Changeset 5793

Timestamp:

Sep 26, 2008, 3:46:52 PM (16 years ago)

Author:

kristy

Message:

 

Files:

• anuga_core/source/anuga/fit_interpolate/fit.py (modified) (1 diff)
• anuga_work/production/busselton/project_250m.py (modified) (1 diff)
• anuga_work/production/carnarvon/build_boundary.py (deleted)
• anuga_work/production/carnarvon/build_carnarvon_250m.py (modified) (1 diff)
• anuga_work/production/carnarvon/export_results.py (modified) (1 diff)
• anuga_work/production/carnarvon/project_250m.py (modified) (1 diff)
• anuga_work/production/carnarvon/run_carnarvon.py (modified) (1 diff)
• anuga_work/production/carnarvon/run_carnarvon_250m.py (modified) (2 diffs)
• anuga_work/production/geraldton/export_results.py (modified) (3 diffs)
• anuga_work/production/geraldton/project_250m.py (modified) (1 diff)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -368 +368 @@
             
         if point_coordinates is None:
-            assert self.AtA <> None
+            print 'Warning: no data points in fit'
+            assert self.AtA <> None, 'no interpolation matrix'
             assert self.Atz <> None
+            
             #FIXME (DSG) - do  a message
         else:

anuga_work/production/busselton/project_250m.py

@@ -51 +51 @@
 finaltime=80000         # final time for simulation
 
-interior_mesh = 'none' # Can have 'all' or 'none' for Phase 2 study
+interior_mesh = 'all' # Can have 'all' or 'none' for Phase 2 study
 
 setup='final'  # Final can be replaced with trial or basic.

anuga_work/production/carnarvon/build_carnarvon_250m.py

@@ -71 +71 @@
 
 #-------------------------------------------------------------------------------
-# Combine, clip and export dataset 
+# export dataset 
 #-------------------------------------------------------------------------------
-
-print'clip combined geospatial object by bounding polygon'
-G_clipped = G.clip(project_250m.poly_all)
 
 print'export combined DEM file'
 if access(project_250m.topographies_dir,F_OK) == 0:
     mkdir (project_250m.topographies_dir)
-G_clipped.export_points_file(project_250m.combined_dir_name + '.pts')
-#G_clipped.export_points_file(project_250m.combined_dir_name + '.txt') #Use for comparision in ARC
+G.export_points_file(project_250m.combined_dir_name + '.pts')
+G.export_points_file(project_250m.combined_dir_name + '.txt') #Use for comparision in ARC
 

anuga_work/production/carnarvon/export_results.py

@@ -16 +16 @@
 directory = project.output_dir
 name = directory+sep+time_dir+sep+project.scenario_name
-
-
-
 
 is_parallel = False

anuga_work/production/carnarvon/project_250m.py

@@ -51 +51 @@
 finaltime=80000         # final time for simulation
 
-interior_mesh = 'all' # Can have 'all' or 'none' for Phase 2 study
+interior_mesh = 'none' # Can have 'all' or 'none' for Phase 2 study
 
 setup='final'  # Final can be replaced with trial or basic.

anuga_work/production/carnarvon/run_carnarvon.py

@@ -91 +91 @@
 
     # boundary tags refer to project.landward 4 points equals 5 segments start at N
-     boundary_tags={'back': [N+1,N+2,N+3], 'side': [N,N+4],'ocean': range(N)}
+    boundary_tags={'back': [N+1,N+2,N+3], 'side': [N,N+4], 'ocean': range(N)}
 
     #--------------------------------------------------------------------------

anuga_work/production/carnarvon/run_carnarvon_250m.py

@@ -91 +91 @@
 
     # boundary tags refer to project_250m.landward 4 points equals 5 segments start at N
-     boundary_tags={'back': [N+1,N+2,N+3], 'side': [N,N+4],'ocean': range(N)}
+    boundary_tags={'back': [N+1,N+2,N+3], 'side': [N,N+4], 'ocean': range(N)}
+
 
     #--------------------------------------------------------------------------
@@ -132 +133 @@
 
     # sets the initial stage in the offcoast region only
