Changeset 7877 for trunk/anuga_work

Timestamp:

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

Author:

James Hudson

Message:

Moved all development files into trunk.

Location:

trunk/anuga_work

Files:

• . (copied) (copied from anuga_work)
• development/classroom/ripcurrent.py (copied) (copied from anuga_work/development/classroom/ripcurrent.py)
• production/australia_ph2/perth/project.py (modified) (2 diffs)
• production/australia_ph2/perth/setup_model.py (modified) (1 diff)
• production/new_south_wales/batemans_bay/setup_model.py (modified) (1 diff)
• production/tweed_heads/project.py (modified) (3 diffs)
• production/tweed_heads/setup_model.py (modified) (1 diff)

trunk/anuga_work/production/australia_ph2/perth/project.py

@@ -41 +41 @@
 starttime=0             # start time for simulation
 finaltime=60000 # final time for simulation
-setup = 'final_30'         # This can be one of three values
+setup = 'trial'         # This can be one of three values
                         #    trial - coarsest mesh, fast
                         #    basic - coarse mesh
@@ -186 +186 @@
 
 # create paths generated from environment variables.
+print os.getenv(ENV_INUNDATIONHOME)
 home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
 muxhome = os.getenv(ENV_MUXHOME)

trunk/anuga_work/production/australia_ph2/perth/setup_model.py

@@ -10 +10 @@
 
 from os.path import join, exists
-from anuga.utilities.polygon import read_polygon, number_mesh_triangles
+from anuga.geometry.polygon import read_polygon, number_mesh_triangles
 
 import project

trunk/anuga_work/production/new_south_wales/batemans_bay/setup_model.py

@@ -10 +10 @@
 
 from os.path import join, exists
-from anuga.utilities.polygon import read_polygon, number_mesh_triangles
+from anuga.geometry.polygon import read_polygon, number_mesh_triangles
 
 import project

trunk/anuga_work/production/tweed_heads/project.py

@@ -32 +32 @@
 finaltime=100         # final time for simulation
 
-setup = 'final'         # This can be one of three values
+setup = 'trial'         # This can be one of three values
                         #    trial - coarsest mesh, fast
                         #    basic - coarse mesh
@@ -143 +143 @@
 # Environment variable names.
 # The inundation directory, not the data directory.
-ENV_INUNDATIONHOME = 'INUNDATIONHOME'
+ENV_INUNDATIONHOME = '/home/james/Projects/anuga/anuga_work/production'
 
 # Path to MUX data
-ENV_MUXHOME = 'MUXHOME'
+ENV_MUXHOME = '/home/james/Projects/anuga/anuga_work/production'
 
 #-------------------------------------------------------------------------------
@@ -167 +167 @@
 
 # create paths generated from environment variables.
-home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
-muxhome = os.getenv(ENV_MUXHOME)
+home = ENV_INUNDATIONHOME # Absolute path for data folder
+muxhome = ENV_MUXHOME
     
 # check various directories/files that must exist

trunk/anuga_work/production/tweed_heads/setup_model.py

@@ -10 +10 @@
 
 from os.path import join, exists
-from anuga.utilities.polygon import read_polygon, number_mesh_triangles
-from anuga.shallow_water.data_manager import csv2polygons
+from anuga.geometry.polygon import read_polygon, number_mesh_triangles
+from anuga.file.csv_file import load_csv_as_polygons as csv2polygons
 import project