Updated to current dev, but need to fix superimposed issue

Argonne-National-Laboratory · Aug 23, 2022 · 3e16456 · 3e16456
1 parent 5173012
commit 3e16456
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/include/visco_flow.h b/include/visco_flow.h
@@ -110,10 +110,10 @@ class NEML_EXPORT SuperimposedViscoPlasticFlowRule : public ViscoPlasticFlowRule
   /// Number of individual models being summed
   size_t nmodels() const;
 
-  /// Number of history variables
-  virtual size_t nhist() const;
+  /// Populate a blank history object
+  virtual void populate_hist(History & hist) const;
   /// Initialize history at time zero
-  virtual void init_hist(double * const h) const;
+  virtual void init_hist(History & hist) const;
 
   /// Scalar flow rate
   virtual void y(const double* const s, const double* const alpha, double T,
@@ -252,7 +252,7 @@ class NEML_EXPORT PerzynaFlowRule : public ViscoPlasticFlowRule {
   /// Initialize from parameters
   static ParameterSet parameters();
 
-  /// Number of history variables
+  /// Populate a blank history object
   virtual void populate_hist(History & hist) const;
   /// Initialize history at time zero
   virtual void init_hist(History & hist) const;
@@ -308,10 +308,10 @@ class NEML_EXPORT LinearViscousFlow : public ViscoPlasticFlowRule {
   /// Initialize from parameters
   static ParameterSet parameters();
 
-  /// Number of history variables
-  virtual size_t nhist() const;
+  /// Populate a blank history object
+  virtual void populate_hist(History & hist) const;
   /// Initialize history at time zero
-  virtual void init_hist(double * const h) const;
+  virtual void init_hist(History & hist) const;
 
   /// Scalar strain rate
   virtual void y(const double* const s, const double* const alpha, double T,

diff --git a/src/visco_flow.cxx b/src/visco_flow.cxx
@@ -142,15 +142,16 @@ size_t SuperimposedViscoPlasticFlowRule::nmodels() const
   return rules_.size();
 }
 
-size_t SuperimposedViscoPlasticFlowRule::nhist() const
+void SuperimposedViscoPlasticFlowRule::populate_hist(History & hist) const
 {
-  return offsets_[nmodels()];
+  for (size_t i = 0; i < nmodels(); i++)
+    rules_[i]->populate_hist(hist);
 }
 
-void SuperimposedViscoPlasticFlowRule::init_hist(double * const h) const
+void SuperimposedViscoPlasticFlowRule::init_hist(History & hist) const
 {
   for (size_t i = 0; i < nmodels(); i++)
-    rules_[i]->init_hist(model_history_(h, i));
+    rules_[i]->init_hist(hist);
 }
 
 void SuperimposedViscoPlasticFlowRule::y(const double* const s, 
@@ -894,12 +895,12 @@ std::unique_ptr<NEMLObject> LinearViscousFlow::initialize(ParameterSet & params)
   return neml::make_unique<LinearViscousFlow>(params); 
 }
 
-size_t LinearViscousFlow::nhist() const
+void LinearViscousFlow::init_hist(History & h) const
 {
-  return 0;
+  return;
 }
 
-void LinearViscousFlow::init_hist(double * const h) const
+void LinearViscousFlow::populate_hist(History & h) const
 {
   return;
 }