Moved regModel-compute after turb-correct (#627)

* Moved the reg-comp after turb-update. * Updated pimple test.
mdolab · Apr 12, 2024 · 528b283 · 528b283
1 parent 8afd2ab
commit 528b283
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 50 deletions.
diff --git a/src/adjoint/DASolver/DAPimpleFoam/DAPimpleFoam.C b/src/adjoint/DASolver/DAPimpleFoam/DAPimpleFoam.C
@@ -211,11 +211,11 @@ label DAPimpleFoam::solvePrimal(
 #include "pEqnPimple.H"
             }
 
-            // update the output field value at each iteration, if the regression model is active
-            fail = daRegressionPtr_->compute();
-
             laminarTransport.correct();
             daTurbulenceModelPtr_->correct(pimplePrintToScreen);
+
+            // update the output field value at each iteration, if the regression model is active
+            fail = daRegressionPtr_->compute();
         }
 
         regModelFail += fail;

diff --git a/src/adjoint/DASolver/DARhoPimpleFoam/DARhoPimpleFoam.C b/src/adjoint/DASolver/DARhoPimpleFoam/DARhoPimpleFoam.C
@@ -217,10 +217,10 @@ label DARhoPimpleFoam::solvePrimal(
 #include "pEqnRhoPimple.H"
             }
 
+            daTurbulenceModelPtr_->correct(pimplePrintToScreen);
+
             // update the output field value at each iteration, if the regression model is active
             fail = daRegressionPtr_->compute();
-
-            daTurbulenceModelPtr_->correct(pimplePrintToScreen);
         }
 
         regModelFail += fail;

