From d1f00e915aac11c70ecd299c7f8053ce454f8673 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 21 Jul 2013 14:41:14 +0200
Subject: [PATCH] [Cleanup] Use camelCase
---
src/enum_state_model.cc | 4 ++--
src/enums.hh | 2 +-
src/one-body-sample.cc | 6 +++---
src/one-body-sample.parset | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/enum_state_model.cc b/src/enum_state_model.cc
index 5982c432..7195a016 100644
--- a/src/enum_state_model.cc
+++ b/src/enum_state_model.cc
@@ -1,7 +1,7 @@
#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;
diff --git a/src/enums.hh b/src/enums.hh
index 1c8a7a85..5d829afd 100644
--- a/src/enums.hh
+++ b/src/enums.hh
@@ -2,7 +2,7 @@
#define ENUMS_HH
struct Config {
- enum state_model {
+ enum stateModel {
Dieterich,
Ruina
};
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 11ce67d8..16546a50 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -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");
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 6339c69b..c6b4cd4a 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -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
--
GitLab