diff --git a/applications/modules/multiphaseEuler/Allwclean b/applications/modules/multiphaseEuler/Allwclean index 1fdda9dd73..256c3624f9 100755 --- a/applications/modules/multiphaseEuler/Allwclean +++ b/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 diff --git a/applications/modules/multiphaseEuler/Allwmake b/applications/modules/multiphaseEuler/Allwmake index 4f3188ffa6..0014cec8c9 100755 --- a/applications/modules/multiphaseEuler/Allwmake +++ b/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 diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/Make/files b/applications/modules/multiphaseEuler/Make/files similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/Make/files rename to applications/modules/multiphaseEuler/Make/files diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/Make/options b/applications/modules/multiphaseEuler/Make/options similarity index 50% rename from applications/modules/multiphaseEuler/multiphaseEuler/Make/options rename to applications/modules/multiphaseEuler/Make/options index 69f15f7aa0..be3b9d3f5b 100644 --- a/applications/modules/multiphaseEuler/multiphaseEuler/Make/options +++ b/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 diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C b/applications/modules/multiphaseEuler/cellPressureCorrector.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C rename to applications/modules/multiphaseEuler/cellPressureCorrector.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/compressibilityEqns.C b/applications/modules/multiphaseEuler/compressibilityEqns.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/compressibilityEqns.C rename to applications/modules/multiphaseEuler/compressibilityEqns.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C b/applications/modules/multiphaseEuler/facePressureCorrector.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C rename to applications/modules/multiphaseEuler/facePressureCorrector.C diff --git a/applications/modules/multiphaseEuler/functionObjects/Make/files b/applications/modules/multiphaseEuler/functionObjects/Make/files index 7fcf3645e3..0f92efbc1e 100644 --- a/applications/modules/multiphaseEuler/functionObjects/Make/files +++ b/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 diff --git a/applications/modules/multiphaseEuler/functionObjects/Make/options b/applications/modules/multiphaseEuler/functionObjects/Make/options index b46aad2356..144bdca398 100644 --- a/applications/modules/multiphaseEuler/functionObjects/Make/options +++ b/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 diff --git a/applications/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H b/applications/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H index 1358b5fc60..a274e0dc0e 100644 --- a/applications/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H +++ b/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; } diff --git a/applications/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H b/applications/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H index 3f9269db0f..2e114d129d 100644 --- a/applications/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H +++ b/applications/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H @@ -34,7 +34,7 @@ Description phaseMap { type phaseMap; - libs ("libmultiphaseEulerFoamFunctionObjects.so"); + libs ("libmultiphaseEulerFunctionObjects.so"); writeControl writeTime; } \endverbatim diff --git a/applications/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H b/applications/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H index e7d55a885a..f45a8bdbfa 100644 --- a/applications/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H +++ b/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; diff --git a/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H b/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H index d8b15c59d3..250bf84464 100644 --- a/applications/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H +++ b/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; diff --git a/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H b/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H index 4c49553c1f..2126a7d27e 100644 --- a/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H +++ b/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; } diff --git a/applications/modules/multiphaseEuler/fvModels/Make/files b/applications/modules/multiphaseEuler/fvModels/Make/files index 44e83034b9..d8d2f60340 100644 --- a/applications/modules/multiphaseEuler/fvModels/Make/files +++ b/applications/modules/multiphaseEuler/fvModels/Make/files @@ -1,4 +1,4 @@ phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C interfaceTurbulenceDamping/interfaceTurbulenceDamping.C -LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFoamFvModels +LIB = $(FOAM_LIBBIN)/libmultiphaseEulerFvModels diff --git a/applications/modules/multiphaseEuler/fvModels/Make/options b/applications/modules/multiphaseEuler/fvModels/Make/options index 2020ed73dd..680ca4e58d 100644 --- a/applications/modules/multiphaseEuler/fvModels/Make/options +++ b/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 diff --git a/applications/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H index fd5f08e2c1..005e4b8898 100644 --- a/applications/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H +++ b/applications/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H @@ -55,7 +55,7 @@ Usage { type interfaceTurbulenceDamping; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase water; diff --git a/applications/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H index e84c0dd395..9c2468ad4c 100644 --- a/applications/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H +++ b/applications/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H @@ -56,7 +56,7 @@ Usage { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase air; diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/Make/files b/applications/modules/multiphaseEuler/interfacialCompositionModels/Make/files deleted file mode 100644 index 169c4a40be..0000000000 --- a/applications/modules/multiphaseEuler/interfacialCompositionModels/Make/files +++ /dev/null @@ -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 diff --git a/applications/modules/multiphaseEuler/interfacialModels/Make/files b/applications/modules/multiphaseEuler/interfacialModels/Make/files index 8970e35504..0b3a539f95 100644 --- a/applications/modules/multiphaseEuler/interfacialModels/Make/files +++ b/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 diff --git a/applications/modules/multiphaseEuler/interfacialModels/Make/options b/applications/modules/multiphaseEuler/interfacialModels/Make/options index 6f50568bac..36fd2b6e20 100644 --- a/applications/modules/multiphaseEuler/interfacialModels/Make/options +++ b/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 diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/Frossling/Frossling.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/Frossling/Frossling.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/Frossling/Frossling.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/Frossling/Frossling.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H b/applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H rename to applications/modules/multiphaseEuler/interfacialModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Henry/Henry.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Henry/Henry.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Henry/Henry.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Henry/Henry.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Raoult/Raoult.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Raoult/Raoult.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Raoult/Raoult.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/Raoult/Raoult.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/saturated/saturated.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/saturated/saturated.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/saturated/saturated.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceCompositionModels/saturated/saturated.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H b/applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C b/applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C rename to applications/modules/multiphaseEuler/interfacialModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/momentumPredictor.C b/applications/modules/multiphaseEuler/momentumPredictor.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/momentumPredictor.C rename to applications/modules/multiphaseEuler/momentumPredictor.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files b/applications/modules/multiphaseEuler/momentumTransportModels/Make/files similarity index 95% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files rename to applications/modules/multiphaseEuler/momentumTransportModels/Make/files index a4b5ab7648..feae53232b 100644 --- a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files +++ b/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 diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options b/applications/modules/multiphaseEuler/momentumTransportModels/Make/options similarity index 76% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options rename to applications/modules/multiphaseEuler/momentumTransportModels/Make/options index 80d55d1d2e..709e17ab56 100644 --- a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options +++ b/applications/modules/multiphaseEuler/momentumTransportModels/Make/options @@ -1,7 +1,9 @@ EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I../interfacialModels/lnInclude\ - -I../interfacialCompositionModels/lnInclude \ + -I../phaseSystem/lnInclude \ + -I../interfacialModels/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 diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to applications/modules/multiphaseEuler/momentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C b/applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C rename to applications/modules/multiphaseEuler/momentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C b/applications/modules/multiphaseEuler/momentumTransportModels/momentumTransportModels.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C rename to applications/modules/multiphaseEuler/momentumTransportModels/momentumTransportModels.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C b/applications/modules/multiphaseEuler/momentumTransportModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C rename to applications/modules/multiphaseEuler/momentumTransportModels/phasePressureModel/phasePressureModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H b/applications/modules/multiphaseEuler/momentumTransportModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H rename to applications/modules/multiphaseEuler/momentumTransportModels/phasePressureModel/phasePressureModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/moveMesh.C b/applications/modules/multiphaseEuler/moveMesh.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/moveMesh.C rename to applications/modules/multiphaseEuler/moveMesh.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C b/applications/modules/multiphaseEuler/multiphaseEuler.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C rename to applications/modules/multiphaseEuler/multiphaseEuler.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.H b/applications/modules/multiphaseEuler/multiphaseEuler.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.H rename to applications/modules/multiphaseEuler/multiphaseEuler.H diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/Allwclean b/applications/modules/multiphaseEuler/multiphaseEuler/Allwclean deleted file mode 100755 index 5d0dac0c4e..0000000000 --- a/applications/modules/multiphaseEuler/multiphaseEuler/Allwclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -wclean libso multiphaseSystems -wclean - -#------------------------------------------------------------------------------ diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/Allwmake b/applications/modules/multiphaseEuler/multiphaseEuler/Allwmake deleted file mode 100755 index 1baaf97cbf..0000000000 --- a/applications/modules/multiphaseEuler/multiphaseEuler/Allwmake +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Parse arguments for library compilation -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - -wmake $targetType multiphaseSystems -wmake $targetType - -#------------------------------------------------------------------------------ diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files b/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files deleted file mode 100644 index 8283aa0248..0000000000 --- a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -multiphaseSystems.C - -LIB = $(FOAM_LIBBIN)/libmultiphaseSystems diff --git a/applications/modules/multiphaseEuler/multiphaseReactions/Make/options b/applications/modules/multiphaseEuler/multiphaseReactions/Make/options deleted file mode 100644 index a98694057d..0000000000 --- a/applications/modules/multiphaseEuler/multiphaseReactions/Make/options +++ /dev/null @@ -1,26 +0,0 @@ -EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I$(LIB_SRC)/physicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -LIB_LIBS = \ - -lphaseSystem \ - -leulerianInterfacialModels \ - -leulerianInterfacialCompositionModels \ - -lphaseCompressibleMomentumTransportModels \ - -lmultiphaseMomentumTransportModels \ - -lphaseFluidThermophysicalTransportModels \ - -lphaseFluidMulticomponentThermophysicalTransportModels \ - -lspecie \ - -lfluidThermophysicalModels \ - -lmulticomponentThermophysicalModels \ - -lchemistryModel \ - -lcombustionModels \ - -lfiniteVolume diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/continuous/continuous.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/continuous/continuous.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/continuous/continuous.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/continuous/continuous.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H b/applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H rename to applications/modules/multiphaseEuler/phaseSystem/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H diff --git a/applications/modules/multiphaseEuler/phaseSystem/Make/files b/applications/modules/multiphaseEuler/phaseSystem/Make/files new file mode 100644 index 0000000000..1f7baab4bd --- /dev/null +++ b/applications/modules/multiphaseEuler/phaseSystem/Make/files @@ -0,0 +1,48 @@ +phaseModel/phaseModel.C +phaseModel/phaseModelNew.C + +phaseModels/phaseModels.C + +phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C +phaseInterface/phaseInterface/phaseInterface.C +phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C +phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C +phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C +phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C +phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C +phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C +phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C +phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C +phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C +phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C +phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C + +phaseSystem/phaseSystem.C +phaseSystem/phaseSystemNew.C +phaseSystem/phaseSystemSolve.C + +diameterModels/diameterModel/diameterModel.C +diameterModels/diameterModel/diameterModelNew.C +diameterModels/sphericalDiameter/sphericalDiameter.C +diameterModels/constantDiameter/constantDiameter.C +diameterModels/isothermalDiameter/isothermalDiameter.C +diameterModels/linearTsubDiameter/linearTsubDiameter.C +diameterModels/noDiameter/noDiameter.C +diameterModels/residualDiameter/residualDiameter.C +diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C + +diameterModels/IATE/IATE.C +diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C +diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C +diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C +diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C + +BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C +BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C +BlendedInterfacialModel/blendingMethods/linear/linear.C +BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C +BlendedInterfacialModel/blendingMethods/continuous/continuous.C +BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C + +LIB = $(FOAM_LIBBIN)/libphaseSystem diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options b/applications/modules/multiphaseEuler/phaseSystem/Make/options similarity index 54% rename from applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options rename to applications/modules/multiphaseEuler/phaseSystem/Make/options index 26ecab9351..edd1acb51e 100644 --- a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options +++ b/applications/modules/multiphaseEuler/phaseSystem/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I../../interfacialModels/lnInclude \ - -I../../interfacialCompositionModels/lnInclude \ - -I../../phaseSystems/lnInclude \ - -I../../multiphaseCompressibleMomentumTransportModels/lnInclude \ - -I../../multiphaseThermophysicalTransportModels/lnInclude \ + -I../interfacialModels/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,15 +10,20 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/saturationModels/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \ + -I$(LIB_SRC)/multiphaseModels/multiphaseProperties/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/combustionModels/lnInclude LIB_LIBS = \ - -lcombustionModels \ - -lphaseSystem \ - -leulerianInterfacialModels + -lsampling \ + -lmulticomponentThermophysicalModels \ + -lsaturationModels \ + -lcompressibleTwoPhases \ + -lmultiphaseProperties \ + -lphaseCompressibleMomentumTransportModels \ + -lphaseFluidMulticomponentThermophysicalTransportModels \ + -lcombustionModels diff --git a/applications/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C b/applications/modules/multiphaseEuler/phaseSystem/SidedInterfacialModel/SidedInterfacialModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C rename to applications/modules/multiphaseEuler/phaseSystem/SidedInterfacialModel/SidedInterfacialModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H b/applications/modules/multiphaseEuler/phaseSystem/SidedInterfacialModel/SidedInterfacialModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H rename to applications/modules/multiphaseEuler/phaseSystem/SidedInterfacialModel/SidedInterfacialModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATE.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATE.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATE.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATE.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/constantDiameter/constantDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/constantDiameter/constantDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/diameterModel/diameterModelNew.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/noDiameter/noDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/noDiameter/noDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/noDiameter/noDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/noDiameter/noDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/residualDiameter/residualDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/residualDiameter/residualDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/residualDiameter/residualDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/residualDiameter/residualDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/residualDiameter/residualDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/residualDiameter/residualDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/residualDiameter/residualDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/residualDiameter/residualDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/sphericalDiameter/sphericalDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/sphericalDiameter/sphericalDiameter.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H b/applications/modules/multiphaseEuler/phaseSystem/diameterModels/sphericalDiameter/sphericalDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H rename to applications/modules/multiphaseEuler/phaseSystem/diameterModels/sphericalDiameter/sphericalDiameter.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterface.C similarity index 99% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterface.C index 06a38a8ff7..fd28f89d88 100644 --- a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C +++ b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterface.C @@ -25,7 +25,6 @@ License #include "phaseInterface.H" #include "phaseSystem.H" -#include "interfaceSurfaceTensionModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterfaceI.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterface/phaseInterfaceI.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H b/applications/modules/multiphaseEuler/phaseSystem/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModel/phaseModelNew.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/AnisothermalPhaseModel/AnisothermalPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/AnisothermalPhaseModel/AnisothermalPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/AnisothermalPhaseModel/AnisothermalPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/AnisothermalPhaseModel/AnisothermalPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/InertPhaseModel/InertPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/InertPhaseModel/InertPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/InertPhaseModel/InertPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/InertPhaseModel/InertPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/IsothermalPhaseModel/IsothermalPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/IsothermalPhaseModel/IsothermalPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/IsothermalPhaseModel/IsothermalPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/IsothermalPhaseModel/IsothermalPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/MovingPhaseModel/MovingPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/MovingPhaseModel/MovingPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/MulticomponentPhaseModel/MulticomponentPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/MulticomponentPhaseModel/MulticomponentPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/MulticomponentPhaseModel/MulticomponentPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/MulticomponentPhaseModel/MulticomponentPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/PurePhaseModel/PurePhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/PurePhaseModel/PurePhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/PurePhaseModel/PurePhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/PurePhaseModel/PurePhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/ReactingPhaseModel/ReactingPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/ReactingPhaseModel/ReactingPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/ReactingPhaseModel/ReactingPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/ReactingPhaseModel/ReactingPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/SolidThermalPhaseModel/SolidThermalPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/SolidThermalPhaseModel/SolidThermalPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/SolidThermalPhaseModel/SolidThermalPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/SolidThermalPhaseModel/SolidThermalPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/SolidThermalPhaseModel/SolidThermalPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/SolidThermalPhaseModel/SolidThermalPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/SolidThermalPhaseModel/SolidThermalPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/SolidThermalPhaseModel/SolidThermalPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/StationaryPhaseModel/StationaryPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/StationaryPhaseModel/StationaryPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/StationaryPhaseModel/StationaryPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/StationaryPhaseModel/StationaryPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/ThermoPhaseModel/ThermoPhaseModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/ThermoPhaseModel/ThermoPhaseModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/ThermoPhaseModel/ThermoPhaseModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/ThermoPhaseModel/ThermoPhaseModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C b/applications/modules/multiphaseEuler/phaseSystem/phaseModels/phaseModels.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseModels/phaseModels.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemI.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemI.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemNew.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemNew.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemSolve.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemSolve.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C rename to applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/Make/files b/applications/modules/multiphaseEuler/phaseSystems/Make/files index 52dc70c7f0..fde5a85415 100644 --- a/applications/modules/multiphaseEuler/phaseSystems/Make/files +++ b/applications/modules/multiphaseEuler/phaseSystems/Make/files @@ -1,106 +1,3 @@ -phaseModel/phaseModel/phaseModel.C -phaseModel/phaseModel/phaseModelNew.C -phaseModel/phaseModel/phaseModels.C +phaseSystems.C -phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C -phaseInterface/phaseInterface/phaseInterface.C -phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C -phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C -phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C -phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C -phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C -phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C -phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C -phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C -phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C -phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C -phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C - -phaseSystem/phaseSystem.C -phaseSystem/phaseSystemNew.C -phaseSystem/phaseSystemSolve.C - -diameterModels/diameterModel/diameterModel.C -diameterModels/diameterModel/diameterModelNew.C -diameterModels/sphericalDiameter/sphericalDiameter.C -diameterModels/constantDiameter/constantDiameter.C -diameterModels/isothermalDiameter/isothermalDiameter.C -diameterModels/linearTsubDiameter/linearTsubDiameter.C -diameterModels/noDiameter/noDiameter.C -diameterModels/residualDiameter/residualDiameter.C -diameterModels/fixedInterfacialAreaDiameter/fixedInterfacialAreaDiameter.C -diameterModels/velocityGroup/velocityGroup.C - -diameterModels/IATE/IATE.C -diameterModels/IATE/IATEsources/IATEsource/IATEsource.C -diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C -diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C -diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C -diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C - -sizeGroup = diameterModels/velocityGroup/sizeGroup -$(sizeGroup)/sizeGroup.C - -shapeModels = $(sizeGroup)/shapeModels -$(shapeModels)/shapeModel/shapeModel.C -$(shapeModels)/spherical/spherical.C -$(shapeModels)/fractal/fractal.C -$(shapeModels)/fractal/sinteringModels/sinteringModel/sinteringModel.C -$(shapeModels)/fractal/sinteringModels/KochFriedlander/KochFriedlander.C -$(shapeModels)/fractal/sinteringModels/noSintering/noSintering.C - -populationBalanceModel/populationBalanceModel/populationBalanceModel.C - -coalescenceModels = populationBalanceModel/coalescenceModels -$(coalescenceModels)/coalescenceModel/coalescenceModel.C -$(coalescenceModels)/AdachiStuartFokkink/AdachiStuartFokkink.C -$(coalescenceModels)/ballisticCollisions/ballisticCollisions.C -$(coalescenceModels)/BrownianCollisions/BrownianCollisions.C -$(coalescenceModels)/constantCoalescence/constantCoalescence.C -$(coalescenceModels)/CoulaloglouTavlarides/CoulaloglouTavlarides.C -$(coalescenceModels)/DahnekeInterpolation/DahnekeInterpolation.C -$(coalescenceModels)/hydrodynamic/hydrodynamic.C -$(coalescenceModels)/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C -$(coalescenceModels)/LiaoCoalescence/LiaoCoalescence.C -$(coalescenceModels)/Luo/Luo.C -$(coalescenceModels)/PrinceBlanch/PrinceBlanch.C -$(coalescenceModels)/turbulentShear/turbulentShear.C - -binaryBreakupModels = populationBalanceModel/binaryBreakupModels -$(binaryBreakupModels)/binaryBreakupModel/binaryBreakupModel.C -$(binaryBreakupModels)/LehrMilliesMewes/LehrMilliesMewes.C -$(binaryBreakupModels)/Liao/LiaoBase.C -$(binaryBreakupModels)/Liao/Liao.C -$(binaryBreakupModels)/LuoSvendsen/LuoSvendsen.C -$(binaryBreakupModels)/powerLawUniformBinary/powerLawUniformBinary.C - -breakupModels = populationBalanceModel/breakupModels -$(breakupModels)/breakupModel/breakupModel.C -$(breakupModels)/exponential/exponential.C -$(breakupModels)/Kusters/Kusters.C -$(breakupModels)/Laakkonen/Laakkonen.C -$(breakupModels)/powerLaw/powerLaw.C - -daughterSizeDistributionModels = populationBalanceModel/daughterSizeDistributionModels -$(daughterSizeDistributionModels)/daughterSizeDistributionModel/daughterSizeDistributionModel.C -$(daughterSizeDistributionModels)/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C -$(daughterSizeDistributionModels)/uniformBinary/uniformBinary.C - -driftModels = populationBalanceModel/driftModels -$(driftModels)/driftModel/driftModel.C -$(driftModels)/constantDrift/constantDrift.C -$(driftModels)/densityChange/densityChange.C -$(driftModels)/phaseChange/phaseChange.C - -nucleationModels = populationBalanceModel/nucleationModels -$(nucleationModels)/nucleationModel/nucleationModel.C -$(nucleationModels)/reactionDriven/reactionDriven.C - -BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C -BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C -BlendedInterfacialModel/blendingMethods/linear/linear.C -BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C -BlendedInterfacialModel/blendingMethods/continuous/continuous.C -BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C - -LIB = $(FOAM_LIBBIN)/libphaseSystem +LIB = $(FOAM_LIBBIN)/libphaseSystems diff --git a/applications/modules/multiphaseEuler/phaseSystems/Make/options b/applications/modules/multiphaseEuler/phaseSystems/Make/options index 332f065a89..10925b18ad 100644 --- a/applications/modules/multiphaseEuler/phaseSystems/Make/options +++ b/applications/modules/multiphaseEuler/phaseSystems/Make/options @@ -1,8 +1,12 @@ EXE_INC = \ + -I../phaseSystem/lnInclude \ -I../interfacialModels/lnInclude \ - -I../interfacialCompositionModels/lnInclude \ - -I../multiphaseCompressibleMomentumTransportModels/lnInclude \ - -I../multiphaseThermophysicalTransportModels/lnInclude \ + -I../populationBalance/lnInclude \ + -I../momentumTransportModels/lnInclude \ + -I../thermophysicalTransportModels/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 \ @@ -10,16 +14,14 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/saturationModels/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude \ - -I$(LIB_SRC)/multiphaseModels/multiphaseProperties/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/combustionModels/lnInclude LIB_LIBS = \ - -lfiniteVolume + -lphaseSystem \ + -lpopulationBalance \ + -lmultiphaseEulerInterfacialModels \ + -lmultiphaseEulerMomentumTransportModels \ + -lmultiphaseEulerThermophysicalTransportModels diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/applications/modules/multiphaseEuler/phaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/phaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H b/applications/modules/multiphaseEuler/phaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/phaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C b/applications/modules/multiphaseEuler/phaseSystems/phaseSystems.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C rename to applications/modules/multiphaseEuler/phaseSystems/phaseSystems.C diff --git a/applications/modules/multiphaseEuler/populationBalance/Make/files b/applications/modules/multiphaseEuler/populationBalance/Make/files new file mode 100644 index 0000000000..f72ffd0330 --- /dev/null +++ b/applications/modules/multiphaseEuler/populationBalance/Make/files @@ -0,0 +1,62 @@ +populationBalanceModel/populationBalanceModel.C + +diameterModels/velocityGroup/velocityGroup.C + +sizeGroup = diameterModels/velocityGroup/sizeGroup +$(sizeGroup)/sizeGroup.C + +shapeModels = $(sizeGroup)/shapeModels +$(shapeModels)/shapeModel/shapeModel.C +$(shapeModels)/spherical/spherical.C +$(shapeModels)/fractal/fractal.C +$(shapeModels)/fractal/sinteringModels/sinteringModel/sinteringModel.C +$(shapeModels)/fractal/sinteringModels/KochFriedlander/KochFriedlander.C +$(shapeModels)/fractal/sinteringModels/noSintering/noSintering.C + +coalescenceModels = coalescenceModels +$(coalescenceModels)/coalescenceModel/coalescenceModel.C +$(coalescenceModels)/AdachiStuartFokkink/AdachiStuartFokkink.C +$(coalescenceModels)/ballisticCollisions/ballisticCollisions.C +$(coalescenceModels)/BrownianCollisions/BrownianCollisions.C +$(coalescenceModels)/constantCoalescence/constantCoalescence.C +$(coalescenceModels)/CoulaloglouTavlarides/CoulaloglouTavlarides.C +$(coalescenceModels)/DahnekeInterpolation/DahnekeInterpolation.C +$(coalescenceModels)/hydrodynamic/hydrodynamic.C +$(coalescenceModels)/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C +$(coalescenceModels)/LiaoCoalescence/LiaoCoalescence.C +$(coalescenceModels)/Luo/Luo.C +$(coalescenceModels)/PrinceBlanch/PrinceBlanch.C +$(coalescenceModels)/turbulentShear/turbulentShear.C + +binaryBreakupModels = binaryBreakupModels +$(binaryBreakupModels)/binaryBreakupModel/binaryBreakupModel.C +$(binaryBreakupModels)/LehrMilliesMewes/LehrMilliesMewes.C +$(binaryBreakupModels)/Liao/LiaoBase.C +$(binaryBreakupModels)/Liao/Liao.C +$(binaryBreakupModels)/LuoSvendsen/LuoSvendsen.C +$(binaryBreakupModels)/powerLawUniformBinary/powerLawUniformBinary.C + +breakupModels = breakupModels +$(breakupModels)/breakupModel/breakupModel.C +$(breakupModels)/exponential/exponential.C +$(breakupModels)/Kusters/Kusters.C +$(breakupModels)/Laakkonen/Laakkonen.C +$(breakupModels)/powerLaw/powerLaw.C + +daughterSizeDistributionModels = daughterSizeDistributionModels +$(daughterSizeDistributionModels)/daughterSizeDistributionModel/daughterSizeDistributionModel.C +$(daughterSizeDistributionModels)/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C +$(daughterSizeDistributionModels)/uniformBinary/uniformBinary.C + +driftModels = driftModels +$(driftModels)/driftModel/driftModel.C +$(driftModels)/constantDrift/constantDrift.C +$(driftModels)/densityChange/densityChange.C +$(driftModels)/phaseChange/phaseChange.C + +nucleationModels = nucleationModels +$(nucleationModels)/nucleationModel/nucleationModel.C +$(nucleationModels)/reactionDriven/reactionDriven.C + + +LIB = $(FOAM_LIBBIN)/libpopulationBalance diff --git a/applications/modules/multiphaseEuler/interfacialCompositionModels/Make/options b/applications/modules/multiphaseEuler/populationBalance/Make/options similarity index 65% rename from applications/modules/multiphaseEuler/interfacialCompositionModels/Make/options rename to applications/modules/multiphaseEuler/populationBalance/Make/options index 0cb19b1ea6..8526e51bd8 100644 --- a/applications/modules/multiphaseEuler/interfacialCompositionModels/Make/options +++ b/applications/modules/multiphaseEuler/populationBalance/Make/options @@ -1,21 +1,23 @@ EXE_INC = \ - -I../phaseSystems/lnInclude \ + -I../phaseSystem/lnInclude \ + -I../interfacialModels/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/specie/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)/multiphaseModels/multiphaseProperties/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)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/combustionModels/lnInclude LIB_LIBS = \ - -lfluidThermophysicalModels \ - -lmulticomponentThermophysicalModels \ - -lsaturationModels + -lphaseSystem diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/Liao.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/Liao.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/Liao.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/Liao.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/Liao/LiaoBase.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H b/applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H rename to applications/modules/multiphaseEuler/populationBalance/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C b/applications/modules/multiphaseEuler/populationBalance/breakupModels/Kusters/Kusters.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/Kusters/Kusters.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H b/applications/modules/multiphaseEuler/populationBalance/breakupModels/Kusters/Kusters.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/Kusters/Kusters.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C b/applications/modules/multiphaseEuler/populationBalance/breakupModels/Laakkonen/Laakkonen.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/Laakkonen/Laakkonen.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H b/applications/modules/multiphaseEuler/populationBalance/breakupModels/Laakkonen/Laakkonen.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/Laakkonen/Laakkonen.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/applications/modules/multiphaseEuler/populationBalance/breakupModels/breakupModel/breakupModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/breakupModel/breakupModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/applications/modules/multiphaseEuler/populationBalance/breakupModels/breakupModel/breakupModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/breakupModel/breakupModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C b/applications/modules/multiphaseEuler/populationBalance/breakupModels/exponential/exponential.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/exponential/exponential.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H b/applications/modules/multiphaseEuler/populationBalance/breakupModels/exponential/exponential.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/exponential/exponential.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/applications/modules/multiphaseEuler/populationBalance/breakupModels/powerLaw/powerLaw.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/powerLaw/powerLaw.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/applications/modules/multiphaseEuler/populationBalance/breakupModels/powerLaw/powerLaw.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to applications/modules/multiphaseEuler/populationBalance/breakupModels/powerLaw/powerLaw.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/BrownianCollisions/BrownianCollisions.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/BrownianCollisions/BrownianCollisions.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/BrownianCollisions/BrownianCollisions.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/BrownianCollisions/BrownianCollisions.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/Luo/Luo.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/Luo/Luo.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/Luo/Luo.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/Luo/Luo.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/PrinceBlanch/PrinceBlanch.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/PrinceBlanch/PrinceBlanch.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/PrinceBlanch/PrinceBlanch.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/PrinceBlanch/PrinceBlanch.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/ballisticCollisions/ballisticCollisions.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/ballisticCollisions/ballisticCollisions.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/ballisticCollisions/ballisticCollisions.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/ballisticCollisions/ballisticCollisions.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/coalescenceModel/coalescenceModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/coalescenceModel/coalescenceModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/coalescenceModel/coalescenceModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/coalescenceModel/coalescenceModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/constantCoalescence/constantCoalescence.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/constantCoalescence/constantCoalescence.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/constantCoalescence/constantCoalescence.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/constantCoalescence/constantCoalescence.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/hydrodynamic/hydrodynamic.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/hydrodynamic/hydrodynamic.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/hydrodynamic/hydrodynamic.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/hydrodynamic/hydrodynamic.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/turbulentShear/turbulentShear.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/turbulentShear/turbulentShear.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H b/applications/modules/multiphaseEuler/populationBalance/coalescenceModels/turbulentShear/turbulentShear.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H rename to applications/modules/multiphaseEuler/populationBalance/coalescenceModels/turbulentShear/turbulentShear.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/uniformBinary/uniformBinary.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/uniformBinary/uniformBinary.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H b/applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/uniformBinary/uniformBinary.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H rename to applications/modules/multiphaseEuler/populationBalance/daughterSizeDistributionModels/uniformBinary/uniformBinary.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroup.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroup.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroup.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroup.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroup.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroup.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroup.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroup.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H b/applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroupI.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H rename to applications/modules/multiphaseEuler/populationBalance/diameterModels/velocityGroup/velocityGroupI.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/applications/modules/multiphaseEuler/populationBalance/driftModels/constantDrift/constantDrift.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C rename to applications/modules/multiphaseEuler/populationBalance/driftModels/constantDrift/constantDrift.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H b/applications/modules/multiphaseEuler/populationBalance/driftModels/constantDrift/constantDrift.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H rename to applications/modules/multiphaseEuler/populationBalance/driftModels/constantDrift/constantDrift.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C b/applications/modules/multiphaseEuler/populationBalance/driftModels/densityChange/densityChange.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C rename to applications/modules/multiphaseEuler/populationBalance/driftModels/densityChange/densityChange.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H b/applications/modules/multiphaseEuler/populationBalance/driftModels/densityChange/densityChange.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H rename to applications/modules/multiphaseEuler/populationBalance/driftModels/densityChange/densityChange.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C b/applications/modules/multiphaseEuler/populationBalance/driftModels/driftModel/driftModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C rename to applications/modules/multiphaseEuler/populationBalance/driftModels/driftModel/driftModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H b/applications/modules/multiphaseEuler/populationBalance/driftModels/driftModel/driftModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H rename to applications/modules/multiphaseEuler/populationBalance/driftModels/driftModel/driftModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/modules/multiphaseEuler/populationBalance/driftModels/phaseChange/phaseChange.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C rename to applications/modules/multiphaseEuler/populationBalance/driftModels/phaseChange/phaseChange.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H b/applications/modules/multiphaseEuler/populationBalance/driftModels/phaseChange/phaseChange.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H rename to applications/modules/multiphaseEuler/populationBalance/driftModels/phaseChange/phaseChange.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/applications/modules/multiphaseEuler/populationBalance/nucleationModels/nucleationModel/nucleationModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C rename to applications/modules/multiphaseEuler/populationBalance/nucleationModels/nucleationModel/nucleationModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/applications/modules/multiphaseEuler/populationBalance/nucleationModels/nucleationModel/nucleationModel.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H rename to applications/modules/multiphaseEuler/populationBalance/nucleationModels/nucleationModel/nucleationModel.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C b/applications/modules/multiphaseEuler/populationBalance/nucleationModels/reactionDriven/reactionDriven.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C rename to applications/modules/multiphaseEuler/populationBalance/nucleationModels/reactionDriven/reactionDriven.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H b/applications/modules/multiphaseEuler/populationBalance/nucleationModels/reactionDriven/reactionDriven.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H rename to applications/modules/multiphaseEuler/populationBalance/nucleationModels/reactionDriven/reactionDriven.H diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModel.C similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C rename to applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModel.C diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModel.H similarity index 98% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H rename to applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModel.H index 85674ba73b..c3fc8cb335 100644 --- a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H +++ b/applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModel.H @@ -88,8 +88,8 @@ Description functionObject 'sizeDistribution'. Integral and mean properties of a size distribution can be computed with the functionObject 'moments'. - Verification cases for the population balance modeling functionality are - provided in test/multiphase/multiphaseEulerFoam/populationBalance. + Verification cases for the population balance modelling functionality are + provided in test/multiphaseEuler/populationBalance. References: \verbatim @@ -138,11 +138,11 @@ Usage sizeGroups ( - f1 {dSph 1e-3; value 1.0;} - f2 {dSph 2e-3; value 0.0;} - f3 {dSph 3e-3; value 0.0;} - f4 {dSph 4e-3; value 0.0;} - f5 {dSph 5e-3; value 0.0;} + f1 { dSph 1e-3; } + f2 { dSph 2e-3; } + f3 { dSph 3e-3; } + f4 { dSph 4e-3; } + f5 { dSph 5e-3; } ... ); } diff --git a/applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModelI.H similarity index 100% rename from applications/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H rename to applications/modules/multiphaseEuler/populationBalance/populationBalanceModel/populationBalanceModelI.H diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/pressureCorrector.C b/applications/modules/multiphaseEuler/pressureCorrector.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/pressureCorrector.C rename to applications/modules/multiphaseEuler/pressureCorrector.C diff --git a/applications/modules/multiphaseEuler/multiphaseReactions/Make/files b/applications/modules/multiphaseEuler/reactions/Make/files similarity index 59% rename from applications/modules/multiphaseEuler/multiphaseReactions/Make/files rename to applications/modules/multiphaseEuler/reactions/Make/files index 8d89c2db04..4068dfebd3 100644 --- a/applications/modules/multiphaseEuler/multiphaseReactions/Make/files +++ b/applications/modules/multiphaseEuler/reactions/Make/files @@ -1,3 +1,3 @@ phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C -LIB = $(FOAM_LIBBIN)/libmultiphaseReactions +LIB = $(FOAM_LIBBIN)/libmultiphaseEulerReactions diff --git a/applications/modules/multiphaseEuler/reactions/Make/options b/applications/modules/multiphaseEuler/reactions/Make/options new file mode 100644 index 0000000000..8e4406106c --- /dev/null +++ b/applications/modules/multiphaseEuler/reactions/Make/options @@ -0,0 +1,16 @@ +EXE_INC = \ + -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/multicomponentThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/compressibleTwoPhases/lnInclude + +LIB_LIBS = \ + -lphaseSystem \ + -lchemistryModel diff --git a/applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C rename to applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C diff --git a/applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H rename to applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H diff --git a/applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H b/applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H rename to applications/modules/multiphaseEuler/reactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/setRDeltaT.C b/applications/modules/multiphaseEuler/setRDeltaT.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/setRDeltaT.C rename to applications/modules/multiphaseEuler/setRDeltaT.C diff --git a/applications/modules/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C b/applications/modules/multiphaseEuler/thermophysicalPredictor.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C rename to applications/modules/multiphaseEuler/thermophysicalPredictor.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files b/applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/files similarity index 92% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/files index 267aae477a..32d0e3582f 100644 --- a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/files @@ -1,5 +1,5 @@ -HeatTransferPhaseSystem/heatTransferPhaseSystem.C -TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C +heatTransferPhaseSystem/heatTransferPhaseSystem.C +twoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C @@ -34,4 +34,4 @@ derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunction derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C -LIB = $(FOAM_LIBBIN)/libmultiphaseThermophysicalTransportModels +LIB = $(FOAM_LIBBIN)/libmultiphaseEulerThermophysicalTransportModels diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options b/applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/options similarity index 77% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/options index 3c7bdd7ae8..4f1d53d052 100644 --- a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/Make/options @@ -1,7 +1,10 @@ EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I../interfacialModels/lnInclude\ - -I../interfacialCompositionModels/lnInclude \ + -I../phaseSystem/lnInclude \ + -I../interfacialModels/lnInclude \ + -I../populationBalance/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 \ @@ -13,16 +16,13 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lnInclude LIB_LIBS = \ -lphaseSystem \ - -leulerianInterfacialModels \ - -leulerianInterfacialCompositionModels \ - -lphaseCompressibleMomentumTransportModels \ + -lpopulationBalance \ + -lmultiphaseEulerInterfacialModels \ + -lphaseFluidThermophysicalTransportModels \ -lphaseFluidMulticomponentThermophysicalTransportModels \ -lcoupledThermophysicalTransportModels diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunctionBase/alphatPhaseChangeWallFunctionBase.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/derivedFvPatchFields/multiphaseExternalTemperature/multiphaseExternalTemperatureFvPatchScalarField.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/heatTransferPhaseSystem.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferPhaseSystem/heatTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/heatTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferPhaseSystem/heatTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/heatTransferPhaseSystem.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferPhaseSystem/heatTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/HeatTransferPhaseSystem/heatTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferPhaseSystem/heatTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/twoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/twoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/twoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/twoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/wallBoilingModelsCoefficient.H b/applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/wallBoilingModelsCoefficient.H similarity index 100% rename from applications/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/wallBoilingSubModels/wallBoilingModelsCoefficient.H rename to applications/modules/multiphaseEuler/thermophysicalTransportModels/wallBoilingSubModels/wallBoilingModelsCoefficient.H diff --git a/bin/reactingMultiphaseEulerFoam b/bin/reactingMultiphaseEulerFoam index c2a3e154e9..48d66ecc27 100755 --- a/bin/reactingMultiphaseEulerFoam +++ b/bin/reactingMultiphaseEulerFoam @@ -26,14 +26,18 @@ # reactingMultiphaseEulerFoam # # Description -# Script to inform the user that the reactingMultiphaseEulerFoam solver has -# been renamed and replaces the original multiphaseEulerFoam, providing -# much more general and extensible functionality. +# Script to inform the user that the reactingtMultiphaseEulerFoam solver +# has been replaced by the more general multiphaseEuler solver module. # #------------------------------------------------------------------------------ -echo "The reactingMultiphaseEulerFoam solver has been renamed" \ - "and replaces the original multiphaseEulerFoam," -echo "providing much more general and extensible functionality." +echo "The reactingtMultiphaseEulerFoam solver has been replaced" \ + "by the more general multiphaseEuler solver module" +echo "which supports two-phase and multiphase systems containing" \ + "fluid and stationary phases," +echo "compressible or incompressible," \ + "with heat and mass transfer, reactions, size distribution" +echo "and all the usual phase interaction and transfer models." #------------------------------------------------------------------------------ + diff --git a/bin/reactingTwoPhaseEulerFoam b/bin/reactingTwoPhaseEulerFoam index 54276e8d96..c4f49ac37d 100755 --- a/bin/reactingTwoPhaseEulerFoam +++ b/bin/reactingTwoPhaseEulerFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,12 +27,12 @@ # # Description # Script to inform the user that the reactingtTwoPhaseEulerFoam solver -# has been replaced by the more general multiphaseEulerFoam solver. +# has been replaced by the more general multiphaseEuler solver module. # #------------------------------------------------------------------------------ echo "The reactingtTwoPhaseEulerFoam solver has been replaced" \ - "by the more general multiphaseEulerFoam solver" + "by the more general multiphaseEuler solver module" echo "which supports two-phase and multiphase systems containing" \ "fluid and stationary phases," echo "compressible or incompressible," \ diff --git a/bin/twoPhaseEulerFoam b/bin/twoPhaseEulerFoam index 7b8908a2d5..2fa21115c9 100755 --- a/bin/twoPhaseEulerFoam +++ b/bin/twoPhaseEulerFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,12 +27,12 @@ # # Description # Script to inform the user that the twoPhaseEulerFoam solver -# has been replaced by the more general multiphaseEulerFoam solver. +# has been replaced by the more general multiphaseEuler solver module. # #------------------------------------------------------------------------------ echo "The twoPhaseEulerFoam solver has been replaced" \ - "by the more general multiphaseEulerFoam solver" + "by the more general multiphaseEuler solver module" echo "which supports two-phase and multiphase systems containing" \ "fluid and stationary phases," echo "compressible or incompressible," \ diff --git a/etc/caseDicts/postProcessing/multiphase/phaseForces b/etc/caseDicts/postProcessing/multiphase/phaseForces index 3b80cdd081..dab38a1271 100644 --- a/etc/caseDicts/postProcessing/multiphase/phaseForces +++ b/etc/caseDicts/postProcessing/multiphase/phaseForces @@ -8,15 +8,12 @@ Description Calculates 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 solver post processing mode and in - combination with multiphaseEulerFoam. For a simulation involving more than - two phases, the accumulated force is calculated by looping over all - phasePairs the phase is a part of. + dispersion. Requires the multiphaseEuler solver module. \*---------------------------------------------------------------------------*/ type phaseForces; -libs ("libmultiphaseEulerFoamFunctionObjects.so"); +libs ("libmultiphaseEulerFunctionObjects.so"); phase ; diff --git a/etc/caseDicts/postProcessing/multiphase/phaseMap b/etc/caseDicts/postProcessing/multiphase/phaseMap index b0d9e6a3d7..35c1d8b4ad 100644 --- a/etc/caseDicts/postProcessing/multiphase/phaseMap +++ b/etc/caseDicts/postProcessing/multiphase/phaseMap @@ -12,7 +12,7 @@ Description \*---------------------------------------------------------------------------*/ type phaseMap; -libs ("libmultiphaseEulerFoamFunctionObjects.so"); +libs ("libmultiphaseEulerFunctionObjects.so"); writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments b/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments index 7b4b1da877..96d4102b23 100644 --- a/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments +++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceMoments @@ -7,13 +7,13 @@ ------------------------------------------------------------------------------- Description Calculates and writes out integral (integer moments) or mean properties - (mean, variance, standard deviation) of a size distribution computed with - multiphaseEulerFoam. Requires solver post-processing. + (mean, variance, standard deviation) of a size distribution. Requires the + multiphaseEuler solver module. \*---------------------------------------------------------------------------*/ type populationBalanceMoments; -libs ("libmultiphaseEulerFoamFunctionObjects.so"); +libs ("libmultiphaseEulerFunctionObjects.so"); populationBalance ; momentType ; // integerMoment, mean, variance, diff --git a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution index daff41b75d..2a8c5b71cf 100644 --- a/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution +++ b/etc/caseDicts/postProcessing/multiphase/populationBalanceSizeDistribution @@ -6,13 +6,13 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Description - Writes out the size distribution computed with multiphaseEulerFoam for the - entire domain or a volume region. Requires solver post-processing. + Writes out the population balance size distribution for the entire mesh + or a specified cell zone. Requires the multiphaseEuler solver module. \*---------------------------------------------------------------------------*/ type populationBalanceSizeDistribution; -libs ("libmultiphaseEulerFoamFunctionObjects.so"); +libs ("libmultiphaseEulerFunctionObjects.so"); populationBalance ; functionType ; // numberConcentration, numberDensity diff --git a/etc/caseDicts/postProcessing/multiphase/wallBoilingProperties b/etc/caseDicts/postProcessing/multiphase/wallBoilingProperties index 14e3ecea24..d60166dbda 100644 --- a/etc/caseDicts/postProcessing/multiphase/wallBoilingProperties +++ b/etc/caseDicts/postProcessing/multiphase/wallBoilingProperties @@ -14,7 +14,7 @@ Description \*---------------------------------------------------------------------------*/ type wallBoilingProperties; -libs ("libmultiphaseEulerFoamFunctionObjects.so"); +libs ("libmultiphaseEulerFunctionObjects.so"); phase ; diff --git a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H index d586268b1b..2a4ca1450d 100644 --- a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H +++ b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.H @@ -60,7 +60,7 @@ Usage | no | true \endtable - Example specification for interFoam: + Example specification for incompressibleVoF: \verbatim phaseScalarTransport1 { @@ -72,7 +72,7 @@ Usage } \endverbatim - Example specification for multiphaseEulerFoam: + Example specification for multiphaseEuler: \verbatim phaseScalarTransport1 { diff --git a/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/fvModels b/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/fvModels index 966ca382a8..1a519ee336 100644 --- a/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/fvModels +++ b/tutorials/multiRegion/CHT/wallBoiling/constant/fluid/fvModels @@ -7,7 +7,6 @@ \*---------------------------------------------------------------------------*/ FoamFile { - version 2.0; format ascii; class dictionary; location "constant"; @@ -19,7 +18,7 @@ phaseTurbulenceStabilisationGas { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas; @@ -30,9 +29,12 @@ phaseTurbulenceStabilisationLiquid { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase liquid; alphaInversion 0.1; } + + +// ************************************************************************* // diff --git a/tutorials/multiRegion/CHT/wallBoiling/system/controlDict b/tutorials/multiRegion/CHT/wallBoiling/system/controlDict index 24b1cb751a..9aeda16f29 100644 --- a/tutorials/multiRegion/CHT/wallBoiling/system/controlDict +++ b/tutorials/multiRegion/CHT/wallBoiling/system/controlDict @@ -67,7 +67,7 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl writeTime; executeAtStart no; region fluid; diff --git a/tutorials/multiphaseEuler/hydrofoil/constant/fvModels b/tutorials/multiphaseEuler/hydrofoil/constant/fvModels index b0c49f3e93..4ed7768c8c 100644 --- a/tutorials/multiphaseEuler/hydrofoil/constant/fvModels +++ b/tutorials/multiphaseEuler/hydrofoil/constant/fvModels @@ -17,7 +17,7 @@ phaseTurbulenceStabilisation { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas; diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/constant/fvModels b/tutorials/multiphaseEuler/wallBoilingIATE/constant/fvModels index 966ca382a8..f8defec74e 100644 --- a/tutorials/multiphaseEuler/wallBoilingIATE/constant/fvModels +++ b/tutorials/multiphaseEuler/wallBoilingIATE/constant/fvModels @@ -19,7 +19,7 @@ phaseTurbulenceStabilisationGas { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas; @@ -30,9 +30,12 @@ phaseTurbulenceStabilisationLiquid { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase liquid; alphaInversion 0.1; } + + +// ************************************************************************* // diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict b/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict index a574518882..62b18d5419 100644 --- a/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict @@ -57,7 +57,7 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl writeTime; phase liquid; } diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/fvModels b/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/fvModels index 966ca382a8..f8defec74e 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/fvModels +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/constant/fvModels @@ -19,7 +19,7 @@ phaseTurbulenceStabilisationGas { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas; @@ -30,9 +30,12 @@ phaseTurbulenceStabilisationLiquid { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase liquid; alphaInversion 0.1; } + + +// ************************************************************************* // diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict b/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict index 3d99f92e3e..174679fd59 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict @@ -57,14 +57,14 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl writeTime; phase liquid; } volumeDensity.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -78,7 +78,7 @@ functions volumeDensity_bulk.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -92,7 +92,7 @@ functions volumeDensity_wall.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/fvModels b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/fvModels index 6c57595ddd..8dbb1e6318 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/fvModels +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/constant/fvModels @@ -19,7 +19,7 @@ phaseTurbulenceStabilisationGas { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas; @@ -30,7 +30,7 @@ phaseTurbulenceStabilisationGas2 { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase gas2; @@ -41,9 +41,12 @@ phaseTurbulenceStabilisationLiquid { type phaseTurbulenceStabilisation; - libs ("libmultiphaseEulerFoamFvModels.so"); + libs ("libmultiphaseEulerFvModels.so"); phase liquid; alphaInversion 0.1; } + + +// ************************************************************************* // diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict index 5dc8ab40c6..8ec9df200a 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict @@ -57,14 +57,14 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl writeTime; phase liquid; } volumeDensity.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -78,7 +78,7 @@ functions volumeDensity_bulk.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -92,7 +92,7 @@ functions volumeDensity_wall.diameter.bubbles { type populationBalanceSizeDistribution; - libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw;