From d06bc2456ed7ab2be25a93e20ec889005e598392 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 8 Oct 2019 12:36:12 +0200
Subject: [PATCH] [PL] Update assembleConcreteProcess interface.
Passing a vector of solutions now.
---
.../ComponentTransport/ComponentTransportProcess.cpp | 2 +-
.../ComponentTransport/ComponentTransportProcess.h | 6 +++---
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp | 2 +-
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h | 6 +++---
ProcessLib/HT/HTProcess.cpp | 2 +-
ProcessLib/HT/HTProcess.h | 6 +++---
ProcessLib/HeatConduction/HeatConductionProcess.cpp | 2 +-
ProcessLib/HeatConduction/HeatConductionProcess.h | 6 +++---
.../HeatTransportBHE/HeatTransportBHEProcess.cpp | 2 +-
ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h | 6 +++---
ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp | 2 +-
ProcessLib/HydroMechanics/HydroMechanicsProcess.h | 6 +++---
.../LIE/HydroMechanics/HydroMechanicsProcess.cpp | 2 +-
ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h | 6 +++---
.../LIE/SmallDeformation/SmallDeformationProcess.cpp | 2 +-
.../LIE/SmallDeformation/SmallDeformationProcess.h | 6 +++---
ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 2 +-
ProcessLib/LiquidFlow/LiquidFlowProcess.h | 6 +++---
ProcessLib/PhaseField/PhaseFieldProcess.cpp | 2 +-
ProcessLib/PhaseField/PhaseFieldProcess.h | 6 +++---
.../RichardsComponentTransportProcess.cpp | 2 +-
.../RichardsComponentTransportProcess.h | 6 +++---
ProcessLib/RichardsFlow/RichardsFlowProcess.cpp | 2 +-
ProcessLib/RichardsFlow/RichardsFlowProcess.h | 6 +++---
.../RichardsMechanics/RichardsMechanicsProcess.cpp | 2 +-
.../RichardsMechanics/RichardsMechanicsProcess.h | 6 +++---
.../SmallDeformation/SmallDeformationProcess.cpp | 2 +-
ProcessLib/SmallDeformation/SmallDeformationProcess.h | 6 +++---
.../SmallDeformationNonlocalProcess.cpp | 2 +-
.../SmallDeformationNonlocalProcess.h | 6 +++---
ProcessLib/TES/TESProcess.cpp | 2 +-
ProcessLib/TES/TESProcess.h | 6 +++---
.../ThermalTwoPhaseFlowWithPPProcess.cpp | 2 +-
.../ThermalTwoPhaseFlowWithPPProcess.h | 6 +++---
.../ThermoHydroMechanicsProcess.cpp | 2 +-
.../ThermoHydroMechanicsProcess.h | 6 +++---
.../ThermoMechanicalPhaseFieldProcess.cpp | 11 +++++------
.../ThermoMechanicalPhaseFieldProcess.h | 6 +++---
ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp | 2 +-
ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h | 6 +++---
.../TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp | 2 +-
.../TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h | 6 +++---
.../TwoPhaseFlowWithPrhoProcess.cpp | 2 +-
.../TwoPhaseFlowWithPrhoProcess.h | 6 +++---
44 files changed, 92 insertions(+), 93 deletions(-)
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 933baaebaef..ec5dfdf2e41 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 4d2ba5a48b6..2486a1a4dad 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 1d976ee8c8c..c6ae5b35678 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 48ff42ee9e5..7e2544aa93b 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 02fc782e136..c4637fa191f 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 9bd47e8ba5a..17ef8de52d1 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 3c5f3c9ca4f..986dca259f9 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 4ad709bf59a..f349e851295 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 e4f211b3382..01cc11f3148 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 a81c690dd0c..a75c064c27e 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 34c00b8ef12..b738bde6b02 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 9cf7390f07f..a74ca0e685d 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 a0effbc186f..d569404ad34 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 80f52a23387..9e04abad53f 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 251ddd86c73..52ff8ad378d 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 a109772a01e..ddb1be1f5a4 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 3161aa2310d..c8c8c806974 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 1945c2e2cff..f998a3c75ba 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 da3962418d4..1a6357a0cc6 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 24de1778174..84f78516d47 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 abb850aa5c1..159d7c0173f 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 a2d15d1a2f2..210e6f70c85 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 34e6988a5ca..4969486d1e9 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 8d64d3c2e21..e4b07e5d34e 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 5d1f23cc982..e13c5db2183 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 bbff5e039dd..8d44161bca0 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 4039bc9822d..b26e2e98124 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 aea3933d83b..c991295aa38 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 1c556f09514..b5aad3e920f 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 1f2099a11a0..386d4eca37a 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 e236c11d158..6867ae7e441 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 c961284009e..e089b0156fc 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 770c6e6c45b..ef9df7ffa58 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 b6c6c3ebb1e..079a422179a 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 577f16ed3dc..a5caf0e27a0 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 4dba2e42b6d..d59f19ca4bc 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 03a5edf7793..76dd7a2fd78 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 4fa10f6311e..2730afc6a67 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 158799bfaa2..41c213b8926 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 9df48f365cc..6c746328b24 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 19776fd5fb8..9fd607e16ff 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 d67c4a3c47b..064ac2db500 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 17c417000e6..5a93fd68472 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 7a4cf3f64a4..bab449e9491 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,
--
GitLab