SCOREC · flagdanger · Mar 28, 2023 · Mar 28, 2023 · Mar 29, 2023 · Mar 29, 2023
diff --git a/apf/apfCGNS.cc b/apf/apfCGNS.cc
@@ -692,7 +692,7 @@ void AddBocosToMainBase(const CGNS &cgns, const CellElementReturn &cellResults,
     return std::make_pair(cacheStarts, cacheEnds);
   };
 
-  const auto globalElementList = [](const std::vector<cgsize_t> &bcList, std::vector<cgsize_t> &allElements) {
+  const auto globalElementList = [&m](const std::vector<cgsize_t> &bcList, std::vector<cgsize_t> &allElements) {
     std::vector<int> sizes(m->getPCU()->Peers(), 0); // important initialiser
     const int l = bcList.size();
     MPI_Allgather(&l, 1, MPI_INT, sizes.data(), 1,
@@ -1049,11 +1049,11 @@ void WriteCGNS(const char *prefix, apf::Mesh *m, const apf::CGNSBCMap &cgnsBCMap
   auto communicator = m->getPCU()->GetMPIComm();
   cgp_mpi_comm(communicator);
   //
-  cgp_pio_mode(CGNS_ENUMV(CGP_INDEPENDENT));
+  cgp_pio_mode(CGP_INDEPENDENT);
 
   CGNS cgns;
   cgns.fname = std::string(prefix);
-  if (cgp_open(prefix, CGNS_ENUMV(CG_MODE_WRITE), &cgns.index))
+  if (cgp_open(prefix, CG_MODE_WRITE, &cgns.index))
     cgp_error_exit();
 
   {

diff --git a/apf/apfConstruct.cc b/apf/apfConstruct.cc
@@ -42,12 +42,12 @@ static NewElements constructElements(
   return newElements;
 }
 
-static Gid getMax(const GlobalToVert& globalToVert, Mesh2* m)
+static Gid getMax(const GlobalToVert& globalToVert, pcu::PCU *PCUObj)
 {
   Gid max = -1;
   APF_CONST_ITERATE(GlobalToVert, globalToVert, it)
     max = std::max(max, it->first);
-  return m->getPCU()->Max<long>(max); // this is type-dependent
+  return PCUObj->Max<long>(max); // this is type-dependent
 }
 
 
@@ -66,7 +66,7 @@ static void constructResidence(Mesh2* m, GlobalToVert& globalToVert)
     }
     ifirst++;
   }
-  Gid max = getMax(globalToVert, m);  // seems like we read this and know it already on every rank so why compute with global comm?
+  Gid max = getMax(globalToVert, m->getPCU());  // seems like we read this and know it already on every rank so why compute with global comm?
   ifirst=0;
   APF_ITERATE(GlobalToVert, globalToVert, it) {
     Gid gid = it->first;  
@@ -212,7 +212,7 @@ NewElements construct(Mesh2* m, const Gid* conn, int nelem, int etype,
 void setCoords(Mesh2* m, const double* coords, int nverts,
     GlobalToVert& globalToVert)
 {
-  Gid max = getMax(globalToVert, m);
+  Gid max = getMax(globalToVert, m->getPCU());
   Gid total = max + 1;
   int peers = m->getPCU()->Peers();
   int quotient = total / peers;
@@ -303,7 +303,7 @@ void setCoords(Mesh2* m, const double* coords, int nverts,
 void setMatches(Mesh2* m, const Gid* matches, int nverts,
     GlobalToVert& globalToVert)
 {
-  Gid max = getMax(globalToVert, m);
+  Gid max = getMax(globalToVert, m->getPCU());
   Gid total = max + 1;
   int peers = m->getPCU()->Peers();
   int quotient = total / peers;

diff --git a/apf/apfMesh.h b/apf/apfMesh.h
@@ -396,7 +396,7 @@ class Mesh
     GlobalNumbering* findGlobalNumbering(const char* name);
 
     GlobalNumbering* getGlobalNumbering(int i);
-    /** \brief get the global pcu */
+    /** \brief get the mesh pcu */
     pcu::PCU* getPCU() const {return pcu_;}
     void switchPCU(pcu::PCU *newPCU);
     /** \brief true if any associated fields use array storage */

diff --git a/capstone_clis/capStone2VTK.cc b/capstone_clis/capStone2VTK.cc
@@ -21,7 +21,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -43,10 +42,10 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
 
   if (argc != 3) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <output folder name>\n";
     return EXIT_FAILURE;
@@ -133,7 +132,7 @@ int main(int argc, char** argv)
   gmi_register_cap();
 
   // convert the mesh to apf/mds mesh
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
 
   apf::writeVtkFiles(folderName, mesh);
 

diff --git a/capstone_clis/capStoneAnalyzeArea.cc b/capstone_clis/capStoneAnalyzeArea.cc
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -50,12 +49,12 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
   lion_set_verbosity(1);
   double initialTime = pcu::Time();
 
   if (argc != 3) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <factor>\n";
     return EXIT_FAILURE;
@@ -145,7 +144,7 @@ int main(int argc, char** argv)
 
   // create the mesh object (this one is CapStone underneath)
   printf("\n---- Creating Mesh Wrapper Object. \n");
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
   printf("---- Creating Mesh Wrapper Object: Done. \n");
 
   // add size distribution based on area

diff --git a/capstone_clis/capStoneAnalyzeEdgeLengths.cc b/capstone_clis/capStoneAnalyzeEdgeLengths.cc
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -51,12 +50,12 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
   lion_set_verbosity(1);
   double initialTime = pcu::Time();
 
   if (argc != 3) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <factor>\n";
     return EXIT_FAILURE;
@@ -146,7 +145,7 @@ int main(int argc, char** argv)
 
   // create the mesh object (this one is CapStone underneath)
   printf("\n---- Creating Mesh Wrapper Object. \n");
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
   printf("---- Creating Mesh Wrapper Object: Done. \n");
 
   // add size distribution based on area

diff --git a/capstone_clis/capStoneAnisoAdapt.cc b/capstone_clis/capStoneAnisoAdapt.cc
@@ -11,7 +11,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -51,10 +50,10 @@ int main(int argc, char** argv)
   /* INIT CALLS */
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
 
   if (argc < 3) {
-    if (PCUObj.get()->Self() == 0) {
+    if (PCUObj.Self() == 0) {
       printf("USAGE: %s <create_file.cre> <size-field>\n", argv[0]);
       printf("Size-fields:\n");
       printf("%d, for uniform anisotropic size-field\n", 1);
@@ -112,7 +111,7 @@ int main(int argc, char** argv)
   MG_API_CALL(m, compute_adjacency());
 
   /* CONVERT THE MESH TO APF::MESH2 */
-  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, PCUObj.get());
+  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, &PCUObj);
 
   /* ADD A TEST FIELD TO THE MESH TO DEMONSTRATE SOLUTION TRANSFER */
   apf::Field* tf  = apf::createFieldOn(apfCapMesh, "test_field", apf::VECTOR);

diff --git a/capstone_clis/capStoneAnisoAdaptWing.cc b/capstone_clis/capStoneAnisoAdaptWing.cc
@@ -11,7 +11,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -98,7 +97,7 @@ int main(int argc, char** argv)
   auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
 
   if (argc < 2) {
-    if (PCUObj.get()->Self() == 0) {
+    if (PCUObj.Self() == 0) {
       printf("USAGE: %s <create_file.cre>\n", argv[0]);
     }
     MPI_Finalize();
@@ -151,7 +150,7 @@ int main(int argc, char** argv)
   MG_API_CALL(m, compute_adjacency());
 
   /* CONVERT THE MESH TO APF::MESH2 */
-  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, PCUObj.get());
+  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, &PCUObj);
 
   /* ADD A TEST FIELD TO THE MESH TO DEMONSTRATE SOLUTION TRANSFER */
   apf::Field* tf  = apf::createFieldOn(apfCapMesh, "test_field", apf::VECTOR);

diff --git a/capstone_clis/capStoneAttachSolution.cc b/capstone_clis/capStoneAttachSolution.cc
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -600,12 +599,12 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
   lion_set_verbosity(1);
   double initialTime = pcu::Time();
 
   if (argc != 9) {
-    if(0==PCUObj.get()->Self()) {
+    if(0==PCUObj.Self()) {
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <data file .txt> <target field(s)> <strand size> <desired max size> <error reduction factor> <max refinement level> <boundary layer thickness>\n";
       std::cerr << "*target field(s) is a bit string to select which field(s) are used for error estimation\n";
@@ -713,7 +712,7 @@ int main(int argc, char** argv)
 
   // create the mesh object (this one is CapStone underneath)
   printf("\n---- Creating Mesh Wrapper Object. \n");
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
   printf("---- Creating Mesh Wrapper Object: Done. \n");
 
   // make the volume mesh (this one is MDS underneath)

diff --git a/capstone_clis/capStoneAttachSolution2.cc b/capstone_clis/capStoneAttachSolution2.cc
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <iomanip>
 #include <vector>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -500,7 +499,7 @@ int main(int argc, char** argv)
   double initialTime = pcu::Time();
 
   if (argc != 7) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <data file .txt> <data offset> <strand size> <desired max size> <error reduction factor>\n";
     return EXIT_FAILURE;
@@ -599,7 +598,7 @@ int main(int argc, char** argv)
 
   // create the mesh object (this one is CapStone underneath)
   printf("\n---- Creating Mesh Wrapper Object. \n");
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
   printf("---- Creating Mesh Wrapper Object: Done. \n");
 
   // remove unused verts

diff --git a/capstone_clis/capStoneAttachSolutionStrandOnly.cc b/capstone_clis/capStoneAttachSolutionStrandOnly.cc
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -522,12 +521,12 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
   lion_set_verbosity(1);
   double initialTime = pcu::Time();
 
   if (argc != 7) {
-    if(0==PCUObj.get()->Self()) {
+    if(0==PCUObj.Self()) {
       std::cerr << "usage: " << argv[0]
         << " <data file .txt> <target field(s)> <strand size> <desired max size> <error reduction factor> <max refinement level>\n";
       std::cerr << "*target field(s) is a bit string to select which field(s) are used for error estimation\n";
@@ -558,7 +557,7 @@ int main(int argc, char** argv)
 
   // create the mesh object (this one is CapStone underneath)
   printf("\n---- Creating Mesh Wrapper Object. \n");
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
   printf("---- Creating Mesh Wrapper Object: Done. \n");
 
   // make the volume mesh (this one is MDS underneath)

diff --git a/capstone_clis/capStoneAttachSolutionUni.cc b/capstone_clis/capStoneAttachSolutionUni.cc
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <vector>
 #include <math.h>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -499,12 +498,12 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
   lion_set_verbosity(1);
   double initialTime = pcu::Time();
 
   if (argc != 7) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre> <data file .txt> <data offset> <strand size> <desired max size> <error reduction factor>\n";
     return EXIT_FAILURE;
@@ -596,7 +595,7 @@ int main(int argc, char** argv)
 
   printf("---- CapStone Mesh Loaded. \n");
 
-  apf::Mesh2* mesh = apf::createMesh(m,g,PCUObj.get());
+  apf::Mesh2* mesh = apf::createMesh(m,g,&PCUObj);
 
   //adapt the mesh
   ma::Input* in;

diff --git a/capstone_clis/capStoneCheckParametrization.cc b/capstone_clis/capStoneCheckParametrization.cc
@@ -7,7 +7,6 @@
 #include <iostream>
 #include <iomanip>
 #include <vector>
-#include <memory>
 
 
 #include "CapstoneModule.h"
@@ -30,10 +29,10 @@ int main(int argc, char** argv)
 {
   MPI_Init(&argc, &argv);
   {
-  auto PCUObj = std::unique_ptr<pcu::PCU>(new pcu::PCU(MPI_COMM_WORLD));
+  pcu::PCU PCUObj = pcu::PCU(MPI_COMM_WORLD);
 
   if (argc != 2) {
-    if(0==PCUObj.get()->Self())
+    if(0==PCUObj.Self())
       std::cerr << "usage: " << argv[0]
         << " <cre file .cre>\n";
     return EXIT_FAILURE;

diff --git a/capstone_clis/capStoneCurve.cc b/capstone_clis/capStoneCurve.cc
@@ -13,7 +13,6 @@
 #include <cstring>
 #include <iostream>
 #include <lionPrint.h>
-#include <memory>
 
 // === includes for safe_mkdir ===
 #include <reel.h>
@@ -162,7 +161,7 @@ int main(int argc, char** argv)
   MG_API_CALL(m, compute_adjacency());
 
   /* writeVtk(cs, "before.vtk"); */
-  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, PCUObj.get());
+  apf::Mesh2* apfCapMesh = apf::createMesh(m, g, &PCUObj);
 
   apf::Field* tf  = apf::createFieldOn(apfCapMesh, "test_field", apf::VECTOR);
   apf::MeshEntity* ent;