Changeset 9376

Timestamp:

Dec 8, 2014, 6:20:17 PM (10 years ago)

Author:

steve

Message:

Changing calling argument of simulation

Location:

trunk/anuga_core/validation_tests/case_studies/towradgi

Files:

• run_simulation.py (modified) (1 diff)
• simulation.py (modified) (6 diffs)

trunk/anuga_core/validation_tests/case_studies/towradgi/run_simulation.py

@@ -4 +4 @@
 from os.path import join
 
-
-
-args = anuga.get_args()
-alg = args.alg
-verbose = args.verbose
+from setup_boundaries import setup_boundaries
+from setup_domain import setup_domain
+from setup_rainfall import setup_rainfall
+from setup_structures import setup_structures
 
 
 
-towradgi = Simulation()
+#args = anuga.get_args()
+#alg = args.alg
+#verbose = args.verbose
+
+
+
+towradgi = Simulation(setup_domain=setup_domain, 
+                      setup_boundaries=setup_boundaries,
+                      setup_rainfall=setup_rainfall,
+                      setup_structures=setup_structures)
 
 towradgi.run()

trunk/anuga_core/validation_tests/case_studies/towradgi/simulation.py

@@ -31 +31 @@
 class Simulation(object):
     
-    def __init__(self,argument_adder=None, from_commandline=True, **kwargs):
+    def __init__(self,argument_adder=None, from_commandline=True, 
+                 setup_boundaries=None,
+                 setup_domain=None, 
+                 setup_rainfall=None,
+                 setup_structures=None,
+                 **kwargs):
         
         args = parse_args_and_parameters(argument_adder, from_commandline, **kwargs)
@@ -45 +50 @@
         self.checkpoint = args.checkpoint
         self.checkpoint_time = args.checkpoint_time
+        
+        self.setup_boundaries = setup_boundaries
+        self.setup_domain = setup_domain
+        self.setup_rainfall = setup_rainfall
+        self.setup_structures = setup_structures
         
         if self.checkpoint:
@@ -137 +147 @@
                 if verbose: print 'Saved domain seems to already exist'
             else:
-                from setup_domain import setup_domain
-                domain = setup_domain(self)
+                domain = self.setup_domain(self)
                 
                 if verbose: print 'Saving Domain'
@@ -175 +184 @@
         
         if myid == 0 and self.verbose: print 'CREATING RAINFALL FUNCTIONS'
-        from setup_rainfall import setup_rainfall
-        
-        setup_rainfall(self) 
+        
+        if self.setup_rainfall is None:
+            pass
+        else:
+            self.setup_rainfall(self) 
 
     def setup_structures(self):
@@ -185 +196 @@
         
         if myid == 0 and self.verbose: print 'CREATING STRUCTURES'
-        from setup_structures import setup_structures
-        
-        setup_structures(self)
+        
+        if self.setup_structures is None:
+            pass
+        else:
+            self.setup_structures(self)
    
     def setup_boundaries(self):
@@ -195 +208 @@
         
         if myid == 0 and self.verbose: print 'SETUP BOUNDARY CONDITIONS'
-        from setup_boundaries import setup_boundaries
-        
-        setup_boundaries(self)
+
+        if self.setup_boundaries is None:
+            pass
+        else:
+            self.setup_boundaries(self)