ENH: centralize more libraries in src/phaseSystemModels

- prelude to code refactoring

NOTE
    no source code change in this commit, only relocation,
    renaming and adjustment of Make/{files,options}

applications/solvers/DNS/dnsFoam/Allwmake

@@ -2,7 +2,6 @@
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 . ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw
-
 #------------------------------------------------------------------------------
 
 if have_fftw

applications/solvers/compressible/rhoCentralFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso BCs
 wclean

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -1,7 +1,12 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
+#------------------------------------------------------------------------------
 
-(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
+(
+    wmake $targetType BCs \
+ && wmake $targetType \
+ && wmake $targetType rhoCentralDyMFoam \
+)
 
 #------------------------------------------------------------------------------

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options

@@ -1,11 +1,13 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
+
 EXE_INC = \
     -I.. \
-    -I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \
+    -I$(FOAM_SOLVERS)/multiphase/reactingTwoPhaseEulerFoam \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \
+    -I${phaseSystem}/twoPhaseSystem/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/lnInclude \
+    -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \
+    -I${phaseSystem}/phaseSystems/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \
+    -I${phaseSystem}/interfacialModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \
+    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
     -I./fluid \
     -I../solid \
     -I../fluid \
@@ -23,18 +25,17 @@ EXE_INC = \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
-
 EXE_LIBS = \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lmeshTools \
+    -lsampling \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
     -lsolidThermo \
-    -ltwoPhaseReactingTurbulenceModels \
-    -lmeshTools \
-    -lfiniteVolume \
-    -lfvOptions \
     -lradiationModels \
     -lregionModels \
-    -lsampling \
     -lreactingTwoPhaseSystem \
+    -ltwoPhaseReactingTurbulenceModels \
     -lreactingPhaseSystem

applications/solvers/lagrangian/DPMFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso DPMTurbulenceModels
 

applications/solvers/lagrangian/DPMFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType DPMTurbulenceModels

applications/solvers/multiphase/MPPICInterFoam/Allwclean

@@ -1,7 +1,8 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
-wclean libso CompressibleTwoPhaseMixtureTurbulenceModels
+wclean libso compressibleTwoPhaseMixtureTurbulenceModels
 wclean
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/MPPICInterFoam/Allwmake

@@ -1,10 +1,9 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
-wmake $targetType CompressibleTwoPhaseMixtureTurbulenceModels
+wmake $targetType compressibleTwoPhaseMixtureTurbulenceModels
 wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/files

@@ -1,3 +0,0 @@
-CompressibleTwoPhaseMixtureTurbulenceModels.C
-
-LIB = $(FOAM_LIBBIN)/libCompressibleTwoPhaseMixtureTurbulenceModels

applications/solvers/multiphase/MPPICInterFoam/Make/options

@@ -1,9 +1,6 @@
-interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam
-
 EXE_INC = \
     -I../VoF \
-    -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \
+    -I$(FOAM_SOLVERS)/multiphase/interFoam \
-    -I$(interFoamPath) \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -40,4 +37,4 @@ EXE_LIBS = \
     -lsampling \
     -lregionModels \
     -lsurfaceFilmModels \
-    -lCompressibleTwoPhaseMixtureTurbulenceModels
+    -lcompressibleTwoPhaseMixtureTurbulenceModels

applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/files

@@ -0,0 +1,3 @@
+compressibleTwoPhaseMixtureTurbulenceModels.C
+
+LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseMixtureTurbulenceModels

applications/solvers/multiphase/compressibleInterFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso twoPhaseMixtureThermo
 wclean libso surfaceTensionModels

applications/solvers/multiphase/compressibleInterFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType twoPhaseMixtureThermo

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso multiphaseMixtureThermo
 wclean

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType multiphaseMixtureThermo

applications/solvers/multiphase/driftFluxFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso mixtureViscosityModels
 wclean libso relativeVelocityModels

applications/solvers/multiphase/driftFluxFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType mixtureViscosityModels

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean

@@ -1,9 +1,7 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
-wclean libso phasesSystem
-wclean libso massTransferModels
-wclean libso CompressibleMultiPhaseTurbulenceModels
 wclean libso laserDTRM
 wclean
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake

@@ -1,13 +1,8 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
-wmakeLnInclude massTransferModels
-wmake $targetType phasesSystem
-wmake $targetType massTransferModels
-wmake $targetType CompressibleMultiPhaseTurbulenceModels
 wmake $targetType laserDTRM
 wmake $targetType
 

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/files

@@ -1,3 +0,0 @@
-CompressibleMultiPhaseTurbulenceModels.C
-
-LIB = $(FOAM_LIBBIN)/libCompressibleMultiPhaseTurbulenceModels

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options

@@ -1,6 +1,8 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseInter
+
 EXE_INC = \
-    -I./phasesSystem/lnInclude \
+    -I${phaseSystem}/phasesSystem/lnInclude \
-    -I./CompressibleMultiPhaseTurbulenceModels/lnInclude \
+    -I${phaseSystem}/compressibleMultiPhaseTurbulenceModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fvOptions/lnInclude\
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -24,10 +26,10 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lradiationModels \
     -lfluidThermophysicalModels \
-    -lIncompressibleMultiphaseSystems \
-    -lCompressibleMultiPhaseTurbulenceModels \
     -lmassTransferModels \
     -lsolidThermo \
     -lsolidSpecie \
     -ltwoPhaseProperties \
-    -llaserDTRM
+    -llaserDTRM \
+    -lincompressibleMultiphaseSystems \
+    -lcompressibleMultiPhaseTurbulenceModels

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options

@@ -1,5 +1,7 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseInter
+
 EXE_INC = \
-    -I../phasesSystem/lnInclude \
+    -I${phaseSystem}/phasesSystem/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -9,4 +11,5 @@ LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -llagrangian \
-    -lradiationModels
+    -lradiationModels \
+    -lincompressibleMultiphaseSystems

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/files

@@ -1,19 +0,0 @@
-interfaceModels/porousModels/porousModel/porousModel.C
-interfaceModels/porousModels/porousModel/porousModelNew.C
-interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
-
-phasePair/phasePairKey/phasePairKey.C
-phasePair/phasePair/phasePair.C
-phasePair/orderedPhasePair/orderedPhasePair.C
-
-phaseModel/phaseModel/phaseModel.C
-phaseModel/phaseModel/phaseModelNew.C
-phaseModel/phaseModel/phaseModels.C
-
-phaseSystem/phaseSystem.C
-
-phaseSystem/multiphaseSystem/multiphaseSystem.C
-phaseSystem/multiphaseSystem/multiphaseSystemNew.C
-phaseSystem/multiphaseSystem/multiphaseSystems.C
-
-LIB = $(FOAM_LIBBIN)/libIncompressibleMultiphaseSystems

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso temperaturePhaseChangeTwoPhaseMixtures
 wclean

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType temperaturePhaseChangeTwoPhaseMixtures

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files

@@ -1,5 +1,5 @@
-temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
 temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C
+temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C
 thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C
 twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
 constant/constant.C

applications/solvers/multiphase/interPhaseChangeFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso phaseChangeTwoPhaseMixtures
 wclean

applications/solvers/multiphase/interPhaseChangeFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType phaseChangeTwoPhaseMixtures

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/files

@@ -1,5 +1,5 @@
 phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C
-phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
+phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C
 Kunz/Kunz.C
 Merkle/Merkle.C
 SchnerrSauer/SchnerrSauer.C

applications/solvers/multiphase/multiphaseEulerFoam/Make/options

@@ -1,7 +1,8 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseEuler
+
 EXE_INC = \
-    -ImultiphaseSystem/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
-    -ImultiphaseFixedFluxPressure \
+    -I${phaseSystem}/interfacialModels/lnInclude \
-    -IinterfacialModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels \
@@ -16,9 +17,9 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lfvOptions \
     -lmeshTools \
-    -lmultiphaseSystem \
     -linterfaceProperties \
     -lincompressibleTransportModels \
-    -lcompressibleMultiphaseEulerianInterfacialModels \
     -lturbulenceModels \
-    -lincompressibleTurbulenceModels
+    -lincompressibleTurbulenceModels \
+    -lmultiphaseSystem \
+    -lcompressibleMultiphaseEulerianInterfacialModels

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/files

@@ -1,17 +0,0 @@
-dragModels/dragModel/dragModel.C
-dragModels/dragModel/newDragModel.C
-dragModels/Ergun/Ergun.C
-dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
-dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
-dragModels/SchillerNaumann/SchillerNaumann.C
-dragModels/Gibilaro/Gibilaro.C
-dragModels/WenYu/WenYu.C
-dragModels/SyamlalOBrien/SyamlalOBrien.C
-dragModels/blended/blended.C
-dragModels/interface/interface.C
-
-heatTransferModels/heatTransferModel/heatTransferModel.C
-heatTransferModels/heatTransferModel/newHeatTransferModel.C
-heatTransferModels/RanzMarshall/RanzMarshall.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleMultiphaseEulerianInterfacialModels

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files

@@ -1,10 +0,0 @@
-phaseModel/phaseModel.C
-diameterModels/diameterModel/diameterModel.C
-diameterModels/diameterModel/newDiameterModel.C
-diameterModels/constantDiameter/constantDiameter.C
-diameterModels/isothermalDiameter/isothermalDiameter.C
-
-alphaContactAngle/alphaContactAngleFvPatchScalarField.C
-multiphaseSystem.C
-
-LIB = $(FOAM_LIBBIN)/libmultiphaseSystem

applications/solvers/multiphase/multiphaseInterFoam/Allwclean

@@ -1,5 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
 wclean libso multiphaseMixture
 wclean

applications/solvers/multiphase/multiphaseInterFoam/Allwmake

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
 wmake $targetType multiphaseMixture

applications/solvers/multiphase/reactingEulerFoam/Allwclean

@@ -1,7 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
-
-wclean reactingTwoPhaseEulerFoam
-wclean reactingMultiphaseEulerFoam
-
-#------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/Allwmake

@@ -1,20 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
-#------------------------------------------------------------------------------
-
-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 $*
-
-#------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean

@@ -1,6 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
-
-wclean
-
-#------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean

@@ -1,6 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
-
-wclean
-
-#------------------------------------------------------------------------------

applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options

@@ -1,12 +1,14 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
+
 EXE_INC = \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
+    -I${phaseSystem}/multiphaseCompressibleTurbulenceModels/lnInclude \
+    -I${phaseSystem}/phaseSystems/lnInclude \
+    -I${phaseSystem}/interfacialModels/lnInclude \
+    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options

@@ -1,12 +1,14 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
+
 EXE_INC = \
+    -I${phaseSystem}/twoPhaseSystem/lnInclude \
+    -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
+    -I${phaseSystem}/phaseSystems/lnInclude \
+    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
+    -I${phaseSystem}/interfacialModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \

applications/solvers/multiphase/twoPhaseEulerFoam/Make/options

@@ -1,4 +1,9 @@
+phaseSystem = $(LIB_SRC)/phaseSystemModels/twoPhaseEuler
+
 EXE_INC = \
+    -I${phaseSystem}/phaseCompressibleTurbulenceModels/lnInclude \
+    -I${phaseSystem}/twoPhaseEuler/interfacialModels/lnInclude \
+    -I${phaseSystem}/twoPhaseSystem/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -7,10 +12,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-    -IphaseCompressibleTurbulenceModels/lnInclude \
-    -IinterfacialModels/lnInclude \
-    -ItwoPhaseSystem/lnInclude \
 
 EXE_LIBS = \
     -lfiniteVolume \
@@ -22,7 +24,7 @@ EXE_LIBS = \
     -lspecie \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lphaseCompressibleTurbulenceModels \
     -lincompressibleTransportModels \
+    -lphaseCompressibleTurbulenceModels \
     -lcompressibleTwoPhaseSystem \
     -lcompressibleEulerianInterfacialModels

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files

@@ -1,64 +0,0 @@
-dragModels/dragModel/dragModel.C
-dragModels/dragModel/newDragModel.C
-dragModels/segregated/segregated.C
-dragModels/Ergun/Ergun.C
-dragModels/Gibilaro/Gibilaro.C
-dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
-dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
-dragModels/Lain/Lain.C
-dragModels/SchillerNaumann/SchillerNaumann.C
-dragModels/SyamlalOBrien/SyamlalOBrien.C
-dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
-dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
-dragModels/WenYu/WenYu.C
-dragModels/IshiiZuber/IshiiZuber.C
-
-swarmCorrections/swarmCorrection/swarmCorrection.C
-swarmCorrections/swarmCorrection/newSwarmCorrection.C
-swarmCorrections/noSwarm/noSwarm.C
-swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
-
-liftModels/liftModel/liftModel.C
-liftModels/liftModel/newLiftModel.C
-liftModels/noLift/noLift.C
-liftModels/constantLiftCoefficient/constantLiftCoefficient.C
-liftModels/Moraga/Moraga.C
-liftModels/LegendreMagnaudet/LegendreMagnaudet.C
-liftModels/TomiyamaLift/TomiyamaLift.C
-
-heatTransferModels/heatTransferModel/heatTransferModel.C
-heatTransferModels/heatTransferModel/newHeatTransferModel.C
-heatTransferModels/RanzMarshall/RanzMarshall.C
-heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
-
-virtualMassModels/virtualMassModel/virtualMassModel.C
-virtualMassModels/virtualMassModel/newVirtualMassModel.C
-virtualMassModels/noVirtualMass/noVirtualMass.C
-virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
-virtualMassModels/Lamb/Lamb.C
-
-wallLubricationModels/wallLubricationModel/wallLubricationModel.C
-wallLubricationModels/wallLubricationModel/newWallLubricationModel.C
-wallLubricationModels/noWallLubrication/noWallLubrication.C
-wallLubricationModels/Antal/Antal.C
-wallLubricationModels/Frank/Frank.C
-wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
-
-turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
-turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C
-turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
-turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
-turbulentDispersionModels/Burns/Burns.C
-turbulentDispersionModels/Gosman/Gosman.C
-turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
-
-aspectRatioModels/aspectRatioModel/aspectRatioModel.C
-aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
-aspectRatioModels/constantAspectRatio/constantAspectRatio.C
-aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
-aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
-aspectRatioModels/Wellek/Wellek.C
-
-wallDependentModel/wallDependentModel.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleEulerianInterfacialModels

applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files

@@ -1,39 +0,0 @@
-phaseCompressibleTurbulenceModels.C
-phasePressureModel/phasePressureModel.C
-
-kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
-
-kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
-kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C
-kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
-kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
-kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
-kineticTheoryModels/viscosityModel/none/noneViscosity.C
-
-kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
-kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C
-kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
-kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
-kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
-
-kineticTheoryModels/radialModel/radialModel/radialModel.C
-kineticTheoryModels/radialModel/radialModel/newRadialModel.C
-kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
-kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
-kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
-
-kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
-kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C
-kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
-kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
-
-kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
-kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C
-kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
-kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
-kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
-
-kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
-kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
-
-LIB = $(FOAM_LIBBIN)/libphaseCompressibleTurbulenceModels

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/files

@@ -1,25 +0,0 @@
-phaseModel/phaseModel.C
-diameterModels/diameterModel/diameterModel.C
-diameterModels/diameterModel/newDiameterModel.C
-diameterModels/constantDiameter/constantDiameter.C
-diameterModels/isothermalDiameter/isothermalDiameter.C
-
-diameterModels/IATE/IATE.C
-diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
-diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
-diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
-diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
-
-BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
-BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C
-BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
-BlendedInterfacialModel/blendingMethods/linear/linear.C
-BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
-
-phasePair/phasePairKey/phasePairKey.C
-phasePair/phasePair/phasePair.C
-phasePair/orderedPhasePair/orderedPhasePair.C
-
-twoPhaseSystem.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseSystem

src/TurbulenceModels/incompressible/Make/files

@@ -1,14 +1,21 @@
 incompressibleTurbulenceModel.C
 
 turbulentTransportModels/turbulentTransportModels.C
-turbulentTransportModels/RAS/qZeta/qZeta.C
-turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
-turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
-turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
-turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
-turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
 
-BCs = turbulentTransportModels/RAS/derivedFvPatchFields
+
-turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+RASModels = turbulentTransportModels/RAS
+
+$(RASModels)/qZeta/qZeta.C
+$(RASModels)/kkLOmega/kkLOmega.C
+$(RASModels)/LamBremhorstKE/LamBremhorstKE.C
+$(RASModels)/LienLeschziner/LienLeschziner.C
+$(RASModels)/ShihQuadraticKE/ShihQuadraticKE.C
+$(RASModels)/LienCubicKE/LienCubicKE.C
+
+
+wallFunctions = turbulentTransportModels/derivedFvPatchFields/wallFunctions
+
+$(wallFunctions)/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+
 
 LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels

src/functionObjects/field/Make/options

@@ -1,5 +1,4 @@
 EXE_INC = \
-    -I$(LIB_SRC)/OpenFOAM/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -19,11 +18,9 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude \
+    -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude
-    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude
 
 LIB_LIBS = \
-    -lOpenFOAM \
     -lfiniteVolume \
     -lfileFormats \
     -lsurfMesh \

src/phaseSystemModels/Allwclean

@@ -1,16 +0,0 @@
-#!/bin/sh
-cd "${0%/*}" || exit    # Run from this directory
-
-wclean libso reactingEulerFoam/phaseSystems
-wclean libso reactingEulerFoam/interfacialModels
-wclean libso reactingEulerFoam/interfacialCompositionModels
-wclean libso reactingEulerFoam/derivedFvPatchFields
-
-wclean libso reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem
-wclean libso reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels
-
-wclean libso reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem
-wclean libso reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels
-wclean libso  reactingEulerFoam/functionObjects
-
-#------------------------------------------------------------------------------

src/phaseSystemModels/Allwmake

@@ -1,32 +1,11 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
-wmakeLnInclude reactingEulerFoam/phaseSystems
+multiphaseInter/Allwmake $targetType $*
-
+multiphaseEuler/Allwmake $targetType $*
-case "$WM_COMPILER" in
+reactingEuler/Allwmake $targetType $*
-Mingw*)
+twoPhaseEuler/Allwmake $targetType $*
-    echo "Skipping $WM_COMPILER compilation of $PWD"
-    echo "... needs further resolution of cyclic dependencies"
-    exit 0
-    ;;
-esac
-
-#------------------------------------------------------------------------------
-
-wmake $targetType  reactingEulerFoam/interfacialModels
-wmake $targetType  reactingEulerFoam/interfacialCompositionModels
-wmake $targetType  reactingEulerFoam/derivedFvPatchFields
-
-wmake $targetType  reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem
-wmake $targetType  reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels
-
-wmake $targetType  reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem
-wmake $targetType  reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels
-
-wmake $targetType  reactingEulerFoam/phaseSystems
-wmake $targetType  reactingEulerFoam/functionObjects
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseEuler/Allwclean

