Skip to content

Commit 807ddd4

Browse files
committed
Fixes for parRSB API changes
1 parent 47a9ce6 commit 807ddd4

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

3rd_party/nek5000/core/partitioner.c

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ void fpartmesh(int *nell, long long *el, long long *vl, double *xyz,
335335
if (*loglevel > 2)
336336
print_part_stat(vl, nel, nv, cext);
337337

338-
ierr = parrsb_part_mesh(part, vl, xyz, NULL, nel, nv, &options, comm.c);
338+
ierr = parrsb_part_mesh(part, vl, xyz, nel, nv, options, comm.c);
339339
if (ierr != 0)
340340
goto err;
341341

@@ -370,42 +370,6 @@ void fpartmesh(int *nell, long long *el, long long *vl, double *xyz,
370370
*rtval = 1;
371371
}
372372

373-
#define fpartmesh_greedy FORTRAN_UNPREFIXED(fpartmesh_greedy, FPARTMESH_GRREDY)
374-
375-
void fpartmesh_greedy(int *const nel2, long long *const el2,
376-
long long *const vl2, const int *const nel1,
377-
const long long *const vl1, const int *const lelm_,
378-
const int *const nv, const int *const fcomm,
379-
int *const rtval) {
380-
#if defined(PARRSB)
381-
const int lelm = *lelm_;
382-
383-
struct comm comm;
384-
#if defined(MPI)
385-
comm_ext cext = MPI_Comm_f2c(*fcomm);
386-
#else
387-
comm_ext cext = 0;
388-
#endif
389-
comm_init(&comm, cext);
390-
391-
int *const part = (int *)malloc(lelm * sizeof(int));
392-
parrsb_part_solid(part, vl2, *nel2, vl1, *nel1, *nv, comm.c);
393-
394-
int ierr = redistribute_data(nel2, vl2, el2, part, *nv, lelm, &comm);
395-
if (ierr != 0)
396-
goto err;
397-
*rtval = 0;
398-
399-
free(part);
400-
comm_free(&comm);
401-
return;
402-
403-
err:
404-
fflush(stdout);
405-
*rtval = 1;
406-
#endif
407-
}
408-
409373
#define fprintpartstat FORTRAN_UNPREFIXED(printpartstat, PRINTPARTSTAT)
410374

411375
void fprintpartstat(long long *vtx, int *nel, int *nv, int *comm) {

cmake/nek5000.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ set(PARRSB_DIR ${NEK5000_SOURCE_DIR}/3rd_party/parRSB/parRSB)
7171
FetchContent_Declare(
7272
parrsb_content
7373
GIT_REPOSITORY https://github.com/thilinarmtb/parRSB.git
74-
GIT_TAG reorder_dofs
74+
GIT_TAG reorder_dofs_v2
7575
SOURCE_DIR ${PARRSB_DIR}
7676
)
7777
FetchContent_GetProperties(parrsb_content)

0 commit comments

Comments
 (0)