Changeset 9156

Timestamp:

Jun 14, 2014, 11:44:13 PM (10 years ago)

Author:

steve

Message:

combined plot scripts

Location:

trunk/anuga_core/validation_tests/analytical_exact/parabolic_basin

Files:

• numerical_parabolic_basin.py (modified) (5 diffs)
• plot_results.py (added)
• produce_results.py (modified) (1 diff)

trunk/anuga_core/validation_tests/analytical_exact/parabolic_basin/numerical_parabolic_basin.py

@@ -5 +5 @@
 #--------
 import anuga
+from anuga import myid, finalize, distribute
 import numpy
 from math import sqrt, cos, sin, pi
@@ -22 +23 @@
 #start_screen_catcher(output_dir+'_')
 
-#-------------------------------------------------------------------------------
-# Domain
-#-------------------------------------------------------------------------------
+args = anuga.get_args()
+alg = args.alg
+verbose = args.v
+
 m = 200
 n = 10
@@ -31 +33 @@
 origin = (-20.0, -1.0)
 
-points, elements, boundary = anuga.rectangular_cross(m, n, lenx, leny, origin)
-domain = anuga.Domain(points, elements, boundary)
-domain.set_name(output_file)                
-domain.set_datadir(output_dir)
-#domain.set_minimum_allowed_height(0.01)
 
-
-#------------------------------------------------------------------------------
-# Setup Algorithm, either using command line arguments
-# or override manually yourself
-#------------------------------------------------------------------------------
-from anuga.utilities.argparsing import parse_standard_args
-alg, cfl = parse_standard_args()
-domain.set_flow_algorithm(alg)
-#domain.set_CFL(cfl)
-
-#------------------
-# Define topography
-#------------------
-
-# Parameters for analytical solution
-D0=4.0
-L=10.0
-A = 2.0
-
-def topography(x,y):
-        return  (D0/(L**2.))*x**2.
-
-def stage_init(x,y):
-    wat= D0 + (2.0*A*D0/L**2.)*(x-A/2.0) # Water elevation inside the parabola
-    top=topography(x,y) # Bed elevation
-    # Return the maximum of the water elevation and the bed elvation
-    return wat*(wat>top) + top*(wat<=top)
-
-
-domain.set_quantity('elevation',topography)     # Use function for elevation
-domain.set_quantity('friction',0.0)            # No friction
-domain.set_quantity('stage', stage_init)        # Constant negative initial stage
-
-
+#-------------------------------------------------------------------------------
+# Sequential Domain
+#-------------------------------------------------------------------------------
+if myid == 0:
+    points, elements, boundary = anuga.rectangular_cross(m, n, lenx, leny, origin)
+    domain = anuga.Domain(points, elements, boundary)
+    domain.set_name(output_file)                
+    domain.set_datadir(output_dir)
+    #domain.set_minimum_allowed_height(0.01)
+    
+    
+    
+    domain.set_flow_algorithm(alg)
+    
+    
+    #------------------
+    # Define topography
+    #------------------
+    
+    # Parameters for analytical solution
+    D0=4.0
+    L=10.0
+    A = 2.0
+    
+    def topography(x,y):
+            return  (D0/(L**2.))*x**2.
+    
+    def stage_init(x,y):
+        wat= D0 + (2.0*A*D0/L**2.)*(x-A/2.0) # Water elevation inside the parabola
+        top=topography(x,y) # Bed elevation
+        # Return the maximum of the water elevation and the bed elvation
+        return wat*(wat>top) + top*(wat<=top)
+    
+    
+    domain.set_quantity('elevation',topography)     # Use function for elevation
+    domain.set_quantity('friction',0.0)            # No friction
+    domain.set_quantity('stage', stage_init)        # Constant negative initial stage
+    
+else:
+    
+    domain = None
+    
+#--------------------------------------------------------------------
+# Parallel Domain
+#--------------------------------------------------------------------
+domain = distribute(domain)
+    
 #--------------------------
 # Setup boundary conditions
@@ -104 +114 @@
 # Produce a documentation of parameters
 #------------------------------------------------------------------------------
-parameter_file=open('parameters.tex', 'w')
-parameter_file.write('\\begin{verbatim}\n')
-from pprint import pprint
-pprint(domain.get_algorithm_parameters(),parameter_file,indent=4)
-parameter_file.write('\\end{verbatim}\n')
-parameter_file.close()
+if myid == 0:
+    parameter_file=open('parameters.tex', 'w')
+    parameter_file.write('\\begin{verbatim}\n')
+    from pprint import pprint
+    pprint(domain.get_algorithm_parameters(),parameter_file,indent=4)
+    parameter_file.write('\\end{verbatim}\n')
+    parameter_file.close()
 
 
@@ -116 +127 @@
 #------------------------------
 for t in domain.evolve(yieldstep=0.05,finaltime=10.0):
-    print domain.timestepping_statistics()
-print 'Finished'
+    if myid == 0: print domain.timestepping_statistics()
+
+domain.sww_merge(delete_old=True)
+
+finalize()
+
+
+
+

trunk/anuga_core/validation_tests/analytical_exact/parabolic_basin/produce_results.py

@@ -2 +2 @@
 # import modules
 #--------------------------------
-from anuga.validation_utilities.fabricate import *
-from anuga.validation_utilities import run_validation_script
-from anuga.validation_utilities import typeset_report
+import anuga
+from anuga.validation_utilities import produce_report
 
+args = anuga.get_args()
 
-# Setup the python scripts which produce the output for this
-# validation test
-def build():
-    run_validation_script('numerical_parabolic_basin.py')
-    run_validation_script('plot_results_cross_section.py')
-    run_validation_script('plot_results_origin_wrt_time.py')    
-    typeset_report()
-
-def clean():
-    autoclean()
-
-main()
+produce_report('numerical_parabolic_basin.py', args=args)