ENH: avoid phaseSystem cyclic dependencies, reduce number of libraries

Reduce the number of phaseSystems libraries:

- phaseSystems previously had a number of smaller libraries to provide
  interface and model properties, etc. This potential flexibility was
  never actually used anywhere, but causes cyclic dependencies between
  phaseSystem and the models (and turbulence) that causes extreme
  difficulty for mingw linking (issue #1238).

- libincompressibleMultiphaseSystems
  - removed: libmassTransferModels

- libmultiphaseSystem
  - removed: libcompressibleMultiphaseEulerianInterfacialModels

- libreactingMultiphaseSystem
  - removed: libreactingPhaseSystem
  - removed: libreactingEulerianFvPatchFields
  - removed: libreactingEulerianInterfacialCompositionModels
  - removed: libreactingEulerianInterfacialModels
  - removed: libmultiphaseReactingTurbulenceModels

- libreactingTwoPhaseSystem
  - removed: libreactingPhaseSystem
  - removed: libreactingEulerianFvPatchFields
  - removed: libreactingEulerianInterfacialCompositionModels
  - removed: libreactingEulerianInterfacialModels

Avoid duplicate symbol for phaseCompressibleTurbulenceModels

  Common turbulence models are defined in libreactingMultiphaseSystem,
  and libmultiphaseReactingTurbulenceModels is now redundant.

  The libtwoPhaseReactingTurbulenceModels extends the common models
  for reactingTwoPhaseSystem.

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

@@ -5,9 +5,7 @@ EXE_INC = \
     -I$(FOAM_SOLVERS)/multiphase/reactingTwoPhaseEulerFoam \
     -I${phaseSystem}/twoPhaseSystem/lnInclude \
     -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
-    -I${phaseSystem}/phaseSystems/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
-    -I${phaseSystem}/interfacialModels/lnInclude \
-    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
     -I./fluid \
     -I../solid \
     -I../fluid \
@@ -36,6 +34,6 @@ EXE_LIBS = \
     -lsolidThermo \
     -lradiationModels \
     -lregionModels \
+    -lreactingMultiphaseSystem \
     -lreactingTwoPhaseSystem \
-    -ltwoPhaseReactingTurbulenceModels \
+    -ltwoPhaseReactingTurbulenceModels
-    -lreactingPhaseSystem

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options

@@ -26,7 +26,6 @@ EXE_LIBS = \
     -lcompressibleTransportModels \
     -lradiationModels \
     -lfluidThermophysicalModels \
-    -lmassTransferModels \
     -lsolidThermo \
     -lsolidSpecie \
     -ltwoPhaseProperties \

applications/solvers/multiphase/multiphaseEulerFoam/Make/options

@@ -2,7 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseEuler
 
 EXE_INC = \
     -I${phaseSystem}/multiphaseSystem/lnInclude \
-    -I${phaseSystem}/interfacialModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels \
@@ -21,5 +20,4 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
-    -lmultiphaseSystem \
+    -lmultiphaseSystem
-    -lcompressibleMultiphaseEulerianInterfacialModels

applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options

@@ -2,10 +2,6 @@ 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 \
@@ -21,8 +17,4 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lreactingPhaseSystem \
+    -lreactingMultiphaseSystem
-    -lreactingMultiphaseSystem \
-    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels \
-    -lmultiphaseReactingTurbulenceModels

applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options

@@ -3,9 +3,7 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
 EXE_INC = \
     -I${phaseSystem}/twoPhaseSystem/lnInclude \
     -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \
-    -I${phaseSystem}/phaseSystems/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
-    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
-    -I${phaseSystem}/interfacialModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
@@ -20,8 +18,6 @@ EXE_LIBS = \
     -lfvOptions \
     -lmeshTools \
     -lsampling \
-    -lreactingPhaseSystem \
+    -lreactingMultiphaseSystem \
     -lreactingTwoPhaseSystem \
-    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels \
     -ltwoPhaseReactingTurbulenceModels

applications/solvers/multiphase/twoPhaseEulerFoam/Make/options

@@ -2,7 +2,6 @@ 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 \
@@ -25,6 +24,5 @@ EXE_LIBS = \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lincompressibleTransportModels \
-    -lphaseCompressibleTurbulenceModels \
     -lcompressibleTwoPhaseSystem \
-    -lcompressibleEulerianInterfacialModels
+    -lphaseCompressibleTurbulenceModels

src/phaseSystemModels/multiphaseEuler/Allwclean

@@ -2,7 +2,6 @@
 cd "${0%/*}" || exit    # Run from this directory
 #------------------------------------------------------------------------------
 
-wclean libso interfacialModels
 wclean libso multiphaseSystem
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseEuler/Allwmake

@@ -3,8 +3,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 #------------------------------------------------------------------------------
 
-wmakeLnInclude multiphaseSystem
-wmake $targetType interfacialModels
 wmake $targetType multiphaseSystem
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files

@@ -1,19 +0,0 @@
-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

src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options

@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I../multiphaseSystem/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmultiphaseSystem

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files

@@ -3,13 +3,31 @@ phaseModel/phaseModel.C
 multiphaseSystem/multiphaseSystem.C
 
 diameter = diameterModels
-
 $(diameter)/diameterModel/diameterModel.C
 $(diameter)/diameterModel/diameterModelNew.C
 $(diameter)/constantDiameter/constantDiameter.C
 $(diameter)/isothermalDiameter/isothermalDiameter.C
 
+
+drag = interfacialModels/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 = interfacialModels/heatTransferModels
+$(heatTransfer)/heatTransferModel/heatTransferModel.C
+$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
+$(heatTransfer)/RanzMarshall/RanzMarshall.C
+
+
 alphaContactAngle/alphaContactAngleFvPatchScalarField.C
 
-
 LIB = $(FOAM_LIBBIN)/libmultiphaseSystem

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options

@@ -1,6 +1,4 @@
 EXE_INC = \
-    -I../phaseModel/lnInclude \
-    -I../interfacialModels/lnInclude \
     -IalphaContactAngle \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \

src/phaseSystemModels/multiphaseInter/Allwclean

@@ -3,7 +3,6 @@ cd "${0%/*}" || exit    # Run from this directory
 #------------------------------------------------------------------------------
 
 wclean libso phasesSystem
-wclean libso massTransferModels
 wclean libso compressibleMultiPhaseTurbulenceModels
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseInter/Allwmake

@@ -3,9 +3,7 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 #------------------------------------------------------------------------------
 
-wmakeLnInclude massTransferModels
 wmake $targetType phasesSystem
-wmake $targetType massTransferModels
 wmake $targetType compressibleMultiPhaseTurbulenceModels
 
 #------------------------------------------------------------------------------

src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files

@@ -1,6 +0,0 @@
-interfaceCompositionModel/interfaceCompositionModel.C
-interfaceCompositionModel/interfaceCompositionModelNew.C
-
-InterfaceCompositionModel/InterfaceCompositionModels.C
-
-LIB = $(FOAM_LIBBIN)/libmassTransferModels

src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options

@@ -1,20 +0,0 @@
-EXE_INC = \
-    -I../phasesSystem/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
-    -lsolidThermo \
-    -lsolidSpecie \
-    -lgeometricVoF

src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files

@@ -12,8 +12,21 @@ multiphaseSystem/multiphaseSystem.C
 multiphaseSystem/multiphaseSystemNew.C
 multiphaseSystem/multiphaseSystems.C
 
-interfaceModels/porousModels/porousModel/porousModel.C
+interfaceCompositionModel/interfaceCompositionModel.C
-interfaceModels/porousModels/porousModel/porousModelNew.C
+interfaceCompositionModel/interfaceCompositionModelNew.C
-interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
+InterfaceCompositionModel/InterfaceCompositionModels.C
+
+porous = interfaceModels/porousModels
+$(porous)/porousModel/porousModel.C
+$(porous)/porousModel/porousModelNew.C
+$(porous)/VollerPrakash/VollerPrakash.C
+
+/* Ununsed? */
+/*
+surfaceTension = interfaceModels/surfaceTensionModels
+$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C
+$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C
+$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+*/
 
 LIB = $(FOAM_LIBBIN)/libincompressibleMultiphaseSystems

src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options

@@ -1,5 +1,4 @@
 EXE_INC = \
-    -I../massTransferModels/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -11,6 +10,7 @@ EXE_INC = \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+    -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
@@ -25,6 +25,7 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lincompressibleTransportModels \
     -linterfaceProperties \
+    -lgeometricVoF \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lcombustionModels

src/phaseSystemModels/reactingEuler/Allwclean

@@ -4,19 +4,10 @@ cd "${0%/*}" || exit    # Run from this directory
 
 # echo "cleaning ${PWD##*/}"
 
-wclean libso phaseSystems
-wclean libso interfacialModels
-wclean libso interfacialCompositionModels
-wclean libso derivedFvPatchFields
-
-# multiphase
 wclean libso multiphaseSystem
-wclean libso multiphaseCompressibleTurbulenceModels
+wclean libso functionObjects
 
-# twoPhase
 wclean libso twoPhaseSystem
 wclean libso twoPhaseCompressibleTurbulenceModels
 
-wclean libso functionObjects
-
 #------------------------------------------------------------------------------

src/phaseSystemModels/reactingEuler/Allwmake

@@ -5,18 +5,10 @@ cd "${0%/*}" || exit                                # Run from this directory
 
 # echo "making ${PWD##*/}"
 
-wmakeLnInclude phaseSystems
-wmake $targetType interfacialModels
-wmake $targetType interfacialCompositionModels
-wmake $targetType derivedFvPatchFields
-
 wmake $targetType multiphaseSystem
-wmake $targetType multiphaseCompressibleTurbulenceModels
+wmake $targetType functionObjects
 
 wmake $targetType twoPhaseSystem
 wmake $targetType twoPhaseCompressibleTurbulenceModels
 
-wmake $targetType phaseSystems
-wmake $targetType functionObjects
-
 #------------------------------------------------------------------------------

src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files

@@ -1,62 +0,0 @@
-partitioning = wallBoilingSubModels/partitioningModels
-$(partitioning)/partitioningModel/partitioningModel.C
-$(partitioning)/partitioningModel/partitioningModelNew.C
-$(partitioning)/phaseFraction/phaseFraction.C
-$(partitioning)/Lavieville/Lavieville.C
-$(partitioning)/cosine/cosine.C
-$(partitioning)/linear/linear.C
-
-nucleation = wallBoilingSubModels/nucleationSiteModels
-$(nucleation)/nucleationSiteModel/nucleationSiteModel.C
-$(nucleation)/nucleationSiteModel/nucleationSiteModelNew.C
-$(nucleation)/LemmertChawla/LemmertChawla.C
-
-departureDiam = wallBoilingSubModels/departureDiameterModels
-$(departureDiam)/departureDiameterModel/departureDiameterModel.C
-$(departureDiam)/departureDiameterModel/departureDiameterModelNew.C
-$(departureDiam)/TolubinskiKostanchuk/TolubinskiKostanchuk.C
-$(departureDiam)/KocamustafaogullariIshii/KocamustafaogullariIshii.C
-
-departureFreq = wallBoilingSubModels/departureFrequencyModels
-$(departureFreq)/departureFrequencyModel/departureFrequencyModel.C
-$(departureFreq)/departureFrequencyModel/departureFrequencyModelNew.C
-$(departureFreq)/Cole/Cole.C
-
-CHFModels = wallBoilingSubModels/CHFModels
-$(CHFModels)/CHFModel/CHFModel.C
-$(CHFModels)/CHFModel/CHFModelNew.C
-$(CHFModels)/Zuber/Zuber.C
-
-CHFSubCoolModels = wallBoilingSubModels/CHFSubCoolModels
-$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModel.C
-$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModelNew.C
-$(CHFSubCoolModels)/HuaXu/HuaXu.C
-
-filmBoiling = wallBoilingSubModels/filmBoilingModels
-$(filmBoiling)/filmBoilingModel/filmBoilingModel.C
-$(filmBoiling)/filmBoilingModel/filmBoilingModelNew.C
-$(filmBoiling)/Bromley/Bromley.C
-
-Leidenfrost = wallBoilingSubModels/LeidenfrostModels
-$(Leidenfrost)/LeidenfrostModel/LeidenfrostModel.C
-$(Leidenfrost)/LeidenfrostModel/LeidenfrostModelNew.C
-$(Leidenfrost)/Spiegler/Spiegler.C
-
-MHFModels = wallBoilingSubModels/MHFModels
-$(MHFModels)/MHFModel/MHFModel.C
-$(MHFModels)/MHFModel/MHFModelNew.C
-$(MHFModels)/Jeschar/Jeschar.C
-
-TDNBModels = wallBoilingSubModels/TDNBModels
-$(TDNBModels)/TDNBModel/TDNBModel.C
-$(TDNBModels)/TDNBModel/TDNBModelNew.C
-$(TDNBModels)/Schroeder/Schroeder.C
-
-alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
-alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
-alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
-alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
-copiedFixedValue/copiedFixedValueFvPatchScalarField.C
-fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libreactingEulerianFvPatchFields

src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/options

@@ -1,21 +0,0 @@
-EXE_INC = \
-    -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 \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools \
-    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels

src/phaseSystemModels/reactingEuler/functionObjects/Make/options

@@ -1,8 +1,7 @@
 phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
 
 EXE_INC = \
-    -I${phaseSystem}/interfacialModels/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
-    -I${phaseSystem}/phaseSystems/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -11,4 +10,4 @@ EXE_INC = \
 LIB_LIBS = \
     -lfiniteVolume \
     -lfieldFunctionObjects \
-    -lreactingPhaseSystem
+    -lreactingMultiphaseSystem

src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files

@@ -1,28 +0,0 @@
-massTransfer = massTransferModels
-
-$(massTransfer)/massTransferModel/massTransferModel.C
-$(massTransfer)/massTransferModel/massTransferModelNew.C
-$(massTransfer)/Frossling/Frossling.C
-$(massTransfer)/sphericalMassTransfer/sphericalMassTransfer.C
-
-surfaceTension = surfaceTensionModels
-$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C
-$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C
-$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
-
-composition = interfaceCompositionModels
-$(composition)/interfaceCompositionModel/interfaceCompositionModel.C
-$(composition)/interfaceCompositionModel/interfaceCompositionModelNew.C
-$(composition)/InterfaceCompositionModel/InterfaceCompositionModels.C
-
-saturation = saturationModels
-$(saturation)/saturationModel/saturationModel.C
-$(saturation)/saturationModel/saturationModelNew.C
-$(saturation)/Antoine/Antoine.C
-$(saturation)/AntoineExtended/AntoineExtended.C
-$(saturation)/ArdenBuck/ArdenBuck.C
-$(saturation)/polynomial/polynomial.C
-$(saturation)/function1/function1.C
-$(saturation)/constantSaturationConditions/constantSaturationConditions.C
-
-LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialCompositionModels

src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/options

@@ -1,22 +0,0 @@
-EXE_INC = \
-    -I../phaseSystems/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
-    -lspecie

src/phaseSystemModels/reactingEuler/interfacialModels/Make/files

@@ -1,92 +0,0 @@
-drag = dragModels
-$(drag)/dragModel/dragModel.C
-$(drag)/dragModel/dragModelNew.C
-$(drag)/Beetstra/Beetstra.C
-$(drag)/segregated/segregated.C
-$(drag)/Ergun/Ergun.C
-$(drag)/Gibilaro/Gibilaro.C
-$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C
-$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
-$(drag)/Lain/Lain.C
-$(drag)/SchillerNaumann/SchillerNaumann.C
-$(drag)/SyamlalOBrien/SyamlalOBrien.C
-$(drag)/TomiyamaCorrelated/TomiyamaCorrelated.C
-$(drag)/TomiyamaAnalytic/TomiyamaAnalytic.C
-$(drag)/Tenneti/Tenneti.C
-$(drag)/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
-$(drag)/WenYu/WenYu.C
-$(drag)/IshiiZuber/IshiiZuber.C
-$(drag)/AttouFerschneider/AttouFerschneider.C
-
-swarm = swarmCorrections
-$(swarm)/swarmCorrection/swarmCorrection.C
-$(swarm)/swarmCorrection/swarmCorrectionNew.C
-$(swarm)/noSwarm/noSwarm.C
-$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C
-
-lift = liftModels
-$(lift)/liftModel/liftModel.C
-$(lift)/liftModel/liftModelNew.C
-$(lift)/noLift/noLift.C
-$(lift)/constantLiftCoefficient/constantLiftCoefficient.C
-$(lift)/Moraga/Moraga.C
-$(lift)/LegendreMagnaudet/LegendreMagnaudet.C
-$(lift)/TomiyamaLift/TomiyamaLift.C
-$(lift)/wallDampedLift/wallDampedLift.C
-
-heatTransfer = heatTransferModels
-$(heatTransfer)/heatTransferModel/heatTransferModel.C
-$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
-$(heatTransfer)/constantNu/constantNuHeatTransfer.C
-$(heatTransfer)/RanzMarshall/RanzMarshall.C
-$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C
-
-virtualMass = virtualMassModels
-$(virtualMass)/virtualMassModel/virtualMassModel.C
-$(virtualMass)/virtualMassModel/virtualMassModelNew.C
-$(virtualMass)/noVirtualMass/noVirtualMass.C
-$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
-$(virtualMass)/Lamb/Lamb.C
-
-lubrication = wallLubricationModels
-$(lubrication)/wallLubricationModel/wallLubricationModel.C
-$(lubrication)/wallLubricationModel/wallLubricationModelNew.C
-$(lubrication)/noWallLubrication/noWallLubrication.C
-$(lubrication)/Antal/Antal.C
-$(lubrication)/Frank/Frank.C
-$(lubrication)/TomiyamaWallLubrication/TomiyamaWallLubrication.C
-
-dispersion = turbulentDispersionModels
-$(dispersion)/turbulentDispersionModel/turbulentDispersionModel.C
-$(dispersion)/turbulentDispersionModel/turbulentDispersionModelNew.C
-$(dispersion)/noTurbulentDispersion/noTurbulentDispersion.C
-$(dispersion)/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
-$(dispersion)/Burns/Burns.C
-$(dispersion)/Gosman/Gosman.C
-$(dispersion)/LopezDeBertodano/LopezDeBertodano.C
-
-aspectRatio = aspectRatioModels
-$(aspectRatio)/aspectRatioModel/aspectRatioModel.C
-$(aspectRatio)/aspectRatioModel/aspectRatioModelNew.C
-$(aspectRatio)/constantAspectRatio/constantAspectRatio.C
-$(aspectRatio)/TomiyamaAspectRatio/TomiyamaAspectRatio.C
-$(aspectRatio)/VakhrushevEfremov/VakhrushevEfremov.C
-$(aspectRatio)/Wellek/Wellek.C
-
-wallDependentModel/wallDependentModel.C
-
-damping = wallDampingModels
-$(damping)/wallDampingModel/wallDampingModel.C
-$(damping)/wallDampingModel/wallDampingModelNew.C
-$(damping)/noWallDamping/noWallDamping.C
-$(damping)/interpolated/interpolatedWallDamping.C
-$(damping)/linear/linearWallDamping.C
-$(damping)/cosine/cosineWallDamping.C
-$(damping)/sine/sineWallDamping.C
-
-phaseTransfer = phaseTransferModels
-$(phaseTransfer)/phaseTransferModel/phaseTransferModel.C
-$(phaseTransfer)/phaseTransferModel/phaseTransferModelNew.C
-$(phaseTransfer)/deposition/deposition.C
-
-LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialModels

src/phaseSystemModels/reactingEuler/interfacialModels/Make/options

@@ -1,19 +0,0 @@
-EXE_INC = \
-    -I../phaseSystems/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lfluidThermophysicalModels \
-    -lcompressibleTransportModels \
-    -lspecie \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels

src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files

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

src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options

@@ -1,27 +0,0 @@
-EXE_INC = \
-    -I../multiphaseSystem/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)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools \
-    -lreactingMultiphaseSystem \
-    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels \
-    -lreactingEulerianFvPatchFields \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels

