Changeset 7567

Timestamp:

Nov 24, 2009, 3:25:22 PM (15 years ago)

Author:

ole

Message:

Got rid of environment variables and move log file to output dir.
The logging module will need some work, though.

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• project.py (modified) (1 diff)
• run_model.py (modified) (3 diffs)
• setup_model.py (modified) (1 diff)
• validate.py (modified) (1 diff)

anuga_validation/automated_validation_tests/patong_beach_validation/project.py

@@ -192 +192 @@
 
 # create paths generated from environment variables.
-home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
-muxhome = os.getenv(ENV_MUXHOME)
-    
+#home = join(os.getenv(ENV_INUNDATIONHOME), 'data') # Absolute path for data folder
+#muxhome = os.getenv(ENV_MUXHOME)
+
+output_dirname = os.path.dirname(__file__)
+home = os.path.join(output_dirname, 'local_data', 'data')
+muxhome = home # FIXME (Ole): Get rid off
+
 # check various directories/files that must exist
 anuga_folder = join(home, state, scenario_folder, 'anuga')

anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

@@ -28 +28 @@
 # Related major packages
 from Scientific.IO.NetCDF import NetCDFFile
-#import numpy as num
 
 from anuga.interface import create_domain_from_regions
@@ -45 +44 @@
 from anuga.caching import cache
 
+import project
 import anuga.utilities.log as log
+
+#-------------------------------------------------------------------------------
+# Copy scripts to time stamped output directory and capture screen
+# output to file. Copy script must be before screen_catcher
+#-------------------------------------------------------------------------------
+
+# Make output dir and set log filename before anything is logged
+os.mkdir(project.output_run)
+# Tell log module to store log file in output dir
+log.log_filename = os.path.join(project.output_run, 'anuga.log')
+log.critical('Log filename: %s' % log.log_filename)
+
+
+output_dirname = os.path.dirname(project.__file__)
+copy_code_files(project.output_run,
+                [__file__, 
+                 os.path.join(output_dirname, project.__name__+'.py'),
+                 os.path.join(output_dirname, 'setup_model.py')],
+                verbose=True
+                )
 
 # Application specific imports
@@ -51 +71 @@
 import build_urs_boundary as bub
 
-#-------------------------------------------------------------------------------
-# Copy scripts to time stamped output directory and capture screen
-# output to file. Copy script must be before screen_catcher
-#-------------------------------------------------------------------------------
-
-copy_code_files(project.output_run,
-                [__file__, 
-                 os.path.join(os.path.dirname(project.__file__),
-                              project.__name__+'.py'),
-                 os.path.join(os.path.dirname(project.__file__),
-                              'setup_model.py')],
-                verbose=True
-               )
-#start_screen_catcher(project.output_run, 0, 1)
 
 #-------------------------------------------------------------------------------

anuga_validation/automated_validation_tests/patong_beach_validation/setup_model.py

@@ -23 +23 @@
 
 # Test that environment variables are defined.
-if os.getenv(project.ENV_INUNDATIONHOME) is None:
-    print "Environment variable '%s' is not set" % project.ENV_INUNDATIONHOME
-    sanity_error = True
-
-if os.getenv(project.ENV_MUXHOME) is None:
-    print "Environment variable '%s' is not set" % project.ENV_MUXHOME
-    sanity_error = True
+#if os.getenv(project.ENV_INUNDATIONHOME) is None:
+#    print "Environment variable '%s' is not set" % project.ENV_INUNDATIONHOME
+#    sanity_error = True
+#
+#if os.getenv(project.ENV_MUXHOME) is None:
+#    print "Environment variable '%s' is not set" % project.ENV_MUXHOME
+#    sanity_error = True
 
 #-------------------------------------------------------------------------------

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -18 +18 @@
 import anuga.utilities.log as log
 
+log.log_filename = './validation.log'
 
 # sourceforge download mirror hosts (must end with '/')