Changeset 9403

Timestamp:

Jan 14, 2015, 10:20:39 AM (10 years ago)

Author:

steve

Message:

Zip barthymetry file

Location:

trunk/anuga_core/validation_tests/experimental_data/okushiri

Files:

• Benchmark_2_Bathymetry.pts (modified) (previous)
• Benchmark_2_Bathymetry.zip (added)
• create_okushiri.py (modified) (2 diffs)
• plot_results.py (modified) (1 diff)
• project.py (modified) (1 diff)

trunk/anuga_core/validation_tests/experimental_data/okushiri/create_okushiri.py

@@ -159 +159 @@
     prepare_timeboundary(project.boundary_filename, verbose)
 
+    
 
+    
 
     meshname = project.mesh_filename + '.msh'
@@ -175 +177 @@
     if elevation_in_mesh is True:
         from anuga.fit_interpolate.fit import fit_to_mesh_file
+
+
+        if verbose: print 'Reading xya from zip'
+        import zipfile as zf
+        zf.ZipFile(project.bathymetry_filename_stem+'.zip').\
+          extract(project.bathymetry_filename_stem+'.xya')
+
+        if verbose: print 'Reading pts from xya'
+        anuga.xya2pts(project.bathymetry_filename_stem+'.pts', verbose = verbose)
+        
         fit_to_mesh_file(project.mesh_filename, project.bathymetry_filename,
                          project.mesh_filename, verbose = verbose)

trunk/anuga_core/validation_tests/experimental_data/okushiri/plot_results.py

@@ -37 +37 @@
 
 try:
-    from matplotlib import pyplot
-    from pyplot import ion, hold, plot, title, legend
-    from pyplot import xlabel, ylabel, savefig
+    import matplotlib
+    from matplotlib.pyplot import ion, hold, plot, title, legend
+    from matplotlib.pyplot import xlabel, ylabel, savefig
     hold(False)  # Check if this command can be issued
 except:

trunk/anuga_core/validation_tests/experimental_data/okushiri/project.py

@@ -11 +11 @@
 
 # Digital Elevation Model
-bathymetry_filename = 'Benchmark_2_Bathymetry.pts'
+bathymetry_filename_stem = 'Benchmark_2_Bathymetry'
+bathymetry_filename = bathymetry_filename_stem + '.pts'
 
 # Triangular mesh