@@ -513,7 +513,7 @@ class CConfig {
513513 DIFFUSIVITYMODEL Kind_Diffusivity_Model; /* !< \brief Kind of the mass diffusivity Model */
514514 FREESTREAM_OPTION Kind_FreeStreamOption; /* !< \brief Kind of free stream option to choose if initializing with density or temperature */
515515 MAIN_SOLVER Kind_Solver; /* !< \brief Kind of solver: Euler, NS, Continuous adjoint, etc. */
516- LIMITER Kind_SlopeLimit, /* !< \brief Global slope limiter. */
516+ LIMITER Kind_SlopeLimit, /* !< \brief Slope limiter (for the runtime eq. system) . */
517517 Kind_SlopeLimit_Flow, /* !< \brief Slope limiter for flow equations.*/
518518 Kind_SlopeLimit_Turb, /* !< \brief Slope limiter for the turbulence equation.*/
519519 Kind_SlopeLimit_AdjTurb, /* !< \brief Slope limiter for the adjoint turbulent equation.*/
@@ -560,12 +560,12 @@ class CConfig {
560560 Kind_ConvNumScheme_AdjTurb, /* !< \brief Centered or upwind scheme for the adjoint turbulence model. */
561561 Kind_ConvNumScheme_Species, /* !< \brief Centered or upwind scheme for the species model. */
562562 Kind_ConvNumScheme_Template, /* !< \brief Centered or upwind scheme for the level set equation. */
563- Kind_FEM, /* !< \brief Finite element scheme for the flow equations. */
563+ Kind_FEM, /* !< \brief Finite element scheme for the flow equations (for the runtime eq. system) . */
564564 Kind_FEM_Flow, /* !< \brief Finite element scheme for the flow equations. */
565565 Kind_Matrix_Coloring; /* !< \brief Type of matrix coloring for sparse Jacobian computation. */
566566
567567 CENTERED
568- Kind_Centered, /* !< \brief Centered scheme. */
568+ Kind_Centered, /* !< \brief Centered scheme (for the runtime eq. system) . */
569569 Kind_Centered_Flow, /* !< \brief Centered scheme for the flow equations. */
570570 Kind_Centered_AdjFlow, /* !< \brief Centered scheme for the adjoint flow equations. */
571571 Kind_Centered_Turb, /* !< \brief Centered scheme for the turbulence model. */
@@ -582,7 +582,7 @@ class CConfig {
582582 bool Energy_Equation; /* !< \brief Solve the energy equation for incompressible flows. */
583583
584584 UPWIND
585- Kind_Upwind, /* !< \brief Upwind scheme. */
585+ Kind_Upwind, /* !< \brief Upwind scheme (for the runtime eq. system) . */
586586 Kind_Upwind_Flow, /* !< \brief Upwind scheme for the flow equations. */
587587 Kind_Upwind_AdjFlow, /* !< \brief Upwind scheme for the adjoint flow equations. */
588588 Kind_Upwind_Turb, /* !< \brief Upwind scheme for the turbulence model. */
@@ -591,13 +591,19 @@ class CConfig {
591591 Kind_Upwind_Heat, /* !< \brief Upwind scheme for the heat transfer model. */
592592 Kind_Upwind_Template; /* !< \brief Upwind scheme for the template model. */
593593
594- bool MUSCL, /* !< \brief MUSCL scheme . */
594+ bool MUSCL, /* !< \brief MUSCL scheme (for the runtime eq. system). */
595595 MUSCL_Flow, /* !< \brief MUSCL scheme for the flow equations.*/
596596 MUSCL_Turb, /* !< \brief MUSCL scheme for the turbulence equations.*/
597597 MUSCL_Heat, /* !< \brief MUSCL scheme for the (fvm) heat equation.*/
598598 MUSCL_AdjFlow, /* !< \brief MUSCL scheme for the adj flow equations.*/
599- MUSCL_AdjTurb; /* !< \brief MUSCL scheme for the adj turbulence equations.*/
600- bool MUSCL_Species; /* !< \brief MUSCL scheme for the species equations.*/
599+ MUSCL_AdjTurb, /* !< \brief MUSCL scheme for the adj turbulence equations.*/
600+ MUSCL_Species; /* !< \brief MUSCL scheme for the species equations.*/
601+ su2double MUSCL_Kappa, /* !< \brief Blending coefficient for U-MUSCL scheme (for the runtime eq. system). */
602+ MUSCL_Kappa_Flow, /* !< \brief Blending coefficient for U-MUSCL scheme for the flow equations.*/
603+ MUSCL_Kappa_Turb, /* !< \brief Blending coefficient for U-MUSCL scheme for the turbulence equations.*/
604+ MUSCL_Kappa_Heat, /* !< \brief Blending coefficient for U-MUSCL scheme for the (fvm) heat equation.*/
605+ MUSCL_Kappa_AdjFlow, /* !< \brief Blending coefficient for U-MUSCL scheme for the adj flow equations.*/
606+ MUSCL_Kappa_Species; /* !< \brief Blending coefficient for U-MUSCL scheme for the species equations.*/
601607 bool Use_Accurate_Jacobians; /* !< \brief Use numerically computed Jacobians for AUSM+up(2) and SLAU(2). */
602608 bool Use_Accurate_Turb_Jacobians; /* !< \brief Use numerically computed Jacobians for standard SA turbulence model. */
603609 bool EulerPersson; /* !< \brief Boolean to determine whether this is an Euler simulation with Persson shock capturing. */
@@ -2462,11 +2468,12 @@ class CConfig {
24622468 * \param[in] val_kind_upwind - If upwind scheme, kind of upwind scheme (Roe, etc.).
24632469 * \param[in] val_kind_slopelimit - If upwind scheme, kind of slope limit.
24642470 * \param[in] val_muscl - Define if we apply a MUSCL scheme or not.
2471+ * \param[in] val_muscl_kappa - Define the blending coefficient for the MUSCL scheme.
24652472 * \param[in] val_kind_fem - If FEM, what kind of FEM discretization.
24662473 */
24672474 void SetKind_ConvNumScheme (unsigned short val_kind_convnumscheme, CENTERED val_kind_centered,
24682475 UPWIND val_kind_upwind, LIMITER val_kind_slopelimit,
2469- bool val_muscl, unsigned short val_kind_fem);
2476+ bool val_muscl, su2double val_muscl_kappa, unsigned short val_kind_fem);
24702477
24712478 /* !
24722479 * \brief Get the value of limiter coefficient.
@@ -4622,54 +4629,30 @@ class CConfig {
46224629
46234630 /* !
46244631 * \brief Get if the upwind scheme used MUSCL or not.
4625- * \note This is the information that the code will use, the method will
4626- * change in runtime depending of the specific equation (direct, adjoint,
4627- * linearized) that is being solved.
46284632 * \return MUSCL scheme.
46294633 */
46304634 bool GetMUSCL_Flow (void ) const { return MUSCL_Flow; }
46314635
4632- /* !
4633- * \brief Get if the upwind scheme used MUSCL or not.
4634- * \note This is the information that the code will use, the method will
4635- * change in runtime depending of the specific equation (direct, adjoint,
4636- * linearized) that is being solved.
4637- * \return MUSCL scheme.
4638- */
4639- bool GetMUSCL_Heat (void ) const { return MUSCL_Heat; }
4640-
4641- /* !
4642- * \brief Get if the upwind scheme used MUSCL or not.
4643- * \note This is the information that the code will use, the method will
4644- * change in runtime depending of the specific equation (direct, adjoint,
4645- * linearized) that is being solved.
4646- * \return MUSCL scheme.
4647- */
4648- bool GetMUSCL_Turb (void ) const { return MUSCL_Turb; }
4649-
46504636 /* !
46514637 * \brief Get if the upwind scheme used MUSCL or not.
46524638 * \return MUSCL scheme.
46534639 */
4654- bool GetMUSCL_Species (void ) const { return MUSCL_Species ; }
4640+ bool GetMUSCL_AdjFlow (void ) const { return MUSCL_AdjFlow ; }
46554641
46564642 /* !
4657- * \brief Get if the upwind scheme used MUSCL or not .
4643+ * \brief Get the blending coefficient for the U- MUSCL scheme .
46584644 * \note This is the information that the code will use, the method will
46594645 * change in runtime depending of the specific equation (direct, adjoint,
46604646 * linearized) that is being solved.
4661- * \return MUSCL scheme.
4647+ * \return Blending coefficient for the U- MUSCL scheme.
46624648 */
4663- bool GetMUSCL_AdjFlow (void ) const { return MUSCL_AdjFlow ; }
4649+ su2double GetMUSCL_Kappa (void ) const { return MUSCL_Kappa ; }
46644650
46654651 /* !
4666- * \brief Get if the upwind scheme used MUSCL or not.
4667- * \note This is the information that the code will use, the method will
4668- * change in runtime depending of the specific equation (direct, adjoint,
4669- * linearized) that is being solved.
4670- * \return MUSCL scheme.
4652+ * \brief Get the blending coefficient for the MUSCL scheme.
4653+ * \return Blending coefficient for the MUSCL scheme.
46714654 */
4672- bool GetMUSCL_AdjTurb (void ) const { return MUSCL_AdjTurb ; }
4655+ su2double GetMUSCL_Kappa_Flow (void ) const { return MUSCL_Kappa_Flow ; }
46734656
46744657 /* !
46754658 * \brief Get whether to "Use Accurate Jacobians" for AUSM+up(2) and SLAU(2).
0 commit comments