Skip to content

Fix running averages for restarted simulations #1601

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

Merged
TobiKattmann merged 4 commits into from
Apr 12, 2022
Merged

Fix running averages for restarted simulations #1601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd1629b
Fix running averages for restarted simulations.
TobiKattmann Apr 11, 2022
e119cec
Add tavg_CL/CD to testcase and add respective regression values.
TobiKattmann Apr 11, 2022
72a2104
Update TestCases/hybrid_regression.py
TobiKattmann Apr 11, 2022
1d24640
Merge branch 'develop' into fix_running_avg
TobiKattmann Apr 12, 2022
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
11 changes: 11 additions & 0 deletions Common/src/CConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3621,6 +3621,17 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
if(nTimeIter <= Restart_Iter) SU2_MPI::Error("TIME_ITER must be larger than RESTART_ITER.", CURRENT_FUNCTION);
}

/*--- WINDOW_START_ITER must be larger than or equal to: RESTART_ITER. Otherwise, the running average is wrong. ---*/
if (OptionIsSet("WINDOW_START_ITER")) {
if (StartWindowIteration < Restart_Iter) {
SU2_MPI::Error("WINDOW_START_ITER must be larger than or equal to: RESTART_ITER!", CURRENT_FUNCTION);
}
} else {
/*--- Enforced default behavior: start of the window is the first new iteration. ---*/
if (rank == MASTER_NODE) cout << "WARNING: Setting WINDOW_START_ITER = RESTART_ITER for meaningful running average.\n";
StartWindowIteration = Restart_Iter;
}

if (Time_Step <= 0.0 && Unst_CFL == 0.0){ SU2_MPI::Error("Invalid value for TIME_STEP.", CURRENT_FUNCTION); }
} else {
nTimeIter = 1;
Expand Down
2 changes: 1 addition & 1 deletion TestCases/hybrid_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ def main():
square_cylinder.cfg_dir = "unsteady/square_cylinder"
square_cylinder.cfg_file = "turb_square.cfg"
square_cylinder.test_iter = 3
square_cylinder.test_vals = [-1.162564, 0.066401, 1.399788, 2.220402]
square_cylinder.test_vals = [-1.162564, 0.066401, 1.399788, 2.220402, 1.399743, 2.218603]
square_cylinder.unsteady = True
test_list.append(square_cylinder)

Expand Down
4 changes: 2 additions & 2 deletions TestCases/parallel_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ def main():
square_cylinder.cfg_dir = "unsteady/square_cylinder"
square_cylinder.cfg_file = "turb_square.cfg"
square_cylinder.test_iter = 3
square_cylinder.test_vals = [-1.162664, 0.066378, 1.399789, 2.220404]
square_cylinder.test_vals = [-1.162664, 0.066378, 1.399789, 2.220404, 1.399743, 2.218605]
square_cylinder.su2_exec = "parallel_computation.py -f"
square_cylinder.timeout = 1600
square_cylinder.tol = 0.00001
Expand Down Expand Up @@ -1478,7 +1478,7 @@ def main():
pywrapper_square_cylinder.cfg_dir = "unsteady/square_cylinder"
pywrapper_square_cylinder.cfg_file = "turb_square.cfg"
pywrapper_square_cylinder.test_iter = 3
pywrapper_square_cylinder.test_vals = [-1.162664, 0.066378, 1.399789, 2.220404] #last 4 columns
pywrapper_square_cylinder.test_vals = [-1.162664, 0.066378, 1.399789, 2.220404, 1.399743, 2.218605] #last 4 columns
pywrapper_square_cylinder.su2_exec = "mpirun -np 2 SU2_CFD.py --parallel -f"
pywrapper_square_cylinder.timeout = 1600
pywrapper_square_cylinder.tol = 0.00001
Expand Down
4 changes: 2 additions & 2 deletions TestCases/serial_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ def main():
square_cylinder.cfg_dir = "unsteady/square_cylinder"
square_cylinder.cfg_file = "turb_square.cfg"
square_cylinder.test_iter = 3
square_cylinder.test_vals = [-1.162561, 0.066414, 1.399788, 2.220411] #last 4 columns
square_cylinder.test_vals = [-1.162561, 0.066414, 1.399788, 2.220411, 1.399743, 2.218612] #last 4 columns
square_cylinder.su2_exec = "SU2_CFD"
square_cylinder.timeout = 1600
square_cylinder.tol = 0.00001
Expand Down Expand Up @@ -1878,7 +1878,7 @@ def main():
pywrapper_square_cylinder.cfg_dir = "unsteady/square_cylinder"
pywrapper_square_cylinder.cfg_file = "turb_square.cfg"
pywrapper_square_cylinder.test_iter = 3
pywrapper_square_cylinder.test_vals = [-1.162560, 0.066414, 1.399788, 2.220411]
pywrapper_square_cylinder.test_vals = [-1.162560, 0.066414, 1.399788, 2.220411, 1.399743, 2.218612]
pywrapper_square_cylinder.su2_exec = "SU2_CFD.py -f"
pywrapper_square_cylinder.timeout = 1600
pywrapper_square_cylinder.tol = 0.00001
Expand Down
2 changes: 1 addition & 1 deletion TestCases/unsteady/square_cylinder/turb_square.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,6 @@ OUTPUT_WRT_FREQ= 1
%
%
% Screen output
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG)
SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_TKE, RMS_DISSIPATION, LIFT, DRAG, TAVG_LIFT, TAVG_DRAG)
%
OUTPUT_FILES= (RESTART_ASCII)