Skip to content

Commit b85a5f4

Browse files
committed
Moved the reg-comp after turb-update.
1 parent 8afd2ab commit b85a5f4

File tree

7 files changed

+17
-18
lines changed

7 files changed

+17
-18
lines changed

src/adjoint/DASolver/DAPimpleFoam/DAPimpleFoam.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@ label DAPimpleFoam::solvePrimal(
211211
#include "pEqnPimple.H"
212212
}
213213

214-
// update the output field value at each iteration, if the regression model is active
215-
fail = daRegressionPtr_->compute();
216-
217214
laminarTransport.correct();
218215
daTurbulenceModelPtr_->correct(pimplePrintToScreen);
216+
217+
// update the output field value at each iteration, if the regression model is active
218+
fail = daRegressionPtr_->compute();
219219
}
220220

221221
regModelFail += fail;

src/adjoint/DASolver/DARhoPimpleFoam/DARhoPimpleFoam.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ label DARhoPimpleFoam::solvePrimal(
217217
#include "pEqnRhoPimple.H"
218218
}
219219

220+
daTurbulenceModelPtr_->correct(pimplePrintToScreen);
221+
220222
// update the output field value at each iteration, if the regression model is active
221223
fail = daRegressionPtr_->compute();
222-
223-
daTurbulenceModelPtr_->correct(pimplePrintToScreen);
224224
}
225225

226226
regModelFail += fail;

src/adjoint/DASolver/DARhoSimpleCFoam/DARhoSimpleCFoam.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ label DARhoSimpleCFoam::solvePrimal(
157157
#include "EEqnRhoSimpleC.H"
158158
#include "pEqnRhoSimpleC.H"
159159

160+
daTurbulenceModelPtr_->correct(printToScreen);
161+
160162
// update the output field value at each iteration, if the regression model is active
161163
regModelFail = daRegressionPtr_->compute();
162164

163-
daTurbulenceModelPtr_->correct(printToScreen);
164-
165165
if (this->validateStates())
166166
{
167167
// write data to files and quit

src/adjoint/DASolver/DARhoSimpleFoam/DARhoSimpleFoam.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@ label DARhoSimpleFoam::solvePrimal(
174174
#include "EEqnRhoSimple.H"
175175
#include "pEqnRhoSimple.H"
176176

177+
daTurbulenceModelPtr_->correct(printToScreen);
178+
177179
// update the output field value at each iteration, if the regression model is active
178180
regModelFail = daRegressionPtr_->compute();
179181

180-
daTurbulenceModelPtr_->correct(printToScreen);
181-
182182
if (this->validateStates())
183183
{
184184
// write data to files and quit

src/adjoint/DASolver/DASimpleFoam/DASimpleFoam.C

+3-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ void DASimpleFoam::initSolver()
102102
daFvSourcePtr_.reset(DAFvSource::New(
103103
fvSourceType, mesh, daOptionPtr_(), daModelPtr_(), daIndexPtr_()));
104104
}
105-
106105
}
107106

108107
label DASimpleFoam::solvePrimal(
@@ -185,12 +184,12 @@ label DASimpleFoam::solvePrimal(
185184
#include "pEqnSimple.H"
186185
}
187186

188-
// update the output field value at each iteration, if the regression model is active
189-
regModelFail = daRegressionPtr_->compute();
190-
191187
laminarTransport.correct();
192188
daTurbulenceModelPtr_->correct(printToScreen);
193189

190+
// update the output field value at each iteration, if the regression model is active
191+
regModelFail = daRegressionPtr_->compute();
192+
194193
if (this->validateStates())
195194
{
196195
// write data to files and quit

src/adjoint/DASolver/DASimpleTFoam/DASimpleTFoam.C

+3-3
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ label DASimpleTFoam::solvePrimal(
165165
#include "TEqnSimpleT.H"
166166
}
167167

168-
// update the output field value at each iteration, if the regression model is active
169-
regModelFail = daRegressionPtr_->compute();
170-
171168
laminarTransport.correct();
172169
daTurbulenceModelPtr_->correct(printToScreen);
173170

171+
// update the output field value at each iteration, if the regression model is active
172+
regModelFail = daRegressionPtr_->compute();
173+
174174
if (this->validateStates())
175175
{
176176
// write data to files and quit

src/adjoint/DASolver/DATurboFoam/DATurboFoam.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ label DATurboFoam::solvePrimal(
127127
#include "pEqnTurbo.H"
128128
#include "EEqnTurbo.H"
129129

130+
daTurbulenceModelPtr_->correct(printToScreen);
131+
130132
// update the output field value at each iteration, if the regression model is active
131133
regModelFail = daRegressionPtr_->compute();
132134

133-
daTurbulenceModelPtr_->correct(printToScreen);
134-
135135
if (this->validateStates())
136136
{
137137
// write data to files and quit

0 commit comments

Comments
 (0)