Commit 915c0785 authored by Mark Olesen's avatar Mark Olesen Committed by Sergio Ferraris
Browse files

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.
parent 03526e20
......@@ -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
......@@ -26,7 +26,6 @@ EXE_LIBS = \
-lcompressibleTransportModels \
-lradiationModels \
-lfluidThermophysicalModels \
-lmassTransferModels \
-lsolidThermo \
-lsolidSpecie \
-ltwoPhaseProperties \
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -2,7 +2,6 @@
cd "${0%/*}" || exit # Run from this directory
#------------------------------------------------------------------------------
wclean libso interfacialModels
wclean libso multiphaseSystem
#------------------------------------------------------------------------------
......@@ -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
#------------------------------------------------------------------------------
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
EXE_INC = \
-I../multiphaseSystem/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lfiniteVolume \
-lmultiphaseSystem
......@@ -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
EXE_INC = \
-I../phaseModel/lnInclude \
-I../interfacialModels/lnInclude \
-IalphaContactAngle \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
......
......@@ -3,7 +3,6 @@ cd "${0%/*}" || exit # Run from this directory
#------------------------------------------------------------------------------
wclean libso phasesSystem
wclean libso massTransferModels
wclean libso compressibleMultiPhaseTurbulenceModels
#------------------------------------------------------------------------------
......@@ -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
#------------------------------------------------------------------------------
interfaceCompositionModel/interfaceCompositionModel.C
interfaceCompositionModel/interfaceCompositionModelNew.C
InterfaceCompositionModel/InterfaceCompositionModels.C
LIB = $(FOAM_LIBBIN)/libmassTransferModels
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
......@@ -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
$(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
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
......@@ -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
#------------------------------------------------------------------------------
......@@ -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
#------------------------------------------------------------------------------
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
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
phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler
EXE_INC = \
-I${phaseSystem}/interfacialModels/lnInclude \
-I${phaseSystem}/phaseSystems/lnInclude \
-I${phaseSystem}/multiphaseSystem/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
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
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
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