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}/interfacialModels/lnInclude \
-    -I${phaseSystem}/interfacialCompositionModels/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/lnInclude \
     -I./fluid \
     -I../solid \
     -I../fluid \
@@ -36,6 +34,6 @@ EXE_LIBS = \
     -lsolidThermo \
     -lradiationModels \
     -lregionModels \
+    -lreactingMultiphaseSystem \
     -lreactingTwoPhaseSystem \
-    -ltwoPhaseReactingTurbulenceModels \
-    -lreactingPhaseSystem
+    -ltwoPhaseReactingTurbulenceModels

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 \
-    -lcompressibleMultiphaseEulerianInterfacialModels
+    -lmultiphaseSystem

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 \
-    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels \
-    -lmultiphaseReactingTurbulenceModels
+    -lreactingMultiphaseSystem

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}/interfacialCompositionModels/lnInclude \
-    -I${phaseSystem}/interfacialModels/lnInclude \
+    -I${phaseSystem}/multiphaseSystem/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

-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

-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
 
-alphaContactAngle/alphaContactAngleFvPatchScalarField.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

 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

-interfaceCompositionModel/interfaceCompositionModel.C
-interfaceCompositionModel/interfaceCompositionModelNew.C
-
-InterfaceCompositionModel/InterfaceCompositionModels.C
-
-LIB = $(FOAM_LIBBIN)/libmassTransferModels

src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options

-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
-interfaceModels/porousModels/porousModel/porousModelNew.C
-interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
+interfaceCompositionModel/interfaceCompositionModel.C
+interfaceCompositionModel/interfaceCompositionModelNew.C
+InterfaceCompositionModel/InterfaceCompositionModels.C
+
+porous = interfaceModels/porousModels