-      IC = Polygon_function( [(project.poly_mainland, 0),(project.poly_island1, 0)
-                            ,(project.poly_island2, 0)], default = kwargs['tide'],
+    IC = Polygon_function( [(project_250m.poly_mainland, 0),(project_250m.poly_island1, 0)
+                            ,(project_250m.poly_island2, 0)], default = kwargs['tide'],
                              geo_reference = domain.geo_reference)
-     domain.set_quantity('stage', IC)
+    domain.set_quantity('stage', IC)
     #domain.set_quantity('stage',kwargs['tide'] )
     domain.set_quantity('friction', kwargs['friction']) 

anuga_work/production/geraldton/export_results.py

@@ -1 @@
-import project, os
+import project_250m, os
 import sys
 
@@ -7 +7 @@
 
 
-time_dir = '20080911_094915_run_final_0.6_27255_alpha0.1_kvanputt'
-#time_dir = '20080911_100609_run_final_0.6_27283_alpha0.1_kvanputt'
-
+time_dir = '20080925_162836_run_final_0_27283_250m_none_kvanputt'
 
 cellsize = 25
 #cellsize = 150
 #timestep = 0
-directory = project.output_dir
-name = directory+sep+time_dir+sep+project.scenario_name
-#var = [0,4] 
-var = [2] # depth and Speed
+directory = project_250m.output_dir
+name = directory+sep+time_dir+sep+project_250m.scenario_name
+
+var = [0,4] 
+#var = [2] # depth and Speed
 #var = [2,3] # elevation, depth and Speed
 
@@ -26 +25 @@
 print 'output dir:', name
 
+name = directory+time_dir+sep+project_250m.scenario_name
 
-name1 = directory+time_dir+sep+project.scenario_name
-name2 = directory+time_dir+sep+'sww2'+sep+project.scenario_name+'_time_41700_0' #need to get assistance on how to make this into anything
+for which_var in var:
+    if which_var == 0:  # Stage
+        outname = name + '_stage'
+        quantityname = 'stage'
 
-names = [name1, name2]
+    if which_var == 1:  # Absolute Momentum
+        outname = name + '_momentum'
+        quantityname = '(xmomentum**2 + ymomentum**2)**0.5'  
 
-for name in names:
+    if which_var == 2:  # Depth
+        outname = name + '_depth'
+        quantityname = 'stage-elevation'  
 
-    for which_var in var:
-        if which_var == 0:  # Stage
-            outname = name + '_stage'
-            quantityname = 'stage'
+    if which_var == 3:  # Speed
+        outname = name + '_speed'
+        quantityname = '(xmomentum**2 + ymomentum**2)**0.5/(stage-elevation+1.e-6/(stage-elevation))'  #Speed
 
-        if which_var == 1:  # Absolute Momentum
-            outname = name + '_momentum'
-            quantityname = '(xmomentum**2 + ymomentum**2)**0.5'  
+    if which_var == 4:  # Elevation
+        outname = name + '_elevation'
+        quantityname = 'elevation'  #Elevation
 
-        if which_var == 2:  # Depth
-            outname = name + '_depth'
-            quantityname = 'stage-elevation'  
-
-        if which_var == 3:  # Speed
-            outname = name + '_speed'
-            quantityname = '(xmomentum**2 + ymomentum**2)**0.5/(stage-elevation+1.e-6/(stage-elevation))'  #Speed
-
-        if which_var == 4:  # Elevation
-            outname = name + '_elevation'
-            quantityname = 'elevation'  #Elevation
-
-        if is_parallel == True:
-        #    print 'is_parallel',is_parallel
-            for i in range(0,nodes):
-                namei = name + '_P%d_%d' %(i,nodes)
-                outnamei = outname + '_P%d_%d' %(i,nodes)
-                print 'start sww2dem for sww file %d' %(i)
-                sww2dem(namei, basename_out = outnamei,
-                            quantity = quantityname,
-                            #timestep = timestep,
-                            cellsize = cellsize,      
-                            easting_min = project_grad.e_min_area,
-                            easting_max = project_grad.e_max_area,
-                            northing_min = project_grad.n_min_area,
-                            northing_max = project_grad.n_max_area,        
-                            reduction = max, 
-                            verbose = True,
-                            format = 'asc')
-        else:
-            print 'start sww2dem'
-            sww2dem(name, basename_out = outname,
+    if is_parallel == True:
+    #    print 'is_parallel',is_parallel
+        for i in range(0,nodes):
+            namei = name + '_P%d_%d' %(i,nodes)
+            outnamei = outname + '_P%d_%d' %(i,nodes)
+            print 'start sww2dem for sww file %d' %(i)
+            sww2dem(namei, basename_out = outnamei,
                         quantity = quantityname,
                         #timestep = timestep,
-                        cellsize = cellsize,
-                        number_of_decimal_places = 4,
+                        cellsize = cellsize,      
+                        easting_min = project_grad.e_min_area,
+                        easting_max = project_grad.e_max_area,
+                        northing_min = project_grad.n_min_area,
+                        northing_max = project_grad.n_max_area,        
                         reduction = max, 
                         verbose = True,
                         format = 'asc')
+    else:
+        print 'start sww2dem'
+        sww2dem(name, basename_out = outname,
+                    quantity = quantityname,
+                    #timestep = timestep,
+                    cellsize = cellsize,
+                    number_of_decimal_places = 4,
+                    reduction = max, 
+                    verbose = True,
+                    format = 'asc')
 

anuga_work/production/geraldton/project_250m.py

@@ -51 +51 @@
 finaltime=80000         # final time for simulation
 
-interior_mesh = 'all' # Can have 'all' or 'none' for Phase 2 study
+interior_mesh = 'none' # Can have 'all' or 'none' for Phase 2 study
 
 setup='final'  # Final can be replaced with trial or basic.