Remove nested class definitions in CDiscAdjSinglezoneDriver

Author: patelha57

SU2_CFD/include/drivers/CDiscAdjSinglezoneDriver.hpp

@@ -33,6 +33,15 @@
 #include "../../../Common/include/linear_algebra/CMatrixVectorProduct.hpp"
 #include "../../../Common/include/linear_algebra/CSysSolve.hpp"
 
+#ifdef CODI_FORWARD_TYPE
+  using Scalar = su2double;
+#else
+  using Scalar = su2mixedfloat;
+#endif
+
+class LinOperator;
+class LinPreconditioner;
+
 /*!
  * \class CDiscAdjSinglezoneDriver
  * \ingroup DiscAdj
@@ -42,11 +51,6 @@
  */
 class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
 protected:
-#ifdef CODI_FORWARD_TYPE
-    using Scalar = su2double;
-#else
-    using Scalar = su2mixedfloat;
-#endif
 
   unsigned long nAdjoint_Iter;                  /*!< \brief The number of adjoint iterations that are run on the fixed-point solver.*/
   RECORDING RecordingState;                     /*!< \brief The kind of recording the tape currently holds.*/
@@ -79,27 +83,8 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
   CSysVector<Scalar> AdjSol;
   CPreconditioner<Scalar>* PrimalPreconditioner = nullptr;
   CSysMatrixVectorProduct<Scalar>* PrimalJacobian = nullptr;
-
-  class LinOperator : public CMatrixVectorProduct<Scalar> {
-  public:
-      CDiscAdjSinglezoneDriver* const driver;
-      LinOperator(CDiscAdjSinglezoneDriver* d) : driver(d) { }
-
-      inline void operator()(const CSysVector<Scalar> & u, CSysVector<Scalar> & v) const override {
-        driver->ApplyOperator(u, v);
-      }
-  };
-
-  class LinPreconditioner : public CPreconditioner<Scalar> {
-   public:
-    CDiscAdjSinglezoneDriver* const driver;
-
-    LinPreconditioner(CDiscAdjSinglezoneDriver* d): driver(d) { }
-
-    inline void operator()(const CSysVector<Scalar> & u, CSysVector<Scalar> & v) const override {
-      driver->ApplyPreconditioner(u, v);
-    }
-  };
+  LinOperator* AdjOperator = nullptr;
+  LinPreconditioner* AdjPreconditioner = nullptr;
 
   /*!
    * \brief Record one iteration of a flow iteration in within multiple zones.
@@ -149,16 +134,6 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
    */
   void UpdateAdjointsResidual();
 
-  /*!
-   * \brief Adjoint problem Jacobian-vector product.
-   */
-  void ApplyOperator(const CSysVector<Scalar>& u, CSysVector<Scalar>& v);
-
-  /*!
-   * \brief Adjoint problem preconditioner (based on the transpose approximate Jacobian of the primal problem).
-   */
-  void ApplyPreconditioner(const CSysVector<Scalar>& u, CSysVector<Scalar>& v);
-
   /*!
    * \brief Initialize the adjoint value of the objective function.
    */
@@ -318,4 +293,34 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
       offset += solver->GetnVar();
     }
   }
+
+  /*!
+   * \brief Adjoint problem Jacobian-vector product.
+   */
+  void ApplyOperator(const CSysVector<Scalar>& u, CSysVector<Scalar>& v);
+
+  /*!
+   * \brief Adjoint problem preconditioner (based on the transpose approximate Jacobian of the primal problem).
+   */
+  void ApplyPreconditioner(const CSysVector<Scalar>& u, CSysVector<Scalar>& v);
+};
+
+class LinOperator : public CMatrixVectorProduct<Scalar> {
+ public:
+  CDiscAdjSinglezoneDriver* const driver;
+  LinOperator(CDiscAdjSinglezoneDriver* d) : driver(d) { }
+
+  inline void operator()(const CSysVector<Scalar> & u, CSysVector<Scalar> & v) const override {
+    driver->ApplyOperator(u, v);
+  }
+};
+
+class LinPreconditioner : public CPreconditioner<Scalar> {
+ public:
+  CDiscAdjSinglezoneDriver* const driver;
+  LinPreconditioner(CDiscAdjSinglezoneDriver* d) : driver(d) { }
+
+  inline void operator()(const CSysVector<Scalar> & u, CSysVector<Scalar> & v) const override {
+    driver->ApplyPreconditioner(u, v);
+  }
 };

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -126,6 +126,9 @@ CDiscAdjSinglezoneDriver::~CDiscAdjSinglezoneDriver() {
   delete direct_iteration;
   delete direct_output;
   delete PrimalJacobian;
+  delete PrimalPreconditioner;
+  delete AdjOperator;
+  delete AdjPreconditioner;
 
 }
 
@@ -260,8 +263,8 @@ void CDiscAdjSinglezoneDriver::RunResidual() {
   AdjSolver.SetMonitoringFrequency(wrtFreq);
 
   /*--- Initialize the linear solver iterations ---*/
-  const auto AdjOperator = LinOperator(this);
-  const auto AdjPreconditioner = LinPreconditioner(this);
+  AdjOperator = new LinOperator(this);
+  AdjPreconditioner = new LinPreconditioner(this);
 
   Scalar eps = 1.0;
 
@@ -273,7 +276,7 @@ void CDiscAdjSinglezoneDriver::RunResidual() {
     Scalar eps_l = 0.0;
     Scalar tol_l = KrylovSysTol / eps;
 
-    nIter = AdjSolver.FGMRES_LinSolver(AdjRHS, AdjSol, AdjOperator, AdjPreconditioner, tol_l, nIter, eps_l, monitor,
+    nIter = AdjSolver.FGMRES_LinSolver(AdjRHS, AdjSol, *AdjOperator, *AdjPreconditioner, tol_l, nIter, eps_l, monitor,
                                        config_container[ZONE_0]);
     nKrylov_Iter -= nIter + 1;