Fix #53

.github/workflows/cmake.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -qq g++ openmpi-bin openmpi-common libopenmpi-dev hdf5-tools libhdf5-openmpi-103 libhdf5-openmpi-dev libnetcdf-dev
+          sudo apt-get install -qq g++ openmpi-bin openmpi-common libopenmpi-dev hdf5-tools libhdf5-openmpi-dev libnetcdf-dev
 
       - name: Configure PUMGen
         working-directory: ${{ github.workspace }}

src/input/EasiMeshSize.cpp

@@ -1,15 +1,16 @@
 #include "EasiMeshSize.h"
+#include <unordered_map>
 #include <utils/logger.h>
 
 #include <tuple>
 #include <utility>
 
-EasiMeshSize::EasiMeshSize() : parser(nullptr), model(nullptr), query(easi::Query(1, 3)) {}
+EasiMeshSize::EasiMeshSize() : parser(nullptr), model(nullptr) {}
 
 EasiMeshSize::EasiMeshSize(VelocityAwareRefinementSettings refinementSettings, pGModel simModel,
                            std::unordered_map<pGRegion, int> groupMap)
     : refinementSettings(refinementSettings), simModel(simModel), parser(new easi::YAMLParser(3)),
-      groupMap(std::move(groupMap)), query(easi::Query(1, 3)) {
+      groupMap(std::move(groupMap)) {
   model = parser->parse(refinementSettings.getEasiFileName());
 }
 
@@ -31,7 +32,7 @@ int EasiMeshSize::findGroup(std::array<double, 3> point) {
 }
 
 std::tuple<const double, const int>
-EasiMeshSize::getTargetedFrequencyAndRegion(std::array<double, 3> point) {
+EasiMeshSize::getTargetedFrequencyAndRegion(const std::array<double, 3>& point) {
   const auto& refinementRegions = refinementSettings.getRefinementRegions();
   double targetedFrequency = 0.0;
   int bypassFindRegionAndUseGroup = 0;
@@ -58,7 +59,7 @@ EasiMeshSize::getTargetedFrequencyAndRegion(std::array<double, 3> point) {
   return std::make_tuple(targetedFrequency, bypassFindRegionAndUseGroup);
 }
 
-double EasiMeshSize::getMeshSize(std::array<double, 3> point) {
+double EasiMeshSize::getMeshSize(const std::array<double, 3>& point) {
   if (!model) {
     logError() << "Model was not parsed correctly";
   }
@@ -71,6 +72,7 @@ double EasiMeshSize::getMeshSize(std::array<double, 3> point) {
     return defaultMeshSize;
   }
 
+  easi::Query query(1, 3);
   query.x(0, 0) = point[0];
   query.x(0, 1) = point[1];
   query.x(0, 2) = point[2];

src/input/EasiMeshSize.h

@@ -20,21 +20,21 @@ class EasiMeshSize {
 
   easi::YAMLParser* parser;
   easi::Component* model; // Unique ptr to model leads to segfault
-  easi::Query query;
   pGModel simModel;
   std::unordered_map<pGRegion, int> groupMap;
 
   int findGroup(std::array<double, 3> point);
 
-  std::tuple<const double, const int> getTargetedFrequencyAndRegion(std::array<double, 3> point);
+  std::tuple<const double, const int>
+  getTargetedFrequencyAndRegion(const std::array<double, 3>& point);
 
   public:
   EasiMeshSize();
   ;
   EasiMeshSize(VelocityAwareRefinementSettings refinementSettings, pGModel simModel,
                std::unordered_map<pGRegion, int> groupMap);
 
-  double getMeshSize(std::array<double, 3> point);
+  double getMeshSize(const std::array<double, 3>& point);
 };
 
 #endif // PUMGEN_EASIMESHSIZE_H

src/input/SimModSuite.h

@@ -69,7 +69,7 @@
  */
 class SimModSuite : public FullStorageMeshData {
   private:
-  EasiMeshSize easiMeshSize;
+  std::shared_ptr<EasiMeshSize> easiMeshSize;
   pGModel m_model;
 
   pParMesh m_simMesh;
@@ -587,7 +587,8 @@ class SimModSuite : public FullStorageMeshData {
 
     if (MeshAtt.velocityAwareRefinementSettings.isVelocityAwareRefinementOn()) {
       logInfo(PMU_rank()) << "Enabling velocity aware meshing";
-      easiMeshSize = EasiMeshSize(MeshAtt.velocityAwareRefinementSettings, model, groupMap);
+      easiMeshSize =
+          std::make_shared<EasiMeshSize>(MeshAtt.velocityAwareRefinementSettings, model, groupMap);
       auto easiMeshSizeFunc = [](pSizeAttData sadata, void* userdata) {
         auto* easiMeshSize = static_cast<EasiMeshSize*>(userdata);
         std::array<double, 3> pt{};
@@ -598,7 +599,7 @@ class SimModSuite : public FullStorageMeshData {
         return easiMeshSize->getMeshSize(pt);
       };
       // set the user-defined function for isotropic size
-      MS_setSizeAttFunc(meshCase, "setCustomMeshSize", easiMeshSizeFunc, &easiMeshSize);
+      MS_setSizeAttFunc(meshCase, "setCustomMeshSize", easiMeshSizeFunc, easiMeshSize.get());
       // Relative anisotropic size is set for the entire model through the
       // function anisoSize
       MS_setMeshSize(meshCase, GM_domain(model), MS_userDefinedType | 1, 0, "setCustomMeshSize");