Merge branch 'smdogroup:master' into radiation

funtofem/driver/oneway_struct_driver.py

@@ -538,6 +538,7 @@ def _transfer_fixed_aero_loads(self):
                 # the mesh for the new structural shape
                 body.transfer_loads(scenario)
                 body.transfer_heat_flux(scenario)
+
         return
 
     def solve_forward(self):

funtofem/interface/fun3d_14_interface.py

@@ -54,10 +54,10 @@ def __init__(
         coord_test_override=False,
         debug=False,
         external_mesh_morph=False,
-        forward_min_tolerance=1e-9,
-        forward_stop_tolerance=1e-6,
-        adjoint_min_tolerance=1e-8,
-        adjoint_stop_tolerance=1e-6,
+        forward_min_tolerance=1e-6,
+        forward_stop_tolerance=1e-9,
+        adjoint_min_tolerance=1e-6,
+        adjoint_stop_tolerance=1e-8,
     ):
         """
         The instantiation of the FUN3D interface class will populate the model with the aerodynamic surface
@@ -1182,7 +1182,7 @@ def post_adjoint(self, scenario, bodies):
         # throw a runtime error if adjoint didn't converge sufficiently
         if abs(np.linalg.norm(resid).real) > self.adjoint_min_tolerance:
             raise RuntimeError(
-                f"Funtofem/Fun3dInterface: fun3d forward adjoint residual = {resid} > {self.adjoint_tolerance:.2e}, is too large..."
+                f"Funtofem/Fun3dInterface: fun3d forward adjoint residual = {resid} > {self.adjoint_min_tolerance:.2e}, is too large..."
             )
         return