Changeset 1259

Timestamp:

Apr 28, 2005, 6:00:40 PM (20 years ago)

Author:

steve

Message:

Playing wiht tps viewer

Location:

inundation/ga/storm_surge

Files:

• pyvolution-parallel/general_mesh.py (modified) (2 diffs)
• pyvolution-parallel/least_squares.py (modified) (2 diffs)
• steve/get_triangle_data.py (added)
• steve/run_merimbula.py (modified) (1 diff)
• zeus/pyvolution-parallel.zpi (modified) (2 diffs)
• zeus/pyvolution.zbi (modified) (previous)
• zeus/steve.zpi (modified) (1 diff)

inundation/ga/storm_surge/pyvolution-parallel/general_mesh.py

@@ -47 +47 @@
 
 
-        This is a cut down version of mesh from pyvolution\mesh.py
+        This is a cut down version of mesh from pyvolution mesh.py
     """
 
@@ -278 +278 @@
 
         return sum(self.areas)
-

inundation/ga/storm_surge/pyvolution-parallel/least_squares.py

@@ -872 +872 @@
             %os.path.basename(sys.argv[0])
 
+
+
     if len(sys.argv) < 4:
         print usage
@@ -897 +899 @@
         else:
             alpha = DEFAULT_ALPHA
+
+        print "alpha = ",alpha
 
         t0 = time.time()

inundation/ga/storm_surge/steve/run_merimbula.py

@@ -6 +6 @@
 import least_squares
 
+alpha = 0.1
+mesh_file = 'merimbula_10785.tsh'
+point_file = 'meri0.xya'
+mesh_output_file = 'merimbula_10785_%g.tsh'%alpha
 
-mesh_file = 'Merimbula_17540_refined.tsh'
-point_file = 'XYmerimbula_bathymetry.xya'
-mesh_output_file = 'Merimbula_17540_refined_bathymetry.tsh'
+print mesh_output_file
 
 
 least_squares.fit_to_mesh_file(mesh_file, point_file, mesh_output_file,
-                     alpha=0.001, verbose= True,
+                     alpha=alpha, verbose= True,
                      expand_search = False,
                      data_origin = None,
                      mesh_origin = None,
-                     precrop = True)
+                     precrop = False)
+
+
+from shallow_water import Domain
+from pmesh2domain import pmesh_to_domain_instance
+from util import file_function, Polygon_function, read_polygon
+from Numeric import zeros, Float 
+
+#-------
+# Domain
+filename = mesh_output_file  
+print 'Creating domain from', filename
+domain = pmesh_to_domain_instance(filename, Domain)
+print "Number of triangles = ", len(domain)

inundation/ga/storm_surge/zeus/pyvolution-parallel.zpi

@@ -78 +78 @@
     <file>..\pyvolution-parallel\cg_solve.py</file>
     <file>..\pyvolution-parallel\check_sww_tsh.py</file>
+    <file>..\pyvolution-parallel\chris-dump.py</file>
     <file>..\pyvolution-parallel\combine_pts.py</file>
     <file>..\pyvolution-parallel\compile.py</file>
@@ -96 +97 @@
     <file>..\pyvolution-parallel\most2nc.py</file>
     <file>..\pyvolution-parallel\netherlands.py</file>
+    <file>..\pyvolution-parallel\netherlands-chris.py</file>
     <file>..\pyvolution-parallel\pmesh2domain.py</file>
     <file>..\pyvolution-parallel\pressure_force.py</file>

inundation/ga/storm_surge/zeus/steve.zpi

@@ -73 +73 @@
     <ReleaseProjectSaveAll>Off</ReleaseProjectSaveAll>
     <ReleaseProjectReload>Off</ReleaseProjectReload>
+    <file>..\steve\get_triangle_data.py</file>
     <file>..\steve\run_merimbula.py</file>
     <folder name="Header Files" />