Update to NekRS next

anshchaube · Jan 26, 2024 · 92da797 · 92da797
1 parent ef77fe4
commit 92da797
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -181,11 +181,13 @@ NEKRS_INCLUDES := \
 	-I$(NEKRS_DIR)/src/neknek \
 	-I$(NEKRS_DIR)/src/plugins \
 	-I$(NEKRS_DIR)/src/pointInterpolation \
+	-I$(NEKRS_DIR)/src/pointInterpolation/findpts \
 	-I$(NEKRS_DIR)/src/postProcessing \
 	-I$(NEKRS_DIR)/src/regularization \
 	-I$(NEKRS_DIR)/src/setup \
 	-I$(NEKRS_DIR)/src/solvers/cvode \
 	-I$(NEKRS_DIR)/src/solvers/elliptic \
+	-I$(NEKRS_DIR)/src/solvers/elliptic/amgSolver \
 	-I$(NEKRS_DIR)/src/solvers/elliptic/linearSolver \
 	-I$(NEKRS_DIR)/src/solvers/elliptic/MG \
 	-I$(NEKRS_DIR)/src/udf \

diff --git a/include/actions/NekInitAction.h b/include/actions/NekInitAction.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include "MooseObjectAction.h"
+#include "inipp.hpp"
 
 /**
  * Initialize Nek application by calling nekrs::setup. This needs to be
@@ -37,6 +38,12 @@ class NekInitAction : public MooseObjectAction
   virtual void act() override;
 
 protected:
+  /**
+   * Copied from NekRS because they do not want to move this to a file
+   * other than main.cpp :|
+   */
+  inipp::Ini* readPar(const std::string &_setupFile, MPI_Comm comm);
+
   /// whether the user specified how many scratch slots to allocate
   const bool _specified_scratch;
 

diff --git a/include/base/NekInterface.h b/include/base/NekInterface.h
@@ -25,6 +25,7 @@
 #include "nekrs.hpp"
 #include "bcMap.hpp"
 #include "udf.hpp"
+#include "inipp.hpp"
 #include "libmesh/point.h"
 #include "mesh.h"
 #include <string>

diff --git a/src/actions/NekInitAction.C b/src/actions/NekInitAction.C
@@ -133,12 +133,15 @@ NekInitAction::act()
                "recommend using the 'batch-restore' mode, which does not have any such limitations.");
   }
 
+  auto par = readPar(setup_file, comm);
+
   nekrs::setup(
       comm /* global communicator, like for Nek-Nek : NOT SUPPORTED, so we use same comm */,
       comm /* local communicator */,
       build_only,
       size_target,
       ci_mode,
+      par,
       casename,
       backend,
       device_id,
@@ -196,4 +199,53 @@ NekInitAction::act()
   }
 }
 
+inipp::Ini*
+NekInitAction::readPar(const std::string &_setupFile, MPI_Comm comm)
+{
+  auto par = new inipp::Ini();
+
+  int rank;
+  MPI_Comm_rank(comm, &rank);
+
+  const auto setupFile = _setupFile + ".par";
+
+  int err = 0;
+  if (rank == 0) {
+    if (!std::filesystem::exists(setupFile)) {
+      std::cerr << "Cannot find setup file " << setupFile << std::endl;
+      err++;
+    }
+  }
+  MPI_Allreduce(MPI_IN_PLACE, &err, 1, MPI_INT, MPI_MAX, comm);
+  if (err) {
+    MPI_Abort(comm, EXIT_FAILURE);
+  }
+
+  char *rbuf;
+  long fsize;
+
+  if (rank == 0) {
+    FILE *f = fopen(setupFile.c_str(), "rb");
+    fseek(f, 0, SEEK_END);
+    fsize = ftell(f);
+    fseek(f, 0, SEEK_SET);
+    rbuf = new char[fsize];
+    auto s = fread(rbuf, 1, fsize, f);
+    fclose(f);
+  }
+  MPI_Bcast(&fsize, sizeof(fsize), MPI_BYTE, 0, comm);
+
+  if (rank != 0)
+    rbuf = new char[fsize];
+  MPI_Bcast(rbuf, fsize, MPI_CHAR, 0, comm);
+
+  std::stringstream is;
+  is.write(rbuf, fsize);
+
+  par->parse(is);
+  par->interpolate();
+
+  return par;
+}
+
 #endif
diff --git a/src/base/NekInterface.C b/src/base/NekInterface.C
@@ -75,7 +75,7 @@ write_usrwrk_field_file(const int & slot, const std::string & prefix, const dflo
     0 /* where to place data */, num_bytes * slot /* where to source data */);
 
   occa::memory o_null;
-  writeFld(prefix.c_str(), time, step, write_coords, 1 /* FP64 */, &o_null, &o_null, &o_write, 1);
+  writeFld(prefix.c_str(), time, step, write_coords, 1 /* FP64 */, o_null, o_null, o_write, 1);
 }
 
 void
@@ -91,7 +91,7 @@ write_field_file(const std::string & prefix, const dfloat time, const int & step
     Nscalar = nrs->Nscalar;
   }
 
-  writeFld(prefix.c_str(), time, step, 1 /* coords */, 1 /* FP64 */, &nrs->o_U, &nrs->o_P, &o_s, Nscalar);
+  writeFld(prefix.c_str(), time, step, 1 /* coords */, 1 /* FP64 */, nrs->o_U, nrs->o_P, o_s, Nscalar);
 }
 
 void