Changeset 3916

Timestamp:

Nov 3, 2006, 5:16:40 PM (18 years ago)

Author:

ole

Message:

Second stab at automatic validation using okushiri data

Location:

anuga_validation/automated_validation_tests/okushiri_tank_validation

Files:

• compare_timeseries_with_measures.py (added)
• create_okushiri.py (modified) (9 diffs)
• project.py (modified) (1 diff)
• run_okushiri.py (added)
• validate_okushiri.py (deleted)

anuga_validation/automated_validation_tests/okushiri_tank_validation/create_okushiri.py

@@ -8 +8 @@
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.coordinate_transforms.geo_reference import Geo_reference
+from anuga.geospatial_data import Geospatial_data
 
 import project
@@ -13 +14 @@
 
 def prepare_timeboundary(filename):
-    """Converting benchmark 2 time series to NetCDF tms file.
+    """Convert benchmark 2 time series to NetCDF tms file.
     This is a 'throw-away' code taylor made for files like
     'Benchmark_2_input.txt' from the LWRU2 benchmark
     """
 
-    print 'Preparing time boundary from %s' %filename
+    from Scientific.IO.NetCDF import NetCDFFile
     from Numeric import array
 
-    fid = open(filename)
 
-    #Skip first line
+    print 'Creating', filename
+
+    # Read the ascii (.txt) version of this file
+    fid = open(filename[:-4] + '.txt')
+
+    # Skip first line
     line = fid.readline()
 
-    #Read remaining lines
+    # Read remaining lines
     lines = fid.readlines()
     fid.close()
@@ -42 +47 @@
 
 
-    #Create tms file
-    from Scientific.IO.NetCDF import NetCDFFile
+    # Create tms NetCDF file
 
-    outfile = filename[:-4] + '.tms'
-    print 'Writing to', outfile
-    fid = NetCDFFile(outfile, 'w')
-
+    fid = NetCDFFile(filename, 'w')
     fid.institution = 'Geoscience Australia'
     fid.description = 'Input wave for Benchmark 2'
@@ -71 +72 @@
 if __name__ == "__main__":
 
+
     # Prepare time boundary
     prepare_timeboundary(project.boundary_filename)
@@ -82 +84 @@
     #--------------------------------------------------------------------------
 
-    base_resolution = 10
 
-    # Basic geometry
+    base_resolution = 1 # Use this to coarsen or refine entire mesh. 
+
+    # Basic geometry and bounding polygon
     xleft   = 0
     xright  = 5.448
@@ -90 +93 @@
     ytop    = 3.402
 
-    # Outline 
     point_sw = [xleft, ybottom]
     point_se = [xright, ybottom]
@@ -96 +98 @@
     point_ne = [xright, ytop]
 
-    # Midway points (left)
-    point_mtop = [xleft + (xright-xleft)/3+1, ytop]
-    point_mbottom = [xleft + (xright-xleft)/3+1, ybottom]
+    bounding_polygon = [point_se,
+                        point_ne,
+                        point_nw,
+                        point_sw]
+    
 
-    #Localised refined area for gulleys
+    # Localised refined area for gulleys
     xl = 4.8
     xr = 5.3
@@ -109 +113 @@
     p2 = [xr, yt]
     p3 = [xl, yt]
+    
     gulleys = [p0, p1, p2, p3]
+    
 
-    #Island area
+
+    # Island area and drawdown region
     island_0 = [xleft + 2*(xright-xleft)/3+1.2, ytop-0.5]
     island_1 = [xleft + 2*(xright-xleft)/3+0.5, ybottom + 2*(ytop-ybottom)/3]
-    island_2 = [xleft + (xright-xleft)/2+0.3, ybottom + 2*(ytop-ybottom)/3-0.3]
-    island_3 = [xleft + (xright-xleft)/2+0.3, ybottom + (ytop-ybottom)/3+0.3]
+    island_2 = [xleft + (xright-xleft)/2+0.4, ybottom + 2*(ytop-ybottom)/3-0.3]
+    island_3 = [xleft + (xright-xleft)/2+0.4, ybottom + (ytop-ybottom)/3+0.3]
     island_4 = [xleft + 2*(xright-xleft)/3+0.4, ybottom + (ytop-ybottom)/3-0.3]
-    island_5 = [xleft + 2*(xright-xleft)/3+1.2, ybottom+0.2]
-    island_6 = [xl-.01, yb]  #OK
-    island_7 = [xl-.01, yt]  #OK      
-
+    island_5 = [xleft + 2*(xright-xleft)/3+1.2, ybottom+0.8]
+    island_6 = [xl-.01, yb]  # Keep right edge just off the gulleys
+    island_7 = [xl-.01, yt]
+ 
     island = [island_0, island_1, island_2,
               island_3, island_4, island_5,
@@ -126 +133 @@
 
 
-    
 
-    bounding_polygon = [point_se,
-                        point_ne,
-                        point_mtop,
-                        point_nw,
-                        point_sw,
-                        point_mbottom]
-    
+    # Region spanning half right hand side of domain just inside boundary
+    rhs_nw = [xleft + (xright-xleft)/3+1, ytop-1.4]
+    rhs_sw = [xleft + (xright-xleft)/3+1, ybottom+0.5]
+    rhs_se = [xright-0.1, ybottom+0.2]
+    rhs_ne = [xright-0.1, ytop-0.2]        
 
-    interior_regions = [[gulleys, 0.00002*base_resolution],
-                        [island, 0.00007*base_resolution]]
-    
-
+    rhs_region = [rhs_nw, rhs_ne, rhs_se, rhs_sw]
 
     
-
-    print 'start create mesh from regions'
+    # Interior regions and creation of mesh
+    interior_regions = [[rhs_region, 0.0005],
+                        [island, 0.0003*base_resolution],
+                        [gulleys, 0.00003*base_resolution]]    
 
     meshname = project.mesh_filename + '.msh'
     m = create_mesh_from_regions(bounding_polygon,
-                                 boundary_tags={'wall': [0, 1, 2, 4, 5],
-                                                'wave': [3]},
+                                 boundary_tags={'wall': [0, 1, 3],
+                                                'wave': [2]},     
                                  maximum_triangle_area=0.1*base_resolution,
                                  interior_regions=interior_regions,
                                  filename=project.mesh_filename,
-                                 use_cache=True,
+                                 use_cache=False,
                                  verbose=True)
 

anuga_validation/automated_validation_tests/okushiri_tank_validation/project.py

@@ -1 @@
-"""Common filenames for LWRU benchmark project 2
+"""Common filenames for Okushiri Island validation
+Formats are given as ANUGA native netCDF where applicable.
+
 """
 
-boundary_filename = 'Benchmark_2_input.txt'
-bathymetry_filename = 'Benchmark_2_Bathymetry.txt'
+# Given boundary wave
+boundary_filename = 'Benchmark_2_input.tms'
+
+# Observed timeseries
+validation_filename = 'output_ch5-7-9.txt'
+
+# Digital Elevation Model
+bathymetry_filename = 'Benchmark_2_Bathymetry.pts'
+
+# Triangular mesh
 mesh_filename = 'Benchmark_2.msh'
+
+# Model output
+output_filename = 'okushiri_auta_validation.sww'