Changeset 9357

Timestamp:

Oct 29, 2014, 9:49:45 AM (11 years ago)

Author:

davies

Message:

Adding towradgi results.tex + a validation test bugfix

Location:

trunk/anuga_core

Files:

• source/anuga/structures/inlet.py (modified) (2 diffs)
• validation_tests/analytical_exact/deep_wave/run_wave.py (modified) (1 diff)
• validation_tests/analytical_exact/subcritical_over_bump/produce_results.py (modified) (1 diff)
• validation_tests/case_studies/towradgi/Compare_results_with_fieldObs.py (modified) (3 diffs)
• validation_tests/case_studies/towradgi/results.tex (added)

trunk/anuga_core/source/anuga/structures/inlet.py

@@ -254 +254 @@
         """
 
+        assert volume >= 0.0
+
         areas = self.get_areas()
         stages = self.get_stages()
@@ -266 +268 @@
         summed_volume = num.zeros_like(areas)       
         summed_volume[1:] = num.cumsum(summed_areas[:-1]*num.diff(stages[stages_order]))
-
-
-        assert volume >= 0.0
-
 
         index = num.nonzero(summed_volume<=volume)[0][-1]

trunk/anuga_core/validation_tests/analytical_exact/deep_wave/run_wave.py

@@ -121 +121 @@
 #------------------------------------------------------------------------------
 
-for t in domain.evolve(yieldstep = 1e1, finaltime = 2e4):
+for t in domain.evolve(yieldstep = 10, finaltime = 2e4):
     domain.write_time()
     if interactive_visualisation:

trunk/anuga_core/validation_tests/analytical_exact/subcritical_over_bump/produce_results.py

@@ -4 +4 @@
 args = anuga.get_args()
 
-produce_report('numerical_supercritical.py', args=args)
+produce_report('numerical_subcritical.py', args=args)
 
 

trunk/anuga_core/validation_tests/case_studies/towradgi/Compare_results_with_fieldObs.py

@@ -5 +5 @@
 """
 import scipy
+import matplotlib
+matplotlib.use('Agg')
 from matplotlib import pyplot as pyplot
 from anuga.utilities import plot_utils as util
+import gdal
 
 
@@ -61 +64 @@
     print 'Making tifs'
     util.Make_Geotif(swwdir+swwname,
-                      ['depth','velocity','depthIntegratedVelocity','elevation'],'max',
+                      ['depth','velocity','depthIntegratedVelocity','elevation', 'friction'],'max',
                       CellSize=CellSize,EPSG_CODE=32756,output_dir=tif_outdir)
     print 'Made tifs'
@@ -70 +73 @@
 # Plot depth raster with discrepency between model and data
 depthFile=tif_outdir+'/Towradgi_historic_flood_depth_max.tif'
-myDepth=scipy.misc.imread(depthFile)
+#myDepth=scipy.misc.imread(depthFile)
+raster = gdal.Open(depthFile)
+myDepth = scipy.array(raster.ReadAsArray())
+
+
 X=scipy.arange(p.xllcorner, p.xllcorner+myDepth.shape[1]*CellSize, CellSize)
 Y=scipy.arange(p.yllcorner, p.yllcorner+myDepth.shape[0]*CellSize, CellSize)