From e2814a6637b161463af149ed6261c61dd46b805a Mon Sep 17 00:00:00 2001
From: Rafael Ravedutti <rafaelravedutti@gmail.com>
Date: Tue, 20 Feb 2024 16:34:35 +0100
Subject: [PATCH] Fix domain partitioning enum
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
---
runtime/pairs.cpp | 2 ++
runtime/pairs_common.hpp | 6 +++---
src/pairs/sim/domain_partitioners.py | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/runtime/pairs.cpp b/runtime/pairs.cpp
index f4179cb..e78e494 100644
--- a/runtime/pairs.cpp
+++ b/runtime/pairs.cpp
@@ -21,6 +21,8 @@ void PairsSimulation::initDomain(
} else if(dom_part_type == RegularXY) {
const int flags[] = {1, 1, 0};
dom_part = new Regular6DStencil(xmin, xmax, ymin, ymax, zmin, zmax, flags);
+ } else if(dom_part_type == BlockForest) {
+ dom_part = new BlockForest(xmin, xmax, ymin, ymax, zmin, zmax);
} else {
PAIRS_EXCEPTION("Domain partitioning type not implemented!\n");
}
diff --git a/runtime/pairs_common.hpp b/runtime/pairs_common.hpp
index c3cf60d..27ed17a 100644
--- a/runtime/pairs_common.hpp
+++ b/runtime/pairs_common.hpp
@@ -46,9 +46,9 @@ enum Timers {
};
enum DomainPartitioners {
- Regular = 0,
- RegularXY = 1,
- BoxList = 2,
+ RegularPartitioning = 0,
+ RegularXYPartitioning = 1,
+ BlockForestPartitioning = 2
};
#ifdef DEBUG
diff --git a/src/pairs/sim/domain_partitioners.py b/src/pairs/sim/domain_partitioners.py
index b2e6fe2..d99c6cd 100644
--- a/src/pairs/sim/domain_partitioners.py
+++ b/src/pairs/sim/domain_partitioners.py
@@ -5,7 +5,7 @@ class DomainPartitioners:
BlockForest = 2
def c_keyword(layout):
- return "Regular" if layout == DomainPartitioners.Regular else \
- "RegularXY" if layout == DomainPartitioners.RegularXY else \
- "BlockForest" if layout == DomainPartitioners.BlockForest else \
+ return "RegularPartitioning" if layout == DomainPartitioners.Regular else \
+ "RegularXYPartitioning" if layout == DomainPartitioners.RegularXY else \
+ "BlockForestPartitioning" if layout == DomainPartitioners.BlockForest else \
"Invalid"
--
GitLab