Factor out dFSBuildSpaceVectors_Private

jedbrown · Apr 13, 2011 · 6057ed7 · 6057ed7
1 parent 11697bc
commit 6057ed7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/include/dohpfsimpl.h b/include/dohpfsimpl.h
@@ -151,6 +151,7 @@ struct _p_dFSRotation {
 
 extern dErr dFSCreateLocalToGlobal_Private(dFS fs,dInt n,dInt nc,dInt ngh,dInt *ghidx,dInt rstart);
 extern dErr dFSBuildSpaceOffsets_Private(dFS fs,dMeshTag indexTag,const dInt inodes[],dInt rstart,dInt crstart,dInt nents,dMeshEH ents[],dInt *ghstart);
+extern dErr dFSBuildSpaceVectors_Private(dFS fs,dMeshTag indexTag,const dInt inodes[],dInt rstart,dInt ghents_s,const dMeshEH ghents[]);
 extern dErr DMDestroy_dFS(DM);
 
 dEXTERN_C_END

diff --git a/src/fs/impls/cont/cont.c b/src/fs/impls/cont/cont.c
@@ -265,7 +265,7 @@ static dErr dFSBuildSpace_Cont(dFS fs)
   iMesh_Instance         mi;
   dEntTopology          *regTopo;
   dPolynomialOrder      *deg,*rdeg,*regBDeg;
-  dInt                  *inodes,*xnodes,nregions,*bstat,ents_a,ents_s,ghents_s,*intdata,*idx,*ghidx;
+  dInt                  *inodes,*xnodes,nregions,*bstat,ents_a,ents_s,ghents_s,*intdata,*idx;
   dInt                  *xstart,xcnt;
   dInt                   rstart,crstart;
   dIInt                  ierr;
@@ -283,7 +283,7 @@ static dErr dFSBuildSpace_Cont(dFS fs)
 
   /* Allocate a workspace that's plenty big, so that we don't have to allocate memory constantly */
   ents_a = ma.nents;
-  err = dMallocA4(ents_a,&ents,ents_a,&intdata,ents_a,&idx,ents_a,&ghidx);dCHK(err);
+  err = dMallocA3(ents_a,&ents,ents_a,&intdata,ents_a,&idx);dCHK(err);
 
   /* Partition entities in active set into owned explicit, owned Dirichlet, and ghost */
   {
@@ -362,30 +362,7 @@ static dErr dFSBuildSpace_Cont(dFS fs)
     ghents_s = ents_s - ghstart;
   }
 
-  /* communicate global and closure offset for ghosts */
-  err = dMeshTagBcast(mesh,fs->tag.goffset);dCHK(err);
-  err = dMeshTagBcast(mesh,fs->tag.gcoffset);dCHK(err);
-
-  /* Retrieve ghost offsets, to create localupdate. */
-  err = dMeshTagGetData(mesh,fs->tag.gcoffset,ghents,ghents_s,intdata,ghents_s,dDATA_INT);dCHK(err);
-  for (dInt i=0; i<ghents_s; i++) { /* Paranoia: confirm that all ghost entities were updated. */
-    if (intdata[i] < 0) dERROR(PETSC_COMM_SELF,1,"Tag exchange did not work");
-  }
-
-  /* Set ghost indices of every node using \a ghidx, create global vector. */
-  {
-    dInt gh=0;
-    for (dInt i=0; i<ghents_s; i++) {
-      for (dInt j=0; j<inodes[idx[i]]; j++) ghidx[gh++] = intdata[i] + j;
-    }
-    if (gh != fs->ngh) dERROR(PETSC_COMM_SELF,1,"Ghost count inconsistent");
-    err = VecCreateDohp(((dObject)fs)->comm,fs->bs,fs->n,fs->nc,fs->ngh,ghidx,&fs->gvec);dCHK(err);
-  }
-
-  /* Create fs->bmapping and fs->mapping */
-  err = dFSCreateLocalToGlobal_Private(fs,fs->n,fs->nc,fs->ngh,ghidx,rstart);dCHK(err);
-
-  err = VecDohpCreateDirichletCache(fs->gvec,&fs->dcache,&fs->dscat);dCHK(err);
+  err = dFSBuildSpaceVectors_Private(fs,ma.indexTag,inodes,rstart,ghents_s,ghents);dCHK(err);
 
   /**
   * At this point the local to global mapping is complete.  Now we need to assemble the constraint matrices which take
@@ -424,7 +401,7 @@ static dErr dFSBuildSpace_Cont(dFS fs)
 
   err = dMeshRestoreAdjacency(fs->mesh,fs->set.active,&meshAdj);dCHK(err); /* Any reason to leave this around for longer? */
   err = dFree4(deg,rdeg,inodes,status);dCHK(err);
-  err = dFree4(ents,intdata,idx,ghidx);dCHK(err);
+  err = dFree3(ents,intdata,idx);dCHK(err);
   dFunctionReturn(0);
 }
 

diff --git a/src/fs/interface/fs.c b/src/fs/interface/fs.c
@@ -416,6 +416,40 @@ dErr dFSBuildSpaceOffsets_Private(dFS fs,dMeshTag indexTag,const dInt inodes[],d
   dFunctionReturn(0);
 }
 
+dErr dFSBuildSpaceVectors_Private(dFS fs,dMeshTag indexTag,const dInt inodes[],dInt rstart,dInt ghents_s,const dMeshEH ghents[])
+{
+  dErr err;
+  dInt *gcoffset,*ghidx,*idx;
+  dMesh mesh;
+
+  dFunctionBegin;
+  err = dMallocA3(ghents_s,&gcoffset,ghents_s,&ghidx,ghents_s,&idx);dCHK(err);
+  err = dFSGetMesh(fs,&mesh);dCHK(err);
+  err = dMeshTagGetData(mesh,indexTag,ghents,ghents_s,idx,ghents_s,dDATA_INT);dCHK(err);
+
+  /* Retrieve ghost offsets, to create localupdate. */
+  err = dMeshTagGetData(mesh,fs->tag.gcoffset,ghents,ghents_s,gcoffset,ghents_s,dDATA_INT);dCHK(err);
+  for (dInt i=0; i<ghents_s; i++) { /* Paranoia: confirm that all ghost entities were updated. */
+    if (gcoffset[i] < 0) dERROR(PETSC_COMM_SELF,1,"Tag exchange did not work");
+  }
+
+  /* Set ghost indices of every node using \a ghidx, create global vector. */
+  {
+    dInt gh=0;
+    for (dInt i=0; i<ghents_s; i++) {
+      for (dInt j=0; j<inodes[idx[i]]; j++) ghidx[gh++] = gcoffset[i] + j;
+    }
+    if (gh != fs->ngh) dERROR(PETSC_COMM_SELF,1,"Ghost count inconsistent");
+    err = VecCreateDohp(((dObject)fs)->comm,fs->bs,fs->n,fs->nc,fs->ngh,ghidx,&fs->gvec);dCHK(err);
+  }
+  err = dFree3(gcoffset,ghidx,idx);dCHK(err);
+
+  /* Create fs->bmapping and fs->mapping */
+  err = dFSCreateLocalToGlobal_Private(fs,fs->n,fs->nc,fs->ngh,ghidx,rstart);dCHK(err);
+
+  err = VecDohpCreateDirichletCache(fs->gvec,&fs->dcache,&fs->dscat);dCHK(err);
+  dFunctionReturn(0);dCHK(err);
+}
 
 dErr dFSCreateExpandedVector(dFS fs,Vec *x)
 {