Changeset 3878 for anuga_validation/okushiri_2005/extract_timeseries.py

Timestamp:

Oct 27, 2006, 5:34:53 PM (18 years ago)

Author:

ole

Message:

Okushiri mesh using new mesh interface

File:

• anuga_validation/okushiri_2005/extract_timeseries.py (modified) (2 diffs)

anuga_validation/okushiri_2005/extract_timeseries.py

@@ -45 +45 @@
 
 # old limiters
-expected_covariances = {'Boundary': 5.288601162783020386e-05,
-                        'ch5': 1.167001054284431472e-04,
-                        'ch7': 1.121474766904651861e-04,
-                        'ch9': 1.249244820847215335e-04}
+#expected_covariances = {'Boundary': 5.288601162783020386e-05,
+#                        'ch5': 1.167001054284431472e-04,
+#                        'ch7': 1.121474766904651861e-04,
+#                        'ch9': 1.249244820847215335e-04}
+#
+#expected_differences = {'Boundary': 8.361144081847830638e-04,
+#                        'ch5': 3.423673831653336816e-03,
+#                        'ch7': 2.799962153549145211e-03,
+#                        'ch9': 3.198560464876740433e-03}
 
-expected_differences = {'Boundary': 8.361144081847830638e-04,
-                        'ch5': 3.423673831653336816e-03,
-                        'ch7': 2.799962153549145211e-03,
-                        'ch9': 3.198560464876740433e-03}
+
+expected_covariances = {'Boundary': 5.288392008865989237e-05, 
+                        'ch5': 1.166748190444680592e-04,
+                        'ch7': 1.121816242516757850e-04,
+                        'ch9': 1.249543278366777640e-04}
+
+expected_differences = {'Boundary':  8.373150808730501615e-04,
+                        'ch5': 3.425914311580337875e-03,
+                        'ch7': 2.802327594773105189e-03,
+                        'ch9': 3.198733498646373370e-03}
 
 
@@ -94 +105 @@
 # Read and interpolate model output
 #--------------------------------------------------
+
+import sys
+if len(sys.argv) > 1:
+    sww_filename = sys.argv[1]
+else:    
+    sww_filename = project.output_filename
+    
 #f = file_function('okushiri_new_limiters.sww',   #The best so far
 #f = file_function('okushiri_as2005_with_mxspd=0.1.sww',
-f = file_function(project.output_filename,
+f = file_function(sww_filename,
                   quantities='stage',
                   interpolation_points=gauge_locations,