diff --git a/src/assemblers.cc b/src/assemblers.cc index 38084c9c4ea48cdf4b40915d6a3170ab7d20f2e0..30cc3746e483cf6f86e83e3a402aa5fa3703440d 100644 --- a/src/assemblers.cc +++ b/src/assemblers.cc @@ -13,7 +13,6 @@ #include "enums.hh" #include "enum_parser.cc" -#include "enum_model.cc" // Assembles Neumann boundary term in f template <class GridType, class GridView, class LocalVectorType, class FEBasis> @@ -66,27 +65,21 @@ assemble_nonlinearity( SingletonVectorType mu(size); mu = parset.get<double>("mu"); - switch (parset.get<Config::model>("model")) { - case Config::Exponential: { - SingletonVectorType a(size); - a = parset.get<double>("a"); + SingletonVectorType a(size); + a = parset.get<double>("a"); - SingletonVectorType V0(size); - V0 = parset.get<double>("V0"); + SingletonVectorType V0(size); + V0 = parset.get<double>("V0"); - SingletonVectorType b(size); - b = parset.get<double>("b"); + SingletonVectorType b(size); + b = parset.get<double>("b"); - SingletonVectorType L(size); - L = parset.get<double>("L"); + SingletonVectorType L(size); + L = parset.get<double>("L"); - return Dune::make_shared< - Dune::GlobalRuinaNonlinearity<MatrixType, VectorType> const>( - nodalIntegrals, a, mu, V0, normalStress, b, state, L); - } - case Config::Laursen: - assert(false); - } + return Dune::make_shared< + Dune::GlobalRuinaNonlinearity<MatrixType, VectorType> const>( + nodalIntegrals, a, mu, V0, normalStress, b, state, L); } #include "assemblers_tmpl.cc" diff --git a/src/enum_model.cc b/src/enum_model.cc deleted file mode 100644 index 1fd1bc1d525bc6ef678823c00487dfb66a2968bf..0000000000000000000000000000000000000000 --- a/src/enum_model.cc +++ /dev/null @@ -1,13 +0,0 @@ -#include <dune/common/exceptions.hh> - -template <> struct StringToEnum<Config::model> { - static Config::model convert(std::string const &s) { - if (s == "Laursen") - return Config::Laursen; - - if (s == "Exponential") - return Config::Exponential; - - DUNE_THROW(Dune::Exception, "failed to parse enum"); - } -}; diff --git a/src/enums.hh b/src/enums.hh index 21fb6cdf1fd6ecf945aa8b4cbce73d30a90dc6dd..f8d05d21f1ee20cef30d1907c8973532154298fc 100644 --- a/src/enums.hh +++ b/src/enums.hh @@ -2,10 +2,6 @@ #define ENUMS_HH struct Config { - enum model { - Laursen, - Exponential - }; enum state_model { Dieterich, Ruina diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset index 6f5146f13f3e1618cf27ae6868d24641ac14243b..78861e1f6acd1eb0c23ac9a190dcbdee53ebd117 100644 --- a/src/one-body-sample.parset +++ b/src/one-body-sample.parset @@ -53,7 +53,6 @@ a = 0.010 b = 0.015 V0 = 1 L = 1e-5 -model = Exponential initial_log_state = -10 state_model = Dieterich