2828#include " ../../../Common/include/toolboxes/geometry_toolbox.hpp"
2929#include " ../../include/solvers/CScalarSolver.hpp"
3030
31- template <class TVariable >
32- CScalarSolver<TVariable >::CScalarSolver(bool conservative) : CSolver(), Conservative(conservative) {}
31+ template <class VariableType >
32+ CScalarSolver<VariableType >::CScalarSolver(bool conservative) : CSolver(), Conservative(conservative) {}
3333
34- template <class TVariable >
35- CScalarSolver<TVariable >::CScalarSolver(CGeometry* geometry, CConfig* config, bool conservative)
34+ template <class VariableType >
35+ CScalarSolver<VariableType >::CScalarSolver(CGeometry* geometry, CConfig* config, bool conservative)
3636 : CSolver(), Conservative(conservative) {
3737 nMarker = config->GetnMarker_All ();
3838
@@ -74,13 +74,13 @@ CScalarSolver<TVariable>::CScalarSolver(CGeometry* geometry, CConfig* config, bo
7474 }
7575}
7676
77- template <class TVariable >
78- CScalarSolver<TVariable >::~CScalarSolver () {
77+ template <class VariableType >
78+ CScalarSolver<VariableType >::~CScalarSolver () {
7979 delete nodes;
8080}
8181
82- template <class TVariable >
83- void CScalarSolver<TVariable >::Upwind_Residual(CGeometry* geometry, CSolver** solver_container,
82+ template <class VariableType >
83+ void CScalarSolver<VariableType >::Upwind_Residual(CGeometry* geometry, CSolver** solver_container,
8484 CNumerics** numerics_container, CConfig* config, unsigned short iMesh) {
8585 const bool implicit = (config->GetKind_TimeIntScheme () == EULER_IMPLICIT);
8686 const bool muscl = config->GetMUSCL_Turb ();
@@ -240,8 +240,8 @@ void CScalarSolver<TVariable>::Upwind_Residual(CGeometry* geometry, CSolver** so
240240 }
241241}
242242
243- template <class TVariable >
244- void CScalarSolver<TVariable >::SumEdgeFluxes(CGeometry* geometry) {
243+ template <class VariableType >
244+ void CScalarSolver<VariableType >::SumEdgeFluxes(CGeometry* geometry) {
245245 SU2_OMP_FOR_STAT (omp_chunk_size)
246246 for (unsigned long iPoint = 0 ; iPoint < nPoint; ++iPoint) {
247247 LinSysRes.SetBlock_Zero (iPoint);
@@ -256,8 +256,8 @@ void CScalarSolver<TVariable>::SumEdgeFluxes(CGeometry* geometry) {
256256 END_SU2_OMP_FOR
257257}
258258
259- template <class TVariable >
260- void CScalarSolver<TVariable >::BC_Periodic(CGeometry* geometry, CSolver** solver_container, CNumerics* numerics,
259+ template <class VariableType >
260+ void CScalarSolver<VariableType >::BC_Periodic(CGeometry* geometry, CSolver** solver_container, CNumerics* numerics,
261261 CConfig* config) {
262262 /* --- Complete residuals for periodic boundary conditions. We loop over
263263 the periodic BCs in matching pairs so that, in the event that there are
@@ -271,8 +271,8 @@ void CScalarSolver<TVariable>::BC_Periodic(CGeometry* geometry, CSolver** solver
271271 }
272272}
273273
274- template <class TVariable >
275- void CScalarSolver<TVariable >::PrepareImplicitIteration(CGeometry* geometry, CSolver** solver_container,
274+ template <class VariableType >
275+ void CScalarSolver<VariableType >::PrepareImplicitIteration(CGeometry* geometry, CSolver** solver_container,
276276 CConfig* config) {
277277 const auto flowNodes = solver_container[FLOW_SOL]->GetNodes ();
278278
@@ -332,8 +332,8 @@ void CScalarSolver<TVariable>::PrepareImplicitIteration(CGeometry* geometry, CSo
332332 SetResidual_RMS (geometry, config);
333333}
334334
335- template <class TVariable >
336- void CScalarSolver<TVariable >::CompleteImplicitIteration(CGeometry* geometry, CSolver** solver_container,
335+ template <class VariableType >
336+ void CScalarSolver<VariableType >::CompleteImplicitIteration(CGeometry* geometry, CSolver** solver_container,
337337 CConfig* config) {
338338 const bool compressible = (config->GetKind_Regime () == ENUM_REGIME::COMPRESSIBLE);
339339
@@ -380,8 +380,8 @@ void CScalarSolver<TVariable>::CompleteImplicitIteration(CGeometry* geometry, CS
380380 CompleteComms (geometry, config, SOLUTION_EDDY);
381381}
382382
383- template <class TVariable >
384- void CScalarSolver<TVariable >::ImplicitEuler_Iteration(CGeometry* geometry, CSolver** solver_container,
383+ template <class VariableType >
384+ void CScalarSolver<VariableType >::ImplicitEuler_Iteration(CGeometry* geometry, CSolver** solver_container,
385385 CConfig* config) {
386386 PrepareImplicitIteration (geometry, solver_container, config);
387387
@@ -406,8 +406,8 @@ void CScalarSolver<TVariable>::ImplicitEuler_Iteration(CGeometry* geometry, CSol
406406 CompleteImplicitIteration (geometry, solver_container, config);
407407}
408408
409- template <class TVariable >
410- void CScalarSolver<TVariable >::SetResidual_DualTime(CGeometry* geometry, CSolver** solver_container, CConfig* config,
409+ template <class VariableType >
410+ void CScalarSolver<VariableType >::SetResidual_DualTime(CGeometry* geometry, CSolver** solver_container, CConfig* config,
411411 unsigned short iRKStep, unsigned short iMesh,
412412 unsigned short RunTime_EqSystem) {
413413 const bool implicit = (config->GetKind_TimeIntScheme () == EULER_IMPLICIT);
0 commit comments