fix for MZ outputs per surf

Author: pcarruscag

SU2_CFD/include/output/COutput.hpp

@@ -621,7 +621,7 @@ class COutput {
     if (it != historyOutputPerSurface_Map.end()) {
       it->second[iMarker].value = value;
     } else {
-      SU2_MPI::Error(string("Cannot find output field with name ") + name, CURRENT_FUNCTION);
+      SU2_MPI::Error("Cannot find output field with name " + name, CURRENT_FUNCTION);
     }
   }
 

SU2_CFD/src/output/CMultizoneOutput.cpp

@@ -103,20 +103,11 @@ void CMultizoneOutput::LoadMultizoneHistoryData(const COutput* const* output, co
       const auto& name = item.first;
       nameMultizone = name + zoneIndex;
 
-      /*--- Determine whether nMaker_Analyze/Monitoring has to be looped. ---*/
-      const auto& group = item.second[0].outputGroup;
-      unsigned short nMarker = 0;
-      if (group == "FLOW_COEFF_SURF")
-        nMarker = config[iZone]->GetnMarker_Analyze();
-      else if (group == "AERO_COEFF_SURF")
-        nMarker = config[iZone]->GetnMarker_Monitoring();
-      else
-        SU2_MPI::Error("Per Surface output group unknown: " + group, CURRENT_FUNCTION);
-
-      for (unsigned short iMarker = 0; iMarker < nMarker; iMarker++) {
-        SetHistoryOutputPerSurfaceValue(nameMultizone, item.second[iMarker].value, iMarker);
-      }// for iMarker
-    }// for HistPerSurfFields
+      unsigned short iMarker = 0;
+      for (const auto& field : item.second) {
+        SetHistoryOutputPerSurfaceValue(nameMultizone, field.value, iMarker++);
+      }
+    }
   }
   SetHistoryOutputValue("COMBO", comboValue);
 }

TestCases/hybrid_regression.py

@@ -98,7 +98,7 @@ def main():
     flatplate           = TestCase('flatplate')
     flatplate.cfg_dir   = "navierstokes/flatplate"
     flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 125
+    flatplate.test_iter = 100
     flatplate.test_vals = [-12.022962, -6.535702, 0.001112, 0.036277, 2.3615, -2.3253, -2.2795, -2.2795, 5]
     test_list.append(flatplate)
 

TestCases/navierstokes/flatplate/lam_flatplate.cfg

@@ -46,15 +46,15 @@ MARKER_ANALYZE= (inlet, outlet)
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
 NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
-CFL_NUMBER= 10000.0
+CFL_NUMBER= 10000
 CFL_ADAPT= NO
 
 % ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
 %
 LINEAR_SOLVER= FGMRES
 LINEAR_SOLVER_PREC= LU_SGS
-LINEAR_SOLVER_ERROR= 0.1
-LINEAR_SOLVER_ITER= 6
+LINEAR_SOLVER_ERROR= 0.05
+LINEAR_SOLVER_ITER= 3
 
 % -------------------------- MULTIGRID PARAMETERS -----------------------------%
 %
@@ -63,8 +63,8 @@ MGCYCLE= V_CYCLE
 MG_PRE_SMOOTH= ( 1, 1, 1, 2 )
 MG_POST_SMOOTH= ( 0, 1, 1, 0 )
 MG_CORRECTION_SMOOTH= ( 0, 0, 0, 0 )
-MG_DAMP_RESTRICTION= 0.8
-MG_DAMP_PROLONGATION= 0.8
+MG_DAMP_RESTRICTION= 0.75
+MG_DAMP_PROLONGATION= 0.75
 
 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
 %
@@ -78,7 +78,7 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT
 %
 CONV_RESIDUAL_MINVAL= -12
 CONV_STARTITER= 10
-ITER= 999999
+ITER= 500
 
 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
 %

TestCases/parallel_regression.py

@@ -204,8 +204,8 @@ def main():
     flatplate           = TestCase('flatplate')
     flatplate.cfg_dir   = "navierstokes/flatplate"
     flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 125
-    flatplate.test_vals = [-12.022962, -6.535702, 0.001112, 0.036277, 2.3615, -2.3253, -2.2795, -2.2795, 5]
+    flatplate.test_iter = 100
+    flatplate.test_vals = [-12.022986, -6.535729, 0.001112, 0.036277, 2.361500, -2.325300, -2.279500, -2.279500, 5]
     flatplate.su2_exec  = "mpirun -n 2 SU2_CFD"
     flatplate.timeout   = 1600
     flatplate.tol       = 0.00001

TestCases/serial_regression.py

@@ -201,7 +201,7 @@ def main():
     flatplate           = TestCase('flatplate')
     flatplate.cfg_dir   = "navierstokes/flatplate"
     flatplate.cfg_file  = "lam_flatplate.cfg"
-    flatplate.test_iter = 125
+    flatplate.test_iter = 100
     flatplate.test_vals = [-12.022962, -6.535702, 0.001112, 0.036277, 2.3615, -2.3253, -2.2795, -2.2795, 5]
     flatplate.su2_exec  = "SU2_CFD"
     flatplate.new_output = True