Transfer time-step from time loop to integrators

kernel/include/Couplings/Coupling.hpp

@@ -48,7 +48,7 @@ class Coupling {
   std::string get_name();
 
   void get_tree();
-  void initialize(const int& iter, const double& initial_time);
+  void initialize(const int& iter, const double& initial_time, const double time_step);
   void execute(const int& iter, double& next_time, const double& current_time,
                const double& current_time_step);
   void update();

kernel/include/Couplings/Coupling.tpp

@@ -75,10 +75,11 @@ void Coupling<Args...>::get_tree() {
  * @param initial_time
  */
 template <class... Args>
-void Coupling<Args...>::initialize(const int& iter, const double& initial_time) {
+void Coupling<Args...>::initialize(const int& iter, const double& initial_time,
+                                   const double time_step) {
   std::apply(
-      [iter, initial_time](auto&... problem) {
-        (problem.initialize(initial_time), ...);
+      [iter, initial_time, time_step](auto&... problem) {
+        (problem.initialize(initial_time, time_step), ...);
         (void([&problem, iter, initial_time] { problem.save(iter, initial_time); }()), ...);
       },
       problems_);

kernel/include/Integrators/AllenCahnNLFormIntegrator.hpp

@@ -72,7 +72,8 @@ class AllenCahnNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
 
  public:
   void init() override;
-  AllenCahnNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  AllenCahnNLFormIntegrator(Geometry geometry, const double time_step,
+                            const std::vector<mfem::ParGridFunction>& u_old,
                             const std::vector<mfem::ParGridFunction>& aux_old,
                             const Parameters& params, std::vector<VARS*> auxvars,
                             const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/AllenCahnNLFormIntegrator.tpp

@@ -61,10 +61,11 @@
  */
 template <class VARS>
 AllenCahnNLFormIntegrator<VARS>::AllenCahnNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {
   this->integrator_name_ = "AllenCahn";
 
   this->check_variables_consistency();

kernel/include/Integrators/BlockAllenCahnNLFormIntegrator.hpp

@@ -65,7 +65,8 @@ class BlockAllenCahnNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
 
  public:
   void init() override;
-  BlockAllenCahnNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  BlockAllenCahnNLFormIntegrator(Geometry geometry, const double time_step,
+                                 const std::vector<mfem::ParGridFunction>& u_old,
                                  const std::vector<mfem::ParGridFunction>& aux_old,
                                  const Parameters& params, std::vector<VARS*> auxvars,
                                  const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/BlockAllenCahnNLFormIntegrator.tpp

@@ -60,10 +60,11 @@
  */
 template <class VARS>
 BlockAllenCahnNLFormIntegrator<VARS>::BlockAllenCahnNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {
   this->check_variables_consistency();
 }
 

kernel/include/Integrators/CahnHilliardNLFormIntegrator.hpp

@@ -66,7 +66,8 @@ class CahnHilliardNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
 
  public:
   void init() override;
-  CahnHilliardNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  CahnHilliardNLFormIntegrator(Geometry geometry, const double time_step,
+                               const std::vector<mfem::ParGridFunction>& u_old,
                                const std::vector<mfem::ParGridFunction>& aux_old,
                                const Parameters& params, std::vector<VARS*> auxvars,
                                const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/CahnHilliardNLFormIntegrator.tpp

@@ -58,10 +58,11 @@
  */
 template <class VARS>
 CahnHilliardNLFormIntegrator<VARS>::CahnHilliardNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {
   this->integrator_name_ = "CahnHilliard";
   this->check_variables_consistency();
 }

kernel/include/Integrators/DiffusionFluxNLFormIntegrator.hpp

@@ -72,7 +72,8 @@ class DiffusionFluxNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
   void init() override;
 
  public:
-  DiffusionFluxNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  DiffusionFluxNLFormIntegrator(Geometry geometry, const double time_step,
+                                const std::vector<mfem::ParGridFunction>& u_old,
                                 const std::vector<mfem::ParGridFunction>& aux_old,
                                 const Parameters& params, std::vector<VARS*> auxvars,
                                 const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/DiffusionFluxNLFormIntegrator.tpp

@@ -81,10 +81,11 @@ void DiffusionFluxNLFormIntegrator<VARS>::get_coefficients() {
  */
 template <class VARS>
 DiffusionFluxNLFormIntegrator<VARS>::DiffusionFluxNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {
   this->expected_list_.push_back(GlossaryType::Diffusivity);
 }
 

kernel/include/Integrators/DiffusionNLFormIntegrator.hpp

@@ -59,7 +59,8 @@ class DiffusionNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
   void init() override;
 
  public:
-  DiffusionNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction> u_old,
+  DiffusionNLFormIntegrator(Geometry geometry, const double time_step,
+                            const std::vector<mfem::ParGridFunction> u_old,
                             const std::vector<mfem::ParGridFunction> aux_old,
                             const Parameters& params, std::vector<VARS*> auxvars,
                             const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/DiffusionNLFormIntegrator.tpp

@@ -61,10 +61,11 @@
  */
 template <class VARS>
 DiffusionNLFormIntegrator<VARS>::DiffusionNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction> u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction> u_old,
     const std::vector<mfem::ParGridFunction> aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {}
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {}
 
 /**
  * @brief Initialize the diffusion integrator.

kernel/include/Integrators/FickNLFormIntegrator.hpp

@@ -56,7 +56,8 @@ class FickNLFormIntegrator : public DiffusionNLFormIntegrator<VARS> {
   void get_coefficients() override;
 
  public:
-  FickNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction> u_old,
+  FickNLFormIntegrator(Geometry geometry, const double time_step,
+                       const std::vector<mfem::ParGridFunction> u_old,
                        const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
                        std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients);
   virtual ~FickNLFormIntegrator() = default;

kernel/include/Integrators/FickNLFormIntegrator.tpp

@@ -58,13 +58,14 @@
  *
  */
 template <class VARS>
-FickNLFormIntegrator<VARS>::FickNLFormIntegrator(Geometry geometry,
+FickNLFormIntegrator<VARS>::FickNLFormIntegrator(Geometry geometry, const double time_step,
                                                  const std::vector<mfem::ParGridFunction> u_old,
                                                  const std::vector<mfem::ParGridFunction>& aux_old,
                                                  const Parameters& params,
                                                  std::vector<VARS*> auxvars,
                                                  const std::vector<Coefficients>& coefficients)
-    : DiffusionNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : DiffusionNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                      coefficients) {
   this->integrator_name_ = "Fick";
 
   this->expected_list_.push_back(GlossaryType::Diffusivity);

kernel/include/Integrators/FourierNLFormIntegrator.hpp

@@ -56,7 +56,8 @@ class FourierNLFormIntegrator : public DiffusionNLFormIntegrator<VARS> {
   void get_coefficients() override;
 
  public:
-  FourierNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  FourierNLFormIntegrator(Geometry geometry, const double time_step,
+                          const std::vector<mfem::ParGridFunction>& u_old,
                           const std::vector<mfem::ParGridFunction>& aux_old,
                           const Parameters& params, std::vector<VARS*> auxvars,
                           const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/FourierNLFormIntegrator.tpp

@@ -59,10 +59,11 @@
  */
 template <class VARS>
 FourierNLFormIntegrator<VARS>::FourierNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : DiffusionNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : DiffusionNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                      coefficients) {
   this->integrator_name_ = "Fourier";
   this->expected_list_.push_back(GlossaryType::Conductivity);
 }

kernel/include/Integrators/HeatTimeNLFormIntegrator.hpp

@@ -48,7 +48,8 @@ class HeatTimeNLFormIntegrator : public TimeNLFormIntegrator<VARS> {
   void get_coefficients() override;
 
  public:
-  HeatTimeNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction> u_old,
+  HeatTimeNLFormIntegrator(Geometry geometry, const double time_step,
+                           const std::vector<mfem::ParGridFunction> u_old,
                            const std::vector<mfem::ParGridFunction>& aux_old,
                            const Parameters& params, std::vector<VARS*> auxvars,
                            const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/HeatTimeNLFormIntegrator.tpp

@@ -56,10 +56,11 @@
  */
 template <class VARS>
 HeatTimeNLFormIntegrator<VARS>::HeatTimeNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction> u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction> u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : TimeNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : TimeNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                 coefficients) {
   this->integrator_name_ = "HeatTime";
 
   this->expected_list_.push_back(GlossaryType::Concentration);

kernel/include/Integrators/LatentHeatNLFormIntegrator.hpp

@@ -52,7 +52,6 @@ template <class VARS>
 class LatentHeatNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
  private:
   int phase_field_index_;
-  double latent_time_step_;
 
   std::list<GlossaryType> expected_list_{GlossaryType::Mobility};
   mfem::DenseMatrix gradPsi;
@@ -74,7 +73,8 @@ class LatentHeatNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
   virtual void check_variables_consistency();
 
  public:
-  LatentHeatNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  LatentHeatNLFormIntegrator(Geometry geometry, const double time_step,
+                             const std::vector<mfem::ParGridFunction>& u_old,
                              const std::vector<mfem::ParGridFunction>& aux_old,
                              const Parameters& params, std::vector<VARS*> auxvars,
                              const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/LatentHeatNLFormIntegrator.tpp

@@ -59,12 +59,12 @@
  */
 template <class VARS>
 LatentHeatNLFormIntegrator<VARS>::LatentHeatNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {
   this->integrator_name_ = "LatentHeat";
-  this->latent_time_step_ = this->params_.template get_param_value<double>("latent_time_step");
   this->check_variables_consistency();
 }
 
@@ -273,7 +273,7 @@ double LatentHeatNLFormIntegrator<VARS>::get_latent_heat_at_ip(
   const double phi = local_auxvalues[this->phase_field_index_];
   const double phin = local_auxvalues_n[this->phase_field_index_];
 
-  double square_time_derivative = (phi - phin) / this->latent_time_step_;
+  double square_time_derivative = (phi - phin) / this->time_step_;
   square_time_derivative *= square_time_derivative;
   const double epsilon = 1.e-10;
   const double latent_heat = -square_time_derivative / std::max(epsilon, mobility_value);

kernel/include/Integrators/MassDiffusionFluxNLFormIntegrator.hpp

@@ -82,7 +82,7 @@ class MassDiffusionFluxNLFormIntegrator : public DiffusionFluxNLFormIntegrator<V
                                            const mfem::IntegrationPoint& ip) override;
 
  public:
-  MassDiffusionFluxNLFormIntegrator(Geometry geometry,
+  MassDiffusionFluxNLFormIntegrator(Geometry geometry, const double time_step,
                                     const std::vector<mfem::ParGridFunction>& u_old,
                                     const std::vector<mfem::ParGridFunction>& aux_old,
                                     const Parameters& params, std::vector<VARS*> auxvars,

kernel/include/Integrators/MassDiffusionFluxNLFormIntegrator.tpp

@@ -91,10 +91,11 @@ void MassDiffusionFluxNLFormIntegrator<VARS>::get_parameters() {
  */
 template <class VARS>
 MassDiffusionFluxNLFormIntegrator<VARS>::MassDiffusionFluxNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : DiffusionFluxNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : DiffusionFluxNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                          coefficients) {
   this->get_parameters();
   this->check_variables_consistency();
 }

kernel/include/Integrators/MeltingBaseNLFormIntegrator.hpp

@@ -73,7 +73,8 @@ class MeltingBaseNLFormIntegrator : public SlothNLFormIntegrator<VARS> {
   virtual void check_variables_consistency();
 
  public:
-  MeltingBaseNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  MeltingBaseNLFormIntegrator(Geometry geometry, const double time_step,
+                              const std::vector<mfem::ParGridFunction>& u_old,
                               const std::vector<mfem::ParGridFunction>& aux_old,
                               const Parameters& params, std::vector<VARS*> auxvars,
                               const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/MeltingBaseNLFormIntegrator.tpp

@@ -59,10 +59,11 @@
  */
 template <class VARS>
 MeltingBaseNLFormIntegrator<VARS>::MeltingBaseNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : SlothNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {}
+    : SlothNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                  coefficients) {}
 
 /**
  * @brief Initialize the integrator.

kernel/include/Integrators/MeltingCalphadNLFormIntegrator.hpp

@@ -73,7 +73,8 @@ class MeltingCalphadNLFormIntegrator : public MeltingBaseNLFormIntegrator<VARS>
                         const std::span<const double>& aux_values) override;
 
  public:
-  MeltingCalphadNLFormIntegrator(Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+  MeltingCalphadNLFormIntegrator(Geometry geometry, const double time_step,
+                                 const std::vector<mfem::ParGridFunction>& u_old,
                                  const std::vector<mfem::ParGridFunction>& aux_old,
                                  const Parameters& params, std::vector<VARS*> auxvars,
                                  const std::vector<Coefficients>& coefficients);

kernel/include/Integrators/MeltingCalphadNLFormIntegrator.tpp

@@ -58,10 +58,11 @@
  */
 template <class VARS>
 MeltingCalphadNLFormIntegrator<VARS>::MeltingCalphadNLFormIntegrator(
-    Geometry geometry, const std::vector<mfem::ParGridFunction>& u_old,
+    Geometry geometry, const double time_step, const std::vector<mfem::ParGridFunction>& u_old,
     const std::vector<mfem::ParGridFunction>& aux_old, const Parameters& params,
     std::vector<VARS*> auxvars, const std::vector<Coefficients>& coefficients)
-    : MeltingBaseNLFormIntegrator<VARS>(geometry, u_old, aux_old, params, auxvars, coefficients) {
+    : MeltingBaseNLFormIntegrator<VARS>(geometry, time_step, u_old, aux_old, params, auxvars,
+                                        coefficients) {
   this->integrator_name_ = "MeltingCalphad";
 
   this->get_parameters();
@@ -232,5 +233,5 @@ double MeltingCalphadNLFormIntegrator<VARS>::get_seed_at_ip(
   const double seed =
       -aux_values[this->secondary_nucleus_index_] - aux_values[this->primary_nucleus_index_];
 
-  return seed;
+  return seed / this->time_step_;
 }

kernel/include/Integrators/MeltingConstantNLFormIntegrator.hpp

@@ -59,7 +59,7 @@ class MeltingConstantNLFormIntegrator : public MeltingBaseNLFormIntegrator<VARS>
                                 const std::span<const double>& aux_values) override;
 
  public:
-  MeltingConstantNLFormIntegrator(Geometry geometry,
+  MeltingConstantNLFormIntegrator(Geometry geometry, const double time_step,
                                   const std::vector<mfem::ParGridFunction>& u_old,
                                   const std::vector<mfem::ParGridFunction>& aux_old,
                                   const Parameters& params, std::vector<VARS*> auxvars,