iMesh_getNumEntSets() has changed the definition of num_hops

jedbrown · Mar 9, 2011 · 97f9ab8 · 97f9ab8
1 parent 6bca9a1
commit 97f9ab8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/fs/impls/cont/cont.c b/src/fs/impls/cont/cont.c
@@ -296,10 +296,10 @@ static dErr dFSBuildSpace_Cont(dFS fs)
     iMesh_rmvEntArrFromSet(mi,ents+ghstart,ents_s-ghstart,fs->set.explicit,&ierr);dICHK(mi,ierr);
     iMesh_addEntArrToSet(mi,ents+ghstart,ents_s-ghstart,fs->set.ghost,&ierr);dICHK(mi,ierr);
     /* Move owned Dirichlet ents from \a explicitSet to \a dirichletSet */
-    err = dMeshGetNumSubsets(mesh,fs->set.boundaries,1,&nboundaries);dCHK(err);
+    err = dMeshGetNumSubsets(mesh,fs->set.boundaries,0,&nboundaries);dCHK(err);
     if (!nboundaries) goto after_boundaries;
     err = dMallocA2(nboundaries,&bdysets,nboundaries,&bstat);dCHK(err);
-    err = dMeshGetSubsets(mesh,fs->set.boundaries,1,bdysets,nboundaries,NULL);dCHK(err);
+    err = dMeshGetSubsets(mesh,fs->set.boundaries,0,bdysets,nboundaries,NULL);dCHK(err);
     err = dMeshTagSGetData(mesh,fs->tag.bstatus,bdysets,nboundaries,bstat,nboundaries,dDATA_INT);dCHK(err);
     for (int i=0; i<nboundaries; i++) {
       if (bstat[i] & dFSBSTATUS_DIRICHLET) {

diff --git a/src/fs/interface/fsgeom.c b/src/fs/interface/fsgeom.c
@@ -291,9 +291,9 @@ dErr dFSRedimension(dFS fs,dInt bs,dFSClosureMode mode,dFS *infs)
   case dFS_INTERIOR: {
     dMeshESH *bsets;
     dInt nsets;
-    err = dMeshGetNumSubsets(fs->mesh,fs->set.boundaries,1,&nsets);dCHK(err);
+    err = dMeshGetNumSubsets(fs->mesh,fs->set.boundaries,0,&nsets);dCHK(err);
     err = dMallocA(nsets,&bsets);dCHK(err);
-    err = dMeshGetSubsets(fs->mesh,fs->set.boundaries,1,bsets,nsets,NULL);dCHK(err);dCHK(err);
+    err = dMeshGetSubsets(fs->mesh,fs->set.boundaries,0,bsets,nsets,NULL);dCHK(err);dCHK(err);
     for (dInt i=0; i<nsets; i++) {
       dFSBStatus bstat;
       err = dMeshTagSGetData(fs->mesh,fs->tag.bstatus,&bsets[i],1,&bstat,sizeof(bstat),dDATA_BYTE);dCHK(err);

diff --git a/src/fs/mesh/impls/pack/pack.c b/src/fs/mesh/impls/pack/pack.c
@@ -559,7 +559,7 @@ static dErr dMeshLoad_Pack(dMesh mesh)
 
   /* Get the interface sets */
   iMesh_getTagHandle(mi,PARALLEL_STATUS_TAG_NAME,&pstatusTag,&err,strlen(PARALLEL_STATUS_TAG_NAME));dICHK(mi,err);
-  iMesh_getNumEntSets(mi,mesh->root,1,&nallset,&err);dICHK(mi,err);
+  iMesh_getNumEntSets(mi,mesh->root,0,&nallset,&err);dICHK(mi,err);
   {
     dInt alloc = nallset;
     err = dMalloc(nallset*sizeof(dMeshESH),&allset);dCHK(err);

diff --git a/src/fs/mesh/interface/mesh.c b/src/fs/mesh/interface/mesh.c
@@ -599,6 +599,7 @@ dErr dMeshGetNumSubsets(dMesh mesh,dMeshESH set,dInt hops,dInt *nsubsets)
   dFunctionBegin;
   dValidHeader(mesh,dMESH_CLASSID,1);
   dValidPointer(nsubsets,4);
+  *nsubsets = -1;
   iMesh_getNumEntSets(mesh->mi,set,hops,&n,&ierr);dICHK(mesh->mi,ierr);
   *nsubsets = n;
   dFunctionReturn(0);