From bab4fd32e02945daadea288f94b8bb383bc36f1f Mon Sep 17 00:00:00 2001
From: Ping He <phe@iastate.edu>
Date: Wed, 6 Dec 2023 19:47:05 -0600
Subject: [PATCH 1/2] Fixed a bug to allow mulitple parts for unsteady objs.

---
 dafoam/pyDAFoam.py                            |  3 +-
 src/adjoint/DAObjFunc/DAObjFunc.H             |  8 --
 .../DAObjFunc/DAObjFuncCenterOfPressure.C     |  2 -
 .../DAObjFunc/DAObjFuncFieldInversion.C       |  2 -
 src/adjoint/DAObjFunc/DAObjFuncForce.C        |  1 -
 src/adjoint/DAObjFunc/DAObjFuncLocation.C     |  1 -
 src/adjoint/DAObjFunc/DAObjFuncMass.C         |  1 -
 src/adjoint/DAObjFunc/DAObjFuncMassFlowRate.C |  1 -
 .../DAObjFunc/DAObjFuncMeshQualityKS.C        |  1 -
 src/adjoint/DAObjFunc/DAObjFuncMoment.C       |  1 -
 src/adjoint/DAObjFunc/DAObjFuncPatchMean.C    |  2 -
 src/adjoint/DAObjFunc/DAObjFuncPower.C        |  2 -
 .../DAObjFunc/DAObjFuncTotalPressure.C        |  2 -
 .../DAObjFunc/DAObjFuncTotalPressureRatio.C   |  1 -
 .../DAObjFuncTotalTemperatureRatio.C          |  1 -
 .../DAObjFunc/DAObjFuncVariableVolSum.C       |  2 -
 src/adjoint/DAObjFunc/DAObjFuncVariance.C     |  2 -
 .../DAObjFunc/DAObjFuncVonMisesStressKS.C     |  1 -
 src/adjoint/DAObjFunc/DAObjFuncWallHeatFlux.C |  2 -
 src/adjoint/DASolver/DASolver.C               | 84 +++++++++++++++----
 src/adjoint/DASolver/DASolver.H               | 15 ++--
 src/pyDASolvers/DASolvers.H                   |  4 +-
 src/pyDASolvers/pyDASolvers.pyx               |  6 +-
 .../refs/DAFoam_Test_DAPimpleFoamFieldRef.txt | 13 +--
 tests/runTests_DAPimpleFoamField.py           | 41 ++++-----
 25 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/dafoam/pyDAFoam.py b/dafoam/pyDAFoam.py
index aef5f423..7dc2ccbc 100755
--- a/dafoam/pyDAFoam.py
+++ b/dafoam/pyDAFoam.py
@@ -465,6 +465,7 @@ def __init__(self):
             "periodicity": -1.0,
             "objFuncStartTime": -1.0,
             "objFuncEndTime": -1.0,
+            "objFuncTimeOperator": "None",
             "PCMatPrecomputeInterval": 100,
             "PCMatUpdateInterval": 1,
             "reduceIO": True,
@@ -2415,7 +2416,7 @@ def solveAdjointUnsteady(self):
                     # on the state at this time index
                     dFScaling = 1.0
                     if n >= objFuncStartTimeIndex and n <= objFuncEndTimeIndex:
-                        dFScaling = self.solver.getObjFuncUnsteadyScaling(objFuncName.encode())
+                        dFScaling = self.solver.getObjFuncUnsteadyScaling()
                     else:
                         dFScaling = 0.0
 
diff --git a/src/adjoint/DAObjFunc/DAObjFunc.H b/src/adjoint/DAObjFunc/DAObjFunc.H
index 4ea3893c..b75a31f6 100755
--- a/src/adjoint/DAObjFunc/DAObjFunc.H
+++ b/src/adjoint/DAObjFunc/DAObjFunc.H
@@ -92,9 +92,6 @@ protected:
     /// the connectivity information for the objective function
     List<List<word>> objFuncConInfo_;
 
-    /// the unsteady objective function type like sum or average
-    word timeOperator_ = "None";
-
 public:
     /// Runtime type information
     TypeName("DAObjFunc");
