fix order of BUFFET and COMBO header in hist map

Author: pcarruscag

SU2_CFD/src/output/CFlowCompOutput.cpp

@@ -229,10 +229,6 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("NEARFIELD_OF", "CNearFieldOF", ScreenOutputFormat::SCIENTIFIC, "EQUIVALENT_AREA", "Nearfield obj. function", HistoryFieldType::COEFFICIENT);
   /// END_GROUP
 
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    AddHistoryOutput("BUFFET", "Buffet", ScreenOutputFormat::SCIENTIFIC, "AERO_COEFF", "Buffet sensor", HistoryFieldType::COEFFICIENT);
-  }
-
   ///   /// BEGIN_GROUP: HEAT_COEFF, DESCRIPTION: Heat coefficients on all surfaces set with MARKER_MONITORING.
   /// DESCRIPTION: Total heatflux
   AddHistoryOutput("TOTAL_HEATFLUX", "HF",      ScreenOutputFormat::SCIENTIFIC, "HEAT", "Total heatflux on all surfaces set with MARKER_MONITORING.", HistoryFieldType::COEFFICIENT);
@@ -275,6 +271,10 @@ void CFlowCompOutput::SetHistoryOutputFields(CConfig *config){
 
   AddAerodynamicCoefficients(config);
 
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    AddHistoryOutput("BUFFET", "Buffet", ScreenOutputFormat::SCIENTIFIC, "AERO_COEFF", "Buffet sensor", HistoryFieldType::COEFFICIENT);
+  }
+
   /*--- Add Cp diff fields ---*/
 
   Add_CpInverseDesignOutput(config);
@@ -664,10 +664,6 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
     }
   }
 
-  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
-    SetHistoryOutputValue("BUFFET", flow_solver->GetTotal_Buffet_Metric());
-  }
-
   SetHistoryOutputValue("TOTAL_HEATFLUX",   flow_solver->GetTotal_HeatFlux());
   SetHistoryOutputValue("MAXIMUM_HEATFLUX", flow_solver->GetTotal_MaxHeatFlux());
 
@@ -704,6 +700,10 @@ void CFlowCompOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CSol
 
   SetAerodynamicCoefficients(config, flow_solver);
 
+  if (config->GetKind_Solver() == RANS || config->GetKind_Solver() == NAVIER_STOKES){
+    SetHistoryOutputValue("BUFFET", flow_solver->GetTotal_Buffet_Metric());
+  }
+
   /*--- Set rotating frame coefficients --- */
 
   SetRotatingFrameCoefficients(config, flow_solver);

SU2_PY/SU2/io/historyMap.py

@@ -268,7 +268,7 @@
                                   'TYPE': 'D_COEFFICIENT'},
  'D_COMBO': {'DESCRIPTION': 'Derivative value',
              'GROUP': 'D_COMBO',
-             'HEADER': 'd[ObjFun]',
+             'HEADER': 'd[ComboObj]',
              'TYPE': 'D_COEFFICIENT'},
  'D_DELTA_CL': {'DESCRIPTION': 'Derivative value',
                 'GROUP': 'D_FIXED_CL',
@@ -929,7 +929,7 @@
                                      'TYPE': 'TAVG_COEFFICIENT'},
  'TAVG_COMBO': {'DESCRIPTION': 'weighted time average value',
                 'GROUP': 'TAVG_COMBO',
-                'HEADER': 'tavg[ObjFun]',
+                'HEADER': 'tavg[ComboObj]',
                 'TYPE': 'TAVG_COEFFICIENT'},
  'TAVG_DELTA_CL': {'DESCRIPTION': 'weighted time average value',
                    'GROUP': 'TAVG_FIXED_CL',
@@ -973,7 +973,7 @@
                                        'TYPE': 'TAVG_D_COEFFICIENT'},
  'TAVG_D_COMBO': {'DESCRIPTION': 'weighted time average derivative value',
                   'GROUP': 'TAVG_D_COMBO',
-                  'HEADER': 'dtavg[ObjFun]',
+                  'HEADER': 'dtavg[ComboObj]',
                   'TYPE': 'TAVG_D_COEFFICIENT'},
  'TAVG_D_DELTA_CL': {'DESCRIPTION': 'weighted time average derivative value',
                      'GROUP': 'TAVG_D_FIXED_CL',