Merge remote-tracking branch 'origin/develop' into chore_minor_cleanups

Author: TobiKattmann

Common/include/option_structure.hpp

@@ -102,6 +102,7 @@ const su2double EPS = 1.0E-16;        /*!< \brief Error scale. */
 const su2double TURB_EPS = 1.0E-16;   /*!< \brief Turbulent Error scale. */
 
 const su2double ONE2 = 0.5;         /*!< \brief One divided by two. */
+const su2double ONE3 = 1.0 / 3.0;   /*!< \brief One divided by three. */
 const su2double TWO3 = 2.0 / 3.0;   /*!< \brief Two divided by three. */
 const su2double FOUR3 = 4.0 / 3.0;  /*!< \brief Four divided by three. */
 
@@ -2213,7 +2214,7 @@ enum MPI_QUANTITIES {
   SOLUTION_FEA_OLD     = 26,  /*!< \brief FEA solution old communication. */
   MESH_DISPLACEMENTS   = 27,  /*!< \brief Mesh displacements at the interface. */
   SOLUTION_TIME_N      = 28,  /*!< \brief Solution at time n. */
-  SOLUTION_TIME_N1     = 29,   /*!< \brief Solution at time n-1. */
+  SOLUTION_TIME_N1     = 29,  /*!< \brief Solution at time n-1. */
   PRIMITIVE            = 30   /*!< \brief Primitive solution communication. */
 };
 

SU2_CFD/include/numerics/CNumerics.hpp

