Changeset 4360 for anuga_core

Timestamp:

Apr 4, 2007, 12:48:14 PM (18 years ago)

Author:

nick

Message:

Mux to sww tests almost finished
added field_boundary to _init_

Location:

anuga_core/source/anuga/shallow_water

Files:

• __init__.py (modified) (1 diff)
• xtest_Bf.py (modified) (16 diffs)

anuga_core/source/anuga/shallow_water/__init__.py

@@ -12 +12 @@
     Transmissive_Momentum_Set_Stage_boundary,\
     Dirichlet_Discharge_boundary,\
-    Constant_stage, Constant_height
+    Constant_stage, Constant_height,\
+    Field_boundary
 
 

anuga_core/source/anuga/shallow_water/xtest_Bf.py

@@ -22 +22 @@
 
 # Related major packages
-from anuga.shallow_water import Domain,Dirichlet_boundary,File_boundary,Transmissive_boundary
-#from anuga.shallow_water import Reflective_boundary
+from anuga.shallow_water import Domain,Dirichlet_boundary,File_boundary,Transmissive_boundary, Field_boundary
+#from anuga.shallow_water.shallow_water_domain import Field_boundary
 from Numeric import allclose, array
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
@@ -43 +43 @@
 tide = 2.4
 
+
+#EVOLVED MODEL
+
 #--------------------------------------------------------------------------
 # Create the triangular mesh based on overall clipping polygon with a
@@ -52 +55 @@
 #all = [[469000,7760000],[470000,7758000],[468000,7758000]]
 #all = [[470000,7760000],[469000,7758000],[468000,7760000]]
-all_large = [[474000,7764000],[474000,7756000],[466000,7756000],[466000,7764000]]
-all = [[470000,7764000],[470000,7756000],[466000,7756000],[466000,7764000]]
+
+#all_large = [[474000,7764000],[474000,7756000],[466000,7756000],[466000,7764000]]
+#all = [[470000,7764000],[470000,7756000],[466000,7756000],[466000,7764000]]
+all = [[465184,7764500],[470397,7764510],[470407,7758988],[465195,7758979]]
+# N, W, S, E
+
 create_mesh_from_regions(all,
 #                             boundary_tags={'ocean': [0,1,2]},
 #                             boundary_tags={'ocean': [ 2],'side': [0, 1]},
-                             boundary_tags={'ocean': [ 2],'side': [1, 3], 'back': [0]},
+                             boundary_tags={'ocean': [ 0],'side': [1, 3], 'back': [2]},
                              maximum_triangle_area=50000,
                              filename=meshes_dir_name,
                              use_cache=False,
-                             #verbose=True
+#                             verbose=True
                              )
 
@@ -67 +74 @@
 # Setup computational domain
 #-------------------------------------------------------------------------
-print 'Setup computational domain'
+#print 'Setup computational domain'
 domain = Domain( meshes_dir_name, verbose=True)
+
+from anuga.shallow_water.data_manager import urs2sww
+boundaries_dir_name = 'o_test'
+
+# convert MUX urs files to an SWW file output
+#print 'boundary file is: ',boundaries_dir_name
+from caching import cache
+cache(urs2sww,
+          (boundaries_dir_name,
+           boundaries_dir_name), 
+          {'verbose': False,
+           'mint': 9200, 'maxt': 11200,
+#           'origin': domain.geo_reference.get_origin(),
+           'fail_on_NaN': False},
+           verbose = False,
+           )
     
 #-------------------------------------------------------------------------
@@ -74 +97 @@
 #-------------------------------------------------------------------------
 
-print 'Start Set quantity'
+#print 'Start Set quantity'
 
 domain.set_quantity('elevation', -42.3)
 
-print 'Finished Set quantity'
+#print 'Finished Set quantity'
 
 #------------------------------------------------------
@@ -84 +107 @@
 #------------------------------------------------------ 
 
-domain.set_quantity('stage', 2.4)
+domain.set_quantity('stage', tide)
 domain.set_quantity('friction', 0.01)
 domain.set_name(fileName)
@@ -92 +115 @@
 # Setup boundary conditions 
 #-------------------------------------------------------------------------
-Bf = File_boundary(out_dir + 'o_test_8500_12000.sww',
-                  domain, time_thinning=24, use_cache=True, verbose=True)
-
-print 'finished reading boundary file'
+#Bf = File_boundary(out_dir + 'o_test_8500_12000.sww',
+#                  domain, time_thinning=24, use_cache=True, verbose=True)
+Bf = Field_boundary(out_dir + 'o_test.sww',
+                  domain, mean_stage=tide, use_cache=True, verbose=False)
+
+#print 'finished reading boundary file'
 
 #Br = Reflective_boundary(domain)
@@ -101 +126 @@
 Bd = Dirichlet_boundary([tide,0,0])
 
-print'set_boundary'
+#print'set_boundary'
 
 domain.set_boundary({'back': Bt,
@@ -107 +132 @@
                     'ocean': Bf
                     })
