Changeset 2957 for development/stochastic_study

Timestamp:

May 24, 2006, 2:35:03 PM (18 years ago)

Author:

ole

Message:

Using new interface to interpolation function and some restructuring

Location:

development/stochastic_study

Files:

• project.py (modified) (1 diff)
• run_model.py (modified) (3 diffs)

development/stochastic_study/project.py

@@ -9 +9 @@
 basename = 'simulation'
 mesh_filename = basename + '.msh'
+
+
+# Gauges (3 timeseries (Ch 5-7-9))
+gauges = [[4.521, 1.196],  [4.521, 1.696],  [4.521, 2.196]] 
+gauge_names = ['ch5', 'ch7', 'ch9']
+
 
 # Stats (Suresh ?)

development/stochastic_study/run_model.py

@@ -57 +57 @@
 print domain.statistics()
 
-import sys; sys.exit()
-
 
 domain.set_datadir('.')
@@ -88 +86 @@
 finaltime = 22.5
 timestep = 0.05
-
 
 
@@ -124 +121 @@
             # Now extract the 3 timeseries (Ch 5-7-9) and store them
             # in three files for this realisation
-            gauges = [[4.521, 1.196],  [4.521, 1.696],  [4.521, 2.196]] 
-            gauge_names = ['ch5', 'ch7', 'ch9']
-
-            
             f = file_function(domain.filename + '.sww',
                               quantities='stage',
-                              interpolation_points=gauges,
-                              verbose = True)
+                              interpolation_points=project.gauges,
+                              verbose=True)
 
 
             simulation_name = domain.filename + '_realisation_%d' %realisation
 
-            for k, name in enumerate(gauge_names):
+            for k, name in enumerate(project.gauge_names):
                 fid = open(simulation_name + '_' + name + '.txt', 'w')
-                for t in f.T:
+                for t in f.get_time():
                     #For all precomputed timesteps
                     val = f(t, point_id = k)[0]