cleanup

Author: pcarruscag

Common/include/geometry/elements/CElementProperty.hpp

@@ -93,7 +93,7 @@ class CProperty {
   /*!
    * \brief Extract the derivative of the Design density.
    */
-  inline virtual su2double GetAdjointDensity(void) const { return 0.0; }
+  inline virtual su2double GetAdjointDensity(void) { return 0.0; }
 
   /*!
    * \brief Register the Design density as an AD input variable.
@@ -177,7 +177,11 @@ class CElementProperty final : public CProperty {
   /*!
    * \brief Extract the derivative of the Design density.
    */
-  inline su2double GetAdjointDensity(void) const override { return SU2_TYPE::GetDerivative(design_rho); }
+  inline su2double GetAdjointDensity(void) override {
+    su2double der = SU2_TYPE::GetDerivative(design_rho);
+    AD::ResetInput(design_rho);
+    return der;
+  }
 
   /*!
    * \brief Register the Design density as an AD input variable.

SU2_CFD/include/variables/CFEABoundVariable.hpp

@@ -157,12 +157,7 @@ class CFEABoundVariable final : public CFEAVariable {
   /*!
    * \brief Register the flow tractions as input variable.
    */
-  void RegisterFlowTraction() override;
-
-  /*!
-   * \brief Resets the AD indices of the flow tractions.
-   */
-  void ResetInputFlowTraction() override;
+  void RegisterFlowTraction(bool reset) override;
 
   /*!
    * \brief Extract the flow traction derivatives.

SU2_CFD/include/variables/CVariable.hpp

@@ -2160,12 +2160,7 @@ class CVariable {
   /*!
    * \brief A virtual member.
    */
-  inline virtual void RegisterFlowTraction() { }
-
-  /*!
-   * \brief A virtual member.
-   */
-  inline virtual void ResetInputFlowTraction() { }
+  inline virtual void RegisterFlowTraction(bool reset) { }
 
   /*!
    * \brief A virtual member.

SU2_CFD/src/solvers/CDiscAdjFEASolver.cpp

@@ -124,32 +124,21 @@ CDiscAdjFEASolver::~CDiscAdjFEASolver() { delete nodes; }
 
 void CDiscAdjFEASolver::SetRecording(CGeometry* geometry, CConfig *config){
 
-  unsigned long iPoint;
-  unsigned short iDim, iVar;
-
   /*--- Reset the solution to the initial (converged) solution ---*/
 
-  for (iPoint = 0; iPoint < nPoint; iPoint++) {
-    for (iVar = 0; iVar < nVar; iVar++)
+  for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {
+    for (auto iVar = 0u; iVar < nVar; iVar++)
       direct_solver->GetNodes()->SetSolution(iPoint, iVar, nodes->GetSolution_Direct(iPoint)[iVar]);
-
-    auto Coord = geometry->nodes->GetCoord(iPoint);
-    for (iDim = 0; iDim < nDim; iDim++) AD::ResetInput(Coord[iDim]);
   }
 
   /*--- Reset the input for time n ---*/
 
   if (config->GetTime_Domain()) {
-    for (iPoint = 0; iPoint < nPoint; iPoint++)
-      for (iVar = 0; iVar < nVar; iVar++)
+    for (auto iPoint = 0ul; iPoint < nPoint; iPoint++)
+      for (auto iVar = 0u; iVar < nVar; iVar++)
         AD::ResetInput(direct_solver->GetNodes()->GetSolution_time_n(iPoint)[iVar]);
   }
 
-  /*--- Set the Jacobian to zero since this is not done inside the meanflow iteration
-   * when running the discrete adjoint solver. ---*/
-
-  direct_solver->Jacobian.SetValZero();
-
   /*--- Set indices to zero ---*/
 
   RegisterVariables(geometry, config, true);
@@ -202,19 +191,18 @@ void CDiscAdjFEASolver::RegisterVariables(CGeometry *geometry, CConfig *config,
       for (iVar = 0; iVar < nDV; iVar++) AD::ResetInput(DV[iVar]);
     }
 
-    direct_solver->GetNodes()->ResetInputFlowTraction();
-
     if (!reset) {
       E.Register();
       Nu.Register();
       Rho.Register();
       Rho_DL.Register();
       if (de_effects) EField.Register();
       if (fea_dv) DV.Register();
+    }
 
-      /*--- Register the flow tractions ---*/
-      if (config->GetnMarker_Fluid_Load() > 0)
-        direct_solver->GetNodes()->RegisterFlowTraction();
+    /*--- Register or reset the flow tractions ---*/
+    if (config->GetnMarker_Fluid_Load() > 0) {
+      direct_solver->GetNodes()->RegisterFlowTraction(reset);
     }
 
   }
@@ -372,12 +360,12 @@ void CDiscAdjFEASolver::SetSensitivity(CGeometry *geometry, CConfig *config, CSo
 
   for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++) {
 
-    //auto Coord = geometry->nodes->GetCoord(iPoint);
+    auto Coord = geometry->nodes->GetCoord(iPoint);
 
     for (unsigned short iDim = 0; iDim < nDim; iDim++) {
 
       su2double Sensitivity = geometry->nodes->GetAdjointSolution(iPoint, iDim);
-      //AD::ResetInput(Coord[iDim]);
+      AD::ResetInput(Coord[iDim]);
 
       if (!time_domain) {
         nodes->SetSensitivity(iPoint, iDim, Sensitivity);

SU2_CFD/src/solvers/CDiscAdjSolver.cpp

@@ -146,11 +146,6 @@ void CDiscAdjSolver::SetRecording(CGeometry* geometry, CConfig *config){
     END_SU2_OMP_FOR
   }
 
-  /*--- Set the Jacobian to zero since this is not done inside the fluid iteration
-   * when running the discrete adjoint solver. ---*/
-
-  direct_solver->Jacobian.SetValZero();
-
   /*--- Set indices to zero ---*/
 
   RegisterVariables(geometry, config, true);

SU2_CFD/src/variables/CFEABoundVariable.cpp

@@ -69,16 +69,10 @@ void CFEABoundVariable::Clear_FlowTraction() { FlowTraction.setConstant(0.0); }
 
 void CFEABoundVariable::Clear_SurfaceLoad_Res() { Residual_Ext_Surf.setConstant(0.0); }
 
-void CFEABoundVariable::RegisterFlowTraction() {
+void CFEABoundVariable::RegisterFlowTraction(bool reset) {
   if (!fsi_analysis) return;
   for (unsigned long iVertex = 0; iVertex < FlowTraction.rows(); iVertex++)
     for (unsigned long iVar = 0; iVar < nVar; iVar++)
-      AD::RegisterInput(FlowTraction(iVertex,iVar));
+      if (reset) AD::ResetInput(FlowTraction(iVertex,iVar));
+      else AD::RegisterInput(FlowTraction(iVertex,iVar));
 }
-
-void CFEABoundVariable::ResetInputFlowTraction() {
-  if (!fsi_analysis) return;
-  for (unsigned long iVertex = 0; iVertex < FlowTraction.rows(); iVertex++)
-    for (unsigned long iVar = 0; iVar < nVar; iVar++)
-      AD::ResetInput(FlowTraction(iVertex,iVar));
-}

TestCases/parallel_regression_AD.py

@@ -413,7 +413,7 @@ def main():
     pywrapper_Unst_FEA_AD.cfg_dir = "py_wrapper/custom_load_fea"
     pywrapper_Unst_FEA_AD.cfg_file = "config.cfg"
     pywrapper_Unst_FEA_AD.test_iter = 100
-    pywrapper_Unst_FEA_AD.test_vals = [0.256684, 0.256684, 0.031988, 0.032015, -18.44906, -18.45085]
+    pywrapper_Unst_FEA_AD.test_vals = [0.256684, 0.256684, 0.319877, 0.320149, -0.184491, -0.184509]
     pywrapper_Unst_FEA_AD.command = TestCase.Command("mpirun -n 2", "python", "run_ad.py")
     pywrapper_Unst_FEA_AD.timeout = 1600
     pywrapper_Unst_FEA_AD.tol = 0.00001

TestCases/py_wrapper/custom_load_fea/run_ad.py

@@ -243,7 +243,7 @@ def main():
   # Print results for the regression script to check.
   if rank == 0:
     print("\n")
-    print(100, 100, sens_load_fd, sens_load, sens_rho_fd, sens_rho, sens_height_fd, sens_height)
+    print(100, 100, sens_load_fd, sens_load, sens_rho_fd * 10, sens_rho * 10, sens_height_fd / 100, sens_height / 100)
 
 
 if __name__ == '__main__':