Skip to content

WIP General Framework for Scalar Transport Equations #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
economon wants to merge 18 commits into from
Closed

WIP General Framework for Scalar Transport Equations #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
be9bd68
Added scalar file stubs and updated build.
economon Aug 8, 2018
1da355e
CVariable class for scalar transport equations.
economon Aug 8, 2018
f190118
Scalar transport numerics.
economon Aug 8, 2018
204f844
First implementation of scalar transport solver.
economon Aug 8, 2018
924f0ed
Added calls to scalar models in iteration_structure.cpp.
economon Aug 8, 2018
c32b4f8
Added integration class changes for scalar transport.
economon Aug 8, 2018
f3c083b
First working version of passive scalar implementation and simple com…
economon Aug 14, 2018
069d066
New options, MG fix for inlets, etc.
economon Aug 15, 2018
4102c2f
Merge branch 'develop' into feature_scalar
economon Aug 20, 2018
1dbd211
Updating with develop and fixing a couple of memory issues.
economon Aug 21, 2018
b490794
Updating the scalar implementation with the develop branch.
economon Jul 22, 2019
6805674
Clean up of scalar framework for PR.
economon Aug 27, 2019
9129a23
More clean up.
economon Aug 27, 2019
8b1fe53
Small changes.
economon Aug 27, 2019
ef7730a
Updated the scalar framework to the new contiguous CVariable structur…
economon Nov 13, 2019
7741b76
Adjusting classes so that all turbulent CVariable and CNumerics inher…
economon Nov 14, 2019
048713e
Fixed turbulent variables names to be the scalar names for viscous flux.
economon Nov 15, 2019
dde6063
Updating TurbVar -> ScalarVar across turb solver BCs.
economon Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 153 additions & 3 deletions Common/include/config_structure.hpp
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions Common/include/config_structure.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,14 @@ inline su2double* CConfig::GetInc_Velocity_Init(void) { return Inc_Velocity_Init

inline su2double CConfig::GetInc_Temperature_Init(void) { return Inc_Temperature_Init; }

inline su2double CConfig::GetScalar_Init(void) { return Scalar_Init; }

inline bool CConfig::GetScalar_Clipping(void) { return Scalar_Clipping; }

inline su2double CConfig::GetScalar_Clipping_Max(void) { return Scalar_Clipping_Max; }

inline su2double CConfig::GetScalar_Clipping_Min(void) { return Scalar_Clipping_Min; }

inline su2double CConfig::GetHeat_Flux_Ref(void) { return Heat_Flux_Ref; }

inline su2double CConfig::GetWallTemperature(void) { return Wall_Temperature; }
Expand Down Expand Up @@ -870,6 +878,8 @@ inline unsigned short CConfig::GetKind_ConductivityModel(void) { return Kind_Con

inline unsigned short CConfig::GetKind_ConductivityModel_Turb(void) { return Kind_ConductivityModel_Turb; }

inline unsigned short CConfig::GetKind_DiffusivityModel(void) { return Kind_DiffusivityModel; }

inline su2double CConfig::GetMu_Constant(void) { return Mu_Constant; }

inline su2double CConfig::GetMu_ConstantND(void) { return Mu_ConstantND; }
Expand All @@ -878,6 +888,14 @@ inline su2double CConfig::GetKt_Constant(void) { return Kt_Constant; }

inline su2double CConfig::GetKt_ConstantND(void) { return Kt_ConstantND; }

inline su2double CConfig::GetDiffusivity_Constant(void) { return Diffusivity_Constant; }

inline su2double CConfig::GetDiffusivity_ConstantND(void) { return Diffusivity_ConstantND; }

inline su2double CConfig::GetSchmidt_Lam(void) { return Schmidt_Lam; }

inline su2double CConfig::GetSchmidt_Turb(void) { return Schmidt_Turb; }

inline su2double CConfig::GetMu_Ref(void) { return Mu_Ref; }

inline su2double CConfig::GetMu_RefND(void) { return Mu_RefND; }
Expand Down Expand Up @@ -924,6 +942,8 @@ inline void CConfig::SetMu_PolyCoeffND(su2double val_coeff, unsigned short val_i

inline void CConfig::SetKt_PolyCoeffND(su2double val_coeff, unsigned short val_index) { KtPolyCoefficientsND[val_index] = val_coeff; }

inline void CConfig::SetDiffusivity_ConstantND(su2double diffusivity_const) { Diffusivity_ConstantND = diffusivity_const; }

inline unsigned short CConfig::GetKind_GridMovement() { return Kind_GridMovement; }

inline void CConfig::SetKind_GridMovement(unsigned short motion_Type) { Kind_GridMovement = motion_Type; }
Expand Down Expand Up @@ -1018,6 +1038,8 @@ inline su2double CConfig::GetRelaxation_Factor_AdjFlow(void) { return Relaxation

inline su2double CConfig::GetRelaxation_Factor_Turb(void) { return Relaxation_Factor_Turb; }

inline su2double CConfig::GetRelaxation_Factor_Scalar(void) { return Relaxation_Factor_Scalar; }

inline su2double CConfig::GetRelaxation_Factor_CHT(void) { return Relaxation_Factor_CHT; }

inline su2double CConfig::GetRoe_Kappa(void) { return Roe_Kappa; }
Expand Down Expand Up @@ -1084,6 +1106,8 @@ inline bool CConfig::GetMUSCL_Flow(void) { return MUSCL_Flow; }

inline bool CConfig::GetMUSCL_Turb(void) { return MUSCL_Turb; }

inline bool CConfig::GetMUSCL_Scalar(void) { return MUSCL_Scalar; }

inline bool CConfig::GetMUSCL_Heat(void) { return MUSCL_Heat; }

inline bool CConfig::GetMUSCL_AdjFlow(void) { return MUSCL_AdjFlow; }
Expand Down Expand Up @@ -1116,6 +1140,8 @@ inline unsigned short CConfig::GetKind_SlopeLimit_Flow(void) { return Kind_Slope

inline unsigned short CConfig::GetKind_SlopeLimit_Turb(void) { return Kind_SlopeLimit_Turb; }

inline unsigned short CConfig::GetKind_SlopeLimit_Scalar(void) { return Kind_SlopeLimit_Scalar; }

inline unsigned short CConfig::GetKind_SlopeLimit_AdjTurb(void) { return Kind_SlopeLimit_AdjTurb; }

inline unsigned short CConfig::GetKind_SlopeLimit_AdjFlow(void) { return Kind_SlopeLimit_AdjFlow; }
Expand Down Expand Up @@ -1152,6 +1178,14 @@ inline su2double CConfig::GetKappa_2nd_AdjFlow(void) { return Kappa_2nd_AdjFlow;

inline su2double CConfig::GetKappa_4th_AdjFlow(void) { return Kappa_4th_AdjFlow; }

inline unsigned short CConfig::GetKind_TimeIntScheme_Scalar(void) { return Kind_TimeIntScheme_Scalar; }

inline unsigned short CConfig::GetKind_ConvNumScheme_Scalar(void) { return Kind_ConvNumScheme_Scalar; }

inline unsigned short CConfig::GetKind_Centered_Scalar(void) { return Kind_Centered_Scalar; }

inline unsigned short CConfig::GetKind_Upwind_Scalar(void) { return Kind_Upwind_Scalar; }

inline unsigned short CConfig::GetKind_TimeIntScheme_Turb(void) { return Kind_TimeIntScheme_Turb; }

inline unsigned short CConfig::GetKind_ConvNumScheme_Turb(void) { return Kind_ConvNumScheme_Turb; }
Expand Down Expand Up @@ -1581,6 +1615,8 @@ inline su2double CConfig::GetFixAzimuthalLine(void) { return FixAzimuthalLine; }

inline su2double CConfig::GetCFLRedCoeff_Turb(void) { return CFLRedCoeff_Turb; }

inline su2double CConfig::GetCFLRedCoeff_Scalar(void) { return CFLRedCoeff_Scalar; }

inline bool CConfig::GetGrid_Movement(void) { return (Kind_GridMovement != NO_MOVEMENT) || ((nKind_SurfaceMovement > 0) && !GetSurface_Movement(FLUID_STRUCTURE_STATIC)); }

inline bool CConfig::GetDynamic_Grid(void) {
Expand Down Expand Up @@ -1617,6 +1653,8 @@ inline unsigned short CConfig::GetKind_Turb_Model(void) { return Kind_Turb_Model

inline unsigned short CConfig::GetKind_Trans_Model(void) { return Kind_Trans_Model; }

inline unsigned short CConfig::GetKind_Scalar_Model(void) { return Kind_Scalar_Model; }

inline unsigned short CConfig::GetKind_SGS_Model(void) { return Kind_SGS_Model; }

inline bool CConfig::GetFrozen_Visc_Cont(void) { return Frozen_Visc_Cont; }
Expand Down
30 changes: 30 additions & 0 deletions Common/include/option_structure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ enum RUNTIME_TYPE {
RUNTIME_HEAT_SYS = 21, /*!< \brief One-physics case, the code is solving the heat equation. */
RUNTIME_ADJHEAT_SYS = 31, /*!< \brief One-physics case, the code is solving the adjoint heat equation. */
RUNTIME_TRANS_SYS = 22, /*!< \brief One-physics case, the code is solving the turbulence model. */
RUNTIME_SCALAR_SYS = 23, /*!< \brief One-physics case, the code is solving the turbulence model. */
};

const int FLOW_SOL = 0; /*!< \brief Position of the mean flow solution in the solver container array. */
Expand All @@ -456,6 +457,8 @@ const int TRANS_SOL = 4; /*!< \brief Position of the transition model solution i
const int HEAT_SOL = 5; /*!< \brief Position of the heat equation in the solution solver array. */
const int ADJHEAT_SOL = 6; /*!< \brief Position of the adjoint heat equation in the solution solver array. */

const int SCALAR_SOL = 5; /*!< \brief Position of the scalar transport solution in the solver container array. */
Copy link
Contributor

@oleburghardt oleburghardt Sep 25, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That excludes cases where we might want to run heat and scalar solvers side by side. So is the idea then to have a scalar solver with a (additional) temperature variable or should the weak coupling option be removed?

Copy link
Member Author

@economon economon Nov 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that, in the end, it would be great to make the current heat solver a solver for heat conduction in solids alone by removing the weakly coupled option. This will simplify things throughout the code a bit and let us remove some things. After/with this PR, it should be easier to have the heat solver inherit from some of the base scalar classes, as I have done for the turbulence models.


const int FEA_SOL = 0; /*!< \brief Position of the FEA equation in the solution solver array. */
const int ADJFEA_SOL = 1; /*!< \brief Position of the FEA adjoint equation in the solution solver array. */

Expand Down Expand Up @@ -624,6 +627,18 @@ static const map<string, ENUM_CONDUCTIVITYMODEL_TURB> TurbConductivityModel_Map
("NONE", NO_CONDUCTIVITY_TURB)
("CONSTANT_PRANDTL_TURB", CONSTANT_PRANDTL_TURB);

/*!
* \brief types of mass diffusivity models
*/
enum ENUM_DIFFUSIVITYMODEL {
CONSTANT_DIFFUSIVITY = 0, /*!< \brief Constant mass diffusivity for scalar transport. */
CONSTANT_SCHMIDT = 1 /*!< \brief Constant Schmidt number for mass diffusion in scalar transport. */
};

static const map<string, ENUM_DIFFUSIVITYMODEL> DiffusivityModel_Map = CCreateMap<string, ENUM_DIFFUSIVITYMODEL>
("CONSTANT_DIFFUSIVITY", CONSTANT_DIFFUSIVITY)
("CONSTANT_SCHMIDT", CONSTANT_SCHMIDT);

/*!
* \brief types of unsteady mesh motion
*/
Expand Down Expand Up @@ -853,6 +868,21 @@ static const map<string, ENUM_TRANS_MODEL> Trans_Model_Map = CCreateMap<string,
("LM", LM)
("BC", BC); //BAS-CAKMAKCIOGLU

/*!
* \brief types of scalar transport models
*/
enum ENUM_SCALAR_MODEL {
NO_SCALAR_MODEL = 0, /*!< \brief No scalar transport model. */
PASSIVE_SCALAR = 1, /*!< \brief Passive scalar transport model. */
PROGRESS_VARIABLE = 2, /*!< \brief Progress variable combustion model. */
CUSTOM_SCALAR = 3 /*!< \brief Custom scalar transport model. */
};
static const map<string, ENUM_SCALAR_MODEL> Scalar_Model_Map = CCreateMap<string, ENUM_SCALAR_MODEL>
("NONE", NO_SCALAR_MODEL)
("PASSIVE_SCALAR", PASSIVE_SCALAR)
("PROGRESS_VARIABLE", PROGRESS_VARIABLE)
("CUSTOM_SCALAR", CUSTOM_SCALAR);

/*!
* \brief types of subgrid scale models
*/
Expand Down
67 changes: 67 additions & 0 deletions Common/src/config_structure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,10 @@ void CConfig::SetConfig_Options() {
addEnumOption("KIND_TURB_MODEL", Kind_Turb_Model, Turb_Model_Map, NO_TURB_MODEL);
/*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NO_TRANS_MODEL \ingroup Config*/
addEnumOption("KIND_TRANS_MODEL", Kind_Trans_Model, Trans_Model_Map, NO_TRANS_MODEL);
/*!\brief KIND_SCALAR_MODEL \n DESCRIPTION: Specify scalar transport model \n Options: see \link Scalar_Model_Map \endlink \n DEFAULT: NO_SCALAR_MODEL \ingroup Config*/
addEnumOption("KIND_SCALAR_MODEL", Kind_Scalar_Model, Scalar_Model_Map, NO_SCALAR_MODEL);
/*!\brief KIND_TRANS_MODEL \n DESCRIPTION: Specify transition model OPTIONS: see \link Trans_Model_Map \endlink \n DEFAULT: NO_TRANS_MODEL \ingroup Config*/
/*!\brief HEAT_EQUATION \n DESCRIPTION: Enable heat equation for incompressible flows. \ingroup Config*/

/*!\brief KIND_SGS_MODEL \n DESCRIPTION: Specify subgrid scale model OPTIONS: see \link SGS_Model_Map \endlink \n DEFAULT: NO_SGS_MODEL \ingroup Config*/
addEnumOption("KIND_SGS_MODEL", Kind_SGS_Model, SGS_Model_Map, NO_SGS_MODEL);
Expand Down Expand Up @@ -995,6 +999,16 @@ void CConfig::SetConfig_Options() {
/* DESCRIPTION: Definition of the temperature polynomial coefficients for specific heat Cp. */
addDoubleArrayOption("KT_POLYCOEFFS", nPolyCoeffs, KtPolyCoefficients, default_kt_polycoeffs);

/*--- Options related to mass diffusivity ---*/

addEnumOption("DIFFUSIVITY_MODEL", Kind_DiffusivityModel, DiffusivityModel_Map, CONSTANT_DIFFUSIVITY);
/* DESCRIPTION: default value for AIR */
addDoubleOption("DIFFUSIVITY_CONSTANT", Diffusivity_Constant , 0.001);
/*!\brief SCHMIDT_LAM \n DESCRIPTION: Laminar Schmidt number of mass diffusion \ingroup Config*/
addDoubleOption("SCHMIDT_LAM", Schmidt_Lam, 1.0);
/*!\brief SCHMIDT_TURB \n DESCRIPTION: Turbulent Schmidt number of mass diffusion \n DEFAULT 0.90 \ingroup Config*/
addDoubleOption("SCHMIDT_TURB", Schmidt_Turb, 1.0);

/*!\brief REYNOLDS_NUMBER \n DESCRIPTION: Reynolds number (non-dimensional, based on the free-stream values). Needed for viscous solvers. For incompressible solvers the Reynolds length will always be 1.0 \n DEFAULT: 0.0 \ingroup Config */
addDoubleOption("REYNOLDS_NUMBER", Reynolds, 0.0);
/*!\brief REYNOLDS_LENGTH \n DESCRIPTION: Reynolds length (1 m by default). Used for compressible solver: incompressible solver will use 1.0. \ingroup Config */
Expand Down Expand Up @@ -1043,6 +1057,16 @@ void CConfig::SetConfig_Options() {
addEnumOption("INC_NONDIM", Ref_Inc_NonDim, NonDim_Map, INITIAL_VALUES);
/*!\brief INC_INLET_USENORMAL \n DESCRIPTION: Use the local boundary normal for the flow direction with the incompressible pressure inlet. \ingroup Config*/
addBoolOption("INC_INLET_USENORMAL", Inc_Inlet_UseNormal, false);

/*!\brief SCALAR_INIT \n DESCRIPTION: Initial value for scalar transport \ingroup Config*/
addDoubleOption("SCALAR_INIT", Scalar_Init, 0.0);
/*!\brief SCALAR_CLIPPING \n DESCRIPTION: Activate clipping for scalar transport equations \ingroup Config*/
addBoolOption("SCALAR_CLIPPING", Scalar_Clipping, false);
/*!\brief SCALAR_CLIPPING_MAX \n DESCRIPTION: Maximum value for scalar clipping \ingroup Config*/
addDoubleOption("SCALAR_CLIPPING_MAX", Scalar_Clipping_Max, 1.0e15);
/*!\brief SCALAR_CLIPPING_MIN \n DESCRIPTION: Minimum value for scalar clipping \ingroup Config*/
addDoubleOption("SCALAR_CLIPPING_MIN", Scalar_Clipping_Min, -1.0e15);

/*!\brief INC_INLET_DAMPING \n DESCRIPTION: Damping factor applied to the iterative updates to the velocity at a pressure inlet in incompressible flow (0.1 by default). \ingroup Config*/
addDoubleOption("INC_INLET_DAMPING", Inc_Inlet_Damping, 0.1);
/*!\brief INC_OUTLET_DAMPING \n DESCRIPTION: Damping factor applied to the iterative updates to the pressure at a mass flow outlet in incompressible flow (0.1 by default). \ingroup Config*/
Expand Down Expand Up @@ -1393,6 +1417,8 @@ void CConfig::SetConfig_Options() {
addDoubleOption("CFL_REDUCTION_TURB", CFLRedCoeff_Turb, 1.0);
/* DESCRIPTION: Reduction factor of the CFL coefficient in the turbulent adjoint problem */
addDoubleOption("CFL_REDUCTION_ADJTURB", CFLRedCoeff_AdjTurb, 1.0);
/* DESCRIPTION: Reduction factor of the CFL coefficient in the scalar transport problem */
addDoubleOption("CFL_REDUCTION_SCALAR", CFLRedCoeff_Scalar, 1.0);
/* DESCRIPTION: External iteration offset due to restart */
addUnsignedLongOption("EXT_ITER_OFFSET", ExtIter_OffSet, 0);
// these options share nRKStep as their size, which is not a good idea in general
Expand Down Expand Up @@ -1427,6 +1453,8 @@ void CConfig::SetConfig_Options() {
/* DESCRIPTION: Time discretization */
addEnumOption("TIME_DISCRE_ADJFLOW", Kind_TimeIntScheme_AdjFlow, Time_Int_Map, EULER_IMPLICIT);
/* DESCRIPTION: Time discretization */
addEnumOption("TIME_DISCRE_SCALAR", Kind_TimeIntScheme_Scalar, Time_Int_Map, EULER_IMPLICIT);
/* DESCRIPTION: Time discretization */
addEnumOption("TIME_DISCRE_TURB", Kind_TimeIntScheme_Turb, Time_Int_Map, EULER_IMPLICIT);
/* DESCRIPTION: Time discretization */
addEnumOption("TIME_DISCRE_ADJTURB", Kind_TimeIntScheme_AdjTurb, Time_Int_Map, EULER_IMPLICIT);
Expand Down Expand Up @@ -1460,6 +1488,8 @@ void CConfig::SetConfig_Options() {
addDoubleOption("RELAXATION_FACTOR_FLOW", Relaxation_Factor_Flow, 1.0);
/* DESCRIPTION: Relaxation of the turb equations solver for the implicit formulation */
addDoubleOption("RELAXATION_FACTOR_TURB", Relaxation_Factor_Turb, 1.0);
/* DESCRIPTION: Relaxation of the scalar transport equations solver for the implicit formulation */
addDoubleOption("RELAXATION_FACTOR_SCALAR", Relaxation_Factor_Scalar, 1.0);
/* DESCRIPTION: Relaxation of the adjoint flow equations solver for the implicit formulation */
addDoubleOption("RELAXATION_FACTOR_ADJFLOW", Relaxation_Factor_AdjFlow, 1.0);
/* DESCRIPTION: Relaxation of the CHT coupling */
Expand Down Expand Up @@ -1596,6 +1626,15 @@ void CConfig::SetConfig_Options() {
* \n DESCRIPTION: Convective numerical method \ingroup Config*/
addConvectOption("CONV_NUM_METHOD_TURB", Kind_ConvNumScheme_Turb, Kind_Centered_Turb, Kind_Upwind_Turb);

/*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/
addBoolOption("MUSCL_SCALAR", MUSCL_Scalar, false);
/*!\brief SLOPE_LIMITER_SCALAR
* \n DESCRIPTION: Slope limiter \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config*/
addEnumOption("SLOPE_LIMITER_SCALAR", Kind_SlopeLimit_Scalar, Limiter_Map, VENKATAKRISHNAN);
/*!\brief CONV_NUM_METHOD_SCALAR
* \n DESCRIPTION: Convective numerical method \ingroup Config*/
addConvectOption("CONV_NUM_METHOD_SCALAR", Kind_ConvNumScheme_Scalar, Kind_Centered_Scalar, Kind_Upwind_Scalar);

/*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/
addBoolOption("MUSCL_ADJTURB", MUSCL_AdjTurb, false);
/*!\brief SLOPE_LIMITER_ADJTURB
Expand Down Expand Up @@ -4363,6 +4402,14 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
}
}

/*--- Disable any scalar model other than passive scalar until
they are implemented. ---*/

if ((Kind_Scalar_Model != NO_SCALAR_MODEL) &&
(Kind_Scalar_Model != PASSIVE_SCALAR)) {
SU2_MPI::Error(string("Selected scalar model not yet implemented.") , CURRENT_FUNCTION);
}

/*--- Handle default options for topology optimization ---*/

if (topology_optimization && top_optim_nKernel==0) {
Expand Down Expand Up @@ -4553,6 +4600,7 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
RampOutletPressure = false;
RampRotatingFrame = false;
}

}

void CConfig::SetMarkers(unsigned short val_software) {
Expand Down Expand Up @@ -7672,6 +7720,7 @@ unsigned short CConfig::GetContainerPosition(unsigned short val_eqsystem) {
case RUNTIME_FLOW_SYS: return FLOW_SOL;
case RUNTIME_TURB_SYS: return TURB_SOL;
case RUNTIME_TRANS_SYS: return TRANS_SOL;
case RUNTIME_SCALAR_SYS: return SCALAR_SOL;
case RUNTIME_HEAT_SYS: return HEAT_SOL;
case RUNTIME_FEA_SYS: return FEA_SOL;
case RUNTIME_ADJPOT_SYS: return ADJFLOW_SOL;
Expand Down Expand Up @@ -7715,6 +7764,12 @@ void CConfig::SetGlobalParam(unsigned short val_solver,
MUSCL_Flow, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Flow);
}
if (val_system == RUNTIME_SCALAR_SYS) {
SetKind_ConvNumScheme(Kind_ConvNumScheme_Scalar, Kind_Centered_Scalar,
Kind_Upwind_Scalar, Kind_SlopeLimit_Scalar,
MUSCL_Scalar, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Scalar);
}
break;
case NAVIER_STOKES: case INC_NAVIER_STOKES:
if (val_system == RUNTIME_FLOW_SYS) {
Expand All @@ -7723,6 +7778,12 @@ void CConfig::SetGlobalParam(unsigned short val_solver,
MUSCL_Flow, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Flow);
}
if (val_system == RUNTIME_SCALAR_SYS) {
SetKind_ConvNumScheme(Kind_ConvNumScheme_Scalar, Kind_Centered_Scalar,
Kind_Upwind_Scalar, Kind_SlopeLimit_Scalar,
MUSCL_Scalar, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Scalar);
}
if (val_system == RUNTIME_HEAT_SYS) {
SetKind_ConvNumScheme(Kind_ConvNumScheme_Heat, NONE, NONE, NONE, NONE, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Heat);
Expand All @@ -7747,6 +7808,12 @@ void CConfig::SetGlobalParam(unsigned short val_solver,
MUSCL_Turb, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Turb);
}
if (val_system == RUNTIME_SCALAR_SYS) {
SetKind_ConvNumScheme(Kind_ConvNumScheme_Scalar, Kind_Centered_Scalar,
Kind_Upwind_Scalar, Kind_SlopeLimit_Scalar,
MUSCL_Scalar, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Scalar);
}
if (val_system == RUNTIME_HEAT_SYS) {
SetKind_ConvNumScheme(Kind_ConvNumScheme_Heat, NONE, NONE, NONE, NONE, NONE);
SetKind_TimeIntScheme(Kind_TimeIntScheme_Heat);
Expand Down
1 change: 1 addition & 0 deletions SU2_CFD/include/drivers/CDriver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
#include "../numerics/CFEAMeshElasticity.hpp"
#include "../solvers/CDiscAdjMeshSolver.hpp"
#include "../solvers/CMeshSolver.hpp"
#include "../solvers/CPassiveScalarSolver.hpp"
#include "../../../Common/include/geometry_structure.hpp"
#include "../../../Common/include/grid_movement_structure.hpp"
#include "../../../Common/include/config_structure.hpp"
Expand Down
Loading