Skip to content
Snippets Groups Projects
Commit 3d240bf6 authored by Timo Koch's avatar Timo Koch Committed by Martin Schneider
Browse files

[privarswitch][cleanup] Apply naming conventions for private member functions

parent cf2202c1
No related branches found
No related tags found
1 merge request!1843Fix/privar switch box boundary
...@@ -112,7 +112,7 @@ public: ...@@ -112,7 +112,7 @@ public:
visited_[dofIdxGlobal] = true; visited_[dofIdxGlobal] = true;
// Compute volVars on which grounds we decide // Compute volVars on which grounds we decide
// if we need to switch the primary variables // if we need to switch the primary variables
auto& volVars = getVolVarAccess(gridVariables.curGridVolVars(), elemVolVars, scv); auto& volVars = getVolVarAccess_(gridVariables.curGridVolVars(), elemVolVars, scv);
volVars.update(curElemSol, problem, element, scv); volVars.update(curElemSol, problem, element, scv);
if (asImp_().update_(curSol[dofIdxGlobal], volVars, dofIdxGlobal, scv.dofPosition())) if (asImp_().update_(curSol[dofIdxGlobal], volVars, dofIdxGlobal, scv.dofPosition()))
...@@ -269,7 +269,7 @@ public: ...@@ -269,7 +269,7 @@ public:
{ {
if (stateChanged[scv.dofIndex()]) if (stateChanged[scv.dofIndex()])
{ {
auto& volVars = getVolVarAccess(gridVariables.curGridVolVars(), elemVolVars, scv); auto& volVars = getVolVarAccess_(gridVariables.curGridVolVars(), elemVolVars, scv);
volVars.update(curElemSol, problem, element, scv); volVars.update(curElemSol, problem, element, scv);
} }
} }
...@@ -386,12 +386,12 @@ protected: ...@@ -386,12 +386,12 @@ protected:
private: private:
template<class GridVolumeVariables, class ElementVolumeVariables, class SubControlVolume> template<class GridVolumeVariables, class ElementVolumeVariables, class SubControlVolume>
static auto getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv) static auto getVolVarAccess_(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
-> std::enable_if_t<!GridVolumeVariables::cachingEnabled, decltype(elemVolVars[scv])> -> std::enable_if_t<!GridVolumeVariables::cachingEnabled, decltype(elemVolVars[scv])>
{ return elemVolVars[scv]; } { return elemVolVars[scv]; }
template<class GridVolumeVariables, class ElementVolumeVariables, class SubControlVolume> template<class GridVolumeVariables, class ElementVolumeVariables, class SubControlVolume>
static auto getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv) static auto getVolVarAccess_(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
-> std::enable_if_t<GridVolumeVariables::cachingEnabled, decltype(gridVolVars.volVars(scv))> -> std::enable_if_t<GridVolumeVariables::cachingEnabled, decltype(gridVolVars.volVars(scv))>
{ return gridVolVars.volVars(scv); } { return gridVolVars.volVars(scv); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment