Changeset 4420

Timestamp:

Apr 24, 2007, 10:32:54 AM (18 years ago)

Author:

duncan

Message:

check in current scenario

Location:

anuga_work/development/friction_UA_flume_2006

Files:

• calc_norm.py (modified) (3 diffs)
• parallel_run_dam.py (modified) (1 diff)

anuga_work/development/friction_UA_flume_2006/calc_norm.py

@@ -63 +63 @@
               outputdir_name=None,
               pro_instance=None,
-              max_time=None):    
+              max_time=None):
+    """
+    Outputdir_name is directory where the sww files are.
+    The output text file name is based on the flume_name
+    """
     if is_trial_run is True:
         outputdir_name += '_test'
     if pro_instance is None:
-        pro_instance = project.Project(['data','flumes','dam_2006'],
+        pro_instance = project.Project(['data','flumes','dam_2007'],
                                        outputdir_name=outputdir_name)
     
@@ -108 +112 @@
                                       interpolation_points = gauge_locations,
                                       verbose = True,
-                                      use_cache = True)
+                                      use_cache = False)
         # file_instance(0.02, point_id=0) #This works
         norm_sum = 0
@@ -141 +145 @@
 if __name__ == "__main__":
     calc_norm(
-        'ensemble_average_h_smooth.csv',
-        #'ensemble_average_h_rough.csv',
+        #'ensemble_average_h_smooth.csv',
+        'ensemble_average_h_rough.csv',
         is_trial_run = False,   # adds _test to outputdir_name
-        outputdir_name='friction_UA_stage_0.06',
+        outputdir_name='UA_flume_built_from_scratch_0.06_stage',
         max_time=None)
 

anuga_work/development/friction_UA_flume_2006/parallel_run_dam.py

@@ -204 +204 @@
                  0.019, 0.02,
                  0.0225, 0.025, 0.03, 0.035, 0.04] # 17 processes
-    frictions = [0.0, 0.014]
+    #frictions = [0.0, 0.014]
     for i, friction in enumerate(frictions):
         if i%size == rank:
             print "I am processor %d of %d on node %s" %(rank, size, node)
-            main(friction, is_trial_run = True,
-                 outputdir_name='results')
+            main(friction, is_trial_run = False,
+                 outputdir_name='UA_flume_built_from_scratch_0.06_stage')