Changeset 4802

Timestamp:

Nov 8, 2007, 5:31:52 PM (16 years ago)

Author:

ole

Message:

Added auto validations to distribution (ticket:207) and
updated installation guide as well as test_all

Changes to

Files:

• anuga_core/documentation/user_manual/anuga_installation_guide.tex (modified) (3 diffs)
• anuga_core/test_all.py (modified) (1 diff)
• create_distribution.py (modified) (4 diffs)

anuga_core/documentation/user_manual/anuga_installation_guide.tex

@@ -74 +74 @@
   \begin{itemize} 
     \item The supplied ANUGA distribution as under the folder pre_requisites (Install in the order \code{enthon-python2.4-1.0.0.exe}, 
-    \code{ScientificPython-2.4.9.win32-py2.4.exe} and the unpack \code{netcdf-3.6.1-beta1-win32dll.zip} into \code{C:\bin} as suggested below.
+    \code{ScientificPython-2.4.9.win32-py2.4.exe} and the unpack \code{netcdf-3.6.1-beta1-win32dll.zip} into \code{C:\\bin} as suggested below.
     \item The WEB:
     \begin{itemize}  
@@ -102 +102 @@
     \end{verbatim}}
   \item In the ANUGA root directory, run the test suite (e.g. by opening it with IDLE 
-  and running the file)\footnote{If run on the commandline, this test suite will cause an error that has to do 
-  with the atexit.py functionality of the logger. As long as all tests pass OK, you can safely ignore that error.}:
+  and running the file)
     {\small \begin{verbatim}
         python test_all.py
     \end{verbatim}}
     ANUGA has been succesfully installed if the tests pass.
+  \item To verify that ANUGA succesfully reproduces a series of validation examples, go
+  to the directory \code{anuga_validation} and into \code{automated_validation_tests} in 
+  which you can run
+  {\small \begin{verbatim}
+      python validate_all.py
+  \end{verbatim}}    
 \end{enumerate}   
+
+
+
 
 To install the anuga\_viewer
@@ -126 +134 @@
 \end{enumerate} 
 
