[PL] Add t and dt to postTimestep{ConcreteProcess}.

Needed for the description of the balance data.
ufz · TomFischer · May 31, 2018 · May 7, 2018 · May 8, 2018 · May 8, 2018
commit 2689f06515eee119671a929bf2ed2d4433367a6a
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -61,6 +61,8 @@ class GroundwaterFlowProcess final : public Process
     }
 
     void postTimestepConcreteProcess(GlobalVector const& x,
+                                     const double /*t*/,
+                                     const double /*delta_t*/,
                                      int const process_id) override
     {
         //For this single process, process_id is always zero.

diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
@@ -255,6 +255,8 @@ std::vector<double> HTProcess::getFlux(std::size_t element_id,
 
 // this is almost a copy of the implemention in the GroundwaterFlow
 void HTProcess::postTimestepConcreteProcess(GlobalVector const& x,
+                                            const double t,
+                                            const double delta_t,
                                             int const process_id)
 {
     // For the monolithic scheme, process_id is always zero.

diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
@@ -76,6 +76,8 @@ class HTProcess final : public Process
     void setCoupledTermForTheStaggeredSchemeToLocalAssemblers() override;
 
     void postTimestepConcreteProcess(GlobalVector const& x,
+                                     const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
 private:

diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -361,7 +361,8 @@ void HydroMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
 
 template <int DisplacementDim>
 void HydroMechanicsProcess<DisplacementDim>::postTimestepConcreteProcess(
-    GlobalVector const& x, const int process_id)
+    GlobalVector const& x, const double /*t*/, const double /*delta_t*/,
+    const int process_id)
 {
     DBUG("PostTimestep HydroMechanicsProcess.");
     GlobalExecutor::executeMemberOnDereferenced(

diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -86,7 +86,8 @@ class HydroMechanicsProcess final : public Process
                                     double const dt,
                                     const int process_id) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
     void postNonLinearSolverConcreteProcess(GlobalVector const& x, const double t,

diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -395,7 +395,8 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess(
 
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
-    GlobalVector const& x, int const /*process_id*/)
+    GlobalVector const& x, const double /*t*/, const double /*delta_t*/,
+    int const /*process_id*/)
 {
     DBUG("PostTimestep SmallDeformationProcess.");
 

diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -70,7 +70,8 @@ class SmallDeformationProcess final : public Process
                                     double const dt,
                                     const int /*process_id*/) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
 private:

diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.cpp b/ProcessLib/PhaseField/PhaseFieldProcess.cpp
@@ -310,7 +310,8 @@ void PhaseFieldProcess<DisplacementDim>::preTimestepConcreteProcess(
 
 template <int DisplacementDim>
 void PhaseFieldProcess<DisplacementDim>::postTimestepConcreteProcess(
-    GlobalVector const& x, int const process_id)
+    GlobalVector const& x, const double /*t*/, const double /*delta_t*/,
+    int const process_id)
 {
     if (isPhaseFieldProcess(process_id))
     {

diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h
@@ -99,7 +99,8 @@ class PhaseFieldProcess final : public Process
                                     double const dt,
                                     const int process_id) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
     void postNonLinearSolverConcreteProcess(GlobalVector const& x,

diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
@@ -350,10 +350,11 @@ void Process::preTimestep(GlobalVector const& x, const double t,
     _boundary_conditions[process_id].preTimestep(t, x);
 }
 
-void Process::postTimestep(GlobalVector const& x, int const process_id)
+void Process::postTimestep(GlobalVector const& x, const double t,
+                           const double delta_t, int const process_id)
 {
     MathLib::LinAlg::setLocalAccessibleVector(x);
-    postTimestepConcreteProcess(x, process_id);
+    postTimestepConcreteProcess(x, t, delta_t, process_id);
 }
 
 void Process::postNonLinearSolver(GlobalVector const& x, const double t,

diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
@@ -61,7 +61,8 @@ class Process
                      const double delta_t, const int process_id);
 
     /// Postprocessing after a complete timestep.
-    void postTimestep(GlobalVector const& x, int const process_id);
+    void postTimestep(GlobalVector const& x, const double t,
+                      const double delta_t, int const process_id);
 
     /// Calculates secondary variables, e.g. stress and strain for deformation
     /// analysis, only after nonlinear solver being successfully conducted.
@@ -194,6 +195,8 @@ class Process
     }
 
     virtual void postTimestepConcreteProcess(GlobalVector const& /*x*/,
+                                             const double /*t*/,
+                                             const double /*delta_t*/,
                                              int const /*process_id*/)
     {
     }

diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp
@@ -268,7 +268,8 @@ void SmallDeformationProcess<DisplacementDim>::preTimestepConcreteProcess(
 
 template <int DisplacementDim>
 void SmallDeformationProcess<DisplacementDim>::postTimestepConcreteProcess(
-    GlobalVector const& x, int const /*process_id*/)
+    GlobalVector const& x, const double /*t*/, const double /*delta_t*/,
+    int const /*process_id*/)
 {
     DBUG("PostTimestep SmallDeformationProcess.");
 

diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -97,7 +97,8 @@ class SmallDeformationProcess final : public Process
         GlobalVector const& x, double const t, double const dt,
         const int process_id) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
 private:

diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h
@@ -288,6 +288,8 @@ void ThermoMechanicalPhaseFieldProcess<
 template <int DisplacementDim>
 void ThermoMechanicalPhaseFieldProcess<
     DisplacementDim>::postTimestepConcreteProcess(GlobalVector const& x,
+                                                  double const /*t*/,
+                                                  double const /*dt*/,
                                                   int const process_id)
 {
     DBUG("PostTimestep ThermoMechanicalPhaseFieldProcess.");

diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h
@@ -104,7 +104,8 @@ class ThermoMechanicalPhaseFieldProcess final : public Process
                                     double const dt,
                                     const int process_id) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, double const t,
+                                     double const dt,
                                      int const process_id) override;
 
     void postNonLinearSolverConcreteProcess(GlobalVector const& x,

diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp
@@ -197,7 +197,8 @@ void ThermoMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess(
 
 template <int DisplacementDim>
 void ThermoMechanicsProcess<DisplacementDim>::postTimestepConcreteProcess(
-    GlobalVector const& x, int const /*process_id*/)
+    GlobalVector const& x, const double /*t*/, const double /*delta_t*/,
+    int const /*process_id*/)
 {
     DBUG("PostTimestep ThermoMechanicsProcess.");
 

diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -63,7 +63,8 @@ class ThermoMechanicsProcess final : public Process
         GlobalVector const& x, double const t, double const dt,
         const int process_id) override;
 
-    void postTimestepConcreteProcess(GlobalVector const& x,
+    void postTimestepConcreteProcess(GlobalVector const& x, const double t,
+                                     const double delta_t,
                                      int const process_id) override;
 
 private:

diff --git a/ProcessLib/UncoupledProcessesTimeLoop.cpp b/ProcessLib/UncoupledProcessesTimeLoop.cpp
@@ -681,7 +681,7 @@ bool UncoupledProcessesTimeLoop::solveUncoupledEquationSystems(
         const auto nonlinear_solver_succeeded = solveOneTimeStepOneProcess(
             process_id, x, timestep_id, t, dt, *process_data, *_output);
         process_data->nonlinear_solver_converged = nonlinear_solver_succeeded;
-        pcs.postTimestep(x, process_id);
+        pcs.postTimestep(x, t, dt, process_id);
         pcs.computeSecondaryVariable(t, x);
 
         INFO("[time] Solving process #%u took %g s in time step #%u ",
@@ -855,7 +855,7 @@ bool UncoupledProcessesTimeLoop::solveCoupledEquationSystemsByStaggeredScheme(
 
         auto& pcs = process_data->process;
         auto& x = *_process_solutions[process_id];
-        pcs.postTimestep(x, process_id);
+        pcs.postTimestep(x, t, dt, process_id);
         pcs.computeSecondaryVariable(t, x);
 
         ++process_id;