Adjoint test is almost working

Author: mandli

examples/acoustics_1d_adjoint/adjoint/test_acoustics_1d_adjoint.py

@@ -1,45 +1,24 @@
 """
-Test for the adjoint problem for 2D acoustics
+Test for the adjoint problem for 1D acoustics
 """
 
-import sys
-import unittest
+from pathlib import Path
+import pytest
 
 import clawpack.amrclaw.test as test
-import clawpack.amrclaw.data as data
 
-class Acoustics1DAdjointTest(test.AMRClawRegressionTest):
+def test_acoustics_1d_adjoint(tmp_path: Path, save: bool):
+    """Acoustics 1D adjoint test"""
 
-    def runTest(self, save=False):
+    ctr = test.AMRClawTestRunner(tmp_path)
+    ctr.set_data()
+    ctr.write_data()
+    ctr.build_executable()
+    ctr.run_code()
 
-        # Write out data files
-        self.load_rundata()
-        
-        # self.rundata.clawdata.num_output_times = 10
-        # self.rundata.clawdata.tfinal = 1.0
+    ctr.check_gauge(gauge_id=0)
+    ctr.check_gauge(gauge_id=1)
 
-        # self.rundata.clawdata.use_fwaves = False
 
-        self.write_rundata_objects()
-
-        self.run_code()
-
-        # Perform Tests
-        self.check_gauges(save=save, gauge_id=0)
-        self.check_gauges(save=save, gauge_id=1)
-
-        self.success = True
-
-
-if __name__=="__main__":
-    if len(sys.argv) > 1:
-        if bool(sys.argv[1]):
-            # Fake the setup and save out output
-            test = Acoustics1DAdjointTest()
-            try:
-                test.setUp()
-                test.runTest(save=True)
-            finally:
-                test.tearDown()
-            sys.exit(0)
-    unittest.main()
+if __name__ == "__main__":
+    pytest.main([__file__])

examples/acoustics_1d_adjoint/test_acoustics_1d_adjoint_forward.py

@@ -3,76 +3,41 @@
 """
 
 from pathlib import Path
-import sys
-import shutil
-import unittest
+import os
+import pytest
 
 import clawpack.amrclaw.test as test
-import clawpack.clawutil.runclaw
 
-from adjoint.test_acoustics_1d_adjoint import Acoustics1DAdjointTest
-
-
-class Acoustics1DAdjointForwardTest(test.AMRClawRegressionTest):
-    r"""Basic test for a 1D acoustics adjoint-flagging forward problem test case"""
-
-
-    def runTest(self, save=False):
-        
-        # Run adjoint problem
-        try:
-            adjoint_run = Acoustics1DAdjointTest()    
-            adjoint_run.setUp()
-            adjoint_run.runTest()
-            
-            # Copy output to local directory
-            adjoint_output = Path(self.temp_path) / "_adjoint_output"
-
-            if Path(adjoint_output).exists():
-                shutil.rmtree(adjoint_output)
-            shutil.copytree(adjoint_run.temp_path, adjoint_output)
-        finally:
-            adjoint_run.tearDown()
-
-        # Write out data files
-        self.load_rundata()
-
-        # self.rundata.clawdata.num_output_times = 1
-        # self.rundata.clawdata.tfinal = 0.5
-
-        # self.rundata.amrdata.flag2refine_tol = 0.05
-
-        # self.rundata.gaugedata.gauges = []
-        # self.rundata.gaugedata.gauges.append([0, -1.0, 0., 1e9])
-        # self.rundata.gaugedata.gauges.append([1, -2.5, 0., 1e9])
-        # self.rundata.gaugedata.gauges.append([2, -1.75, 0., 1e9])
-
-        # Look for adjoint data
-        self.rundata.adjointdata.adjoint_outdir = adjoint_output
-
-        self.write_rundata_objects()
-
-        # Run code
-        self.run_code()
-
-        # Perform tests
-        self.check_gauges(save=save, gauge_id=0)
-        self.check_gauges(save=save, gauge_id=1)
-        # self.check_gauges(save=save, gauge_id=2)
-
-        self.success = True
-
-
-
-if __name__=="__main__":
-    if len(sys.argv) > 1:
-        if bool(sys.argv[1]):
-            # Fake the setup and save out output
-            test = Acoustics1DAdjointForwardTest()
-            try:
-                test.setUp()
-                test.runTest(save=True)
-            finally:
-                test.tearDown()
-            sys.exit(0)
-    unittest.main()
+# import adjoint.test_acoustics_1d_adjoint
+
+def test_acoustics_1d_adjoint_forward(tmp_path: Path, save: bool):
+    """Test for a 1D acoustics adjoint-flagging forward problem test case"""
+
+    ctr = test.AMRClawTestRunner(tmp_path, test_path=__file__)
+    
+    # Run adjoint problem
+    adjoint_output = ctr.temp_path / "_adjoint_output"
+    
+    if not adjoint_output.exists():
+        os.makedirs(adjoint_output)
+    adjoint_ctr = test.AMRClawTestRunner(adjoint_output, 
+                                         test_path=ctr.test_path / "adjoint")
+    adjoint_ctr.set_data(setrun_path=adjoint_ctr.test_path / "setrun.py")
+    adjoint_ctr.write_data()
+    adjoint_ctr.build_executable()
+    adjoint_ctr.run_code()
+
+    # Write problem data
+    ctr.set_data()
+    ctr.rundata.adjointdata.adjoint_outdir = adjoint_output
+    ctr.write_data()
+
+    ctr.build_executable()
+    ctr.run_code()
+    
+    ctr.check_gauge(gauge_id=0)
+    ctr.check_gauge(gauge_id=1)
+
+
+if __name__ == "__main__":
+    pytest.main([__file__])

src/python/amrclaw/test.py

@@ -7,6 +7,7 @@
 
 from pathlib import Path
 import os
+from typing import Optional
 
 import clawpack.clawutil.test as test
 
@@ -25,6 +26,6 @@
 
 class AMRClawTestRunner(test.ClawpackTestRunner):
 
-    def __init__(self, path: Path):
-        super(AMRClawTestRunner, self).__init__(path)
+    def __init__(self, path: Path, test_path: Optional[Path]=None):
+        super(AMRClawTestRunner, self).__init__(path, test_path=test_path)
         self.executable_name = 'xamr'