From 7c870f03118ace6b089dd0222e508f28fceef18d Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 8 Feb 2016 13:36:18 +0100
Subject: [PATCH] Introduce a separate 'dimworld' variable
You never know, we may be doing dim!=dimworld grids eventually.
---
src/gradient-flow.cc | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 562ae3e5..02dc2723 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -47,6 +47,7 @@
// grid dimension
const int dim = 1;
+const int dimworld = dim;
// Image space of the geodesic fe functions
// typedef Rotation<double,2> TargetSpace;
@@ -115,13 +116,13 @@ int main (int argc, char *argv[]) try
typedef std::conditional<dim==1,OneDGrid,UGGrid<dim> >::type GridType;
std::shared_ptr<GridType> grid;
- FieldVector<double,dim> lower(0), upper(1);
+ FieldVector<double,dimworld> lower(0), upper(1);
std::array<unsigned int,dim> elements;
if (parameterSet.get<bool>("structuredGrid"))
{
- lower = parameterSet.get<FieldVector<double,dim> >("lower");
- upper = parameterSet.get<FieldVector<double,dim> >("upper");
+ lower = parameterSet.get<FieldVector<double,dimworld> >("lower");
+ upper = parameterSet.get<FieldVector<double,dimworld> >("upper");
elements = parameterSet.get<array<unsigned int,dim> >("elements");
grid = StructuredGridFactory<GridType>::createCubeGrid(lower, upper, elements);
@@ -162,7 +163,7 @@ int main (int argc, char *argv[]) try
////////////////////////////
// Read initial iterate into a PythonFunction
- typedef PythonFunction<FieldVector<double, dim>, TargetSpace::CoordinateType> FBase;
+ typedef PythonFunction<FieldVector<double, dimworld>, TargetSpace::CoordinateType> FBase;
Python::Module module = Python::import(parameterSet.get<std::string>("initialIterate"));
auto pythonInitialIterate = module.get("f").toC<std::shared_ptr<FBase>>();
--
GitLab