Skip to content
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

Abort if nosplit option used in multimat mode #108

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Abort if nosplit option used in multimat mode #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0853ee1
Update ls-cuttet function to exit if the option nosplit is used
laetitia-m Apr 3, 2024
b03fa0b
Take into account comments from PR + modify return in ls_pmmg.c to be…
laetitia-m Apr 4, 2024
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
57 changes: 35 additions & 22 deletions src/ls_pmmg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh, MMG5_pSol sol, MMG5_p
PMMG_pGrp grp;
MMG5_pSol field;
MMG5_pSol psl;
MMG5_pMat mat;


MMG5_int ne_init,ne_tmp;
MMG5_int k,k0;
MMG5_int ip0,ip1,np,nb,ns,src,refext,refint;
MMG5_int ip0,ip1,np,nb,ns,src,refext,refint,ref;
MMG5_int vGlobNum[4],vx[6];
MMG5_int tetra_sorted[3], node_sorted[3];
MMG5_int *ne_tmp_tab,*vGlobNum_tab;
Expand Down Expand Up @@ -101,12 +103,26 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh, MMG5_pSol sol, MMG5_p
int idx_edge_ext,idx_edge_int,idx_edge_mesh;
int idx_face_ext,idx_face_int,val_face;

if ( parmesh->info.imprim > PMMG_VERB_VERSION )
fprintf(stdout,"\n ## PMMG_cuttet_ls: Multimaterial not supported yet.\n");
if ( parmesh->myrank == parmesh->info.root )
fprintf(stdout,"\n ## PMMG_cuttet_ls: Multimaterial not fully supported yet.\n");

/* Ensure only one group on each proc */
assert(parmesh->ngrp == 1);

/* For now, does not support `nosplit` option in multimat */
// To be removed when supported
for (i=0; i<mesh->info.nmat; i++) {
mat = &mesh->info.mat[i];
ref = mat->ref;
refint = mat->rin;
refext = mat->rex;
if ( (ref == refint) && (ref == refext) ) {
if ( parmesh->myrank == parmesh->info.root )
fprintf(stderr,"\n -- ERROR: The option `nosplit` in multimat is not supported yet.\n");
return 0;
}
}

/* Initialization */
grp = &parmesh->listgrp[0];
field = grp->field;
Expand Down Expand Up @@ -225,7 +241,9 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh, MMG5_pSol sol, MMG5_p
pt = &mesh->tetra[k];
if ( !MG_EOK(pt) ) continue;

// /* Check whether the tetra with reference ref should be split */
/* Check whether the tetra with reference ref should be split */
// For now, the option nosplit is not supported
// So we assume all the elements should be split
// if ( !MMG5_isSplit(mesh,pt->ref,&refint,&refext) ) continue;

/** Step 4.1 - Identification of edges belonging to a required tet */
Expand Down Expand Up @@ -498,7 +516,9 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh, MMG5_pSol sol, MMG5_p
if ( np>0 ) continue;

/* Check whether an entity with reference ref should be split */
if ( !MMG5_isSplit(mesh,pt->ref,&refint,&refext) ) continue;
// For now, the option nosplit is not supported
// So we assume all the elements should be split
// if ( !MMG5_isSplit(mesh,pt->ref,&refint,&refext) ) continue;

/* STEP 5.2.1 - Create a new point if this edge needs to be split */
/* Check the ls value at the edge nodes */
Expand Down Expand Up @@ -642,10 +662,8 @@ int PMMG_cuttet_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh, MMG5_pSol sol, MMG5_p
/** STEP 6 - Split according to tets flags */
/** STEP 6.1 - Compute global node vertices */
if ( !PMMG_Compute_verticesGloNum( parmesh,parmesh->comm ) ) {
if ( parmesh->info.imprim > PMMG_VERB_VERSION ) {
fprintf(stdout,"\n\n\n -- WARNING: IMPOSSIBLE TO COMPUTE NODE GLOBAL NUMBERING\n\n\n");
PMMG_RETURN_AND_FREE( parmesh, PMMG_LOWFAILURE );
}
fprintf(stderr,"\n\n\n -- WARNING: IMPOSSIBLE TO COMPUTE NODE GLOBAL NUMBERING\n\n\n");
return 0;
}

/** STEP 6.2 - Do the splitting for tetra on parallel interface */
Expand Down Expand Up @@ -1606,27 +1624,21 @@ int PMMG_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh,MMG5_pSol sol,MMG5_pSol met)
/* Compute vertices global numerotation
This step is needed to compute the edge communicator */
if ( !PMMG_Compute_verticesGloNum( parmesh,parmesh->info.read_comm ) ) {
if ( parmesh->info.imprim > PMMG_VERB_VERSION ) {
fprintf(stdout,"\n\n\n -- WARNING: IMPOSSIBLE TO COMPUTE NODE GLOBAL NUMBERING\n\n\n");
PMMG_RETURN_AND_FREE( parmesh, PMMG_LOWFAILURE );
}
fprintf(stderr,"\n\n\n -- WARNING: IMPOSSIBLE TO COMPUTE NODE GLOBAL NUMBERING\n\n\n");
return 0;
}

/* Hash parallel edges
This step is needed to compute the edge communicator */
if( PMMG_hashPar_pmmg( parmesh,&hpar ) != PMMG_SUCCESS ) {
if ( parmesh->info.imprim > PMMG_VERB_VERSION ) {
fprintf(stdout,"\n\n\n -- WARNING: Impossible to compute the hash parallel edge \n\n\n");
PMMG_RETURN_AND_FREE( parmesh, PMMG_LOWFAILURE );
}
fprintf(stderr,"\n\n\n -- WARNING: Impossible to compute the hash parallel edge \n\n\n");
return 0;
}

/* Build edge communicator */
if( !PMMG_build_edgeComm( parmesh,mesh,&hpar,parmesh->info.read_comm ) ) {
if ( parmesh->info.imprim > PMMG_VERB_VERSION ) {
fprintf(stdout,"\n\n\n -- WARNING: Impossible to build edge communicator \n\n\n");
PMMG_RETURN_AND_FREE( parmesh, PMMG_LOWFAILURE );
}
fprintf(stderr,"\n\n\n -- WARNING: Impossible to build edge communicator \n\n\n");
return 0;
}

#ifndef NDEBUG
Expand All @@ -1635,7 +1647,8 @@ int PMMG_ls(PMMG_pParMesh parmesh, MMG5_pMesh mesh,MMG5_pSol sol,MMG5_pSol met)

/** Discretization of the implicit function - Cut tetra */
if ( !PMMG_cuttet_ls(parmesh,mesh,sol,met) ) {
fprintf(stderr,"\n ## Problem in discretizing implicit function. Exit program.\n");
if ( parmesh->myrank == parmesh->info.root )
fprintf(stderr,"\n ## Problem in discretizing implicit function. Exit program.\n");
return 0;
}

Expand Down
Loading