Skip to content

Commit

Permalink
update to be compatible to gslib 1.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
stgeke committed Nov 15, 2024
1 parent fdd4d07 commit 221064a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CC ?= mpicc
CFLAGS ?= -Wall -Wextra -Wpedantic -Wno-unused-function -Wno-unused-parameter -std=c99 -g
LDFLAGS ?=
DEBUG ?= 0
MPI ?= 1
UNDERSCORE ?= 1
SYNC_BY_REDUCTION ?= 1
BLAS ?= 0
Expand Down Expand Up @@ -40,9 +39,7 @@ else
CFLAGS += -O2
endif

ifneq ($(MPI),0)
PP += -DMPI
endif
PP += -DPARRSB_MPI

ifneq ($(UNDERSCORE),0)
PP += -DPARRSB_UNDERSCORE
Expand Down
6 changes: 3 additions & 3 deletions src/parRSB.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

#include "gslib.h"

#if !defined(MPI)
#if !defined(GSLIB_USE_MPI)
#error "gslib needs to be compiled with MPI"
#endif

#if !defined(GLOBAL_LONG_LONG)
#if !defined(GSLIB_USE_GLOBAL_LONG_LONG)
#error "gslib needs to be compiled with GLOBAL_LONG_LONG"
#endif

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

#define fparrsb_conn_mesh \
FORTRAN_UNPREFIXED(fparrsb_conn_mesh, FPARRSB_CONN_MESH)
GS_FORTRAN_UNPREFIXED(fparrsb_conn_mesh, FPARRSB_CONN_MESH)
void fparrsb_conn_mesh(long long *vtx, double *coord, int *nel, int *nDim,
long long *periodicInfo, int *nPeriodicFaces,
double *tol, MPI_Fint *fcomm, int *err);
Expand Down
2 changes: 1 addition & 1 deletion src/parrsb.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static void restore_original(int *part, struct crystal *cr, struct array *elist,
}

static void initialize_node_aux(struct comm *c, const struct comm *const gc) {
#ifdef MPI
#ifdef PARRSB_MPI
MPI_Comm node;
MPI_Comm_split_type(gc->c, MPI_COMM_TYPE_SHARED, gc->id, MPI_INFO_NULL,
&node);
Expand Down

0 comments on commit 221064a

Please sign in to comment.