Skip to content
Snippets Groups Projects
Commit d1f00e91 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

[Cleanup] Use camelCase

parent bd6d38b9
No related branches found
No related tags found
No related merge requests found
#include <dune/common/exceptions.hh>
template <> struct StringToEnum<Config::state_model> {
static Config::state_model convert(std::string const &s) {
template <> struct StringToEnum<Config::stateModel> {
static Config::stateModel convert(std::string const &s) {
if (s == "Dieterich")
return Config::Dieterich;
......
......@@ -2,7 +2,7 @@
#define ENUMS_HH
struct Config {
enum state_model {
enum stateModel {
Dieterich,
Ruina
};
......
......@@ -119,7 +119,7 @@ initTimeStepper(Config::scheme scheme,
template <class SingletonVectorType, class VectorType>
Dune::shared_ptr<StateUpdater<SingletonVectorType, VectorType>>
initStateUpdater(Config::state_model model,
initStateUpdater(Config::stateModel model,
SingletonVectorType const &alpha_initial,
Dune::BitSetVector<1> const &frictionalNodes,
FrictionData const &fd) {
......@@ -347,7 +347,7 @@ int main(int argc, char *argv[]) {
// {{{ Initial conditions
SingletonVectorType alpha_initial(finestSize);
alpha_initial =
std::log(parset.get<double>("boundary.friction.initial_state"));
std::log(parset.get<double>("boundary.friction.initialState"));
using LinearFactoryType = SolverFactory<
dims, BlockNonlinearTNNMGProblem<ConvexProblem<
......@@ -467,7 +467,7 @@ int main(int argc, char *argv[]) {
velocityDirichletFunction, velocityDirichletNodes, M, A,
u_initial, v_initial, a_initial);
auto stateUpdater = initStateUpdater<SingletonVectorType, VectorType>(
parset.get<Config::state_model>("boundary.friction.state_model"),
parset.get<Config::stateModel>("boundary.friction.stateModel"),
alpha_initial, frictionalNodes, frictionData);
auto const timesteps = parset.get<size_t>("timeSteps");
......
......@@ -52,5 +52,5 @@ a = 0.010
b = 0.015
V0 = 1e-6
L = 1e-5
initial_state = 4.54e-05 # exp(-10)
state_model = Dieterich
initialState = 4.54e-05 # exp(-10)
stateModel = Dieterich
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment