structural objective functions in history, delete a lot of unused stuff

Author: pcarruscag

SU2_CFD/include/solvers/CDiscAdjFEASolver.hpp

@@ -160,12 +160,6 @@ class CDiscAdjFEASolver final : public CSolver {
    */
   void ExtractAdjoint_Solution(CGeometry *geometry, CConfig *config) override;
 
-  /*!
-   * \brief Register the objective function as output.
-   * \param[in] geometry - The geometrical definition of the problem.
-   */
-  void RegisterObj_Func(CConfig *config) override;
-
   /*!
    * \brief Set the surface sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -180,13 +174,6 @@ class CDiscAdjFEASolver final : public CSolver {
    */
   void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver*) override;
 
-  /*!
-   * \brief Set the objective function.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetAdj_ObjFunc(CGeometry *geometry, CConfig* config) override;
-
   /*!
    * \brief Provide the total Young's modulus sensitivity
    * \return Value of the total Young's modulus sensitivity

SU2_CFD/include/solvers/CDiscAdjSolver.hpp

@@ -140,12 +140,6 @@ class CDiscAdjSolver final : public CSolver {
    */
   void ExtractAdjoint_Geometry(CGeometry *geometry, CConfig *config) override;
 
-  /*!
-   * \brief Register the objective function as output.
-   * \param[in] geometry - The geometrical definition of the problem.
-   */
-  void RegisterObj_Func(CConfig *config) override;
-
   /*!
    * \brief Set the surface sensitivity.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -160,13 +154,6 @@ class CDiscAdjSolver final : public CSolver {
    */
   void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver*) override;
 
-  /*!
-   * \brief Set the objective function.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetAdj_ObjFunc(CGeometry *geometry, CConfig* config) override;
-
   /*!
    * \brief Provide the total shape sensitivity coefficient.
    * \return Value of the geometrical sensitivity coefficient

SU2_CFD/include/solvers/CFEASolver.hpp

@@ -67,8 +67,8 @@ class CFEASolver : public CSolver {
   su2double Total_OFRefGeom;        /*!< \brief Total Objective Function: Reference Geometry. */
   su2double Total_OFRefNode;        /*!< \brief Total Objective Function: Reference Node. */
   su2double Total_OFVolFrac;        /*!< \brief Total Objective Function: Volume fraction (topology optimization). */
+  su2double Total_OFDiscreteness;   /*!< \brief Total Objective Function: Discreteness (topology optimization). */
   su2double Total_OFCompliance;     /*!< \brief Total Objective Function: Compliance (topology optimization). */
-  su2double Total_OFCombo = 0.0;    /*!< \brief One of the above, for output/history purposes. */
 
   su2double Global_OFRefGeom;       /*!< \brief Global Objective Function (added over time steps): Reference Geometry. */
   su2double Global_OFRefNode;       /*!< \brief Global Objective Function (added over time steps): Reference Node. */
