diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake index a334548fd777209f569bfc1559156c8f4fcb76e4..7aa883fed9d33c5d203d767a5dc7d26bcfc37f83 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 8ff34452ca317c8c4353a023a7583f4453c7ced5..cd3a9bf287c85b5c28e901c30c2e7bf4621afa67 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 2471b6d55ab7eef9d59961f2d83b4f3d41ef8205..ecb7039b93a994de65d349fce9bea25d936eea56 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 29e718a552f0509237d77754c2d1b374fcdbe158..4ff427d1684e97a30c728ecd9b7ac46dde83136f 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 9fb98cf79419e19f6d145ff2524cafab8203ae1d..9ba3e3ab4f5c1a94c981545c8cfb51f1f747dd65 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 d80f8dd8858285e28aea2863a5250d1fc6331eda..eada63474042997d0e43f5525b23950d7f051d25 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 85a68fefcf0eb612b389fbc32e29a23128a73351..9af2da489d5c3046692d01f225c23e8b7db931eb 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 8f13443f893a7633c7c0c494d030de63da483890..8d823cafb94ed2fcfc07f34a039cfc85866e27dd 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 bff40b7c90d2b34338e93b821e378720feea2183..b032af91392b75f2e06960d8c75942b3ac0a7b8b 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 e5d6829d5659ef87d9f25f5801ce253e2074b973..500708f45a1fb6f4fdd0cf1d909312e32e501bb1 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 25b42cbee04572a0d1d656a976371a5905317069..f0f539eeed10b3b05b50b5267eee1b01228693b9 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 8ecc152446e57b9dd96b27c04514dd319a116e61..650650dab1757289a83d362782e666e9cf98af60 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