-print'finish set boundary'
+#print'finish set boundary'
 
 #----------------------------------------------------------------------------
@@ -113 +138 @@
 #----------------------------------------------------------------------------
 
+#remove mesh file!!! and o_test.sww
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 60, finaltime = 3400):
+for t in domain.evolve(yieldstep = 60, finaltime = 1920):
     domain.write_time()
-    domain.write_boundary_statistics(tags = 'ocean')
-
-
-
-
+#    domain.write_boundary_statistics()
+
+
+
+#Gets timeseries from boundary sww and evolved sww
 home = getenv('INUNDATIONHOME') #Sandpit's parent dir   
 #user = get_user_name()
@@ -145 +171 @@
 
 
-gauge_boundary_filename = 'boundary_gauge_near_top.csv'
+#gauge_boundary_filename = 'boundary_gauge_near_top.csv'
+gauge_boundary_filename = 'gauges_time_series_b_near_top.csv'
 gauge_evolved_filename = 'gauges_time_series_near_top.csv'
 
 boundary_dir_filename = os.path.join(out_dir,gauge_boundary_filename)
-print'boundary_dir_filename',boundary_dir_filename
+#print'boundary_dir_filename',boundary_dir_filename
 
 evolved_dir_filename= os.path.join(out_dir,gauge_evolved_filename)
 
-print'boundary_dir_filename',boundary_dir_filename
-print'evolved_dir_filename',evolved_dir_filename
+#print'boundary_dir_filename',boundary_dir_filename
+#print'evolved_dir_filename',evolved_dir_filename
                                      
 swwfiles = {}
 swwfile = out_dir + fileName + '.sww'
 swwfiles[swwfile] = run_time
-print"swwfiles",swwfiles,"shallow_water"
+#print"swwfiles",swwfiles,"shallow_water"
         
 texname, elev_output = sww2timeseries(swwfiles,
@@ -171 +198 @@
                                       title_on = False,
                                       use_cache = True,
-                                      verbose = True)
+                                      verbose = False)
+                                      
+swwfiles = {}
+swwfile = out_dir + boundaries_dir_name + '.sww'
+swwfiles[swwfile] = run_time
+#print"swwfiles",swwfiles,"shallow_water"
+        
+texname, elev_output = sww2timeseries(swwfiles,
+                                      out_dir+sep+"boundary_gauges.csv",
+                                      production_dirs,
+                                      report = False,
+                                      plot_quantity = ['stage', 'xmomentum', 'ymomentum'],
+                                      surface = False,
+                                      time_min = None,
+                                      time_max = None,
+                                      title_on = False,
+                                      use_cache = True,
+                                      verbose = False)
 
 #makes the csv files from the evolved model
@@ -182 +226 @@
 e_elevation = e_data[:,4]
 
-print'boundary_dir_filename',boundary_dir_filename
+#print'boundary_dir_filename',boundary_dir_filename
 b_header, b_data = get_data_from_file(boundary_dir_filename)
 
@@ -194 +238 @@
 # compares the 2 models
 j=0
-k=1
+k=0
 b_sample = []
 e_sample = []
@@ -200 +244 @@
 #    if j<(len(e_time)) and b_time[i] == e_time[j]:
     if j<(len(e_time)) and k<(len(e_time)) and b_time[i] == e_time[j]:
-        b_sample.append(float(b_stage[i]))
+        b_sample.append(float(tide+b_stage[i]))
         e_sample.append(float(e_stage[k]))
-#        print 'out:', b_time[i], b_stage[i],i, j, b_sample[j],e_stage[j]
-#        if k <len(e_time): print 'time e equal b:', b_time[i], b_stage[i],i, j, b_sample[j],e_stage[j], e_stage[k],(len(e_time)-1)
-        if k <len(e_time): print 'time e equal b:', b_time[i],i, j, b_stage[i], e_stage[k],(len(e_time)-1)
+#        if k <len(e_time): print 'time e equal b:', b_time[i],i, j, b_stage[i], b_sample[i], e_stage[k],(len(e_time)-1)
         j = j +1
         k = k +1
 
 
-print len(b_sample), len(e_stage),e_stage,type(e_stage)
+#print len(b_sample), len(e_stage),e_stage,type(e_stage)
 e_stage = e_stage.tolist()
 e_stage.pop()
 #e_stage.pop()
  
-print len(b_sample), len(e_stage),e_stage
+#print len(b_sample), len(e_stage),e_stage
 
 
@@ -220 +262 @@
 print "test successful" 
 os.remove(fileName+'.sww')
-print 'evolved_dir_filename',evolved_dir_filename
+#print 'evolved_dir_filename',evolved_dir_filename
 os.remove('gauges_time_series_near_top.csv')
+os.remove('gauges_time_series_b_near_top.csv')
+os.remove('gauges_t0.csv')
 os.remove('gauges_maxmins.csv')
+os.remove(meshes_dir_name)
+
 
 assert allclose (b_sample, e_sample, 0.5, 0.5)