src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files

@@ -1,7 +1,262 @@
+phaseModel/phaseModel/phaseModel.C
+phaseModel/phaseModel/phaseModelNew.C
+phaseModel/phaseModel/phaseModels.C
+
+phasePair/phasePairKey.C
+phasePair/phasePair.C
+phasePair/orderedPhasePair.C
+
+phaseSystem/phaseSystem.C
+
 multiphaseSystem/multiphaseSystem.C
 multiphaseSystem/multiphaseSystemNew.C
 multiphaseSystem/multiphaseSystems.C
 
-alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+reactionThermo/hRefConstThermos.C
+
+diameter = diameterModels
+$(diameter)/diameterModel/diameterModel.C
+$(diameter)/diameterModel/diameterModelNew.C
+$(diameter)/constantDiameter/constantDiameter.C
+$(diameter)/isothermalDiameter/isothermalDiameter.C
+$(diameter)/linearTsubDiameter/linearTsubDiameter.C
+$(diameter)/velocityGroup/velocityGroup.C
+$(diameter)/velocityGroup/sizeGroup/sizeGroup.C
+
+
+populationBalanceModel/populationBalanceModel/populationBalanceModel.C
+
+coalescence = populationBalanceModel/coalescenceModels
+$(coalescence)/coalescenceModel/coalescenceModel.C
+$(coalescence)/constantCoalescence/constantCoalescence.C
+$(coalescence)/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
+$(coalescence)/hydrodynamic/hydrodynamic.C
+$(coalescence)/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
+$(coalescence)/Luo/Luo.C
+$(coalescence)/PrinceBlanch/PrinceBlanch.C
+
+binaryBreakup = populationBalanceModel/binaryBreakupModels
+$(binaryBreakup)/binaryBreakupModel/binaryBreakupModel.C
+$(binaryBreakup)/LuoSvendsen/LuoSvendsen.C
+$(binaryBreakup)/LehrMilliesMewes/LehrMilliesMewes.C
+$(binaryBreakup)/powerLawUniformBinary/powerLawUniformBinary.C
+
+breakup = populationBalanceModel/breakupModels
+$(breakup)/breakupModel/breakupModel.C
+$(breakup)/exponential/exponential.C
+$(breakup)/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
+$(breakup)/powerLaw/powerLaw.C
+
+daughterSize = populationBalanceModel/daughterSizeDistributionModels
+$(daughterSize)/daughterSizeDistributionModel/daughterSizeDistributionModel.C
+$(daughterSize)/uniformBinary/uniformBinary.C
+$(daughterSize)/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
+
+drift = populationBalanceModel/driftModels
+$(drift)/driftModel/driftModel.C
+$(drift)/constantDrift/constantDrift.C
+$(drift)/densityChange/densityChange.C
+$(drift)/phaseChange/phaseChange.C
+
+nucleation = populationBalanceModel/nucleationModels
+$(nucleation)/nucleationModel/nucleationModel.C
+$(nucleation)/constantNucleation/constantNucleation.C
+$(nucleation)/wallBoiling/wallBoiling.C
+
+blending = BlendedInterfacialModel/blendingMethods
+$(blending)/blendingMethod/blendingMethod.C
+$(blending)/blendingMethod/blendingMethodNew.C
+$(blending)/noBlending/noBlending.C
+$(blending)/linear/linear.C
+$(blending)/hyperbolic/hyperbolic.C
+
+
+interfacialModels/wallDependentModel/wallDependentModel.C
+
+aspectRatio = interfacialModels/aspectRatioModels
+$(aspectRatio)/aspectRatioModel/aspectRatioModel.C
+$(aspectRatio)/aspectRatioModel/aspectRatioModelNew.C
+$(aspectRatio)/constantAspectRatio/constantAspectRatio.C
+$(aspectRatio)/TomiyamaAspectRatio/TomiyamaAspectRatio.C
+$(aspectRatio)/VakhrushevEfremov/VakhrushevEfremov.C
+$(aspectRatio)/Wellek/Wellek.C
+
+drag = interfacialModels/dragModels
+$(drag)/dragModel/dragModel.C
+$(drag)/dragModel/dragModelNew.C
+$(drag)/Beetstra/Beetstra.C
+$(drag)/segregated/segregated.C
+$(drag)/Ergun/Ergun.C
+$(drag)/Gibilaro/Gibilaro.C
+$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+$(drag)/Lain/Lain.C
+$(drag)/SchillerNaumann/SchillerNaumann.C
+$(drag)/SyamlalOBrien/SyamlalOBrien.C
+$(drag)/TomiyamaCorrelated/TomiyamaCorrelated.C
+$(drag)/TomiyamaAnalytic/TomiyamaAnalytic.C
+$(drag)/Tenneti/Tenneti.C
+$(drag)/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
+$(drag)/WenYu/WenYu.C
+$(drag)/IshiiZuber/IshiiZuber.C
+$(drag)/AttouFerschneider/AttouFerschneider.C
+
+lift = interfacialModels/liftModels
+$(lift)/liftModel/liftModel.C
+$(lift)/liftModel/liftModelNew.C
+$(lift)/noLift/noLift.C
+$(lift)/constantLiftCoefficient/constantLiftCoefficient.C
+$(lift)/Moraga/Moraga.C
+$(lift)/LegendreMagnaudet/LegendreMagnaudet.C
+$(lift)/TomiyamaLift/TomiyamaLift.C
+$(lift)/wallDampedLift/wallDampedLift.C
+
+heatTransfer = interfacialModels/heatTransferModels
+$(heatTransfer)/heatTransferModel/heatTransferModel.C
+$(heatTransfer)/heatTransferModel/heatTransferModelNew.C
+$(heatTransfer)/constantNu/constantNuHeatTransfer.C
+$(heatTransfer)/RanzMarshall/RanzMarshall.C
+$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C
+
+phaseTransfer = interfacialModels/phaseTransferModels
+$(phaseTransfer)/phaseTransferModel/phaseTransferModel.C
+$(phaseTransfer)/phaseTransferModel/phaseTransferModelNew.C
+$(phaseTransfer)/deposition/deposition.C
+
+swarm = interfacialModels/swarmCorrections
+$(swarm)/swarmCorrection/swarmCorrection.C
+$(swarm)/swarmCorrection/swarmCorrectionNew.C
+$(swarm)/noSwarm/noSwarm.C
+$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C
+
+dispersion = interfacialModels/turbulentDispersionModels
+$(dispersion)/turbulentDispersionModel/turbulentDispersionModel.C
+$(dispersion)/turbulentDispersionModel/turbulentDispersionModelNew.C
+$(dispersion)/noTurbulentDispersion/noTurbulentDispersion.C
+$(dispersion)/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+$(dispersion)/Burns/Burns.C
+$(dispersion)/Gosman/Gosman.C
+$(dispersion)/LopezDeBertodano/LopezDeBertodano.C
+
+virtualMass = interfacialModels/virtualMassModels
+$(virtualMass)/virtualMassModel/virtualMassModel.C
+$(virtualMass)/virtualMassModel/virtualMassModelNew.C
+$(virtualMass)/noVirtualMass/noVirtualMass.C
+$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+$(virtualMass)/Lamb/Lamb.C
+
+damping = interfacialModels/wallDampingModels
+$(damping)/wallDampingModel/wallDampingModel.C
+$(damping)/wallDampingModel/wallDampingModelNew.C
+$(damping)/noWallDamping/noWallDamping.C
+$(damping)/interpolated/interpolatedWallDamping.C
+$(damping)/linear/linearWallDamping.C
+$(damping)/cosine/cosineWallDamping.C
+$(damping)/sine/sineWallDamping.C
+
+lubrication = interfacialModels/wallLubricationModels
+$(lubrication)/wallLubricationModel/wallLubricationModel.C
+$(lubrication)/wallLubricationModel/wallLubricationModelNew.C
+$(lubrication)/noWallLubrication/noWallLubrication.C
+$(lubrication)/Antal/Antal.C
+$(lubrication)/Frank/Frank.C
+$(lubrication)/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+
+composition = interfacialCompositionModels/interfaceCompositionModels
+$(composition)/interfaceCompositionModel/interfaceCompositionModel.C
+$(composition)/interfaceCompositionModel/interfaceCompositionModelNew.C
+$(composition)/InterfaceCompositionModel/InterfaceCompositionModels.C
+
+massTransfer = interfacialCompositionModels/massTransferModels
+$(massTransfer)/massTransferModel/massTransferModel.C
+$(massTransfer)/massTransferModel/massTransferModelNew.C
+$(massTransfer)/Frossling/Frossling.C
+$(massTransfer)/sphericalMassTransfer/sphericalMassTransfer.C
+
+saturation = interfacialCompositionModels/saturationModels
+$(saturation)/saturationModel/saturationModel.C
+$(saturation)/saturationModel/saturationModelNew.C
+$(saturation)/Antoine/Antoine.C
+$(saturation)/AntoineExtended/AntoineExtended.C
+$(saturation)/ArdenBuck/ArdenBuck.C
+$(saturation)/polynomial/polynomial.C
+$(saturation)/function1/function1.C
+$(saturation)/constantSaturationConditions/constantSaturationConditions.C
+
+surfaceTension = interfacialCompositionModels/surfaceTensionModels
+$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C
+$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C
+$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+
+
+derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+
+derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C
+
+/* wall-boiling */
+
+wallBoilingSubModels = derivedFvPatchFields/wallBoilingSubModels
+
+partitioning = $(wallBoilingSubModels)/partitioningModels
+$(partitioning)/partitioningModel/partitioningModel.C
+$(partitioning)/partitioningModel/partitioningModelNew.C
+$(partitioning)/phaseFraction/phaseFraction.C
+$(partitioning)/Lavieville/Lavieville.C
+$(partitioning)/cosine/cosine.C
+$(partitioning)/linear/linear.C
+
+nucleationSite = $(wallBoilingSubModels)/nucleationSiteModels
+$(nucleationSite)/nucleationSiteModel/nucleationSiteModel.C
+$(nucleationSite)/nucleationSiteModel/nucleationSiteModelNew.C
+$(nucleationSite)/LemmertChawla/LemmertChawla.C
+
+departureDiam = $(wallBoilingSubModels)/departureDiameterModels
+$(departureDiam)/departureDiameterModel/departureDiameterModel.C
+$(departureDiam)/departureDiameterModel/departureDiameterModelNew.C
+$(departureDiam)/TolubinskiKostanchuk/TolubinskiKostanchuk.C
+$(departureDiam)/KocamustafaogullariIshii/KocamustafaogullariIshii.C
+
+departureFreq = $(wallBoilingSubModels)/departureFrequencyModels
+$(departureFreq)/departureFrequencyModel/departureFrequencyModel.C
+$(departureFreq)/departureFrequencyModel/departureFrequencyModelNew.C
+$(departureFreq)/Cole/Cole.C
+
+CHFModels = $(wallBoilingSubModels)/CHFModels
+$(CHFModels)/CHFModel/CHFModel.C
+$(CHFModels)/CHFModel/CHFModelNew.C
+$(CHFModels)/Zuber/Zuber.C
+
+CHFSubCoolModels = $(wallBoilingSubModels)/CHFSubCoolModels
+$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModel.C
+$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModelNew.C
+$(CHFSubCoolModels)/HuaXu/HuaXu.C
+
+filmBoiling = $(wallBoilingSubModels)/filmBoilingModels
+$(filmBoiling)/filmBoilingModel/filmBoilingModel.C
+$(filmBoiling)/filmBoilingModel/filmBoilingModelNew.C
+$(filmBoiling)/Bromley/Bromley.C
+
+Leidenfrost = $(wallBoilingSubModels)/LeidenfrostModels
+$(Leidenfrost)/LeidenfrostModel/LeidenfrostModel.C
+$(Leidenfrost)/LeidenfrostModel/LeidenfrostModelNew.C
+$(Leidenfrost)/Spiegler/Spiegler.C
+
+MHFModels = $(wallBoilingSubModels)/MHFModels
+$(MHFModels)/MHFModel/MHFModel.C
+$(MHFModels)/MHFModel/MHFModelNew.C
+$(MHFModels)/Jeschar/Jeschar.C
+
+TDNBModels = $(wallBoilingSubModels)/TDNBModels
+$(TDNBModels)/TDNBModel/TDNBModel.C
+$(TDNBModels)/TDNBModel/TDNBModelNew.C
+$(TDNBModels)/Schroeder/Schroeder.C
+
+/* Turbulence */
+turbulence/multiphaseCompressibleTurbulenceModels.C
 
 LIB = $(FOAM_LIBBIN)/libreactingMultiphaseSystem

src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options

@@ -1,25 +1,26 @@
 EXE_INC = \
-    -I../interfacialModels/lnInclude \
-    -I../interfacialCompositionModels/lnInclude \
-    -I../phaseSystems/lnInclude \
-    -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/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
+    -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)/combustionModels/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
-    -lfvOptions \
     -lmeshTools \
-    -lsampling \
+    -lcombustionModels \
-    -lcombustionModels
+    -lfluidThermophysicalModels \
+    -lreactionThermophysicalModels \
+    -lcompressibleTransportModels \
+    -lspecie \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels