diff --git a/applications/solvers/DNS/dnsFoam/Allwmake b/applications/solvers/DNS/dnsFoam/Allwmake index c55855fb89efc6a684bc0a0b207ee84329fe80e5..66767a22433f04d7649ff5bd4f78819c92439835 100755 --- a/applications/solvers/DNS/dnsFoam/Allwmake +++ b/applications/solvers/DNS/dnsFoam/Allwmake @@ -2,7 +2,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments . ${WM_PROJECT_DIR:?}/wmake/scripts/have_fftw - #------------------------------------------------------------------------------ if have_fftw diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwclean b/applications/solvers/compressible/rhoCentralFoam/Allwclean index 2665e2c41a4523383be5202e607ee040dd6d6b45..6ccfad7e88e55ab11d8a2a566954616679104a03 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwclean +++ b/applications/solvers/compressible/rhoCentralFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso BCs wclean diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake index 368ffbde871ce918eb640771bf8f66950ee18cce..58d48467bea669d4e70a11a8dae3651806bee664 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwmake +++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake @@ -1,7 +1,12 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +#------------------------------------------------------------------------------ -(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam) +( + wmake $targetType BCs \ + && wmake $targetType \ + && wmake $targetType rhoCentralDyMFoam \ +) #------------------------------------------------------------------------------ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options index aa83fdb2bbd04399b2ff17c23c310ee6f8845724..4014bbe8d3de78a578e3cae617a1c97c67f275e7 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options @@ -1,11 +1,13 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler + EXE_INC = \ -I.. \ - -I$(FOAM_SOLVERS)/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \ + -I$(FOAM_SOLVERS)/multiphase/reactingTwoPhaseEulerFoam \ + -I${phaseSystem}/twoPhaseSystem/lnInclude \ + -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \ + -I${phaseSystem}/phaseSystems/lnInclude \ + -I${phaseSystem}/interfacialModels/lnInclude \ + -I${phaseSystem}/interfacialCompositionModels/lnInclude \ -I./fluid \ -I../solid \ -I../fluid \ @@ -23,18 +25,17 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude - EXE_LIBS = \ + -lfiniteVolume \ + -lfvOptions \ + -lmeshTools \ + -lsampling \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lsolidThermo \ - -ltwoPhaseReactingTurbulenceModels \ - -lmeshTools \ - -lfiniteVolume \ - -lfvOptions \ -lradiationModels \ -lregionModels \ - -lsampling \ -lreactingTwoPhaseSystem \ + -ltwoPhaseReactingTurbulenceModels \ -lreactingPhaseSystem diff --git a/applications/solvers/lagrangian/DPMFoam/Allwclean b/applications/solvers/lagrangian/DPMFoam/Allwclean index 921884d39a16bdb9906df8e9ac540421e87baa2b..bbf8fbcee10d94a4de03a41d3f78abc5d7c15485 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwclean +++ b/applications/solvers/lagrangian/DPMFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso DPMTurbulenceModels diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake index e549ab052895f8a539d78fbe6bccbb5b46075da4..679dc9a8cd798d0aadc31e2007c68d23c02d24cf 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwmake +++ b/applications/solvers/lagrangian/DPMFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType DPMTurbulenceModels diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwclean b/applications/solvers/multiphase/MPPICInterFoam/Allwclean index fd8589a9c2e57c82a407fc031646dc05f57eb308..e46800f4cbf322ed990be87b3fff558acfa550f6 100755 --- a/applications/solvers/multiphase/MPPICInterFoam/Allwclean +++ b/applications/solvers/multiphase/MPPICInterFoam/Allwclean @@ -1,7 +1,8 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ -wclean libso CompressibleTwoPhaseMixtureTurbulenceModels +wclean libso compressibleTwoPhaseMixtureTurbulenceModels wclean #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwmake b/applications/solvers/multiphase/MPPICInterFoam/Allwmake index 07f6b8c1d67ae59646ebe18100ef367ed409b190..c709eb1c6dffd7908b75e9eec4ba3ab90be1c932 100755 --- a/applications/solvers/multiphase/MPPICInterFoam/Allwmake +++ b/applications/solvers/multiphase/MPPICInterFoam/Allwmake @@ -1,10 +1,9 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ -wmake $targetType CompressibleTwoPhaseMixtureTurbulenceModels +wmake $targetType compressibleTwoPhaseMixtureTurbulenceModels wmake $targetType #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/files b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/files deleted file mode 100644 index de1a922fbc1f3c1181e1ec48294f70d3671c7547..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -CompressibleTwoPhaseMixtureTurbulenceModels.C - -LIB = $(FOAM_LIBBIN)/libCompressibleTwoPhaseMixtureTurbulenceModels diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options index 0ecf85c239687841771ac0c74f7e8a1a84c56714..337f90f68680feeb34224b67591d2f606a850683 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options @@ -1,9 +1,6 @@ -interFoamPath = $(FOAM_SOLVERS)/multiphase/interFoam - EXE_INC = \ -I../VoF \ - -I./IncompressibleTwoPhaseMixtureTurbulenceModels/lnInclude \ - -I$(interFoamPath) \ + -I$(FOAM_SOLVERS)/multiphase/interFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -40,4 +37,4 @@ EXE_LIBS = \ -lsampling \ -lregionModels \ -lsurfaceFilmModels \ - -lCompressibleTwoPhaseMixtureTurbulenceModels + -lcompressibleTwoPhaseMixtureTurbulenceModels diff --git a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/files b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..e9d15811f1a7a089fb2194230cb4d51c73d3363c --- /dev/null +++ b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/files @@ -0,0 +1,3 @@ +compressibleTwoPhaseMixtureTurbulenceModels.C + +LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseMixtureTurbulenceModels diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options similarity index 100% rename from applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options rename to applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/compressibleTwoPhaseMixtureTurbulenceModels.C similarity index 100% rename from applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/CompressibleTwoPhaseMixtureTurbulenceModels.C rename to applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/compressibleTwoPhaseMixtureTurbulenceModels.C diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean index 5a4d26d0d2296f8110d8cae78efddabbe3ab5af2..64ff35532163a55d6303f0d903d767649905aca1 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso twoPhaseMixtureThermo wclean libso surfaceTensionModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake index f226247da2e2fc7836c69d2861b309b6f9ce90c2..2140d45eb38ce52651fa255e0769c598a04341ad 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType twoPhaseMixtureThermo diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean index 8efc71002b6907c424e75242c4e5d32714b558a3..918cd9667f422b7588719d89420fdcb57e0931fb 100755 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso multiphaseMixtureThermo wclean diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake index fd701ea773c44ae28bfc94c9dfb44493a93fa23d..293ad680ddb62181e6e3599b7e722c58393cdd2d 100755 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType multiphaseMixtureThermo diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwclean b/applications/solvers/multiphase/driftFluxFoam/Allwclean index a6ba0bf9d7725cc9d6ff54f7b082adf6947847a6..57900fc44384122e68855043c5aa9d28e332e255 100755 --- a/applications/solvers/multiphase/driftFluxFoam/Allwclean +++ b/applications/solvers/multiphase/driftFluxFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso mixtureViscosityModels wclean libso relativeVelocityModels diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake index 3dcb1104bd9b73df3ae00dbe25f5083854c9412f..4916404dee017402c0001b3cbe235cdb0e964e7e 100755 --- a/applications/solvers/multiphase/driftFluxFoam/Allwmake +++ b/applications/solvers/multiphase/driftFluxFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType mixtureViscosityModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean index 48dbdf48cfbd580d1203b19d1473ea3dfc7178d6..7dca2e3e3bc432f6979f9c9fa946b0be5bfabccc 100755 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwclean @@ -1,9 +1,7 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ -wclean libso phasesSystem -wclean libso massTransferModels -wclean libso CompressibleMultiPhaseTurbulenceModels wclean libso laserDTRM wclean diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake index 0a30b7d9f94ee1d105bb0b1bdd0e96a4a1d3650f..95f6ca1c8f4da0913a209d4d6355c05a81a04ca9 100755 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Allwmake @@ -1,13 +1,8 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ -wmakeLnInclude massTransferModels -wmake $targetType phasesSystem -wmake $targetType massTransferModels -wmake $targetType CompressibleMultiPhaseTurbulenceModels wmake $targetType laserDTRM wmake $targetType diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/files b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/files deleted file mode 100644 index c85d7222d2900d7581efc0705079d21b32987d2c..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -CompressibleMultiPhaseTurbulenceModels.C - -LIB = $(FOAM_LIBBIN)/libCompressibleMultiPhaseTurbulenceModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options index 8e3f95e80f223315594f35dc104ea79d1b95acd3..7e462e236fbd0407f543eb3274f0d762632be342 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options @@ -1,6 +1,8 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseInter + EXE_INC = \ - -I./phasesSystem/lnInclude \ - -I./CompressibleMultiPhaseTurbulenceModels/lnInclude \ + -I${phaseSystem}/phasesSystem/lnInclude \ + -I${phaseSystem}/compressibleMultiPhaseTurbulenceModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude\ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -24,10 +26,10 @@ EXE_LIBS = \ -lcompressibleTransportModels \ -lradiationModels \ -lfluidThermophysicalModels \ - -lIncompressibleMultiphaseSystems \ - -lCompressibleMultiPhaseTurbulenceModels \ -lmassTransferModels \ -lsolidThermo \ -lsolidSpecie \ -ltwoPhaseProperties \ - -llaserDTRM + -llaserDTRM \ + -lincompressibleMultiphaseSystems \ + -lcompressibleMultiPhaseTurbulenceModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options index 07ce7c685bdf01556375997c38ffa0c6cc57442e..43f3302bba26ef89855d82490ad8b2e31c7b6cc5 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options @@ -1,5 +1,7 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseInter + EXE_INC = \ - -I../phasesSystem/lnInclude \ + -I${phaseSystem}/phasesSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ @@ -9,4 +11,5 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -llagrangian \ - -lradiationModels + -lradiationModels \ + -lincompressibleMultiphaseSystems diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/files b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/files deleted file mode 100644 index 96b699f92abd6ed4edd83d0501090e11514897b7..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/files +++ /dev/null @@ -1,19 +0,0 @@ -interfaceModels/porousModels/porousModel/porousModel.C -interfaceModels/porousModels/porousModel/porousModelNew.C -interfaceModels/porousModels/VollerPrakash/VollerPrakash.C - -phasePair/phasePairKey/phasePairKey.C -phasePair/phasePair/phasePair.C -phasePair/orderedPhasePair/orderedPhasePair.C - -phaseModel/phaseModel/phaseModel.C -phaseModel/phaseModel/phaseModelNew.C -phaseModel/phaseModel/phaseModels.C - -phaseSystem/phaseSystem.C - -phaseSystem/multiphaseSystem/multiphaseSystem.C -phaseSystem/multiphaseSystem/multiphaseSystemNew.C -phaseSystem/multiphaseSystem/multiphaseSystems.C - -LIB = $(FOAM_LIBBIN)/libIncompressibleMultiphaseSystems diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean index c52eb07a6eb2e284200a7f945382eb4ec8f02913..05177c120b5fdf16261af06be2345f33adc490fe 100755 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso temperaturePhaseChangeTwoPhaseMixtures wclean diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake index 161cf173bd55eaee39c46b03fdd8ef25eba69c09..9676ed22ebaee48b1e76649c83fe7660e1d83ad8 100755 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType temperaturePhaseChangeTwoPhaseMixtures diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files index 3944b9edb1e40cfc1a65bff67dd0a98065ccd501..59d9eedd0b97c1f9f9cd79288a330b8c3aeb0e96 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files @@ -1,5 +1,5 @@ -temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C +temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C constant/constant.C diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C similarity index 100% rename from applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtureNew.C diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean index c8c968e88a6943a4547ecedcc062729e990a0087..ed13e92d0006f44fd82cd71d003d9d9976f0e379 100755 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso phaseChangeTwoPhaseMixtures wclean diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake index f71877b09cd96d73b25e2a8e6ddd7271a6cc1a7d..1728290029b51a7e70869b89cba9b7ac2dfa15f2 100755 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType phaseChangeTwoPhaseMixtures diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/files b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/files index ac0e4f4787222c6b6535ade73a5f18b0ae36eca0..08f86c582fe696a13df65b5c49103a70ba01ac8c 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/files +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/files @@ -1,5 +1,5 @@ phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C -phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C +phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C Kunz/Kunz.C Merkle/Merkle.C SchnerrSauer/SchnerrSauer.C diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C similarity index 100% rename from applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C rename to applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index 83b37671ec1aba630f072cf56e8822efbf6d7e8c..28a7966cd58eb65bbfc952dc75a9c86c062b30ab 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -1,7 +1,8 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseEuler + EXE_INC = \ - -ImultiphaseSystem/lnInclude \ - -ImultiphaseFixedFluxPressure \ - -IinterfacialModels/lnInclude \ + -I${phaseSystem}/multiphaseSystem/lnInclude \ + -I${phaseSystem}/interfacialModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels \ @@ -16,9 +17,9 @@ EXE_LIBS = \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ - -lmultiphaseSystem \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lcompressibleMultiphaseEulerianInterfacialModels \ -lturbulenceModels \ - -lincompressibleTurbulenceModels + -lincompressibleTurbulenceModels \ + -lmultiphaseSystem \ + -lcompressibleMultiphaseEulerianInterfacialModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/files deleted file mode 100644 index ff81afc6346c3148a276bdf56a1f09101db51f3b..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/files +++ /dev/null @@ -1,17 +0,0 @@ -dragModels/dragModel/dragModel.C -dragModels/dragModel/newDragModel.C -dragModels/Ergun/Ergun.C -dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C -dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C -dragModels/SchillerNaumann/SchillerNaumann.C -dragModels/Gibilaro/Gibilaro.C -dragModels/WenYu/WenYu.C -dragModels/SyamlalOBrien/SyamlalOBrien.C -dragModels/blended/blended.C -dragModels/interface/interface.C - -heatTransferModels/heatTransferModel/heatTransferModel.C -heatTransferModels/heatTransferModel/newHeatTransferModel.C -heatTransferModels/RanzMarshall/RanzMarshall.C - -LIB = $(FOAM_LIBBIN)/libcompressibleMultiphaseEulerianInterfacialModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files deleted file mode 100644 index e14922c0e377d9a830ec9726ceaeaa39de93e2d9..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files +++ /dev/null @@ -1,10 +0,0 @@ -phaseModel/phaseModel.C -diameterModels/diameterModel/diameterModel.C -diameterModels/diameterModel/newDiameterModel.C -diameterModels/constantDiameter/constantDiameter.C -diameterModels/isothermalDiameter/isothermalDiameter.C - -alphaContactAngle/alphaContactAngleFvPatchScalarField.C -multiphaseSystem.C - -LIB = $(FOAM_LIBBIN)/libmultiphaseSystem diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean index 519d34d2b7205a066984578f980523655214cb9b..3b2bbdbed14a564ff74d58742a6d6dbe8e9706b7 100755 --- a/applications/solvers/multiphase/multiphaseInterFoam/Allwclean +++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwclean @@ -1,5 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso multiphaseMixture wclean diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake index 45599d519db455c50fa6010bf91d6ba07f63e52d..00662576c16492d1ac8b8b7de676a070a53fa409 100755 --- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake @@ -1,7 +1,6 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmake $targetType multiphaseMixture diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/Allwclean deleted file mode 100755 index 4ac3e56e70a6c5b6ce27eaafdf2595162746148f..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/reactingEulerFoam/Allwclean +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory - -wclean reactingTwoPhaseEulerFoam -wclean reactingMultiphaseEulerFoam - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake deleted file mode 100755 index afb6570f3afccad85b3fbdd5080f7e0343c72ed1..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - -#------------------------------------------------------------------------------ - -case "$WM_COMPILER" in -Mingw*) - echo "Skipping $WM_COMPILER compilation of $PWD" - echo "... needs further resolution of cyclic dependencies" - exit 0 - ;; -esac - -#------------------------------------------------------------------------------ - -reactingTwoPhaseEulerFoam/Allwmake $targetType $* -reactingMultiphaseEulerFoam/Allwmake $targetType $* - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean deleted file mode 100755 index 909e0eed6a842339c03db78bca16654e69592706..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwclean +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory - -wclean - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean deleted file mode 100755 index 909e0eed6a842339c03db78bca16654e69592706..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory - -wclean - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/CourantNo.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/CourantNo.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/EEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/EEqns.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/EEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/files similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/files rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/files diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options similarity index 62% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options index e13ba154846b1a156d6808e2e689e9704c176fdd..8aa5433d870bfef6ad347bf59597498d7bcfb968 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options @@ -1,12 +1,14 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler + EXE_INC = \ + -I${phaseSystem}/multiphaseSystem/lnInclude \ + -I${phaseSystem}/multiphaseCompressibleTurbulenceModels/lnInclude \ + -I${phaseSystem}/phaseSystems/lnInclude \ + -I${phaseSystem}/interfacialModels/lnInclude \ + -I${phaseSystem}/interfacialCompositionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/YEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/YEqns.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/YEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFieldRefs.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/createFieldRefs.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFieldRefs.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/createFieldRefs.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/createFields.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/createFields.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/UEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/UEqns.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/UEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/pU/pEqn.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/UEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/UEqns.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/UEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pUf/pEqn.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/pUf/pEqn.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/setRDeltaT.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H rename to applications/solvers/multiphase/reactingMultiphaseEulerFoam/setRDeltaT.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/EEqns.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/EEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/files b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/files similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/files rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/files diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options similarity index 59% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options index 81c44f8898a427de4b5eedbad2b6cb2c9e1e88ad..365e8d5d386b3c3eb4feef274024794013e6212c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options @@ -1,12 +1,14 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler + EXE_INC = \ + -I${phaseSystem}/twoPhaseSystem/lnInclude \ + -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \ + -I${phaseSystem}/phaseSystems/lnInclude \ + -I${phaseSystem}/interfacialCompositionModels/lnInclude \ + -I${phaseSystem}/interfacialModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/YEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/YEqns.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/YEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFieldRefs.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFieldRefs.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFieldRefs.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFieldRefs.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/UEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/UEqns.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/UEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/pEqn.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pU/pEqn.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pU/pEqn.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/UEqns.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/UEqns.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/UEqns.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/createRDeltaTf.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/pEqn.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/pUf/pEqn.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/pUf/pEqn.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaT.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaT.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaTf.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaTf.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaTf.H rename to applications/solvers/multiphase/reactingTwoPhaseEulerFoam/setRDeltaTf.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index 45b60207aab0a4c7ad547c5aade6ed1cbb971913..848c6ee28febd1d421704e999438d26fbec04a4e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -1,4 +1,9 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/twoPhaseEuler + EXE_INC = \ + -I${phaseSystem}/phaseCompressibleTurbulenceModels/lnInclude \ + -I${phaseSystem}/twoPhaseEuler/interfacialModels/lnInclude \ + -I${phaseSystem}/twoPhaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -7,10 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ - -IphaseCompressibleTurbulenceModels/lnInclude \ - -IinterfacialModels/lnInclude \ - -ItwoPhaseSystem/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -22,7 +24,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ - -lphaseCompressibleTurbulenceModels \ -lincompressibleTransportModels \ + -lphaseCompressibleTurbulenceModels \ -lcompressibleTwoPhaseSystem \ -lcompressibleEulerianInterfacialModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files deleted file mode 100644 index b4abd28a68284dc47e6765812174bb4d88d6faf8..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/files +++ /dev/null @@ -1,64 +0,0 @@ -dragModels/dragModel/dragModel.C -dragModels/dragModel/newDragModel.C -dragModels/segregated/segregated.C -dragModels/Ergun/Ergun.C -dragModels/Gibilaro/Gibilaro.C -dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C -dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C -dragModels/Lain/Lain.C -dragModels/SchillerNaumann/SchillerNaumann.C -dragModels/SyamlalOBrien/SyamlalOBrien.C -dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C -dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C -dragModels/WenYu/WenYu.C -dragModels/IshiiZuber/IshiiZuber.C - -swarmCorrections/swarmCorrection/swarmCorrection.C -swarmCorrections/swarmCorrection/newSwarmCorrection.C -swarmCorrections/noSwarm/noSwarm.C -swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C - -liftModels/liftModel/liftModel.C -liftModels/liftModel/newLiftModel.C -liftModels/noLift/noLift.C -liftModels/constantLiftCoefficient/constantLiftCoefficient.C -liftModels/Moraga/Moraga.C -liftModels/LegendreMagnaudet/LegendreMagnaudet.C -liftModels/TomiyamaLift/TomiyamaLift.C - -heatTransferModels/heatTransferModel/heatTransferModel.C -heatTransferModels/heatTransferModel/newHeatTransferModel.C -heatTransferModels/RanzMarshall/RanzMarshall.C -heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C - -virtualMassModels/virtualMassModel/virtualMassModel.C -virtualMassModels/virtualMassModel/newVirtualMassModel.C -virtualMassModels/noVirtualMass/noVirtualMass.C -virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C -virtualMassModels/Lamb/Lamb.C - -wallLubricationModels/wallLubricationModel/wallLubricationModel.C -wallLubricationModels/wallLubricationModel/newWallLubricationModel.C -wallLubricationModels/noWallLubrication/noWallLubrication.C -wallLubricationModels/Antal/Antal.C -wallLubricationModels/Frank/Frank.C -wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C - -turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C -turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C -turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C -turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C -turbulentDispersionModels/Burns/Burns.C -turbulentDispersionModels/Gosman/Gosman.C -turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C - -aspectRatioModels/aspectRatioModel/aspectRatioModel.C -aspectRatioModels/aspectRatioModel/newAspectRatioModel.C -aspectRatioModels/constantAspectRatio/constantAspectRatio.C -aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C -aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C -aspectRatioModels/Wellek/Wellek.C - -wallDependentModel/wallDependentModel.C - -LIB = $(FOAM_LIBBIN)/libcompressibleEulerianInterfacialModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files deleted file mode 100644 index f6510d618c3a3c2be0aa93178bf0e0f02fdb644f..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files +++ /dev/null @@ -1,39 +0,0 @@ -phaseCompressibleTurbulenceModels.C -phasePressureModel/phasePressureModel.C - -kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C - -kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C -kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C -kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C -kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C -kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C -kineticTheoryModels/viscosityModel/none/noneViscosity.C - -kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C -kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C -kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C -kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C -kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C - -kineticTheoryModels/radialModel/radialModel/radialModel.C -kineticTheoryModels/radialModel/radialModel/newRadialModel.C -kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C -kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C -kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C - -kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C -kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C -kineticTheoryModels/granularPressureModel/Lun/LunPressure.C -kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C - -kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C -kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C -kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C -kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C -kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C - -kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C -kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C - -LIB = $(FOAM_LIBBIN)/libphaseCompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/files deleted file mode 100644 index 8ca75b46ee2b47fe7f8859700a117b9c4903496b..0000000000000000000000000000000000000000 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/files +++ /dev/null @@ -1,25 +0,0 @@ -phaseModel/phaseModel.C -diameterModels/diameterModel/diameterModel.C -diameterModels/diameterModel/newDiameterModel.C -diameterModels/constantDiameter/constantDiameter.C -diameterModels/isothermalDiameter/isothermalDiameter.C - -diameterModels/IATE/IATE.C -diameterModels/IATE/IATEsources/IATEsource/IATEsource.C -diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C -diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C -diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C - -BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C -BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C -BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C -BlendedInterfacialModel/blendingMethods/linear/linear.C -BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C - -phasePair/phasePairKey/phasePairKey.C -phasePair/phasePair/phasePair.C -phasePair/orderedPhasePair/orderedPhasePair.C - -twoPhaseSystem.C - -LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseSystem diff --git a/src/TurbulenceModels/incompressible/Make/files b/src/TurbulenceModels/incompressible/Make/files index 9f5893a0fe35f9136255efc1954aca9c3a8cefef..389c934efdbda61b86e8bc43cb20ead9efec39fa 100644 --- a/src/TurbulenceModels/incompressible/Make/files +++ b/src/TurbulenceModels/incompressible/Make/files @@ -1,14 +1,21 @@ incompressibleTurbulenceModel.C turbulentTransportModels/turbulentTransportModels.C -turbulentTransportModels/RAS/qZeta/qZeta.C -turbulentTransportModels/RAS/kkLOmega/kkLOmega.C -turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C -turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C -turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C -turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C - -BCs = turbulentTransportModels/RAS/derivedFvPatchFields -turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C + + +RASModels = turbulentTransportModels/RAS + +$(RASModels)/qZeta/qZeta.C +$(RASModels)/kkLOmega/kkLOmega.C +$(RASModels)/LamBremhorstKE/LamBremhorstKE.C +$(RASModels)/LienLeschziner/LienLeschziner.C +$(RASModels)/ShihQuadraticKE/ShihQuadraticKE.C +$(RASModels)/LienCubicKE/LienCubicKE.C + + +wallFunctions = turbulentTransportModels/derivedFvPatchFields/wallFunctions + +$(wallFunctions)/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C + LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels diff --git a/src/TurbulenceModels/schemes/Make/files b/src/TurbulenceModels/schemes/Make/files index 49f0357b642acb406d5ca87311bac2b779126f33..6da90fcb4df112fb49354ff8dbe2d4d52e43f8d0 100644 --- a/src/TurbulenceModels/schemes/Make/files +++ b/src/TurbulenceModels/schemes/Make/files @@ -1,3 +1,3 @@ DEShybrid/DEShybrid.C -LIB = $(FOAM_LIBBIN)/libturbulenceModelSchemes \ No newline at end of file +LIB = $(FOAM_LIBBIN)/libturbulenceModelSchemes diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index 5d3d5f11d6692b9f5bbb33a32b5efc2eac674aed..57ea31c1cfb026a75c927836f43aed29ef24bf1d 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I$(LIB_SRC)/OpenFOAM/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ @@ -19,11 +18,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude + -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude LIB_LIBS = \ - -lOpenFOAM \ -lfiniteVolume \ -lfileFormats \ -lsurfMesh \ diff --git a/src/phaseSystemModels/Allwclean b/src/phaseSystemModels/Allwclean deleted file mode 100755 index cc8f941470c33b473e1a9edcfaa31965b31e6fe8..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/Allwclean +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -cd "${0%/*}" || exit # Run from this directory - -wclean libso reactingEulerFoam/phaseSystems -wclean libso reactingEulerFoam/interfacialModels -wclean libso reactingEulerFoam/interfacialCompositionModels -wclean libso reactingEulerFoam/derivedFvPatchFields - -wclean libso reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem -wclean libso reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels - -wclean libso reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem -wclean libso reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels -wclean libso reactingEulerFoam/functionObjects - -#------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake index 65eb00e8ee7bdfeebf1c81f950a84905a7309a8c..7239a7a7536a576eebc2a2ace1fa7792a5a59825 100755 --- a/src/phaseSystemModels/Allwmake +++ b/src/phaseSystemModels/Allwmake @@ -1,32 +1,11 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - -#------------------------------------------------------------------------------ - -wmakeLnInclude reactingEulerFoam/phaseSystems - -case "$WM_COMPILER" in -Mingw*) - echo "Skipping $WM_COMPILER compilation of $PWD" - echo "... needs further resolution of cyclic dependencies" - exit 0 - ;; -esac - #------------------------------------------------------------------------------ -wmake $targetType reactingEulerFoam/interfacialModels -wmake $targetType reactingEulerFoam/interfacialCompositionModels -wmake $targetType reactingEulerFoam/derivedFvPatchFields - -wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem -wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels - -wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem -wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels - -wmake $targetType reactingEulerFoam/phaseSystems -wmake $targetType reactingEulerFoam/functionObjects +multiphaseInter/Allwmake $targetType $* +multiphaseEuler/Allwmake $targetType $* +reactingEuler/Allwmake $targetType $* +twoPhaseEuler/Allwmake $targetType $* #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean b/src/phaseSystemModels/multiphaseEuler/Allwclean similarity index 71% rename from applications/solvers/multiphase/multiphaseEulerFoam/Allwclean rename to src/phaseSystemModels/multiphaseEuler/Allwclean index a2b25759d42cc7f685640c689f4cca7a6579aec3..bf494aaecca1b693c060b6f43c8ad62c51f9298f 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean +++ b/src/phaseSystemModels/multiphaseEuler/Allwclean @@ -1,8 +1,8 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ -wclean libso multiphaseSystem wclean libso interfacialModels -wclean +wclean libso multiphaseSystem #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/src/phaseSystemModels/multiphaseEuler/Allwmake similarity index 87% rename from applications/solvers/multiphase/multiphaseEulerFoam/Allwmake rename to src/phaseSystemModels/multiphaseEuler/Allwmake index 4d000cef0a0e26a13ed24598e130895227d75a2f..44a6b77516e3601362b0bff8fb0d5e730badac91 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake +++ b/src/phaseSystemModels/multiphaseEuler/Allwmake @@ -1,12 +1,10 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ -wmakeLnInclude interfacialModels -wmake $targetType multiphaseSystem +wmakeLnInclude multiphaseSystem wmake $targetType interfacialModels -wmake $targetType +wmake $targetType multiphaseSystem #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files b/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..38ad5c19fb148ea24f4aa06a27f13bc6bff1d055 --- /dev/null +++ b/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files @@ -0,0 +1,19 @@ +drag = dragModels +$(drag)/dragModel/dragModel.C +$(drag)/dragModel/dragModelNew.C +$(drag)/Ergun/Ergun.C +$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C +$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +$(drag)/SchillerNaumann/SchillerNaumann.C +$(drag)/Gibilaro/Gibilaro.C +$(drag)/WenYu/WenYu.C +$(drag)/SyamlalOBrien/SyamlalOBrien.C +$(drag)/blended/blended.C +$(drag)/interface/interface.C + +heatTransfer = heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C + +LIB = $(FOAM_LIBBIN)/libcompressibleMultiphaseEulerianInterfacialModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options b/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/blended/blended.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/blended/blended.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/blended/blended.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/blended/blended.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C rename to src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..454c8d5a68089cdc2a1591e642d7da5cc3e44838 --- /dev/null +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files @@ -0,0 +1,15 @@ +phaseModel/phaseModel.C + +multiphaseSystem/multiphaseSystem.C + +diameter = diameterModels + +$(diameter)/diameterModel/diameterModel.C +$(diameter)/diameterModel/diameterModelNew.C +$(diameter)/constantDiameter/constantDiameter.C +$(diameter)/isothermalDiameter/isothermalDiameter.C + +alphaContactAngle/alphaContactAngleFvPatchScalarField.C + + +LIB = $(FOAM_LIBBIN)/libmultiphaseSystem diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options similarity index 88% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options index cccb31514dc70f1381ac66652cb7b4b3ac396f04..e39081ae11092c00345ccebbe478e308ad0055d2 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -linterfaceProperties \ - -lincompressibleTransportModels \ -lfiniteVolume \ - -lmeshTools + -lmeshTools \ + -linterfaceProperties \ + -lincompressibleTransportModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H similarity index 100% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/src/phaseSystemModels/multiphaseInter/Allwclean similarity index 51% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake rename to src/phaseSystemModels/multiphaseInter/Allwclean index 3a29d0b1741f17dd736a75b2825a1faf25ebf116..869275cbbf9cf182143b1ea6e7d576d1b1a8d832 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake +++ b/src/phaseSystemModels/multiphaseInter/Allwclean @@ -1,9 +1,9 @@ #!/bin/sh -cd "${0%/*}" || exit # Run from this directory -. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - +cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ -wmake $targetType +wclean libso phasesSystem +wclean libso massTransferModels +wclean libso compressibleMultiPhaseTurbulenceModels #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/src/phaseSystemModels/multiphaseInter/Allwmake similarity index 66% rename from applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake rename to src/phaseSystemModels/multiphaseInter/Allwmake index 3a29d0b1741f17dd736a75b2825a1faf25ebf116..ec914b38e570f6774eea6b2e46ed858b08b408f1 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake +++ b/src/phaseSystemModels/multiphaseInter/Allwmake @@ -1,9 +1,11 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ -wmake $targetType +wmakeLnInclude massTransferModels +wmake $targetType phasesSystem +wmake $targetType massTransferModels +wmake $targetType compressibleMultiPhaseTurbulenceModels #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/Make/files b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..adbf68e8479f0e34505dbd0858a96ab257866656 --- /dev/null +++ b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/Make/files @@ -0,0 +1,3 @@ +compressibleMultiPhaseTurbulenceModels.C + +LIB = $(FOAM_LIBBIN)/libcompressibleMultiPhaseTurbulenceModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/Make/options similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options rename to src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/Make/options diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/CompressibleMultiPhaseTurbulenceModels.C rename to src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H rename to src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H b/src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Lee/Lee.H rename to src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/files b/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files similarity index 99% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/files rename to src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files index cf1d7d5e77721776ca4b1a09caf10cb2a04c3c2b..e9dfc088813c588d78b35c841b9aefb4252554f3 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/files +++ b/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files @@ -1,5 +1,6 @@ interfaceCompositionModel/interfaceCompositionModel.C interfaceCompositionModel/interfaceCompositionModelNew.C + InterfaceCompositionModel/InterfaceCompositionModels.C LIB = $(FOAM_LIBBIN)/libmassTransferModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options b/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options rename to src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H rename to src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H b/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H rename to src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C b/src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C rename to src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H b/src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H rename to src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..5f1cd9f53ed0f987e359be24eac727235aab1d32 --- /dev/null +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files @@ -0,0 +1,19 @@ +phaseModel/phaseModel/phaseModel.C +phaseModel/phaseModel/phaseModelNew.C +phaseModel/phaseModel/phaseModels.C + +phasePair/phasePair.C +phasePair/phasePairKey.C +phasePair/orderedPhasePair.C + +phaseSystem/phaseSystem.C + +multiphaseSystem/multiphaseSystem.C +multiphaseSystem/multiphaseSystemNew.C +multiphaseSystem/multiphaseSystems.C + +interfaceModels/porousModels/porousModel/porousModel.C +interfaceModels/porousModels/porousModel/porousModelNew.C +interfaceModels/porousModels/VollerPrakash/VollerPrakash.C + +LIB = $(FOAM_LIBBIN)/libincompressibleMultiphaseSystems diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options similarity index 94% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options rename to src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options index 4a4a3493ddd8cd6f9bdaf52db77dea25332ca992..4c1f54cfa28bcb6785b28d4ead9757f0cc61e3de 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I../massTransferModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModelNew.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystemNew.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystems.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/PurePhaseModel/PurePhaseModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/StaticPhaseModel/StaticPhaseModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/makePhaseTypes.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/makePhaseTypes.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/makePhaseTypes.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/makePhaseTypes.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModel.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModelNew.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModelNew.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModelNew.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModels.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModels.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModels.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseModel/phaseModel/phaseModels.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/orderedPhasePair.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/orderedPhasePair/orderedPhasePair.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/orderedPhasePair.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/orderedPhasePair/orderedPhasePair.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/orderedPhasePair.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/orderedPhasePair/orderedPhasePair.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/orderedPhasePair.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePair.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePair.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePair.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePair.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePairI.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairI.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePairI.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairI.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePairKey/phasePairKey.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairKey.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePairKey/phasePairKey.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairKey.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePairKey/phasePairKey.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairKey.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePairKey/phasePairKey.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phasePair/phasePairKey.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystemTemplates.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystemTemplates.H similarity index 100% rename from applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystemTemplates.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystemTemplates.H diff --git a/src/phaseSystemModels/reactingEuler/Allwclean b/src/phaseSystemModels/reactingEuler/Allwclean new file mode 100755 index 0000000000000000000000000000000000000000..1d16885dffcd04224d3ef1e28efcd2a5a9920775 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/Allwclean @@ -0,0 +1,22 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ + +# echo "cleaning ${PWD##*/}" + +wclean libso phaseSystems +wclean libso interfacialModels +wclean libso interfacialCompositionModels +wclean libso derivedFvPatchFields + +# multiphase +wclean libso multiphaseSystem +wclean libso multiphaseCompressibleTurbulenceModels + +# twoPhase +wclean libso twoPhaseSystem +wclean libso twoPhaseCompressibleTurbulenceModels + +wclean libso functionObjects + +#------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/reactingEuler/Allwmake b/src/phaseSystemModels/reactingEuler/Allwmake new file mode 100755 index 0000000000000000000000000000000000000000..2cbf2cc0821f0070291e8c50a359dfd4dda81803 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/Allwmake @@ -0,0 +1,22 @@ +#!/bin/sh +cd "${0%/*}" || exit # Run from this directory +. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments +#------------------------------------------------------------------------------ + +# echo "making ${PWD##*/}" + +wmakeLnInclude phaseSystems +wmake $targetType interfacialModels +wmake $targetType interfacialCompositionModels +wmake $targetType derivedFvPatchFields + +wmake $targetType multiphaseSystem +wmake $targetType multiphaseCompressibleTurbulenceModels + +wmake $targetType twoPhaseSystem +wmake $targetType twoPhaseCompressibleTurbulenceModels + +wmake $targetType phaseSystems +wmake $targetType functionObjects + +#------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..788c93faa016d6b515f8b359a05a471e0ff6c981 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files @@ -0,0 +1,62 @@ +partitioning = wallBoilingSubModels/partitioningModels +$(partitioning)/partitioningModel/partitioningModel.C +$(partitioning)/partitioningModel/partitioningModelNew.C +$(partitioning)/phaseFraction/phaseFraction.C +$(partitioning)/Lavieville/Lavieville.C +$(partitioning)/cosine/cosine.C +$(partitioning)/linear/linear.C + +nucleation = wallBoilingSubModels/nucleationSiteModels +$(nucleation)/nucleationSiteModel/nucleationSiteModel.C +$(nucleation)/nucleationSiteModel/nucleationSiteModelNew.C +$(nucleation)/LemmertChawla/LemmertChawla.C + +departureDiam = wallBoilingSubModels/departureDiameterModels +$(departureDiam)/departureDiameterModel/departureDiameterModel.C +$(departureDiam)/departureDiameterModel/departureDiameterModelNew.C +$(departureDiam)/TolubinskiKostanchuk/TolubinskiKostanchuk.C +$(departureDiam)/KocamustafaogullariIshii/KocamustafaogullariIshii.C + +departureFreq = wallBoilingSubModels/departureFrequencyModels +$(departureFreq)/departureFrequencyModel/departureFrequencyModel.C +$(departureFreq)/departureFrequencyModel/departureFrequencyModelNew.C +$(departureFreq)/Cole/Cole.C + +CHFModels = wallBoilingSubModels/CHFModels +$(CHFModels)/CHFModel/CHFModel.C +$(CHFModels)/CHFModel/CHFModelNew.C +$(CHFModels)/Zuber/Zuber.C + +CHFSubCoolModels = wallBoilingSubModels/CHFSubCoolModels +$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModel.C +$(CHFSubCoolModels)/CHFSubCoolModel/CHFSubCoolModelNew.C +$(CHFSubCoolModels)/HuaXu/HuaXu.C + +filmBoiling = wallBoilingSubModels/filmBoilingModels +$(filmBoiling)/filmBoilingModel/filmBoilingModel.C +$(filmBoiling)/filmBoilingModel/filmBoilingModelNew.C +$(filmBoiling)/Bromley/Bromley.C + +Leidenfrost = wallBoilingSubModels/LeidenfrostModels +$(Leidenfrost)/LeidenfrostModel/LeidenfrostModel.C +$(Leidenfrost)/LeidenfrostModel/LeidenfrostModelNew.C +$(Leidenfrost)/Spiegler/Spiegler.C + +MHFModels = wallBoilingSubModels/MHFModels +$(MHFModels)/MHFModel/MHFModel.C +$(MHFModels)/MHFModel/MHFModelNew.C +$(MHFModels)/Jeschar/Jeschar.C + +TDNBModels = wallBoilingSubModels/TDNBModels +$(TDNBModels)/TDNBModel/TDNBModel.C +$(TDNBModels)/TDNBModel/TDNBModelNew.C +$(TDNBModels)/Schroeder/Schroeder.C + +alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C +alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C +alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C +alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +copiedFixedValue/copiedFixedValueFvPatchScalarField.C +fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C + +LIB = $(FOAM_LIBBIN)/libreactingEulerianFvPatchFields diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/options similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/options diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/newCHFModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/newCHFModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/newCHFSubCoolModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/newCHFSubCoolModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/newLeidenfrostModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/newLeidenfrostModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/newMHFModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/newMHFModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/newTDNBModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/newTDNBModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/newfilmBoilingModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/newfilmBoilingModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/Make/files b/src/phaseSystemModels/reactingEuler/functionObjects/Make/files similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/Make/files rename to src/phaseSystemModels/reactingEuler/functionObjects/Make/files diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/Make/options b/src/phaseSystemModels/reactingEuler/functionObjects/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..648204031361f2446c869be83cb1fe01bf68a9f1 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/functionObjects/Make/options @@ -0,0 +1,14 @@ +phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler + +EXE_INC = \ + -I${phaseSystem}/interfacialModels/lnInclude \ + -I${phaseSystem}/phaseSystems/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/functionObjects/field/lnInclude + +LIB_LIBS = \ + -lfiniteVolume \ + -lfieldFunctionObjects \ + -lreactingPhaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/phaseForces/phaseForces.C b/src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/phaseForces/phaseForces.C rename to src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.C diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H b/src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H rename to src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.H diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C b/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C rename to src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H b/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H rename to src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C rename to src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.C diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H rename to src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..94c6cf7051400d5b7d3c7bc31423a443163f7b8e --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files @@ -0,0 +1,28 @@ +massTransfer = massTransferModels + +$(massTransfer)/massTransferModel/massTransferModel.C +$(massTransfer)/massTransferModel/massTransferModelNew.C +$(massTransfer)/Frossling/Frossling.C +$(massTransfer)/sphericalMassTransfer/sphericalMassTransfer.C + +surfaceTension = surfaceTensionModels +$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C +$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C +$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C + +composition = interfaceCompositionModels +$(composition)/interfaceCompositionModel/interfaceCompositionModel.C +$(composition)/interfaceCompositionModel/interfaceCompositionModelNew.C +$(composition)/InterfaceCompositionModel/InterfaceCompositionModels.C + +saturation = saturationModels +$(saturation)/saturationModel/saturationModel.C +$(saturation)/saturationModel/saturationModelNew.C +$(saturation)/Antoine/Antoine.C +$(saturation)/AntoineExtended/AntoineExtended.C +$(saturation)/ArdenBuck/ArdenBuck.C +$(saturation)/polynomial/polynomial.C +$(saturation)/function1/function1.C +$(saturation)/constantSaturationConditions/constantSaturationConditions.C + +LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialCompositionModels diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/options similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/options diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files b/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..d9af0507a0428aa9412aa5da876beeb296addd76 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files @@ -0,0 +1,92 @@ +drag = dragModels +$(drag)/dragModel/dragModel.C +$(drag)/dragModel/dragModelNew.C +$(drag)/Beetstra/Beetstra.C +$(drag)/segregated/segregated.C +$(drag)/Ergun/Ergun.C +$(drag)/Gibilaro/Gibilaro.C +$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C +$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +$(drag)/Lain/Lain.C +$(drag)/SchillerNaumann/SchillerNaumann.C +$(drag)/SyamlalOBrien/SyamlalOBrien.C +$(drag)/TomiyamaCorrelated/TomiyamaCorrelated.C +$(drag)/TomiyamaAnalytic/TomiyamaAnalytic.C +$(drag)/Tenneti/Tenneti.C +$(drag)/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C +$(drag)/WenYu/WenYu.C +$(drag)/IshiiZuber/IshiiZuber.C +$(drag)/AttouFerschneider/AttouFerschneider.C + +swarm = swarmCorrections +$(swarm)/swarmCorrection/swarmCorrection.C +$(swarm)/swarmCorrection/swarmCorrectionNew.C +$(swarm)/noSwarm/noSwarm.C +$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C + +lift = liftModels +$(lift)/liftModel/liftModel.C +$(lift)/liftModel/liftModelNew.C +$(lift)/noLift/noLift.C +$(lift)/constantLiftCoefficient/constantLiftCoefficient.C +$(lift)/Moraga/Moraga.C +$(lift)/LegendreMagnaudet/LegendreMagnaudet.C +$(lift)/TomiyamaLift/TomiyamaLift.C +$(lift)/wallDampedLift/wallDampedLift.C + +heatTransfer = heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/constantNu/constantNuHeatTransfer.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C +$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C + +virtualMass = virtualMassModels +$(virtualMass)/virtualMassModel/virtualMassModel.C +$(virtualMass)/virtualMassModel/virtualMassModelNew.C +$(virtualMass)/noVirtualMass/noVirtualMass.C +$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C +$(virtualMass)/Lamb/Lamb.C + +lubrication = wallLubricationModels +$(lubrication)/wallLubricationModel/wallLubricationModel.C +$(lubrication)/wallLubricationModel/wallLubricationModelNew.C +$(lubrication)/noWallLubrication/noWallLubrication.C +$(lubrication)/Antal/Antal.C +$(lubrication)/Frank/Frank.C +$(lubrication)/TomiyamaWallLubrication/TomiyamaWallLubrication.C + +dispersion = turbulentDispersionModels +$(dispersion)/turbulentDispersionModel/turbulentDispersionModel.C +$(dispersion)/turbulentDispersionModel/turbulentDispersionModelNew.C +$(dispersion)/noTurbulentDispersion/noTurbulentDispersion.C +$(dispersion)/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +$(dispersion)/Burns/Burns.C +$(dispersion)/Gosman/Gosman.C +$(dispersion)/LopezDeBertodano/LopezDeBertodano.C + +aspectRatio = aspectRatioModels +$(aspectRatio)/aspectRatioModel/aspectRatioModel.C +$(aspectRatio)/aspectRatioModel/aspectRatioModelNew.C +$(aspectRatio)/constantAspectRatio/constantAspectRatio.C +$(aspectRatio)/TomiyamaAspectRatio/TomiyamaAspectRatio.C +$(aspectRatio)/VakhrushevEfremov/VakhrushevEfremov.C +$(aspectRatio)/Wellek/Wellek.C + +wallDependentModel/wallDependentModel.C + +damping = wallDampingModels +$(damping)/wallDampingModel/wallDampingModel.C +$(damping)/wallDampingModel/wallDampingModelNew.C +$(damping)/noWallDamping/noWallDamping.C +$(damping)/interpolated/interpolatedWallDamping.C +$(damping)/linear/linearWallDamping.C +$(damping)/cosine/cosineWallDamping.C +$(damping)/sine/sineWallDamping.C + +phaseTransfer = phaseTransferModels +$(phaseTransfer)/phaseTransferModel/phaseTransferModel.C +$(phaseTransfer)/phaseTransferModel/phaseTransferModelNew.C +$(phaseTransfer)/deposition/deposition.C + +LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialModels diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options b/src/phaseSystemModels/reactingEuler/interfacialModels/Make/options similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options rename to src/phaseSystemModels/reactingEuler/interfacialModels/Make/options diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Lain/Lain.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H b/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C b/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H b/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/newPhaseTransferModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/newPhaseTransferModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/newWallDampingModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C rename to src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/files rename to src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options similarity index 83% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options rename to src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options index 70335690503626532da723d14fa43f295c0aad84..b6550f8382729a1dbbfd1cdc4251a26355efc596 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I../multiphaseSystem/lnInclude \ - -I../../phaseSystems/lnInclude \ - -I../../interfacialModels/lnInclude\ - -I../../interfacialCompositionModels/lnInclude \ - -I../../derivedFvPatchFields/lnInclude \ + -I../phaseSystems/lnInclude \ + -I../interfacialModels/lnInclude\ + -I../interfacialCompositionModels/lnInclude \ + -I../derivedFvPatchFields/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C rename to src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..df53a45929ccb96a42c5979b375aac1b4bf08d6c --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files @@ -0,0 +1,7 @@ +multiphaseSystem/multiphaseSystem.C +multiphaseSystem/multiphaseSystemNew.C +multiphaseSystem/multiphaseSystems.C + +alphaContactAngle/alphaContactAngleFvPatchScalarField.C + +LIB = $(FOAM_LIBBIN)/libreactingMultiphaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options similarity index 81% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options index 06b3f1356ccac5eb925941fc392972c263d9105a..9b6559680518039e09de026954464f814d8ec897 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I../../interfacialModels/lnInclude \ - -I../../interfacialCompositionModels/lnInclude \ - -I../../phaseSystems/lnInclude \ + -I../interfacialModels/lnInclude \ + -I../interfacialCompositionModels/lnInclude \ + -I../phaseSystems/lnInclude \ -I../multiphaseCompressibleTurbulenceModels/lnInclude \ - -I../../derivedFvPatchFields/lnInclude \ + -I../derivedFvPatchFields/lnInclude \ -IalphaContactAngle \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/newMultiphaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystems.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H b/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files b/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..2bda03caad9b3f806531eccc8e8da33e92532d38 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files @@ -0,0 +1,68 @@ +phaseModel/phaseModel/phaseModel.C +phaseModel/phaseModel/phaseModelNew.C +phaseModel/phaseModel/phaseModels.C + +phasePair/phasePairKey.C +phasePair/phasePair.C +phasePair/orderedPhasePair.C + +phaseSystem/phaseSystem.C + +reactionThermo/hRefConstThermos.C + +diameter = diameterModels +$(diameter)/diameterModel/diameterModel.C +$(diameter)/diameterModel/diameterModelNew.C +$(diameter)/constantDiameter/constantDiameter.C +$(diameter)/isothermalDiameter/isothermalDiameter.C +$(diameter)/linearTsubDiameter/linearTsubDiameter.C +$(diameter)/velocityGroup/velocityGroup.C +$(diameter)/velocityGroup/sizeGroup/sizeGroup.C + +populationBalanceModel/populationBalanceModel/populationBalanceModel.C + +coalescence = populationBalanceModel/coalescenceModels +$(coalescence)/coalescenceModel/coalescenceModel.C +$(coalescence)/constantCoalescence/constantCoalescence.C +$(coalescence)/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +$(coalescence)/hydrodynamic/hydrodynamic.C +$(coalescence)/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C +$(coalescence)/Luo/Luo.C +$(coalescence)/PrinceBlanch/PrinceBlanch.C + +binaryBreakup = populationBalanceModel/binaryBreakupModels +$(binaryBreakup)/binaryBreakupModel/binaryBreakupModel.C +$(binaryBreakup)/LuoSvendsen/LuoSvendsen.C +$(binaryBreakup)/LehrMilliesMewes/LehrMilliesMewes.C +$(binaryBreakup)/powerLawUniformBinary/powerLawUniformBinary.C + +breakup = populationBalanceModel/breakupModels +$(breakup)/breakupModel/breakupModel.C +$(breakup)/exponential/exponential.C +$(breakup)/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C +$(breakup)/powerLaw/powerLaw.C + +daughterSize = populationBalanceModel/daughterSizeDistributionModels +$(daughterSize)/daughterSizeDistributionModel/daughterSizeDistributionModel.C +$(daughterSize)/uniformBinary/uniformBinary.C +$(daughterSize)/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C + +drift = populationBalanceModel/driftModels +$(drift)/driftModel/driftModel.C +$(drift)/constantDrift/constantDrift.C +$(drift)/densityChange/densityChange.C +$(drift)/phaseChange/phaseChange.C + +nucleation = populationBalanceModel/nucleationModels +$(nucleation)/nucleationModel/nucleationModel.C +$(nucleation)/constantNucleation/constantNucleation.C +$(nucleation)/wallBoiling/wallBoiling.C + +blending = BlendedInterfacialModel/blendingMethods +$(blending)/blendingMethod/blendingMethod.C +$(blending)/blendingMethod/blendingMethodNew.C +$(blending)/noBlending/noBlending.C +$(blending)/linear/linear.C +$(blending)/hyperbolic/hyperbolic.C + +LIB = $(FOAM_LIBBIN)/libreactingPhaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options b/src/phaseSystemModels/reactingEuler/phaseSystems/Make/options similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options rename to src/phaseSystemModels/reactingEuler/phaseSystems/Make/options diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/newDiameterModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H b/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/newPhaseModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H rename to src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/src/phaseSystemModels/reactingEuler/phaseSystems/reactionThermo/hRefConstThermos.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C rename to src/phaseSystemModels/reactingEuler/phaseSystems/reactionThermo/hRefConstThermos.C diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/files b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..8fea79143cce573495a8deced41b5bd01d176558 --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/files @@ -0,0 +1,47 @@ +twoPhaseCompressibleTurbulenceModels.C +phasePressureModel/phasePressureModel.C + +kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C + + +viscosity = kineticTheoryModels/viscosityModel +$(viscosity)/viscosityModel/viscosityModel.C +$(viscosity)/viscosityModel/viscosityModelNew.C +$(viscosity)/Gidaspow/GidaspowViscosity.C +$(viscosity)/Syamlal/SyamlalViscosity.C +$(viscosity)/HrenyaSinclair/HrenyaSinclairViscosity.C +$(viscosity)/none/noneViscosity.C + +conductivity = kineticTheoryModels/conductivityModel +$(conductivity)/conductivityModel/conductivityModel.C +$(conductivity)/conductivityModel/conductivityModelNew.C +$(conductivity)/Gidaspow/GidaspowConductivity.C +$(conductivity)/Syamlal/SyamlalConductivity.C +$(conductivity)/HrenyaSinclair/HrenyaSinclairConductivity.C + +radial = kineticTheoryModels/radialModel +$(radial)/radialModel/radialModel.C +$(radial)/radialModel/radialModelNew.C +$(radial)/CarnahanStarling/CarnahanStarlingRadial.C +$(radial)/LunSavage/LunSavageRadial.C +$(radial)/SinclairJackson/SinclairJacksonRadial.C + +granular = kineticTheoryModels/granularPressureModel +$(granular)/granularPressureModel/granularPressureModel.C +$(granular)/granularPressureModel/granularPressureModelNew.C +$(granular)/Lun/LunPressure.C +$(granular)/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C + +frictional = kineticTheoryModels/frictionalStressModel +$(frictional)/frictionalStressModel/frictionalStressModel.C +$(frictional)/frictionalStressModel/frictionalStressModelNew.C +$(frictional)/JohnsonJackson/JohnsonJacksonFrictionalStress.C +$(frictional)/Schaeffer/SchaefferFrictionalStress.C +$(frictional)/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C + +derived = kineticTheoryModels/derivedFvPatchFields +$(derived)/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +$(derived)/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C + + +LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options similarity index 80% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options index c4ed27c34fb49ceeffcea72570a7a7c0b4f26c55..20127e5a47ebaafb12bf33e0119570c7eba34fc2 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I../twoPhaseSystem/lnInclude \ - -I../../phaseSystems/lnInclude \ - -I../../interfacialModels/lnInclude\ - -I../../interfacialCompositionModels/lnInclude \ - -I../../derivedFvPatchFields/lnInclude \ + -I../phaseSystems/lnInclude \ + -I../interfacialModels/lnInclude\ + -I../interfacialCompositionModels/lnInclude \ + -I../derivedFvPatchFields/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C rename to src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/files b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..45593c9ff4a8953fbb300548ab4948d469a461cf --- /dev/null +++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/files @@ -0,0 +1,16 @@ +twoPhaseSystem.C +twoPhaseSystemNew.C +twoPhaseSystems.C + +diameterModels/IATE/IATE.C + +IATEsources = diameterModels/IATE/IATEsources + +$(IATEsources)/IATEsource/IATEsource.C +$(IATEsources)/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C +$(IATEsources)/turbulentBreakUp/turbulentBreakUp.C +$(IATEsources)/randomCoalescence/randomCoalescence.C +$(IATEsources)/phaseChange/phaseChange.C +$(IATEsources)/wallBoiling/wallBoiling.C + +LIB = $(FOAM_LIBBIN)/libreactingTwoPhaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options similarity index 82% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options index a19dce92ba514d56c272dd21a200a0da629418e1..b0f22c09d55d58a332cbdd567061eabea37b40e2 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I../../interfacialModels/lnInclude \ - -I../../interfacialCompositionModels/lnInclude \ - -I../../phaseSystems/lnInclude \ + -I../interfacialModels/lnInclude \ + -I../interfacialCompositionModels/lnInclude \ + -I../phaseSystems/lnInclude \ -I../twoPhaseCompressibleTurbulenceModels/lnInclude \ - -I../../derivedFvPatchFields/lnInclude \ + -I../derivedFvPatchFields/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemI.H similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemI.H diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/newTwoPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystems.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C similarity index 100% rename from src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystems.C rename to src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C diff --git a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/files b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/files deleted file mode 100644 index 2a775f26611030d4f8e81647ebfa6778d1f316f2..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/files +++ /dev/null @@ -1,52 +0,0 @@ -wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C -wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C -wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C -wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C -wallBoilingSubModels/partitioningModels/cosine/cosine.C -wallBoilingSubModels/partitioningModels/linear/linear.C - -wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C -wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C -wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C - -wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C -wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C -wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C -wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C - -wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C -wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C -wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C - -wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C -wallBoilingSubModels/CHFModels/CHFModel/newCHFModel.C -wallBoilingSubModels/CHFModels/Zuber/Zuber.C - -wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C -wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/newCHFSubCoolModel.C -wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C - -wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C -wallBoilingSubModels/filmBoilingModels/filmBoilingModel/newfilmBoilingModel.C -wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C - -wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C -wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/newLeidenfrostModel.C -wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C - -wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C -wallBoilingSubModels/MHFModels/MHFModel/newMHFModel.C -wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C - -wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C -wallBoilingSubModels/TDNBModels/TDNBModel/newTDNBModel.C -wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C - -alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C -alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C -alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C -alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C -copiedFixedValue/copiedFixedValueFvPatchScalarField.C -fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C - -LIB = $(FOAM_LIBBIN)/libreactingEulerianFvPatchFields diff --git a/src/phaseSystemModels/reactingEulerFoam/functionObjects/Make/options b/src/phaseSystemModels/reactingEulerFoam/functionObjects/Make/options deleted file mode 100644 index cd3a9bf287c85b5c28e901c30c2e7bf4621afa67..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/functionObjects/Make/options +++ /dev/null @@ -1,11 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/functionObjects/field/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/interfacialModels/lnInclude \ - -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lfieldFunctionObjects diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/files b/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/files deleted file mode 100644 index 34919abb2b2062a88a7d24cfd854f239aa2e5ff2..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/files +++ /dev/null @@ -1,23 +0,0 @@ -massTransferModels/massTransferModel/massTransferModel.C -massTransferModels/massTransferModel/newMassTransferModel.C -massTransferModels/Frossling/Frossling.C -massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C - -surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C -surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C -surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C - -interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C -interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C -interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C - -saturationModels/saturationModel/saturationModel.C -saturationModels/saturationModel/newSaturationModel.C -saturationModels/Antoine/Antoine.C -saturationModels/AntoineExtended/AntoineExtended.C -saturationModels/ArdenBuck/ArdenBuck.C -saturationModels/polynomial/polynomial.C -saturationModels/function1/function1.C -saturationModels/constantSaturationConditions/constantSaturationConditions.C - -LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialCompositionModels diff --git a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/files b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/files deleted file mode 100644 index 34774329fae461505b168d7a5d8b6c70fc3660b3..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/files +++ /dev/null @@ -1,82 +0,0 @@ -dragModels/dragModel/dragModel.C -dragModels/dragModel/newDragModel.C -dragModels/Beetstra/Beetstra.C -dragModels/segregated/segregated.C -dragModels/Ergun/Ergun.C -dragModels/Gibilaro/Gibilaro.C -dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C -dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C -dragModels/Lain/Lain.C -dragModels/SchillerNaumann/SchillerNaumann.C -dragModels/SyamlalOBrien/SyamlalOBrien.C -dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C -dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C -dragModels/Tenneti/Tenneti.C -dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C -dragModels/WenYu/WenYu.C -dragModels/IshiiZuber/IshiiZuber.C -dragModels/AttouFerschneider/AttouFerschneider.C - -swarmCorrections/swarmCorrection/swarmCorrection.C -swarmCorrections/swarmCorrection/newSwarmCorrection.C -swarmCorrections/noSwarm/noSwarm.C -swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C - -liftModels/liftModel/liftModel.C -liftModels/liftModel/newLiftModel.C -liftModels/noLift/noLift.C -liftModels/constantLiftCoefficient/constantLiftCoefficient.C -liftModels/Moraga/Moraga.C -liftModels/LegendreMagnaudet/LegendreMagnaudet.C -liftModels/TomiyamaLift/TomiyamaLift.C -liftModels/wallDampedLift/wallDampedLift.C - -heatTransferModels/heatTransferModel/heatTransferModel.C -heatTransferModels/heatTransferModel/newHeatTransferModel.C -heatTransferModels/constantNu/constantNuHeatTransfer.C -heatTransferModels/RanzMarshall/RanzMarshall.C -heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C - -virtualMassModels/virtualMassModel/virtualMassModel.C -virtualMassModels/virtualMassModel/newVirtualMassModel.C -virtualMassModels/noVirtualMass/noVirtualMass.C -virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C -virtualMassModels/Lamb/Lamb.C - -wallLubricationModels/wallLubricationModel/wallLubricationModel.C -wallLubricationModels/wallLubricationModel/newWallLubricationModel.C -wallLubricationModels/noWallLubrication/noWallLubrication.C -wallLubricationModels/Antal/Antal.C -wallLubricationModels/Frank/Frank.C -wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C - -turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C -turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C -turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C -turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C -turbulentDispersionModels/Burns/Burns.C -turbulentDispersionModels/Gosman/Gosman.C -turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C - -aspectRatioModels/aspectRatioModel/aspectRatioModel.C -aspectRatioModels/aspectRatioModel/newAspectRatioModel.C -aspectRatioModels/constantAspectRatio/constantAspectRatio.C -aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C -aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C -aspectRatioModels/Wellek/Wellek.C - -wallDependentModel/wallDependentModel.C - -wallDampingModels/wallDampingModel/wallDampingModel.C -wallDampingModels/wallDampingModel/newWallDampingModel.C -wallDampingModels/noWallDamping/noWallDamping.C -wallDampingModels/interpolated/interpolatedWallDamping.C -wallDampingModels/linear/linearWallDamping.C -wallDampingModels/cosine/cosineWallDamping.C -wallDampingModels/sine/sineWallDamping.C - -phaseTransferModels/phaseTransferModel/phaseTransferModel.C -phaseTransferModels/phaseTransferModel/newPhaseTransferModel.C -phaseTransferModels/deposition/deposition.C - -LIB = $(FOAM_LIBBIN)/libreactingEulerianInterfacialModels diff --git a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/files b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/files deleted file mode 100644 index ee98c2c78642cb670792500aca329eafd55b5c20..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/files +++ /dev/null @@ -1,60 +0,0 @@ -phaseModel/phaseModel/phaseModel.C -phaseModel/phaseModel/newPhaseModel.C -phaseModel/phaseModel/phaseModels.C - -phasePair/phasePairKey/phasePairKey.C -phasePair/phasePair/phasePair.C -phasePair/orderedPhasePair/orderedPhasePair.C - -phaseSystem/phaseSystem.C - -diameterModels/diameterModel/diameterModel.C -diameterModels/diameterModel/newDiameterModel.C -diameterModels/constantDiameter/constantDiameter.C -diameterModels/isothermalDiameter/isothermalDiameter.C -diameterModels/linearTsubDiameter/linearTsubDiameter.C -diameterModels/velocityGroup/velocityGroup.C - -populationBalanceModel/populationBalanceModel/populationBalanceModel.C -diameterModels/velocityGroup/sizeGroup/sizeGroup.C - -populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C -populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C -populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C -populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C -populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C -populationBalanceModel/coalescenceModels/Luo/Luo.C -populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C - -populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C -populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C -populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C -populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C - -populationBalanceModel/breakupModels/breakupModel/breakupModel.C -populationBalanceModel/breakupModels/exponential/exponential.C -populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C -populationBalanceModel/breakupModels/powerLaw/powerLaw.C - -populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C -populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C -populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C - -populationBalanceModel/driftModels/driftModel/driftModel.C -populationBalanceModel/driftModels/constantDrift/constantDrift.C -populationBalanceModel/driftModels/densityChange/densityChange.C -populationBalanceModel/driftModels/phaseChange/phaseChange.C - -populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C -populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C -populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C - -BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C -BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C -BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C -BlendedInterfacialModel/blendingMethods/linear/linear.C -BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C - -reactionThermo/hRefConstThermos.C - -LIB = $(FOAM_LIBBIN)/libreactingPhaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files deleted file mode 100644 index f1728bb33dcd72639cdbd864f5561e569a9febd2..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/files +++ /dev/null @@ -1,6 +0,0 @@ -alphaContactAngle/alphaContactAngleFvPatchScalarField.C -multiphaseSystem.C -newMultiphaseSystem.C -multiphaseSystems.C - -LIB = $(FOAM_LIBBIN)/libreactingMultiphaseSystem diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files deleted file mode 100644 index 9b7775fb0d8719ac37b3b8685683e96835dd5b42..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files +++ /dev/null @@ -1,40 +0,0 @@ -phaseCompressibleTurbulenceModels.C -phasePressureModel/phasePressureModel.C - -kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C - -kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C -kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C -kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C -kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C -kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C -kineticTheoryModels/viscosityModel/none/noneViscosity.C - -kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C -kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C -kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C -kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C -kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C - -kineticTheoryModels/radialModel/radialModel/radialModel.C -kineticTheoryModels/radialModel/radialModel/newRadialModel.C -kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C -kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C -kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C - -kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C -kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C -kineticTheoryModels/granularPressureModel/Lun/LunPressure.C -kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C - -kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C -kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C -kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C -kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C -kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C - -kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C -kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C - - -LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files deleted file mode 100644 index 67caa0d98b595287a8b8ac805684944397dc9da2..0000000000000000000000000000000000000000 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/files +++ /dev/null @@ -1,13 +0,0 @@ -diameterModels/IATE/IATE.C -diameterModels/IATE/IATEsources/IATEsource/IATEsource.C -diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C -diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C -diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C -diameterModels/IATE/IATEsources/phaseChange/phaseChange.C -diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C - -twoPhaseSystem.C -newTwoPhaseSystem.C -twoPhaseSystems.C - -LIB = $(FOAM_LIBBIN)/libreactingTwoPhaseSystem diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/src/phaseSystemModels/twoPhaseEuler/Allwclean similarity index 75% rename from applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean rename to src/phaseSystemModels/twoPhaseEuler/Allwclean index 162d04c3c816b2adf67c25f29cdc326cc8db4f56..2dbee8a6a66ce60ddb96fc09f478abd8887ee0e6 100755 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean +++ b/src/phaseSystemModels/twoPhaseEuler/Allwclean @@ -1,9 +1,9 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory +#------------------------------------------------------------------------------ wclean libso twoPhaseSystem wclean libso interfacialModels wclean libso phaseCompressibleTurbulenceModels -wclean #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/src/phaseSystemModels/twoPhaseEuler/Allwmake similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake rename to src/phaseSystemModels/twoPhaseEuler/Allwmake index de87d95e34084212aedea39ec5d119a72f297b1f..3407288a2e52e76282f6a9c75d44ab586edafeba 100755 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake +++ b/src/phaseSystemModels/twoPhaseEuler/Allwmake @@ -1,13 +1,11 @@ #!/bin/sh cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments - #------------------------------------------------------------------------------ wmakeLnInclude interfacialModels wmake $targetType twoPhaseSystem wmake $targetType interfacialModels wmake $targetType phaseCompressibleTurbulenceModels -wmake $targetType #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..c164c6abc260856063c19053f23fc8e7cf6c86f8 --- /dev/null +++ b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files @@ -0,0 +1,72 @@ +drag = dragModels +$(drag)/dragModel/dragModel.C +$(drag)/dragModel/dragModelNew.C +$(drag)/segregated/segregated.C +$(drag)/Ergun/Ergun.C +$(drag)/Gibilaro/Gibilaro.C +$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C +$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +$(drag)/Lain/Lain.C +$(drag)/SchillerNaumann/SchillerNaumann.C +$(drag)/SyamlalOBrien/SyamlalOBrien.C +$(drag)/TomiyamaCorrelated/TomiyamaCorrelated.C +$(drag)/TomiyamaAnalytic/TomiyamaAnalytic.C +$(drag)/WenYu/WenYu.C +$(drag)/IshiiZuber/IshiiZuber.C + +swarm = swarmCorrections +$(swarm)/swarmCorrection/swarmCorrection.C +$(swarm)/swarmCorrection/swarmCorrectionNew.C +$(swarm)/noSwarm/noSwarm.C +$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C + +lift = liftModels +$(lift)/liftModel/liftModel.C +$(lift)/liftModel/liftModelNew.C +$(lift)/noLift/noLift.C +$(lift)/constantLiftCoefficient/constantLiftCoefficient.C +$(lift)/Moraga/Moraga.C +$(lift)/LegendreMagnaudet/LegendreMagnaudet.C +$(lift)/TomiyamaLift/TomiyamaLift.C + +heatTransfer = heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C +$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C + +virtualMass = virtualMassModels +$(virtualMass)/virtualMassModel/virtualMassModel.C +$(virtualMass)/virtualMassModel/virtualMassModelNew.C +$(virtualMass)/noVirtualMass/noVirtualMass.C +$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C +$(virtualMass)/Lamb/Lamb.C + +lubrication = wallLubricationModels +$(lubrication)/wallLubricationModel/wallLubricationModel.C +$(lubrication)/wallLubricationModel/wallLubricationModelNew.C +$(lubrication)/noWallLubrication/noWallLubrication.C +$(lubrication)/Antal/Antal.C +$(lubrication)/Frank/Frank.C +$(lubrication)/TomiyamaWallLubrication/TomiyamaWallLubrication.C + +dispersion = turbulentDispersionModels +$(dispersion)/turbulentDispersionModel/turbulentDispersionModel.C +$(dispersion)/turbulentDispersionModel/turbulentDispersionModelNew.C +$(dispersion)/noTurbulentDispersion/noTurbulentDispersion.C +$(dispersion)/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +$(dispersion)/Burns/Burns.C +$(dispersion)/Gosman/Gosman.C +$(dispersion)/LopezDeBertodano/LopezDeBertodano.C + +aspectRatio = aspectRatioModels +$(aspectRatio)/aspectRatioModel/aspectRatioModel.C +$(aspectRatio)/aspectRatioModel/aspectRatioModelNew.C +$(aspectRatio)/constantAspectRatio/constantAspectRatio.C +$(aspectRatio)/TomiyamaAspectRatio/TomiyamaAspectRatio.C +$(aspectRatio)/VakhrushevEfremov/VakhrushevEfremov.C +$(aspectRatio)/Wellek/Wellek.C + +wallDependentModel/wallDependentModel.C + +LIB = $(FOAM_LIBBIN)/libcompressibleEulerianInterfacialModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options similarity index 85% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options index 0244b7df757ac4ecc960e4467ee20adf7a08cfdf..d6cd8bc8903958c430509ac922188b6408e11be2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options +++ b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I../twoPhaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ @@ -6,8 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/incompressible/transportModel \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ - -I../twoPhaseSystem/lnInclude + -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude LIB_LIBS = \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/newTurbulentDispersionModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/newWallLubricationModel.C rename to src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/files b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..cd84e483ff80f208d14e05c0b61598338609d93a --- /dev/null +++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/files @@ -0,0 +1,46 @@ +phaseCompressibleTurbulenceModels.C +phasePressureModel/phasePressureModel.C + +kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C + +viscosity = kineticTheoryModels/viscosityModel +$(viscosity)/viscosityModel/viscosityModel.C +$(viscosity)/viscosityModel/viscosityModelNew.C +$(viscosity)/Gidaspow/GidaspowViscosity.C +$(viscosity)/Syamlal/SyamlalViscosity.C +$(viscosity)/HrenyaSinclair/HrenyaSinclairViscosity.C +$(viscosity)/none/noneViscosity.C + +conductivity = kineticTheoryModels/conductivityModel +$(conductivity)/conductivityModel/conductivityModel.C +$(conductivity)/conductivityModel/conductivityModelNew.C +$(conductivity)/Gidaspow/GidaspowConductivity.C +$(conductivity)/Syamlal/SyamlalConductivity.C +$(conductivity)/HrenyaSinclair/HrenyaSinclairConductivity.C + +radial = kineticTheoryModels/radialModel +$(radial)/radialModel/radialModel.C +$(radial)/radialModel/radialModelNew.C +$(radial)/CarnahanStarling/CarnahanStarlingRadial.C +$(radial)/LunSavage/LunSavageRadial.C +$(radial)/SinclairJackson/SinclairJacksonRadial.C + +granular = kineticTheoryModels/granularPressureModel +$(granular)/granularPressureModel/granularPressureModel.C +$(granular)/granularPressureModel/granularPressureModelNew.C +$(granular)/Lun/LunPressure.C +$(granular)/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C + +frictional = kineticTheoryModels/frictionalStressModel +$(frictional)/frictionalStressModel/frictionalStressModel.C +$(frictional)/frictionalStressModel/frictionalStressModelNew.C +$(frictional)/JohnsonJackson/JohnsonJacksonFrictionalStress.C +$(frictional)/Schaeffer/SchaefferFrictionalStress.C +$(frictional)/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C + +derived = kineticTheoryModels/derivedFvPatchFields +$(derived)/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +$(derived)/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C + + +LIB = $(FOAM_LIBBIN)/libphaseCompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H rename to src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/newBlendingMethod.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..540d6cc057083d072b0f7f07582fcd28c1110284 --- /dev/null +++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files @@ -0,0 +1,32 @@ +phaseModel/phaseModel.C + +phasePair/phasePairKey.C +phasePair/phasePair.C +phasePair/orderedPhasePair.C + +twoPhaseSystem/twoPhaseSystem.C + + +diameter = diameterModels +$(diameter)/diameterModel/diameterModel.C +$(diameter)/diameterModel/diameterModelNew.C +$(diameter)/constantDiameter/constantDiameter.C +$(diameter)/isothermalDiameter/isothermalDiameter.C + +diameterModels/IATE/IATE.C + +IATEsources = diameterModels/IATE/IATEsources +$(IATEsources)/IATEsource/IATEsource.C +$(IATEsources)/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C +$(IATEsources)/turbulentBreakUp/turbulentBreakUp.C +$(IATEsources)/randomCoalescence/randomCoalescence.C + +blending = BlendedInterfacialModel/blendingMethods +$(blending)/blendingMethod/blendingMethod.C +$(blending)/blendingMethod/blendingMethodNew.C +$(blending)/noBlending/noBlending.C +$(blending)/linear/linear.C +$(blending)/hyperbolic/hyperbolic.C + + +LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseSystem diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options similarity index 86% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options index cd6eefd591d2cdfe3650dc0cc132a44e04b10e3c..84ae1ad7846c8893e867fa4a89725b91f068deae 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options @@ -3,13 +3,12 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude LIB_LIBS = \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/newDiameterModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModelNew.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/orderedPhasePair.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/orderedPhasePair.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/orderedPhasePair.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/orderedPhasePair/orderedPhasePair.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/orderedPhasePair.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePair.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePair.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePair.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePair.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePair.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePairI.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairI.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePair/phasePairI.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairI.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairKey.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairKey.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairKey.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phasePair/phasePairKey/phasePairKey.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phasePair/phasePairKey.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystem.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystemI.H similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemI.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystemI.H diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemTemplates.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystemTemplates.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystemTemplates.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/twoPhaseSystem/twoPhaseSystemTemplates.C