multiphaseEuler: Library reorganisation

This change makes multiphaseEuler more consistent with other modules and
makes its sub-libraries less inter-dependent. Some left-over references
to multiphaseEulerFoam have also been removed.

applications/modules/multiphaseEuler/Allwclean

@@ -1,13 +1,16 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-wclean libso phaseSystems
+wclean libso phaseSystem
 wclean libso interfacialModels
-wclean libso interfacialCompositionModels
-wclean libso multiphaseCompressibleMomentumTransportModels
-wclean libso multiphaseThermophysicalTransportModels
-wclean libso multiphaseReactions
-multiphaseEuler/Allwclean
+wclean libso populationBalance
+wclean libso momentumTransportModels
+wclean libso thermophysicalTransportModels
+wclean libso reactions
+wclean libso phaseSystems
+
+wclean
+
 wclean libso fvModels
 wclean libso functionObjects
 

applications/modules/multiphaseEuler/Allwmake

@@ -4,13 +4,16 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-wmake $targetType phaseSystems
+wmake $targetType phaseSystem
 wmake $targetType interfacialModels
-wmake $targetType interfacialCompositionModels
-wmake $targetType multiphaseCompressibleMomentumTransportModels
-wmake $targetType multiphaseThermophysicalTransportModels
-wmake $targetType multiphaseReactions
-multiphaseEuler/Allwmake $targetType $*
+wmake $targetType populationBalance
+wmake $targetType momentumTransportModels
+wmake $targetType thermophysicalTransportModels
+wmake $targetType reactions
+wmake $targetType phaseSystems
+
+wmake $targetType
+
 wmake $targetType fvModels
 wmake $targetType functionObjects
 

applications/modules/multiphaseEuler/Make/options

@@ -1,33 +1,21 @@
 EXE_INC = \
     -I$(FOAM_MODULES)/fluidSolver/lnInclude \
-    -I../include \
-    -I../phaseSystems/lnInclude \
-    -I../interfacialModels/lnInclude \
-    -I../interfacialCompositionModels/lnInclude \
+    -IphaseSystem/lnInclude \
+    -IinterfacialModels/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude
 
 LIB_LIBS = \
     -lfluidSolver \
-    -lphaseSystem \
-    -lmultiphaseSystems \
-    -leulerianInterfacialModels \
-    -leulerianInterfacialCompositionModels \
-    -lmultiphaseMomentumTransportModels \
-    -lmultiphaseThermophysicalTransportModels \
-    -lmultiphaseReactions \
-    -lmultiphaseProperties \
-    -lphaseFluidThermophysicalTransportModels \
-    -lphaseFluidMulticomponentThermophysicalTransportModels \
-    -lfiniteVolume \
+    -lphaseSystems \
+    -lmultiphaseEulerReactions \
     -lfvModels \
-    -lfvConstraints \
-    -lmeshTools
+    -lfvConstraints

applications/modules/multiphaseEuler/functionObjects/Make/files

@@ -4,4 +4,4 @@ phaseForces/phaseForces.C
 phaseMap/phaseMap.C
 wallBoilingProperties/wallBoilingProperties.C
 
-LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFoamFunctionObjects
+LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFunctionObjects

applications/modules/multiphaseEuler/functionObjects/Make/options

@@ -1,8 +1,14 @@
 EXE_INC = \
-    -I../phaseSystems/lnInclude \
+    -I../phaseSystem/lnInclude \
     -I../interfacialModels/lnInclude \
-    -I../multiphaseCompressibleMomentumTransportModels/lnInclude \
-    -I../multiphaseThermophysicalTransportModels/lnInclude \
+    -I../populationBalance/lnInclude \
+    -I../momentumTransportModels/lnInclude \
+    -I../thermophysicalTransportModels/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/functionObjects/field/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
@@ -10,25 +16,8 @@ EXE_INC = \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/functionObjects/field/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
 
 LIB_LIBS = \
-    -lphaseSystem \
-    -lmultiphaseSystems \
-    -leulerianInterfacialModels \
-    -leulerianInterfacialCompositionModels \
-    -lmultiphaseMomentumTransportModels \
-    -lmultiphaseThermophysicalTransportModels \
-    -lmultiphaseReactions \
-    -lmultiphaseProperties \
-    -lphaseFluidThermophysicalTransportModels \
-    -lphaseFluidMulticomponentThermophysicalTransportModels \
-    -lcompressibleTwoPhases \
-    -lfiniteVolume \
-    -lmeshTools \
+    -lphaseSystems \
     -lfileFormats \
     -lfieldFunctionObjects

applications/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H

@@ -28,7 +28,7 @@ Description
     This functionObject calculates and outputs the blended interfacial forces
     acting on a given phase, i.e. drag, virtual mass, lift, wall-lubrication and
     turbulent dispersion. Note that it works only in run-time processing mode
-    and in combination with the multiphaseEulerFoam solver.
+    and in combination with the multiphaseEuler solver module.
 
     For a simulation involving more than two phases, the accumulated force is
     calculated by looping over all interfaces involving that phase. The fields
@@ -41,7 +41,7 @@ Description
     {
         type            phaseForces;
 
-        libs ("libmultiphaseEulerFoamFunctionObjects.so");
+        libs ("libmultiphaseEulerFunctionObjects.so");
 
         phase           water;
     }

applications/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H

@@ -34,7 +34,7 @@ Description
     phaseMap
     {
         type            phaseMap;
-        libs            ("libmultiphaseEulerFoamFunctionObjects.so");
+        libs            ("libmultiphaseEulerFunctionObjects.so");
         writeControl    writeTime;
     }
     \endverbatim

applications/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H

