From 4e8535f4a10f03090651c887cf9cf47850b84b7e Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan@moebiusband.org>
Date: Mon, 15 Jan 2024 06:55:05 +0100
Subject: [PATCH] Fix bugs
---
BasicSolver/3D-mpi/include_ICC.mk | 2 +-
BasicSolver/3D-mpi/src/comm.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BasicSolver/3D-mpi/include_ICC.mk b/BasicSolver/3D-mpi/include_ICC.mk
index 8f3a1fb..6bedf55 100644
--- a/BasicSolver/3D-mpi/include_ICC.mk
+++ b/BasicSolver/3D-mpi/include_ICC.mk
@@ -15,6 +15,6 @@ endif
VERSION = --version
CFLAGS = -O3 -xHost -qopt-zmm-usage=high -std=c99 $(OPENMP)
LFLAGS = $(OPENMP)
-DEFINES = -D_GNU_SOURCE
+DEFINES += -D_GNU_SOURCE# -DDEBUG
INCLUDES =
LIBS =
diff --git a/BasicSolver/3D-mpi/src/comm.c b/BasicSolver/3D-mpi/src/comm.c
index fb8f519..dbee6b7 100644
--- a/BasicSolver/3D-mpi/src/comm.c
+++ b/BasicSolver/3D-mpi/src/comm.c
@@ -445,7 +445,7 @@ void commCollectResult(Comm* c,
for (int k = 1; k < kmaxLocal + 1; k++) {
for (int j = 1; j < jmaxLocal + 1; j++) {
for (int i = 1; i < imaxLocal + 1; i++) {
- pg[idx++] = G(s->p, i, j, k);
+ pg[idx++] = G(p, i, j, k);
}
}
}
@@ -455,7 +455,7 @@ void commCollectResult(Comm* c,
for (int k = 1; k < kmaxLocal + 1; k++) {
for (int j = 1; j < jmaxLocal + 1; j++) {
for (int i = 1; i < imaxLocal + 1; i++) {
- ug[idx++] = (G(s->u, i, j, k) + G(s->u, i - 1, j, k)) / 2.0;
+ ug[idx++] = (G(u, i, j, k) + G(u, i - 1, j, k)) / 2.0;
}
}
}
@@ -465,7 +465,7 @@ void commCollectResult(Comm* c,
for (int k = 1; k < kmaxLocal + 1; k++) {
for (int j = 1; j < jmaxLocal + 1; j++) {
for (int i = 1; i < imaxLocal + 1; i++) {
- vg[idx++] = (G(s->v, i, j, k) + G(s->v, i, j - 1, k)) / 2.0;
+ vg[idx++] = (G(v, i, j, k) + G(v, i, j - 1, k)) / 2.0;
}
}
}
@@ -475,7 +475,7 @@ void commCollectResult(Comm* c,
for (int k = 1; k < kmaxLocal + 1; k++) {
for (int j = 1; j < jmaxLocal + 1; j++) {
for (int i = 1; i < imaxLocal + 1; i++) {
- wg[idx++] = (G(s->w, i, j, k) + G(s->w, i, j, k - 1)) / 2.0;
+ wg[idx++] = (G(w, i, j, k) + G(w, i, j, k - 1)) / 2.0;
}
}
}