@@ -1,8 +1,8 @@
 #!/bin/sh
 cd "${0%/*}" || exit    # Run from this directory
+#------------------------------------------------------------------------------
 
-wclean libso multiphaseSystem
 wclean libso interfacialModels
-wclean
+wclean libso multiphaseSystem
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseEuler/Allwmake

@@ -1,12 +1,10 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
-
 #------------------------------------------------------------------------------
 
-wmakeLnInclude interfacialModels
+wmakeLnInclude multiphaseSystem
-wmake $targetType multiphaseSystem
 wmake $targetType interfacialModels
-wmake $targetType
+wmake $targetType multiphaseSystem
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files

@@ -0,0 +1,19 @@
+drag = dragModels
+$(drag)/dragModel/dragModel.C
+$(drag)/dragModel/dragModelNew.C
+$(drag)/Ergun/Ergun.C
+$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+$(drag)/SchillerNaumann/SchillerNaumann.C
+$(drag)/Gibilaro/Gibilaro.C
+$(drag)/WenYu/WenYu.C
+$(drag)/SyamlalOBrien/SyamlalOBrien.C
+$(drag)/blended/blended.C
+$(drag)/interface/interface.C
+
+heatTransfer = heatTransferModels
+$(heatTransfer)/heatTransferModel/heatTransferModel.C
+$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
+$(heatTransfer)/RanzMarshall/RanzMarshall.C
+
+LIB = $(FOAM_LIBBIN)/libcompressibleMultiphaseEulerianInterfacialModels