diff --git a/applications/solvers/modules/foamMultiRun/Make/files b/applications/solvers/foamMultiRun/Make/files similarity index 100% rename from applications/solvers/modules/foamMultiRun/Make/files rename to applications/solvers/foamMultiRun/Make/files diff --git a/applications/solvers/modules/foamMultiRun/Make/options b/applications/solvers/foamMultiRun/Make/options similarity index 100% rename from applications/solvers/modules/foamMultiRun/Make/options rename to applications/solvers/foamMultiRun/Make/options diff --git a/applications/solvers/modules/foamMultiRun/foamMultiRun.C b/applications/solvers/foamMultiRun/foamMultiRun.C similarity index 100% rename from applications/solvers/modules/foamMultiRun/foamMultiRun.C rename to applications/solvers/foamMultiRun/foamMultiRun.C diff --git a/applications/solvers/modules/foamMultiRun/regionSolvers/regionSolvers.C b/applications/solvers/foamMultiRun/regionSolvers/regionSolvers.C similarity index 100% rename from applications/solvers/modules/foamMultiRun/regionSolvers/regionSolvers.C rename to applications/solvers/foamMultiRun/regionSolvers/regionSolvers.C diff --git a/applications/solvers/modules/foamMultiRun/regionSolvers/regionSolvers.H b/applications/solvers/foamMultiRun/regionSolvers/regionSolvers.H similarity index 100% rename from applications/solvers/modules/foamMultiRun/regionSolvers/regionSolvers.H rename to applications/solvers/foamMultiRun/regionSolvers/regionSolvers.H diff --git a/applications/solvers/modules/foamMultiRun/setDeltaT.C b/applications/solvers/foamMultiRun/setDeltaT.C similarity index 100% rename from applications/solvers/modules/foamMultiRun/setDeltaT.C rename to applications/solvers/foamMultiRun/setDeltaT.C diff --git a/applications/solvers/modules/foamMultiRun/setDeltaT.H b/applications/solvers/foamMultiRun/setDeltaT.H similarity index 100% rename from applications/solvers/modules/foamMultiRun/setDeltaT.H rename to applications/solvers/foamMultiRun/setDeltaT.H diff --git a/applications/solvers/modules/foamRun/Make/files b/applications/solvers/foamRun/Make/files similarity index 100% rename from applications/solvers/modules/foamRun/Make/files rename to applications/solvers/foamRun/Make/files diff --git a/applications/solvers/modules/foamRun/Make/options b/applications/solvers/foamRun/Make/options similarity index 100% rename from applications/solvers/modules/foamRun/Make/options rename to applications/solvers/foamRun/Make/options diff --git a/applications/solvers/modules/foamRun/foamRun.C b/applications/solvers/foamRun/foamRun.C similarity index 100% rename from applications/solvers/modules/foamRun/foamRun.C rename to applications/solvers/foamRun/foamRun.C diff --git a/applications/solvers/modules/foamRun/setDeltaT.C b/applications/solvers/foamRun/setDeltaT.C similarity index 100% rename from applications/solvers/modules/foamRun/setDeltaT.C rename to applications/solvers/foamRun/setDeltaT.C diff --git a/applications/solvers/modules/foamRun/setDeltaT.H b/applications/solvers/foamRun/setDeltaT.H similarity index 100% rename from applications/solvers/modules/foamRun/setDeltaT.H rename to applications/solvers/foamRun/setDeltaT.H diff --git a/applications/solvers/modules/fluid/Allwmake b/applications/solvers/modules/Allwmake similarity index 95% rename from applications/solvers/modules/fluid/Allwmake rename to applications/solvers/modules/Allwmake index bbc2904a6d..039c9d5135 100755 --- a/applications/solvers/modules/fluid/Allwmake +++ b/applications/solvers/modules/Allwmake @@ -11,5 +11,6 @@ wmake $targetType fluid wmake $targetType multicomponentFluid compressibleVoF/Allwmake $targetType $* multiphaseEuler/Allwmake $targetType $* +wmake $targetType solid #------------------------------------------------------------------------------ diff --git a/applications/solvers/modules/fluid/compressibleVoF/Allwclean b/applications/solvers/modules/compressibleVoF/Allwclean similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/Allwclean rename to applications/solvers/modules/compressibleVoF/Allwclean diff --git a/applications/solvers/modules/fluid/compressibleVoF/Allwmake b/applications/solvers/modules/compressibleVoF/Allwmake similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/Allwmake rename to applications/solvers/modules/compressibleVoF/Allwmake diff --git a/applications/solvers/modules/fluid/compressibleVoF/Make/files b/applications/solvers/modules/compressibleVoF/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/Make/files rename to applications/solvers/modules/compressibleVoF/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/Make/options b/applications/solvers/modules/compressibleVoF/Make/options similarity index 95% rename from applications/solvers/modules/fluid/compressibleVoF/Make/options rename to applications/solvers/modules/compressibleVoF/Make/options index 9dde8453ad..aa7b70772b 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/Make/options +++ b/applications/solvers/modules/compressibleVoF/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ -IcompressibleInterPhaseTransportModel/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ diff --git a/applications/solvers/modules/fluid/compressibleVoF/alphaPredictor.C b/applications/solvers/modules/compressibleVoF/alphaPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/alphaPredictor.C rename to applications/solvers/modules/compressibleVoF/alphaPredictor.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/alphaSuSp.H b/applications/solvers/modules/compressibleVoF/alphaSuSp.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/alphaSuSp.H rename to applications/solvers/modules/compressibleVoF/alphaSuSp.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/Make/files b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/Make/files rename to applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/Make/options b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/Make/options rename to applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C rename to applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H rename to applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C b/applications/solvers/modules/compressibleVoF/compressibleVoF.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C rename to applications/solvers/modules/compressibleVoF/compressibleVoF.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.H b/applications/solvers/modules/compressibleVoF/compressibleVoF.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.H rename to applications/solvers/modules/compressibleVoF/compressibleVoF.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/Make/files b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/Make/files rename to applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/Make/options rename to applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/Make/files b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/Make/files rename to applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/Make/options rename to applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/VoFClouds.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/VoFClouds.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/VoFClouds.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFClouds/VoFClouds.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFClouds/VoFClouds.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/Make/files b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/Make/files rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/files b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/files similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/files rename to applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/files diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/options b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/options similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/options rename to applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/Make/options diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C rename to applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H rename to applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/momentumPredictor.C b/applications/solvers/modules/compressibleVoF/momentumPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/momentumPredictor.C rename to applications/solvers/modules/compressibleVoF/momentumPredictor.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/moveMesh.C b/applications/solvers/modules/compressibleVoF/moveMesh.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/moveMesh.C rename to applications/solvers/modules/compressibleVoF/moveMesh.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/pressureCorrector.C b/applications/solvers/modules/compressibleVoF/pressureCorrector.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/pressureCorrector.C rename to applications/solvers/modules/compressibleVoF/pressureCorrector.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/rhofs.H b/applications/solvers/modules/compressibleVoF/rhofs.H similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/rhofs.H rename to applications/solvers/modules/compressibleVoF/rhofs.H diff --git a/applications/solvers/modules/fluid/compressibleVoF/setRDeltaT.C b/applications/solvers/modules/compressibleVoF/setRDeltaT.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/setRDeltaT.C rename to applications/solvers/modules/compressibleVoF/setRDeltaT.C diff --git a/applications/solvers/modules/fluid/compressibleVoF/thermophysicalPredictor.C b/applications/solvers/modules/compressibleVoF/thermophysicalPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/compressibleVoF/thermophysicalPredictor.C rename to applications/solvers/modules/compressibleVoF/thermophysicalPredictor.C diff --git a/applications/solvers/modules/fluid/fluid/Make/files b/applications/solvers/modules/fluid/Make/files similarity index 100% rename from applications/solvers/modules/fluid/fluid/Make/files rename to applications/solvers/modules/fluid/Make/files diff --git a/applications/solvers/modules/fluid/fluid/Make/options b/applications/solvers/modules/fluid/Make/options similarity index 88% rename from applications/solvers/modules/fluid/fluid/Make/options rename to applications/solvers/modules/fluid/Make/options index 7b01b11cfd..677d13b389 100644 --- a/applications/solvers/modules/fluid/fluid/Make/options +++ b/applications/solvers/modules/fluid/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ - -I$(FOAM_SOLVERS)/modules/fluid/isothermalFluid/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/isothermalFluid/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ diff --git a/applications/solvers/modules/fluid/fluid/fluid.C b/applications/solvers/modules/fluid/fluid.C similarity index 100% rename from applications/solvers/modules/fluid/fluid/fluid.C rename to applications/solvers/modules/fluid/fluid.C diff --git a/applications/solvers/modules/fluid/fluid/fluid.H b/applications/solvers/modules/fluid/fluid.H similarity index 100% rename from applications/solvers/modules/fluid/fluid/fluid.H rename to applications/solvers/modules/fluid/fluid.H diff --git a/applications/solvers/modules/fluid/fluid/thermophysicalPredictor.C b/applications/solvers/modules/fluid/thermophysicalPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/fluid/thermophysicalPredictor.C rename to applications/solvers/modules/fluid/thermophysicalPredictor.C diff --git a/applications/solvers/modules/fluid/fluidSolver/Make/files b/applications/solvers/modules/fluidSolver/Make/files similarity index 100% rename from applications/solvers/modules/fluid/fluidSolver/Make/files rename to applications/solvers/modules/fluidSolver/Make/files diff --git a/applications/solvers/modules/fluid/fluidSolver/Make/options b/applications/solvers/modules/fluidSolver/Make/options similarity index 100% rename from applications/solvers/modules/fluid/fluidSolver/Make/options rename to applications/solvers/modules/fluidSolver/Make/options diff --git a/applications/solvers/modules/fluid/fluidSolver/fluidSolver.C b/applications/solvers/modules/fluidSolver/fluidSolver.C similarity index 100% rename from applications/solvers/modules/fluid/fluidSolver/fluidSolver.C rename to applications/solvers/modules/fluidSolver/fluidSolver.C diff --git a/applications/solvers/modules/fluid/fluidSolver/fluidSolver.H b/applications/solvers/modules/fluidSolver/fluidSolver.H similarity index 100% rename from applications/solvers/modules/fluid/fluidSolver/fluidSolver.H rename to applications/solvers/modules/fluidSolver/fluidSolver.H diff --git a/applications/solvers/modules/fluid/incompressibleFluid/Make/files b/applications/solvers/modules/incompressibleFluid/Make/files similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/Make/files rename to applications/solvers/modules/incompressibleFluid/Make/files diff --git a/applications/solvers/modules/fluid/incompressibleFluid/Make/options b/applications/solvers/modules/incompressibleFluid/Make/options similarity index 89% rename from applications/solvers/modules/fluid/incompressibleFluid/Make/options rename to applications/solvers/modules/incompressibleFluid/Make/options index 5697189e77..a6676a9cd4 100644 --- a/applications/solvers/modules/fluid/incompressibleFluid/Make/options +++ b/applications/solvers/modules/incompressibleFluid/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ diff --git a/applications/solvers/modules/fluid/incompressibleFluid/correctPressure.C b/applications/solvers/modules/incompressibleFluid/correctPressure.C similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/correctPressure.C rename to applications/solvers/modules/incompressibleFluid/correctPressure.C diff --git a/applications/solvers/modules/fluid/incompressibleFluid/incompressibleFluid.C b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/incompressibleFluid.C rename to applications/solvers/modules/incompressibleFluid/incompressibleFluid.C diff --git a/applications/solvers/modules/fluid/incompressibleFluid/incompressibleFluid.H b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.H similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/incompressibleFluid.H rename to applications/solvers/modules/incompressibleFluid/incompressibleFluid.H diff --git a/applications/solvers/modules/fluid/incompressibleFluid/momentumPredictor.C b/applications/solvers/modules/incompressibleFluid/momentumPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/momentumPredictor.C rename to applications/solvers/modules/incompressibleFluid/momentumPredictor.C diff --git a/applications/solvers/modules/fluid/incompressibleFluid/moveMesh.C b/applications/solvers/modules/incompressibleFluid/moveMesh.C similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/moveMesh.C rename to applications/solvers/modules/incompressibleFluid/moveMesh.C diff --git a/applications/solvers/modules/fluid/incompressibleFluid/setRDeltaT.C b/applications/solvers/modules/incompressibleFluid/setRDeltaT.C similarity index 100% rename from applications/solvers/modules/fluid/incompressibleFluid/setRDeltaT.C rename to applications/solvers/modules/incompressibleFluid/setRDeltaT.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/Make/files b/applications/solvers/modules/isothermalFluid/Make/files similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/Make/files rename to applications/solvers/modules/isothermalFluid/Make/files diff --git a/applications/solvers/modules/fluid/isothermalFluid/Make/options b/applications/solvers/modules/isothermalFluid/Make/options similarity index 91% rename from applications/solvers/modules/fluid/isothermalFluid/Make/options rename to applications/solvers/modules/isothermalFluid/Make/options index ac5b77bedf..6bf3897d49 100644 --- a/applications/solvers/modules/fluid/isothermalFluid/Make/options +++ b/applications/solvers/modules/isothermalFluid/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ diff --git a/applications/solvers/modules/fluid/isothermalFluid/correctBuoyantPressure.C b/applications/solvers/modules/isothermalFluid/correctBuoyantPressure.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/correctBuoyantPressure.C rename to applications/solvers/modules/isothermalFluid/correctBuoyantPressure.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/correctDensity.C b/applications/solvers/modules/isothermalFluid/correctDensity.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/correctDensity.C rename to applications/solvers/modules/isothermalFluid/correctDensity.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/correctPressure.C b/applications/solvers/modules/isothermalFluid/correctPressure.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/correctPressure.C rename to applications/solvers/modules/isothermalFluid/correctPressure.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C b/applications/solvers/modules/isothermalFluid/isothermalFluid.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.C rename to applications/solvers/modules/isothermalFluid/isothermalFluid.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.H b/applications/solvers/modules/isothermalFluid/isothermalFluid.H similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/isothermalFluid.H rename to applications/solvers/modules/isothermalFluid/isothermalFluid.H diff --git a/applications/solvers/modules/fluid/isothermalFluid/momentumPredictor.C b/applications/solvers/modules/isothermalFluid/momentumPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/momentumPredictor.C rename to applications/solvers/modules/isothermalFluid/momentumPredictor.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/moveMesh.C b/applications/solvers/modules/isothermalFluid/moveMesh.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/moveMesh.C rename to applications/solvers/modules/isothermalFluid/moveMesh.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/prePredictor.C b/applications/solvers/modules/isothermalFluid/prePredictor.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/prePredictor.C rename to applications/solvers/modules/isothermalFluid/prePredictor.C diff --git a/applications/solvers/modules/fluid/isothermalFluid/setRDeltaT.C b/applications/solvers/modules/isothermalFluid/setRDeltaT.C similarity index 100% rename from applications/solvers/modules/fluid/isothermalFluid/setRDeltaT.C rename to applications/solvers/modules/isothermalFluid/setRDeltaT.C diff --git a/applications/solvers/modules/fluid/multicomponentFluid/Make/files b/applications/solvers/modules/multicomponentFluid/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multicomponentFluid/Make/files rename to applications/solvers/modules/multicomponentFluid/Make/files diff --git a/applications/solvers/modules/fluid/multicomponentFluid/Make/options b/applications/solvers/modules/multicomponentFluid/Make/options similarity index 91% rename from applications/solvers/modules/fluid/multicomponentFluid/Make/options rename to applications/solvers/modules/multicomponentFluid/Make/options index e1989cfe02..ce4ff0d466 100644 --- a/applications/solvers/modules/fluid/multicomponentFluid/Make/options +++ b/applications/solvers/modules/multicomponentFluid/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ - -I$(FOAM_SOLVERS)/modules/fluid/isothermalFluid/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/isothermalFluid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ diff --git a/applications/solvers/modules/fluid/multicomponentFluid/multicomponentFluid.C b/applications/solvers/modules/multicomponentFluid/multicomponentFluid.C similarity index 100% rename from applications/solvers/modules/fluid/multicomponentFluid/multicomponentFluid.C rename to applications/solvers/modules/multicomponentFluid/multicomponentFluid.C diff --git a/applications/solvers/modules/fluid/multicomponentFluid/multicomponentFluid.H b/applications/solvers/modules/multicomponentFluid/multicomponentFluid.H similarity index 100% rename from applications/solvers/modules/fluid/multicomponentFluid/multicomponentFluid.H rename to applications/solvers/modules/multicomponentFluid/multicomponentFluid.H diff --git a/applications/solvers/modules/fluid/multicomponentFluid/setRDeltaT.C b/applications/solvers/modules/multicomponentFluid/setRDeltaT.C similarity index 100% rename from applications/solvers/modules/fluid/multicomponentFluid/setRDeltaT.C rename to applications/solvers/modules/multicomponentFluid/setRDeltaT.C diff --git a/applications/solvers/modules/fluid/multicomponentFluid/thermophysicalPredictor.C b/applications/solvers/modules/multicomponentFluid/thermophysicalPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/multicomponentFluid/thermophysicalPredictor.C rename to applications/solvers/modules/multicomponentFluid/thermophysicalPredictor.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/Allwclean b/applications/solvers/modules/multiphaseEuler/Allwclean similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/Allwclean rename to applications/solvers/modules/multiphaseEuler/Allwclean diff --git a/applications/solvers/modules/fluid/multiphaseEuler/Allwmake b/applications/solvers/modules/multiphaseEuler/Allwmake similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/Allwmake rename to applications/solvers/modules/multiphaseEuler/Allwmake diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/Make/files b/applications/solvers/modules/multiphaseEuler/functionObjects/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/Make/files rename to applications/solvers/modules/multiphaseEuler/functionObjects/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/Make/options b/applications/solvers/modules/multiphaseEuler/functionObjects/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/Make/options rename to applications/solvers/modules/multiphaseEuler/functionObjects/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseForces/phaseForces.C b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseForces/phaseForces.C rename to applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseForces/phaseForces.H b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseForces/phaseForces.H rename to applications/solvers/modules/multiphaseEuler/functionObjects/phaseForces/phaseForces.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseMap/phaseMap.C b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseMap/phaseMap.C rename to applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseMap/phaseMap.H b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseMap/phaseMap.H rename to applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H index 955355d4d3..ce68f56c0c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/phaseMap/phaseMap.H +++ b/applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C rename to applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H rename to applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceMoments/populationBalanceMoments.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C rename to applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H b/applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H rename to applications/solvers/modules/multiphaseEuler/functionObjects/populationBalanceSizeDistribution/populationBalanceSizeDistribution.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.C b/applications/solvers/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.C rename to applications/solvers/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H b/applications/solvers/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H rename to applications/solvers/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/Make/files b/applications/solvers/modules/multiphaseEuler/fvModels/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/Make/files rename to applications/solvers/modules/multiphaseEuler/fvModels/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/Make/options b/applications/solvers/modules/multiphaseEuler/fvModels/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/Make/options rename to applications/solvers/modules/multiphaseEuler/fvModels/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C b/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C rename to applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H b/applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H rename to applications/solvers/modules/multiphaseEuler/fvModels/interfaceTurbulenceDamping/interfaceTurbulenceDamping.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C b/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C rename to applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H b/applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H rename to applications/solvers/modules/multiphaseEuler/fvModels/phaseTurbulenceStabilisation/phaseTurbulenceStabilisation.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/include/createRDeltaTf.H b/applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/include/createRDeltaTf.H rename to applications/solvers/modules/multiphaseEuler/include/createRDeltaTf.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/include/setRDeltaTf.H b/applications/solvers/modules/multiphaseEuler/include/setRDeltaTf.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/include/setRDeltaTf.H rename to applications/solvers/modules/multiphaseEuler/include/setRDeltaTf.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/Make/files b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/Make/files rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/Make/options b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/Make/options rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSaturationTemperatureModel/interfaceSaturationTemperatureModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialCompositionModels/interfaceSurfaceTensionModels/interfaceSurfaceTensionModel/interfaceSurfaceTensionModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/Make/files b/applications/solvers/modules/multiphaseEuler/interfacialModels/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/Make/files rename to applications/solvers/modules/multiphaseEuler/interfacialModels/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/Make/options b/applications/solvers/modules/multiphaseEuler/interfacialModels/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/Make/options rename to applications/solvers/modules/multiphaseEuler/interfacialModels/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Beetstra/Beetstra.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Lain/Lain.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/Tenneti/Tenneti.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dispersedDragModel/dispersedDragModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/segregated/segregated.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/Gunn/Gunn.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/SaffmanMei/SaffmanMei.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/dispersedLiftModel/dispersedLiftModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/noLift/noLift.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/cavitation/cavitation.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/deposition/deposition.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/dispersedTurbulentDispersionModel/dispersedTurbulentDispersionModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/dispersedVirtualMassModel/dispersedVirtualMassModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/linear/linearWallDamping.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/sine/sineWallDamping.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C index 2d502eb963..0c35f53475 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H index 03dc0725fc..3790597aa7 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H +++ b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallDependentModel/wallDependentModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/dispersedWallLubricationModel/dispersedWallLubricationModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C b/applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C rename to applications/solvers/modules/multiphaseEuler/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index b16700752f..ed32310d23 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H index 524f578d6b..c97a0aff67 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H index 411073706f..56e77bcc01 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C index f5c851b617..59fc0de2fe 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H index 75f2e8cd6a..7d793e7c8a 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C index d50703def8..744f827463 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index 91943163cb..bc7f4ebf31 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C index cce902e078..2fab5920e6 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H index 6a13f74c19..7ac7bc4d92 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H index f8852e4f7c..878c33555c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H index 79bf2325c6..f1883f092f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C index 1a1659c474..0a5b0fd536 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index a6cb445b38..6b759da767 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C index 981ef36ccc..06cb6effc1 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C index 640b4cea09..8bfed02f7f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H index bc06a22865..c57ef963cb 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C index 8c91d12dfa..289932e69c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H index 8886b5bdf2..e331d8efb5 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C index 37fd91f9c7..f82707b2b2 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index a77e66b7c5..6265e4a0ff 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C index 07440f7241..80629eb813 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index d6c9881e39..980170f027 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H index 4ad1327181..b1df8ffc5d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C index 70f5d82361..1323d7cda5 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H index c94690ccc2..b0bb9252f8 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index 98b780d343..90b162085e 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H index d7e11d19f6..8d9a263f24 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C index 5ec4a31a6b..3aeff80a29 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H index 23fb05cab1..07506f58f7 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C index 0a57e62379..f61b86c4ca 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index 6f0bd917ae..5a4c5f5374 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index 20bd7f6978..8964473a4d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index 25c6f2fc5b..9320117342 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H index 93fc6ff2da..cf5dd137f4 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C index 4f4a96c7fa..23f3296a47 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H index a8f68017fa..e369b1c481 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C index a43a671eed..09815ab68c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C index f5c407cc2e..69a915c81b 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Allwclean b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/Allwclean similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Allwclean rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/Allwclean diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Allwmake b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/Allwmake similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Allwmake rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/Allwmake diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Make/files b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Make/files rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Make/options b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/Make/options similarity index 95% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Make/options rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/Make/options index a164f4cc37..21aff35414 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/Make/options +++ b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \ + -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \ -I../include \ -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude \ diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/compressibilityEqns.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/compressibilityEqns.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/compressibilityEqns.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/compressibilityEqns.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/facePressureCorrector.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/momentumPredictor.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/momentumPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/momentumPredictor.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/momentumPredictor.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/moveMesh.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/moveMesh.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/moveMesh.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/moveMesh.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.H b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.H rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseEuler.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/multiphaseSystems/multiphaseSystems.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/pressureCorrector.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/pressureCorrector.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/pressureCorrector.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/pressureCorrector.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/setRDeltaT.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/setRDeltaT.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/setRDeltaT.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/setRDeltaT.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C b/applications/solvers/modules/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C rename to applications/solvers/modules/multiphaseEuler/multiphaseEuler/thermophysicalPredictor.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/Make/files b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/Make/files rename to applications/solvers/modules/multiphaseEuler/multiphaseReactions/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/Make/options b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/Make/options rename to applications/solvers/modules/multiphaseEuler/multiphaseReactions/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C similarity index 95% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C rename to applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C index 9f22f24d6e..1118b4cd42 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C +++ b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H rename to applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H index 94988cae37..0ad91c8d0d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H rename to applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H index 5f7e8b78bf..662aeee248 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H +++ b/applications/solvers/modules/multiphaseEuler/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/coupledMultiphaseTemperature/coupledMultiphaseTemperatureFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/fixedMultiphaseHeatFlux/fixedMultiphaseHeatFluxFvPatchScalarField.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to applications/solvers/modules/multiphaseEuler/multiphaseThermophysicalTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/continuous/continuous.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/BlendedInterfacialModel/blendingMethods/segregatedBlendingMethod/segregatedBlendingMethod.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/Make/files b/applications/solvers/modules/multiphaseEuler/phaseSystems/Make/files similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/Make/files rename to applications/solvers/modules/multiphaseEuler/phaseSystems/Make/files diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/Make/options b/applications/solvers/modules/multiphaseEuler/phaseSystems/Make/options similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/Make/options rename to applications/solvers/modules/multiphaseEuler/phaseSystems/Make/options diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C index fafc243603..7f12d71cca 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C similarity index 95% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C index a75ef82d11..e93216ac26 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H index b0908cebd4..3b3adcb8e5 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/SidedInterfacialModel/SidedInterfacialModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C index d80056f816..800af31e0c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H index fb46d02be9..a6f1910bbb 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATE.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 5d217e6e92..1a086c2dc4 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H index 2a83b57520..5ad66a3cc8 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H index e8531f67fd..324394227a 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H index 9641e55c4f..2423381341 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H index daa9816c97..e4f5262acd 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C index 1b2f0d9a6f..42be5908a7 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H index 31fa84c5f0..026e3ec6d3 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H index d1393c167b..38dba6ee75 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C index 6508cbc4fd..1e4bc9ea02 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H index 1b089c9bdf..fabb192f1d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/constantDiameter/constantDiameter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C index f5e3ff0fa6..cb0d1d7cf8 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H index c24a33d7b4..f6b61a69ae 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C index 7e0ac1b33a..ffe5993078 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/diameterModel/diameterModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C index 0052e92e30..c8c8d6bf62 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H index d93ebd3b75..2613d79e0f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H index 7dde11cd45..84415e2298 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/noDiameter/noDiameter.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C index b31d963f24..4c21c3d52f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H index 1247442d4a..b2f0f08ff4 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C index b73a246992..3192f89443 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C index 21bef4cbfa..f4286c7eef 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H index d00b7a5014..8ade46f8e1 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H index 3d0fc793f5..b0a24da32a 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroup.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H index 180f6f43cb..1ef644cd52 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedPhaseInterface/dispersedDisplacedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedDisplacedSidedPhaseInterface/dispersedDisplacedSidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedPhaseInterface/dispersedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/dispersedSidedPhaseInterface/dispersedSidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedPhaseInterface/displacedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/displacedSidedPhaseInterface/displacedSidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterface/phaseInterfaceI.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/phaseInterfaceKey/phaseInterfaceKey.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedPhaseInterface/segregatedDisplacedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedDisplacedSidedPhaseInterface/segregatedDisplacedSidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedPhaseInterface/segregatedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/segregatedSidedPhaseInterface/segregatedSidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseInterface/sidedPhaseInterface/sidedPhaseInterface.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C index b48c5946a5..5fb7b640d3 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H index 44317686cd..18a57441a6 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C index 79c8dd7ae4..e9ebe6f4e1 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H index d2c238d413..211c184069 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C index c18f8d4904..b533b3b76c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H index 91df8f1e4a..c31c12f982 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MulticomponentPhaseModel/MulticomponentPhaseModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C index 9e110bf700..12fc729082 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H index f0afa290e7..8dfc94d491 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C index 91f3998f47..311df03ef2 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H index 3dd3be9486..89ab5e0c51 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H index 9e4182c672..e49eb0b5eb 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C index 075ed6cd0a..c4d0d0278d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H index bd9fae196d..fa61cc16af 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C index 13f57eb221..fc6d61b673 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C index 030e09ae41..067fb6b54a 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModels.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemI.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C similarity index 96% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C index eddfe84808..943473322f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemSolve.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystemTemplates.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H index b84ea324a9..eb9eff87c1 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H index 6862c75f35..32f30f43e0 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/Liao.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C index fc3e738ea8..172bb38abd 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H index 3555fd7af7..0eaff8b2df 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/Liao/LiaoBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H similarity index 99% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H index 85f6014d57..30787a7f3d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C index a1ab27e14f..15f3b34c89 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H index c3235e2966..65cc6007c8 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Kusters/Kusters.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H index 171091b8a6..85a88bf652 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C index eda88ef5d0..0264bd8306 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C index ea2249c9a4..63f9dd19a7 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H index 21a69d5c2f..12e7b65140 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C index 181b19ab2f..e57fc6eda3 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H index 03bd41eeb9..8ad49ecac9 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/AdachiStuartFokkink/AdachiStuartFokkink.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H index f8fd78c2a2..1b04deef22 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H index ff0e8c7330..aefec0b784 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlarides/CoulaloglouTavlarides.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C index 54a080b971..d84a9aa4c0 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H index 8e98c605a4..89f33be714 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H index 2b21b58afb..6f65df154b 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H index 9ed85b7030..7b0bfa4690 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/LiaoCoalescence/LiaoCoalescence.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H index a9ed751666..7f4bc4f3f9 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H similarity index 99% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H index ba78522cf8..869ababd10 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C index 446a286e39..76a3bebf74 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H index 4949b4d65f..43924efb02 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C index caf9dc6be2..9ad998a185 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C index a1a84bda9f..8dc7cc248d 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H index da9ea2bbac..5c519da87c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C index 9a3ae76125..252db693c7 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H index 53ece52555..d4e9db23c4 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H index a30b2be2d7..0b7d2bd833 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C index cb13192ace..bc5fde02d9 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H index 2eab73cf71..b2caabf820 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C similarity index 98% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C index 08fd8acb8f..d1181c4da2 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C index 76dfacd7b0..0c3c1e65ad 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H index 952cb2d3ba..b5f4fb153c 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H index 5bd83e8baa..03b72aa16b 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H index 4aba1b0873..87c941c320 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C index 679e41fb09..8fb6781f6f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H similarity index 97% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H index 1c62f1bdb1..aa14f5fe5f 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H diff --git a/applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H similarity index 100% rename from applications/solvers/modules/fluid/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H rename to applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H diff --git a/applications/solvers/modules/solid/solid/Make/files b/applications/solvers/modules/solid/Make/files similarity index 100% rename from applications/solvers/modules/solid/solid/Make/files rename to applications/solvers/modules/solid/Make/files diff --git a/applications/solvers/modules/solid/solid/Make/options b/applications/solvers/modules/solid/Make/options similarity index 100% rename from applications/solvers/modules/solid/solid/Make/options rename to applications/solvers/modules/solid/Make/options diff --git a/applications/solvers/modules/solid/solid/solid.C b/applications/solvers/modules/solid/solid.C similarity index 100% rename from applications/solvers/modules/solid/solid/solid.C rename to applications/solvers/modules/solid/solid.C diff --git a/applications/solvers/modules/solid/solid/solid.H b/applications/solvers/modules/solid/solid.H similarity index 100% rename from applications/solvers/modules/solid/solid/solid.H rename to applications/solvers/modules/solid/solid.H