increasing nPrimVar and removing some variables

Author: Cristopher-Morales

SU2_CFD/include/numerics_simd/flow/diffusion/viscous_fluxes.hpp

@@ -75,9 +75,7 @@ class CCompressibleViscousFluxBase : public CNumericsSIMD {
 
   const su2double gamma;
   const su2double gasConst;
-  const su2double prandtlLam;
   const su2double prandtlTurb;
-  const su2double cp;
   const bool correct;
   const bool useSA_QCR;
   const bool wallFun;
@@ -97,9 +95,7 @@ class CCompressibleViscousFluxBase : public CNumericsSIMD {
                                const CVariable* turbVars_, Ts&...) :
     gamma(config.GetGamma()),
     gasConst(config.GetGas_ConstantND()),
-    prandtlLam(config.GetPrandtl_Lam()),
     prandtlTurb(config.GetPrandtl_Turb()),
-    cp(gamma * gasConst / (gamma - 1)),
     correct(iMesh == MESH_0),
     useSA_QCR(config.GetSAParsedOptions().qcr2000),
     wallFun(config.GetWall_Functions()),
@@ -256,13 +252,11 @@ class CCompressibleViscousFluxBase : public CNumericsSIMD {
 template<size_t NDIM>
 class CCompressibleViscousFlux : public CCompressibleViscousFluxBase<NDIM, CCompressibleViscousFlux<NDIM> > {
 public:
-  static constexpr size_t nPrimVar = NDIM+7;
+  static constexpr size_t nPrimVar = NDIM+9;
   using Base = CCompressibleViscousFluxBase<NDIM, CCompressibleViscousFlux<NDIM> >;
   using Base::gamma;
   using Base::gasConst;
-  using Base::prandtlLam;
   using Base::prandtlTurb;
-  using Base::cp;
 
   /*!
    * \brief Constructor, initialize constants and booleans.
@@ -275,7 +269,7 @@ class CCompressibleViscousFlux : public CCompressibleViscousFluxBase<NDIM, CComp
    */
   template<class PrimitiveType>
   FORCEINLINE Double thermalConductivity(const PrimitiveType& V) const {
-    return V.thermalCond() + V.cp()*V.eddyVisc()/prandtlTurb;
+    return V.thermalCond() + V.cp() * V.eddyVisc() / prandtlTurb;
   }
 
   /*!