precice · MakisH · May 19, 2020 · May 19, 2020 · May 19, 2020
diff --git a/Adapter.C b/Adapter.C
@@ -383,7 +383,8 @@ void preciceAdapter::Adapter::execute()
     {
         // Check if the time directory already exists
         // (i.e. the solver wrote results that need to be updated)
-        if (runTime_.timePath().type() == fileName::DIRECTORY)
+        #include "version-specific/directory_type.H"
+        if (runTime_.timePath().type() == directory_type)
         {
             adapterInfo
                     (
@@ -607,7 +608,11 @@ void preciceAdapter::Adapter::adjustSolverTimeStep()
     // Update the solver's timestep (but don't trigger the adjustDeltaT(),
     // which also triggers the functionObject's adjustTimeStep())
     // TODO: Keep this in mind if any relevant problem appears.
-    const_cast<Time&>(runTime_).setDeltaT(timestepSolver_, false);
+    //
+    // Version-specific code with possible variants:
+    // - const_cast<Time&>(runTime_).setDeltaT(timestepSolver_, false);
+    // - const_cast<Time&>(runTime_).setDeltaTNoAdjust(timestepSolver_);
+    #include "version-specific/setDeltaT.H"
 
     return;
 }

diff --git a/Allwmake b/Allwmake
@@ -30,6 +30,14 @@ ADAPTER_TARGET_DIR="${FOAM_USER_LIBBIN}"
 # More information for compatibility with OpenFOAM
 DOC_COMPATIBILITY="https://github.com/precice/openfoam-adapter/wiki/Notes-on-OpenFOAM"
 
+################################################################################
+# Guess the OpenFOAM version.
+# We have version-specific files under variants/
+ADAPTER_OPENFOAM_VARIANT="default"
+if [ "${WM_PROJECT}" = "OpenFOAM" ]; then
+    ADAPTER_OPENFOAM_VARIANT=${WM_PROJECT_VERSION}
+fi
+
 ################################################################################
 # Funtion to print to screen and copy to a logfile
 log () {
@@ -65,6 +73,7 @@ fi
 # Export the environment variables
 export ADAPTER_PRECICE_ROOT
 export ADAPTER_PRECICE_DEP
+export ADAPTER_OPENFOAM_VARIANT
 export ADAPTER_PREP_FLAGS
 export ADAPTER_TARGET_DIR
 export ADAPTER_GLOBAL_CPLUS_INC_PATHS
@@ -78,6 +87,7 @@ log ""
 log "Current OpenFOAM environment:"
 log "  WM_PROJECT = ${WM_PROJECT}"
 log "  WM_PROJECT_VERSION = ${WM_PROJECT_VERSION}"
+log "  ADAPTER_OPENFOAM_VARIANT = ${ADAPTER_OPENFOAM_VARIANT}"
 
 if [ -z "${WM_PROJECT}" ]; then
     log ""

diff --git a/Make/options b/Make/options
@@ -13,6 +13,7 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     $(ADAPTER_GLOBAL_CPLUS_INC_PATHS) \
+    -Ivariants/$(ADAPTER_OPENFOAM_VARIANT) \
     -I$(ADAPTER_PRECICE_ROOT)/src \
     $(ADAPTER_PKG_CONFIG_CFLAGS) \
     -I../ \

diff --git a/preciceAdapterFunctionObject.C b/preciceAdapterFunctionObject.C
@@ -53,12 +53,8 @@ Foam::functionObjects::preciceAdapterFunctionObject::preciceAdapterFunctionObjec
     fvMeshFunctionObject(name, runTime, dict),
     adapter_(runTime, mesh_)
 {
-    #if (defined OPENFOAM_PLUS && (OPENFOAM_PLUS >= 1712) ) || (defined OPENFOAM && (OPENFOAM >= 1806))
-        // Patch for issue #27: warning "MPI was already finalized" while
-        // running in serial. This only affects openfoam.com, while initNull()
-        // does not exist in openfoam.org.
-        UPstream::initNull();
-    #endif
+
+    #include "version-specific/init.H"
 
     read(dict);
 }

diff --git a/variants/4.0/version-specific/directory_type.H b/variants/4.0/version-specific/directory_type.H
@@ -0,0 +1 @@
+auto directory_type{fileName::DIRECTORY};
diff --git a/variants/4.0/version-specific/init.H b/variants/4.0/version-specific/init.H
@@ -0,0 +1 @@
+std::cout << "Using a variant of the preciceAdapter for OpenFOAM 4.0 and 4.1." << std::endl;
diff --git a/variants/4.0/version-specific/setDeltaT.H b/variants/4.0/version-specific/setDeltaT.H
@@ -0,0 +1 @@
+const_cast<Time&>(runTime_).setDeltaT(timestepSolver_, false);
diff --git a/variants/4.1 b/variants/4.1
@@ -0,0 +1 @@
+4.0
diff --git a/variants/5.0/version-specific/directory_type.H b/variants/5.0/version-specific/directory_type.H
@@ -0,0 +1 @@
+../../4.0/version-specific/directory_type.H
diff --git a/variants/5.0/version-specific/init.H b/variants/5.0/version-specific/init.H
@@ -0,0 +1 @@
+std::cout << "Using a variant of the preciceAdapter for OpenFOAM 5.0 and 5.x." << std::endl;
diff --git a/variants/5.0/version-specific/setDeltaT.H b/variants/5.0/version-specific/setDeltaT.H
@@ -0,0 +1 @@
+../../4.0/version-specific/setDeltaT.H
diff --git a/variants/6/version-specific/directory_type.H b/variants/6/version-specific/directory_type.H
@@ -0,0 +1 @@
+../../5.0/version-specific/directory_type.H
diff --git a/variants/6/version-specific/init.H b/variants/6/version-specific/init.H
@@ -0,0 +1 @@
+std::cout << "Using a variant of the preciceAdapter for OpenFOAM 6." << std::endl;
diff --git a/variants/6/version-specific/setDeltaT.H b/variants/6/version-specific/setDeltaT.H
@@ -0,0 +1 @@
+const_cast<Time&>(runTime_).setDeltaTNoAdjust(timestepSolver_);
diff --git a/variants/7/version-specific/directory_type.H b/variants/7/version-specific/directory_type.H
@@ -0,0 +1 @@
+auto directory_type{fileType::directory};
diff --git a/variants/7/version-specific/init.H b/variants/7/version-specific/init.H
@@ -0,0 +1 @@
+std::cout << "Using a variant of the preciceAdapter for OpenFOAM 7 or newer." << std::endl;
diff --git a/variants/7/version-specific/setDeltaT.H b/variants/7/version-specific/setDeltaT.H
@@ -0,0 +1 @@
+../../6/version-specific/setDeltaT.H
diff --git a/variants/default b/variants/default
@@ -0,0 +1 @@
+5.0
diff --git a/variants/dev b/variants/dev
@@ -0,0 +1 @@
+7
diff --git a/variants/v1712/version-specific/directory_type.H b/variants/v1712/version-specific/directory_type.H
@@ -0,0 +1 @@
+../../4.0/version-specific/directory_type.H
diff --git a/variants/v1712/version-specific/init.H b/variants/v1712/version-specific/init.H
@@ -0,0 +1,6 @@
+std::cout << "Using a variant of the preciceAdapter for OpenFOAM v1812 or newer." << std::endl;
+
+// Patch for issue #27: warning "MPI was already finalized" while
+// running in serial. This only affects openfoam.com, while initNull()
+// does not exist in openfoam.org.
+UPstream::initNull();
diff --git a/variants/v1712/version-specific/setDeltaT.H b/variants/v1712/version-specific/setDeltaT.H
@@ -0,0 +1 @@
+../../4.0/version-specific/setDeltaT.H
diff --git a/variants/v1806 b/variants/v1806
@@ -0,0 +1 @@
+v1712/
diff --git a/variants/v1812 b/variants/v1812
@@ -0,0 +1 @@
+v1806
diff --git a/variants/v1906 b/variants/v1906
@@ -0,0 +1 @@
+v1812
diff --git a/variants/v1912 b/variants/v1912
@@ -0,0 +1 @@
+v1906
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		std::cout << "Using a variant of the preciceAdapter for OpenFOAM 4.0 and 4.1." << std::endl;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		const_cast<Time&>(runTime_).setDeltaT(timestepSolver_, false);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		const_cast<Time&>(runTime_).setDeltaTNoAdjust(timestepSolver_);