Changeset 1745

Timestamp:

Aug 23, 2005, 3:31:11 PM (18 years ago)

Author:

ole

Message:

Truncation of Numeric arguments to caching

Location:

inundation

Files:

• caching/caching.py (modified) (1 diff)
• validation/LWRU2/lwru2.py (modified) (2 diffs)

inundation/caching/caching.py

@@ -2240 +2240 @@
       argstr = argstr + "'"+str(args)+"'"
     else:
+      #FIXME Have a truncation for large Numeric arrays before using str()
+      import Numeric
+      if type(args) == Numeric.ArrayType:
+        if len(args.flat) > textwidth:
+          args = 'Array: %s' %args.shape
+
       argstr = argstr + str(args)
   else:

inundation/validation/LWRU2/lwru2.py

@@ -11 +11 @@
 
 
-read_mesh = False
+read_mesh = True  #Use large unstructured mesh generated from create_mesh.py
+#read_mesh = False  #Use small structured mesh
 
 import sys
@@ -93 +94 @@
 if read_mesh is True:
     print 'Creating domain from', filenames.mesh_filename
-    domain = pmesh_to_domain_instance(filenames.mesh_filename, Domain)    
+    #domain = pmesh_to_domain_instance(filenames.mesh_filename, Domain)
+
+    domain = cache(pmesh_to_domain_instance,
+                   (filenames.mesh_filename, Domain),
+                   dependencies = [filenames.mesh_filename])
+
+
+    
 else:   
     print 'Creating regular mesh'