Changeset 4311

Timestamp:

Mar 22, 2007, 8:49:47 AM (18 years ago)

Author:

nick

Message:

updates to dampier

Location:

anuga_work/production/dampier_2006

Files:

• get_timeseries.py (modified) (2 diffs)
• get_timeseries_and.py (modified) (6 diffs)
• project.py (modified) (1 diff)
• run_dampier_simple.py (modified) (10 diffs)

anuga_work/production/dampier_2006/get_timeseries.py

@@ -26 +26 @@
                    #'20070307_224017_run': 'URS boundary normal'
                    }
+>>>>>>> .r4304
 
     
@@ -59 +60 @@
     texname, elev_output = sww2timeseries(swwfiles,
                                           project.gauges_dir_name_simple,
+>>>>>>> .r4304
                                           production_dirs,
                                           report = False,

anuga_work/production/dampier_2006/get_timeseries_and.py

@@ -35 +35 @@
 bo = 'boundaries'
 
-run_time = '20070312_030201_run'
+run_time = '20070321_164505_run'
 production_dirs = {#run_time: 'URS evolved data'#,
                    'boundaries': 'URS boundary condition'
@@ -97 +97 @@
         print 'boundaries'
 #        file_loc = project.boundaries_in_dir
-#        swwfile = project.boundaries_dir_name3 + '.sww'
-        swwfile = project.boundaries_dir_name6+'.sww'
+        swwfile = project.boundaries_dir_name3 + '.sww'
+#        swwfile = project.boundaries_dir_name6+'.sww'
     else:
 #        file_loc = project.output_dir + label_id + sep
@@ -124 +124 @@
 
 
-e_time, e_stage, e_momentum, e_speed, e_elevation = get_data_from_file(evolved_dir_filename)
+e_header, e_data = get_data_from_file(evolved_dir_filename)
+
+e_time = e_data[:,0]
+e_stage = e_data[:,1]
+e_momentum = e_data[:,2]
+e_speed = e_data[:,3]
+e_elevation = e_data[:,4]
 
 print'boundary_dir_filename',boundary_dir_filename
-b_time, b_stage, b_momentum, b_speed, b_elevation = get_data_from_file(boundary_dir_filename)
+b_header, b_data = get_data_from_file(boundary_dir_filename)
+
+b_time = b_data[:,0]
+b_stage = b_data[:,1]
+b_momentum = b_data[:,2]
+b_speed = b_data[:,3]
+b_elevation = b_data[:,4]
+
 
 # compares the 2 models
@@ -139 +152 @@
         b_sample.append(float(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)
         j = j +1
@@ -144 +158 @@
 
 
-e_stage.pop()
-e_stage.pop()
+print len(b_sample), len(e_stage)
+e_stage = e_stage.tolist().pop()
+e_stage = e_stage.tolist().pop()
  
 print len(b_sample), len(e_stage)
@@ -157 +172 @@
 
                              
+                             
                                           

anuga_work/production/dampier_2006/project.py

@@ -113 +113 @@
 #gauges
 gauge_name = 'dampier_gauges_up2.csv' #'dampier.csv'
+gauge_name_simple = 'dampier_gauges_simple.csv' 
 gauge_name_test = 'dampier_gauges_up_test.csv' #'dampier.csv'
-gauge_name_simple = 'dampier_gauges_simple.csv' 
 gauges_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
 gauges_dir_name = gauges_dir + gauge_name
+gauges_dir_name_simple = gauges_dir + gauge_name_simple
 gauges_dir_name_test = gauges_dir + gauge_name_test
-gauges_dir_name_simple = gauges_dir + gauge_name_simple
 
 

anuga_work/production/dampier_2006/run_dampier_simple.py

@@ -36 +36 @@
 from anuga.caching import myhash
 # Application specific imports
-#import project                 # Definition of file names and polygons
+import project                 # Definition of file names and polygons
 
 #------------------------------------------------------------------------------
@@ -43 +43 @@
 #------------------------------------------------------------------------------
 
-#start_screen_catcher(project.output_run_time_dir, myid, numprocs)
+start_screen_catcher(project.output_run_time_dir, myid, numprocs)
 print "Processor Name:",get_processor_name()
 
@@ -52 +52 @@
 #boundaries_dir_name = project.boundaries_dir_name
 
-#tide = project.tide
+tide = project.tide
 
 # creates copy of code in output dir
-'''
 if myid == 0:
     copy_code_files(project.output_run_time_dir,__file__, 
                  dirname(project.__file__)+sep+ project.__name__+'.py' )
 barrier()
-'''
-#print 'USER: ', project.user
-#print 'min triangles', project.trigs_min,
+
+print 'USER: ', project.user
+print 'min triangles', project.trigs_min,
 print 'Note: This is generally about 20% less than the final amount'
 
@@ -117 +116 @@
                              verbose=True)
 '''                            
-all = [[469000,7760000],[470000,7758000],[468000,7758000]]
-#all = [[470000,7760000],[469000,7758000],[468000,7760000]]
+#all = [[469000,7760000],[470000,7758000],[468000,7758000]]
+all = [[470000,7760000],[469000,7758000],[468000,7760000]]
 create_mesh_from_regions(all,
-#                             boundary_tags={'ocean': [0,1,2]},
-                             boundary_tags={'ocean': [ 2],'side': [0, 1]},
-#                             boundary_tags={'ocean': [ 2],'ref_side': [0, 1]},
-                             maximum_triangle_area=100000,
-                             filename=meshes_dir_name,
-                             use_cache=True,
-                             verbose=True)
-import sys
-sys.exit()
+                             boundary_tags={'ocean': [0,1,2]},
+#                             boundary_tags={'ocean': [ 2],'side': [0, 1]},
+                             maximum_triangle_area=50000,
+                             filename=meshes_dir_name,
+                             use_cache=False,
+                             verbose=True)
+
 #-------------------------------------------------------------------------
 # Setup computational domain
@@ -134 +131 @@
 print 'Setup computational domain'
 domain = Domain( meshes_dir_name, verbose=True)
-
 '''
 from caching import cache
@@ -199 +195 @@
 print 'Start Set quantity'
 
-domain.set_quantity('elevation', 
+#domain.set_quantity('elevation', 
 #                    filename = project.combined_dir_name + '.pts',
 # MUST USE TXT FILES FOR CACHING TO WORK!
-                    filename = project.combined_smallest_dir_name + '.txt',
-                    use_cache = True,
-                    verbose = True,
-                    alpha = 0.1)
+#                    filename = project.combined_smallest_dir_name + '.txt',
+#                    use_cache = True,
+#                    verbose = True,
+#                    alpha = 0.1)
+domain.set_quantity('elevation', -42.3)
+
 print 'Finished Set quantity'
 
@@ -252 +250 @@
 Bd = Dirichlet_boundary([tide,0,0])
 
-Bo = Dirichlet_boundary([tide+4.0,0,0])
-
 print'set_boundary'
 ##domain.set_boundary({'back': Br,
@@ -259 +255 @@
 ##                     'ocean': Bf})
 domain.set_boundary({#'back': Br,
-                     'side': Br,
-                     'ref_side': Br,
-                    'ocean': Bd
+                     'side': Bd,
+                    'ocean': Bf
                     })
 print'finish set boundary'
@@ -271 +266 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 10, finaltime = 3400):
+for t in domain.evolve(yieldstep = 60, finaltime = 3400):
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')
-
-    if allclose(t, 120):
-        domain.set_boundary({'side': Br, 'ocean': Bo})
-
-    if allclose(t, 1020):
-        domain.set_boundary({'side': Br, 'ocean': Bd})
 
 #for t in domain.evolve(yieldstep = 120, finaltime = 9000):
@@ -305 +294 @@
 
 
-
-
-
-
-
-
-
-
-