Fixing initial state values in MPhys

adflow/mphys/mphys_adflow.py

@@ -91,14 +91,14 @@
     coordsUpdated = False
     if "x_aero" in inputs:
         newSurfCoord = inputs["x_aero"].reshape((-1, 3))
-        currentSurfCoord = solver.getSurfaceCoordinates(groupName=solver.meshFamilyGroup, includeZipper=False)
+        currentSurfCoord = solver.mesh.getSurfaceCoordinates()  # Get coordinates directly from IDWarp
         coordsAreEqual = np.allclose(newSurfCoord, currentSurfCoord, rtol=1e-14, atol=1e-14)
         coordsAreEqual = solver.comm.allreduce(coordsAreEqual, op=MPI.LAND)
         if not coordsAreEqual:
             if solver.comm.rank == 0:
                 print("Updating surface coords", flush=True)
             solver.setSurfaceCoordinates(newSurfCoord, groupName=solver.meshFamilyGroup)
-            solver.updateGeometryInfo()
+            solver.updateGeometryInfo(warpMesh=False)
             coordsUpdated = True
     return coordsUpdated
 
@@ -164,8 +164,17 @@
 
     updatesMade = ap != solver.curAP
 
+    # These flags control printing alpha and boundary condition warnings
+    # when we update the aeroproblem.  We only want these to print when
+    # we actually switch the aeroproblem.
+    solver.setOption("printIterations", updatesMade)
+    solver.adflow.inputiteration.printbcwarnings = updatesMade
     solver.setAeroProblem(ap)
 
+    # Turn printing back on
+    solver.setOption("printIterations", True)
+    solver.adflow.inputiteration.printbcwarnings = True
+
     if inputs is not None:
         tmp = {}
         for args, _ in ap_vars:
@@ -227,7 +236,7 @@
         return self._getTriangulatedMeshSurface(groupName=groupName)
 
     def _getTriangulatedMeshSurface(self, groupName=None, **kwargs):
-        """
+        """©
         This function returns a trianguled verision of the surface
         mesh on all processors. The intent is to use this for doing
         constraints in DVConstraints.
@@ -333,12 +342,17 @@
 
     def compute(self, inputs, outputs):
         solver = self.solver
-        set_surf_coords(solver, inputs)
+        coords_updated = set_surf_coords(solver, inputs)
+        if coords_updated:
+            solver.mesh.warpMesh()
+
         outputs["adflow_vol_coords"] = solver.mesh.getSolverGrid()
 
     def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
         solver = self.solver
-        set_surf_coords(solver, inputs)
+        coords_updated = set_surf_coords(solver, inputs)
+        if coords_updated:
+            solver.mesh.warpMesh()
 
         if mode == "fwd":
             if "adflow_vol_coords" in d_outputs:
@@ -422,6 +436,23 @@
     def _set_states(self, outputs):
         self.solver.setStates(outputs["adflow_states"])
 
+    def _setup_vectors(self, root_vectors):
+        super()._setup_vectors(root_vectors)
+
+        # Turn off extra printouts
+        self.solver.setOption("printIterations", False)
+        self.solver.adflow.inputiteration.printbcwarnings = False
+
+        # Set the AP
+        self.solver.setAeroProblem(self.ap)
+
+        # Turn printing back on
+        self.solver.setOption("printIterations", True)
+        self.solver.adflow.inputiteration.printbcwarnings = True
+
+        # Set the OM states to be equal to the free stream
+        self.set_val("adflow_states", self.solver.getStates())
+
     def apply_nonlinear(self, inputs, outputs, residuals):
         solver = self.solver
         ap = self.ap
@@ -433,6 +464,7 @@
     def solve_nonlinear(self, inputs, outputs):
         solver = self.solver
         ap = self.ap
+
         if self._do_solve:
             setAeroProblem(solver, ap, self.ap_vars, inputs=inputs, outputs=outputs, print_dict=False)
             ap.solveFailed = False  # might need to clear this out?
@@ -955,8 +987,14 @@
         ap = self.ap
 
         # re-set the AP so that we are sure state is updated
+        solver.setOption("printIterations", False)
+        solver.adflow.inputiteration.printbcwarnings = False  # Turn off extra printouts
         solver.setAeroProblem(ap)
 
