switch to OM's assert_check_totals (#463)

Author: kanekosh

openaerostruct/utils/testing.py

@@ -514,42 +514,3 @@ def get_single_section_surface_AS():
     }
 
     return surface_dict
-
-
-def assert_check_totals(totals, atol=1e-6, rtol=1e-6):
-    for of_wrt_pair in totals.keys():
-        of, wrt = of_wrt_pair
-        total_dict = totals[of_wrt_pair]
-        abs_error = total_dict["abs error"]
-        rel_error = total_dict["rel error"]
-        for i_mode, mode in enumerate(["forward", "forward_reverse", "reverse"]):
-            if rel_error[i_mode] is not None:
-                if np.abs(rel_error[i_mode]) - rtol > 0.0:
-                    err_str = (
-                        "Total deriv (mode "
-                        + mode
-                        + ") of "
-                        + of
-                        + " with respect to "
-                        + wrt
-                        + " had rel error "
-                        + str(rel_error[i_mode])
-                        + " which is greater than tol "
-                        + str(rtol)
-                    )
-                    raise ValueError(err_str)
-            if abs_error[i_mode] is not None:
-                if np.abs(abs_error[i_mode]) - atol > 0.0:
-                    err_str = (
-                        "Total deriv (mode "
-                        + mode
-                        + ") of "
-                        + of
-                        + " with respect to "
-                        + wrt
-                        + " had abs error "
-                        + str(abs_error[i_mode])
-                        + " which is greater than tol "
-                        + str(atol)
-                    )
-                    raise ValueError(err_str)

tests/integration_tests/test_aero_ground_effect.py

@@ -12,8 +12,7 @@ def test(self):
         from openaerostruct.geometry.geometry_group import Geometry
         from openaerostruct.aerodynamics.aero_groups import AeroPoint
 
-        from openmdao.utils.assert_utils import assert_near_equal
-        from openaerostruct.utils.testing import assert_check_totals
+        from openmdao.utils.assert_utils import assert_near_equal, assert_check_totals
 
         # Create a dictionary to store options about the mesh
         mesh_dict = {"num_y": 7, "num_x": 2, "wing_type": "CRM", "symmetry": True, "num_twist_cp": 5}
@@ -126,7 +125,7 @@ def test(self):
             compact_print=True,
             out_stream=None,
         )
-        assert_check_totals(totals, atol=1e-2, rtol=1e-5)
+        assert_check_totals(totals, atol=1e-5, rtol=1e-5)
 
 
 if __name__ == "__main__":

tests/integration_tests/test_aero_ground_effect_right.py

@@ -6,8 +6,7 @@ def test(self):
         # docs checkpoint 0
         from openaerostruct.meshing.mesh_generator import generate_mesh
 
-        from openmdao.utils.assert_utils import assert_near_equal
-        from openaerostruct.utils.testing import assert_check_totals
+        from openmdao.utils.assert_utils import assert_near_equal, assert_check_totals
 
         # Create a dictionary to store options about the mesh
         mesh_dict = {"num_y": 7, "num_x": 2, "wing_type": "CRM", "symmetry": True, "num_twist_cp": 5}
@@ -49,7 +48,7 @@ def test(self):
             compact_print=True,
             out_stream=None,
         )
-        assert_check_totals(totals, atol=1e-2, rtol=1e-5)
+        assert_check_totals(totals, atol=1e-5, rtol=1e-5)
 
     def setup_problem(self, mesh, twist_cp):
         """

tests/integration_tests/test_aerostruct_groundeffect.py

@@ -1,6 +1,6 @@
-from openmdao.utils.assert_utils import assert_near_equal
+from openmdao.utils.assert_utils import assert_near_equal, assert_check_totals
 import unittest
-from openaerostruct.utils.testing import assert_check_totals, assert_opt_successful
+from openaerostruct.utils.testing import assert_opt_successful
 
 
 class Test(unittest.TestCase):
@@ -160,7 +160,7 @@ def test(self):
             abs_err_tol=1e-2,
             rel_err_tol=1e-5,
         )
-        assert_check_totals(totals, atol=1e-2, rtol=1e-5)
+        assert_check_totals(totals, atol=1e-5, rtol=1e-5)
 
 
 if __name__ == "__main__":

tests/integration_tests/test_scaneagle.py

@@ -3,12 +3,11 @@
 import numpy as np
 
 import openmdao.api as om
-from openmdao.utils.assert_utils import assert_near_equal
+from openmdao.utils.assert_utils import assert_near_equal, assert_check_totals
 
 from openaerostruct.meshing.mesh_generator import generate_mesh
 from openaerostruct.integration.aerostruct_groups import AerostructGeometry, AerostructPoint
 from openaerostruct.utils.constants import grav_constant
-from openaerostruct.utils.testing import assert_check_totals
 
 
 class Test(unittest.TestCase):
@@ -221,10 +220,10 @@ def test_totals(self):
             step=1e-3,
             step_calc="rel",
             compact_print=True,
-            abs_err_tol=1e-4,
-            rel_err_tol=1e-4,
+            abs_err_tol=1e-5,
+            rel_err_tol=1e-5,
         )
-        assert_check_totals(totals, atol=1e-4, rtol=1e-4)
+        assert_check_totals(totals, atol=1e-5, rtol=1e-5)
 
 
 if __name__ == "__main__":