@@ -181,8 +181,8 @@ class CNumerics {
   **TurbPsi_Grad_i,  /*!< \brief Gradient of adjoint turbulent variables at point i. */
   **TurbPsi_Grad_j;  /*!< \brief Gradient of adjoint turbulent variables at point j. */
   su2double
-  *AuxVar_Grad_i,    /*!< \brief Gradient of an auxiliary variable at point i. */
-  *AuxVar_Grad_j;    /*!< \brief Gradient of an auxiliary variable at point i. */
+  **AuxVar_Grad_i,    /*!< \brief Gradient of an auxiliary variable at point i. */
+  **AuxVar_Grad_j;    /*!< \brief Gradient of an auxiliary variable at point i. */
   const su2double *RadVar_Source;  /*!< \brief Source term from the radiative heat transfer equation. */
   su2double
   *Coord_i,      /*!< \brief Cartesians coordinates of point i. */
@@ -609,12 +609,13 @@ class CNumerics {
 
   /*!
    * \brief Set the gradient of the auxiliary variables.
-   * \param[in] val_auxvargrad_i - Gradient of the auxiliary variable at point i.
-   * \param[in] val_auxvargrad_j - Gradient of the auxiliary variable at point j.
+   * \param[in] val_auxvar_grad_i - Gradient of the auxiliary variable at point i.
+   * \param[in] val_auxvar_grad_j - Gradient of the auxiliary variable at point j.
    */
-  inline void SetAuxVarGrad(su2double *val_auxvargrad_i, su2double *val_auxvargrad_j) {
-    AuxVar_Grad_i = val_auxvargrad_i;
-    AuxVar_Grad_j = val_auxvargrad_j;
+  inline void SetAuxVarGrad(su2double **val_auxvar_grad_i,
+                            su2double **val_auxvar_grad_j) {
+    AuxVar_Grad_i = val_auxvar_grad_i;
+    AuxVar_Grad_j = val_auxvar_grad_j;
   }
 
   /*!

SU2_CFD/include/numerics/flow/flow_sources.hpp

@@ -63,7 +63,16 @@ class CSourceBase_Flow : public CNumerics {
  * \ingroup SourceDiscr
  * \author F. Palacios
  */
-class CSourceAxisymmetric_Flow final : public CSourceBase_Flow {
+class CSourceAxisymmetric_Flow : public CSourceBase_Flow {
+protected:
+    bool implicit, viscous, rans;
+    su2double yinv{0.0};
+    
+  /*!
+  * \brief Diffusion residual of the axisymmetric source term.
+  */
+  void ResidualDiffusion();
+    
 public:
   /*!
    * \brief Constructor of the class.
@@ -74,12 +83,31 @@ class CSourceAxisymmetric_Flow final : public CSourceBase_Flow {
   CSourceAxisymmetric_Flow(unsigned short val_nDim, unsigned short val_nVar, const CConfig* config);
 
   /*!
-   * \brief Residual of the rotational frame source term.
+   * \brief Residual of the axisymmetric source term.
    * \param[in] config - Definition of the particular problem.
    * \return Lightweight const-view of residual and Jacobian.
    */
   ResidualType<> ComputeResidual(const CConfig* config) override;
+  
+};
 
+/*!
+ * \class CSourceGeneralAxisymmetric_Flow
+ * \brief Class for source term for solving axisymmetric problems for a general (non ideal) fluid.
+ * \ingroup SourceDiscr
+ * \author F. Dittmann
+ */
+class CSourceGeneralAxisymmetric_Flow final : public CSourceAxisymmetric_Flow {
+public:
+  
+  using CSourceAxisymmetric_Flow::CSourceAxisymmetric_Flow;
+  /*!
+   * \brief Residual of the general axisymmetric source term.
+   * \param[in] config - Definition of the particular problem.
+   * \return Lightweight const-view of residual and Jacobian.
+   */
+  ResidualType<> ComputeResidual(const CConfig* config) override;
+  
 };
 
 /*!

SU2_CFD/include/solvers/CAdjEulerSolver.hpp

@@ -78,6 +78,13 @@ class CAdjEulerSolver : public CSolver {
    */
   inline CVariable* GetBaseClassPointerToNodes() override { return nodes; }
 
+  /*!
+   * \brief Compute the Least Squares gradient of an auxiliar variable on the profile surface.
+   * \param[in] geometry - Geometrical definition of the problem.
+   * \param[in] config - Definition of the particular problem.
+   */
+  void SetAuxVar_Surface_Gradient(CGeometry *geometry, const CConfig *config);
+
 public:
 
   /*!

SU2_CFD/include/solvers/CSolver.hpp

@@ -585,13 +585,6 @@ class CSolver {
    */
   void SetAuxVar_Gradient_LS(CGeometry *geometry, const CConfig *config);
 
-  /*!
-   * \brief Compute the Least Squares gradient of an auxiliar variable on the profile surface.
-   * \param[in] geometry - Geometrical definition of the problem.
-   * \param[in] config - Definition of the particular problem.
-   */
-  void SetAuxVar_Surface_Gradient(CGeometry *geometry, const CConfig *config);
-
   /*!
    * \brief Add External to Solution vector.
    */

SU2_CFD/include/variables/CVariable.hpp

@@ -77,8 +77,8 @@ class CVariable {
   MatrixType Solution_Max;   /*!< \brief Max solution for limiter computation. */
   MatrixType Solution_Min;   /*!< \brief Min solution for limiter computation. */
 
-  VectorType AuxVar;       /*!< \brief Auxiliar variable for gradient computation. */
-  MatrixType Grad_AuxVar;  /*!< \brief Gradient of the auxiliar variable. */
+  MatrixType AuxVar;             /*!< \brief Auxiliar variable for gradient computation. */
+  CVectorOfMatrix Grad_AuxVar;   /*!< \brief Gradient of the auxilliary variables  of the problem. */
 
   VectorType Max_Lambda_Inv;   /*!< \brief Maximun inviscid eingenvalue. */
   VectorType Max_Lambda_Visc;  /*!< \brief Maximun viscous eingenvalue. */
@@ -105,6 +105,7 @@ class CVariable {
   unsigned long nPrimVarGrad = 0;    /*!< \brief Number of primitives for which a gradient is computed. */
   unsigned long nSecondaryVar = 0;     /*!< \brief Number of secondary variables. */
   unsigned long nSecondaryVarGrad = 0;   /*!< \brief Number of secondaries for which a gradient is computed. */
+  unsigned long nAuxVar = 0; /*!< \brief Number of auxiliary variables. */
 
   /*--- Only allow default construction by derived classes. ---*/
   CVariable() = default;
@@ -137,6 +138,11 @@ class CVariable {
    */
   virtual ~CVariable() = default;
 
+  /*!
+   * \brief Get the number of auxiliary variables.
+   */
+  inline unsigned long GetnAuxVar() const { return nAuxVar; }
+
   /*!
    * \brief Set the value of the solution, all variables.
    * \param[in] iPoint - Point index.
@@ -564,65 +570,62 @@ class CVariable {
   inline su2double GetLocalCFL(unsigned long iPoint) const { return LocalCFL(iPoint); }
 
   /*!
-   * \brief Set auxiliar variables, we are looking for the gradient of that variable.
-   * \param[in] iPoint - Point index.
-   * \param[in] val_auxvar - Value of the auxiliar variable.
+   * \brief Get the entire Aux matrix of the problem.
+   * \return Reference to the aux var  matrix.
    */
-  inline void SetAuxVar(unsigned long iPoint, su2double val_auxvar) { AuxVar(iPoint) = val_auxvar; }
+  inline const MatrixType& GetAuxVar(void) const { return AuxVar; }
 
   /*!
-   * \brief Get the value of the auxiliary variable.
-   * \param[in] iPoint - Point index.
-   * \return Value of the auxiliary variable.
+   * \brief Get the Aux var value at Point i, variable j.
    */
-  inline su2double GetAuxVar(unsigned long iPoint) const { return AuxVar(iPoint); }
+  inline su2double GetAuxVar(unsigned long iPoint, unsigned long iVar = 0) const { return AuxVar(iPoint,iVar); }
 
   /*!
-   * \brief Get the auxiliary variable.
-   * \return 2D view of the auxiliary variable.
+   * \brief Set auxiliary variables.
+   * \param[in] iPoint - Point index.
+   * \param[in] iVar - Varriable indexs
+   * \param[in] val_auxvar - Value of the auxiliar variable.
    */
-  inline C2DDummyLastView<const VectorType> GetAuxVar(void) const {
-    return C2DDummyLastView<const VectorType>(AuxVar);
+  inline void SetAuxVar(unsigned long iPoint, unsigned long iVar, const su2double auxvar) {
+    AuxVar(iPoint,iVar) = auxvar;
   }
 
   /*!
-   * \brief Set the value of the auxiliary variable gradient.
+   * \brief Set value of auxillary gradients.
    * \param[in] iPoint - Point index.
+   * \param[in] iVar - Index of the variable.
    * \param[in] iDim - Index of the dimension.
-   * \param[in] val_gradient - Value of the gradient for the index <i>iDim</i>.
+   * \param[in] value - Value of the gradient.
    */
-  inline void SetAuxVarGradient(unsigned long iPoint, unsigned long iDim, su2double val_gradient) { Grad_AuxVar(iPoint,iDim) = val_gradient; }
+  inline void SetAuxVarGradient(unsigned long iPoint, unsigned long iVar, unsigned long iDim, su2double value) {
+    Grad_AuxVar(iPoint,iVar,iDim) = value;
+  }
 
   /*!
-   * \brief Add a value to the auxiliary variable gradient.
-   * \param[in] iPoint - Point index.
-   * \param[in] iDim - Index of the dimension.
-   * \param[in] val_value - Value of the gradient to be added for the index <i>iDim</i>.
+   * \brief Get the gradient of the auxilary variables.
+   * \return Reference to gradient.
    */
-  inline void AddAuxVarGradient(unsigned long iPoint, unsigned long iDim, su2double val_value) { Grad_AuxVar(iPoint,iDim) += val_value;}
+  inline CVectorOfMatrix& GetAuxVarGradient(void) { return Grad_AuxVar; }
 
   /*!
-   * \brief Get the gradient of the auxiliary variable.
+   * \brief Get the value of the auxilliary gradient.
    * \param[in] iPoint - Point index.
-   * \return Value of the gradient of the auxiliary variable.
-   */
-  inline su2double *GetAuxVarGradient(unsigned long iPoint) { return Grad_AuxVar[iPoint]; }
-
-  /*!
-   * \brief Get the gradient of the auxiliary variable.
-   * \return 3D view of the gradient of the auxiliary variable.
+   * \param[in] iVar - Index of the variable.
+   * \param[in] iDim - Index of the dimension.
+   * \return Value of the solution gradient.
    */
-  inline C3DDummyMiddleView<MatrixType> GetAuxVarGradient() {
-    return C3DDummyMiddleView<MatrixType>(Grad_AuxVar);
+  inline su2double GetAuxVarGradient(unsigned long iPoint, unsigned long iVar, unsigned long iDim) const {
+    return Grad_AuxVar(iPoint,iVar,iDim);
   }
 
   /*!
-   * \brief Get the gradient of the auxiliary variable.
+   * \brief Get the value of the auxilliary gradient.
    * \param[in] iPoint - Point index.
-   * \param[in] iDim - Index of the dimension.
-   * \return Value of the gradient of the auxiliary variable for the dimension <i>iDim</i>.
+   * \return Value of the solution gradient.
    */
-  inline su2double GetAuxVarGradient(unsigned long iPoint, unsigned long iDim) const { return Grad_AuxVar(iPoint,iDim); }
+  inline su2double** GetAuxVarGradient(unsigned long iPoint) {
+    return Grad_AuxVar[iPoint];
+  }
 
   /*!
    * \brief Add a value to the truncation error.

SU2_CFD/src/drivers/CDriver.cpp

@@ -1864,8 +1864,10 @@ void CDriver::Numerics_Preprocessing(CConfig *config, CGeometry **geometry, CSol
       else if (config->GetAxisymmetric() == YES) {
         if (incompressible)
           numerics[iMGlevel][FLOW_SOL][source_first_term] = new CSourceIncAxisymmetric_Flow(nDim, nVar_Flow, config);
-        else
+        else if (ideal_gas)
           numerics[iMGlevel][FLOW_SOL][source_first_term] = new CSourceAxisymmetric_Flow(nDim, nVar_Flow, config);
+        else
+          numerics[iMGlevel][FLOW_SOL][source_first_term] = new CSourceGeneralAxisymmetric_Flow(nDim, nVar_Flow, config);
       }
       else if (config->GetGravityForce() == YES) {
         numerics[iMGlevel][FLOW_SOL][source_first_term] = new CSourceGravity(nDim, nVar_Flow, config);