From db986e47910587ad3af05b7788a086d52d374662 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Tue, 16 Feb 2016 18:27:24 +0100
Subject: [PATCH] modified poissonSolver main
---
HySoP/src/hysop++/main/poissonSolver.cpp | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/HySoP/src/hysop++/main/poissonSolver.cpp b/HySoP/src/hysop++/main/poissonSolver.cpp
index 59cd79961..3ad9b5453 100644
--- a/HySoP/src/hysop++/main/poissonSolver.cpp
+++ b/HySoP/src/hysop++/main/poissonSolver.cpp
@@ -39,6 +39,18 @@ std::function<T(T)> func(std::size_t k) {
}
}
+std::string bdsToStr(domain::Boundary bd) {
+ switch(bd) {
+ case(NONE): return "None ";
+ case(PERIODIC) : return "Periodic ";
+ case(HOMOGENEOUS_NEUMANN): return "Hom_Neum. ";
+ case(HOMOGENEOUS_DIRICHLET): return "Hom_Diric.";
+ case(NEUMANN): return "Neumann ";
+ case(DIRICHLET): return "Dirichlet ";
+ }
+ return "";
+}
+
template <typename T, std::size_t Dim, bool verbose=false>
void test(bool includePeriodicBds=false) {
Shape<Dim> shape;
@@ -114,8 +126,8 @@ void test(bool includePeriodicBds=false) {
std::stringstream ss;
ss << "[";
for (std::size_t k=0; k<Dim-1; k++)
- ss << bdsConfig[k].first << "/" << bdsConfig[k].second << ",";
- ss << bdsConfig[Dim-1].first << "/" << bdsConfig[Dim-1].second;
+ ss << bdsToStr(bdsConfig[k].first) << "/" << bdsToStr(bdsConfig[k].second) << ",";
+ ss << bdsToStr(bdsConfig[Dim-1].first) << "/" << bdsToStr(bdsConfig[Dim-1].second);
ss << "]";
const auto dist = out.distance(ref);
@@ -155,11 +167,11 @@ void test(bool includePeriodicBds=false) {
int main(int argc, const char *argv[]) {
std::cout << "== TEST 1D - float ==";
- test<float,1,true>(true);
+ test<float,1,true>();
std::cout << "== TEST 2D - float ==";
- test<float,2,false>();
+ test<float,2,true>();
std::cout << "== TEST 3D - float ==";
- test<float,3,false>();
+ test<float,3,true>();
std::cout << std::endl;
std::cout << "== TEST 1D - double ==";
--
GitLab