OpenFOAM9-specific changes (#222)

Co-authored-by: Jeff Heylmun <heylmun@synthetik-technologies.com>
precice · Apr 26, 2024 · a288580 · a288580
1 parent f0c120a
commit a288580
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 33 deletions.
diff --git a/Adapter.H b/Adapter.H
@@ -391,7 +391,8 @@ public:
     //- Called by the functionObject's execute()
     void execute();
 
-    //- Called by the functionObject's setTimeStep()
+    //- Not called by OpenFOAM.org since OpenFOAM 9
+    //  See https://github.com/precice/openfoam-adapter/issues/261
     void setTimeStep();
 
     //- Called by the functionObject's end()

diff --git a/CHT/KappaEffective.H b/CHT/KappaEffective.H
@@ -1,8 +1,7 @@
 #ifndef CHT_COMMON_KAPPAEFF_H
 #define CHT_COMMON_KAPPAEFF_H
 
-#include "fluidThermoMomentumTransportModel.H"
-#include "kinematicMomentumTransportModel.H"
+#include "momentumTransportModel.H"
 #include "thermophysicalTransportModel.H"
 
 namespace preciceAdapter

diff --git a/FSI/ForceBase.C b/FSI/ForceBase.C
@@ -1,4 +1,5 @@
 #include "ForceBase.H"
+#include "fluidThermo.H"
 
 using namespace Foam;
 
@@ -27,8 +28,8 @@ preciceAdapter::FSI::ForceBase::ForceBase(
 Foam::tmp<Foam::volSymmTensorField> preciceAdapter::FSI::ForceBase::devRhoReff() const
 {
     //For turbulent flows
-    typedef compressible::momentumTransportModel cmpTurbModel;
-    typedef incompressible::momentumTransportModel icoTurbModel;
+    typedef compressibleMomentumTransportModel cmpTurbModel;
+    typedef incompressibleMomentumTransportModel icoTurbModel;
 
     if (mesh_.foundObject<cmpTurbModel>(cmpTurbModel::typeName))
     {
@@ -39,7 +40,7 @@ Foam::tmp<Foam::volSymmTensorField> preciceAdapter::FSI::ForceBase::devRhoReff()
     }
     else if (mesh_.foundObject<icoTurbModel>(icoTurbModel::typeName))
     {
-        const incompressible::momentumTransportModel& turb =
+        const icoTurbModel& turb =
             mesh_.lookupObject<icoTurbModel>(icoTurbModel::typeName);
 
         return rho() * turb.devSigma();

diff --git a/FSI/ForceBase.H b/FSI/ForceBase.H
@@ -8,7 +8,7 @@
 
 #include "pointFields.H"
 #include "vectorField.H"
-#include "fluidThermoMomentumTransportModel.H"
+#include "compressibleMomentumTransportModel.H"
 #include "kinematicMomentumTransportModel.H"
 
 namespace preciceAdapter

diff --git a/Interface.C b/Interface.C
@@ -1,6 +1,6 @@
 #include "Interface.H"
 #include "Utilities.H"
-#include "faceTriangulation.H"
+#include "polygonTriangulate.H"
 #include "cellSet.H"
 
 
@@ -303,16 +303,15 @@ void preciceAdapter::Interface::configureMesh(const fvMesh& mesh, const std::str
                 {
                     const face& faceQuad = faceField[facei];
 
-                    // Triangulate the face
-                    faceTriangulation faceTri(pointCoords, faceQuad, false);
+                    triEngine.triangulate(UIndirectList<point>(pointCoords, faceQuad));
 
                     // Iterate over all triangles generated out of each (quad) face
                     for (uint triIndex = 0; triIndex < triaPerQuad; triIndex++)
                     {
                         // Get the vertex that corresponds to the x,y,z coordinates of each node of a triangle
                         for (uint nodeIndex = 0; nodeIndex < nodesPerTria; nodeIndex++)
                         {
-                            triVertIDs.push_back(verticesMap.at(std::make_tuple(pointCoords[faceTri[triIndex][nodeIndex]][0], pointCoords[faceTri[triIndex][nodeIndex]][1], pointCoords[faceTri[triIndex][nodeIndex]][2])));
+                            triVertIDs.push_back(verticesMap.at(std::make_tuple(pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][0], pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][1], pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][2])));
                         }
                     }
                 }

diff --git a/Make/options b/Make/options
@@ -16,9 +16,11 @@ EXE_INC = \
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lthermophysicalTransportModels \
-    -lfluidThermoMomentumTransportModels \
+    -ltransportModels \
+    -lmomentumTransportModels \
     -lincompressibleMomentumTransportModels \
+    -lcompressibleMomentumTransportModels \
+    -lthermophysicalTransportModels \
     -limmiscibleIncompressibleTwoPhaseMixture \
     $(ADAPTER_PKG_CONFIG_LIBS) \
     -lprecice
diff --git a/preciceAdapterFunctionObject.C b/preciceAdapterFunctionObject.C
@@ -144,21 +144,4 @@ bool Foam::functionObjects::preciceAdapterFunctionObject::write()
     return true;
 }
 
-bool Foam::functionObjects::preciceAdapterFunctionObject::setTimeStep()
-{
-#ifdef ADAPTER_ENABLE_TIMINGS
-    clockValue clock;
-    clock.update();
-#endif
-
-    adapter_.setTimeStep();
-
-#ifdef ADAPTER_ENABLE_TIMINGS
-    timeInAll_ += clock.elapsed();
-    timeInExecute_ += clock.elapsed();
-#endif
-
-    return true;
-}
-
 // ************************************************************************* //
diff --git a/preciceAdapterFunctionObject.H b/preciceAdapterFunctionObject.H
@@ -133,9 +133,6 @@ public:
     //- Write the preciceAdapterFunctionObject
     bool write() final;
 
-    //- Called at the end of Time::adjustDeltaT() if adjustTime is true
-    bool setTimeStep() final;
-
     /*
         // NOTE: If you add a new module that needs to execute methods
         // whenever the mesh is updated or its points moved,