Merge branch 'feature_NEMO_Jhs' of https://github.com/su2code/SU2 into feature_NEMO_Jhs

Author: jtneedels

SU2_CFD/include/variables/CNEMONSVariable.hpp

@@ -99,7 +99,7 @@ class CNEMONSVariable final : public CNEMOEulerVariable {
    */
   inline su2double* GetDiffusionCoeff(unsigned long iPoint) override { return DiffusionCoeff[iPoint]; }
 
-    /*!
+  /*!
    * \brief Get the species enthalpy.
    * \return Value of the species enthalpy.
    */

SU2_CFD/include/variables/CVariable.hpp

@@ -938,10 +938,8 @@ class CVariable {
   inline virtual su2double GetMassFraction(unsigned long iPoint, unsigned long val_Species) const { return 0.0; }
 
   /*!
-   * \brief A virtual member.
-   * \param[in] iPoint - Point index.
-   * \param[in] val_Species - Index of species s.
-   * \return Value of enthalpy of species s.
+   * \brief Get the species enthalpy.
+   * \return Value of the species enthalpy.
    */
   inline virtual su2double* GetEnthalpys(unsigned long iPoint) { return nullptr; }
 

SU2_CFD/src/solvers/CNEMOEulerSolver.cpp

@@ -1591,8 +1591,6 @@ void CNEMOEulerSolver::BC_Far_Field(CGeometry *geometry, CSolver **solver_contai
         /*--- Primitive variables, and gradient ---*/
         visc_numerics->SetConservative(nodes->GetSolution(iPoint),
                                        node_infty->GetSolution(0) );
-        visc_numerics->SetConsVarGradient(nodes->GetGradient(iPoint),
-                                          node_infty->GetGradient(0) );
         visc_numerics->SetPrimitive(nodes->GetPrimitive(iPoint),
                                     node_infty->GetPrimitive(0) );
         visc_numerics->SetPrimVarGradient(nodes->GetGradient_Primitive(iPoint),
@@ -2119,8 +2117,6 @@ void CNEMOEulerSolver::BC_Outlet(CGeometry *geometry, CSolver **solver_container
 
 //        /*--- Conservative variables, and gradient ---*/
 //        visc_numerics->SetConservative(U_domain, U_outlet);
-//        visc_numerics->SetConsVarGradient(nodes->GetGradient(), node_infty->GetGradient() );
-
 
 //        /*--- Pass supplementary information to CNumerics ---*/
 //        visc_numerics->SetdPdU(nodes->GetdPdU(), node_infty->GetdPdU());

SU2_CFD/src/solvers/CNEMONSSolver.cpp

@@ -191,8 +191,6 @@ void CNEMONSSolver::Viscous_Residual(CGeometry *geometry,
     /*--- Primitive variables, and gradient ---*/
     numerics->SetConservative   (nodes->GetSolution(iPoint),
                                  nodes->GetSolution(jPoint) );
-    numerics->SetConsVarGradient(nodes->GetGradient(iPoint),
-                                 nodes->GetGradient(jPoint) );
     numerics->SetPrimitive      (nodes->GetPrimitive(iPoint),
                                  nodes->GetPrimitive(jPoint) );
     numerics->SetPrimVarGradient(nodes->GetGradient_Primitive(iPoint),

SU2_CFD/src/variables/CNEMONSVariable.cpp

@@ -113,7 +113,7 @@ bool CNEMONSVariable::SetPrimVar(unsigned long iPoint, CFluidModel *FluidModel)
 
   LaminarViscosity(iPoint) = fluidmodel->GetViscosity();
 
-  const auto& thermalconductivities    = fluidmodel->GetThermalConductivities();
+  const auto& thermalconductivities = fluidmodel->GetThermalConductivities();
   ThermalCond(iPoint)      = thermalconductivities[0];
   ThermalCond_ve(iPoint)   = thermalconductivities[1];