dim -> dims

src/one-body-sample.org

@@ -14,11 +14,11 @@
 #+begin_src c++
   {
     double volume = 1.0;
-    for (int i=0; i<dim; ++i)
+    for (int i=0; i<dims; ++i)
       volume *= (upperRight[i] - lowerLeft[i]);
 
     double area = 1.0;
-    for (int i=0; i<dim; ++i)
+    for (int i=0; i<dims; ++i)
       if (i != 1)
         area *= (upperRight[i] - lowerLeft[i]);
 
@@ -54,20 +54,20 @@
 #+name: setupBoundary
 #+begin_src c++
   {
-    typedef typename GridView::template Codim<dim>::Iterator VertexLeafIterator;
+    typedef typename GridView::template Codim<dims>::Iterator VertexLeafIterator;
   
     Dune::MultipleCodimMultipleGeomTypeMapper
       <GridView, Dune::MCMGVertexLayout> const myVertexMapper(leafView);
   
-    for (auto it = leafView.template begin<dim>();
-         it != leafView.template end<dim>();
+    for (auto it = leafView.template begin<dims>();
+         it != leafView.template end<dims>();
          ++it) {
       assert(it->geometry().corners() == 1);
-      Dune::FieldVector<double, dim> const coordinates = it->geometry().corner(0);
+      Dune::FieldVector<double, dims> const coordinates = it->geometry().corner(0);
       size_t const id = myVertexMapper.map(*it);
   
       // Find the center of the lower face
-      switch (dim) {
+      switch (dims) {
       case 3:
         if (coordinates[2] != lowerLeft[2])
           break;
@@ -169,13 +169,13 @@
 * Functions
 #+name: defineInitTimeStepper
 #+begin_src c++
-  template<class VectorType, class MatrixType, class FunctionType, int dim>
+  template<class VectorType, class MatrixType, class FunctionType, int dims>
   Dune::shared_ptr
   <TimeSteppingScheme
-   <VectorType,MatrixType,FunctionType,dim> >
+   <VectorType,MatrixType,FunctionType,dims> >
   initTimeStepper(Config::scheme scheme,
                   FunctionType const &dirichletFunction,
-                  Dune::BitSetVector<dim> const &ignoreNodes,
+                  Dune::BitSetVector<dims> const &ignoreNodes,
                   MatrixType const &massMatrix, MatrixType const &stiffnessMatrix,
                   VectorType const &u_initial,
                   VectorType const &ud_initial,
@@ -184,14 +184,14 @@
     switch (scheme) {
     case Config::ImplicitTwoStep:
       return Dune::make_shared<ImplicitTwoStep<VectorType,MatrixType,
-                                               FunctionType,dim> >
+                                               FunctionType,dims> >
         (stiffnessMatrix, u_initial, ud_initial, ignoreNodes, dirichletFunction);
     case Config::ImplicitEuler:
       return Dune::make_shared<ImplicitEuler<VectorType,MatrixType,
-                                             FunctionType,dim> >
+                                             FunctionType,dims> >
         (stiffnessMatrix, u_initial, ud_initial, ignoreNodes, dirichletFunction);
     case Config::Newmark:
-      return Dune::make_shared <Newmark <VectorType,MatrixType,FunctionType,dim> >
+      return Dune::make_shared <Newmark <VectorType,MatrixType,FunctionType,dims> >
         (stiffnessMatrix, massMatrix, u_initial, ud_initial, udd_initial,
          ignoreNodes, dirichletFunction);
     }
@@ -244,8 +244,8 @@
       (srcdir "/one-body-sample.parset", parset);
     Dune::ParameterTreeParser::readOptions(argc, argv, parset);
   
-    typedef Dune::FieldVector<double, dim> SmallVector;
-    typedef Dune::FieldMatrix<double, dim, dim> SmallMatrix;
+    typedef Dune::FieldVector<double, dims> SmallVector;
+    typedef Dune::FieldMatrix<double, dims, dims> SmallMatrix;
     typedef Dune::BCRSMatrix<SmallMatrix> MatrixType;
     typedef Dune::BlockVector<SmallVector> VectorType;
     typedef Dune::BlockVector<Dune::FieldVector<double,1> > SingletonVectorType;
@@ -259,15 +259,15 @@
     auto const L = parset.get<double>("boundary.friction.L");
   
     // {{{ Set up grid
-    typedef Dune::ALUGrid<dim, dim, Dune::simplex, Dune::nonconforming>
+    typedef Dune::ALUGrid<dims, dims, Dune::simplex, Dune::nonconforming>
       GridType;
   
-    Dune::FieldVector<typename GridType::ctype, dim> lowerLeft(0);
-    Dune::FieldVector<typename GridType::ctype, dim> upperRight(1);
+    Dune::FieldVector<typename GridType::ctype, dims> lowerLeft(0);
+    Dune::FieldVector<typename GridType::ctype, dims> upperRight(1);
     upperRight[0] = parset.get<size_t>("body.width");
     upperRight[1] = parset.get<size_t>("body.height");
   
-    Dune::array<unsigned int, dim> elements;
+    Dune::array<unsigned int, dims> elements;
     std::fill(elements.begin(), elements.end(), 1);
     elements[0] = parset.get<size_t>("body.width");
     elements[1] = parset.get<size_t>("body.height");
@@ -277,7 +277,7 @@
   
     auto const refinements = parset.get<size_t>("grid.refinements");
     grid->globalRefine(refinements);
-    size_t const finestSize = grid->size(grid->maxLevel(), dim);
+    size_t const finestSize = grid->size(grid->maxLevel(), dims);
   
     typedef GridType::LeafGridView GridView;
     GridView const leafView = grid->leafView();
@@ -291,7 +291,7 @@
   
     // Set up the boundary
     size_t specialNode = finestSize;
-    Dune::BitSetVector<dim> ignoreNodes(finestSize, false);
+    Dune::BitSetVector<dims> ignoreNodes(finestSize, false);
     Dune::BitSetVector<1> neumannNodes(finestSize, false);
     Dune::BitSetVector<1> frictionalNodes(finestSize, false);
     <<setupBoundary>>;
@@ -339,7 +339,7 @@
     auto const solver_tolerance = parset.get<double>("solver.tolerance");
     typedef MyConvexProblem<MatrixType, VectorType> MyConvexProblemType;
     typedef MyBlockProblem<MyConvexProblemType> MyBlockProblemType;
-    MySolver<dim, MatrixType, VectorType, GridType, MyBlockProblemType>
+    MySolver<dims, MatrixType, VectorType, GridType, MyBlockProblemType>
       mySolver(parset.sub("solver.tnnmg"), refinements, solver_tolerance,
                ,*grid, ignoreNodes);
   
@@ -534,7 +534,7 @@
   #include "state/ruinastateupdater.hh"
   #include "state/dieterichstateupdater.hh"
   
-  int const dim = DIM;
+  int const dims = DIM;
   
   <<defineInitTimeStepper>>
   <<defineInitStateUpdater>>