diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 933baaebaef3830196dd9294f6f4d16da7977466..ec5dfdf2e4172c940cad51015896ac7be846e63a 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -90,7 +90,7 @@ void ComponentTransportProcess::initializeConcreteProcess(
}
void ComponentTransportProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble ComponentTransportProcess.");
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
index 4d2ba5a48b6a4fa865151e73e998e50e1bfed6f8..2486a1a4dadd5c94cbbdda95df01be1e1979da7d 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
@@ -143,9 +143,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
index 1d976ee8c8c615114ec55d982585502e85a28a06..c6ae5b3567869ab41cf41d8d8014ae990ff5b2da 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
@@ -58,7 +58,7 @@ void GroundwaterFlowProcess::initializeConcreteProcess(
}
void GroundwaterFlowProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble GroundwaterFlowProcess.");
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
index 48ff42ee9e5fbff56a6f2dafda9a31ef3249db35..7e2544aa93b53db4539f543318ff336a728556d2 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -92,9 +92,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 02fc782e136f51371a1747daad0d67dda6c8480a..c4637fa191f2e34a448ba81471519d7a554af25d 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -87,7 +87,7 @@ void HTProcess::initializeConcreteProcess(
}
void HTProcess::assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x,
+ std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b)
{
diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
index 9bd47e8ba5ad210a412735c77745fc24e55f5748..17ef8de52d1c78aeabb3f419fee3c65338088d1d 100644
--- a/ProcessLib/HT/HTProcess.h
+++ b/ProcessLib/HT/HTProcess.h
@@ -93,9 +93,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
index 3c5f3c9ca4f76141ca16aba920f327f6171bbcca..986dca259f94d1f1a8ba427e0a664443c241282a 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
@@ -73,7 +73,7 @@ void HeatConductionProcess::initializeConcreteProcess(
}
void HeatConductionProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble HeatConductionProcess.");
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.h b/ProcessLib/HeatConduction/HeatConductionProcess.h
index 4ad709bf59af3a8616a54267e4607e0e92b7f760..f349e851295dcd60305cf127fddf95cddb2f2263 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.h
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.h
@@ -51,9 +51,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const /*dt*/,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const /*dt*/,
diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
index e4f211b33827103fcf15182db959b8cc7e3ea554..01cc11f3148edb36a52a7233c4d8f4ea529e26f2 100644
--- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
@@ -159,7 +159,7 @@ void HeatTransportBHEProcess::initializeConcreteProcess(
}
void HeatTransportBHEProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble HeatTransportBHE process.");
diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h
index a81c690dd0c47b5a8f9051a8029f9656d0b2abf8..a75c064c27ed72e67efc0a34041077f97cecba52 100644
--- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h
+++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h
@@ -55,9 +55,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 34c00b8ef1202c1f26147e5c441d84d7fa58977f..b738bde6b02d5d63ebfd03ca6102281e10de715b 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -368,7 +368,7 @@ void HydroMechanicsProcess<DisplacementDim>::initializeBoundaryConditions()
template <int DisplacementDim>
void HydroMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble the equations for HydroMechanics");
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index 9cf7390f07fedc358a9c962863ff2ef78943f37d..a74ca0e685df3ed6e916c5e987aa0de0a4d57a6f 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -73,9 +73,9 @@ private:
void initializeBoundaryConditions() override;
void assembleConcreteProcess(const double t, double const /*dt*/,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const /*dt*/,
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
index a0effbc186f536f2512d5ed823c5c06ed763b025..d569404ad34fefd3d81845e8ff4abae7f1552064 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
@@ -567,7 +567,7 @@ bool HydroMechanicsProcess<GlobalDim>::isLinear() const
template <int GlobalDim>
void HydroMechanicsProcess<GlobalDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble HydroMechanicsProcess.");
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
index 80f52a233872f939775bbe0310489e627a16b065..9e04abad53f779e5b374e8a47409943282a53383 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
@@ -66,9 +66,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index 251ddd86c7348b07bcef0bc20f5fde8adcf43cce..52ff8ad378d1ece3ce0d988880dcba73da005194 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -542,7 +542,7 @@ bool SmallDeformationProcess<DisplacementDim>::isLinear() const
template <int DisplacementDim>
void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble SmallDeformationProcess.");
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
index a109772a01ed7c00211bf247baf3907003fc0e15..ddb1be1f5a488992c2a32afd24202bc88a64704a 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -62,9 +62,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
index 3161aa2310d98ec9eefce04b65652ac091c2c1c6..c8c8c80697423f490a8e36666828713407a8c7e8 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
@@ -79,7 +79,7 @@ void LiquidFlowProcess::initializeConcreteProcess(
}
void LiquidFlowProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble LiquidFlowProcess.");
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
index 1945c2e2cff0dbb1b9556e9673ddf7f08f50c206..f998a3c75bade823cf0ee5d21dbdeb6eee1d53e7 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
@@ -90,9 +90,9 @@ private:
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.cpp b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
index da3962418d4474986997c0ce0bfe5b5c0de75046..1a6357a0cc634b1781f298f0b2f3b4de68e65af2 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.cpp
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
@@ -162,7 +162,7 @@ void PhaseFieldProcess<DisplacementDim>::initializeBoundaryConditions()
template <int DisplacementDim>
void PhaseFieldProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble PhaseFieldProcess.");
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h
index 24de17781741a846295f3bc1731fcf1804bf4407..84f78516d475059cb2835212ee89df1112bba3d1 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.h
@@ -88,9 +88,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
index abb850aa5c1f5c9c2af0201591515599004a959e..159d7c0173f9afd4169591de744a6878dbdb5698 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
@@ -66,7 +66,7 @@ void RichardsComponentTransportProcess::initializeConcreteProcess(
}
void RichardsComponentTransportProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble RichardsComponentTransportProcess.");
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
index a2d15d1a2f281d8470815d968c103a951722b464..210e6f70c858bd3d2330afcaea8a731eebac4645 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
@@ -130,9 +130,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
index 34e6988a5ca0ac1fe5dde8d9d39d61e5d6c56af2..4969486d1e939deb35956126a60dfe9f432c13f0 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
@@ -66,7 +66,7 @@ void RichardsFlowProcess::initializeConcreteProcess(
}
void RichardsFlowProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble RichardsFlowProcess.");
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.h b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
index 8d64d3c2e21f583a22a8fcf59895c81651fe30b6..e4b07e5d34e3291a955f6bce9625accf137eaca8 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.h
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
@@ -54,9 +54,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
index 5d1f23cc9828f0bf38d6196de29d294207a22dcf..e13c5db218379eb5510b22093932c06caa7afb0e 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp
@@ -234,7 +234,7 @@ void RichardsMechanicsProcess<DisplacementDim>::initializeBoundaryConditions()
template <int DisplacementDim>
void RichardsMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble the equations for RichardsMechanics");
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
index bbff5e039dd9df8c7093e1f2d6df6e71eb2d33d8..8d44161bca0205c7885fe3deaa44ab02a5553e0d 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h
@@ -75,9 +75,9 @@ private:
void initializeBoundaryConditions() override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
index 4039bc9822d783ca2a5f2d07ae83e9e9a38340c4..b26e2e981245e00d68e75984cfbe4b0aac31ed22 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -241,7 +241,7 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
template <int DisplacementDim>
void SmallDeformationProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble SmallDeformationProcess.");
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
index aea3933d83ba58de5a250ab07d7787c35be62b6f..c991295aa381b1c7a17911895c33d221d721fd5a 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -51,9 +51,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
index 1c556f09514b92cdea125d8776eed1ff1e6019ca..b5aad3e920ffcea598ebdaea15b78655e3024ec7 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
@@ -231,7 +231,7 @@ void SmallDeformationNonlocalProcess<DisplacementDim>::
template <int DisplacementDim>
void SmallDeformationNonlocalProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble SmallDeformationNonlocalProcess.");
diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
index 1f2099a11a0d01401d957c946c40d41a3811cc63..386d4eca37ab3705bb763bdd7c0506ba94beb924 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h
@@ -54,9 +54,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void preAssembleConcreteProcess(const double t, double const dt,
GlobalVector const& x) override;
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index e236c11d1587605577057357dc65065edc5f2123..6867ae7e441cc9cb59739bc98f74fea4d6b38e5f 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -229,7 +229,7 @@ void TESProcess::initializeSecondaryVariables()
}
void TESProcess::assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x,
+ std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M,
GlobalMatrix& K, GlobalVector& b)
{
diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h
index c961284009e74ae7210742fa0c4032851cf29e2b..e089b0156fc37e5792669c98278922772c0e83d9 100644
--- a/ProcessLib/TES/TESProcess.h
+++ b/ProcessLib/TES/TESProcess.h
@@ -60,9 +60,9 @@ private:
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void initializeSecondaryVariables();
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
index 770c6e6c45be5eb523fb89802142dc57821aff74..ef9df7ffa5888f434f01b2b7b263672c1f9374d1 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
@@ -75,7 +75,7 @@ void ThermalTwoPhaseFlowWithPPProcess::initializeConcreteProcess(
}
void ThermalTwoPhaseFlowWithPPProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble ThermalTwoPhaseFlowWithPPProcess.");
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
index b6c6c3ebb1e65908fcebd7102db57db2b6ee37ac..079a422179a77a5b7d5c863803363babcb4d38e6 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
@@ -62,9 +62,9 @@ private:
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
index 577f16ed3dc2246f04b6f31f9ad38cfb527d8712..a5caf0e27a0569590824ad56d40b50ae32f1de8c 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -240,7 +240,7 @@ void ThermoHydroMechanicsProcess<
template <int DisplacementDim>
void ThermoHydroMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble the equations for ThermoHydroMechanics");
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h
index 4dba2e42b6d23b0bde5cd81a6c760e427f805cf5..d59f19ca4bc5c32f10096f7243de8455ad670767 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h
@@ -76,9 +76,9 @@ private:
void initializeBoundaryConditions() override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
index 03a5edf779387d1fb124028728cfe766fa92f879..76dd7a2fd787889984b60f8de0e1733d522cc129 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
@@ -189,12 +189,11 @@ void ThermoMechanicalPhaseFieldProcess<
}
template <int DisplacementDim>
-void ThermoMechanicalPhaseFieldProcess<
- DisplacementDim>::assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x,
- int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b)
+void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
+ assembleConcreteProcess(const double t, double const dt,
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble the equations for ThermoMechanicalPhaseFieldProcess.");
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
index 4fa10f6311ea2d01998d994c6a7fea38ee9df5cd..2730afc6a67b692662ab1d72d6432d137732283e 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
@@ -93,9 +93,9 @@ private:
unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
index 158799bfaa250220e8bc35ee1889f11cf3b8a0fc..41c213b892693721f99e2cda62a4ae7c86768596 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -277,7 +277,7 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeBoundaryConditions()
template <int DisplacementDim>
void ThermoMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble ThermoMechanicsProcess.");
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
index 9df48f365cc42e887ddb391ad3ad3852313266a9..6c746328b24d84cd97005dea0d4eb220ff586c3a 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -68,9 +68,9 @@ private:
void initializeBoundaryConditions() override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
index 19776fd5fb847212705bb30360ecb6dcf86788a1..9fd607e16ff012883678240cefd9b0a66e938600 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
@@ -72,7 +72,7 @@ void TwoPhaseFlowWithPPProcess::initializeConcreteProcess(
}
void TwoPhaseFlowWithPPProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble TwoPhaseFlowWithPPProcess.");
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
index d67c4a3c47b5882136a194c6046632aa0e44b16c..064ac2db500f2bcc30967470bc0e5832cf496165 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
@@ -60,9 +60,9 @@ private:
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
index 17c417000e67b3c8f8d2b92b8fcd0d766ff310b4..5a93fd68472c6dd192b6dc9d711b9d685f9995da 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
@@ -73,7 +73,7 @@ void TwoPhaseFlowWithPrhoProcess::initializeConcreteProcess(
}
void TwoPhaseFlowWithPrhoProcess::assembleConcreteProcess(
- const double t, double const dt, GlobalVector const& x,
+ const double t, double const dt, std::vector<GlobalVector*> const& x,
int const process_id, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b)
{
DBUG("Assemble TwoPhaseFlowWithPrhoProcess.");
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
index 7a4cf3f64a49b7bc08151c63796617119a13fc21..bab449e9491f86295053125af1ce658e55233769 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
@@ -58,9 +58,9 @@ private:
MeshLib::Mesh const& mesh, unsigned const integration_order) override;
void assembleConcreteProcess(const double t, double const dt,
- GlobalVector const& x, int const process_id,
- GlobalMatrix& M, GlobalMatrix& K,
- GlobalVector& b) override;
+ std::vector<GlobalVector*> const& x,
+ int const process_id, GlobalMatrix& M,
+ GlobalMatrix& K, GlobalVector& b) override;
void assembleWithJacobianConcreteProcess(
const double t, double const dt, std::vector<GlobalVector*> const& x,