Changeset 6750

Timestamp:

Apr 7, 2009, 3:50:57 PM (16 years ago)

Author:

ole

Message:

Reverted 'do not evolve' code in patong simulation.
It didn't work and is not desirable for this model.

File:

• anuga_work/production/patong/new_version/run_model.py (modified) (3 diffs)

anuga_work/production/patong/new_version/run_model.py

@@ -21 +21 @@
 
 # Standard modules
-import sys
 import os
 import os.path
@@ -49 +48 @@
 from setup_model import project
 import build_urs_boundary as bub
-
-
-#-------------------------------------------------------------------------------
-# Examine args - look for switches to control execution
-# 
-# We expect:
-#   -n --no-evolve  Stop after writing cached data - don't enter evolve loop
-#-------------------------------------------------------------------------------
-
-##
-# @brief Return a usage string.
-def usage():
-    '''Return a 'usage' string.'''
-
-    return '''Usage: run_model.py [<options>]
-where <options> is one or more of:
-                  --help       print this help
-                  --no-evolve  quit after creating cache data
-'''
-
-
-try:
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hn', ['help', 'no-evolve'])
-    except getopt.error, msg:
-        raise RuntimeError, Usage(msg)
-except Usage, err:
-    print >>sys.stderr, err.msg
-    print >>sys.stderr, "for help use --help"
-    sys.exit(2)
-
-# process options
-DoEvolve = True
-for opt, arg in opts:
-    if opt in ('-h', '--help'):
-        print usage()
-        sys.exit(0)
-    elif opt in ('-n', '--no-evolve'):
-        DoEvolve = False
 
 #-------------------------------------------------------------------------------
@@ -233 +193 @@
 #-------------------------------------------------------------------------------
 
-if DoEvolve:
-    t0 = time.time()
-
-    # Skip over the first 6000 seconds
-    for t in domain.evolve(yieldstep=2000,
-                           finaltime=6000):
-        print domain.timestepping_statistics()
-        print domain.boundary_statistics(tags='ocean')
-
-    # Start detailed model
-    for t in domain.evolve(yieldstep=project.yieldstep,
-                           finaltime=project.finaltime,
-                           skip_initial_step=True):
-        print domain.timestepping_statistics()
-        print domain.boundary_statistics(tags='ocean')
-else:
-    print 'Model not evolved, as requested'
-
+t0 = time.time()
+
+# Skip over the first 6000 seconds
+for t in domain.evolve(yieldstep=2000,
+                       finaltime=6000):
+    print domain.timestepping_statistics()
+    print domain.boundary_statistics(tags='ocean')
+
+# Start detailed model
+for t in domain.evolve(yieldstep=project.yieldstep,
+                       finaltime=project.finaltime,
+                       skip_initial_step=True):
+    print domain.timestepping_statistics()
+    print domain.boundary_statistics(tags='ocean')
+    
 print 'Simulation took %.2f seconds' %(time.time()-t0)
+