Changeset 1753 for inundation/validation/LWRU2/lwru2.py

Timestamp:

Aug 24, 2005, 1:49:47 PM (19 years ago)

Author:

ole

Message:

Embedded caching functionality within quantity.set_values and modified validation example lwru2.py to illustrate the advantages that can be gained from supervised caching.

File:

• inundation/validation/LWRU2/lwru2.py (modified) (2 diffs)

inundation/validation/LWRU2/lwru2.py

@@ -11 +11 @@
 
 
-read_mesh = True  #Use large unstructured mesh generated from create_mesh.py
-#read_mesh = False  #Use small structured mesh
+#read_mesh = True  #Use large unstructured mesh generated from create_mesh.py
+read_mesh = False  #Use small structured mesh
 
 import sys
@@ -128 +128 @@
 domain.filename, _ = os.path.splitext(base)
 
-#LS code to be included in set_quantity
-print 'Reading points'
-from pyvolution import util, least_squares
-#points, attributes = util.read_xya(filenames.bathymetry_filename[:-4] + '.pts')
-points, attributes = cache(util.read_xya,
-                           filenames.bathymetry_filename[:-4] + '.pts')
+print 'Initial values'
 
-elevation = attributes['elevation']
-
-#Fit attributes to mesh
-#vertex_attributes = least_squares.fit_to_mesh(domain.coordinates,
-#                                              domain.triangles,
-#                                              points,
-#                                              attributes['elevation'],
-#                                              alpha = 0.0001,
-#                                              verbose=True)
-
-vertex_attributes = cache(least_squares.fit_to_mesh,
-                          (domain.coordinates, domain.triangles,
-                           points, elevation) ,
-                          {'alpha': 0.0001, 'verbose': True})
-
-print 'Initial values'
-domain.set_quantity('elevation', vertex_attributes)
-#domain.set_quantity('elevation', points=points, attributes=attributes['elevation'], alpha=0.0001)
+domain.set_quantity('elevation',
+                    filename=filenames.bathymetry_filename[:-4] + '.pts',
+                    alpha = 0.0001,
+                    verbose = True,
+                    use_cache = True)
+                    
 domain.set_quantity('friction', 0.0)
 domain.set_quantity('stage', 0.0)