Merge pull request aurora-multiphysics#41 from hsaunders1904/hsaunders1904/remove_foam_interface_singleton

Remove foam interface singleton

Author: hsaunders1904

.github/workflows/ci.yml

@@ -42,6 +42,7 @@ jobs:
       shell: bash
       run: |
         . /opt/openfoam/OpenFOAM-12/etc/bashrc || true
+        unset FOAM_SIGFPE && unset FOAM_SETNAN
         ./run_tests
 
     - name: Docs

include/base/FoamInterface.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ArgsUtil.h"
+#include "fvCFD_moose.h"
+
+#include <mpi.h>
+
+namespace Hippo
+{
+
+class FoamRuntime
+{
+public:
+  FoamRuntime(const std::string & case_dir, MPI_Comm const & comm);
+  FoamRuntime(const FoamRuntime & rt);
+
+  Foam::Time & runTime() { return _runtime; }
+
+private:
+  cArgs _argv;
+  Foam::Time _runtime;
+};
+
+}

include/base/FoamInterfaceImpl.h

@@ -2,8 +2,6 @@
 
 #include "fvCFD_moose.h"
 
-#include <scalar.H>
-
 #include <vector>
 
 namespace Hippo
@@ -17,17 +15,28 @@ class FoamSolver
   // Run a timestep of the OpenFOAM solver.
   void run();
 
-  // Append temperature values from the OpenFOAM patch (boundary) to the end of the given vector.
+  // Append temperature values from the OpenFOAM patch (boundary) to the end of
+  // the given vector.
   std::size_t appendPatchTemperatures(int patch_id, std::vector<double> & foam_t);
   // Return the number of faces in the given patch (boundary).
   std::size_t patchSize(int patch_id);
   // Set the temperature values of the OpenFOAM patch (boundary).
   void setPatchTemperatures(int patch_id, const std::vector<double> & moose_t);
   // Set the negative heat flux values on the OpenFOAM patch (boundary).
   void setPatchNegativeHeatFlux(int patch_id, std::vector<double> & negative_hf);
+  // Get or calculate the wall heat flux for the given patch.
+  std::size_t wallHeatFlux(int patch_id, std::vector<double> & fill_vector);
+  // Set the solver's time step size.
+  void setTimeDelta(double dt) { runTime().setDeltaTNoAdjust(dt); }
+  // Set the solver to the given time.
+  void setCurrentTime(double time) { runTime().setTime(time, runTime().timeIndex()); }
+  // Set the time at which the solver should terminate.
+  void setEndTime(double time) { runTime().setEndTime(time); }
 
 private:
   Foam::solver * _solver = nullptr;
+
+  Foam::Time & runTime() { return const_cast<Foam::Time &>(_solver->runTime); }
 };
 
-}
+} // namespace Hippo

include/base/FoamRuntime.h

@@ -1,19 +1,36 @@
 #pragma once
-// Need to play some games to prevent name clashes
-// hence the undef and to define namespaceFoam to
-// prevnet a using namespace Foam; in header (sigh)
+// This file is a workaround for a name clash between OpenFOAM and libMesh,
+// which both define the symbol 'NotImplemented'. If you see some cryptic
+// build errors in libMesh, then this is likely the problem.
+// The solution here is to include what we need from OpenFOAM and then undef
+// NotImplemented, which will be redefined by libMesh later. Source files can
+// include this file instead of directly including OpenFOAM headers.
+// Not a huge amount of science went into what's included here and what's
+// included in source files. It was pretty much a case of 'move things until it
+// works'.
 
 #define namespaceFoam
+// Foam2MooseMeshGen.h
+#include <distributionMapBase.H>
+#include <fvMesh.H>
+
 // Foam2MooseMeshGen.C
+#include <IOobject.H>
+#include <PrimitivePatch.H>
 #include <error.H>
 #include <fvMesh.H>
-#include <IOobject.H>
 #include <polyPatch.H>
 
-// FoamInterfaceImpl.H
-#include <argList.H>
-
 // FoamSolver.h
+#include <scalar.H>
 #include <solver.H>
 
+// FoamRuntime.h
+#include <Time.H>
+
+// FoamRuntime.C
+#include <Pstream/mpi/PstreamGlobals.H>
+#include <argList.H>
+#include <fvMesh.H>
+
 #undef NotImplemented