Changeset 3567

Timestamp:

Sep 12, 2006, 5:30:58 PM (17 years ago)

Author:

ole

Message:

More heavy handed restructuring towards the agreed formats.

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/run_profile.py (modified) (1 diff)
• anuga_core/source/anuga/abstract_2d_finite_volumes/run_profile2.py (modified) (1 diff)
• anuga_core/source/anuga/abstract_2d_finite_volumes/test_all.py (modified) (1 diff)
• anuga_core/source/anuga/advection/advection.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/advection.py)
• anuga_core/source/anuga/advection/test_advection.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/test_advection.py)
• anuga_core/source/anuga/damage_modelling (moved) (moved from anuga_core/source/anuga/damage)
• anuga_core/source/anuga/damage_modelling/test_inundation_damage.py (modified) (1 diff)
• anuga_core/source/anuga/examples/twolevels.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/twolevels.py)
• anuga_core/source/anuga/shallow_water/test_most2nc.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/test_most2nc.py)
• anuga_core/source/obsolete_code/doit.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/doit.py)
• anuga_core/source/obsolete_code/normalDate.py (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/normalDate.py)
• anuga_core/source/obsolete_code/version.txt (moved) (moved from anuga_core/source/anuga/abstract_2d_finite_volumes/version.txt)
• anuga_validation (added)
• anuga_validation/okushiri_2005 (moved) (moved from development/okushiri_2005)
• anuga_validation/performance_tests (added)

anuga_core/source/anuga/abstract_2d_finite_volumes/run_profile.py

@@ -6 +6 @@
 ######################
 # Module imports
-from shallow_water import Domain, Reflective_boundary
+from anuga.shallow_water import Domain, Reflective_boundary
 from mesh_factory import rectangular
 from Numeric import array

anuga_core/source/anuga/abstract_2d_finite_volumes/run_profile2.py

@@ -11 +11 @@
 # Module imports 
 #
-from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
-     Transmissive_boundary, Time_boundary,\
-     Weir_simple as Weir, Constant_height
+from anuga.shallow_water import Domain, Reflective_boundary,\
+     Dirichlet_boundary,\
+     Transmissive_boundary, Time_boundary
+
+from anuga.shallow_water.shallow_water_domain\
+     import Weir_simple as Weir, Constant_height
 
 from mesh_factory import rectangular

anuga_core/source/anuga/abstract_2d_finite_volumes/test_all.py

@@ -15 +15 @@
 #List files that should be excluded from the testing process.
 #E.g. if they are known to fail and under development
-exclude = ['test_interpolate_sww.py'] 
+exclude = [] 
 
 

anuga_core/source/anuga/damage_modelling/test_inundation_damage.py

@@ -9 +9 @@
 
 #from anuga.damage.inundation_damage import _calc_collapse_structures
-from anuga.damage.inundation_damage import *
+from inundation_damage import *
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.pmesh.mesh import Mesh