From a4bae8cf8e1ef153956a99f8e3560b7387ffd4ce Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Mon, 6 May 2019 11:15:37 +0200
Subject: [PATCH] replace deprecated AMDiS::init and finalize with Environment
---
bin/amdisproject | 4 +---
doc/Mainpage.md | 3 +--
examples/surface.cc | 3 +--
test/HybridSizeTest.cpp | 3 +--
test/ProblemStatTest.cpp | 3 +--
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/bin/amdisproject b/bin/amdisproject
index 22aff564..3f65d3c9 100755
--- a/bin/amdisproject
+++ b/bin/amdisproject
@@ -528,11 +528,9 @@ cat> "$PROJECT/src/$MODULE.cpp" << CC_DELIM
using namespace AMDiS;
int main(int argc, char** argv)
{
- AMDiS::init(argc, argv);
+ Environment env(argc, argv);
// your code comes here
-
- AMDiS::finalize();
}
CC_DELIM
diff --git a/doc/Mainpage.md b/doc/Mainpage.md
index 46adb2a7..6b4b2f78 100644
--- a/doc/Mainpage.md
+++ b/doc/Mainpage.md
@@ -31,7 +31,7 @@ using Traits = LagrangeBasis<Grid::LeafGridView, 1>;
int main(int argc, char* argv[])
{
// Initialize linear-algebra backend and read parameters from file
- AMDiS::init(argc, argv);
+ Environment env(argc, argv);
// Create a problem class containing all data for assembling
ProblemStat<Traits> prob("poisson");
@@ -56,7 +56,6 @@ int main(int argc, char* argv[])
AdaptStationary adapt("adapt", prob);
adapt.adapt();
- AMDiS::finalize();
return 0;
}
~~~~~~~~~~~~~~~
diff --git a/examples/surface.cc b/examples/surface.cc
index 51484ac4..7de309bc 100644
--- a/examples/surface.cc
+++ b/examples/surface.cc
@@ -30,7 +30,7 @@ struct UnitRadius
// solve the equation -laplace(u) - k^2 u = f on the sphere
int main(int argc, char** argv)
{
- AMDiS::init(argc, argv);
+ Environment env(argc, argv);
std::string gridName = Parameters::get<std::string>("surface->mesh").value();
std::string gridFileName = Parameters::get<std::string>(gridName + "->macro file name").value();
@@ -59,6 +59,5 @@ int main(int argc, char** argv)
prob.writeFiles(adaptInfo);
- AMDiS::finalize();
return 0;
}
diff --git a/test/HybridSizeTest.cpp b/test/HybridSizeTest.cpp
index 5335f00c..1a270382 100644
--- a/test/HybridSizeTest.cpp
+++ b/test/HybridSizeTest.cpp
@@ -57,7 +57,7 @@ struct NotAccessible {};
int main(int argc, char** argv)
{
- AMDiS::init(argc, argv);
+ Environment env(argc, argv);
Vec1 vec1;
Vec2 vec2;
@@ -90,6 +90,5 @@ int main(int argc, char** argv)
static_assert(VALUE(r) == 1, "");
static_assert(VALUE(c) == 1, "");
- AMDiS::finalize();
return 0;
}
diff --git a/test/ProblemStatTest.cpp b/test/ProblemStatTest.cpp
index 9ad40cb9..d4fa6a49 100644
--- a/test/ProblemStatTest.cpp
+++ b/test/ProblemStatTest.cpp
@@ -25,12 +25,11 @@ void test()
int main(int argc, char** argv)
{
- AMDiS::init(argc, argv);
+ Environment env(argc, argv);
test<float>();
test<double>();
test<long double>();
- AMDiS::finalize();
return 0;
}
--
GitLab