Commits

Michael Kuhlen committed 9afcbf1 Merge

Merged in ngoldbaum/enzo-dev-clean (pull request #101)

Comments (0)

Files changed (3)

run/Hydro/Hydro-1D/Toro-6-ShockTube/Toro-6-ShockTube__test_toro6.py

+import os
 from yt.mods import *
-from yt.funcs import *
 from yt.testing import *
+from yt.utilities.answer_testing.framework import \
+    VerifySimulationSameTest, \
+    sim_dir_load
 from yt.frontends.enzo.answer_testing_support import \
     requires_outputlog, \
-    ShockTubeTest
-import os
+    ShockTubeTest, \
+    standard_small_simulation
+
 
 _data_file = 'DD0001/data0001'
 _solution_file = 'Toro-6-ShockTube_t=2.0_exact.txt'
 _rtol = 1.0e-6
 _atol = 1.0e-7
 
-# Verifies that OutputLog exists
+
+_base_fields = ('Density', 'Gas_Energy')
+
 @requires_outputlog(os.path.dirname(__file__), "Toro-6-ShockTube.enzo")
+
+def test_almost_standard():
+    sim = sim_dir_load("Toro-6-ShockTube.enzo",
+                       path="./Hydro/Hydro-1D/Toro-6-ShockTube",
+                       find_outputs=True)
+    sim.get_time_series()
+    yield VerifySimulationSameTest(sim)
+    base_pf = sim[0]
+    fields = [f for f in _base_fields if f in base_pf.h.field_list]
+    # Only test the last output.
+    pf = sim[-1]
+    for test in standard_small_simulation(pf, fields): yield test
+
+# Tests that OutputLog exists and fails otherwise
+def test_exist():
+    filename = os.path.dirname(__file__) + "/OutputLog"
+    if not os.path.exists(filename):
+        raise EnzoTestOutputFileNonExistent(filename)
+
 def test_toro6():
     test = ShockTubeTest(_data_file, _solution_file, _fields, 
                          _les, _res, _rtol, _atol)
     # Same with MHD2DRotorTest
     ignore_list = ('GravityTest', 'ProtostellarCollapse_Std',
                    'ZeldovichPancake', 'AMRZeldovichPancake',
-                   'MHD2DRotorTest')
+                   'MHD2DRotorTest', 'Toro-6-ShockTube')
     
     template = open("test_type.py.template").read()
     

src/enzo/Make.mach.nasa-pleiades

 #-----------------------------------------------------------------------
 
 LOCAL_MPI_INSTALL    = /nasa/sgi/mpt/2.04.10789/
-LOCAL_HDF5_INSTALL   = /u/ngoldbau/yt-x86_64/
-LOCAL_PYTHON_INSTALL = /u/ngoldbau/yt-x86_64/
+LOCAL_HDF5_INSTALL   = $(YT_DEST)
+LOCAL_PYTHON_INSTALL = $(YT_DEST)
 LOCAL_COMPILER_DIR    = /nasa/intel/Compiler/2011.7.256/
 
 #-----------------------------------------------------------------------