Changeset 5150 for anuga_work/production/geraldton/run_geraldton.py

Timestamp:

Mar 10, 2008, 4:00:52 PM (15 years ago)

Author:

nick

Message:

update geraldton

File:

• anuga_work/production/geraldton/run_geraldton.py (modified) (4 diffs)

anuga_work/production/geraldton/run_geraldton.py

@@ -168 +168 @@
     print 'domain id', id(domain)
     #print 'Reading Boundary file',project.boundaries_dir_namea + '.sww'
+    print'set_boundary'
+
+    Br = Reflective_boundary(domain)
+    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
+    Bo = Dirichlet_boundary([kwargs['tide']+5.0,0,0])
 
     if project.source != 'other':
@@ -173 +178 @@
                     domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'], 
                     use_cache=True, verbose=True)
-                    
-    kwargs['input_start_time']=domain.starttime
-
-    print 'finished reading boundary file'
-
-    Br = Reflective_boundary(domain)
-    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
-    Bo = Dirichlet_boundary([kwargs['tide']+5.0,0,0])
-
-
-    print'set_boundary'
-
-    domain.set_boundary({'back': Br,
-                         'side': Bd,
-                         'ocean': Bf}) 
+        print 'finished reading boundary file'
+        domain.set_boundary({'back': Br,
+                             'side': Bd,
+                             'ocean': Bf})
+    else: 
+        print 'set ocean'               
+        domain.set_boundary({'back': Br,
+                             'side': Bd,
+                             'ocean': Bd}) 
+
+#    kwargs['input_start_time']=domain.starttime
+
+
+
     print'finish set boundary'
 
@@ -195 +199 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['starttime']): 
+    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['finaltime']): 
         domain.write_time()
         domain.write_boundary_statistics(tags = 'ocean')     
 
-        if allclose(t, 120):
+        if allclose(t, 240):
             domain.set_boundary({'back': Br, 'side': Bd, 'ocean': Bo})
 
-        if allclose(t, 720):
+        if allclose(t, 1440):
             domain.set_boundary({'back': Br, 'side': Bd, 'ocean': Bd})
 
@@ -274 +278 @@
     
     kwargs['output_dir']=project.output_run_time_dir
-    kwargs['bathy_file']=project.combined_dir_name
-#    kwargs['bathy_file']=project.combined_small_dir_name + '.pts'
+#    kwargs['bathy_file']=project.combined_dir_name+'.txt'
+    kwargs['bathy_file']=project.combined_dir_name_small + '.txt'
     kwargs['boundary_file']=project.boundaries_in_dir_name + '.sww'
     kwargs['file_name']=project.home+'detail.csv'