@@ -541,33 +541,29 @@ class CFEASolver : public CSolver {
 
   /*!
    * \brief Retrieve the value of the objective function for a reference geometry
-   * \param[out] OFRefGeom - value of the objective function.
    */
   inline su2double GetTotal_OFRefGeom(void) const final { return Total_OFRefGeom; }
 
   /*!
    * \brief Retrieve the value of the objective function for a reference node
-   * \param[out] OFRefNode - value of the objective function.
    */
   inline su2double GetTotal_OFRefNode(void) const final { return Total_OFRefNode; }
 
   /*!
    * \brief Retrieve the value of the volume fraction objective function
-   * \param[out] OFVolFrac - value of the objective function.
    */
   inline su2double GetTotal_OFVolFrac(void) const final { return Total_OFVolFrac; }
 
   /*!
-   * \brief Retrieve the value of the structural compliance objective function
-   * \return Value of the objective function.
+   * \brief Retrieve the value of the discreteness objective function
    */
-  inline su2double GetTotal_OFCompliance(void) const final { return Total_OFCompliance; }
+  inline su2double GetTotal_OFDiscreteness(void) const final { return Total_OFDiscreteness; }
 
   /*!
-   * \brief Retrieve the value of the combined objective function
-   * \note For now there is no combination, this is just a seletion.
+   * \brief Retrieve the value of the structural compliance objective function
+   * \return Value of the objective function.
    */
-  inline su2double GetTotal_ComboObj(void) const final { return Total_OFCombo; }
+  inline su2double GetTotal_OFCompliance(void) const final { return Total_OFCompliance; }
 
   /*!
    * \brief Determines whether there is an element-based file or not.

SU2_CFD/include/solvers/CSolver.hpp

@@ -2465,6 +2465,11 @@ class CSolver {
    */
   inline virtual su2double GetTotal_OFVolFrac() const { return 0; }
 
+  /*!
+   * \brief Retrieve the value of the discreteness objective function
+   */
+  inline virtual su2double GetTotal_OFDiscreteness() const { return 0; }
+
   /*!
    * \brief A virtual member.
    * \return Value of the objective function for the structural compliance.
@@ -3630,41 +3635,6 @@ class CSolver {
                                       CConfig *config,
                                       int val_iter) { }
 
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   */
-  inline virtual void RefGeom_Sensitivity(CGeometry *geometry,
-                                          CSolver **solver_container,
-                                          CConfig *config){ }
-
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   */
-  inline virtual void DE_Sensitivity(CGeometry *geometry,
-                                     CSolver **solver_container,
-                                     CNumerics **numerics_container,
-                                     CConfig *config) { }
-
-  /*!
-   * \brief A virtual member.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] solver_container - Container vector with all the solutions.
-   * \param[in] numerics - Description of the numerical method.
-   * \param[in] config - Definition of the particular problem.
-   */
-  inline virtual void Stiffness_Sensitivity(CGeometry *geometry,
-                                            CSolver **solver_container,
-                                            CNumerics **numerics_container,
-                                            CConfig *config) { }
-
   /*!
    * \brief A virtual member.
    * \param[in] iElem - element parameter.
@@ -3777,12 +3747,6 @@ class CSolver {
    */
   inline virtual void ExtractAdjoint_Geometry(CGeometry *geometry, CConfig *config) {}
 
-  /*!
-   * \brief A virtual member
-   * \param[in] geometry - The geometrical definition of the problem.
-   */
-  inline virtual void RegisterObj_Func(CConfig *config){}
-
   /*!
    * \brief  A virtual member.
    * \param[in] geometry - Geometrical definition of the problem.
@@ -3798,13 +3762,6 @@ class CSolver {
    */
   inline virtual void SetSensitivity(CGeometry *geometry, CConfig *config, CSolver *target_solver = nullptr){ }
 
-  /*!
-   * \brief A virtual member. Extract and set the derivative of objective function.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  inline virtual void SetAdj_ObjFunc(CGeometry *geometry, CConfig *config) { }
-
   /*!
    * \brief A virtual member.
    * \param[in] Set value of interest: 0 - Initial value, 1 - Current value.

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -758,10 +758,13 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
             ObjFunc += solvers[FEA_SOL]->GetTotal_OFCompliance()*Weight_ObjFunc;
             break;
           case VOLUME_FRACTION:
-          case TOPOL_DISCRETENESS:
             solvers[FEA_SOL]->Compute_OFVolFrac(geometry, config);
             ObjFunc += solvers[FEA_SOL]->GetTotal_OFVolFrac()*Weight_ObjFunc;
             break;
+          case TOPOL_DISCRETENESS:
+            solvers[FEA_SOL]->Compute_OFVolFrac(geometry, config);
+            ObjFunc += solvers[FEA_SOL]->GetTotal_OFDiscreteness()*Weight_ObjFunc;
+            break;
 
           default:
             ObjectiveNotCovered = true;

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -436,9 +436,11 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
       ObjFunc = solver[FEA_SOL]->GetTotal_OFCompliance();
       break;
     case VOLUME_FRACTION:
-    case TOPOL_DISCRETENESS:
       ObjFunc = solver[FEA_SOL]->GetTotal_OFVolFrac();
       break;
+    case TOPOL_DISCRETENESS:
+      ObjFunc = solver[FEA_SOL]->GetTotal_OFDiscreteness();
+      break;
     default:
       ObjFunc = 0.0;  // If the objective function is computed in a different physical problem
       break;

SU2_CFD/src/iteration/CDiscAdjFEAIteration.cpp

@@ -401,10 +401,6 @@ void CDiscAdjFEAIteration::RegisterOutput(CSolver***** solver, CGeometry**** geo
 
 void CDiscAdjFEAIteration::InitializeAdjoint(CSolver***** solver, CGeometry**** geometry, CConfig** config,
                                              unsigned short iZone, unsigned short iInst) {
-  /*--- Initialize the adjoint of the objective function (typically with 1.0) ---*/
-
-  solver[iZone][iInst][MESH_0][ADJFEA_SOL]->SetAdj_ObjFunc(geometry[iZone][iInst][MESH_0], config[iZone]);
-
   /*--- Initialize the adjoints the conservative variables ---*/
 
   solver[iZone][iInst][MESH_0][ADJFEA_SOL]->SetAdjoint_Output(geometry[iZone][iInst][MESH_0], config[iZone]);
@@ -455,9 +451,11 @@ void CDiscAdjFEAIteration::Postprocess(COutput* output, CIntegration**** integra
         myfile_res << scientific << solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->GetTotal_OFRefNode() << "\t";
         break;
       case VOLUME_FRACTION:
-      case TOPOL_DISCRETENESS:
         myfile_res << scientific << solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->GetTotal_OFVolFrac() << "\t";
         break;
+      case TOPOL_DISCRETENESS:
+        myfile_res << scientific << solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->GetTotal_OFDiscreteness() << "\t";
+        break;
       case TOPOL_COMPLIANCE:
         myfile_res << scientific << solver[val_iZone][val_iInst][MESH_0][FEA_SOL]->GetTotal_OFCompliance() << "\t";
         break;

SU2_CFD/src/output/CAdjElasticityOutput.cpp

@@ -106,8 +106,6 @@ void CAdjElasticityOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("SENS_E", "Sens[E]",  ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "");
   AddHistoryOutput("SENS_NU","Sens[Nu]", ScreenOutputFormat::SCIENTIFIC, "SENSITIVITY", "");
 
-  AddHistoryOutput("COMBO", "ObjFun", ScreenOutputFormat::SCIENTIFIC, "COMBO", "", HistoryFieldType::COEFFICIENT);
-
   AddHistoryOutput("LINSOL_ITER", "LinSolIter", ScreenOutputFormat::INTEGER, "LINSOL", "Number of iterations of the linear solver.");
   AddHistoryOutput("LINSOL_RESIDUAL", "LinSolRes", ScreenOutputFormat::FIXED, "LINSOL", "Residual of the linear solver.");
 
@@ -141,8 +139,6 @@ inline void CAdjElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *ge
   SetHistoryOutputValue("SENS_E", Total_SensE);
   SetHistoryOutputValue("SENS_NU", Total_SensNu);
 
-  SetHistoryOutputValue("COMBO", solver[FEA_SOL]->GetTotal_ComboObj());
-
   SetHistoryOutputValue("LINSOL_ITER", solver[ADJFEA_SOL]->GetIterLinSolver());
   SetHistoryOutputValue("LINSOL_RESIDUAL", log10(solver[ADJFEA_SOL]->GetResLinSolver()));
 

SU2_CFD/src/output/CElasticityOutput.cpp

@@ -134,7 +134,15 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS
   SetHistoryOutputValue("LINSOL_ITER", fea_solver->GetIterLinSolver());
   SetHistoryOutputValue("LINSOL_RESIDUAL", log10(fea_solver->GetResLinSolver()));
 
-  SetHistoryOutputValue("COMBO", fea_solver->GetTotal_ComboObj());
+  SetHistoryOutputValue("REFERENCE_NODE", fea_solver->GetTotal_OFRefNode());
+  SetHistoryOutputValue("TOPOL_COMPLIANCE", fea_solver->GetTotal_OFCompliance());
+  if (config->GetRefGeom()) {
+    SetHistoryOutputValue("REFERENCE_GEOMETRY", fea_solver->GetTotal_OFRefGeom());
+  }
+  if (config->GetTopology_Optimization()) {
+    SetHistoryOutputValue("VOLUME_FRACTION", fea_solver->GetTotal_OFVolFrac());
+    SetHistoryOutputValue("TOPOL_DISCRETENESS", fea_solver->GetTotal_OFDiscreteness());
+  }
 
 }
 
@@ -158,10 +166,14 @@ void CElasticityOutput::SetHistoryOutputFields(CConfig *config){
   AddHistoryOutput("BGS_DISP_Z", "bgs[DispZ]", ScreenOutputFormat::FIXED,  "BGS_RES", "", HistoryFieldType::RESIDUAL);
 
   AddHistoryOutput("VMS",            "VonMises", ScreenOutputFormat::SCIENTIFIC, "", "VMS");
-  AddHistoryOutput("LOAD_INCREMENT", "Load[%]",  ScreenOutputFormat::PERCENT, "", "LOAD_INCREMENT");
-  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",       ScreenOutputFormat::FIXED, "", "LOAD_RAMP");
-
-  AddHistoryOutput("COMBO", "ObjFun", ScreenOutputFormat::SCIENTIFIC, "COMBO", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("LOAD_INCREMENT", "Load[%]",  ScreenOutputFormat::PERCENT,    "", "LOAD_INCREMENT");
+  AddHistoryOutput("LOAD_RAMP",      "Load_Ramp",ScreenOutputFormat::FIXED,      "", "LOAD_RAMP");
+
+  AddHistoryOutput("REFERENCE_GEOMETRY", "RefGeom", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("REFERENCE_NODE",     "RefNode", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("VOLUME_FRACTION",    "VolFrac", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("TOPOL_DISCRETENESS", "TopDisc", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
+  AddHistoryOutput("TOPOL_COMPLIANCE",   "TopComp", ScreenOutputFormat::SCIENTIFIC, "STRUCT_COEFF", "", HistoryFieldType::COEFFICIENT);
 
 }
 

SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp

@@ -462,67 +462,6 @@ void CDiscAdjFEASolver::RegisterOutput(CGeometry *geometry, CConfig *config){
 
 }
 
-void CDiscAdjFEASolver::RegisterObj_Func(CConfig *config){
-
-  /*--- Here we can add new (scalar) objective functions ---*/
-
-  switch (config->GetKind_ObjFunc()){
-  case REFERENCE_GEOMETRY:
-      ObjFunc_Value = direct_solver->GetTotal_OFRefGeom();
-      break;
-  case REFERENCE_NODE:
-      ObjFunc_Value = direct_solver->GetTotal_OFRefNode();
-      break;
-  case VOLUME_FRACTION:
-  case TOPOL_DISCRETENESS:
-      ObjFunc_Value = direct_solver->GetTotal_OFVolFrac();
-      break;
-  case TOPOL_COMPLIANCE:
-      ObjFunc_Value = direct_solver->GetTotal_OFCompliance();
-      break;
-  default:
-      ObjFunc_Value = 0.0;  // If the objective function is computed in a different physical problem
-      break;
- /*--- Template for new objective functions where TemplateObjFunction()
-  *  is the routine that returns the obj. function value. The computation
-  * must be done while the tape is active, i.e. between AD::StartRecording() and
-  * AD::StopRecording() in DiscAdjMeanFlowIteration::Iterate(). The best place is somewhere
-  * inside MeanFlowIteration::Iterate().
-  *
-  * case TEMPLATE_OBJECTIVE:
-  *    ObjFunc_Value = TemplateObjFunction();
-  *    break;
-  * ---*/
-  }
-  if (rank == MASTER_NODE){
-    AD::RegisterOutput(ObjFunc_Value);
-  }
-}
-
-
-void CDiscAdjFEASolver::SetAdj_ObjFunc(CGeometry *geometry, CConfig *config){
-
-  bool dynamic = (config->GetTime_Domain());
-  unsigned long IterAvg_Obj = config->GetIter_Avg_Objective();
-  unsigned long TimeIter = config->GetTimeIter();
-  su2double seeding = 1.0;
-
-  if (dynamic){
-    if (TimeIter < IterAvg_Obj){
-      seeding = 1.0/((su2double)IterAvg_Obj);
-    }
-    else{
-      seeding = 0.0;
-    }
-  }
-
-  if (rank == MASTER_NODE){
-    SU2_TYPE::SetDerivative(ObjFunc_Value, SU2_TYPE::GetValue(seeding));
-  } else {
-    SU2_TYPE::SetDerivative(ObjFunc_Value, 0.0);
-  }
-}
-
 void CDiscAdjFEASolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *config){
 
   bool dynamic = config->GetTime_Domain();