Changeset 8225

Timestamp:

Oct 14, 2011, 11:55:11 AM (13 years ago)

Author:

steve

Message:

Committing changes

Location:

trunk

Files:

• anuga_core/source/anuga_parallel/INSTALL-README (modified) (4 diffs)
• anuga_core/source/anuga_parallel/run_parallel_sw_merimbula_profile.py (modified) (2 diffs)
• anuga_validation/validation_tests/periodic_carrier_greenspan.py (modified) (1 diff)
• anuga_work/development/2010-projects/anuga_1d/sww/sww_domain.py (modified) (1 diff)

trunk/anuga_core/source/anuga_parallel/INSTALL-README

@@ -4 +4 @@
 =========================
 
+anuga_parallel
+==============
+
+Well first you need to get the anuga_parallel code. You can get this from
+our svn repository with userid anonymous (blank password)
+
+The location is
+
+https://anuga.anu.edu.au/svn/anuga/trunk/anuga_core/source/anuga_parallel
+
+(By the way, the most recent version of the development code of anuga
+is available at
+
+https://anuga.anu.edu.au/svn/anuga/trunk/anuga_core/source/anuga
+)
+
+Setup your PYTHONPATH to point to location of the source directory
+
+For instance I havethe following line in my .bashrc file
+
+export PYTHONPATH=/home/steve/anuga/anuga_core/source
+
+
+
 MPI
 ===
 
-First thing, you need to install MPI on your system. OPENMPI and MPICH2 
+Now you need to install MPI on your system. OPENMPI and MPICH2
 are supported by pypar (see below) so both should be ok. 
 
@@ -27 +51 @@
 
 (There is an old version on sourceforge
-http://sourceforge.net/projects/pypar/)
+http://sourceforge.net/projects/pypar/ don't use that)
 
-Install pypar following the instructions in hte download. Should be able
-use standard python setup.py install
+Install pypar following the instructions in the download. Should be able
+use standard command
+
+python setup.py install
+
+or maybe
+
+sudo python setup.py install
+
 
 Make sure the pypar examples work
@@ -42 +73 @@
 Follow the instructions in README to install. Essentially just run make.
 
-From the pymetis directory, test using test_all.py
+If you have a 64 bit machine run
+
+make COPTIONS="-fPIC"
+
+From the pymetis directory, test using test_all.py, ie
+
+python test_all.py
 
 ANUGA_PARALLEL
@@ -55 +92 @@
 Run run_parallel_sw_merimbula.py
 
-First just run it a sequential program. 
+First just run it as a sequential program, via
+
+python run_parallel_sw_merimbula.py
 
 Then try a parallel run using a command like

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_merimbula_profile.py

@@ -42 +42 @@
 #--------------------------------------------------------------------------
 
-mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
-#mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
+#mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
+mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
 #mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
-yieldstep = 5
+
 finaltime = 50
+yieldstep = finaltime
 verbose = True
 
@@ -125 +126 @@
     p.sort_stats('time').print_stats(25)
 
-    p.print_callers(.5, 'init')
 
 

trunk/anuga_validation/validation_tests/periodic_carrier_greenspan.py

@@ -40 +40 @@
 # Setup domain
 #------------------------------------------------------------------------------
-dx = 1000.
+dx = 100.
 dy = dx
 L = 40000.

trunk/anuga_work/development/2010-projects/anuga_1d/sww/sww_domain.py

@@ -158 +158 @@
 
 
-        from anuga_1d.sww.sww_comp_flux_ext import compute_fluxes_ext_short
-
-        #self.flux_timestep = compute_fluxes_ext(timestep,self,stage,xmom,bed,height,velocity)
-
-    
-        self.flux_timestep = compute_fluxes_ext_short(timestep,self,stage,xmom,bed)
+        #from anuga_1d.sww.sww_comp_flux_ext import compute_fluxes_ext_short as comp_flux_ext
+        #self.flux_timestep = comp_flux_ext(timestep,self,stage,xmom,bed)
+
+        from anuga_1d.sww.sww_vel_comp_flux_ext import compute_fluxes_vel_ext as comp_flux_ext
+        self.flux_timestep = comp_flux_ext(timestep,self,stage,xmom,bed,height,velocity)
+
+