try to fix objective functions, #1075

Author: pcarruscag

Common/include/CConfig.hpp

@@ -141,8 +141,7 @@ class CConfig {
   Sens_Remove_Sharp,        /*!< \brief Flag for removing or not the sharp edges from the sensitivity computation. */
   Hold_GridFixed,           /*!< \brief Flag hold fixed some part of the mesh during the deformation. */
   Axisymmetric,             /*!< \brief Flag for axisymmetric calculations */
-  Integrated_HeatFlux,      /*!< \brief Flag for heat flux BC whether it deals with integrated values.*/
-  Buffet_Monitoring;        /*!< \brief Flag for computing the buffet sensor.*/
+  Integrated_HeatFlux;      /*!< \brief Flag for heat flux BC whether it deals with integrated values.*/
   su2double Buffet_k;       /*!< \brief Sharpness coefficient for buffet sensor.*/
   su2double Buffet_lambda;  /*!< \brief Offset parameter for buffet sensor.*/
   su2double Damp_Engine_Inflow;   /*!< \brief Damping factor for the engine inlet. */
@@ -5034,11 +5033,6 @@ class CConfig {
    */
   unsigned short GetKind_ObjFunc(unsigned short val_obj = 0) const { return Kind_ObjFunc[val_obj]; }
 
-  /*!
-   * \brief Similar to GetKind_ObjFunc but returns the corresponding string.
-   */
-  string GetName_ObjFunc(unsigned short val_obj = 0) const;
-
   /*!
    * \author H. Kline
    * \brief Get the weight of objective function. There are several options: Drag coefficient,
@@ -5867,12 +5861,6 @@ class CConfig {
    */
   unsigned short GetDesign_Variable(unsigned short val_dv) const { return Design_Variable[val_dv]; }
 
-  /*!
-   * \brief Provides the buffet monitoring information.
-   * \return Buffet monitoring information, if <code>TRUE</code> then the code will compute the buffet sensor.
-   */
-  bool GetBuffet_Monitoring(void) const { return Buffet_Monitoring; }
-
   /*!
    * \brief Get the buffet sensor sharpness coefficient.
    * \return Sharpness coefficient for buffet sensor.

Common/include/option_structure.hpp

@@ -1485,7 +1485,7 @@ enum ENUM_OBJECTIVE {
   INVERSE_DESIGN_HEATFLUX = 6,  /*!< \brief Heat flux objective function definition (inverse design). */
   TOTAL_HEATFLUX = 7,           /*!< \brief Total heat flux. */
   MAXIMUM_HEATFLUX = 8,         /*!< \brief Maximum heat flux. */
-  TOTAL_AVG_TEMPERATURE = 70,   /*!< \brief Total averaged temperature. */
+  AVG_TEMPERATURE = 70,         /*!< \brief Total averaged temperature. */
   MOMENT_X_COEFFICIENT = 9,     /*!< \brief Pitching moment objective function definition. */
   MOMENT_Y_COEFFICIENT = 10,    /*!< \brief Rolling moment objective function definition. */
   MOMENT_Z_COEFFICIENT = 11,    /*!< \brief Yawing objective function definition. */
@@ -1545,7 +1545,7 @@ static const MapType<string, ENUM_OBJECTIVE> Objective_Map = {
   MakePair("TORQUE", TORQUE_COEFFICIENT)
   MakePair("TOTAL_HEATFLUX", TOTAL_HEATFLUX)
   MakePair("MAXIMUM_HEATFLUX", MAXIMUM_HEATFLUX)
-  MakePair("TOTAL_AVG_TEMPERATURE", TOTAL_AVG_TEMPERATURE)
+  MakePair("AVG_TEMPERATURE", AVG_TEMPERATURE)
   MakePair("FIGURE_OF_MERIT", FIGURE_OF_MERIT)
   MakePair("BUFFET", BUFFET_SENSOR)
   MakePair("SURFACE_TOTAL_PRESSURE", SURFACE_TOTAL_PRESSURE)

Common/src/CConfig.cpp

@@ -1594,8 +1594,6 @@ void CConfig::SetConfig_Options() {
   /* DESCRIPTION: Evaluate a problem with engines */
   addBoolOption("ENGINE", Engine, false);
 
-  /* DESCRIPTION:  Compute buffet sensor */
-  addBoolOption("BUFFET_MONITORING", Buffet_Monitoring, false);
   /* DESCRIPTION:  Sharpness coefficient for the buffet sensor */
   addDoubleOption("BUFFET_K", Buffet_k, 10.0);
   /* DESCRIPTION:  Offset parameter for the buffet sensor */
@@ -3502,10 +3500,6 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     SU2_MPI::Error("Harmonic Balance not yet implemented for the incompressible solver.", CURRENT_FUNCTION);
   }
 
-  if ((Kind_Solver != NAVIER_STOKES && Kind_Solver != RANS) && (Buffet_Monitoring == true)){
-    SU2_MPI::Error("Buffet monitoring incompatible with solvers other than NAVIER_STOKES and RANS", CURRENT_FUNCTION);
-  }
-
   /*--- Check for Fluid model consistency ---*/
 
   if (standard_air) {
@@ -7996,9 +7990,9 @@ string CConfig::GetObjFunc_Extension(string val_filename) const {
         case TORQUE_COEFFICIENT:          AdjExt = "_cq";       break;
         case TOTAL_HEATFLUX:              AdjExt = "_totheat";  break;
         case MAXIMUM_HEATFLUX:            AdjExt = "_maxheat";  break;
-        case TOTAL_AVG_TEMPERATURE:       AdjExt = "_avtp";     break;
+        case AVG_TEMPERATURE:             AdjExt = "_avtp";     break;
         case FIGURE_OF_MERIT:             AdjExt = "_merit";    break;
-        case BUFFET_SENSOR:               AdjExt = "_buffet";    break;
+        case BUFFET_SENSOR:               AdjExt = "_buffet";   break;
         case SURFACE_TOTAL_PRESSURE:      AdjExt = "_pt";       break;
         case SURFACE_STATIC_PRESSURE:     AdjExt = "_pe";       break;
         case SURFACE_MASSFLOW:            AdjExt = "_mfr";      break;
@@ -9305,13 +9299,6 @@ short CConfig::FindInterfaceMarker(unsigned short iInterface) const {
   return -1;
 }
 
-string CConfig::GetName_ObjFunc(unsigned short val_obj) const {
-  for (auto item : Objective_Map)
-    if (item.second == static_cast<ENUM_OBJECTIVE>(Kind_ObjFunc[val_obj]))
-      return item.first;
-  return string();
-}
-
 void CConfig::Tick(double *val_start_time) {
 
 #ifdef PROFILE

SU2_CFD/include/solvers/CFVMFlowSolverBase.hpp

@@ -1464,6 +1464,13 @@ class CFVMFlowSolverBase : public CSolver {
    */
   void Friction_Forces(const CGeometry* geometry, const CConfig* config) final;
 
+  /*!
+   * \brief Compute the buffet sensor.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   */
+  inline virtual void Buffet_Monitoring(const CGeometry *geometry, const CConfig *config) { }
+
   /*!
    * \brief Allocates the final pointer of SlidingState depending on how many donor vertex donate to it.
    * That number is stored in SlidingStateNodes[val_marker][val_vertex].

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -2487,6 +2487,10 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
     SurfaceCoeff.CMy[iMarker_Monitoring] += SurfaceViscCoeff.CMy[iMarker_Monitoring];
     SurfaceCoeff.CMz[iMarker_Monitoring] += SurfaceViscCoeff.CMz[iMarker_Monitoring];
   }
+
+
+  Buffet_Monitoring(geometry, config);
+
 }
 
 template<class V, ENUM_REGIME R>
@@ -2586,6 +2590,9 @@ su2double CFVMFlowSolverBase<V,R>::EvaluateCommonObjFunc(const CConfig& config)
     case SURFACE_SECOND_OVER_UNIFORM:
       objFun += weight * config.GetSurface_SecondOverUniform(0);
       break;
+    case SURFACE_PRESSURE_DROP:
+      objFun += weight * config.GetSurface_PressureDrop(0);
+      break;
     case CUSTOM_OBJFUNC:
       objFun += weight * Total_Custom_ObjFunc;
       break;

SU2_CFD/include/solvers/CNSSolver.hpp

@@ -203,7 +203,7 @@ class CNSSolver final : public CEulerSolver {
    * \param[in] geometry - Geometrical definition of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  void Buffet_Monitoring(CGeometry *geometry, CConfig *config) override;
+  void Buffet_Monitoring(const CGeometry *geometry, const CConfig *config) override;
 
   /*!
    * \brief Compute the viscous contribution for a particular edge.

SU2_CFD/include/solvers/CSolver.hpp

@@ -1638,13 +1638,6 @@ class CSolver {
    */
   inline virtual void Friction_Forces(const CGeometry* geometry, const CConfig* config) { }
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  inline virtual void Buffet_Monitoring(CGeometry *geometry, CConfig *config) { }
-
   /*!
    * \brief A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -654,9 +654,6 @@ void CDiscAdjMultizoneDriver::DirectIteration(unsigned short iZone, unsigned sho
 void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
 
   ObjFunc = 0.0;
-  su2double Weight_ObjFunc;
-
-  unsigned short iMarker_Analyze, nMarker_Analyze;
 
   /*--- Call objective function calculations. ---*/
 
@@ -678,14 +675,16 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
         if(config->GetWeakly_Coupled_Heat()) {
           solvers[HEAT_SOL]->Heat_Fluxes(geometry, solvers, config);
         }
+
+        direct_output[iZone]->SetHistory_Output(geometry, solvers, config);
+
         solvers[FLOW_SOL]->Evaluate_ObjFunc(config);
         break;
+
       case DISC_ADJ_HEAT:
         solvers[HEAT_SOL]->Heat_Fluxes(geometry, solvers, config);
         break;
     }
-
-    direct_output[iZone]->SetHistory_Output(geometry, solvers, config);
   }
 
   /*--- Extract objective function values. ---*/
@@ -696,28 +695,9 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
     auto solvers = solver_container[iZone][INST_0][MESH_0];
     auto geometry = geometry_container[iZone][INST_0][MESH_0];
 
-    nMarker_Analyze = config->GetnMarker_Analyze();
-
-    for (iMarker_Analyze = 0; iMarker_Analyze < nMarker_Analyze; iMarker_Analyze++) {
-
-      Weight_ObjFunc = config->GetWeight_ObjFunc(iMarker_Analyze);
-
-      switch (config->GetKind_Solver()) {
-
-        case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-          // per-surface output to be added soon
-          break;
-        case HEAT_EQUATION: case DISC_ADJ_HEAT:
-          // per-surface output to be added soon
-          break;
-        default:
-          break;
-      }
-    }
-
     /*--- Not-per-surface objective functions (shall not be included above) ---*/
 
-    Weight_ObjFunc = config->GetWeight_ObjFunc(0);
+    const auto Weight_ObjFunc = config->GetWeight_ObjFunc(0);
 
     bool ObjectiveNotCovered = false;
 
@@ -726,57 +706,20 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
       case DISC_ADJ_EULER:     case DISC_ADJ_NAVIER_STOKES:     case DISC_ADJ_RANS:
       case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES: case DISC_ADJ_INC_RANS:
       {
-        string FieldName;
-
-        switch (config->GetKind_ObjFunc()) {
-
-          // Aerodynamic coefficients
-
-          case DRAG_COEFFICIENT:
-          case LIFT_COEFFICIENT:
-          case SIDEFORCE_COEFFICIENT:
-          case EFFICIENCY:
-          case MOMENT_X_COEFFICIENT:
-          case MOMENT_Y_COEFFICIENT:
-          case MOMENT_Z_COEFFICIENT:
-          case FORCE_X_COEFFICIENT:
-          case FORCE_Y_COEFFICIENT:
-          case FORCE_Z_COEFFICIENT:
-            FieldName = config->GetName_ObjFunc();
-            break;
-
-          // Other surface-related output values
-          // The names are different than in CConfig...
-
-          case SURFACE_MASSFLOW:            FieldName = "AVG_MASSFLOW";              break;
-          case SURFACE_MACH:                FieldName = "AVG_MACH";                  break;
-          case SURFACE_UNIFORMITY:          FieldName = "UNIFORMITY";                break;
-          case SURFACE_SECONDARY:           FieldName = "SECONDARY_STRENGTH";        break;
-          case SURFACE_MOM_DISTORTION:      FieldName = "MOMENTUM_DISTORTION";       break;
-          case SURFACE_SECOND_OVER_UNIFORM: FieldName = "SECONDARY_OVER_UNIFORMITY"; break;
-          case TOTAL_AVG_TEMPERATURE:       FieldName = "AVG_TOTALTEMP";             break;
-          case SURFACE_TOTAL_PRESSURE:      FieldName = "AVG_TOTALPRESS";            break;
-
-          // Not yet covered by new output structure. Be careful these use MARKER_MONITORING.
-
-          case SURFACE_PRESSURE_DROP:
-            ObjFunc += config->GetSurface_PressureDrop(0)*Weight_ObjFunc;
-            break;
-          case SURFACE_STATIC_PRESSURE:
-            ObjFunc += config->GetSurface_Pressure(0)*Weight_ObjFunc;
-            break;
-          case TOTAL_HEATFLUX:
-            ObjFunc += solvers[FLOW_SOL]->GetTotal_HeatFlux()*Weight_ObjFunc;
-            break;
+        auto val = solvers[FLOW_SOL]->GetTotal_ComboObj();
 
-          default:
-            ObjectiveNotCovered = true;
-            break;
+        if (config->GetWeakly_Coupled_Heat()) {
+          if (config->GetKind_ObjFunc() == TOTAL_HEATFLUX) {
+            val += solvers[HEAT_SOL]->GetTotal_HeatFlux();
+          }
+          else if (config->GetKind_ObjFunc() == AVG_TEMPERATURE) {
+            val += solvers[HEAT_SOL]->GetTotal_AvgTemperature();
+          }
         }
+        ObjFunc += val*Weight_ObjFunc;
 
-        if(!FieldName.empty())
-          ObjFunc += direct_output[iZone]->GetHistoryFieldValue(FieldName)*Weight_ObjFunc;
-
+        /*--- This is not ideal... ---*/
+        ObjectiveNotCovered = (val==0.0);
         break;
       }
       case DISC_ADJ_HEAT:
@@ -788,7 +731,7 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
           case TOTAL_HEATFLUX:
             ObjFunc += solvers[HEAT_SOL]->GetTotal_HeatFlux()*Weight_ObjFunc;
             break;
-          case TOTAL_AVG_TEMPERATURE:
+          case AVG_TEMPERATURE:
             ObjFunc += solvers[HEAT_SOL]->GetTotal_AvgTemperature()*Weight_ObjFunc;
             break;
 

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -377,7 +377,7 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
       if (config->GetKind_ObjFunc() == TOTAL_HEATFLUX) {
         ObjFunc += solver[HEAT_SOL]->GetTotal_HeatFlux();
       }
-      else if (config->GetKind_ObjFunc() == TOTAL_AVG_TEMPERATURE) {
+      else if (config->GetKind_ObjFunc() == AVG_TEMPERATURE) {
         ObjFunc += solver[HEAT_SOL]->GetTotal_AvgTemperature();
       }
     }
@@ -416,7 +416,7 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
     case TOTAL_HEATFLUX:
       ObjFunc = solver[HEAT_SOL]->GetTotal_HeatFlux();
       break;
-    case TOTAL_AVG_TEMPERATURE:
+    case AVG_TEMPERATURE:
       ObjFunc = solver[HEAT_SOL]->GetTotal_AvgTemperature();
       break;
     default:

SU2_CFD/src/integration/CMultiGridIntegration.cpp

@@ -688,12 +688,6 @@ void CMultiGridIntegration::NonDimensional_Parameters(CGeometry **geometry, CSol
       solver_container[FinestMesh][FLOW_SOL]->Momentum_Forces(geometry[FinestMesh], config);
       solver_container[FinestMesh][FLOW_SOL]->Friction_Forces(geometry[FinestMesh], config);
 
-      /*--- Evaluate the buffet metric if requested ---*/
-
-      if(config->GetBuffet_Monitoring() || config->GetKind_ObjFunc() == BUFFET_SENSOR){
-          solver_container[FinestMesh][FLOW_SOL]->Buffet_Monitoring(geometry[FinestMesh], config);
-      }
-
       break;
 
     case RUNTIME_ADJFLOW_SYS: