Changeset 2425

Timestamp:

Feb 17, 2006, 6:42:25 PM (19 years ago)

Author:

ole

Message:

Work on stochastic_study and okushiri_2005

Location:

development

Files:

• okushiri_2005/create_mesh.py (modified) (1 diff)
• okushiri_2005/lwru2.py (modified) (1 diff)
• stochastic_study/create_mesh.py (modified) (2 diffs)
• stochastic_study/extract_timeseries.py (modified) (3 diffs)

development/okushiri_2005/create_mesh.py

@@ -133 +133 @@
     m.generateMesh('pzq28.0za1000000a')
 
-    import filenames
-    m.export_mesh_file(filenames.mesh_filename)
+    import project
+    m.export_mesh_file(project.mesh_filename)
     

development/okushiri_2005/lwru2.py

@@ -11 +11 @@
 
 
-#use_variable_mesh = True #Use large variable mesh generated by create_mesh.py
-use_variable_mesh = False #Use small structured mesh for speed
+use_variable_mesh = True #Use large variable mesh generated by create_mesh.py
+#use_variable_mesh = False #Use small structured mesh for speed
 
 

development/stochastic_study/create_mesh.py

@@ -115 +115 @@
     
     base_resolution = 1
-    #base_resolution = 10    
+    base_resolution = 10    
 
     ocean = m.addRegionEN(xleft+.1, ybottom+.1)
@@ -121 +121 @@
 
     mid = m.addRegionEN(point_mbottom[0]+.1, ybottom+.1)
-    #mid.setMaxArea(0.0005*base_resolution)
-    mid.setMaxArea(0.005*base_resolution)    
-    
+    mid.setMaxArea(0.0005*base_resolution)
 
     inner = m.addRegionEN(island_3[0]+.1, island_3[1]+.1)

development/stochastic_study/extract_timeseries.py

@@ -5 +5 @@
 from os import sep
 from caching import cache
+import project
 
 sys.path.append('..'+sep+'..'+sep)
@@ -21 +22 @@
 
 #Input wave
-filename = 'Benchmark_2_input.tms'
+filename = 'input_wave.tms'
 print 'Reading', filename
 from Scientific.IO.NetCDF import NetCDFFile
@@ -60 +61 @@
 
 #Read model output
-#filename = 'output.sww'
-filename = 'lwru2.sww'
-#filename = 'lwru2_.05s.sww'
+filename = project.basename + '.sww'
 
-#f = file_function(filename,
-#                  quantities = 'stage',
-#                  interpolation_points = gauges,
-#                  verbose = True)
-
-f = cache(file_function,filename,
+f = cache(file_function, filename,
           {'quantities': 'stage',
            'interpolation_points': gauges,