Changeset 8694

Timestamp:

Feb 14, 2013, 7:43:48 AM (12 years ago)

Author:

steve

Message:

Okushiri seems t obe running now.

Location:

trunk/anuga_core

Files:

• source/anuga/fit_interpolate/fit.py (modified) (3 diffs)
• source/anuga/load_mesh/loadASCII.py (modified) (2 diffs)
• source/anuga/utilities/compile.py (modified) (1 diff)
• validation_tests/Tests/Case_studies/Okushiri/create_okushiri.py (modified) (3 diffs)
• validation_tests/Tests/Case_studies/Okushiri/run_okushiri.py (modified) (1 diff)

trunk/anuga_core/source/anuga/fit_interpolate/fit.py

@@ -81 +81 @@
                  alpha=None,
                  verbose=False,
-                 cg_precon='None',
+                 cg_precon='Jacobi',
                  use_c_cg=True):
 
@@ -479 +479 @@
                 attribute_name=None,
                 use_cache=False,
-                cg_precon='None',
-                use_c_cg=False):
+                cg_precon='Jacobi',
+                use_c_cg=True):
     """Wrapper around internal function _fit_to_mesh for use with caching.
     """
@@ -533 +533 @@
                  max_read_lines=None,
                  attribute_name=None,
-                 cg_precon='None',
-                 use_c_cg=False):
+                 cg_precon='Jacobi',
+                 use_c_cg=True):
     """
     Fit a smooth surface to a triangulation,

trunk/anuga_core/source/anuga/load_mesh/loadASCII.py

@@ -580 +580 @@
     #IntType = Int
 
+    #print 'mesh vertices',mesh['vertices'].shape
+
+
     #the triangulation
     mesh['vertices'] = num.array(mesh['vertices'], num.float)
+    mesh['vertex_attribute_titles'] = \
+        num.array(string_to_char(mesh['vertex_attribute_titles']), num.character)
+
+    num_attributes = len(mesh['vertex_attribute_titles'])
+    num_vertices = mesh['vertices'].shape[0]
+    #print 'num_attrib ',num_attributes
     if mesh['vertex_attributes'] != None:
         mesh['vertex_attributes'] = \
             num.array(mesh['vertex_attributes'], num.float)
-    mesh['vertex_attribute_titles'] = \
-        num.array(string_to_char(mesh['vertex_attribute_titles']), num.character)
+
+    if num_attributes > 0 :
+        mesh['vertex_attributes'] = \
+            num.reshape(mesh['vertex_attributes'],(num_vertices,-1))
+
+
+
     mesh['segments'] = num.array(mesh['segments'], IntType)
     mesh['segment_tags'] = num.array(string_to_char(mesh['segment_tags']),
@@ -635 +649 @@
                                                           'num_of_dimensions'))
         outfile.variables['vertices'][:] = mesh['vertices']
+
+        #print 'mesh vertex attributes', mesh['vertex_attributes'].shape
+        
         if (mesh['vertex_attributes'] != None and
             (mesh['vertex_attributes'].shape[0] > 0 and

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -283 +283 @@
       
     # adding open mp support just for now
-    s += ' -fopenmp -g'
+    s += ' -fopenmp '
 
     if verbose:

trunk/anuga_core/validation_tests/Tests/Case_studies/Okushiri/create_okushiri.py

@@ -27 +27 @@
 #--------------------------------------------------------------------------
 
+base_resolution = 0.01 #  triangles
+base_resolution = 0.02 # 1,972,289 triangles
+base_resolution = 0.04 # 989,669 triangles
+base_resolution = 0.1 # 397,456 triangles
+base_resolution = 0.6 # 68162 triangles
+base_resolution = 2.0 # 21214 triangles
+base_resolution = 4.0 # 11069 triangles
 
-base_resolution = 0.25 # Use this to coarsen or refine entire mesh.
+print base_resolution
 
 # Basic geometry and bounding polygon
@@ -87 +94 @@
 
 # Interior regions and creation of mesh
-interior_regions = [[rhs_region, 0.0005],
+interior_regions = [[rhs_region, 0.0005*base_resolution],
                     [island, 0.0003*base_resolution],
                     [gulleys, 0.00003*base_resolution]]    
@@ -172 +179 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
+
+    print 'create mesh'
     create_mesh(elevation_in_mesh=True)
 

trunk/anuga_core/validation_tests/Tests/Case_studies/Okushiri/run_okushiri.py

@@ -104 +104 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    main(elevation_in_mesh=True)
+    main(elevation_in_mesh=False)