Changeset 4357 for anuga_work/production

Timestamp:

Apr 4, 2007, 12:43:19 PM (18 years ago)

Author:

nick

Message:

update to dampier

Location:

anuga_work/production/dampier_2006

Files:

• build_dampier.py (modified) (2 diffs)
• check_data.py (modified) (1 diff)
• get_timeseries_and.py (modified) (3 diffs)
• project.py (modified) (1 diff)
• run_dampier.py (modified) (7 diffs)
• run_dampier_simple.py (modified) (1 diff)

anuga_work/production/dampier_2006/build_dampier.py

@@ -158 +158 @@
 cache(urs2sww,
       (boundaries_in_dir_name,
-       project.boundaries_dir_name+'2'),
+       project.boundaries_dir_name+'a'),
       {'verbose': True,
        'minlat': project.south_boundary,
@@ -164 +164 @@
        'minlon': project.west_boundary,
        'maxlon': project.east_boundary,
-       'mint': 8500, 'maxt': 12000,
+       'mint': 5000, 'maxt': 35000,
 #       'origin': domain.geo_reference.get_origin(),
-       'mean_stage': project.tide,
+#       'mean_stage': project.tide,
        'zscale': 1,                 #Enhance tsunami
        'fail_on_NaN': False},

anuga_work/production/dampier_2006/check_data.py

@@ -20 +20 @@
 #run_time = '20070305_055256_run'
 #run_time = '20070305_134855_run'
-run_time = '20070307_041139_run'
+run_time = '20070321_164505_run'
 
 topo = 'topographies'

anuga_work/production/dampier_2006/get_timeseries_and.py

@@ -35 +35 @@
 bo = 'boundaries'
 
-run_time = '20070321_164505_run'
-production_dirs = {#run_time: 'URS evolved data'#,
-                   'boundaries': 'URS boundary condition'
+run_time = '20070311_225041_run'
+production_dirs = {run_time: 'URS evolved data'#,
+                   #'boundaries': 'URS boundary condition'
                    }
 
@@ -152 +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]
+#        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
@@ -158 +158 @@
 
 
-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),e_stage,type(e_stage)
+e_stage = e_stage.tolist()
+e_stage.pop()
+#e_stage = e_stage.tolist().pop()
+e_stage.pop()
+#e_stage.pop()
  
-print len(b_sample), len(e_stage)
+print len(b_sample), len(e_stage),e_stage
 #assert allclose (b_sample, e_sample, 0.5, 0.5)
 
-assert allclose (b_sample, e_stage, 0.5, 0.5) 
+assert allclose (b_sample, e_stage, 0.2, 0.2) 
 print "test successful" 
 

anuga_work/production/dampier_2006/project.py

@@ -95 +95 @@
 boundaries_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'boundaries'+sep
 boundaries_dir_name = boundaries_dir + boundaries_name
+boundaries_dir_namea = boundaries_dir + boundaries_name+'_5000_35000'
 boundaries_dir_name1 = boundaries_dir + boundaries_name1
 boundaries_dir_name2 = boundaries_dir + boundaries_name2

anuga_work/production/dampier_2006/run_dampier.py

@@ -44 +44 @@
 
 start_screen_catcher(project.output_run_time_dir, myid, numprocs)
+
 print "Processor Name:",get_processor_name()
+barrier()
 
 # filenames
@@ -82 +84 @@
 
 sys.exit()
-
+'''
 if myid == 0:
     
@@ -93 +95 @@
                                             'ocean': [5]},
                              maximum_triangle_area=project.res_poly_all,
-                             interior_regions=project.interior_regions_test,
+                             interior_regions=project.interior_regions,
                              filename=meshes_dir_name,
                              use_cache=True,
@@ -105 +107 @@
                                             'ocean': [5]},
                              maximum_triangle_area=project.res_poly_all,
-                             interior_regions=project.interior_regions_test,
+#                             interior_regions=project.interior_regions,
+                             interior_regions=None,
                              filename=meshes_dir_name,
-                             use_cache=True,
+                             use_cache=False,
                              verbose=True)
-
+'''
 #-------------------------------------------------------------------------
 # Setup computational domain
 #-------------------------------------------------------------------------
 print 'Setup computational domain'
-from caching import cache
-domain = cache(Domain, (meshes_dir_name), {'use_cache':True, 'verbose':True}, verbose=True)
+#from caching import cache
+
+#domain = cache(Domain, (meshes_dir_name), {'use_cache':True, 'verbose':True}, verbose=True)
+#above don't work
+domain = Domain(meshes_dir_name, use_cache=True, verbose=True)
 print 'domain id', id(domain) 
 print 'myhash', myhash(domain)      
@@ -166 +172 @@
 #                    filename = project.combined_dir_name + '.pts',
 # MUST USE TXT FILES FOR CACHING TO WORK!
-                    filename = project.combined_smallest_dir_name + '.txt',
+                    filename = project.combined_dir_name + '.txt',
                     use_cache = True,
                     verbose = True,
@@ -203 +209 @@
 print 'Reading Boundary file',project.boundaries_dir_name4 + '.sww'
 #Bf = File_boundary(boundaries_dir_name + '.sww',
-Bf = File_boundary(project.boundaries_dir_name3 + '.sww',
-                  domain, time_thinning=24, use_cache=True, verbose=True)
+#Bf = File_boundary(project.boundaries_dir_name3 + '.sww',
+#                  domain, time_thinning=24, use_cache=True, verbose=True)
+Bf = Field_boundary(project.boundaries_dir_namea + '.sww',
+                  domain, time_thinning=12,mean_stage=tide, use_cache=True, verbose=True)
 
 print 'finished reading boundary file'
@@ -226 +234 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 60, finaltime = 3400):
+for t in domain.evolve(yieldstep = 60, finaltime = 29990):
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')

anuga_work/production/dampier_2006/run_dampier_simple.py

@@ -17 +17 @@
 # Standard modules
 from os import sep
-from os.path import dirname, basename
+from os.path import dirname, basename,
 from os import mkdir, access, F_OK
 from shutil import copy