enable use of conductivity models for compressible flows

Author: Cristopher-Morales

Common/src/CConfig.cpp

@@ -4162,10 +4162,6 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
           SU2_MPI::Error("Only SUTHERLAND viscosity model can be used with US Measurement", CURRENT_FUNCTION);
         }
       }
-      if (Kind_ConductivityModel != CONDUCTIVITYMODEL::CONSTANT_PRANDTL) {
-        SU2_MPI::Error("Only CONSTANT_PRANDTL thermal conductivity model can be used with STANDARD_AIR and IDEAL_GAS",
-                       CURRENT_FUNCTION);
-      }
     }
     /*--- Check for Boundary condition option agreement ---*/
   if (Kind_InitOption == REYNOLDS){

SU2_CFD/include/numerics/flow/flow_diffusion.hpp

@@ -355,15 +355,10 @@ class CGeneralAvgGrad_Flow final : public CAvgGrad_Base {
    * \brief Compute the heat flux due to molecular and turbulent diffusivity
    * \param[in] val_gradprimvar - Gradient of the primitive variables.
    * \param[in] val_laminar_viscosity - Laminar viscosity.
-   * \param[in] val_eddy_viscosity - Eddy viscosity.
    * \param[in] val_thermal_conductivity - Thermal Conductivity.
-   * \param[in] val_heat_capacity_cp - Heat Capacity at constant pressure.
    */
-  void SetHeatFluxVector(const su2double* const *val_gradprimvar,
-                         su2double val_laminar_viscosity,
-                         su2double val_eddy_viscosity,
-                         su2double val_thermal_conductivity,
-                         su2double val_heat_capacity_cp);
+  void SetHeatFluxVector(const su2double* const* val_gradprimvar, su2double val_laminar_viscosity,
+                         su2double val_thermal_conductivity);
 
   /*!
    * \brief Compute the Jacobian of the heat flux vector
@@ -373,19 +368,13 @@ class CGeneralAvgGrad_Flow final : public CAvgGrad_Base {
    *
    * \param[in] val_Mean_PrimVar - Mean value of the primitive variables.
    * \param[in] val_Mean_SecVar - Mean value of the secondary variables.
-   * \param[in] val_eddy_viscosity - Value of the eddy viscosity.
    * \param[in] val_thermal_conductivity - Value of the thermal conductivity.
-   * \param[in] val_heat_capacity_cp - Value of the specific heat at constant pressure.
    * \param[in] val_dist_ij - Distance between the points.
    */
-  void SetHeatFluxJacobian(const su2double *val_Mean_PrimVar,
-                           const su2double *val_Mean_SecVar,
-                           su2double val_eddy_viscosity,
-                           su2double val_thermal_conductivity,
-                           su2double val_heat_capacity_cp,
-                           su2double val_dist_ij);
+  void SetHeatFluxJacobian(const su2double* val_Mean_PrimVar, const su2double* val_Mean_SecVar,
+                           su2double val_thermal_conductivity, su2double val_dist_ij);
 
-public:
+ public:
 
   /*!
    * \brief Constructor of the class.

SU2_CFD/src/numerics/flow/flow_diffusion.cpp

@@ -797,11 +797,9 @@ CGeneralAvgGrad_Flow::CGeneralAvgGrad_Flow(unsigned short val_nDim,
 
 void CGeneralAvgGrad_Flow::SetHeatFluxVector(const su2double* const *val_gradprimvar,
                                              const su2double val_laminar_viscosity,
-                                             const su2double val_eddy_viscosity,
-                                             const su2double val_thermal_conductivity,
-                                             const su2double val_heat_capacity_cp) {
+                                             const su2double val_thermal_conductivity) {
 
-  const su2double heat_flux_factor = val_thermal_conductivity + val_heat_capacity_cp*val_eddy_viscosity/Prandtl_Turb;
+  const su2double heat_flux_factor = val_thermal_conductivity;
 
   /*--- Gradient of primitive variables -> [Temp vel_x vel_y vel_z Pressure] ---*/
   for (unsigned short iDim = 0; iDim < nDim; iDim++) {
@@ -811,9 +809,7 @@ void CGeneralAvgGrad_Flow::SetHeatFluxVector(const su2double* const *val_gradpri
 
 void CGeneralAvgGrad_Flow::SetHeatFluxJacobian(const su2double *val_Mean_PrimVar,
                                                const su2double *val_Mean_SecVar,
-                                               const su2double val_eddy_viscosity,
                                                const su2double val_thermal_conductivity,
-                                               const su2double val_heat_capacity_cp,
                                                const su2double val_dist_ij) {
   /* Viscous flux Jacobians for arbitrary equations of state */
 
@@ -835,8 +831,7 @@ void CGeneralAvgGrad_Flow::SetHeatFluxJacobian(const su2double *val_Mean_PrimVar
   su2double dTdu1= dTde_rho*(-val_Mean_PrimVar[1])*(1/rho);
   su2double dTdu2= dTde_rho*(-val_Mean_PrimVar[2])*(1/rho);
 
-  su2double total_conductivity = val_thermal_conductivity + val_heat_capacity_cp*val_eddy_viscosity/Prandtl_Turb;
-  su2double factor2 = total_conductivity/val_dist_ij;
+  su2double factor2 = val_thermal_conductivity/val_dist_ij;
 
   heat_flux_jac_i[0] = factor2*dTdu0;
   heat_flux_jac_i[1] = factor2*dTdu1;
@@ -903,7 +898,6 @@ CNumerics::ResidualType<> CGeneralAvgGrad_Flow::ComputeResidual(const CConfig* c
   Laminar_Viscosity_i = V_i[nDim+5];    Laminar_Viscosity_j = V_j[nDim+5];
   Eddy_Viscosity_i = V_i[nDim+6];       Eddy_Viscosity_j = V_j[nDim+6];
   Thermal_Conductivity_i = V_i[nDim+7]; Thermal_Conductivity_j = V_j[nDim+7];
-  Cp_i = V_i[nDim+8]; Cp_j = V_j[nDim+8];
 
   /*--- Mean secondary variables ---*/
 
@@ -917,7 +911,6 @@ CNumerics::ResidualType<> CGeneralAvgGrad_Flow::ComputeResidual(const CConfig* c
   Mean_Eddy_Viscosity       = 0.5*(Eddy_Viscosity_i + Eddy_Viscosity_j);
   Mean_turb_ke              = 0.5*(turb_ke_i + turb_ke_j);
   Mean_Thermal_Conductivity = 0.5*(Thermal_Conductivity_i + Thermal_Conductivity_j);
-  Mean_Cp                   = 0.5*(Cp_i + Cp_j);
 
   /*--- Mean gradient approximation ---*/
 
@@ -954,8 +947,7 @@ CNumerics::ResidualType<> CGeneralAvgGrad_Flow::ComputeResidual(const CConfig* c
   if (config->GetSAParsedOptions().qcr2000) AddQCR(nDim, &Mean_GradPrimVar[1], tau);
   if (Mean_TauWall > 0) AddTauWall(UnitNormal, Mean_TauWall);
 
-  SetHeatFluxVector(Mean_GradPrimVar, Mean_Laminar_Viscosity,
-                    Mean_Eddy_Viscosity, Mean_Thermal_Conductivity, Mean_Cp);
+  SetHeatFluxVector(Mean_GradPrimVar, Mean_Laminar_Viscosity, Mean_Thermal_Conductivity);
 
   GetViscousProjFlux(Mean_PrimVar, Normal);
 
@@ -975,8 +967,7 @@ CNumerics::ResidualType<> CGeneralAvgGrad_Flow::ComputeResidual(const CConfig* c
 
       SetTauJacobian(Mean_PrimVar, Mean_Laminar_Viscosity, Mean_Eddy_Viscosity, dist_ij, UnitNormal);
 
-      SetHeatFluxJacobian(Mean_PrimVar, Mean_SecVar, Mean_Eddy_Viscosity,
-                          Mean_Thermal_Conductivity, Mean_Cp, dist_ij);
+      SetHeatFluxJacobian(Mean_PrimVar, Mean_SecVar, Mean_Thermal_Conductivity, dist_ij);
 
       GetViscousProjJacs(Mean_PrimVar, Area, Proj_Flux_Tensor, Jacobian_i, Jacobian_j);
     }

SU2_CFD/src/solvers/CAdjNSSolver.cpp

@@ -1641,10 +1641,8 @@ void CAdjNSSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_cont
       }
 
       /*--- Get transport coefficient information ---*/
-      Laminar_Viscosity    = solver_container[FLOW_SOL]->GetNodes()->GetLaminarViscosity(iPoint);
       Eddy_Viscosity       = solver_container[FLOW_SOL]->GetNodes()->GetEddyViscosity(iPoint);
-      Thermal_Conductivity = Cp * ( Laminar_Viscosity/Prandtl_Lam
-                                   +Eddy_Viscosity/Prandtl_Turb);
+      Thermal_Conductivity = solver_container[FLOW_SOL]-> GetNodes()->GetThermalConductivity(iPoint);
 
 //      GradV = solver_container[FLOW_SOL]->GetNodes()->GetGradient_Primitive(iPoint);
 
@@ -1660,8 +1658,7 @@ void CAdjNSSolver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_cont
         GradT = solver_container[FLOW_SOL]->GetNodes()->GetGradient_Primitive(iPoint)[0];
         kGTdotn = 0.0;
         for (iDim = 0; iDim < nDim; iDim++)
-          kGTdotn += Cp * Laminar_Viscosity/Prandtl_Lam*GradT[iDim]*Normal[iDim]/Area;
-        // Cp * Viscosity/Prandtl_Lam matches term used in solver_direct_mean
+          kGTdotn += (Thermal_Conductivity - Cp * Eddy_Viscosity/Prandtl_Turb) * GradT[iDim]*Normal[iDim]/Area;
         /*--- constant term to multiply max heat flux objective ---*/
         Xi = solver_container[FLOW_SOL]->GetTotal_HeatFlux(); // versions for max heat flux
         Xi = pow(Xi, 1.0/pnorm-1.0)/pnorm;

SU2_CFD/src/solvers/CNSSolver.cpp

@@ -622,7 +622,6 @@ void CNSSolver::BC_Isothermal_Wall_Generic(CGeometry *geometry, CSolver **solver
   const su2double Prandtl_Lam = config->GetPrandtl_Lam();
   const su2double Prandtl_Turb = config->GetPrandtl_Turb();
   const su2double Gas_Constant = config->GetGas_ConstantND();
-  const su2double Cp = (Gamma / Gamma_Minus_One) * Gas_Constant;
 
   /*--- Identify the boundary and retrieve the specified wall temperature from
    the config (for non-CHT problems) as well as the wall function treatment. ---*/
@@ -689,9 +688,7 @@ void CNSSolver::BC_Isothermal_Wall_Generic(CGeometry *geometry, CSolver **solver
 
     /*--- Get transport coefficients ---*/
 
-    su2double laminar_viscosity    = nodes->GetLaminarViscosity(iPoint);
-    su2double eddy_viscosity       = nodes->GetEddyViscosity(iPoint);
-    su2double thermal_conductivity = Cp * (laminar_viscosity/Prandtl_Lam + eddy_viscosity/Prandtl_Turb);
+    su2double thermal_conductivity = nodes->GetThermalConductivity(iPoint);
 
     // work in progress on real-gases...
     //thermal_conductivity = nodes->GetThermalConductivity(iPoint);