Changeset 8787

Timestamp:

Mar 28, 2013, 10:42:14 PM (12 years ago)

Author:

steve

Message:

Getting the validate script to work in Okushiri validation tests

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/file_function.py (modified) (2 diffs)
• anuga/utilities/compile.py (modified) (1 diff)
• anuga_validation_tests/Case_studies/Okushiri/compare_timeseries_with_measures.py (modified) (2 diffs)
• anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/file_function.py

@@ -189 +189 @@
     fid.close()
 
-    # FIXME SR: This test doesn't seem to work with netcdf4
     if line[:3] == 'CDF':
         return get_netcdf_file_function(filename,
@@ -305 +304 @@
     # Get variables
     # if verbose: log.critical('Get variables'    )
-    time = fid.variables['time'][:]    
+    time = fid.variables['time'][:]
+
     # FIXME(Ole): Is time monotoneous?
 

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -14 +14 @@
 
 import os, string, sys
+
 
 NETCDF_LIB_DIR = os.getenv('NETCDF_LIB_DIR', '')

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/compare_timeseries_with_measures.py

@@ -19 +19 @@
 from anuga.shallow_water.sww_interrogate import get_maximum_inundation_location
 
-if sys.platform == 'win32':
-    # Windows has a problem when this module is run through
-    # os.system as done by validate_okushiri.
-    # See https://datamining.anu.edu.au/anuga/ticket/235
-
-    # If you want to see the plots from this validation,
-    # run this module by itself with this if clause removed.
+##if sys.platform == 'win32':
+##    # Windows has a problem when this module is run through
+##    # os.system as done by validate_okushiri.
+##    # See https://datamining.anu.edu.au/anuga/ticket/235
+##
+##    # If you want to see the plots from this validation,
+##    # run this module by itself with this if clause removed.
+##    plotting = False
+##    
+##else:
+try:
+    from pylab import ion, hold, plot, title, legend
+    from pylab import xlabel, ylabel, savefig
+    hold(False)  # Check if this command can be issued
+except:
+    print 'Could not import pylab'
     plotting = False
-    
 else:
-    try:
-        from pylab import ion, hold, plot, title, legend
-        from pylab import xlabel, ylabel, savefig
-        hold(False)  # Check if this command can be issued
-    except:
-        print 'Could not import pylab'
-        plotting = False
-    else:
-        # Create plots as png files
-        plotting = True
+    # Create plots as png files
+    plotting = True
     
 
@@ -168 +168 @@
 # Windows tolerances
 rtol = 1.0e-2
-atol = 1.0e-3
+atol = 1.0e-2
 print 'Precisions used: rtol=%e, atol=%e' %(rtol, atol)
 
+
+#print reference_time
 for k, name in enumerate(gauge_names):
 

trunk/anuga_core/source/anuga_validation_tests/Case_studies/Okushiri/run_okushiri.py

@@ -73 +73 @@
     domain.set_flow_algorithm(alg)
     domain.set_CFL(cfl)
+        
 
+    #------------------------------------------------------------------------------
+    # Produce a documentation of parameters
+    #------------------------------------------------------------------------------
+    parameter_file=open('parameters.tex', 'w')
+    parameter_file.write('\\begin{verbatim}\n')
+    from pprint import pprint
+    pprint(domain.get_algorithm_parameters(),parameter_file,indent=4)
+    parameter_file.write('\\end{verbatim}\n')
+    parameter_file.close()
+        
     #-------------------------
     # Boundary Conditions