Mphys multi dirs (#395)

* Multi_case opt now uses the mphys run_directory interface.

* Turned off the report to avoid an error.

Author: friedenhe

dafoam/mphys/mphys_dafoam.py

@@ -8,6 +8,7 @@
 import numpy as np
 from mpi4py import MPI
 from mphys import MaskedConverter, UnmaskedConverter, MaskedVariableDescription
+from mphys.utils.directory_utils import cd
 
 petsc4py.init(sys.argv)
 
@@ -23,6 +24,7 @@ def __init__(
         mesh_options=None,  # IDWarp options
         scenario="aerodynamic",  # scenario type to configure the groups
         prop_coupling=None,
+        run_directory="",  # the directory to run this case in, default is the current directory
     ):
 
         # options dictionary for DAFoam
@@ -44,6 +46,9 @@ def __init__(
         # flag for aerostructural coupling variables
         self.struct_coupling = False
 
+        # the directory to run this case in, default is the current directory
+        self.run_directory = run_directory
+
         # flag for aero-propulsive coupling variables
         self.prop_coupling = prop_coupling
 
@@ -60,17 +65,20 @@ def __init__(
 
     # api level method for all builders
     def initialize(self, comm):
+
         self.comm = comm
-        # initialize the PYDAFOAM class, defined in pyDAFoam.py
-        self.DASolver = PYDAFOAM(options=self.options, comm=comm)
-        # always set the mesh
-        mesh = USMesh(options=self.mesh_options, comm=comm)
-        self.DASolver.setMesh(mesh)
-        # add the design surface family group
-        self.DASolver.addFamilyGroup(
-            self.DASolver.getOption("designSurfaceFamily"), self.DASolver.getOption("designSurfaces")
-        )
-        self.DASolver.printFamilyList()
+
+        with cd(self.run_directory):
+            # initialize the PYDAFOAM class, defined in pyDAFoam.py
+            self.DASolver = PYDAFOAM(options=self.options, comm=comm)
+            # always set the mesh
+            mesh = USMesh(options=self.mesh_options, comm=comm)
+            self.DASolver.setMesh(mesh)
+            # add the design surface family group
+            self.DASolver.addFamilyGroup(
+                self.DASolver.getOption("designSurfaceFamily"), self.DASolver.getOption("designSurfaces")
+            )
+            self.DASolver.printFamilyList()
 
     def get_solver(self):
         # this method is only used by the RLT transfer scheme
@@ -756,7 +764,6 @@ def solve_linear(self, d_outputs, d_residuals, mode):
             # if writeMinorIterations=True, we rename the solution in pyDAFoam.py. So we don't recompute the PC
             if DASolver.getOption("writeMinorIterations"):
                 if DASolver.dRdWTPC is None or DASolver.ksp is None:
-                    DASolver.cdRoot()
                     DASolver.dRdWTPC = PETSc.Mat().create(self.comm)
                     DASolver.solver.calcdRdWT(DASolver.xvVec, DASolver.wVec, 1, DASolver.dRdWTPC)
                     DASolver.ksp = PETSc.KSP().create(self.comm)
@@ -782,7 +789,6 @@ def solve_linear(self, d_outputs, d_residuals, mode):
                 adjPCLag = DASolver.getOption("adjPCLag")
                 if DASolver.dRdWTPC is None or DASolver.ksp is None or (self.solution_counter - 1) % adjPCLag == 0:
                     if renamed:
-                        DASolver.cdRoot()
                         # calculate the PC mat
                         if DASolver.dRdWTPC is not None:
                             DASolver.dRdWTPC.destroy()
@@ -1116,7 +1122,7 @@ def compute_jacvec_product(self, inputs, d_inputs, d_outputs, mode):
                         dFdAOA.setSizes((PETSc.DECIDE, 1), bsize=1)
                         dFdAOA.setFromOptions()
                         DASolver.calcdFdAOAAnalytical(objFuncName, dFdAOA)
-                        
+
                         # The aoaBar variable will be length 1 on the root proc, but length 0 an all slave procs.
                         # The value on the root proc must be broadcast across all procs.
                         if self.comm.rank == 0:

dafoam/pyDAFoam.py

@@ -11,7 +11,7 @@
 
 """
 
-__version__ = "3.0.3"
+__version__ = "3.0.4"
 
 import subprocess
 import os
@@ -456,11 +456,6 @@ def __init__(self):
         # ************************************ Advance Options ****************************************
         # *********************************************************************************************
 
-        ## The root directory for the DAFoam case. If rooDir = "None" (default), we will assign os.getcwd() to rootDir
-        ## If we want to have multiple cases running at the same time, e.g., coupled wing propeller case, we may
-        ## set different rootDirs for each case. NOTE: if we set rootDir, we need to set an absolute path!
-        self.rootDir = "None"
-
         ## The run status which can be solvePrimal, solveAdjoint, or calcTotalDeriv. This parameter is
         ## used internally, so users should never change this option in the Python layer.
         self.runStatus = "None"
@@ -664,13 +659,6 @@ def __init__(self, comm=None, options=None):
         # check if the combination of options is valid.
         self._checkOptions()
 
-        # the absolute path where the run script is located at
-        if self.getOption("rootDir") == "None":
-            self.rootDir = os.getcwd()
-        else:
-            self.rootDir = self.getOption("rootDir")
-        self.cdRoot()
-
         # Initialize families
         self.families = OrderedDict()
 
@@ -807,8 +795,6 @@ def __call__(self):
         # update the mesh coordinates if DVGeo is set
         # add point set and update the mesh based on the DV values
 
-        self.cdRoot()
-
         if self.DVGeo is not None:
 
             # if the point set is not in DVGeo add it first
@@ -1659,9 +1645,7 @@ def writeFieldSensitivityMap(self, objFuncName, designVarName, solutionTime, fie
             The Petsc vector that contains the sensitivity
         """
 
-        self.cdRoot()
-
-        workingDir = self.rootDir
+        workingDir = os.getcwd()
         if self.parallel:
             sensDir = "processor%d/%.8f/" % (self.rank, solutionTime)
         else:
@@ -1736,9 +1720,7 @@ def writeSurfaceSensitivityMap(self, objFuncName, designVarName, solutionTime):
         conn, faceSizes = self.getSurfaceConnectivity(self.allWallsGroup)
         conn = np.array(conn).flatten()
 
-        self.cdRoot()
-
-        workingDir = self.rootDir
+        workingDir = os.getcwd()
         if self.parallel:
             meshDir = "processor%d/%.11f/polyMesh/" % (self.rank, solutionTime)
             sensDir = "processor%d/%.11f/" % (self.rank, solutionTime)
@@ -1946,8 +1928,6 @@ def solveAdjoint(self):
         viewerW(self.wVec)
         """
 
-        self.cdRoot()
-
         if self.getOption("useAD")["mode"] == "forward":
             raise Error("solveAdjoint only supports useAD->mode=reverse|fd")
 
@@ -2672,8 +2652,6 @@ def runColoring(self):
         Info("|                       Running Coloring Solver                            |")
         Info("+--------------------------------------------------------------------------+")
 
-        self.cdRoot()
-
         solverName = self.getOption("solverName")
         if solverName in self.solverRegistry["Incompressible"]:
 
@@ -2729,8 +2707,7 @@ def deletePrevPrimalSolTime(self):
 
         solTime = self.solver.getPrevPrimalSolTime()
 
-        self.cdRoot()
-        rootDir = self.rootDir
+        rootDir = os.getcwd()
         if self.parallel:
             checkPath = os.path.join(rootDir, "processor%d/%g" % (self.comm.rank, solTime))
         else:
@@ -2763,8 +2740,7 @@ def renameSolution(self, solIndex):
         """
 
         allSolutions = []
-        self.cdRoot()
-        rootDir = self.rootDir
+        rootDir = os.getcwd()
         if self.parallel:
             checkPath = os.path.join(rootDir, "processor%d" % self.comm.rank)
         else:
@@ -2952,8 +2928,7 @@ def _readMeshInfo(self):
         Initialize mesh information and read mesh information
         """
 
-        self.cdRoot()
-        dirName = self.rootDir
+        dirName = os.getcwd()
 
         self.fileNames, self.xv0, self.faces, self.boundaries, self.owners, self.neighbours = self._readOFGrid(dirName)
         self.xv = copy.copy(self.xv0)
@@ -3769,12 +3744,6 @@ def vec2ArraySeq(self, vec):
             array1[i] = vec[i]
         return array1
 
-    def cdRoot(self):
-        """
-        Go to the case root dir, as set in self.rootDir
-        """
-        os.chdir(self.rootDir)
-
     def _printCurrentOptions(self):
         """
         Prints a nicely formatted dictionary of all the current solver
@@ -3806,8 +3775,8 @@ def _writeDecomposeParDict(self):
         """
         if self.comm.rank == 0:
             # Open the options file for writing
-            self.cdRoot()
-            workingDirectory = self.rootDir
+
+            workingDirectory = os.getcwd()
             sysDir = "system"
             varDir = os.path.join(workingDirectory, sysDir)
             fileName = "decomposeParDict"

tests/runTests_MphysAeroField.py

@@ -157,7 +157,7 @@ def alphaPorosity(val, DASolver):
         self.add_constraint("cruise.aero_post.CL", equals=0.3, scaler=1.0)
 
 
-prob = om.Problem()
+prob = om.Problem(reports=None)
 prob.model = Top()
 
 prob.driver = om.pyOptSparseDriver()