Skip to content

Add support for SCOTCH 7 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Algiane merged 1 commit into from
Apr 15, 2022
Merged

Add support for SCOTCH 7 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/common/librnbg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ int MMG5_kPartBoxCompute(SCOTCH_Graph *graf, int vertNbr, int boxVertNbr,

/* Initializing SCOTCH functions */
CHECK_SCOTCH(SCOTCH_stratInit(&strat), "scotch_stratInit", 0) ;
if ( SCOTCH_6 ) {
if ( SCOTCH_6 || SCOTCH_7 ) {
CHECK_SCOTCH(SCOTCH_archCmplt(&arch, boxNbr), "scotch_archCmplt", 0) ;
}
else {
Expand All @@ -87,7 +87,7 @@ int MMG5_kPartBoxCompute(SCOTCH_Graph *graf, int vertNbr, int boxVertNbr,
}


if ( SCOTCH_6 ) {
if ( SCOTCH_6 || SCOTCH_7 ) {
// Looking for the max value in sortPartTb and computing sortPartTb as
// followed :
// - sortPartTb[2i] is the box value
Expand Down Expand Up @@ -237,7 +237,7 @@ int MMG5_scotchCall(MMG5_pMesh mesh, MMG5_pSol met,
/*check enough vertex to renum*/
if ( mesh->info.renum && (mesh->np/2. > MMG5_BOXSIZE) ) {

if ( (SCOTCH_5 && SCOTCH_6 ) || ( (!SCOTCH_5) && (!SCOTCH_6) ) ) {
if ( (SCOTCH_5 && SCOTCH_6 && SCOTCH_7 ) || ( (!SCOTCH_5) && (!SCOTCH_6) && (!SCOTCH_7) ) ) {
if ( !mmgWarn ) {
fprintf(stderr,"\n ## Warning: %s: fail to determine scotch version."
" No renumbering.\n",__func__);
Expand Down
2 changes: 2 additions & 0 deletions src/common/librnbg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

#define SCOTCH_6 !strcmp(TOSTRING(SCOTCH_VERSION),"6")

#define SCOTCH_7 !strcmp(TOSTRING(SCOTCH_VERSION),"7")

#define CHECK_SCOTCH(t,m,e) if(0!=t){perror(m);return e;}

typedef struct MeshGraphHash_ {
Expand Down