Skip to content

Commit 1372590

Browse files
committed
you always get more than you bargain for...
1 parent 1aae062 commit 1372590

5 files changed

Lines changed: 7 additions & 10 deletions

File tree

SU2_CFD/src/output/CMultizoneOutput.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,11 @@ void CMultizoneOutput::SetMultizoneHistoryOutputFields(const COutput* const* out
172172
group = field[0].outputGroup;
173173

174174
/*--- Determine whether Maker_Analyze/Monitoring has to be used. ---*/
175-
vector<string>* Marker;
175+
auto* Marker = &Marker_Monitoring;
176176
if (group == "FLOW_COEFF_SURF")
177177
Marker = &Marker_Analyze;
178-
else if (group == "AERO_COEFF_SURF")
179-
Marker = &Marker_Monitoring;
180-
else {
181-
Marker = &Marker_Analyze; // dummy to suppress maybe-uninitialized warning
178+
else if (group != "AERO_COEFF_SURF" && group != "HEAT_SURF")
182179
SU2_MPI::Error("Per Surface output group unknown: " + group, CURRENT_FUNCTION);
183-
}
184180

185181
group += zoneIndex;
186182

TestCases/hybrid_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def main():
9999
flatplate.cfg_dir = "navierstokes/flatplate"
100100
flatplate.cfg_file = "lam_flatplate.cfg"
101101
flatplate.test_iter = 100
102-
flatplate.test_vals = [-12.022962, -6.535702, 0.001112, 0.036277, 2.3615, -2.3253, -2.2795, -2.2795, 5]
102+
flatplate.test_vals = [-9.154121, -3.663159, 0.001112, 0.036277, 2.361500, -2.325300, -2.278800, -2.278800]
103103
test_list.append(flatplate)
104104

105105
# Laminar cylinder (steady)

TestCases/navierstokes/flatplate/lam_flatplate.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,5 @@ RESTART_FILENAME= restart_flow.dat
9191
RESTART_ADJ_FILENAME= restart_adj.dat
9292
GRAD_OBJFUNC_FILENAME= of_grad.dat
9393
OUTPUT_WRT_FREQ= 250
94-
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, DRAG, SURFACE_MASSFLOW, TOTAL_HEATFLUX, TOTAL_HEATFLUX_ON_SURFACE, LINSOL_ITER)
94+
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, DRAG, SURFACE_MASSFLOW, TOTAL_HEATFLUX, TOTAL_HEATFLUX_ON_SURFACE)
95+

TestCases/parallel_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def main():
205205
flatplate.cfg_dir = "navierstokes/flatplate"
206206
flatplate.cfg_file = "lam_flatplate.cfg"
207207
flatplate.test_iter = 100
208-
flatplate.test_vals = [-12.022986, -6.535729, 0.001112, 0.036277, 2.361500, -2.325300, -2.279500, -2.279500, 5]
208+
flatplate.test_vals = [-9.336395, -3.849426, 0.001112, 0.036276, 2.361500, -2.325300, -2.279700, -2.279700]
209209
flatplate.su2_exec = "mpirun -n 2 SU2_CFD"
210210
flatplate.timeout = 1600
211211
flatplate.tol = 0.00001

TestCases/serial_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def main():
202202
flatplate.cfg_dir = "navierstokes/flatplate"
203203
flatplate.cfg_file = "lam_flatplate.cfg"
204204
flatplate.test_iter = 100
205-
flatplate.test_vals = [-12.022962, -6.535702, 0.001112, 0.036277, 2.3615, -2.3253, -2.2795, -2.2795, 5]
205+
flatplate.test_vals = [-9.856258, -4.371983, 0.001112, 0.036277, 2.361500, -2.325300, -2.279500, -2.279500]
206206
flatplate.su2_exec = "SU2_CFD"
207207
flatplate.new_output = True
208208
flatplate.timeout = 1600

0 commit comments

Comments
 (0)