Remove mesh->maskedGlobalIds

src/elliptic/elliptic.h

@@ -223,6 +223,6 @@ occa::properties ellipticKernelInfo(mesh_t* mesh);
 
 void ellipticZeroMean(elliptic_t* elliptic, occa::memory &o_q);
 
-mesh_t* create_extended_mesh(elliptic_t*);
+mesh_t* create_extended_mesh(elliptic_t*,hlong*);
 
 #endif

src/elliptic/ellipticBuildMultigridLevel.cpp

@@ -200,14 +200,15 @@ elliptic_t* ellipticBuildMultigridLevel(elliptic_t* baseElliptic, int Nc, int Nf
       elliptic->maskIds);
 
   //make a masked version of the global id numbering
-  mesh->maskedGlobalIds = (hlong*) calloc(Ntotal,sizeof(hlong));
-  memcpy(mesh->maskedGlobalIds, mesh->globalIds, Ntotal * sizeof(hlong));
+  hlong* maskedGlobalIds = (hlong*) calloc(Ntotal,sizeof(hlong));
+  memcpy(maskedGlobalIds, mesh->globalIds, Ntotal * sizeof(hlong));
   for (dlong n = 0; n < elliptic->Nmasked; n++)
-    mesh->maskedGlobalIds[elliptic->maskIds[n]] = 0;
+    maskedGlobalIds[elliptic->maskIds[n]] = 0;
 
   //use the masked ids to make another gs handle
-  elliptic->ogs = ogsSetup(Ntotal, mesh->maskedGlobalIds, platform->comm.mpiComm, verbose, platform->device);
+  elliptic->ogs = ogsSetup(Ntotal, maskedGlobalIds, platform->comm.mpiComm, verbose, platform->device);
   elliptic->o_invDegree = elliptic->ogs->o_invDegree;
+  free(maskedGlobalIds);
 
   occa::properties kernelInfo = ellipticKernelInfo(mesh);
 

src/elliptic/ellipticMultiGridSchwarz.cpp

@@ -605,7 +605,7 @@ void gen_operators(FDMOperators* op, ElementLengths* lengths, elliptic_t* ellipt
   free(Sz);
 }
 
-mesh_t* create_extended_mesh(elliptic_t* elliptic)
+mesh_t* create_extended_mesh(elliptic_t* elliptic, hlong* maskedGlobalIds)
 {
 
   //platform_t* platform = platform_t::getInstance();
@@ -678,11 +678,9 @@ mesh_t* create_extended_mesh(elliptic_t* elliptic)
   for (dlong n = 0; n < mesh->Nelements * mesh->Np; n++)
     if (mapB[n] == 1) maskIds[Nmasked++] = n;
   //make a masked version of the global id numbering
-  free(mesh->maskedGlobalIds);
-  mesh->maskedGlobalIds = (hlong*) calloc(Ntotal,sizeof(hlong));
-  memcpy(mesh->maskedGlobalIds, mesh->globalIds, Ntotal * sizeof(hlong));
+  memcpy(maskedGlobalIds, mesh->globalIds, mesh->Nlocal * sizeof(hlong));
   for (dlong n = 0; n < Nmasked; n++)
-    mesh->maskedGlobalIds[maskIds[n]] = 0;
+    maskedGlobalIds[maskIds[n]] = 0;
 
   free(mapB);
   free(maskIds);
@@ -804,18 +802,22 @@ void MGLevel::build(
   overlap = false;
   if(Nq >= 5) overlap = true;
 
-  mesh_t* extendedMesh = create_extended_mesh(elliptic);
+
+  const int Nq_e = Nq + 2;
+  const int Np_e = Nq_e * Nq_e * Nq_e;
+
+  hlong* maskedGlobalIds = (hlong*) calloc(Nelements * Np_e, sizeof(hlong));
+  mesh_t* extendedMesh = create_extended_mesh(elliptic, maskedGlobalIds);
 
-  const int Nq_e = extendedMesh->Nq;
-  const int Np_e = extendedMesh->Np;
   const dlong Nlocal_e = Nelements * Np_e;
 
   oogs_mode oogsMode = OOGS_AUTO;
   if(options.compareArgs("THREAD MODEL", "SERIAL")) oogsMode = OOGS_DEFAULT;
 
-  extendedOgs = (void*) oogs::setup(Nelements * Np_e, extendedMesh->maskedGlobalIds, 1, 0,
+  extendedOgs = (void*) oogs::setup(Nelements * Np_e, maskedGlobalIds, 1, 0,
                                     ogsPfloat, platform->comm.mpiComm, 1, platform->device,
                                     NULL, oogsMode);
+  free(maskedGlobalIds);
   meshFree(extendedMesh);
 
   ogs = (void*) elliptic->oogs;

src/elliptic/ellipticSolveSetup.cpp

@@ -255,13 +255,14 @@ void ellipticSolveSetup(elliptic_t* elliptic, occa::properties kernelInfo)
     elliptic->ogs = mesh->ogs; // cannot use maksed version as mixed BC's possible in each field
     elliptic->o_invDegree = elliptic->ogs->o_invDegree;
   } else {
-    mesh->maskedGlobalIds = (hlong*) calloc(Nlocal,sizeof(hlong));
-    memcpy(mesh->maskedGlobalIds, mesh->globalIds, Nlocal * sizeof(hlong));
+    hlong* maskedGlobalIds = (hlong*) calloc(Nlocal,sizeof(hlong));
+    memcpy(maskedGlobalIds, mesh->globalIds, Nlocal * sizeof(hlong));
     for (dlong n = 0; n < elliptic->Nmasked; n++)
-      mesh->maskedGlobalIds[elliptic->maskIds[n]] = 0;
+      maskedGlobalIds[elliptic->maskIds[n]] = 0;
 
-    elliptic->ogs = ogsSetup(Nlocal, mesh->maskedGlobalIds, platform->comm.mpiComm, verbose, platform->device);
+    elliptic->ogs = ogsSetup(Nlocal, maskedGlobalIds, platform->comm.mpiComm, verbose, platform->device);
     elliptic->o_invDegree = elliptic->ogs->o_invDegree;
+    free(maskedGlobalIds);
   }
 
   elliptic->precon = new precon_t();

src/mesh/mesh.h

@@ -95,7 +95,6 @@ struct mesh_t
 
   // CG gather-scatter info
   hlong* globalIds;
-  hlong* maskedGlobalIds;
   void* gsh, * hostGsh; // gslib struct pointer
   ogs_t* ogs; //occa gs pointer
   oogs_t* oogs; //occa gs pointer

src/mesh/meshFree.cpp

@@ -56,7 +56,6 @@ void meshFree(mesh_t* mesh)
 
   // CG gather-scatter info
   if(mesh->globalIds) free(mesh->globalIds);
-  if(mesh->maskedGlobalIds) free(mesh->maskedGlobalIds);
   //if(mesh->gsh) ogsHostFree(mesh->gsh);
   //if(  mesh->hostGsh) ogsHostFree(  mesh->hostGsh);// gslib struct pointer
   if(  mesh->ogs) ogsFree(  mesh->ogs); //occa gs pointer