Skip to content

Commit

Permalink
set averaging schemes in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bobmyhill committed Jul 25, 2024
1 parent 82c7607 commit f41a86e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/composite_viscous_outputs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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("Viscosity averaging scheme", "isostrain");
prm.set("Include diffusion creep in composite rheology", "true");
prm.set("Include dislocation creep in composite rheology", "true");
prm.set("Include Peierls creep in composite rheology", "true");
Expand Down
1 change: 0 additions & 1 deletion tests/composite_viscous_outputs_isostress.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ 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("Viscosity averaging scheme", "isostress");
prm.set("Include diffusion creep in composite rheology", "true");
prm.set("Include dislocation creep in composite rheology", "true");
Expand Down
1 change: 1 addition & 0 deletions tests/composite_viscous_outputs_no_peierls.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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("Viscosity averaging scheme", "isostrain");
prm.set("Include diffusion creep in composite rheology", "true");
prm.set("Include dislocation creep in composite rheology", "true");
prm.set("Include Peierls creep in composite rheology", "false");
Expand Down

0 comments on commit f41a86e

Please sign in to comment.