[Cleanup] Continue renaming: alpha -> logState

src/state/dieterichstateupdater.hh

@@ -8,7 +8,7 @@ template <class SingletonVectorType, class VectorType>
 class DieterichStateUpdater
     : public StateUpdater<SingletonVectorType, VectorType> {
 public:
-  DieterichStateUpdater(SingletonVectorType _alpha_initial,
+  DieterichStateUpdater(SingletonVectorType _logState_initial,
                         Dune::BitSetVector<1> const &_nodes, double _L);
 
   virtual void nextTimeStep();
@@ -18,7 +18,7 @@ class DieterichStateUpdater
 
 private:
   SingletonVectorType logState_o;
-  SingletonVectorType alpha;
+  SingletonVectorType logState;
   Dune::BitSetVector<1> const &nodes;
   double const L;
   double tau;
@@ -26,13 +26,13 @@ class DieterichStateUpdater
 
 template <class SingletonVectorType, class VectorType>
 DieterichStateUpdater<SingletonVectorType, VectorType>::DieterichStateUpdater(
-    SingletonVectorType _alpha_initial, Dune::BitSetVector<1> const &_nodes,
+    SingletonVectorType _logState_initial, Dune::BitSetVector<1> const &_nodes,
     double _L)
-    : alpha(_alpha_initial), nodes(_nodes), L(_L) {}
+    : logState(_logState_initial), nodes(_nodes), L(_L) {}
 
 template <class SingletonVectorType, class VectorType>
 void DieterichStateUpdater<SingletonVectorType, VectorType>::nextTimeStep() {
-  logState_o = alpha;
+  logState_o = logState;
 }
 
 template <class SingletonVectorType, class VectorType>
@@ -47,14 +47,14 @@ void DieterichStateUpdater<SingletonVectorType, VectorType>::solve(
   for (size_t i = 0; i < nodes.size(); ++i)
     if (nodes[i][0]) {
       double const V = velocity_field[i].two_norm();
-      alpha[i] = state_update_dieterich_euler(tau, V / L, logState_o[i]);
+      logState[i] = state_update_dieterich_euler(tau, V / L, logState_o[i]);
     }
 }
 
 template <class SingletonVectorType, class VectorType>
 void DieterichStateUpdater<SingletonVectorType, VectorType>::extractLogState(
-    SingletonVectorType &logState) {
-  logState = alpha;
+    SingletonVectorType &_logState) {
+  _logState = logState;
 }
 
 #endif

src/state/ruinastateupdater.hh

@@ -7,7 +7,7 @@
 template <class SingletonVectorType, class VectorType>
 class RuinaStateUpdater : public StateUpdater<SingletonVectorType, VectorType> {
 public:
-  RuinaStateUpdater(SingletonVectorType _alpha_initial,
+  RuinaStateUpdater(SingletonVectorType _logState_initial,
                     Dune::BitSetVector<1> const &_nodes, double _L);
 
   virtual void nextTimeStep();
@@ -17,7 +17,7 @@ class RuinaStateUpdater : public StateUpdater<SingletonVectorType, VectorType> {
 
 private:
   SingletonVectorType logState_o;
-  SingletonVectorType alpha;
+  SingletonVectorType logState;
   Dune::BitSetVector<1> const &nodes;
   double const L;
   double tau;
@@ -25,13 +25,13 @@ class RuinaStateUpdater : public StateUpdater<SingletonVectorType, VectorType> {
 
 template <class SingletonVectorType, class VectorType>
 RuinaStateUpdater<SingletonVectorType, VectorType>::RuinaStateUpdater(
-    SingletonVectorType _alpha_initial, Dune::BitSetVector<1> const &_nodes,
+    SingletonVectorType _logState_initial, Dune::BitSetVector<1> const &_nodes,
     double _L)
-    : alpha(_alpha_initial), nodes(_nodes), L(_L) {}
+    : logState(_logState_initial), nodes(_nodes), L(_L) {}
 
 template <class SingletonVectorType, class VectorType>
 void RuinaStateUpdater<SingletonVectorType, VectorType>::nextTimeStep() {
-  logState_o = alpha;
+  logState_o = logState;
 }
 
 template <class SingletonVectorType, class VectorType>
@@ -45,14 +45,14 @@ void RuinaStateUpdater<SingletonVectorType, VectorType>::solve(
   for (size_t i = 0; i < nodes.size(); ++i)
     if (nodes[i][0]) {
       double const V = velocity_field[i].two_norm();
-      alpha[i] = state_update_ruina(tau, V * tau / L, logState_o[i]);
+      logState[i] = state_update_ruina(tau, V * tau / L, logState_o[i]);
     }
 }
 
 template <class SingletonVectorType, class VectorType>
 void RuinaStateUpdater<SingletonVectorType, VectorType>::extractLogState(
-    SingletonVectorType &logState) {
-  logState = alpha;
+    SingletonVectorType &_logState) {
+  _logState = logState;
 }
 
 #endif