@@ -508,7 +508,7 @@ class CConfig {
508508 DIFFUSIVITYMODEL Kind_Diffusivity_Model; /* !< \brief Kind of the mass diffusivity Model */
509509 FREESTREAM_OPTION Kind_FreeStreamOption; /* !< \brief Kind of free stream option to choose if initializing with density or temperature */
510510 MAIN_SOLVER Kind_Solver; /* !< \brief Kind of solver: Euler, NS, Continuous adjoint, etc. */
511- LIMITER Kind_SlopeLimit, /* !< \brief Global slope limiter. */
511+ LIMITER Kind_SlopeLimit, /* !< \brief Slope limiter (for the runtime eq. system) . */
512512 Kind_SlopeLimit_Flow, /* !< \brief Slope limiter for flow equations.*/
513513 Kind_SlopeLimit_Turb, /* !< \brief Slope limiter for the turbulence equation.*/
514514 Kind_SlopeLimit_AdjTurb, /* !< \brief Slope limiter for the adjoint turbulent equation.*/
@@ -555,12 +555,12 @@ class CConfig {
555555 Kind_ConvNumScheme_AdjTurb, /* !< \brief Centered or upwind scheme for the adjoint turbulence model. */
556556 Kind_ConvNumScheme_Species, /* !< \brief Centered or upwind scheme for the species model. */
557557 Kind_ConvNumScheme_Template, /* !< \brief Centered or upwind scheme for the level set equation. */
558- Kind_FEM, /* !< \brief Finite element scheme for the flow equations. */
558+ Kind_FEM, /* !< \brief Finite element scheme for the flow equations (for the runtime eq. system) . */
559559 Kind_FEM_Flow, /* !< \brief Finite element scheme for the flow equations. */
560560 Kind_Matrix_Coloring; /* !< \brief Type of matrix coloring for sparse Jacobian computation. */
561561
562562 CENTERED
563- Kind_Centered, /* !< \brief Centered scheme. */
563+ Kind_Centered, /* !< \brief Centered scheme (for the runtime eq. system) . */
564564 Kind_Centered_Flow, /* !< \brief Centered scheme for the flow equations. */
565565 Kind_Centered_AdjFlow, /* !< \brief Centered scheme for the adjoint flow equations. */
566566 Kind_Centered_Turb, /* !< \brief Centered scheme for the turbulence model. */
@@ -577,7 +577,7 @@ class CConfig {
577577 bool Energy_Equation; /* !< \brief Solve the energy equation for incompressible flows. */
578578
579579 UPWIND
580- Kind_Upwind, /* !< \brief Upwind scheme. */
580+ Kind_Upwind, /* !< \brief Upwind scheme (for the runtime eq. system) . */
581581 Kind_Upwind_Flow, /* !< \brief Upwind scheme for the flow equations. */
582582 Kind_Upwind_AdjFlow, /* !< \brief Upwind scheme for the adjoint flow equations. */
583583 Kind_Upwind_Turb, /* !< \brief Upwind scheme for the turbulence model. */
@@ -586,13 +586,19 @@ class CConfig {
586586 Kind_Upwind_Heat, /* !< \brief Upwind scheme for the heat transfer model. */
587587 Kind_Upwind_Template; /* !< \brief Upwind scheme for the template model. */
588588
589- bool MUSCL, /* !< \brief MUSCL scheme . */
589+ bool MUSCL, /* !< \brief MUSCL scheme (for the runtime eq. system). */
590590 MUSCL_Flow, /* !< \brief MUSCL scheme for the flow equations.*/
591591 MUSCL_Turb, /* !< \brief MUSCL scheme for the turbulence equations.*/
592592 MUSCL_Heat, /* !< \brief MUSCL scheme for the (fvm) heat equation.*/
593593 MUSCL_AdjFlow, /* !< \brief MUSCL scheme for the adj flow equations.*/
594- MUSCL_AdjTurb; /* !< \brief MUSCL scheme for the adj turbulence equations.*/
595- bool MUSCL_Species; /* !< \brief MUSCL scheme for the species equations.*/
594+ MUSCL_AdjTurb, /* !< \brief MUSCL scheme for the adj turbulence equations.*/
595+ MUSCL_Species; /* !< \brief MUSCL scheme for the species equations.*/
596+ su2double MUSCL_Kappa, /* !< \brief Blending coefficient for U-MUSCL scheme (for the runtime eq. system). */
597+ MUSCL_Kappa_Flow, /* !< \brief Blending coefficient for U-MUSCL scheme for the flow equations.*/
598+ MUSCL_Kappa_Turb, /* !< \brief Blending coefficient for U-MUSCL scheme for the turbulence equations.*/
599+ MUSCL_Kappa_Heat, /* !< \brief Blending coefficient for U-MUSCL scheme for the (fvm) heat equation.*/
600+ MUSCL_Kappa_AdjFlow, /* !< \brief Blending coefficient for U-MUSCL scheme for the adj flow equations.*/
601+ MUSCL_Kappa_Species; /* !< \brief Blending coefficient for U-MUSCL scheme for the species equations.*/
596602 bool Use_Accurate_Jacobians; /* !< \brief Use numerically computed Jacobians for AUSM+up(2) and SLAU(2). */
597603 bool Use_Accurate_Turb_Jacobians; /* !< \brief Use numerically computed Jacobians for standard SA turbulence model. */
598604 bool EulerPersson; /* !< \brief Boolean to determine whether this is an Euler simulation with Persson shock capturing. */
@@ -2457,11 +2463,12 @@ class CConfig {
24572463 * \param[in] val_kind_upwind - If upwind scheme, kind of upwind scheme (Roe, etc.).
24582464 * \param[in] val_kind_slopelimit - If upwind scheme, kind of slope limit.
24592465 * \param[in] val_muscl - Define if we apply a MUSCL scheme or not.
2466+ * \param[in] val_muscl_kappa - Define the blending coefficient for the MUSCL scheme.
24602467 * \param[in] val_kind_fem - If FEM, what kind of FEM discretization.
24612468 */
24622469 void SetKind_ConvNumScheme (unsigned short val_kind_convnumscheme, CENTERED val_kind_centered,
24632470 UPWIND val_kind_upwind, LIMITER val_kind_slopelimit,
2464- bool val_muscl, unsigned short val_kind_fem);
2471+ bool val_muscl, su2double val_muscl_kappa, unsigned short val_kind_fem);
24652472
24662473 /* !
24672474 * \brief Get the value of limiter coefficient.
@@ -4638,54 +4645,30 @@ class CConfig {
46384645
46394646 /* !
46404647 * \brief Get if the upwind scheme used MUSCL or not.
4641- * \note This is the information that the code will use, the method will
4642- * change in runtime depending of the specific equation (direct, adjoint,
4643- * linearized) that is being solved.
46444648 * \return MUSCL scheme.
46454649 */
46464650 bool GetMUSCL_Flow (void ) const { return MUSCL_Flow; }
46474651
4648- /* !
4649- * \brief Get if the upwind scheme used MUSCL or not.
4650- * \note This is the information that the code will use, the method will
4651- * change in runtime depending of the specific equation (direct, adjoint,
4652- * linearized) that is being solved.
4653- * \return MUSCL scheme.
4654- */
4655- bool GetMUSCL_Heat (void ) const { return MUSCL_Heat; }
4656-
4657- /* !
4658- * \brief Get if the upwind scheme used MUSCL or not.
4659- * \note This is the information that the code will use, the method will
4660- * change in runtime depending of the specific equation (direct, adjoint,
4661- * linearized) that is being solved.
4662- * \return MUSCL scheme.
4663- */
4664- bool GetMUSCL_Turb (void ) const { return MUSCL_Turb; }
4665-
46664652 /* !
46674653 * \brief Get if the upwind scheme used MUSCL or not.
46684654 * \return MUSCL scheme.
46694655 */
4670- bool GetMUSCL_Species (void ) const { return MUSCL_Species ; }
4656+ bool GetMUSCL_AdjFlow (void ) const { return MUSCL_AdjFlow ; }
46714657
46724658 /* !
4673- * \brief Get if the upwind scheme used MUSCL or not .
4659+ * \brief Get the blending coefficient for the U- MUSCL scheme .
46744660 * \note This is the information that the code will use, the method will
46754661 * change in runtime depending of the specific equation (direct, adjoint,
46764662 * linearized) that is being solved.
4677- * \return MUSCL scheme.
4663+ * \return Blending coefficient for the U- MUSCL scheme.
46784664 */
4679- bool GetMUSCL_AdjFlow (void ) const { return MUSCL_AdjFlow ; }
4665+ su2double GetMUSCL_Kappa (void ) const { return MUSCL_Kappa ; }
46804666
46814667 /* !
4682- * \brief Get if the upwind scheme used MUSCL or not.
4683- * \note This is the information that the code will use, the method will
4684- * change in runtime depending of the specific equation (direct, adjoint,
4685- * linearized) that is being solved.
4686- * \return MUSCL scheme.
4668+ * \brief Get the blending coefficient for the MUSCL scheme.
4669+ * \return Blending coefficient for the MUSCL scheme.
46874670 */
4688- bool GetMUSCL_AdjTurb (void ) const { return MUSCL_AdjTurb ; }
4671+ su2double GetMUSCL_Kappa_Flow (void ) const { return MUSCL_Kappa_Flow ; }
46894672
46904673 /* !
46914674 * \brief Get whether to "Use Accurate Jacobians" for AUSM+up(2) and SLAU(2).
0 commit comments