Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fixes / cleanup of CONV_CRITERIA which has no effect and will be deprecated in 7.2.0 #1238

Merged
merged 11 commits into from
Mar 22, 2021
Merged

Some fixes / cleanup of CONV_CRITERIA which has no effect and will be deprecated in 7.2.0 #1238

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
445a975
rm unused Set/GetGeometryPlanes function.
TobiKattmann Mar 10, 2021
46a9c3f
Some small typo, comment, rearrangement fixes.
TobiKattmann Mar 10, 2021
de78e4b
Unsuccesful addition of avgT Obj Func for flow solver
TobiKattmann Mar 16, 2021
cc74598
Merge remote-tracking branch 'origin/develop' into happy_little_fixes
TobiKattmann Mar 18, 2021
503f2d4
Remove unused CONV_CRITERIA cfg option from code. Testcases 223(fml) …
TobiKattmann Mar 18, 2021
b73341f
Remove CONV_CRITERIA from 223 Testcases.
TobiKattmann Mar 18, 2021
331d37f
Remove own testcode.
TobiKattmann Mar 18, 2021
84b13c6
Better error msg for deprecated CONV_CRITERIA.
TobiKattmann Mar 19, 2021
9c1a701
Merge remote-tracking branch 'origin/develop' into happy_little_fixes
TobiKattmann Mar 19, 2021
aa7393f
Make error for deprecated CONV_CRITERIA a warning. Revert that commit…
TobiKattmann Mar 19, 2021
93fd616
For unsteady check that RESTART_ITER < TIME_ITER.
TobiKattmann Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Common/src/CConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3428,7 +3428,11 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
if (!OptionIsSet("HISTORY_WRT_FREQ_INNER")) { HistoryWrtFreq[2] = 0; }
if (!OptionIsSet("HISTORY_WRT_FREQ_OUTER")) { HistoryWrtFreq[1] = 0; }

if (Restart == NO) { Restart_Iter = 0; }
if (Restart == NO) {
Restart_Iter = 0;
} else {
if(nTimeIter <= Restart_Iter) SU2_MPI::Error("TIME_ITER must be larger than RESTART_ITER.", CURRENT_FUNCTION);
}

if (Time_Step <= 0.0 && Unst_CFL == 0.0){ SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION); }
} else {
Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/src/drivers/CMultizoneDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void CMultizoneDriver::StartSolver() {
if (rank == MASTER_NODE){
cout << endl <<"Simulation Run using the Multizone Driver" << endl;
if (driver_config->GetTime_Domain())
cout << "The simulation will run for " << driver_config->GetnTime_Iter() << " time steps." << endl;
cout << "The simulation will run until time step " << driver_config->GetnTime_Iter() << "." << endl;
Copy link
Contributor Author

@TobiKattmann TobiKattmann Mar 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In SingleZoneDriver nTimeIter - Restart_Iter can lead to underflow of the unsigned long result which is now checked in CConfig

}

/*--- Set the initial time iteration to the restart iteration. ---*/
Expand Down