Added tests and fixed an issue for refDiffSquare.

Author: friedenhe

src/adjoint/DAObjFunc/DAObjFunc.C

@@ -330,11 +330,11 @@ void DAObjFunc::calcRefDiffSquare(scalar& objFuncValue)
     {
         if (ref_.size() == 1)
         {
-            objFuncValue = (objFuncValue - ref_) * (objFuncValue - ref_);
+            objFuncValue = (objFuncValue - ref_[0]) * (objFuncValue - ref_[0]);
         }
         else
         {
-            label idxI = runTime.timeIndex() - 1;
+            label idxI = mesh_.time().timeIndex() - 1;
             objFuncValue = (objFuncValue - ref_[idxI]) * (objFuncValue - ref_[idxI]);
         }
     }

tests/refs/DAFoam_Test_DAPimpleFoamRef.txt

@@ -1,5 +1,7 @@
 Dictionary Key: CD
 @value    7.747035248407224 1e-08 1e-10
+Dictionary Key: CMZVAR
+@value    41.05825112111668 1e-08 1e-10
 Dictionary Key: fail
 @value                    0 1e-08 1e-10
 Dictionary Key: CD
@@ -25,5 +27,29 @@ Dictionary Key: twist
 @value   0.5092926662504045 0.0001 1e-06
 Dictionary Key: uin
 @value   0.1887121251618032 0.0001 1e-06
+Dictionary Key: CMZVAR
+Dictionary Key: actuator
+@value   0.0129164206206973 0.0001 1e-06
+@value -0.06721779867591618 0.0001 1e-06
+@value 1.01218774787428e-06 0.0001 1e-06
+@value                    0 0.0001 1e-06
+@value -0.03989829709014971 0.0001 1e-06
+@value -1.174777939902339e-05 0.0001 1e-06
+@value -0.01318488544862298 0.0001 1e-06
+@value  0.02098447283371081 0.0001 1e-06
+@value 7.847578532670927e-05 0.0001 1e-06
+@value 1.135345283703712e-06 0.0001 1e-06
+@value -0.00490063870041851 0.0001 1e-06
+@value -0.007270668470157968 0.0001 1e-06
+@value                    0 0.0001 1e-06
+Dictionary Key: alpha
+@value   0.1694703610086252 0.0001 1e-06
+Dictionary Key: parameter
+@value  0.01322002733662093 0.0001 1e-06
+Dictionary Key: twist
+@value    2.800461713324844 0.0001 1e-06
+Dictionary Key: uin
+@value   0.5352121060453168 0.0001 1e-06
+
 Dictionary Key: fail
 @value                    0 0.0001 1e-06

tests/runTests_DAPimpleFoam.py

@@ -95,6 +95,19 @@
                 "addToAdjoint": False,
             }
         },
+        "CMZVAR": {
+            "part1": {
+                "type": "moment",
+                "source": "patchToFace",
+                "patches": ["wing"],
+                "axis": [0.0, 0.0, 1.0],
+                "center": [0.25, 0.0, 0.05],
+                "scale": 1.0,
+                "addToAdjoint": True,
+                "calcRefDiffSquare": True,
+                "ref": [0.1, 0.05, 0.04, 0.02, 0.02, 0.01, 0.0, -0.01, -0.01, -0.02]
+            }
+        }
     },
     "adjStateOrdering": "cell",
     "adjEqnOption": {
@@ -267,6 +280,9 @@ def regModel(val, geo):
     parameterNormU = np.linalg.norm(funcsSens["CD"]["parameter"])
     funcsSens["CD"]["parameter"] = parameterNormU
 
+    parameterNormM = np.linalg.norm(funcsSens["CMZVAR"]["parameter"])
+    funcsSens["CMZVAR"]["parameter"] = parameterNormM
+
     if gcomm.rank == 0:
         reg_write_dict(funcs, 1e-8, 1e-10)
         reg_write_dict(funcsSens, 1e-4, 1e-6)