From 81c96a2df0561fce7a7b8efdbbcd308f4fa3a430 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 14 Jun 2019 13:58:37 +0200
Subject: [PATCH] COMP: skip reactingEulerFoam compilation on mingw (#1238)
- pending resolution of cyclic dependencies
---
.../multiphase/reactingEulerFoam/Allwmake | 10 ++++++++++
.../functionObjects/Make/options | 4 ++--
.../reactingMultiphaseEulerFoam/Allwmake | 6 +++---
src/phaseSystemModels/Allwmake | 17 +++++++++++++----
.../derivedFvPatchFields/Make/options | 8 +++++---
.../interfacialCompositionModels/Make/options | 1 +
.../interfacialModels/Make/options | 5 ++++-
.../reactingEulerFoam/phaseSystems/Make/options | 8 +++++---
.../Make/options | 14 ++++++++------
.../multiphaseSystem/Make/options | 12 ++++++++----
.../Make/options | 4 ++--
.../twoPhaseSystem/Make/options | 13 +++++++++----
12 files changed, 70 insertions(+), 32 deletions(-)
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
index a334548fd7..7aa883fed9 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@@ -4,6 +4,16 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
+case "$WM_COMPILER" in
+Mingw*)
+ echo "Skipping $WM_COMPILER compilation of $PWD"
+ echo "... needs further resolution of cyclic dependencies"
+ exit 0
+ ;;
+esac
+
+#------------------------------------------------------------------------------
+
reactingTwoPhaseEulerFoam/Allwmake $targetType $*
reactingMultiphaseEulerFoam/Allwmake $targetType $*
wmake $targetType functionObjects
diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options
index 8ff34452ca..cd3a9bf287 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options
@@ -7,5 +7,5 @@ EXE_INC = \
-I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude
LIB_LIBS = \
- -lfieldFunctionObjects \
- -lfiniteVolume
+ -lfiniteVolume \
+ -lfieldFunctionObjects
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
index 2471b6d55a..ecb7039b93 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
@@ -1,9 +1,9 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# Parse arguments for library compilation
+cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+#------------------------------------------------------------------------------
+
wmake $targetType
#------------------------------------------------------------------------------
diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake
index 29e718a552..4ff427d168 100755
--- a/src/phaseSystemModels/Allwmake
+++ b/src/phaseSystemModels/Allwmake
@@ -1,13 +1,23 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
-
-# Parse arguments for library compilation
+cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+#------------------------------------------------------------------------------
+
wmakeLnInclude reactingEulerFoam/interfacialCompositionModels
wmakeLnInclude reactingEulerFoam/interfacialModels
wmakeLnInclude reactingEulerFoam/derivedFvPatchFields
+case "$WM_COMPILER" in
+Mingw*)
+ echo "Skipping $WM_COMPILER compilation of $PWD"
+ echo "... needs further resolution of cyclic dependencies"
+ exit 0
+ ;;
+esac
+
+#------------------------------------------------------------------------------
+
wmake $targetType reactingEulerFoam/phaseSystems
wmake $targetType reactingEulerFoam/interfacialModels
wmake $targetType reactingEulerFoam/interfacialCompositionModels
@@ -19,5 +29,4 @@ wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompr
wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem
wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels
-
#------------------------------------------------------------------------------
diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options
index 9fb98cf794..9ba3e3ab4f 100644
--- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options
@@ -1,9 +1,9 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I../phaseSystems/lnInclude \
-I../interfacialModels/lnInclude\
-I../interfacialCompositionModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
@@ -17,4 +17,6 @@ LIB_LIBS = \
-lmeshTools \
-lreactingPhaseSystem \
-lreactingEulerianInterfacialModels \
- -lreactingEulerianInterfacialCompositionModels
+ -lreactingEulerianInterfacialCompositionModels \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options
index d80f8dd885..eada634740 100644
--- a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options
@@ -16,6 +16,7 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
+ -lmeshTools \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie
diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options
index 85a68fefcf..9af2da489d 100644
--- a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options
@@ -11,7 +11,10 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
+ -lmeshTools \
-lfluidThermophysicalModels \
-lcompressibleTransportModels \
-lspecie \
- -lreactingPhaseSystem
+ -lreactingPhaseSystem \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options
index 8f13443f89..8d823cafb9 100644
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude \
-I../interfacialModels/lnInclude \
-I../interfacialCompositionModels/lnInclude \
-I../derivedFvPatchFields/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -16,6 +16,8 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
+ -lmeshTools \
+ -lsampling \
-lfluidThermophysicalModels \
-lspecie \
-lreactionThermophysicalModels \
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
index bff40b7c90..b032af9139 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@@ -4,6 +4,8 @@ EXE_INC = \
-I../../interfacialModels/lnInclude\
-I../../interfacialCompositionModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -11,16 +13,16 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
-lreactingPhaseSystem \
-lreactingMultiphaseSystem \
-lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \
-lreactingEulerianFvPatchFields \
- -lfiniteVolume \
- -lfvOptions \
- -lmeshTools
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
index e5d6829d56..500708f45a 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
@@ -5,6 +5,9 @@ EXE_INC = \
-I../multiphaseCompressibleTurbulenceModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \
-IalphaContactAngle \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -12,11 +15,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/combustionModels/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfvOptions \
+ -lmeshTools \
+ -lsampling \
-lcombustionModels \
-lreactingPhaseSystem
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
index 25b42cbee0..f0f539eeed 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@@ -1,11 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I../twoPhaseSystem/lnInclude \
-I../../phaseSystems/lnInclude \
-I../../interfacialModels/lnInclude\
-I../../interfacialCompositionModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
index 8ecc152446..650650dab1 100644
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
@@ -4,6 +4,9 @@ EXE_INC = \
-I../../phaseSystems/lnInclude \
-I../twoPhaseCompressibleTurbulenceModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -12,10 +15,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lsampling \
-lcombustionModels \
- -lreactingPhaseSystem
+ -lreactingPhaseSystem \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
--
GitLab