Skip to content

Commit 221064a

Browse files
committed
update to be compatible to gslib 1.0.9
1 parent fdd4d07 commit 221064a

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ CC ?= mpicc
22
CFLAGS ?= -Wall -Wextra -Wpedantic -Wno-unused-function -Wno-unused-parameter -std=c99 -g
33
LDFLAGS ?=
44
DEBUG ?= 0
5-
MPI ?= 1
65
UNDERSCORE ?= 1
76
SYNC_BY_REDUCTION ?= 1
87
BLAS ?= 0
@@ -40,9 +39,7 @@ else
4039
CFLAGS += -O2
4140
endif
4241

43-
ifneq ($(MPI),0)
44-
PP += -DMPI
45-
endif
42+
PP += -DPARRSB_MPI
4643

4744
ifneq ($(UNDERSCORE),0)
4845
PP += -DPARRSB_UNDERSCORE

src/parRSB.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#include "gslib.h"
55

6-
#if !defined(MPI)
6+
#if !defined(GSLIB_USE_MPI)
77
#error "gslib needs to be compiled with MPI"
88
#endif
99

10-
#if !defined(GLOBAL_LONG_LONG)
10+
#if !defined(GSLIB_USE_GLOBAL_LONG_LONG)
1111
#error "gslib needs to be compiled with GLOBAL_LONG_LONG"
1212
#endif
1313

@@ -64,7 +64,7 @@ int parrsb_conn_mesh(long long *vtx, double *coord, uint nel, unsigned nDim,
6464
MPI_Comm comm);
6565

6666
#define fparrsb_conn_mesh \
67-
FORTRAN_UNPREFIXED(fparrsb_conn_mesh, FPARRSB_CONN_MESH)
67+
GS_FORTRAN_UNPREFIXED(fparrsb_conn_mesh, FPARRSB_CONN_MESH)
6868
void fparrsb_conn_mesh(long long *vtx, double *coord, int *nel, int *nDim,
6969
long long *periodicInfo, int *nPeriodicFaces,
7070
double *tol, MPI_Fint *fcomm, int *err);

src/parrsb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static void restore_original(int *part, struct crystal *cr, struct array *elist,
184184
}
185185

186186
static void initialize_node_aux(struct comm *c, const struct comm *const gc) {
187-
#ifdef MPI
187+
#ifdef PARRSB_MPI
188188
MPI_Comm node;
189189
MPI_Comm_split_type(gc->c, MPI_COMM_TYPE_SHARED, gc->id, MPI_INFO_NULL,
190190
&node);

0 commit comments

Comments
 (0)