@@ -234,11 +231,6 @@ public:
         return objFuncConInfo_;
     }
 
-    const word& getObjFuncTimeOperator() const
-    {
-        return timeOperator_;
-    }
-
     /// expSumKS stores sum[exp(coeffKS*x_i)] for KS function which will be used to scale dFdW
     scalar expSumKS = 1.0;
 
diff --git a/src/adjoint/DAObjFunc/DAObjFuncCenterOfPressure.C b/src/adjoint/DAObjFunc/DAObjFuncCenterOfPressure.C
index 84111595..792f928e 100644
--- a/src/adjoint/DAObjFunc/DAObjFuncCenterOfPressure.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncCenterOfPressure.C
@@ -71,8 +71,6 @@ DAObjFuncCenterOfPressure::DAObjFuncCenterOfPressure(
     center_[2] = centerList[2];
 
     objFuncDict_.readEntry<scalar>("scale", scale_);
-
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncFieldInversion.C b/src/adjoint/DAObjFunc/DAObjFuncFieldInversion.C
index 8b1412f5..b8608271 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncFieldInversion.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncFieldInversion.C
@@ -74,8 +74,6 @@ DAObjFuncFieldInversion::DAObjFuncFieldInversion(
     {
         objFuncConInfo_ = {{}}; // level 0
     }
-
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncForce.C b/src/adjoint/DAObjFunc/DAObjFuncForce.C
index cee9494b..244c645f 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncForce.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncForce.C
@@ -115,7 +115,6 @@ DAObjFuncForce::DAObjFuncForce(
     // now replace nut with the corrected name for the selected turbulence model
     daModel.correctModelStates(objFuncConInfo_[0]);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncLocation.C b/src/adjoint/DAObjFunc/DAObjFuncLocation.C
index 86a51de4..2baa0c0d 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncLocation.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncLocation.C
@@ -110,7 +110,6 @@ DAObjFuncLocation::DAObjFuncLocation(
         }
     }
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncMass.C b/src/adjoint/DAObjFunc/DAObjFuncMass.C
index 2ac773a4..782fe4fb 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncMass.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncMass.C
@@ -44,7 +44,6 @@ DAObjFuncMass::DAObjFuncMass(
 
     objFuncDict_.readEntry<scalar>("scale", scale_);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncMassFlowRate.C b/src/adjoint/DAObjFunc/DAObjFuncMassFlowRate.C
index e99e1801..841071e9 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncMassFlowRate.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncMassFlowRate.C
@@ -57,7 +57,6 @@ DAObjFuncMassFlowRate::DAObjFuncMassFlowRate(
 
     objFuncDict_.readEntry<scalar>("scale", scale_);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncMeshQualityKS.C b/src/adjoint/DAObjFunc/DAObjFuncMeshQualityKS.C
index 0bc84f25..efe5bb58 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncMeshQualityKS.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncMeshQualityKS.C
@@ -77,7 +77,6 @@ DAObjFuncMeshQualityKS::DAObjFuncMeshQualityKS(
         Info << "includeFaceList " << includeFaceList_ << endl;
     }
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncMoment.C b/src/adjoint/DAObjFunc/DAObjFuncMoment.C
index e0d47ffa..0fe5da0f 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncMoment.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncMoment.C
@@ -91,7 +91,6 @@ DAObjFuncMoment::DAObjFuncMoment(
     // now replace nut with the corrected name for the selected turbulence model
     daModel.correctModelStates(objFuncConInfo_[0]);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncPatchMean.C b/src/adjoint/DAObjFunc/DAObjFuncPatchMean.C
index 6e5fb538..4980f665 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncPatchMean.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncPatchMean.C
@@ -45,8 +45,6 @@ DAObjFuncPatchMean::DAObjFuncPatchMean(
     objFuncDict_.readEntry<word>("varType", varType_);
 
     objFuncDict_.readEntry<label>("component", component_);
-
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncPower.C b/src/adjoint/DAObjFunc/DAObjFuncPower.C
index faeb1c15..c0bd620d 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncPower.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncPower.C
@@ -90,8 +90,6 @@ DAObjFuncPower::DAObjFuncPower(
 
     // now replace nut with the corrected name for the selected turbulence model
     daModel.correctModelStates(objFuncConInfo_[0]);
-
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncTotalPressure.C b/src/adjoint/DAObjFunc/DAObjFuncTotalPressure.C
index 322e5966..8d652d62 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncTotalPressure.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncTotalPressure.C
@@ -56,8 +56,6 @@ DAObjFuncTotalPressure::DAObjFuncTotalPressure(
 #endif
 
     objFuncDict_.readEntry<scalar>("scale", scale_);
-
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncTotalPressureRatio.C b/src/adjoint/DAObjFunc/DAObjFuncTotalPressureRatio.C
index bfbde8b6..b265711a 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncTotalPressureRatio.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncTotalPressureRatio.C
@@ -65,7 +65,6 @@ DAObjFuncTotalPressureRatio::DAObjFuncTotalPressureRatio(
         Info << "gamma " << gamma_ << endl;
     }
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncTotalTemperatureRatio.C b/src/adjoint/DAObjFunc/DAObjFuncTotalTemperatureRatio.C
index 445d520b..8c56e1c2 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncTotalTemperatureRatio.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncTotalTemperatureRatio.C
@@ -60,7 +60,6 @@ DAObjFuncTotalTemperatureRatio::DAObjFuncTotalTemperatureRatio(
         Info << "gamma " << gamma_ << endl;
     }
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncVariableVolSum.C b/src/adjoint/DAObjFunc/DAObjFuncVariableVolSum.C
index 5984d21c..0ec19b99 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncVariableVolSum.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncVariableVolSum.C
@@ -51,8 +51,6 @@ DAObjFuncVariableVolSum::DAObjFuncVariableVolSum(
 
     objFuncDict_.readEntry<label>("divByTotalVol", divByTotalVol_);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
-
     if (daIndex.adjStateNames.found(varName_))
     {
         objFuncConInfo_ = {{varName_}};
diff --git a/src/adjoint/DAObjFunc/DAObjFuncVariance.C b/src/adjoint/DAObjFunc/DAObjFuncVariance.C
index 2bf3bd15..423da9d4 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncVariance.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncVariance.C
@@ -65,8 +65,6 @@ DAObjFuncVariance::DAObjFuncVariance(
         objFuncDict_.readEntry<labelList>("components", components_);
     }
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
-
     if (daIndex.adjStateNames.found(varName_))
     {
         objFuncConInfo_ = {{varName_}};
diff --git a/src/adjoint/DAObjFunc/DAObjFuncVonMisesStressKS.C b/src/adjoint/DAObjFunc/DAObjFuncVonMisesStressKS.C
index b9f8c31c..de67494e 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncVonMisesStressKS.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncVonMisesStressKS.C
@@ -47,7 +47,6 @@ DAObjFuncVonMisesStressKS::DAObjFuncVonMisesStressKS(
 
     objFuncDict_.readEntry<scalar>("coeffKS", coeffKS_);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
 }
 
 /// calculate the value of objective function
diff --git a/src/adjoint/DAObjFunc/DAObjFuncWallHeatFlux.C b/src/adjoint/DAObjFunc/DAObjFuncWallHeatFlux.C
index 8388f30b..2b10d704 100755
--- a/src/adjoint/DAObjFunc/DAObjFuncWallHeatFlux.C
+++ b/src/adjoint/DAObjFunc/DAObjFuncWallHeatFlux.C
@@ -79,8 +79,6 @@ DAObjFuncWallHeatFlux::DAObjFuncWallHeatFlux(
 
     objFuncDict_.readEntry<scalar>("scale", scale_);
 
-    timeOperator_ = objFuncDict.lookupOrDefault<word>("timeOperator", "None");
-
 #ifdef CompressibleFlow
 
     // setup the connectivity for heat flux, this is needed in Foam::DAJacCondFdW
diff --git a/src/adjoint/DASolver/DASolver.C b/src/adjoint/DASolver/DASolver.C
index 838a2e92..5e18e5fe 100644
--- a/src/adjoint/DASolver/DASolver.C
+++ b/src/adjoint/DASolver/DASolver.C
@@ -173,26 +173,30 @@ void DASolver::calcUnsteadyObjFuncs()
 
     scalar objFuncValue = 0.0;
 
+    word timeOperator = daOptionPtr_->getSubDictOption<word>("unsteadyAdjoint", "objFuncTimeOperator");
+
     forAll(daObjFuncPtrList_, idxI)
     {
         DAObjFunc& daObjFunc = daObjFuncPtrList_[idxI];
         word objFuncName = daObjFunc.getObjFuncName();
-        if (daObjFunc.getObjFuncTimeOperator() == "None")
+        word objFuncPart = daObjFunc.getObjFuncPart();
+        word uKey = objFuncName + objFuncPart;
+        if (timeOperator == "None")
         {
             FatalErrorIn("") << "calcUnsteadyObjFuncs is called but the timeOperator is not set!!! Options are: average or sum"
                              << abort(FatalError);
         }
-        else if (daObjFunc.getObjFuncTimeOperator() == "sum")
+        else if (timeOperator == "sum")
         {
             label startTimeIndex = this->getUnsteadyObjFuncStartTimeIndex();
             label endTimeIndex = this->getUnsteadyObjFuncEndTimeIndex();
             label timeIndex = runTimePtr_->timeIndex();
             if (timeIndex >= startTimeIndex && timeIndex <= endTimeIndex)
             {
-                unsteadyObjFuncs_[objFuncName] += this->getObjFuncValue(objFuncName);
+                unsteadyObjFuncs_[uKey] += daObjFunc.getObjFuncValue();
             }
         }
-        else if (daObjFunc.getObjFuncTimeOperator() == "average")
+        else if (timeOperator == "average")
         {
             // calculate the average on the fly, i.e., moving average
             label startTimeIndex = this->getUnsteadyObjFuncStartTimeIndex();
@@ -201,14 +205,14 @@ void DASolver::calcUnsteadyObjFuncs()
             if (timeIndex >= startTimeIndex && timeIndex <= endTimeIndex)
             {
                 label n = timeIndex - startTimeIndex + 1;
-                scalar objFuncVal = this->getObjFuncValue(objFuncName);
-                unsteadyObjFuncs_[objFuncName] = (unsteadyObjFuncs_[objFuncName] * (n - 1) + objFuncVal) / n;
+                scalar objFuncVal = daObjFunc.getObjFuncValue();
+                unsteadyObjFuncs_[uKey] = (unsteadyObjFuncs_[uKey] * (n - 1) + objFuncVal) / n;
             }
         }
         else
         {
-            FatalErrorIn("calcUnsteadyObjFuncs") << "timeOperator not valid! Options are None, average, or sum"
-                                                 << abort(FatalError);
+            FatalErrorIn("") << "calcUnsteadyObjFuncs is called but the timeOperator is not set!!! Options are: average or sum"
+                             << abort(FatalError);
         }
     }
 }
@@ -228,18 +232,22 @@ void DASolver::printAllObjFuncs()
                                          << abort(FatalError);
     }
 
+    word timeOperator = daOptionPtr_->getSubDictOption<word>("unsteadyAdjoint", "objFuncTimeOperator");
+
     forAll(daObjFuncPtrList_, idxI)
     {
         DAObjFunc& daObjFunc = daObjFuncPtrList_[idxI];
         word objFuncName = daObjFunc.getObjFuncName();
+        word objFuncPart = daObjFunc.getObjFuncPart();
+        word uKey = objFuncName + objFuncPart;
         scalar objFuncVal = daObjFunc.getObjFuncValue();
         Info << objFuncName
-             << "-" << daObjFunc.getObjFuncPart()
+             << "-" << objFuncPart
              << "-" << daObjFunc.getObjFuncType()
              << ": " << objFuncVal;
-        if (daObjFunc.getObjFuncTimeOperator() == "average" || daObjFunc.getObjFuncTimeOperator() == "sum")
+        if (timeOperator == "average" || timeOperator == "sum")
         {
-            Info << " Unsteady " << daObjFunc.getObjFuncTimeOperator() << " " << unsteadyObjFuncs_[objFuncName];
+            Info << " Unsteady " << timeOperator << " " << unsteadyObjFuncs_[uKey];
         }
 #ifdef CODI_AD_FORWARD
 
@@ -254,7 +262,7 @@ void DASolver::printAllObjFuncs()
 
             if (daOptionPtr_->getSubDictOption<word>("unsteadyAdjoint", "mode") == "timeAccurate")
             {
-                Info << " Unsteady Deriv: " << unsteadyObjFuncs_[objFuncName].getGradient();
+                Info << " Unsteady Deriv: " << unsteadyObjFuncs_[uKey].getGradient();
             }
         }
 #endif
@@ -262,6 +270,44 @@ void DASolver::printAllObjFuncs()
     }
 }
 
+scalar DASolver::getObjFuncValueUnsteady(const word objFuncName)
+{
+    /*
+    Description:
+        Return the value of the objective function for unsteady cases
+        NOTE: we will sum up all the parts in objFuncName
+
+    Input:
+        objFuncName: the name of the objective function
+
+    Output:
+        objFuncValue: the value of the objective
+    */
+    if (daObjFuncPtrList_.size() == 0)
+    {
+        FatalErrorIn("printAllObjFuncs") << "daObjFuncPtrList_.size() ==0... "
+                                         << "Forgot to call setDAObjFuncList?"
+                                         << abort(FatalError);
+    }
+
+    scalar objFuncValue = 0.0;
+
+    forAll(daObjFuncPtrList_, idxI)
+    {
+        DAObjFunc& daObjFunc = daObjFuncPtrList_[idxI];
+        word objFuncNameI = daObjFunc.getObjFuncName();
+        word objFuncPart = daObjFunc.getObjFuncPart();
+        word uKey = objFuncNameI + objFuncPart;
+
+        if (objFuncNameI == objFuncName)
+        {
+            objFuncValue += unsteadyObjFuncs_[uKey];
+        }
+    }
+
+    return objFuncValue;
+}
+
 scalar DASolver::getObjFuncValue(const word objFuncName)
 {
     /*
@@ -398,24 +444,26 @@ void DASolver::setDAObjFuncList()
     {
         DAObjFunc& daObjFunc = daObjFuncPtrList_[idxI];
         word objFuncName = daObjFunc.getObjFuncName();
-        unsteadyObjFuncs_.set(objFuncName, 0.0);
+        word objFuncPart = daObjFunc.getObjFuncPart();
+        word uKey = objFuncName + objFuncPart;
+        unsteadyObjFuncs_.set(uKey, 0.0);
 
-        word timeOperator = daObjFunc.getObjFuncTimeOperator();
+        word timeOperator = daOptionPtr_->getSubDictOption<word>("unsteadyAdjoint", "objFuncTimeOperator");
         if (timeOperator == "None" || timeOperator == "sum")
         {
-            unsteadyObjFuncsScaling_.set(objFuncName, 1.0);
+            unsteadyObjFuncsScaling_ = 1.0;
         }
         else if (timeOperator == "average")
         {
             label startTimeIndex = this->getUnsteadyObjFuncStartTimeIndex();
             label endTimeIndex = this->getUnsteadyObjFuncEndTimeIndex();
             label nInstances = endTimeIndex - startTimeIndex + 1;
-            unsteadyObjFuncsScaling_.set(objFuncName, 1.0 / nInstances);
+            unsteadyObjFuncsScaling_ = 1.0 / nInstances;
         }
         else
         {
-            FatalErrorIn("calcUnsteadyObjFuncs") << "timeOperator not valid! Options are None, average, or sum"
-                                                 << abort(FatalError);
+            FatalErrorIn("setDAObjFuncList") << "timeOperator not valid! Options are None, average, or sum"
+                                             << abort(FatalError);
         }
     }
 }
diff --git a/src/adjoint/DASolver/DASolver.H b/src/adjoint/DASolver/DASolver.H
index 16dd087f..880c0407 100644
--- a/src/adjoint/DASolver/DASolver.H
+++ b/src/adjoint/DASolver/DASolver.H
@@ -207,7 +207,7 @@ protected:
     HashTable<scalar> unsteadyObjFuncs_;
 
     /// a scaling factor related to the unsteady obj func timeOperator e.g., in dFdW calculation
-    HashTable<scalar> unsteadyObjFuncsScaling_;
+    scalar unsteadyObjFuncsScaling_;
 
 public:
     /// Runtime type information
@@ -780,7 +780,9 @@ public:
         {
             DAObjFunc& daObjFunc = daObjFuncPtrList_[idxI];
             word objFuncName = daObjFunc.getObjFuncName();
-            unsteadyObjFuncs_[objFuncName] = 0.0;
+            word objFuncPart = daObjFunc.getObjFuncPart();
+            word uKey = objFuncName + objFuncPart;
+            unsteadyObjFuncs_[uKey] = 0.0;
         }
     }
 
@@ -788,15 +790,12 @@ public:
     void calcUnsteadyObjFuncs();
 
     /// return the unsteady objFunc values
-    scalar getObjFuncValueUnsteady(const word objFuncName)
-    {
-        return unsteadyObjFuncs_[objFuncName];
-    }
+    scalar getObjFuncValueUnsteady(const word objFuncName);
 
     /// get the objective func scaling for unsteady adjoint
-    scalar getObjFuncUnsteadyScaling(const word objFuncName)
+    scalar getObjFuncUnsteadyScaling()
     {
-        return unsteadyObjFuncsScaling_[objFuncName];
+        return unsteadyObjFuncsScaling_;
     }
 
     /// get the unsteady adjoint start time index
diff --git a/src/pyDASolvers/DASolvers.H b/src/pyDASolvers/DASolvers.H
index eee20e95..55694ff6 100755
--- a/src/pyDASolvers/DASolvers.H
+++ b/src/pyDASolvers/DASolvers.H
@@ -496,10 +496,10 @@ public:
         return returnVal;
     }
 
-    double getObjFuncUnsteadyScaling(const word objFuncName)
+    double getObjFuncUnsteadyScaling()
     {
         double returnVal = 0.0;
-        assignValueCheckAD(returnVal, DASolverPtr_->getObjFuncUnsteadyScaling(objFuncName));
+        assignValueCheckAD(returnVal, DASolverPtr_->getObjFuncUnsteadyScaling());
         return returnVal;
     }
 
diff --git a/src/pyDASolvers/pyDASolvers.pyx b/src/pyDASolvers/pyDASolvers.pyx
index 30731dc3..79916961 100755
--- a/src/pyDASolvers/pyDASolvers.pyx
+++ b/src/pyDASolvers/pyDASolvers.pyx
@@ -94,7 +94,7 @@ cdef extern from "DASolvers.H" namespace "Foam":
         int checkMesh()
         double getObjFuncValue(char *)
         double getObjFuncValueUnsteady(char *)
-        double getObjFuncUnsteadyScaling(char *)
+        double getObjFuncUnsteadyScaling()
         double getElapsedClockTime()
         double getElapsedCpuTime()
         void calcCouplingFaceCoords(double *, double *)
@@ -378,8 +378,8 @@ cdef class pyDASolvers:
     def getObjFuncValueUnsteady(self, objFuncName):
         return self._thisptr.getObjFuncValueUnsteady(objFuncName)
     
-    def getObjFuncUnsteadyScaling(self, objFuncName):
-        return self._thisptr.getObjFuncUnsteadyScaling(objFuncName)
+    def getObjFuncUnsteadyScaling(self):
+        return self._thisptr.getObjFuncUnsteadyScaling()
     
     def getElapsedClockTime(self):
         return self._thisptr.getElapsedClockTime()
diff --git a/tests/refs/DAFoam_Test_DAPimpleFoamFieldRef.txt b/tests/refs/DAFoam_Test_DAPimpleFoamFieldRef.txt
index 38d56935..71409c09 100755
--- a/tests/refs/DAFoam_Test_DAPimpleFoamFieldRef.txt
+++ b/tests/refs/DAFoam_Test_DAPimpleFoamFieldRef.txt
@@ -1,24 +1,19 @@
-Dictionary Key: UVar
-@value  0.00599646380067478 1e-08 1e-10
+Dictionary Key: UPVar
+@value  0.04796868117520926 1e-08 1e-10
 Dictionary Key: UVarProbe
 @value 1.248866229574679e-07 1e-08 1e-10
 Dictionary Key: fail
 @value                    0 1e-08 1e-10
-Dictionary Key: pVar
-@value  0.04197221737453448 1e-08 1e-10
 Dictionary Key: wallShearStressVar
 @value 0.0006665194518553904 1e-08 1e-10
-Dictionary Key: UVar
+Dictionary Key: UPVar
 Dictionary Key: beta
-@value 0.0004601298806438439 0.0001 1e-06
+@value 0.003933212513650671 0.0001 1e-06
 Dictionary Key: UVarProbe
 Dictionary Key: beta
 @value 2.065456515673644e-08 0.0001 1e-06
 Dictionary Key: fail
 @value                    0 0.0001 1e-06
-Dictionary Key: pVar
-Dictionary Key: beta
-@value 0.003702060823881352 0.0001 1e-06
 Dictionary Key: wallShearStressVar
 Dictionary Key: beta
 @value 5.772757583725657e-05 0.0001 1e-06
\ No newline at end of file
diff --git a/tests/runTests_DAPimpleFoamField.py b/tests/runTests_DAPimpleFoamField.py
index 4b3ee307..b25634c8 100755
--- a/tests/runTests_DAPimpleFoamField.py
+++ b/tests/runTests_DAPimpleFoamField.py
@@ -44,11 +44,11 @@
     "designSurfaces": ["wing"],
     "solverName": "DAPimpleFoam",
     "primalBC": {"U0": {"variable": "U", "patches": ["inout"], "value": [U0, 0, 0]}, "useWallFunction": True},
-    "unsteadyAdjoint": {"mode": "timeAccurate", "objFuncStartTime": 0.01, "objFuncEndTime": 0.045},
+    "unsteadyAdjoint": {"mode": "timeAccurate", "objFuncStartTime": 0.01, "objFuncEndTime": 0.045, "objFuncTimeOperator": "average"},
     "printIntervalUnsteady": 1,
     "objFunc": {
-        "UVar": {
-            "part1": {
+        "UPVar": {
+            "UVar": {
                 "type": "variance",
                 "source": "boxToCell",
                 "min": [-100.0, -100.0, -100.0],
@@ -59,38 +59,33 @@
                 "varType": "vector",
                 "components": [0, 1, 2],
                 "addToAdjoint": True,
-                "timeOperator": "average",
             },
-        },
-        "UVarProbe": {
-            "part1": {
+            "PVar": {
                 "type": "variance",
                 "source": "boxToCell",
                 "min": [-100.0, -100.0, -100.0],
                 "max": [100.0, 100.0, 100.0],
                 "scale": 1.0,
-                "mode": "probePoint",
-                "probePointCoords": [[1.5565, -0.4780, 0.025], [1.5775, -0.1781, 0.025], [1.6245, 0.4924, 0.025]],
-                "varName": "U",
-                "varType": "vector",
-                "components": [0, 1],
+                "mode": "surface",
+                "varName": "p",
+                "varType": "scalar",
+                "surfaceNames": ["wing"],
                 "addToAdjoint": True,
-                "timeOperator": "average",
             },
         },
-        "pVar": {
+        "UVarProbe": {
             "part1": {
                 "type": "variance",
                 "source": "boxToCell",
                 "min": [-100.0, -100.0, -100.0],
                 "max": [100.0, 100.0, 100.0],
                 "scale": 1.0,
-                "mode": "surface",
-                "varName": "p",
-                "varType": "scalar",
-                "surfaceNames": ["wing"],
+                "mode": "probePoint",
+                "probePointCoords": [[1.5565, -0.4780, 0.025], [1.5775, -0.1781, 0.025], [1.6245, 0.4924, 0.025]],
+                "varName": "U",
+                "varType": "vector",
+                "components": [0, 1],
                 "addToAdjoint": True,
-                "timeOperator": "average",
             },
         },
         "wallShearStressVar": {
@@ -106,7 +101,6 @@
                 "components": [0, 1],
                 "surfaceNames": ["wing"],
                 "addToAdjoint": True,
-                "timeOperator": "average",
             },
         },
     },
@@ -190,15 +184,12 @@ def betaFieldInversion(val, geo):
     funcsSens = {}
     funcsSens, fail = optFuncs.calcObjFuncSens(xDV, funcs)
 
-    betaNormU = np.linalg.norm(funcsSens["UVar"]["beta"])
-    funcsSens["UVar"]["beta"] = betaNormU
+    betaNormU = np.linalg.norm(funcsSens["UPVar"]["beta"])
+    funcsSens["UPVar"]["beta"] = betaNormU
 
     betaNormUProb = np.linalg.norm(funcsSens["UVarProbe"]["beta"])
     funcsSens["UVarProbe"]["beta"] = betaNormUProb
 
-    betaNormP = np.linalg.norm(funcsSens["pVar"]["beta"])
-    funcsSens["pVar"]["beta"] = betaNormP
-
     betaNormS = np.linalg.norm(funcsSens["wallShearStressVar"]["beta"])
     funcsSens["wallShearStressVar"]["beta"] = betaNormS
 

From c48fe30b3390aee0745868a5cfbaf7a0d3d80669 Mon Sep 17 00:00:00 2001
From: Ping He <phe@iastate.edu>
Date: Wed, 6 Dec 2023 20:13:05 -0600
Subject: [PATCH 2/2] Updated test scripts.

---
 tests/runTests_DAPimpleFoam.py           | 4 +---
 tests/runTests_DAPimpleFoamTurbModels.py | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/runTests_DAPimpleFoam.py b/tests/runTests_DAPimpleFoam.py
index 4c1bfb7f..46bddcb9 100755
--- a/tests/runTests_DAPimpleFoam.py
+++ b/tests/runTests_DAPimpleFoam.py
@@ -34,7 +34,7 @@
     "designSurfaces": ["wing"],
     "solverName": "DAPimpleFoam",
     "primalBC": {"U0": {"variable": "U", "patches": ["inout"], "value": [U0, 0, 0]}, "useWallFunction": True},
-    "unsteadyAdjoint": {"mode": "timeAccurate", "PCMatPrecomputeInterval": 5, "PCMatUpdateInterval": 1},
+    "unsteadyAdjoint": {"mode": "timeAccurate", "PCMatPrecomputeInterval": 5, "PCMatUpdateInterval": 1, "objFuncTimeOperator": "average"},
     "printIntervalUnsteady": 1,
     "fvSource": {
         "disk1": {
@@ -64,7 +64,6 @@
                 "alphaName": "alpha",
                 "scale": 1.0,
                 "addToAdjoint": True,
-                "timeOperator": "average",
             }
         },
         "CL": {
@@ -76,7 +75,6 @@
                 "alphaName": "alpha",
                 "scale": 1.0,
                 "addToAdjoint": False,
-                "timeOperator": "average",
             }
         },
     },
diff --git a/tests/runTests_DAPimpleFoamTurbModels.py b/tests/runTests_DAPimpleFoamTurbModels.py
index 2e096682..62360974 100755
--- a/tests/runTests_DAPimpleFoamTurbModels.py
+++ b/tests/runTests_DAPimpleFoamTurbModels.py
@@ -44,7 +44,7 @@
             "epsilon0": {"variable": "epsilon", "patches": ["inout"], "value": [0.135]},
             "useWallFunction": True,
         },
-        "unsteadyAdjoint": {"mode": "timeAccurate", "PCMatPrecomputeInterval": 5, "PCMatUpdateInterval": 1},
+        "unsteadyAdjoint": {"mode": "timeAccurate", "PCMatPrecomputeInterval": 5, "PCMatUpdateInterval": 1, "objFuncTimeOperator": "average"},
         "printIntervalUnsteady": 1,
         "primalVarBounds": {"kMin": -1e16, "omegaMin": -1e16, "epsilonMin": -1e16},
         "useConstrainHbyA": True,
@@ -58,7 +58,6 @@
                     "alphaName": "alpha",
                     "scale": 1.0,
                     "addToAdjoint": True,
-                    "timeOperator": "average",
                 }
             },
             "CL": {
@@ -70,7 +69,6 @@
                     "alphaName": "alpha",
                     "scale": 1.0,
                     "addToAdjoint": False,
-                    "timeOperator": "average",
                 }
             },
         },