fixes, secret option to use it in Newton Krylov

Author: pcarruscag

Common/include/CConfig.hpp

@@ -430,7 +430,7 @@ class CConfig {
   unsigned short nQuasiNewtonSamples;  /*!< \brief Number of samples used in quasi-Newton solution methods. */
   bool UseVectorization;       /*!< \brief Whether to use vectorized numerics schemes. */
   bool NewtonKrylov;           /*!< \brief Use a coupled Newton method to solve the flow equations. */
-  array<unsigned short,3> NK_IntParam{{20, 3, 2}}; /*!< \brief Integer parameters for NK method. */
+  array<unsigned short,4> NK_IntParam{{20, 3, 2, 0}}; /*!< \brief Integer parameters for NK method. */
   array<su2double,5> NK_DblParam{{-2.0, 0.1, -3.0, 1e-4, 1.0}}; /*!< \brief Floating-point parameters for NK method. */
   su2double NK_Relaxation = 1.0;
 
@@ -4401,7 +4401,7 @@ class CConfig {
   /*!
    * \brief Get Newton-Krylov integer parameters.
    */
-  array<unsigned short,3> GetNewtonKrylovIntParam() const { return NK_IntParam; }
+  array<unsigned short,4> GetNewtonKrylovIntParam() const { return NK_IntParam; }
 
   /*!
    * \brief Get Newton-Krylov floating-point parameters.

Common/include/linear_algebra/CSysSolve.hpp

@@ -54,6 +54,15 @@ class CPreconditioner;
  *    Absolute tolerance, target residual is tol*||b||. ---*/
 enum class LinearToleranceType { RELATIVE, ABSOLUTE };
 
+/*!
+ * \brief Modes of using FGCRODR.
+ * \ingroup SpLinSys
+ */
+enum class FgcrodrMode {
+  NORMAL,   /*!< \brief Solve the linear system. */
+  SAME_MAT, /*!< \brief "NORMAL" but knowing the matrix did not change. */
+};
+
 /*!
  * \class CSysSolve
  * \ingroup SpLinSys
@@ -99,8 +108,8 @@ class CSysSolve {
   mutable VectorType v;   /*!< \brief BCGSTAB "v" vector (v = A * M^-1 * p). */
 
   mutable unsigned long k = 0;
-  mutable std::vector<VectorType> W, V; /*!< \brief Large matrix used by FGMRES, w^i+1 = A * z^i. */
-  mutable std::vector<VectorType> Z, T; /*!< \brief Large matrix used by FGMRES, preconditioned W. */
+  mutable std::vector<VectorType> Z, V; /*!< \brief Large matrices used by FGMRES, v^i+1 = A * z^i. */
+  mutable std::vector<VectorType> W, T; /*!< \brief Large matrices used by FGCRODR for deflation vectors. */
 
   /*!< \brief Temporary used when it is necessary to interface between active and passive types. */
   VectorType LinSysSol_tmp;
@@ -283,7 +292,8 @@ class CSysSolve {
   template <class Dummy = int>
   unsigned long FGCRODR_LinSolverImpl(const VectorType& b, VectorType& x, const ProductType& mat_vec,
                                       const PrecondType& precond, ScalarType tol, unsigned long max_iter,
-                                      ScalarType& residual, bool monitoring, const CConfig* config) const;
+                                      ScalarType& residual, bool monitoring, const CConfig* config,
+                                      FgcrodrMode mode) const;
 
  public:
   /*!
@@ -341,10 +351,12 @@ class CSysSolve {
    * \param[out] residual - final normalized residual
    * \param[in] monitoring - turn on priting residuals from solver to screen.
    * \param[in] config - Definition of the particular problem.
+   * \param[in] mode - See FgcrodrMode.
    */
   unsigned long FGCRODR_LinSolver(const VectorType& b, VectorType& x, const ProductType& mat_vec,
                                   const PrecondType& precond, ScalarType tol, unsigned long max_iter,
-                                  ScalarType& residual, bool monitoring, const CConfig* config) const;
+                                  ScalarType& residual, bool monitoring, const CConfig* config,
+                                  FgcrodrMode mode = FgcrodrMode::NORMAL) const;
 
   /*!
    * \brief Biconjugate Gradient Stabilized Method (BCGSTAB)
@@ -436,5 +448,5 @@ class CSysSolve {
   /*!
    * \brief Discard FGCRODR's deflation vectors for the next solve.
    */
-  inline void ResetDeflation() { k = 0; }
+  inline void ResetDeflation() const { k = 0; }
 };