3434
3535/* !
3636 * \brief Blended difference for U-MUSCL reconstruction.
37- * \param[in] grad_proj - Gradient projection at point i: dot(grad_i, vector_ij).
37+ * \param[in] gradProj - Gradient projection at point i: dot(grad_i, vector_ij).
3838 * \param[in] delta - Centered difference: V_j - V_i.
3939 * \param[in] kappa - Blending parameter.
4040 * \return Blended difference for reconstruction from point i.
4141 */
42- FORCEINLINE Double umusclProjection (Double grad_proj ,
42+ FORCEINLINE Double umusclProjection (Double gradProj ,
4343 Double delta,
4444 Double kappa) {
4545 /* -------------------------------------------------------------------*/
@@ -51,7 +51,7 @@ FORCEINLINE Double umusclProjection(Double grad_proj,
5151 /* --- To maintain proper scaling for edge limiters, the result of ---*/
5252 /* --- this function is 0.5 * dV_ij^kap. ---*/
5353 /* -------------------------------------------------------------------*/
54- return (1.0 - kappa) * grad_proj + kappa * delta;
54+ return (1.0 - kappa) * gradProj + kappa * delta;
5555}
5656
5757/* !
@@ -62,7 +62,7 @@ FORCEINLINE Double umusclProjection(Double grad_proj,
6262 * \param[in] delta - Centered difference: V_j - V_i.
6363 * \param[in] iVar - Variable index.
6464 * \param[in] kappa - Blending coefficient.
65- * \param[in] relax - Newton-Krylov relaxation.
65+ * \param[in] umusclRamp - MUSCL 1st-2nd order ramp times Newton-Krylov relaxation.
6666 * \return Variable reconstructed from point i.
6767 */
6868template <class GradType , size_t nDim>
@@ -71,10 +71,9 @@ FORCEINLINE Double musclReconstruction(const GradType& grad,
7171 const Double delta,
7272 size_t iVar,
7373 Double kappa,
74- Double relax,
75- Double ramp_val) {
74+ Double umusclRamp) {
7675 const Double proj = dot (grad[iVar], vector_ij);
77- return ramp_val * relax * umusclProjection (proj, delta, kappa);
76+ return umusclRamp * umusclProjection (proj, delta, kappa);
7877}
7978
8079/* !
@@ -87,8 +86,7 @@ FORCEINLINE void musclUnlimited(Int iPoint,
8786 const Gradient_t& gradient,
8887 CPair<VarType>& V,
8988 Double kappa,
90- Double relax,
91- Double ramp_val) {
89+ Double umusclRamp) {
9290 constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : VarType::nVar;
9391
9492 auto grad_i = gatherVariables<nVarGrad,nDim>(iPoint, gradient);
@@ -99,8 +97,8 @@ FORCEINLINE void musclUnlimited(Int iPoint,
9997 const Double delta_ij = V.j .all (iVar) - V.i .all (iVar);
10098
10199 /* --- U-MUSCL reconstructed variables ---*/
102- const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
103- const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
100+ const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, umusclRamp );
101+ const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, umusclRamp );
104102
105103 /* --- Apply reconstruction: V_L = V_i + 0.5 * dV_ij^kap ---*/
106104 V.i .all (iVar) += 0.5 * proj_i;
@@ -119,8 +117,7 @@ FORCEINLINE void musclPointLimited(Int iPoint,
119117 const Gradient_t& gradient,
120118 CPair<VarType>& V,
121119 Double kappa,
122- Double relax,
123- Double ramp_val) {
120+ Double umusclRamp) {
124121 constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : VarType::nVar;
125122
126123 auto lim_i = gatherVariables<nVarGrad>(iPoint, limiter);
@@ -134,8 +131,8 @@ FORCEINLINE void musclPointLimited(Int iPoint,
134131 const Double delta_ij = V.j .all (iVar) - V.i .all (iVar);
135132
136133 /* --- U-MUSCL reconstructed variables ---*/
137- const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
138- const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
134+ const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, umusclRamp );
135+ const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, umusclRamp );
139136
140137 /* --- Apply reconstruction: V_L = V_i + 0.5 * lim * dV_ij^kap ---*/
141138 V.i .all (iVar) += 0.5 * lim_i (iVar) * proj_i;
@@ -153,8 +150,7 @@ FORCEINLINE void musclEdgeLimited(Int iPoint,
153150 const Gradient_t& gradient,
154151 CPair<VarType>& V,
155152 Double kappa,
156- Double relax,
157- Double ramp_val) {
153+ Double umusclRamp) {
158154 constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : VarType::nVar;
159155
160156 auto grad_i = gatherVariables<nVarGrad,nDim>(iPoint, gradient);
@@ -166,8 +162,8 @@ FORCEINLINE void musclEdgeLimited(Int iPoint,
166162 const Double delta_ij_2 = pow (delta_ij, 2 ) + 1e-6 ;
167163
168164 /* --- U-MUSCL reconstructed variables ---*/
169- const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
170- const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, relax, ramp_val );
165+ const Double proj_i = musclReconstruction (grad_i, vector_ij, delta_ij, iVar, kappa, umusclRamp );
166+ const Double proj_j = musclReconstruction (grad_j, vector_ij, delta_ij, iVar, kappa, umusclRamp );
171167
172168 // / TODO: Customize the limiter function.
173169 const Double lim_i = (delta_ij_2 + proj_i*delta_ij) / (pow (proj_i,2 ) + delta_ij_2);
@@ -187,7 +183,7 @@ FORCEINLINE void musclEdgeLimited(Int iPoint,
187183 * \param[in] gasConst - Specific gas constant.
188184 * \param[in] muscl - If true, reconstruct, else simply fetch.
189185 * \param[in] kappa - Blending coefficient for MUSCL reconstruction.
190- * \param[in] relax - Newton-Krylov relaxation.
186+ * \param[in] umusclRamp - MUSCL 1st-2nd order ramp times Newton-Krylov relaxation.
191187 * \param[in] limiterType - Type of flux limiter.
192188 * \param[in] V1st - Pair of compressible flow primitives for nodes i,j.
193189 * \param[in] vector_ij - Distance vector from i to j.
@@ -200,12 +196,11 @@ FORCEINLINE CPair<ReconVarType> reconstructPrimitives(Int iEdge, Int iPoint, Int
200196 const su2double& gasConst,
201197 bool muscl,
202198 const su2double& kappa,
203- const su2double& relax ,
199+ const su2double& umusclRamp ,
204200 LIMITER limiterType,
205201 const CPair<PrimVarType>& V1st,
206202 const VectorDbl<nDim>& vector_ij,
207- const VariableType& solution,
208- const su2double& ramp_val) {
203+ const VariableType& solution) {
209204 static_assert (ReconVarType::nVar <= PrimVarType::nVar);
210205
211206 const auto & gradients = solution.GetGradient_Reconstruction ();
@@ -223,13 +218,13 @@ FORCEINLINE CPair<ReconVarType> reconstructPrimitives(Int iEdge, Int iPoint, Int
223218 constexpr auto nVarGrad = ReconVarType::nVar - 2 ;
224219 switch (limiterType) {
225220 case LIMITER::NONE:
226- musclUnlimited<nVarGrad>(iPoint, jPoint, vector_ij, gradients, V, kappa, relax, ramp_val );
221+ musclUnlimited<nVarGrad>(iPoint, jPoint, vector_ij, gradients, V, kappa, umusclRamp );
227222 break ;
228223 case LIMITER::VAN_ALBADA_EDGE:
229- musclEdgeLimited<nVarGrad>(iPoint, jPoint, vector_ij, gradients, V, kappa, relax, ramp_val );
224+ musclEdgeLimited<nVarGrad>(iPoint, jPoint, vector_ij, gradients, V, kappa, umusclRamp );
230225 break ;
231226 default :
232- musclPointLimited<nVarGrad>(iPoint, jPoint, vector_ij, limiters, gradients, V, kappa, relax, ramp_val );
227+ musclPointLimited<nVarGrad>(iPoint, jPoint, vector_ij, limiters, gradients, V, kappa, umusclRamp );
233228 break ;
234229 }
235230 /* --- Recompute density using the reconstructed pressure and temperature. ---*/
0 commit comments