moving Energy flag to CIncNSVariable and making it constant

Author: Cristopher-Morales

SU2_CFD/include/variables/CIncEulerVariable.hpp

@@ -73,7 +73,6 @@ class CIncEulerVariable : public CFlowVariable {
              Streamwise_Periodic_RecoveredTemperature; /*!< \brief Recovered/Physical temperature [K] for streamwise periodic flow. */
   su2double TemperatureLimits[2];                      /*!< \brief Temperature limits [K]. */
   su2double TemperatureInc = 0.0;                      /*!< \brief Temperature [K] imposed when energy equation is switch off. */
-  bool Energy;                                         /*!< \brief Flag for Energy equation in incompressible flows. */
  public:
   /*!
    * \brief Constructor of the class.

SU2_CFD/include/variables/CIncNSVariable.hpp

@@ -40,6 +40,7 @@ class CIncNSVariable final : public CIncEulerVariable {
 private:
   VectorType Tau_Wall;        /*!< \brief Magnitude of the wall shear stress from a wall function. */
   VectorType DES_LengthScale;
+  const bool Energy;          /*!< \brief Flag for Energy equation in incompressible flows. */
 
 public:
   /*!

SU2_CFD/src/variables/CIncNSVariable.cpp

@@ -30,7 +30,8 @@
 
 CIncNSVariable::CIncNSVariable(su2double pressure, const su2double *velocity, su2double enthalpy,
                                unsigned long npoint, unsigned long ndim, unsigned long nvar, const CConfig *config) :
-                               CIncEulerVariable(pressure, velocity, enthalpy, npoint, ndim, nvar, config) {
+                               CIncEulerVariable(pressure, velocity, enthalpy, npoint, ndim, nvar, config),
+                               Energy(config->GetEnergy_Equation()) {
 
   Vorticity.resize(nPoint,3);
   StrainMag.resize(nPoint);
@@ -46,7 +47,6 @@ CIncNSVariable::CIncNSVariable(su2double pressure, const su2double *velocity, su
     AuxVar.resize(nPoint,nAuxVar) = su2double(0.0);
     Grad_AuxVar.resize(nPoint,nAuxVar,nDim);
   }
-  Energy = config->GetEnergy_Equation();
   if(!Energy) TemperatureInc = config->GetInc_Temperature_Init();
 }