From 60b50a65452e93476206d5bfe659feb6ad273bd0 Mon Sep 17 00:00:00 2001
From: Christian Engwer <christi@dune-project.org>
Date: Fri, 30 Sep 2005 13:39:22 +0000
Subject: [PATCH] Don't use DIM and DIM_OF_WORLD
[[Imported from SVN: r2996]]
---
fem/test/test-fem-alberta.cc | 11 +++++++----
grid/test/test-alberta.cc | 9 ++++++---
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fem/test/test-fem-alberta.cc b/fem/test/test-fem-alberta.cc
index 09751d841..fe21b7b29 100644
--- a/fem/test/test-fem-alberta.cc
+++ b/fem/test/test-fem-alberta.cc
@@ -6,7 +6,7 @@
Instantiate Alberta-Grid and feed it to the generic femcheck()
- Note: Albert needs the defines DIM and DIM_OF_WORLD on the
+ Note: Albert needs the defines DUNE_PROBLEM_DIM and DUNE_WORLD_DUNE_PROBLEM_DIM on the
commandline anyway thus we can use them to select the correct class
*/
@@ -22,15 +22,18 @@ int main () {
try {
/* use grid-file appropriate for dimensions */
std::ostringstream filename;
- filename << "alberta-testgrid-" << DIM << "-" << DIM_OF_WORLD << ".al";
+ filename << "alberta-testgrid-" << DUNE_PROBLEM_DIM
+ << "-" << DUNE_WORLD_DUNE_PROBLEM_DIM << ".al";
- std::cout << std::endl << "AlbertaGrid<" << DIM << "," << DIM_OF_WORLD
+ std::cout << std::endl << "AlbertaGrid<" << DUNE_PROBLEM_DIM
+ << "," << DUNE_WORLD_DUNE_PROBLEM_DIM
<< "> with grid file: " << filename.str()
<< std::endl << std::endl;
// extra-environment to check destruction
{
- Dune::AlbertaGrid<DIM,DIM_OF_WORLD> grid(filename.str().c_str());
+ Dune::AlbertaGrid<DUNE_PROBLEM_DIM,DUNE_WORLD_DUNE_PROBLEM_DIM>
+ grid(filename.str().c_str());
for(int i=0; i<3; i++)
{
grid.globalRefine(1);
diff --git a/grid/test/test-alberta.cc b/grid/test/test-alberta.cc
index e994ba734..ba3d1cff8 100644
--- a/grid/test/test-alberta.cc
+++ b/grid/test/test-alberta.cc
@@ -22,16 +22,19 @@ int main () {
try {
/* use grid-file appropriate for dimensions */
std::ostringstream filename;
- filename << "alberta-testgrid-" << DIM << "-" << DIM_OF_WORLD << ".al";
+ filename << "alberta-testgrid-" << DUNE_PROBLEM_DIM
+ << "-" << DUNE_WORLD_DIM << ".al";
- std::cout << std::endl << "AlbertaGrid<" << DIM << "," << DIM_OF_WORLD
+ std::cout << std::endl << "AlbertaGrid<" << DUNE_PROBLEM_DIM
+ << "," << DUNE_WORLD_DIM
<< "> with grid file: " << filename.str()
<< std::endl << std::endl;
// extra-environment to check destruction
{
factorEpsilon = 500.0;
- Dune::AlbertaGrid<DIM,DIM_OF_WORLD> grid(filename.str().c_str());
+ Dune::AlbertaGrid<DUNE_PROBLEM_DIM,DUNE_WORLD_DIM>
+ grid(filename.str().c_str());
for(int i=0; i<3; i++)
{
grid.globalRefine(1);
--
GitLab