-Try the demos provided in the ANUGA root directory 
+Try the demos provided in the ANUGA directory \code{anuga\_demos} 
 (also discussed in the ANUGA user manual available with the distribution and also at 
 \url{http://datamining.anu.edu.au/~ole/anuga/user_manual/anuga_user_manual.pdf}) and 
 view the resulting sww files with the anuga\_viewer.
 
-To verify that the installed version of ANUGA validates satisfactorily
-against the Okushiri Island wave tank validation dataset
-(\url{http://www.cee.cornell.edu/longwave})
-unpack the distribution (\code{anuga_validation_1.0_xxxx.tgz}) into
-any directory and run the scripts \code{create_okushiri.py},
-\code{run_okushiri.py} and \code{compare_timeseries.py}.  See also the
-\code{README.txt} file that comes with the validation scripts for more
-details.
+%To run the ANUGA against the Okushiri Island wave tank validation dataset
+%(\url{http://www.cee.cornell.edu/longwave})
+%go to \code{anuga_validation}
+% into
+%any directory and run the scripts \code{create_okushiri.py},
+%\code{run_okushiri.py} and \code{compare_timeseries.py}.  See also the
+%\code{README.txt} file that comes with the validation scripts for more
+%details.
 
 

anuga_core/test_all.py

@@ -10 +10 @@
 execfile('test_all.py')
 
+print
+print '************************** NOTE *************************************'
+print 'If all unit tests passed you should run the suite of validation tests'
+print 'Go to the directory anuga_validation/automated_validation_tests'
+print 'and run'
+print '    python validate_all.py'
+print
+print 'These tests will take a few hours and will verify that ANUGA'
+print 'produces the physical results expected.'
+print '*********************************************************************'
+
     

create_distribution.py

@@ -77 +77 @@
 system(s)
 
-
 # Store file with revision info for use with get_revision_number
 store_version_info(destination_path=distro_dir+'/anuga', verbose=True)
 
-# Zip it up
+
+#-----------------------------
+# Get validation_files as well
+
+s = 'mkdir %s/anuga_validation' %distro_dir
+system(s)
+
+s = 'svn export anuga_validation/okushiri_2005 %s/anuga_validation/okushiri'\
+    %(distro_dir) 
+print s
+system(s)
+
+s = 'svn export anuga_validation/solitary_waves %s/anuga_validation/solitary_waves'\
+    %(distro_dir) 
+print s
+system(s)
+
+
+s = 'svn export anuga_validation/automated_validation_tests %s/anuga_validation/automated_validation_tests'\
+    %(distro_dir) 
+print s
+system(s)
+
+
+# FIXME: Other validations in here!!!
+
+
+#-----------------------------
+# Get demos from user manual
+
+#s = 'mkdir %s/anuga_demos' %distro_dir
+#system(s)
+
+s = 'svn export anuga_core/documentation/user_manual/demos %s/anuga_demos'\
+    %(distro_dir) 
+print s
+system(s)
+
+
+#------------------
+# Zip everything up
 s = 'cd %s;tar cvfz %s *' %(distro_dir, distro_filename)
 print s
@@ -92 +131 @@
 
 # Clean up
-s = '/bin/rm -rf %s/anuga' %(distro_dir) 
-print s
-system(s)
-
-
-#-----------------------------
-# Get validation_files as well
-
-s = 'mkdir %s/anuga_validation' %distro_dir
-system(s)
-
-s = 'svn export anuga_validation/okushiri_2005 %s/anuga_validation/okushiri'\
-    %(distro_dir) 
-print s
-system(s)
-
-s = 'svn export anuga_validation/solitary_waves %s/anuga_validation/solitary_waves'\
-    %(distro_dir) 
-print s
-system(s)
-
-# Other validations in here!!!
-
-# Zip it up
-s = 'cd %s;tar cvfz anuga_validation-%s.tgz *'\
-    %(distro_dir, revision)
-print s
-system(s)
-
-# Move distro to release area
-s = '/bin/mv %s/*.tgz %s' %(distro_dir, release_dir) 
-print s
-system(s)
-
-# Clean up
-s = '/bin/rm -rf %s/anuga_validation' %(distro_dir) 
-print s
-system(s)
-
-
-#-----------------------------
-# Get demos from user manual
-
-#s = 'mkdir %s/anuga_demos' %distro_dir
-#system(s)
-
-s = 'svn export anuga_core/documentation/user_manual/demos %s/anuga_demos'\
-    %(distro_dir) 
-print s
-system(s)
-
-# Zip it up
-s = 'cd %s;tar cvfz anuga_demos-%s.tgz *'\
-    %(distro_dir, revision)
-print s
-system(s)
-
-# Move distro to release area
-s = '/bin/mv %s/*.tgz %s' %(distro_dir, release_dir) 
-print s
-system(s)
-
-# Clean up
-s = '/bin/rm -rf %s/anuga_demos' %(distro_dir) 
-print s
-system(s)
+s = '/bin/rm -rf %s/*' %(distro_dir) 
+print s
+system(s)
+
+
 
 
@@ -256 +234 @@
 
 
-import sys; sys.exit() 
-
 #----------------------------
 # Throw away code to drop all files into the RAMP download area
@@ -265 +241 @@
 if get_user_name() == 'ole' and get_host_name() == 'nautilus':
 
+
+    answer = raw_input('Do you want to move this to perlite and ANU? Y/N [Y]')
+    if answer.lower() == 'n':
+        import sys; sys.exit()
+
+        
+    #------------------------------
+    print 'Uploading to sourceforge'
+
+
+    
+
     print 'Attempt to rsync data to perlite and datamining'
-    # Copy to RAMP
+    # Copy to NHIP
     s = 'rsync -avz %s/* onielsen@cyclone:/d/cit/1/cit/natural_hazard_impacts/downloads/ANUGA_install/%s' %(release_dir, 'anuga_%s' %revision)
     print s