diff --git a/src/adjoint/DASolver/DARhoSimpleCFoam/DARhoSimpleCFoam.C b/src/adjoint/DASolver/DARhoSimpleCFoam/DARhoSimpleCFoam.C
@@ -157,11 +157,11 @@ label DARhoSimpleCFoam::solvePrimal(
 #include "EEqnRhoSimpleC.H"
 #include "pEqnRhoSimpleC.H"
 
+        daTurbulenceModelPtr_->correct(printToScreen);
+
         // update the output field value at each iteration, if the regression model is active
         regModelFail = daRegressionPtr_->compute();
 
-        daTurbulenceModelPtr_->correct(printToScreen);
-
         if (this->validateStates())
         {
             // write data to files and quit

diff --git a/src/adjoint/DASolver/DARhoSimpleFoam/DARhoSimpleFoam.C b/src/adjoint/DASolver/DARhoSimpleFoam/DARhoSimpleFoam.C
@@ -174,11 +174,11 @@ label DARhoSimpleFoam::solvePrimal(
 #include "EEqnRhoSimple.H"
 #include "pEqnRhoSimple.H"
 
+        daTurbulenceModelPtr_->correct(printToScreen);
+
         // update the output field value at each iteration, if the regression model is active
         regModelFail = daRegressionPtr_->compute();
 
-        daTurbulenceModelPtr_->correct(printToScreen);
-
         if (this->validateStates())
         {
             // write data to files and quit

diff --git a/src/adjoint/DASolver/DASimpleFoam/DASimpleFoam.C b/src/adjoint/DASolver/DASimpleFoam/DASimpleFoam.C
@@ -102,7 +102,6 @@ void DASimpleFoam::initSolver()
         daFvSourcePtr_.reset(DAFvSource::New(
             fvSourceType, mesh, daOptionPtr_(), daModelPtr_(), daIndexPtr_()));
     }
-
 }
 
 label DASimpleFoam::solvePrimal(
@@ -185,12 +184,12 @@ label DASimpleFoam::solvePrimal(
 #include "pEqnSimple.H"
         }
 
-        // update the output field value at each iteration, if the regression model is active
-        regModelFail = daRegressionPtr_->compute();
-
         laminarTransport.correct();
         daTurbulenceModelPtr_->correct(printToScreen);
 
+        // update the output field value at each iteration, if the regression model is active
+        regModelFail = daRegressionPtr_->compute();
+
         if (this->validateStates())
         {
             // write data to files and quit

diff --git a/src/adjoint/DASolver/DASimpleTFoam/DASimpleTFoam.C b/src/adjoint/DASolver/DASimpleTFoam/DASimpleTFoam.C
@@ -165,12 +165,12 @@ label DASimpleTFoam::solvePrimal(
 #include "TEqnSimpleT.H"
         }
 
-        // update the output field value at each iteration, if the regression model is active
-        regModelFail = daRegressionPtr_->compute();
-
         laminarTransport.correct();
         daTurbulenceModelPtr_->correct(printToScreen);
 
+        // update the output field value at each iteration, if the regression model is active
+        regModelFail = daRegressionPtr_->compute();
+
         if (this->validateStates())
         {
             // write data to files and quit

diff --git a/src/adjoint/DASolver/DATurboFoam/DATurboFoam.C b/src/adjoint/DASolver/DATurboFoam/DATurboFoam.C
@@ -127,11 +127,11 @@ label DATurboFoam::solvePrimal(
 #include "pEqnTurbo.H"
 #include "EEqnTurbo.H"
 
+        daTurbulenceModelPtr_->correct(printToScreen);
+
         // update the output field value at each iteration, if the regression model is active
         regModelFail = daRegressionPtr_->compute();
 
-        daTurbulenceModelPtr_->correct(printToScreen);
-
         if (this->validateStates())
         {
             // write data to files and quit

diff --git a/tests/refs/DAFoam_Test_DAPimpleFoamRef.txt b/tests/refs/DAFoam_Test_DAPimpleFoamRef.txt
@@ -1,54 +1,54 @@
 Dictionary Key: CD
-@value    7.747035248407224 1e-08 1e-10
+@value    7.747018955982705 1e-08 1e-10
 Dictionary Key: CMZVAR
-@value    41.05825112111668 1e-08 1e-10
+@value    41.05825214841987 1e-08 1e-10
 Dictionary Key: fail
 @value                    0 1e-08 1e-10
 Dictionary Key: CD
 Dictionary Key: actuator
-@value  0.06141701879027876 0.0001 1e-06
-@value -0.02943080425870279 0.0001 1e-06
-@value 8.532337048146331e-07 0.0001 1e-06
+@value  0.06141669123894886 0.0001 1e-06
+@value -0.02943035191818643 0.0001 1e-06
+@value 8.532367829232026e-07 0.0001 1e-06
 @value                    0 0.0001 1e-06
-@value -0.02832583727264912 0.0001 1e-06
-@value -5.402338249648069e-06 0.0001 1e-06
-@value  -0.1093209186116286 0.0001 1e-06
-@value -0.003809751562879285 0.0001 1e-06
-@value 0.0002923808412825273 0.0001 1e-06
-@value -6.047390772232167e-07 0.0001 1e-06
-@value -0.02579299253429663 0.0001 1e-06
-@value -0.01957309335551474 0.0001 1e-06
+@value -0.02832584350427931 0.0001 1e-06
+@value -5.402340242215096e-06 0.0001 1e-06
+@value  -0.1093202159672174 0.0001 1e-06
+@value -0.003809632067486717 0.0001 1e-06
+@value 0.000292379034350851 0.0001 1e-06
+@value -6.047928239713498e-07 0.0001 1e-06
+@value -0.02579282652884607 0.0001 1e-06
+@value -0.01957297931933645 0.0001 1e-06
 @value                    0 0.0001 1e-06
 Dictionary Key: alpha
-@value   0.2971414616605795 0.0001 1e-06
+@value   0.2971412894447766 0.0001 1e-06
 Dictionary Key: parameter
-@value   0.1062184733491818 0.0001 1e-06
+@value   0.1061176536441759 0.0001 1e-06
 Dictionary Key: twist
-@value   0.5092926662504045 0.0001 1e-06
+@value   0.5092929899511818 0.0001 1e-06
 Dictionary Key: uin
-@value   0.1887121251618032 0.0001 1e-06
+@value   0.1887107736261104 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.01291643471777806 0.0001 1e-06
+@value -0.06721783286374683 0.0001 1e-06
+@value 1.012188890171458e-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.03989830051579327 0.0001 1e-06
+@value -1.174778728995113e-05 0.0001 1e-06
+@value -0.01318480218147377 0.0001 1e-06
+@value  0.02098453642920323 0.0001 1e-06
+@value 7.847574927121338e-05 0.0001 1e-06
+@value 1.135351990357217e-06 0.0001 1e-06
+@value -0.004900628281173936 0.0001 1e-06
+@value -0.007270672904233405 0.0001 1e-06
 @value                    0 0.0001 1e-06
 Dictionary Key: alpha
-@value   0.1694703610086252 0.0001 1e-06
+@value   0.1694703808315662 0.0001 1e-06
 Dictionary Key: parameter
-@value  0.01322002733662093 0.0001 1e-06
+@value  0.01320303798700824 0.0001 1e-06
 Dictionary Key: twist
-@value    2.800461713324844 0.0001 1e-06
+@value    2.800461949695517 0.0001 1e-06
 Dictionary Key: uin
-@value   0.5352121060453168 0.0001 1e-06
+@value   0.5352122732349225 0.0001 1e-06
 Dictionary Key: fail
 @value                    0 0.0001 1e-06