fix small issues, dependencies need re-evaluation after deforming the mesh because of some OF's

Author: pcarruscag

Common/include/CConfig.hpp

@@ -998,8 +998,7 @@ class CConfig {
   Nonphys_Reconstr;                 /*!< \brief Current number of non-physical reconstructions for 2nd-order upwinding. */
   bool ParMETIS;                    /*!< \brief Boolean for activating ParMETIS mode (while testing). */
   unsigned short DirectDiff;        /*!< \brief Direct Differentation mode. */
-  bool DiscreteAdjoint,                  /*!< \brief AD-based discrete adjoint mode. */
-  FullTape;                              /*!< \brief Full tape mode for coupled discrete adjoints. */
+  bool DiscreteAdjoint;                  /*!< \brief AD-based discrete adjoint mode. */
   unsigned long Wrt_Surf_Freq_DualTime;  /*!< \brief Writing surface solution frequency for Dual Time. */
   su2double Const_DES;                 /*!< \brief Detached Eddy Simulation Constant. */
   unsigned short Kind_WindowFct;       /*!< \brief Type of window (weight) function for objective functional. */
@@ -8437,12 +8436,6 @@ class CConfig {
    */
   bool GetDiscrete_Adjoint(void) const { return DiscreteAdjoint; }
 
-  /*!
-  * \brief Get the indicator whether we want to use full (coupled) tapes.
-  * \return the full tape indicator.
-  */
-  bool GetFull_Tape(void) const { return FullTape; }
-
   /*!
    * \brief Get the number of subiterations while a ramp is applied.
    * \return Number of FSI subiters.

Common/src/CConfig.cpp

@@ -1087,8 +1087,6 @@ void CConfig::SetConfig_Options() {
   addEnumOption("MULTIZONE_SOLVER", Kind_MZSolver, Multizone_Map, MZ_BLOCK_GAUSS_SEIDEL);
   /*!\brief MATH_PROBLEM  \n DESCRIPTION: Mathematical problem \n  Options: DIRECT, ADJOINT \ingroup Config*/
   addMathProblemOption("MATH_PROBLEM", ContinuousAdjoint, false, DiscreteAdjoint, false, Restart_Flow, false);
-  /*!\brief FULL_TAPE \n DESCRIPTION: Use full (coupled) tapes for multiphysics discrete adjoint. \ingroup Config*/
-  addBoolOption("FULL_TAPE", FullTape, YES);
   /*!\brief KIND_TURB_MODEL \n DESCRIPTION: Specify turbulence model \n Options: see \link Turb_Model_Map \endlink \n DEFAULT: NO_TURB_MODEL \ingroup Config*/
   addEnumOption("KIND_TURB_MODEL", Kind_Turb_Model, Turb_Model_Map, NO_TURB_MODEL);
   /*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NO_TRANS_MODEL \ingroup Config*/

SU2_CFD/include/drivers/CDiscAdjMultizoneDriver.hpp

@@ -40,8 +40,6 @@ class CDiscAdjMultizoneDriver : public CMultizoneDriver {
                                           solution update. */
     OBJECTIVE_FUNCTION_TAPE,  /*!< \brief Record only the dependence of the objective function
                                           w.r.t. solver variables (from all zones). */
-    ZONE_SPECIFIC_TAPE        /*!< \brief Record only the dependence of the solution update in a
-                                          specified zone w.r.t. solver variables (from all zones). */
   };
 
   /*!
@@ -58,8 +56,7 @@ class CDiscAdjMultizoneDriver : public CMultizoneDriver {
                                               that it can be connected to a solver update evaluation. */
   };
 
-  int RecordingState;             /*!< \brief The kind of recording that the tape currently holds. */
-  bool retape;                    /*!< \brief Boolean whether a full tape can be kept in memory. */
+  int RecordingState = NONE;      /*!< \brief The kind of recording that the tape currently holds. */
 
   su2double ObjFunc;              /*!< \brief Value of the objective function. */
   int ObjFunc_Index;              /*!< \brief Index of the value of the objective function. */

SU2_CFD/include/interfaces/fsi/CDiscAdjFlowTractionInterface.hpp

@@ -38,7 +38,7 @@ class CDiscAdjFlowTractionInterface : public CFlowTractionInterface {
    * \param[in] config - Definition of the particular problem.
    */
   CDiscAdjFlowTractionInterface(unsigned short val_nVar, unsigned short val_nConst,
-                                const CConfig *config, bool integrate_tractions_);
+                                const CConfig *config, bool conservative_);
 
   /*!
    * \brief Retrieve some constants needed for the calculations.

SU2_CFD/include/interfaces/fsi/CFlowTractionInterface.hpp

@@ -29,18 +29,27 @@
 #pragma once
 
 #include "../CInterface.hpp"
+#include <unordered_map>
 
 class CFlowTractionInterface : public CInterface {
-private:
-  bool integrate_tractions;
-
 protected:
+  const bool conservative;
+  std::unordered_map<unsigned long, su2double> vertexArea;
+
   /*!
-   * \brief Sets the dimensional factor for pressure and the consistent_interpolation flag
+   * \brief Sets the dimensional factor for pressure and the consistent_interpolation flag.
    * \param[in] flow_config - Definition of the fluid (donor) problem.
    */
   void Preprocess(const CConfig *flow_config);
 
+  /*!
+   * \brief Computes vertex areas (FEA side) for when tractions need to be integrated.
+   * \param[in] config - Definition of the structural (target) problem.
+   * \param[in] geometry - FEA geometry.
+   * \param[in] solution - FEA solver.
+   */
+  void ComputeVertexAreas(const CConfig *config, CGeometry *geometry, CSolver *solution);
+
 public:
   /*!
    * \overload

SU2_CFD/include/iteration/CFEAIteration.hpp

@@ -131,15 +131,4 @@ class CFEAIteration : public CIteration {
                CNumerics****** numerics, CConfig** config, CSurfaceMovement** surface_movement,
                CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
                unsigned short val_iInst) override;
-
-  /*!
-   * \brief Postprocess ???.
-   * \param[in] solver - Container vector with all the solutions.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void Postprocess(COutput* output, CIntegration**** integration, CGeometry**** geometry, CSolver***** solver,
-                   CNumerics****** numerics, CConfig** config, CSurfaceMovement** surface_movement,
-                   CVolumetricMovement*** grid_movement, CFreeFormDefBox*** FFDBox, unsigned short val_iZone,
-                   unsigned short val_iInst) override;
 };

SU2_CFD/include/solvers/CFEASolver.hpp

@@ -449,13 +449,6 @@ class CFEASolver : public CSolver {
                     const CConfig *config,
                     unsigned short val_marker) final;
 
-  /*!
-   * \brief Required step for non conservative interpolation schemes where stresses are transferred instead of forces.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void Integrate_FSI_Loads(CGeometry *geometry, const CConfig *config);
-
   /*!
    * \brief Iterate using an implicit Newmark solver.
    * \param[in] geometry - Geometrical definition of the problem.

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -39,10 +39,6 @@ CDiscAdjMultizoneDriver::CDiscAdjMultizoneDriver(char* confFile,
 
                         : CMultizoneDriver(confFile, val_nZone, MPICommunicator) {
 
-  retape = !config_container[ZONE_0]->GetFull_Tape();
-
-  RecordingState = NONE;
-
   direct_nInst.resize(nZone,1);
   nInnerIter.resize(nZone);
 
@@ -236,7 +232,7 @@ void CDiscAdjMultizoneDriver::Run() {
     /*--- If we want to set up zone-specific tapes (retape), we do not need to record
      *    here. Otherwise, the whole tape of a coupled run will be created. ---*/
 
-    if (!retape && (RecordingState != SOLUTION_VARIABLES)) {
+    if (RecordingState != SOLUTION_VARIABLES) {
       SetRecording(NONE, Kind_Tape::FULL_TAPE, ZONE_0);
       SetRecording(SOLUTION_VARIABLES, Kind_Tape::FULL_TAPE, ZONE_0);
     }
@@ -247,11 +243,6 @@ void CDiscAdjMultizoneDriver::Run() {
 
       config_container[iZone]->Set_StartTime(SU2_MPI::Wtime());
 
-      if (retape) {
-        SetRecording(NONE, Kind_Tape::FULL_TAPE, ZONE_0);
-        SetRecording(SOLUTION_VARIABLES, Kind_Tape::ZONE_SPECIFIC_TAPE, iZone);
-      }
-
       /*--- Start inner iterations from where we stopped in previous outer iteration. ---*/
 
       Set_Solution_To_BGSSolution_k(iZone);
@@ -502,7 +493,6 @@ void CDiscAdjMultizoneDriver::SetRecording(unsigned short kind_recording, Kind_T
   AD::Push_TapePosition(); /// REGISTERED
 
   for (iZone = 0; iZone < nZone; iZone++) {
-
     iteration_container[iZone][INST_0]->SetDependencies(solver_container, geometry_container, numerics_container,
                                                         config_container, iZone, INST_0, kind_recording);
   }
@@ -515,10 +505,15 @@ void CDiscAdjMultizoneDriver::SetRecording(unsigned short kind_recording, Kind_T
 
   if ((tape_type == Kind_Tape::OBJECTIVE_FUNCTION_TAPE) || (kind_recording == MESH_COORDS)) {
     HandleDataTransfer();
+    for (iZone = 0; iZone < nZone; iZone++) {
+      if (Has_Deformation(iZone)) {
+        iteration_container[iZone][INST_0]->SetDependencies(solver_container, geometry_container, numerics_container,
+                                                            config_container, iZone, INST_0, kind_recording);
+      }
+    }
+    SetObjFunction(kind_recording);
   }
 
-  SetObjFunction(kind_recording);
-
   AD::Push_TapePosition(); /// OBJECTIVE_FUNCTION
 
   if (tape_type != Kind_Tape::OBJECTIVE_FUNCTION_TAPE) {
@@ -537,18 +532,10 @@ void CDiscAdjMultizoneDriver::SetRecording(unsigned short kind_recording, Kind_T
 
       AD::Push_TapePosition(); /// enter_zone
 
-      if (tape_type == Kind_Tape::ZONE_SPECIFIC_TAPE) {
-        if (iZone == record_zone) {
-          DirectIteration(iZone, kind_recording);
-        }
-      }
-      else {
-        DirectIteration(iZone, kind_recording);
-      }
+      DirectIteration(iZone, kind_recording);
 
       iteration_container[iZone][INST_0]->RegisterOutput(solver_container, geometry_container,
                                                          config_container, output_container[iZone], iZone, INST_0);
-
       AD::Push_TapePosition(); /// leave_zone
     }
   }
@@ -788,7 +775,6 @@ void CDiscAdjMultizoneDriver::SetObjFunction(unsigned short kind_recording) {
             ObjFunc += solvers[FEA_SOL]->GetTotal_OFRefGeom()*Weight_ObjFunc;
             break;
           case TOPOL_COMPLIANCE:
-            static_cast<CFEASolver*>(solvers[FEA_SOL])->Integrate_FSI_Loads(geometry, config);
             solvers[FEA_SOL]->Compute_OFCompliance(geometry, config);
             ObjFunc += solvers[FEA_SOL]->GetTotal_OFCompliance()*Weight_ObjFunc;
             break;

SU2_CFD/src/interfaces/fsi/CDiscAdjFlowTractionInterface.cpp

@@ -32,8 +32,8 @@
 #include "../../../include/solvers/CSolver.hpp"
 
 CDiscAdjFlowTractionInterface::CDiscAdjFlowTractionInterface(unsigned short val_nVar, unsigned short val_nConst,
-                                                             const CConfig *config, bool integrate_tractions_) :
-  CFlowTractionInterface(val_nVar, val_nConst, config, integrate_tractions_) {
+                                                             const CConfig *config, bool conservative_) :
+  CFlowTractionInterface(val_nVar, val_nConst, config, conservative_) {
 }
 
 void CDiscAdjFlowTractionInterface::GetPhysical_Constants(CSolver *flow_solution, CSolver *struct_solution,
@@ -46,6 +46,8 @@ void CDiscAdjFlowTractionInterface::GetPhysical_Constants(CSolver *flow_solution
 
   Preprocess(flow_config);
 
+  if (!conservative) ComputeVertexAreas(struct_config, struct_geometry, struct_solution);
+
   /*--- No ramp applied ---*/
   Physical_Constants[1] = 1.0;
 }