Changeset 5695

Timestamp:

Aug 27, 2008, 10:04:24 AM (17 years ago)

Author:

duncan

Message:

Get the output directory going

Location:

anuga_validation/Hinwood_2008

Files:

• calc_rmsd.py (modified) (6 diffs)
• project.py (modified) (1 diff)
• run_dam.py (modified) (6 diffs)

anuga_validation/Hinwood_2008/calc_rmsd.py

@@ -1 +1 @@
 """
-
-All err results are going into the same dir, and it can't really be changed.
+Functions used to calculate the root mean square deviation.
+
+Duncan Gray, GA - 2007 
+
 """
 
@@ -13 +15 @@
 from csv import writer
 from time import localtime, strftime
+from os.path import join
 
 # Related major packages
 from Numeric import zeros, Float, where, greater, less, compress, sqrt, sum
-
 from anuga.shallow_water.data_manager import csv2dict
 from anuga.utilities.numerical_tools import ensure_numeric, err, norm
 from anuga.utilities.interp import interp
 
+# Scenario specific imports
+import project
+
 def get_max_min_condition_array(min, max, vector):
+    """
+    Given a vector of values, and minimum and maximum values, return a
+    vector of 0/1's that can be used to cut arrays so only the times
+    in the min max range are used.
+    
+    precondition: The vector values are ascending.
+    
+    """
     
     SMALL_MIN = -1e10  # Not that small, but small enough
@@ -48 +61 @@
         id = run_data['scenario_id']
         outputdir_name = id + outputdir_tag
-        file_sim = outputdir_name + '_' +  quantity + ".csv"
+        file_sim = join(project.output_dir,outputdir_name + '_' +  \
+                        quantity + ".csv")
         file_exp = id + '_exp_' + quantity + '.csv'
-        file_err = outputdir_name + "_" + quantity + "_err.csv"
+        file_err = join(project.output_dir,outputdir_name + "_" + \
+                        quantity + "_err.csv")
         
 
@@ -60 +75 @@
         time_sim = ensure_numeric(time_sim)
         time_exp = ensure_numeric(time_exp)
-        
         condition = get_max_min_condition_array(run_data['wave_times'][0],
                                                 run_data['wave_times'][1],
@@ -145 +159 @@
         id = scenario['scenario_id']
         outputdir_name = id + outputdir_tag
-        file_err =  outputdir_name + "_" + quantity + "_err.csv"
+        file_err =  join(project.output_dir,outputdir_name + "_" + \
+                         quantity + "_err.csv")
         file_errs.append(file_err)
     return file_errs
@@ -196 +211 @@
     #scenarios = [scenarios[0]] # !!!!!!!!!!!!!!!!!!!!!!
 
-    outputdir_tag = "_nolmts_wdth_0.1_z_0.0_ys_0.01_mta_0.01"
+    outputdir_tag = "_nolmts_wdth_0.1_z_0.0_ys_0.5_mta_0.01_A"
     calc_norms = True
     #calc_norms = False

anuga_validation/Hinwood_2008/project.py

@@ -1 +1 @@
 """Common filenames and locations.
 """
+
+from os import access, F_OK, mkdir
+
+output_dir = 'output'
+
+if not access(output_dir,F_OK):
+            mkdir (output_dir) 

anuga_validation/Hinwood_2008/run_dam.py

@@ -13 +13 @@
 # Standard modules
 import time
-
+from os.path import join
 
 # Related major packages
@@ -22 +22 @@
 
 # Scenario specific imports
+import project
 import create_mesh
 from prepare_time_boundary import csv2tms
@@ -64 +65 @@
     csv2tms(boundary_file_path, metadata_dic['xleft'][1])
    
-    mesh_filename =  basename + '.msh'
+    mesh_filename =  join(project.output_dir,basename + '.msh')
 
     #-------------------------------------------------------------------------
@@ -83 +84 @@
     
     domain.set_name(basename)
-    domain.set_datadir('.')
+    domain.set_datadir(project.output_dir)
     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
     domain.set_minimum_storable_height(0.0001)
@@ -133 +134 @@
             points.append([gauge_x, 0.0])
 
-        id =  ".csv"
-        interpolate_sww2csv(basename +".sww",
+        interpolate_sww2csv(join(project.output_dir,basename+".sww"),
                             points,
-                            basename + "_depth" + id,
-                            basename + "_velocity_x" + id,
-                            basename + "_velocity_y" + id,
-                            basename + "_stage" + id)
+                            join(project.output_dir,basename + "_depth.csv"),
+                            join(project.output_dir,basename + \
+                                 "_velocit_x.csv"),
+                           join(project.output_dir, basename + \
+                                "_velocity_y.csv"),
+                            join(project.output_dir,basename + "_stage.csv"))
   
 
@@ -202 +204 @@
     friction=0.0
     isTest=True
-    #isTest=False
+    isTest=False
     
     for run_data in scenarios: