Merge pull request #5977 from bobmyhill/approx_peierls

enforce approx peierls in composite viscoplastic
geodynamics · Jul 19, 2024 · b398dd9 · b398dd9
2 parents 188a8ec + 3faf79e
commit b398dd9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/doc/modules/changes/20240717d_myhill b/doc/modules/changes/20240717d_myhill
@@ -0,0 +1,5 @@
+Changed: The CompositeViscoPlastic rheology in ASPECT is now
+required to use the approximate Peierls flow rheology if
+Peierls flow is switched on.
+<br>
+(Bob Myhill, 2024/07/17)
diff --git a/source/material_model/rheology/composite_visco_plastic.cc b/source/material_model/rheology/composite_visco_plastic.cc
@@ -417,6 +417,9 @@ namespace aspect
             peierls_creep = std::make_unique<Rheology::PeierlsCreep<dim>>();
             peierls_creep->initialize_simulator (this->get_simulator());
             peierls_creep->parse_parameters(prm, expected_n_phases_per_composition);
+
+            AssertThrow((prm.get ("Peierls creep flow law") == "viscosity approximation"),
+                        ExcMessage("The Peierls creep flow law parameter needs to be set to viscosity approximation."));
           }
 
         // Drucker Prager parameters

diff --git a/tests/composite_viscous_outputs.cc b/tests/composite_viscous_outputs.cc
@@ -47,6 +47,7 @@ void f(const aspect::SimulatorAccess<dim> &simulator_access,
   composite_creep = std::make_unique<Rheology::CompositeViscoPlastic<dim>>();
   composite_creep->initialize_simulator (simulator_access.get_simulator());
   composite_creep->declare_parameters(prm);
+  prm.set("Peierls creep flow law", "viscosity approximation");
   prm.set("Maximum yield stress", "5e8");
   composite_creep->parse_parameters(prm, n_phases);