diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
index 9123e3ee744e7a0b5a87077f3f12899fd5138a48..c11bb4cdba7eead17d7ca362b63511ddbff49017 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -24,8 +24,6 @@ namespace GroundwaterFlow
{
class GroundwaterFlowProcess final : public Process
{
- using Base = Process;
-
public:
GroundwaterFlowProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 14f747b289e8a413e46206be006fbcd685b0e58d..956a77a28d8235810846f0d4ea9914eb22e4bfe1 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -174,60 +174,60 @@ void HydroMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
_local_assemblers, mesh.isAxiallySymmetric(), integration_order,
_process_data);
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xx",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yy",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_zz",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xy",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaXY));
if (DisplacementDim == 3)
{
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xz",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaXZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yz",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigmaYZ));
}
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xx",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtEpsilonXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_yy",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtEpsilonYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_zz",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtEpsilonZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xy",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtEpsilonXY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"velocity",
makeExtrapolator(mesh.getDimension(), getExtrapolator(),
_local_assemblers,
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index 92215ea0ae5070ef43fda3e91cbe386aaf836632..2d6c630e76fc1cbad39c04203d930bac50d0401e 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -26,8 +26,6 @@ struct LocalAssemblerInterface;
template <int DisplacementDim>
class HydroMechanicsProcess final : public Process
{
- using Base = Process;
-
public:
HydroMechanicsProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
index 35ebdcfbd5d31fc7606bff45957d2abb582c7426..74700779ab1ef63f1840cd55fda595ce0791990f 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
@@ -25,8 +25,6 @@ class HydroMechanicsLocalAssemblerInterface;
template <int GlobalDim>
class HydroMechanicsProcess final : public Process
{
- using Base = Process;
-
static_assert(GlobalDim == 2 || GlobalDim == 3,
"Currently LIE::HydroMechanicsProcess "
"supports only 2D or 3D.");
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index c3cea019509ccb63125c5db85b9bee972df2d3b0..5dfd2841b2af9fc2f0e15713861d8a202bb7fcb6 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -192,25 +192,25 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
// by location order is needed for output
NumLib::ComponentOrder::BY_LOCATION);
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xx",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtSigmaXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtSigmaYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_zz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtSigmaZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
@@ -218,38 +218,38 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
if (DisplacementDim == 3)
{
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtSigmaXZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtSigmaYZ));
}
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xx",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_yy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_zz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtEpsilonZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
@@ -257,13 +257,13 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
if (DisplacementDim == 3)
{
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_yz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
index 26a4fa6e9a90cfd99fda9e3fe49e40efd423bb48..11b2b3f9a4d49d77ae941b28ad6950bd7aefea75 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -23,8 +23,6 @@ namespace SmallDeformation
template <int DisplacementDim>
class SmallDeformationProcess final : public Process
{
- using Base = Process;
-
static_assert(DisplacementDim == 2 || DisplacementDim == 3,
"Currently LIE::SmallDeformationProcess "
"supports only 2D or 3D.");
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.cpp b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
index bab5a306c3d1514da25c9e4777d323bbc816e53b..08a955f90d2a860bf00b305afd407a7c01cc5a37 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.cpp
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
@@ -166,14 +166,14 @@ void PhaseFieldProcess<DisplacementDim>::initializeConcreteProcess(
mesh.getElements(), dof_table, _local_assemblers,
mesh.isAxiallySymmetric(), integration_order, _process_data);
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma",
makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
DisplacementDim>::RowsAtCompileTime,
getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigma));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon",
makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
DisplacementDim>::RowsAtCompileTime,
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h
index e5fc42a018073347c695ea993a6f92853d4d9308..d86277f98be403c23c508ed7e009668594057c2b 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.h
@@ -47,8 +47,6 @@ namespace PhaseField
template <int DisplacementDim>
class PhaseFieldProcess final : public Process
{
- using Base = Process;
-
public:
PhaseFieldProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.h b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
index e61fb0f7581b4e83ddfe699b73c938c82af75f80..3c2d130348a11c35120292cc94014962c4bbc176 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.h
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
@@ -21,8 +21,6 @@ namespace RichardsFlow
{
class RichardsFlowProcess final : public Process
{
- using Base = Process;
-
public:
RichardsFlowProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index 1e9bcb1e81641b20434050d83513589fb6dc364a..33295c9a1be22cdbe6f6c100c981f1cafa16cdc9 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -94,19 +94,19 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
// by location order is needed for output
NumLib::ComponentOrder::BY_LOCATION);
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"free_energy_density",
makeExtrapolator(1, getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtFreeEnergyDensity));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma",
makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
DisplacementDim>::RowsAtCompileTime,
getExtrapolator(), _local_assemblers,
&LocalAssemblerInterface::getIntPtSigma));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon",
makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
DisplacementDim>::RowsAtCompileTime,
@@ -156,7 +156,7 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
return cache;
});
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
name,
makeExtrapolator(num_components, getExtrapolator(),
_local_assemblers, std::move(getIntPtValues)));
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
index 33caff6c503ff7d616ee9761680eecb3e3180ff0..03ad31318cfe91fba035b546bca30007be1f6226 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -55,8 +55,6 @@ private:
template <int DisplacementDim>
class SmallDeformationProcess final : public Process
{
- using Base = Process;
-
public:
SmallDeformationProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h
index dededb17f36e64033281659c4424f40b575bfa1f..47c37461d4800d5ba0417e4aea6aa63443a8fe72 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h
@@ -155,7 +155,7 @@ void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
_mechanics_related_process_id, _phase_field_process_id,
_heat_conduction_process_id);
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma",
makeExtrapolator(
MathLib::KelvinVector::KelvinVectorType<
@@ -163,7 +163,7 @@ void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
getExtrapolator(), _local_assemblers,
&ThermoMechanicalPhaseFieldLocalAssemblerInterface::getIntPtSigma));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon",
makeExtrapolator(MathLib::KelvinVector::KelvinVectorType<
DisplacementDim>::RowsAtCompileTime,
@@ -171,7 +171,7 @@ void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
&ThermoMechanicalPhaseFieldLocalAssemblerInterface::
getIntPtEpsilon));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"heat_flux",
makeExtrapolator(mesh.getDimension(), getExtrapolator(),
_local_assemblers,
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
index f5d6e4f5933c96d5835d02d22c5e26b4096d976c..7042e42fba5ee04743c749284a82221d4079399f 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
@@ -52,8 +52,6 @@ struct ThermoMechanicalPhaseFieldLocalAssemblerInterface;
template <int DisplacementDim>
class ThermoMechanicalPhaseFieldProcess final : public Process
{
- using Base = Process;
-
public:
ThermoMechanicalPhaseFieldProcess(
MeshLib::Mesh& mesh,
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
index 393c68a1f5e09e1351fdda0fcdb6eed5c044c202..517056af0b428c67a76b3b5dd6828d7ddf26a312 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -68,25 +68,25 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
// by location order is needed for output
NumLib::ComponentOrder::BY_LOCATION));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xx",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtSigmaXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtSigmaYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_zz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtSigmaZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
@@ -94,50 +94,50 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeConcreteProcess(
if (DisplacementDim == 3)
{
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_xz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtSigmaXZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"sigma_yz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtSigmaYZ));
}
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xx",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtEpsilonXX));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_yy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtEpsilonYY));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_zz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtEpsilonZZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xy",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtEpsilonXY));
if (DisplacementDim == 3)
{
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_yz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
&ThermoMechanicsLocalAssemblerInterface::getIntPtEpsilonYZ));
- Base::_secondary_variables.addSecondaryVariable(
+ _secondary_variables.addSecondaryVariable(
"epsilon_xz",
makeExtrapolator(
1, getExtrapolator(), _local_assemblers,
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
index 7e0218ac19fe9a9647ef3aa2633e83659ba19720..25b6f37fe049eb8ca80d94bfec84399a82467358 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -23,8 +23,6 @@ struct ThermoMechanicsLocalAssemblerInterface;
template <int DisplacementDim>
class ThermoMechanicsProcess final : public Process
{
- using Base = Process;
-
public:
ThermoMechanicsProcess(
MeshLib::Mesh& mesh,