+        # Reset back to true to preserve normal ADflow printout structure
+        solver.setOption("printIterations", True)
+        solver.adflow.inputiteration.printbcwarnings = True
+
         # write the solution files. Internally, this checks the
         # types of solution files specified in the options and
         # only outsputs these

adflow/pyADflow.py

@@ -93,6 +93,12 @@ def __init__(self, comm=None, options=None, debug=False, dtype="d"):
             curDir = os.path.basename(os.path.dirname(os.path.realpath(__file__)))
             self.adflow = MExt.MExt("libadflow", curDir, debug=debug)._module
 
+        # This is a flag not exposed to the user as an option that controls
+        # printing the boundary condition warnings.  This should only
+        # be used in the MPhys layer when we make multiple calls to
+        # updateBCAllLevels.
+        self.adflow.inputiteration.printbcwarnings = True
+
         libLoadTime = time.time()
 
         # Information for base class:
@@ -3285,7 +3291,15 @@ def setSurfaceCoordinates(self, coordinates, groupName=None):
         self.mesh.setSurfaceCoordinates(meshSurfCoords)
 
     def setAeroProblem(self, aeroProblem, releaseAdjointMemory=True):
-        """Set the supplied aeroProblem to be used in ADflow"""
+        """Set the supplied aeroProblem to be used in ADflow.
+
+        Parameters
+        ----------
+        aeroProblem : AeroProblem
+            The supplied aeroproblem to be set.
+        releaseAdjointMemory : bool, optional
+            Flag to release the adjoint memory when setting a new aeroproblem, by default True
+        """
 
         ptSetName = "adflow_%s_coords" % aeroProblem.name
 
@@ -3413,9 +3427,16 @@ def setAeroProblem(self, aeroProblem, releaseAdjointMemory=True):
             self.adflow.anksolver.ank_cfl = aeroProblem.adflowData.ank_cfl
 
     def _setAeroProblemData(self, aeroProblem, firstCall=False):
+        """After an aeroProblem has been associated with self.curAP, set
+        all the updated information in ADflow.
+
+        Parameters
+        ----------
+        aeroProblem : AeroProblem
+            The current aeroProblem object.
+        firstCall : bool, optional
+            Flag that signifies this is being called for the first time, by default False
         """
-        After an aeroProblem has been associated with self.curAP, set
-        all the updated information in ADflow."""
 
         # Set any additional adflow options that may be defined in the
         # aeroproblem. While we do it we save the options that we've

src/bcdata/BCData.F90

@@ -2687,6 +2687,7 @@ subroutine setBCDataFineGrid(initializationPart)
         use inputTimeSpectral, only: nTimeIntervalsSpectral
         use iteration, only: groundLevel
         use utils, only: setPointers, terminate
+        use inputIteration, only: printBCWarnings
         implicit none
         !
         !      Subroutine arguments.
@@ -2803,7 +2804,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &
@@ -2827,7 +2828,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &
@@ -2850,7 +2851,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &
@@ -2874,7 +2875,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &
@@ -2898,7 +2899,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &
@@ -2921,7 +2922,7 @@ subroutine setBCDataFineGrid(initializationPart)
             call mpi_reduce(i, j, 1, adflow_integer, mpi_max, 0, &
                             ADflow_comm_world, ierr)
 
-            if (myID == 0 .and. j == 1) then
+            if (myID == 0 .and. j == 1 .and. printBCWarnings) then
 
                 print "(a)", "#"
                 print "(a)", "#*==================== !!! Warning !!! &

src/f2py/adflow.pyf

@@ -1086,6 +1086,7 @@ python module libadflow
          logical :: printiterations
          logical :: printwarnings
          logical :: printnegativevolumes
+         logical :: printbcwarnings
          real(kind=realtype) ::maxl2deviationfactor
          logical :: uselinresmonitor
          logical :: usedisscontinuation

src/modules/inputParam.F90

@@ -285,6 +285,7 @@ module inputIteration
     logical :: printIterations
     logical :: printWarnings
     logical :: printNegativeVolumes
+    logical :: printBCWarnings
     real(kind=realType), dimension(4) :: turbResScale
     logical :: useDissContinuation
     real(kind=realType) :: dissContMagnitude, dissContMidpoint, dissContSharpness