Skip to content

Commit

Permalink
- Revert to previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
rois1995 committed Jan 23, 2025
1 parent f5d0c82 commit 2c3e3c7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 0 additions & 2 deletions SU2_CFD/src/drivers/CMultizoneDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -403,8 +403,6 @@ bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {

for (iZone = 0; iZone < nZone; iZone++) {

output_container[iZone]->SetCurTimeIter(config_container[iZone]->GetTimeIter());

/*--- Account for all the solvers in this zone. ---*/

auto solvers = solver_container[iZone][INST_0][MESH_0];
Expand Down
1 change: 0 additions & 1 deletion SU2_CFD/src/iteration/CFluidIteration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@ void CFluidIteration::Solve(COutput* output, CIntegration**** integration, CGeom
unsigned short val_iInst) {
/*--- Boolean to determine if we are running a static or dynamic case ---*/
bool steady = !config[val_iZone]->GetTime_Domain();
output->SetCurTimeIter(config[val_iZone]->GetTimeIter());

unsigned long Inner_Iter, nInner_Iter = config[val_iZone]->GetnInner_Iter();
bool StopCalc = false;
Expand Down
7 changes: 6 additions & 1 deletion SU2_CFD/src/output/COutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,8 @@ void COutput::SetHistoryOutput(CGeometry *geometry,
unsigned long TimeIter,
unsigned long OuterIter,
unsigned long InnerIter) {


curTimeIter = TimeIter;
curAbsTimeIter = max(TimeIter, config->GetStartWindowIteration()) - config->GetStartWindowIteration();
curOuterIter = OuterIter;
curInnerIter = InnerIter;
Expand Down Expand Up @@ -272,6 +273,7 @@ void COutput::SetHistoryOutput(CGeometry ****geometry, CSolver *****solver, CCon

void COutput::SetMultizoneHistoryOutput(COutput **output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter){

curTimeIter = TimeIter;
curAbsTimeIter = max(TimeIter, driver_config->GetStartWindowIteration()) - driver_config->GetStartWindowIteration();
curOuterIter = OuterIter;

Expand Down Expand Up @@ -387,6 +389,9 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE form
/*--- File writer that will later be used to write the file to disk. Created below in the "switch" ---*/
CFileWriter *fileWriter = nullptr;

/*--- Set current time iter even if history file is not written ---*/
curTimeIter = config->GetTimeIter();

/*--- If it is still present, strip the extension (suffix) from the filename ---*/
const auto lastindex = fileName.find_last_of('.');
fileName = fileName.substr(0, lastindex);
Expand Down

0 comments on commit 2c3e3c7

Please sign in to comment.