diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options index 4014bbe8d3..4662932e47 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionTwoPhaseEulerFoam/Make/options @@ -5,9 +5,7 @@ EXE_INC = \ -I$(FOAM_SOLVERS)/multiphase/reactingTwoPhaseEulerFoam \ -I${phaseSystem}/twoPhaseSystem/lnInclude \ -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \ - -I${phaseSystem}/phaseSystems/lnInclude \ - -I${phaseSystem}/interfacialModels/lnInclude \ - -I${phaseSystem}/interfacialCompositionModels/lnInclude \ + -I${phaseSystem}/multiphaseSystem/lnInclude \ -I./fluid \ -I../solid \ -I../fluid \ @@ -36,6 +34,6 @@ EXE_LIBS = \ -lsolidThermo \ -lradiationModels \ -lregionModels \ + -lreactingMultiphaseSystem \ -lreactingTwoPhaseSystem \ - -ltwoPhaseReactingTurbulenceModels \ - -lreactingPhaseSystem + -ltwoPhaseReactingTurbulenceModels diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options index 7e462e236f..c2cc92b57d 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options @@ -26,7 +26,6 @@ EXE_LIBS = \ -lcompressibleTransportModels \ -lradiationModels \ -lfluidThermophysicalModels \ - -lmassTransferModels \ -lsolidThermo \ -lsolidSpecie \ -ltwoPhaseProperties \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index 28a7966cd5..814bef46f1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -2,7 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/multiphaseEuler EXE_INC = \ -I${phaseSystem}/multiphaseSystem/lnInclude \ - -I${phaseSystem}/interfacialModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels \ @@ -21,5 +20,4 @@ EXE_LIBS = \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ - -lmultiphaseSystem \ - -lcompressibleMultiphaseEulerianInterfacialModels + -lmultiphaseSystem diff --git a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options index 8aa5433d87..fa724dc3b2 100644 --- a/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingMultiphaseEulerFoam/Make/options @@ -2,10 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler EXE_INC = \ -I${phaseSystem}/multiphaseSystem/lnInclude \ - -I${phaseSystem}/multiphaseCompressibleTurbulenceModels/lnInclude \ - -I${phaseSystem}/phaseSystems/lnInclude \ - -I${phaseSystem}/interfacialModels/lnInclude \ - -I${phaseSystem}/interfacialCompositionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -21,8 +17,4 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lreactingPhaseSystem \ - -lreactingMultiphaseSystem \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lmultiphaseReactingTurbulenceModels + -lreactingMultiphaseSystem diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options index 365e8d5d38..c8a632087e 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options @@ -3,9 +3,7 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler EXE_INC = \ -I${phaseSystem}/twoPhaseSystem/lnInclude \ -I${phaseSystem}/twoPhaseCompressibleTurbulenceModels/lnInclude \ - -I${phaseSystem}/phaseSystems/lnInclude \ - -I${phaseSystem}/interfacialCompositionModels/lnInclude \ - -I${phaseSystem}/interfacialModels/lnInclude \ + -I${phaseSystem}/multiphaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -20,8 +18,6 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lreactingPhaseSystem \ + -lreactingMultiphaseSystem \ -lreactingTwoPhaseSystem \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ -ltwoPhaseReactingTurbulenceModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index 848c6ee28f..fcd7558097 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -2,7 +2,6 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/twoPhaseEuler EXE_INC = \ -I${phaseSystem}/phaseCompressibleTurbulenceModels/lnInclude \ - -I${phaseSystem}/twoPhaseEuler/interfacialModels/lnInclude \ -I${phaseSystem}/twoPhaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -25,6 +24,5 @@ EXE_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lphaseCompressibleTurbulenceModels \ -lcompressibleTwoPhaseSystem \ - -lcompressibleEulerianInterfacialModels + -lphaseCompressibleTurbulenceModels diff --git a/src/phaseSystemModels/multiphaseEuler/Allwclean b/src/phaseSystemModels/multiphaseEuler/Allwclean index bf494aaecc..404e929a20 100755 --- a/src/phaseSystemModels/multiphaseEuler/Allwclean +++ b/src/phaseSystemModels/multiphaseEuler/Allwclean @@ -2,7 +2,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ -wclean libso interfacialModels wclean libso multiphaseSystem #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseEuler/Allwmake b/src/phaseSystemModels/multiphaseEuler/Allwmake index 44a6b77516..dcce4b093e 100755 --- a/src/phaseSystemModels/multiphaseEuler/Allwmake +++ b/src/phaseSystemModels/multiphaseEuler/Allwmake @@ -3,8 +3,6 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ -wmakeLnInclude multiphaseSystem -wmake $targetType interfacialModels wmake $targetType multiphaseSystem #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files b/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files deleted file mode 100644 index 38ad5c19fb..0000000000 --- a/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/files +++ /dev/null @@ -1,19 +0,0 @@ -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/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options b/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options deleted file mode 100644 index f4c92c9d5e..0000000000 --- a/src/phaseSystemModels/multiphaseEuler/interfacialModels/Make/options +++ /dev/null @@ -1,7 +0,0 @@ -EXE_INC = \ - -I../multiphaseSystem/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmultiphaseSystem diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files index 454c8d5a68..f3a1514a4c 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files @@ -3,13 +3,31 @@ phaseModel/phaseModel.C multiphaseSystem/multiphaseSystem.C diameter = diameterModels - $(diameter)/diameterModel/diameterModel.C $(diameter)/diameterModel/diameterModelNew.C $(diameter)/constantDiameter/constantDiameter.C $(diameter)/isothermalDiameter/isothermalDiameter.C + +drag = interfacialModels/dragModels +$(drag)/dragModel/dragModel.C +$(drag)/dragModel/dragModelNew.C +$(drag)/Ergun/Ergun.C +$(drag)/GidaspowErgunWenYu/GidaspowErgunWenYu.C +$(drag)/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +$(drag)/SchillerNaumann/SchillerNaumann.C +$(drag)/Gibilaro/Gibilaro.C +$(drag)/WenYu/WenYu.C +$(drag)/SyamlalOBrien/SyamlalOBrien.C +$(drag)/blended/blended.C +$(drag)/interface/interface.C + +heatTransfer = interfacialModels/heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C + + alphaContactAngle/alphaContactAngleFvPatchScalarField.C - LIB = $(FOAM_LIBBIN)/libmultiphaseSystem diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options index e39081ae11..be37e148b8 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/options @@ -1,6 +1,4 @@ EXE_INC = \ - -I../phaseModel/lnInclude \ - -I../interfacialModels/lnInclude \ -IalphaContactAngle \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/blended/blended.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/dragModels/interface/interface.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/src/phaseSystemModels/multiphaseInter/Allwclean b/src/phaseSystemModels/multiphaseInter/Allwclean index 869275cbbf..023de40422 100755 --- a/src/phaseSystemModels/multiphaseInter/Allwclean +++ b/src/phaseSystemModels/multiphaseInter/Allwclean @@ -3,7 +3,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ wclean libso phasesSystem -wclean libso massTransferModels wclean libso compressibleMultiPhaseTurbulenceModels #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseInter/Allwmake b/src/phaseSystemModels/multiphaseInter/Allwmake index ec914b38e5..ba7429a8a9 100755 --- a/src/phaseSystemModels/multiphaseInter/Allwmake +++ b/src/phaseSystemModels/multiphaseInter/Allwmake @@ -3,9 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ -wmakeLnInclude massTransferModels wmake $targetType phasesSystem -wmake $targetType massTransferModels wmake $targetType compressibleMultiPhaseTurbulenceModels #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files b/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files deleted file mode 100644 index e9dfc08881..0000000000 --- a/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/files +++ /dev/null @@ -1,6 +0,0 @@ -interfaceCompositionModel/interfaceCompositionModel.C -interfaceCompositionModel/interfaceCompositionModelNew.C - -InterfaceCompositionModel/InterfaceCompositionModels.C - -LIB = $(FOAM_LIBBIN)/libmassTransferModels diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options b/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options deleted file mode 100644 index 740a55f4a0..0000000000 --- a/src/phaseSystemModels/multiphaseInter/massTransferModels/Make/options +++ /dev/null @@ -1,20 +0,0 @@ -EXE_INC = \ - -I../phasesSystem/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ - -lsolidThermo \ - -lsolidSpecie \ - -lgeometricVoF diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModels.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files index 5f1cd9f53e..0a0155ca5c 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files @@ -12,8 +12,21 @@ multiphaseSystem/multiphaseSystem.C multiphaseSystem/multiphaseSystemNew.C multiphaseSystem/multiphaseSystems.C -interfaceModels/porousModels/porousModel/porousModel.C -interfaceModels/porousModels/porousModel/porousModelNew.C -interfaceModels/porousModels/VollerPrakash/VollerPrakash.C +interfaceCompositionModel/interfaceCompositionModel.C +interfaceCompositionModel/interfaceCompositionModelNew.C +InterfaceCompositionModel/InterfaceCompositionModels.C + +porous = interfaceModels/porousModels +$(porous)/porousModel/porousModel.C +$(porous)/porousModel/porousModelNew.C +$(porous)/VollerPrakash/VollerPrakash.C + +/* Ununsed? */ +/* +surfaceTension = interfaceModels/surfaceTensionModels +$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C +$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C +$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C +*/ LIB = $(FOAM_LIBBIN)/libincompressibleMultiphaseSystems diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options index 4c1f54cfa2..ad28edd86f 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I../massTransferModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -11,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ @@ -25,6 +25,7 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lincompressibleTransportModels \ -linterfaceProperties \ + -lgeometricVoF \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lcombustionModels diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModel.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.H similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/Lee/Lee.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.H diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.H diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C diff --git a/src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H similarity index 100% rename from src/phaseSystemModels/multiphaseInter/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.H diff --git a/src/phaseSystemModels/reactingEuler/Allwclean b/src/phaseSystemModels/reactingEuler/Allwclean index 1d16885dff..79ef7c0453 100755 --- a/src/phaseSystemModels/reactingEuler/Allwclean +++ b/src/phaseSystemModels/reactingEuler/Allwclean @@ -4,19 +4,10 @@ cd "${0%/*}" || exit # Run from this directory # echo "cleaning ${PWD##*/}" -wclean libso phaseSystems -wclean libso interfacialModels -wclean libso interfacialCompositionModels -wclean libso derivedFvPatchFields - -# multiphase wclean libso multiphaseSystem -wclean libso multiphaseCompressibleTurbulenceModels +wclean libso functionObjects -# twoPhase wclean libso twoPhaseSystem wclean libso twoPhaseCompressibleTurbulenceModels -wclean libso functionObjects - #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/reactingEuler/Allwmake b/src/phaseSystemModels/reactingEuler/Allwmake index 2cbf2cc082..ca9165e4a9 100755 --- a/src/phaseSystemModels/reactingEuler/Allwmake +++ b/src/phaseSystemModels/reactingEuler/Allwmake @@ -5,18 +5,10 @@ cd "${0%/*}" || exit # Run from this directory # echo "making ${PWD##*/}" -wmakeLnInclude phaseSystems -wmake $targetType interfacialModels -wmake $targetType interfacialCompositionModels -wmake $targetType derivedFvPatchFields - wmake $targetType multiphaseSystem -wmake $targetType multiphaseCompressibleTurbulenceModels +wmake $targetType functionObjects wmake $targetType twoPhaseSystem wmake $targetType twoPhaseCompressibleTurbulenceModels -wmake $targetType phaseSystems -wmake $targetType functionObjects - #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files deleted file mode 100644 index 788c93faa0..0000000000 --- a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/files +++ /dev/null @@ -1,62 +0,0 @@ -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/reactingEuler/derivedFvPatchFields/Make/options b/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/options deleted file mode 100644 index 24fb0f28dc..0000000000 --- a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/Make/options +++ /dev/null @@ -1,21 +0,0 @@ -EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I../interfacialModels/lnInclude\ - -I../interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lfvOptions \ - -lmeshTools \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/Make/options b/src/phaseSystemModels/reactingEuler/functionObjects/Make/options index 6482040313..0d77a3a0b3 100644 --- a/src/phaseSystemModels/reactingEuler/functionObjects/Make/options +++ b/src/phaseSystemModels/reactingEuler/functionObjects/Make/options @@ -1,8 +1,7 @@ phaseSystem = $(LIB_SRC)/phaseSystemModels/reactingEuler EXE_INC = \ - -I${phaseSystem}/interfacialModels/lnInclude \ - -I${phaseSystem}/phaseSystems/lnInclude \ + -I${phaseSystem}/multiphaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ @@ -11,4 +10,4 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ -lfieldFunctionObjects \ - -lreactingPhaseSystem + -lreactingMultiphaseSystem diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files deleted file mode 100644 index 94c6cf7051..0000000000 --- a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/files +++ /dev/null @@ -1,28 +0,0 @@ -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/reactingEuler/interfacialCompositionModels/Make/options b/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/options deleted file mode 100644 index eada634740..0000000000 --- a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/Make/options +++ /dev/null @@ -1,22 +0,0 @@ -EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ - -lspecie diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files b/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files deleted file mode 100644 index d9af0507a0..0000000000 --- a/src/phaseSystemModels/reactingEuler/interfacialModels/Make/files +++ /dev/null @@ -1,92 +0,0 @@ -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/reactingEuler/interfacialModels/Make/options b/src/phaseSystemModels/reactingEuler/interfacialModels/Make/options deleted file mode 100644 index 2a0f82bd25..0000000000 --- a/src/phaseSystemModels/reactingEuler/interfacialModels/Make/options +++ /dev/null @@ -1,19 +0,0 @@ -EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lfluidThermophysicalModels \ - -lcompressibleTransportModels \ - -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels diff --git a/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files deleted file mode 100644 index dd421b52a3..0000000000 --- a/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -multiphaseCompressibleTurbulenceModels.C - -LIB = $(FOAM_LIBBIN)/libmultiphaseReactingTurbulenceModels diff --git a/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options deleted file mode 100644 index b6550f8382..0000000000 --- a/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/Make/options +++ /dev/null @@ -1,27 +0,0 @@ -EXE_INC = \ - -I../multiphaseSystem/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 \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lfvOptions \ - -lmeshTools \ - -lreactingMultiphaseSystem \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lreactingEulerianFvPatchFields \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files index df53a45929..0520c4d218 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/files @@ -1,7 +1,262 @@ +phaseModel/phaseModel/phaseModel.C +phaseModel/phaseModel/phaseModelNew.C +phaseModel/phaseModel/phaseModels.C + +phasePair/phasePairKey.C +phasePair/phasePair.C +phasePair/orderedPhasePair.C + +phaseSystem/phaseSystem.C + multiphaseSystem/multiphaseSystem.C multiphaseSystem/multiphaseSystemNew.C multiphaseSystem/multiphaseSystems.C -alphaContactAngle/alphaContactAngleFvPatchScalarField.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 + + +interfacialModels/wallDependentModel/wallDependentModel.C + +aspectRatio = interfacialModels/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 + +drag = interfacialModels/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 + +lift = interfacialModels/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 = interfacialModels/heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/constantNu/constantNuHeatTransfer.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C +$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C + +phaseTransfer = interfacialModels/phaseTransferModels +$(phaseTransfer)/phaseTransferModel/phaseTransferModel.C +$(phaseTransfer)/phaseTransferModel/phaseTransferModelNew.C +$(phaseTransfer)/deposition/deposition.C + +swarm = interfacialModels/swarmCorrections +$(swarm)/swarmCorrection/swarmCorrection.C +$(swarm)/swarmCorrection/swarmCorrectionNew.C +$(swarm)/noSwarm/noSwarm.C +$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C + +dispersion = interfacialModels/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 + +virtualMass = interfacialModels/virtualMassModels +$(virtualMass)/virtualMassModel/virtualMassModel.C +$(virtualMass)/virtualMassModel/virtualMassModelNew.C +$(virtualMass)/noVirtualMass/noVirtualMass.C +$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C +$(virtualMass)/Lamb/Lamb.C + +damping = interfacialModels/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 + +lubrication = interfacialModels/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 + +composition = interfacialCompositionModels/interfaceCompositionModels +$(composition)/interfaceCompositionModel/interfaceCompositionModel.C +$(composition)/interfaceCompositionModel/interfaceCompositionModelNew.C +$(composition)/InterfaceCompositionModel/InterfaceCompositionModels.C + +massTransfer = interfacialCompositionModels/massTransferModels +$(massTransfer)/massTransferModel/massTransferModel.C +$(massTransfer)/massTransferModel/massTransferModelNew.C +$(massTransfer)/Frossling/Frossling.C +$(massTransfer)/sphericalMassTransfer/sphericalMassTransfer.C + +saturation = interfacialCompositionModels/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 + +surfaceTension = interfacialCompositionModels/surfaceTensionModels +$(surfaceTension)/surfaceTensionModel/surfaceTensionModel.C +$(surfaceTension)/surfaceTensionModel/surfaceTensionModelNew.C +$(surfaceTension)/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C + + +derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C + +derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C +derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C +derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C +derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C +derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C + +/* wall-boiling */ + +wallBoilingSubModels = derivedFvPatchFields/wallBoilingSubModels + +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 + +nucleationSite = $(wallBoilingSubModels)/nucleationSiteModels +$(nucleationSite)/nucleationSiteModel/nucleationSiteModel.C +$(nucleationSite)/nucleationSiteModel/nucleationSiteModelNew.C +$(nucleationSite)/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 + +/* Turbulence */ +turbulence/multiphaseCompressibleTurbulenceModels.C LIB = $(FOAM_LIBBIN)/libreactingMultiphaseSystem diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options index 9b65596805..ae88c6b128 100644 --- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/Make/options @@ -1,25 +1,26 @@ EXE_INC = \ - -I../interfacialModels/lnInclude \ - -I../interfacialCompositionModels/lnInclude \ - -I../phaseSystems/lnInclude \ - -I../multiphaseCompressibleTurbulenceModels/lnInclude \ - -I../derivedFvPatchFields/lnInclude \ - -IalphaContactAngle \ -I$(LIB_SRC)/finiteVolume/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/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ + -I$(LIB_SRC)/transportModels/incompressible/transportModel \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude LIB_LIBS = \ -lfiniteVolume \ - -lfvOptions \ -lmeshTools \ - -lsampling \ - -lcombustionModels + -lcombustionModels \ + -lfluidThermophysicalModels \ + -lreactionThermophysicalModels \ + -lcompressibleTransportModels \ + -lspecie \ + -lturbulenceModels \ + -lcompressibleTurbulenceModels diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroup.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroup.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroup.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroup.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroupI.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroupI.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModels.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/Antoine/Antoine.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/Antoine/Antoine.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/Antoine/Antoine.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/Antoine/Antoine.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/Antoine/Antoine.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/function1/function1.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/polynomial/polynomial.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/polynomial/polynomial.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/polynomial/polynomial.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/polynomial/polynomial.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/polynomial/polynomial.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Beetstra/Beetstra.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Lain/Lain.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/Tenneti/Tenneti.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/dragModel/dragModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/dragModels/segregated/segregated.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/Moraga/Moraga.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/liftModel/liftModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/noLift/noLift.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/deposition/deposition.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/interpolated/interpolatedWallDamping.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDependentModel/wallDependentModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallDependentModel/wallDependentModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDependentModel/wallDependentModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Antal/Antal.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/Frank/Frank.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/InertPhaseModel/InertPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/InertPhaseModel/InertPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/InertPhaseModel/InertPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/InertPhaseModel/InertPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/PurePhaseModel/PurePhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/PurePhaseModel/PurePhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/PurePhaseModel/PurePhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/PurePhaseModel/PurePhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModelNew.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModelNew.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModels.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/phaseModel/phaseModels.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/orderedPhasePair.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/orderedPhasePair.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/orderedPhasePair.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/orderedPhasePair.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/orderedPhasePair.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePair.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePair.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePair.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePair.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePair.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairI.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairI.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairI.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairI.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairKey.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairKey.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairKey.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phasePair/phasePairKey.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phasePair/phasePairKey.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystem.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystem.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystem.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystem.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystem.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemI.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystemI.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemI.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystemI.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystemTemplates.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseSystem/phaseSystemTemplates.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModel.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModel.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/reactionThermo/hRefConstThermos.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/reactionThermo/hRefConstThermos.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/reactionThermo/hRefConstThermos.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/reactionThermo/hRefConstThermos.C diff --git a/src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/multiphaseCompressibleTurbulenceModels.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/multiphaseCompressibleTurbulenceModels.C diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/phaseCompressibleTurbulenceModel.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/phaseCompressibleTurbulenceModel.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/phaseCompressibleTurbulenceModelFwd.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/phaseSystems/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H rename to src/phaseSystemModels/reactingEuler/multiphaseSystem/turbulence/phaseCompressibleTurbulenceModelFwd.H diff --git a/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files b/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files deleted file mode 100644 index 2bda03caad..0000000000 --- a/src/phaseSystemModels/reactingEuler/phaseSystems/Make/files +++ /dev/null @@ -1,68 +0,0 @@ -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/reactingEuler/phaseSystems/Make/options b/src/phaseSystemModels/reactingEuler/phaseSystems/Make/options deleted file mode 100644 index 1a779eba47..0000000000 --- a/src/phaseSystemModels/reactingEuler/phaseSystems/Make/options +++ /dev/null @@ -1,30 +0,0 @@ -EXE_INC = \ - -I../interfacialModels/lnInclude \ - -I../interfacialCompositionModels/lnInclude \ - -I../derivedFvPatchFields/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)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling \ - -lfluidThermophysicalModels \ - -lspecie \ - -lreactionThermophysicalModels \ - -lcompressibleTransportModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -lcombustionModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianFvPatchFields diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options index 20127e5a47..89f86e3e0f 100644 --- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/Make/options @@ -1,9 +1,6 @@ EXE_INC = \ -I../twoPhaseSystem/lnInclude \ - -I../phaseSystems/lnInclude \ - -I../interfacialModels/lnInclude\ - -I../interfacialCompositionModels/lnInclude \ - -I../derivedFvPatchFields/lnInclude \ + -I../multiphaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ @@ -15,9 +12,8 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -lfvOptions \ -lmeshTools \ - -lreactingTwoPhaseSystem \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lreactingEulerianFvPatchFields + -lturbulenceModels \ + -lcompressibleTurbulenceModels \ + -lreactingMultiphaseSystem \ + -lreactingTwoPhaseSystem diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C index f6655c18ce..9760725bec 100644 --- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C +++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2014-2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,6 +36,11 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Base models defined in multiphaseCompressibleTurbulenceModels.C +// +// Additional two-phase only models + +// Typedefs defineTurbulenceModelTypes ( volScalarField, @@ -45,20 +51,6 @@ defineTurbulenceModelTypes phaseModel ); -makeBaseTurbulenceModel -( - volScalarField, - volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, - phaseModel -); - -#define makeLaminarModel(Type) \ - makeTemplatedLaminarModel \ - (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) - #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) @@ -72,19 +64,15 @@ makeBaseTurbulenceModel // Laminar models // -------------------------------------------------------------------------- // -#include "Stokes.H" -makeLaminarModel(Stokes); +// "Stokes.H" // -------------------------------------------------------------------------- // // RAS models // -------------------------------------------------------------------------- // -#include "kEpsilon.H" -makeRASModel(kEpsilon); - -#include "kOmegaSST.H" -makeRASModel(kOmegaSST); +// "kEpsilon.H" +// "kOmegaSST.H" #include "kOmegaSSTSato.H" makeRASModel(kOmegaSSTSato); @@ -98,17 +86,14 @@ makeRASModel(LaheyKEpsilon); #include "continuousGasKEpsilon.H" makeRASModel(continuousGasKEpsilon); -#include "Smagorinsky.H" -makeLESModel(Smagorinsky); - -#include "kEqn.H" -makeLESModel(kEqn); - // -------------------------------------------------------------------------- // // LES models // -------------------------------------------------------------------------- // +// "Smagorinsky.H" +// "kEqn.H" + #include "SmagorinskyZhang.H" makeLESModel(SmagorinskyZhang); diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options index b0f22c09d5..e07d2ee933 100644 --- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options +++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/Make/options @@ -1,12 +1,7 @@ EXE_INC = \ - -I../interfacialModels/lnInclude \ - -I../interfacialCompositionModels/lnInclude \ - -I../phaseSystems/lnInclude \ - -I../twoPhaseCompressibleTurbulenceModels/lnInclude \ - -I../derivedFvPatchFields/lnInclude \ + -I../multiphaseSystem/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)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -19,7 +14,7 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lsampling \ -lcombustionModels \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lreactingMultiphaseSystem diff --git a/src/phaseSystemModels/twoPhaseEuler/Allwclean b/src/phaseSystemModels/twoPhaseEuler/Allwclean index 2dbee8a6a6..69faacc1f2 100755 --- a/src/phaseSystemModels/twoPhaseEuler/Allwclean +++ b/src/phaseSystemModels/twoPhaseEuler/Allwclean @@ -3,7 +3,6 @@ cd "${0%/*}" || exit # Run from this directory #------------------------------------------------------------------------------ wclean libso twoPhaseSystem -wclean libso interfacialModels wclean libso phaseCompressibleTurbulenceModels #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/twoPhaseEuler/Allwmake b/src/phaseSystemModels/twoPhaseEuler/Allwmake index 3407288a2e..1813125074 100755 --- a/src/phaseSystemModels/twoPhaseEuler/Allwmake +++ b/src/phaseSystemModels/twoPhaseEuler/Allwmake @@ -3,9 +3,7 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ -wmakeLnInclude interfacialModels wmake $targetType twoPhaseSystem -wmake $targetType interfacialModels wmake $targetType phaseCompressibleTurbulenceModels #------------------------------------------------------------------------------ diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files deleted file mode 100644 index c164c6abc2..0000000000 --- a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/files +++ /dev/null @@ -1,72 +0,0 @@ -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/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options b/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options deleted file mode 100644 index d6cd8bc890..0000000000 --- a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/Make/options +++ /dev/null @@ -1,18 +0,0 @@ -EXE_INC = \ - -I../twoPhaseSystem/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lcompressibleTwoPhaseSystem \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lspecie diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options index 0fcb6d1eec..3c211257c8 100644 --- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options +++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ -I../twoPhaseSystem/lnInclude \ - -I../interfacialModels/lnInclude\ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ @@ -12,7 +11,6 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -lfvOptions \ -lmeshTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ @@ -20,5 +18,4 @@ LIB_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lincompressibleTransportModels \ - -lcompressibleTwoPhaseSystem \ - -lcompressibleEulerianInterfacialModels + -lcompressibleTwoPhaseSystem diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C index da76d42291..a8e16fead7 100644 --- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2014-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -40,17 +41,12 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defineTurbulenceModelTypes -( - volScalarField, - volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, - phaseModel -); +// Base models defined in compressibleTwoPhaseSystem +// +// Additional models only -makeBaseTurbulenceModel +// Typedefs +defineTurbulenceModelTypes ( volScalarField, volScalarField, @@ -72,13 +68,11 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) - // -------------------------------------------------------------------------- // // Laminar models // -------------------------------------------------------------------------- // -#include "Stokes.H" -makeLaminarModel(Stokes); +// #include "Stokes.H" // -------------------------------------------------------------------------- // diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files index 540d6cc057..1e0420bbc1 100644 --- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files +++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/files @@ -29,4 +29,78 @@ $(blending)/linear/linear.C $(blending)/hyperbolic/hyperbolic.C +interfacialModels/wallDependentModel/wallDependentModel.C + +aspectRatio = interfacialModels/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 + +drag = interfacialModels/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 + +lift = interfacialModels/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 = interfacialModels/heatTransferModels +$(heatTransfer)/heatTransferModel/heatTransferModel.C +$(heatTransfer)/heatTransferModel/heatTransferModelNew.C +$(heatTransfer)/RanzMarshall/RanzMarshall.C +$(heatTransfer)/sphericalHeatTransfer/sphericalHeatTransfer.C + +swarm = interfacialModels/swarmCorrections +$(swarm)/swarmCorrection/swarmCorrection.C +$(swarm)/swarmCorrection/swarmCorrectionNew.C +$(swarm)/noSwarm/noSwarm.C +$(swarm)/TomiyamaSwarm/TomiyamaSwarm.C + +dispersion = interfacialModels/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 + +virtualMass = interfacialModels/virtualMassModels +$(virtualMass)/virtualMassModel/virtualMassModel.C +$(virtualMass)/virtualMassModel/virtualMassModelNew.C +$(virtualMass)/noVirtualMass/noVirtualMass.C +$(virtualMass)/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C +$(virtualMass)/Lamb/Lamb.C + +lubrication = interfacialModels/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 + +/* Turbulence stubs */ +turbulence/phaseCompressibleTurbulenceModels.C + LIB = $(FOAM_LIBBIN)/libcompressibleTwoPhaseSystem diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options index 84ae1ad784..81636f2b71 100644 --- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options +++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/Make/options @@ -1,6 +1,4 @@ EXE_INC = \ - -I../twoPhaseSystem \ - -I../interfacialModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Ergun/Ergun.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/Lain/Lain.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/WenYu/WenYu.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/dragModels/segregated/segregated.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/Moraga/Moraga.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/liftModels/noLift/noLift.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallDependentModel/wallDependentModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallDependentModel/wallDependentModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModel.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModel.H diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModelFwd.H similarity index 100% rename from src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H rename to src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModelFwd.H diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModels.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModels.C new file mode 100644 index 0000000000..802a563316 --- /dev/null +++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/turbulence/phaseCompressibleTurbulenceModels.C @@ -0,0 +1,78 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2020 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "PhaseCompressibleTurbulenceModel.H" +#include "phaseModel.H" +#include "twoPhaseSystem.H" +#include "addToRunTimeSelectionTable.H" +#include "makeTurbulenceModel.H" + +#include "ThermalDiffusivity.H" +#include "EddyDiffusivity.H" + +#include "laminarModel.H" +#include "RASModel.H" +#include "LESModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// Typedefs +defineTurbulenceModelTypes +( + volScalarField, + volScalarField, + compressibleTurbulenceModel, + PhaseCompressibleTurbulenceModel, + ThermalDiffusivity, + phaseModel +); + +// Base models +makeBaseTurbulenceModel +( + volScalarField, + volScalarField, + compressibleTurbulenceModel, + PhaseCompressibleTurbulenceModel, + ThermalDiffusivity, + phaseModel +); + +#define makeLaminarModel(Type) \ + makeTemplatedLaminarModel \ + (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Stokes.H" +makeLaminarModel(Stokes); + + +// ************************************************************************* //