Changeset 7877 for trunk/anuga_core

Timestamp:

Jun 29, 2010, 11:26:45 AM (15 years ago)

Author:

James Hudson

Message:

Moved all development files into trunk.

Location:

trunk/anuga_core

Files:

• benchmarks/benchmark_sww2dem.py (modified) (2 diffs)
• benchmarks/create_test_sww.py (modified) (2 diffs)
• documentation/user_manual/demos/cairns/ExportResults.py (modified) (2 diffs)
• source/anuga_parallel/parallel_advection.py (modified) (1 diff)
• source/anuga_parallel/parallel_shallow_water.py (modified) (1 diff)
• source/anuga_parallel/print_stats.py (modified) (1 diff)
• source/anuga_parallel/run_parallel_sw_rectangle.py (modified) (1 diff)
• source/anuga_parallel/test_parallel.py (modified) (2 diffs)
• source/anuga_parallel/test_parallel_distribute_domain.py (modified) (1 diff)

trunk/anuga_core/benchmarks/benchmark_sww2dem.py

@@ -4 +4 @@
 """
 
-from anuga.file_conversion.sww2dem import sww2dem
-from create_test_sww import create_test_sww
+import anuga
 import os.path
 import cProfile
 import time
 
+from create_test_sww import create_test_sww
 
 sww_name = 'test.sww'
@@ -16 +16 @@
         # do export to DEM
 
-        sww2dem(sww_name,
+        anuga.sww2dem(sww_name,
                         name_out='sww2dem_out.asc',
-                        quantity='stage',
+                        quantity='xmomentum',
                         cellsize=0.25,      
                         easting_min=0,

trunk/anuga_core/benchmarks/create_test_sww.py

@@ -9 +9 @@
         # Setup computational domain
         #------------------------------------------------------------------------------
-        points, vertices, boundary = anuga.rectangular_cross(50, 50,
+        points, vertices, boundary = anuga.rectangular_cross(5, 5,
                                                                                                    len1=50.0, len2=50.0) # Mesh
 
@@ -19 +19 @@
         #------------------------------------------------------------------------------
         def topography(x, y):
-                return -x/20                             # linear bed slope
+                return -x/2                             # linear bed slope
 
         domain.set_quantity('elevation', topography) # Use function for elevation

trunk/anuga_core/documentation/user_manual/demos/cairns/ExportResults.py

@@ -9 +9 @@
 
 print 'output dir:', name
-which_var = 4
+which_var = 3
 
 if which_var == 0:    # Stage
@@ -34 +34 @@
 
 anuga.sww2dem(name+'.sww',
-        outname+'.ers',
+        outname+'.asc',
         quantity=quantityname,
         cellsize=100,      

trunk/anuga_core/source/anuga_parallel/parallel_advection.py

@@ -15 +15 @@
 from anuga.advection import *
 
+from anuga import Domain
 
 import numpy as num

trunk/anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -12 +12 @@
 """
 
-from anuga.interface import Domain
+from anuga import Domain
 
 

trunk/anuga_core/source/anuga_parallel/print_stats.py

@@ -21 +21 @@
 import pypar
 
-from Numeric import array, Int8, zeros, ones, take, nonzero, Float
+from numpy import array, zeros, ones, take, nonzero, float
 from anuga.utilities.norms import l1_norm, l2_norm, linf_norm
 

trunk/anuga_core/source/anuga_parallel/run_parallel_sw_rectangle.py

@@ -23 +23 @@
 # Sequential interface
 #---------------------------
-from anuga.interface import Domain
-from anuga.interface import Transmissive_boundary, Reflective_boundary
+from anuga import Domain
+from anuga import Transmissive_boundary, Reflective_boundary
 
 #----------------------------

trunk/anuga_core/source/anuga_parallel/test_parallel.py

@@ -6 +6 @@
 from math import sqrt
 
-
-
-
-
-from anuga.interface import Domain
-from anuga.interface import rectangular_cross
+import anuga
 
 from anuga_parallel.distribute_mesh import pmesh_divide_metis
@@ -74 +69 @@
         if myid == 0:
 
-            points, vertices, boundary = rectangular_cross(2,2)
-
-            domain = Domain(points, vertices, boundary)
+            points, vertices, boundary = anuga.rectangular_cross(2,2)
+
+            domain = anuga.Domain(points, vertices, boundary)
 
 

trunk/anuga_core/source/anuga_parallel/test_parallel_distribute_domain.py

@@ -25 +25 @@
 from anuga.utilities.norms           import l1_norm, l2_norm, linf_norm
 
-from anuga.interface import Domain
-from anuga.interface import Reflective_boundary
-from anuga.interface import Dirichlet_boundary
-from anuga.interface import Time_boundary
-from anuga.interface import Transmissive_boundary
-
-from anuga.interface import rectangular_cross
-from anuga.interface import create_domain_from_file
+from anuga import Domain
+from anuga import Reflective_boundary
+from anuga import Dirichlet_boundary
+from anuga import Time_boundary
+from anuga import Transmissive_boundary
+
+from anuga import rectangular_cross
+from anuga import create_domain_from_file