@@ -37,7 +37,7 @@ Description
     populationBalanceMoments
     {
         type                populationBalanceMoments;
-        libs                ("libmultiphaseEulerFoamFunctionObjects.so");
+        libs                ("libmultiphaseEulerFunctionObjects.so");
         executeControl      timeStep;
         writeControl        writeTime;
         populationBalance   bubbles;

applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H

@@ -37,7 +37,7 @@ Description
     numberDensity
     {
         type                populationBalanceSizeDistribution;
-        libs                ("libmultiphaseEulerFoamFunctionObjects.so");
+        libs                ("libmultiphaseEulerFunctionObjects.so");
         writeControl        writeTime;
         populationBalance   bubbles;
         functionType        numberDensity;

applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H

@@ -40,7 +40,7 @@ Description
     writeWallBoilingProperties
     {
         type            wallBoilingProperties;
-        libs            ( "libmultiphaseEulerFoamFunctionObjects.so" );
+        libs            ( "libmultiphaseEulerFunctionObjects.so" );
         writeControl    writeTime;
         phase           liquid;
     }

applications/modules/multiphaseEuler/fvModels/Make/files

@@ -1,4 +1,4 @@
 phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C
 interfaceTurbulenceDamping/interfaceTurbulenceDamping.C
 
-LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFoamFvModels
+LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFvModels

applications/modules/multiphaseEuler/fvModels/Make/options

@@ -1,26 +1,15 @@
 EXE_INC = \
-    -I../phaseSystems/lnInclude \
+    -I../phaseSystem/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude
 
 LIB_LIBS = \
-    -lphaseSystem \
-    -lmultiphaseSystems \
-    -leulerianInterfacialModels \
-    -leulerianInterfacialCompositionModels \
-    -lmultiphaseMomentumTransportModels \
-    -lmultiphaseReactions \
-    -lmultiphaseProperties \
-    -lphaseFluidThermophysicalTransportModels \
-    -lphaseFluidMulticomponentThermophysicalTransportModels \
-    -lcompressibleTwoPhases \
-    -lfiniteVolume \
-    -lfvModels \
-    -lmeshTools
+    -lphaseSystems

applications/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H

@@ -55,7 +55,7 @@ Usage
     {
         type    interfaceTurbulenceDamping;
 
-        libs    ("libmultiphaseEulerFoamFvModels.so");
+        libs    ("libmultiphaseEulerFvModels.so");
 
         phase   water;
 

applications/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H

@@ -56,7 +56,7 @@ Usage
     {
         type    phaseTurbulenceStabilisation;
 
-        libs    ("libmultiphaseEulerFoamFvModels.so");
+        libs    ("libmultiphaseEulerFvModels.so");
 
         phase   air;
 

applications/modules/multiphaseEuler/interfacialCompositionModels/Make/files

@@ -1,20 +0,0 @@
-diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C
-diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C
-diffusiveMassTransferModels/Frossling/Frossling.C
-diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C
-
-interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C
-interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C
-interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
-
-interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
-interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C
-interfaceCompositionModels/Henry/Henry.C
-interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C
-interfaceCompositionModels/Raoult/Raoult.C
-interfaceCompositionModels/saturated/saturated.C
-
-interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C
-interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C
-
-LIB = $(FOAM_LIBBIN)/libeulerianInterfacialCompositionModels

applications/modules/multiphaseEuler/interfacialModels/Make/files

@@ -90,4 +90,23 @@ phaseTransferModels/cavitation/cavitation.C
 phaseTransferModels/deposition/deposition.C
 phaseTransferModels/reactionDriven/reactionDriven.C
 
-LIB = $(FOAM_LIBBIN)/libeulerianInterfacialModels
+diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C
+diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C
+diffusiveMassTransferModels/Frossling/Frossling.C
+diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C
+
+interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C
+interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C
+interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+
+interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
+interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C
+interfaceCompositionModels/Henry/Henry.C
+interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C
+interfaceCompositionModels/Raoult/Raoult.C
+interfaceCompositionModels/saturated/saturated.C
+
+interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C
+interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C
+
+LIB = $(FOAM_LIBBIN)/libmultiphaseEulerInterfacialModels

applications/modules/multiphaseEuler/interfacialModels/Make/options

@@ -1,21 +1,21 @@
 EXE_INC = \
-    -I../phaseSystems/lnInclude \
+    -I../phaseSystem/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/saturationModels/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
     -I$(LIB_SRC)/twoPhaseModels/compressibleCavitation/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude
 
 LIB_LIBS = \
     -lphaseSystem \
-    -lfluidThermophysicalModels \
-    -lsaturationModels \
-    -lspecie \
     -lcompressibleCavitationModels

applications/modules/multiphaseEuler/momentumTransportModels/Make/files

@@ -1,4 +1,4 @@
-multiphaseCompressibleMomentumTransportModels.C
+momentumTransportModels.C
 
 phasePressureModel/phasePressureModel.C
 
@@ -37,4 +37,4 @@ kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJackson
 derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C
 derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C
 
-LIB = $(FOAM_LIBBIN)/libmultiphaseMomentumTransportModels
+LIB = $(FOAM_LIBBIN)/libmultiphaseEulerMomentumTransportModels

applications/modules/multiphaseEuler/momentumTransportModels/Make/options

@@ -1,7 +1,9 @@
 EXE_INC = \
-    -I../phaseSystems/lnInclude \
+    -I../phaseSystem/lnInclude \
     -I../interfacialModels/lnInclude \
-    -I../interfacialCompositionModels/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -11,13 +13,9 @@ EXE_INC = \
     -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude
 
 LIB_LIBS = \
     -lphaseSystem \
-    -leulerianInterfacialModels \
-    -leulerianInterfacialCompositionModels \
+    -lmultiphaseEulerInterfacialModels \
     -lphaseCompressibleMomentumTransportModels