From b1de509a776918042df210ea8ceda71e077bd049 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Wed, 19 Oct 2022 11:43:23 +0100 Subject: [PATCH] fvModels: surfaceFilms: Support for multiple films The surfaceFilm fvModel has been renamed surfaceFilms, and can now have a number of independent film models specified. For example, the hotBoxes tutorial could be modified to have separate film regions for the boxes and for the floor. In which case, the names of the separate films would need specifying as shown below. surfaceFilms { type surfaceFilms; surfaceFilms (boxesFilm floorFilm); // <-- new entry libs ("libsurfaceFilmModels.so"); } The old fvModel name, surfaceFilm, has been maintained for backwards compatibility. The Lagrangian surface film model now also requires the coupled surfaceFilms to be specified when there is not just a single default-named film. For example, in constant/cloudProperties: subModels { surfaceFilmModel thermoSurfaceFilm; thermoSurfaceFilmCoeffs { surfaceFilms (boxesFilm floorFilm); // <-- new entry interactionType splashBai; deltaWet 0.0005; Adry 2630; Awet 1320; Cf 0.6; } ... } --- .../VoFPatchTransfer/VoFPatchTransfer.C | 10 +- .../VoFPatchTransfer/VoFPatchTransfer.H | 8 +- .../fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C | 4 +- .../fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H | 4 +- bin/foamInfo | 2 +- src/lagrangian/parcel/Make/files | 3 + .../NoSurfaceFilm/NoSurfaceFilm.C | 13 +- .../NoSurfaceFilm/NoSurfaceFilm.H | 8 +- .../SurfaceFilmModel/SurfaceFilmModel.C | 226 ++++++------- .../SurfaceFilmModel/SurfaceFilmModel.H | 15 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 316 +++++++++--------- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 96 +++--- .../ThermoSurfaceFilm/ThermoSurfaceFilmBase.C | 48 +++ src/regionModels/regionModel/Make/files | 2 +- .../singleLayerRegionModel.C} | 20 +- .../singleLayerRegionModel.H} | 22 +- .../singleLayerRegionModelTemplates.C} | 6 +- src/regionModels/surfaceFilmModels/Make/files | 71 ++-- ...ilmHeightInletVelocityFvPatchVectorField.C | 2 +- ...ilmHeightInletVelocityFvPatchVectorField.H | 2 +- ...linedFilmNusseltHeightFvPatchScalarField.C | 34 +- ...linedFilmNusseltHeightFvPatchScalarField.H | 5 +- ...lmNusseltInletVelocityFvPatchVectorField.C | 34 +- ...lmNusseltInletVelocityFvPatchVectorField.H | 5 +- ...alphatFilmWallFunctionFvPatchScalarField.C | 26 +- ...alphatFilmWallFunctionFvPatchScalarField.H | 5 +- .../nutkFilmWallFunctionFvPatchScalarField.C | 30 +- .../nutkFilmWallFunctionFvPatchScalarField.H | 5 +- .../fvModels/surfaceFilm/surfaceFilm.C | 239 ------------- .../fvModels/surfaceFilms/surfaceFilms.C | 309 +++++++++++++++++ .../surfaceFilms.H} | 41 ++- .../kinematicSingleLayerI.H | 234 ------------- .../momentumSurfaceFilm.C} | 126 +++---- .../momentumSurfaceFilm.H} | 56 ++-- .../momentumSurfaceFilmI.H | 249 ++++++++++++++ .../momentumSurfaceFilmTemplates.C} | 21 +- .../submodels/filmSubModelBase.C | 12 +- .../submodels/filmSubModelBase.H | 22 +- .../submodels/filmSubModelBaseI.H | 10 +- .../submodels/filmSubModelBaseTemplates.C | 6 +- .../BrunDrippingEjection.C | 14 +- .../BrunDrippingEjection.H | 10 +- .../curvatureSeparation/curvatureSeparation.C | 14 +- .../curvatureSeparation/curvatureSeparation.H | 10 +- .../drippingEjection/drippingEjection.C | 14 +- .../drippingEjection/drippingEjection.H | 10 +- .../ejectionModel/ejectionModel.C | 10 +- .../ejectionModel/ejectionModel.H | 16 +- .../ejectionModel/ejectionModelNew.C | 8 +- .../ejectionModelList/ejectionModelList.C | 10 +- .../ejectionModelList/ejectionModelList.H | 12 +- .../patchEjection/patchEjection.C | 8 +- .../patchEjection/patchEjection.H | 10 +- .../filmMomentumTransportModel.C | 10 +- .../filmMomentumTransportModel.H | 16 +- .../filmMomentumTransportModelNew.C | 8 +- .../laminar/laminar.C | 12 +- .../laminar/laminar.H | 10 +- .../Arrhenius/ArrheniusViscosity.C | 8 +- .../Arrhenius/ArrheniusViscosity.H | 10 +- .../Newtonian/NewtonianViscosity.C | 12 +- .../Newtonian/NewtonianViscosity.H | 10 +- .../constant/constantViscosity.C | 8 +- .../constant/constantViscosity.H | 10 +- .../filmViscosityModel/filmViscosityModel.C | 8 +- .../filmViscosityModel/filmViscosityModel.H | 14 +- .../filmViscosityModelNew.C | 8 +- .../function1/function1Viscosity.C | 8 +- .../function1/function1Viscosity.H | 10 +- .../thixotropic/thixotropicViscosity.C | 10 +- .../thixotropic/thixotropicViscosity.H | 10 +- .../waxSolvent/waxSolventViscosity.C | 10 +- .../waxSolvent/waxSolventViscosity.H | 10 +- .../contactAngleForce/contactAngleForce.C | 6 +- .../contactAngleForce/contactAngleForce.H | 10 +- .../distributionContactAngleForce.C | 6 +- .../distributionContactAngleForce.H | 12 +- ...bedTemperatureDependentContactAngleForce.C | 10 +- ...bedTemperatureDependentContactAngleForce.H | 17 +- .../temperatureDependentContactAngleForce.C | 10 +- .../temperatureDependentContactAngleForce.H | 13 +- .../force/force/force.C | 10 +- .../force/force/force.H | 16 +- .../force/force/forceNew.C | 8 +- .../force/forceList/forceList.C | 10 +- .../force/forceList/forceList.H | 12 +- .../thermocapillaryForce.C | 8 +- .../thermocapillaryForce.H | 10 +- .../transferModel/transferModel.C | 12 +- .../transferModel/transferModel.H | 16 +- .../transferModel/transferModelNew.C | 8 +- .../transferModelList/transferModelList.C | 10 +- .../transferModelList/transferModelList.H | 12 +- .../constantRadiation/constantRadiation.C | 6 +- .../constantRadiation/constantRadiation.H | 10 +- .../filmRadiationModel/filmRadiationModel.C | 10 +- .../filmRadiationModel/filmRadiationModel.H | 16 +- .../filmRadiationModelNew.C | 8 +- .../noRadiation/noRadiation.C | 6 +- .../noRadiation/noRadiation.H | 10 +- .../primaryRadiation/primaryRadiation.C | 6 +- .../primaryRadiation/primaryRadiation.H | 10 +- .../standardRadiation/standardRadiation.C | 6 +- .../standardRadiation/standardRadiation.H | 10 +- .../constantHeatTransfer.C | 8 +- .../constantHeatTransfer.H | 10 +- .../heatTransferModel/heatTransferModel.C | 10 +- .../heatTransferModel/heatTransferModel.H | 16 +- .../heatTransferModel/heatTransferModelNew.C | 8 +- .../mappedConvectiveHeatTransfer.C | 10 +- .../mappedConvectiveHeatTransfer.H | 10 +- .../noPhaseChange/noPhaseChange.C | 8 +- .../noPhaseChange/noPhaseChange.H | 10 +- .../phaseChangeModel/phaseChangeModel.C | 10 +- .../phaseChangeModel/phaseChangeModel.H | 16 +- .../phaseChangeModel/phaseChangeModelNew.C | 8 +- .../solidification/solidification.C | 10 +- .../solidification/solidification.H | 10 +- .../speciePhaseChange/speciePhaseChange.C | 14 +- .../speciePhaseChange/speciePhaseChange.H | 12 +- .../standardPhaseChange/standardPhaseChange.C | 14 +- .../standardPhaseChange/standardPhaseChange.H | 10 +- .../waxSolventEvaporation.C | 12 +- .../waxSolventEvaporation.H | 10 +- .../surfaceFilm.C} | 35 +- .../surfaceFilm.H} | 34 +- .../surfaceFilmI.H} | 22 +- .../thermoSurfaceFilm.C} | 97 +++--- .../thermoSurfaceFilm.H} | 60 ++-- .../thermoSurfaceFilmI.H} | 46 ++- .../cylinder/constant/fvModels | 4 +- .../hotBoxes/constant/fvModels | 4 +- .../hotBoxes/constant/surfaceFilmProperties | 1 - .../rivuletPanel/constant/fvModels | 4 +- .../splashPanel/constant/fvModels | 4 +- 135 files changed, 1880 insertions(+), 1656 deletions(-) create mode 100644 src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilmBase.C rename src/regionModels/regionModel/{singleLayerRegion/singleLayerRegion.C => singleLayerRegionModel/singleLayerRegionModel.C} (88%) rename src/regionModels/regionModel/{singleLayerRegion/singleLayerRegion.H => singleLayerRegionModel/singleLayerRegionModel.H} (88%) rename src/regionModels/regionModel/{singleLayerRegion/singleLayerRegionTemplates.C => singleLayerRegionModel/singleLayerRegionModelTemplates.C} (92%) delete mode 100644 src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C create mode 100644 src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C rename src/regionModels/surfaceFilmModels/fvModels/{surfaceFilm/surfaceFilm.H => surfaceFilms/surfaceFilms.H} (84%) delete mode 100644 src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H rename src/regionModels/surfaceFilmModels/{kinematicSingleLayer/kinematicSingleLayer.C => momentumSurfaceFilm/momentumSurfaceFilm.C} (89%) rename src/regionModels/surfaceFilmModels/{kinematicSingleLayer/kinematicSingleLayer.H => momentumSurfaceFilm/momentumSurfaceFilm.H} (92%) create mode 100644 src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H rename src/regionModels/surfaceFilmModels/{kinematicSingleLayer/kinematicSingleLayerTemplates.C => momentumSurfaceFilm/momentumSurfaceFilmTemplates.C} (82%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/curvatureSeparation/curvatureSeparation.C (96%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/curvatureSeparation/curvatureSeparation.H (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/drippingEjection/drippingEjection.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/drippingEjection/drippingEjection.H (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/ejectionModel/ejectionModel.C (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/ejectionModel/ejectionModel.H (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/ejectionModel/ejectionModelNew.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/ejectionModelList/ejectionModelList.C (95%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/ejectionModelList/ejectionModelList.H (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/patchEjection/patchEjection.C (97%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/ejectionModel/patchEjection/patchEjection.H (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H (90%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmMomentumTransportModel/laminar/laminar.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmMomentumTransportModel/laminar/laminar.H (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/Arrhenius/ArrheniusViscosity.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/Arrhenius/ArrheniusViscosity.H (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/Newtonian/NewtonianViscosity.C (90%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/Newtonian/NewtonianViscosity.H (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/constant/constantViscosity.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/constant/constantViscosity.H (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/filmViscosityModel/filmViscosityModel.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/filmViscosityModel/filmViscosityModel.H (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/function1/function1Viscosity.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/function1/function1Viscosity.H (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/thixotropic/thixotropicViscosity.C (96%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/thixotropic/thixotropicViscosity.H (95%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/waxSolvent/waxSolventViscosity.C (95%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/filmViscosityModel/waxSolvent/waxSolventViscosity.H (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/contactAngleForce/contactAngleForce.C (98%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/contactAngleForce/contactAngleForce.H (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/distribution/distributionContactAngleForce.C (97%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/distribution/distributionContactAngleForce.H (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C (95%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H (89%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C (94%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H (90%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/force/force.C (90%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/force/force.H (90%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/force/forceNew.C (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/forceList/forceList.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/forceList/forceList.H (89%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/thermocapillaryForce/thermocapillaryForce.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/force/thermocapillaryForce/thermocapillaryForce.H (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/transferModels/transferModel/transferModel.C (91%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/transferModels/transferModel/transferModel.H (92%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/transferModels/transferModel/transferModelNew.C (93%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/transferModels/transferModelList/transferModelList.C (96%) rename src/regionModels/surfaceFilmModels/submodels/{kinematic => momentum}/transferModels/transferModelList/transferModelList.H (92%) rename src/regionModels/surfaceFilmModels/{surfaceFilmRegionModel/surfaceFilmRegionModel.C => surfaceFilm/surfaceFilm.C} (75%) rename src/regionModels/surfaceFilmModels/{surfaceFilmRegionModel/surfaceFilmRegionModel.H => surfaceFilm/surfaceFilm.H} (86%) rename src/regionModels/surfaceFilmModels/{surfaceFilmRegionModel/surfaceFilmRegionModelI.H => surfaceFilm/surfaceFilmI.H} (72%) rename src/regionModels/surfaceFilmModels/{thermoSingleLayer/thermoSingleLayer.C => thermoSurfaceFilm/thermoSurfaceFilm.C} (86%) rename src/regionModels/surfaceFilmModels/{thermoSingleLayer/thermoSingleLayer.H => thermoSurfaceFilm/thermoSurfaceFilm.H} (86%) rename src/regionModels/surfaceFilmModels/{thermoSingleLayer/thermoSingleLayerI.H => thermoSurfaceFilm/thermoSurfaceFilmI.H} (60%) diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C index 57c95c7e9d..491b46af65 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C +++ b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.C @@ -25,7 +25,7 @@ License #include "VoFPatchTransfer.H" #include "compressibleTwoPhaseMixture.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +34,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -46,7 +46,7 @@ addToRunTimeSelectionTable(transferModel, VoFPatchTransfer, dictionary); VoFPatchTransfer::VoFPatchTransfer ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -146,7 +146,7 @@ void VoFPatchTransfer::correct // Do not correct if no patches selected if (!patchIDs_.size()) return; - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const scalarField& delta = film.delta(); const scalarField& rho = film.rho(); @@ -338,7 +338,7 @@ void VoFPatchTransfer::patchTransferredMassTotals // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H index 4c2249838f..0cf806046b 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H +++ b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFPatchTransfer/VoFPatchTransfer.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::VoFPatchTransfer + Foam::regionModels::surfaceFilmSubModels::VoFPatchTransfer Description Transfer mass between the film and the VoF in the continuous phase. @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -89,7 +89,7 @@ public: // Constructors //- Construct from surface film model - VoFPatchTransfer(surfaceFilmRegionModel& film, const dictionary& dict); + VoFPatchTransfer(surfaceFilm& film, const dictionary& dict); //- Disallow default bitwise copy construction VoFPatchTransfer(const VoFPatchTransfer&) = delete; @@ -135,7 +135,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C index dd63abf084..25495a8890 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C +++ b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.C @@ -60,10 +60,10 @@ Foam::fv::VoFSurfaceFilm::VoFSurfaceFilm fvModel(sourceName, modelType, dict, mesh), surfaceFilm_ ( - regionModels::surfaceFilmModels::thermoSingleLayer::typeName, + regionModels::thermoSurfaceFilm::typeName, mesh, mesh.lookupObject("g"), - "surfaceFilm" + regionModels::surfaceFilm::typeName ), curTimeIndex_(-1) {} diff --git a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H index 6f25b0b197..25aa3c4ad9 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H +++ b/applications/solvers/modules/fluid/compressibleVoF/fvModels/VoFSurfaceFilm/VoFSurfaceFilm.H @@ -46,7 +46,7 @@ SourceFiles #define VoFSurfaceFilm_H #include "fvModel.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -66,7 +66,7 @@ class VoFSurfaceFilm // Private Data //- The surface film model - regionModels::surfaceFilmModels::thermoSingleLayer surfaceFilm_; + regionModels::thermoSurfaceFilm surfaceFilm_; //- Current time index (used for updating) mutable label curTimeIndex_; diff --git a/bin/foamInfo b/bin/foamInfo index 98f20d69be..7f0022d1b3 100755 --- a/bin/foamInfo +++ b/bin/foamInfo @@ -206,7 +206,7 @@ modelsInFamily () { _modelDirs="\ $(findModelDirs "$_familyDir" 2) \ $(findModelDirs "$FOAM_SRC/lagrangian/parcel/fvModels") \ - $(findModelDirs "$FOAM_SRC/regionModels/surfaceFilmModels/fvModels") \ + $(findModelDirs "$FOAM_SRC/regionModels/surfaceFilm/fvModels") \ $(findModelDirs "$FOAM_SRC/radiationModels/fvModels/radiation")" [ "$_modelDirs" ] || return 0 diff --git a/src/lagrangian/parcel/Make/files b/src/lagrangian/parcel/Make/files index f9c4378511..767a0bef1c 100644 --- a/src/lagrangian/parcel/Make/files +++ b/src/lagrangian/parcel/Make/files @@ -117,6 +117,9 @@ clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C # averaging methods submodels/MPPIC/AveragingMethods/makeAveragingMethods.C +# surface films +submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilmBase.C + # fvModels fvModels/clouds/clouds.C diff --git a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C index 42c70ab6a0..f8f27dcac7 100644 --- a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.C +++ b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.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 @@ -26,6 +26,17 @@ License #include "NoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +template +Foam::UPtrList& +Foam::NoSurfaceFilm::surfaceFilmPtrs() const +{ + static UPtrList null; + return null; +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template diff --git a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H index 67cb3ecb38..dc890bea2d 100644 --- a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.H +++ b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/NoSurfaceFilm/NoSurfaceFilm.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 @@ -59,6 +59,12 @@ protected: typedef typename CloudType::parcelType parcelType; + // Protected Member Functions + + //- Return pointers to the films + virtual UPtrList& surfaceFilmPtrs() const; + + public: //- Runtime type information diff --git a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C index e5a3e35d64..356ac16f6b 100644 --- a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C +++ b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.C @@ -24,11 +24,64 @@ License \*---------------------------------------------------------------------------*/ #include "SurfaceFilmModel.H" -#include "surfaceFilmRegionModel.H" +#include "UPtrList.H" +#include "surfaceFilm.H" #include "mathematicalConstants.H" using namespace Foam::constant; + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +template +void Foam::SurfaceFilmModel::cacheFilmFields +( + const label filmPatchi, + const label primaryPatchi, + const regionModels::surfaceFilm& filmModel +) +{ + massParcelPatch_ = filmModel.cloudMassTrans().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, massParcelPatch_); + + diameterParcelPatch_ = + filmModel.cloudDiameterTrans().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, diameterParcelPatch_); + + UFilmPatch_ = filmModel.U().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, UFilmPatch_); + + rhoFilmPatch_ = filmModel.rho().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, rhoFilmPatch_); + + deltaFilmPatch_[primaryPatchi] = + filmModel.delta().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, deltaFilmPatch_[primaryPatchi]); +} + + +template +void Foam::SurfaceFilmModel::setParcelProperties +( + parcelType& p, + const label filmFacei +) const +{ + // Set parcel properties + scalar vol = mathematical::pi/6.0*pow3(diameterParcelPatch_[filmFacei]); + p.d() = diameterParcelPatch_[filmFacei]; + p.U() = UFilmPatch_[filmFacei]; + p.rho() = rhoFilmPatch_[filmFacei]; + + p.nParticle() = massParcelPatch_[filmFacei]/p.rho()/vol; + + if (ejectedParcelType_ >= 0) + { + p.typeId() = ejectedParcelType_; + } +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template @@ -103,83 +156,69 @@ template template void Foam::SurfaceFilmModel::inject(TrackCloudType& cloud) { - if - ( - !this->owner().mesh().time().objectRegistry::template foundObject - - ( - "surfaceFilmProperties" - ) - ) + forAll(surfaceFilmPtrs(), filmi) { - return; - } + const regionModels::surfaceFilm& filmModel = surfaceFilmPtrs()[filmi]; - // Retrieve the film model from the owner database - const regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel = - this->owner().mesh().time().objectRegistry::template lookupObject - - ( - "surfaceFilmProperties" - ); + const labelList& filmPatches = filmModel.intCoupledPatchIDs(); + const labelList& primaryPatches = filmModel.primaryPatchIDs(); - const labelList& filmPatches = filmModel.intCoupledPatchIDs(); - const labelList& primaryPatches = filmModel.primaryPatchIDs(); + const fvMesh& mesh = this->owner().mesh(); + const polyBoundaryMesh& pbm = mesh.boundaryMesh(); - const fvMesh& mesh = this->owner().mesh(); - const polyBoundaryMesh& pbm = mesh.boundaryMesh(); - - forAll(filmPatches, i) - { - const label filmPatchi = filmPatches[i]; - const label primaryPatchi = primaryPatches[i]; - - const labelList& injectorCellsPatch = pbm[primaryPatchi].faceCells(); - - cacheFilmFields(filmPatchi, primaryPatchi, filmModel); - - const vectorField& Cf = mesh.C().boundaryField()[primaryPatchi]; - const vectorField& Sf = mesh.Sf().boundaryField()[primaryPatchi]; - const scalarField& magSf = mesh.magSf().boundaryField()[primaryPatchi]; - - forAll(injectorCellsPatch, j) + forAll(filmPatches, i) { - if (diameterParcelPatch_[j] > 0) + const label filmPatchi = filmPatches[i]; + const label primaryPatchi = primaryPatches[i]; + + const labelList& injectorCellsPatch = + pbm[primaryPatchi].faceCells(); + + cacheFilmFields(filmPatchi, primaryPatchi, filmModel); + + const vectorField& Cf = mesh.C().boundaryField()[primaryPatchi]; + const vectorField& Sf = mesh.Sf().boundaryField()[primaryPatchi]; + const scalarField& magSf = + mesh.magSf().boundaryField()[primaryPatchi]; + + forAll(injectorCellsPatch, j) { - const label celli = injectorCellsPatch[j]; - - const scalar offset = - max - ( - diameterParcelPatch_[j], - deltaFilmPatch_[primaryPatchi][j] - ); - const point pos = Cf[j] - 1.1*offset*Sf[j]/magSf[j]; - - // Create a new parcel - parcelType* pPtr = - new parcelType(this->owner().pMesh(), pos, celli); - - // Check/set new parcel thermo properties - cloud.setParcelThermoProperties(*pPtr, 0.0); - - setParcelProperties(*pPtr, j); - - if (pPtr->nParticle() > 0.001) + if (massParcelPatch_[j] > 0) { - // Check new parcel properties - // cloud.checkParcelProperties(*pPtr, 0.0, true); - cloud.checkParcelProperties(*pPtr, 0.0, false); + const label celli = injectorCellsPatch[j]; - // Add the new parcel to the cloud - cloud.addParticle(pPtr); + const scalar offset = + max + ( + diameterParcelPatch_[j], + deltaFilmPatch_[primaryPatchi][j] + ); + const point pos = Cf[j] - 1.1*offset*Sf[j]/magSf[j]; - nParcelsInjected_++; - } - else - { - // TODO: cache mass and re-distribute? - delete pPtr; + // Create a new parcel + parcelType* pPtr = + new parcelType(this->owner().pMesh(), pos, celli); + + // Check/set new parcel thermo properties + cloud.setParcelThermoProperties(*pPtr, 0.0); + + setParcelProperties(*pPtr, j); + + if (pPtr->nParticle() > 0.001) + { + // Check new parcel properties + cloud.checkParcelProperties(*pPtr, 0.0, false); + + // Add the new parcel to the cloud + cloud.addParticle(pPtr); + + nParcelsInjected_++; + } + else + { + // TODO: cache mass and re-distribute? + delete pPtr; + } } } } @@ -187,55 +226,6 @@ void Foam::SurfaceFilmModel::inject(TrackCloudType& cloud) } -template -void Foam::SurfaceFilmModel::cacheFilmFields -( - const label filmPatchi, - const label primaryPatchi, - const regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel -) -{ - massParcelPatch_ = filmModel.cloudMassTrans().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, massParcelPatch_); - - diameterParcelPatch_ = - filmModel.cloudDiameterTrans().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, diameterParcelPatch_); - - UFilmPatch_ = filmModel.U().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, UFilmPatch_); - - rhoFilmPatch_ = filmModel.rho().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, rhoFilmPatch_); - - deltaFilmPatch_[primaryPatchi] = - filmModel.delta().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, deltaFilmPatch_[primaryPatchi]); -} - - -template -void Foam::SurfaceFilmModel::setParcelProperties -( - parcelType& p, - const label filmFacei -) const -{ - // Set parcel properties - scalar vol = mathematical::pi/6.0*pow3(diameterParcelPatch_[filmFacei]); - p.d() = diameterParcelPatch_[filmFacei]; - p.U() = UFilmPatch_[filmFacei]; - p.rho() = rhoFilmPatch_[filmFacei]; - - p.nParticle() = massParcelPatch_[filmFacei]/p.rho()/vol; - - if (ejectedParcelType_ >= 0) - { - p.typeId() = ejectedParcelType_; - } -} - - template void Foam::SurfaceFilmModel::info(Ostream& os) { diff --git a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H index 1155eaf1e5..83e6835e69 100644 --- a/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H +++ b/src/lagrangian/parcel/submodels/Momentum/SurfaceFilmModel/SurfaceFilmModel/SurfaceFilmModel.H @@ -40,6 +40,8 @@ SourceFiles #include "autoPtr.H" #include "runTimeSelectionTables.H" #include "CloudSubModelBase.H" +#include "surfaceMesh.H" +#include "dimensionedTypes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,10 +51,7 @@ namespace Foam // Forward declaration of classes namespace regionModels { - namespace surfaceFilmModels - { - class surfaceFilmRegionModel; - } + class surfaceFilm; } /*---------------------------------------------------------------------------*\ @@ -109,12 +108,16 @@ protected: // Protected functions + //- Return pointers to the films + virtual UPtrList& + surfaceFilmPtrs() const = 0; + //- Cache the film fields in preparation for injection virtual void cacheFilmFields ( const label filmPatchi, const label primaryPatchi, - const regionModels::surfaceFilmModels::surfaceFilmRegionModel& + const regionModels::surfaceFilm& ); //- Set the individual parcel properties @@ -128,7 +131,7 @@ protected: public: //- Runtime type information - TypeName("surfaceFilmModel"); + TypeName("surfaceFilm"); //- Declare runtime constructor selection table declareRunTimeSelectionTable diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C index b7b2cf3ae9..45a726aa1e 100644 --- a/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C +++ b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C @@ -24,64 +24,15 @@ License \*---------------------------------------------------------------------------*/ #include "ThermoSurfaceFilm.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" #include "Pstream.H" +#include "ThermoCloud.H" +#include "meshTools.H" using namespace Foam::constant::mathematical; -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -template -Foam::wordList Foam::ThermoSurfaceFilm::interactionTypeNames_ -( - IStringStream - ( - "(absorb bounce splashBai)" - )() -); - - -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // - -template -typename Foam::ThermoSurfaceFilm::interactionType -Foam::ThermoSurfaceFilm::interactionTypeEnum(const word& it) const -{ - forAll(interactionTypeNames_, i) - { - if (interactionTypeNames_[i] == it) - { - return interactionType(i); - } - } - - FatalErrorInFunction - << "Unknown interaction type " << it - << ". Valid interaction types include: " << interactionTypeNames_ - << abort(FatalError); - - return interactionType(0); -} - - -template -Foam::word Foam::ThermoSurfaceFilm::interactionTypeStr -( - const interactionType& it -) const -{ - if (it >= interactionTypeNames_.size()) - { - FatalErrorInFunction - << "Unknown interaction type enumeration" << abort(FatalError); - } - - return interactionTypeNames_[it]; -} - - // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template @@ -112,7 +63,7 @@ Foam::vector Foam::ThermoSurfaceFilm::splashDirection template void Foam::ThermoSurfaceFilm::absorbInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel, + regionModels::surfaceFilm& filmModel, const parcelType& p, const polyPatch& pp, const label facei, @@ -201,7 +152,7 @@ void Foam::ThermoSurfaceFilm::bounceInteraction template void Foam::ThermoSurfaceFilm::drySplashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel, + regionModels::surfaceFilm& filmModel, const parcelType& p, const polyPatch& pp, const label facei, @@ -264,7 +215,7 @@ void Foam::ThermoSurfaceFilm::drySplashInteraction template void Foam::ThermoSurfaceFilm::wetSplashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel, + regionModels::surfaceFilm& filmModel, parcelType& p, const polyPatch& pp, const label facei, @@ -348,7 +299,7 @@ void Foam::ThermoSurfaceFilm::wetSplashInteraction template void Foam::ThermoSurfaceFilm::splashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel, + regionModels::surfaceFilm& filmModel, const parcelType& p, const polyPatch& pp, const label facei, @@ -480,6 +431,98 @@ void Foam::ThermoSurfaceFilm::splashInteraction } +template +Foam::UPtrList& +Foam::ThermoSurfaceFilm::surfaceFilmPtrs() const +{ + const objectRegistry& db = this->owner().mesh().time(); + + if (!surfaceFilmNames_.empty() && surfaceFilms_.empty()) + { + // If there are multiple surface films and/or surface films with + // non-default names, then require the surfaceFilms entry to have been + // specified + { + HashTable surfaceFilmPtrs = + db.lookupClass(); + + const word defaultName = + regionModels::surfaceFilm::typeName + "Properties"; + + if + ( + ( + surfaceFilmPtrs.size() == 1 + && surfaceFilmPtrs.begin().key() != defaultName + ) + || (surfaceFilmPtrs.size() > 1) + ) + { + this->coeffDict().lookup("surfaceFilms"); + } + } + + // Cache pointers to the surface film models + surfaceFilms_.resize(surfaceFilmNames_.size()); + forAll(surfaceFilms_, filmi) + { + surfaceFilms_.set + ( + filmi, + &db.template lookupObjectRef + ( + surfaceFilmNames_[filmi] + "Properties" + ) + ); + } + } + + return surfaceFilms_; +} + + +template +void Foam::ThermoSurfaceFilm::cacheFilmFields +( + const label filmPatchi, + const label primaryPatchi, + const regionModels::surfaceFilm& filmModel +) +{ + SurfaceFilmModel::cacheFilmFields + ( + filmPatchi, + primaryPatchi, + filmModel + ); + + const regionModels::thermoSurfaceFilm& thermalFilmModel = + refCast(filmModel); + + TFilmPatch_ = thermalFilmModel.thermo().T().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, TFilmPatch_); + + CpFilmPatch_ = + thermalFilmModel.thermo().Cpv()().boundaryField()[filmPatchi]; + filmModel.toPrimary(filmPatchi, CpFilmPatch_); +} + + +template +void Foam::ThermoSurfaceFilm::setParcelProperties +( + parcelType& p, + const label filmFacei +) const +{ + SurfaceFilmModel::setParcelProperties(p, filmFacei); + + // Set parcel properties + p.T() = TFilmPatch_[filmFacei]; + p.Cp() = CpFilmPatch_[filmFacei]; +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template @@ -491,11 +534,20 @@ Foam::ThermoSurfaceFilm::ThermoSurfaceFilm : SurfaceFilmModel(dict, owner, typeName), rndGen_(owner.rndGen()), + surfaceFilmNames_ + ( + this->coeffDict().lookupOrDefault + ( + "surfaceFilms", + wordList(1, regionModels::surfaceFilm::typeName) + ) + ), + surfaceFilms_(), TFilmPatch_(0), CpFilmPatch_(0), interactionType_ ( - interactionTypeEnum(this->coeffDict().lookup("interactionType")) + interactionTypeNames_.read(this->coeffDict().lookup("interactionType")) ), deltaWet_(0.0), splashParcelType_(0), @@ -505,10 +557,10 @@ Foam::ThermoSurfaceFilm::ThermoSurfaceFilm Cf_(0.0), nParcelsSplashed_(0) { - Info<< " Applying " << interactionTypeStr(interactionType_) + Info<< " Applying " << interactionTypeNames_[interactionType_] << " interaction model" << endl; - if (interactionType_ == itSplashBai) + if (interactionType_ == interactionType::splashBai) { this->coeffDict().lookup("deltaWet") >> deltaWet_; splashParcelType_ = @@ -530,6 +582,8 @@ Foam::ThermoSurfaceFilm::ThermoSurfaceFilm : SurfaceFilmModel(sfm), rndGen_(sfm.rndGen_), + surfaceFilmNames_(sfm.surfaceFilmNames_), + surfaceFilms_(), TFilmPatch_(sfm.TFilmPatch_), CpFilmPatch_(sfm.CpFilmPatch_), interactionType_(sfm.interactionType_), @@ -560,64 +614,73 @@ bool Foam::ThermoSurfaceFilm::transferParcel bool& keepParticle ) { - // Retrieve the film model from the owner database - regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel = - const_cast - ( - this->owner().db().time().objectRegistry::template - lookupObject - - ( - "surfaceFilmProperties" - ) - ); - const label patchi = pp.index(); - if (filmModel.isRegionPatch(patchi)) + forAll(this->surfaceFilmPtrs(), filmi) { - const label facei = pp.whichFace(p.face()); + regionModels::surfaceFilm& filmModel = this->surfaceFilmPtrs()[filmi]; - switch (interactionType_) + if (filmModel.isRegionPatch(patchi)) { - case itBounce: - { - bounceInteraction(p, pp, facei, keepParticle); + const label facei = pp.whichFace(p.face()); - break; - } - case itAbsorb: + switch (interactionType_) { - const scalar m = p.nParticle()*p.mass(); - absorbInteraction(filmModel, p, pp, facei, m, keepParticle); - - break; - } - case itSplashBai: - { - bool dry = this->deltaFilmPatch_[patchi][facei] < deltaWet_; - - if (dry) + case interactionType::bounce: { - drySplashInteraction(filmModel, p, pp, facei, keepParticle); + bounceInteraction(p, pp, facei, keepParticle); + break; } - else + case interactionType::absorb: { - wetSplashInteraction(filmModel, p, pp, facei, keepParticle); + absorbInteraction + ( + filmModel, + p, + pp, + facei, + p.nParticle()*p.mass(), + keepParticle + ); + break; } + case interactionType::splashBai: + { + if (this->deltaFilmPatch_[patchi][facei] < deltaWet_) + { + drySplashInteraction + ( + filmModel, + p, + pp, + facei, + keepParticle + ); + } + else + { + wetSplashInteraction + ( + filmModel, + p, + pp, + facei, + keepParticle + ); + } + break; + } + default: + { + FatalErrorInFunction + << "Unknown interaction type enumeration" + << abort(FatalError); + } + } - break; - } - default: - { - FatalErrorInFunction - << "Unknown interaction type enumeration" - << abort(FatalError); - } + // Transfer parcel/parcel interactions complete + return true; } - - // Transfer parcel/parcel interactions complete - return true; } // Parcel not interacting with film @@ -625,51 +688,6 @@ bool Foam::ThermoSurfaceFilm::transferParcel } -template -void Foam::ThermoSurfaceFilm::cacheFilmFields -( - const label filmPatchi, - const label primaryPatchi, - const regionModels::surfaceFilmModels::surfaceFilmRegionModel& filmModel -) -{ - SurfaceFilmModel::cacheFilmFields - ( - filmPatchi, - primaryPatchi, - filmModel - ); - - const regionModels::surfaceFilmModels::thermoSingleLayer& thermalFilmModel = - refCast - ( - filmModel - ); - - TFilmPatch_ = thermalFilmModel.thermo().T().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, TFilmPatch_); - - CpFilmPatch_ = - thermalFilmModel.thermo().Cpv()().boundaryField()[filmPatchi]; - filmModel.toPrimary(filmPatchi, CpFilmPatch_); -} - - -template -void Foam::ThermoSurfaceFilm::setParcelProperties -( - parcelType& p, - const label filmFacei -) const -{ - SurfaceFilmModel::setParcelProperties(p, filmFacei); - - // Set parcel properties - p.T() = TFilmPatch_[filmFacei]; - p.Cp() = CpFilmPatch_[filmFacei]; -} - - template void Foam::ThermoSurfaceFilm::info(Ostream& os) { diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H index 1c3820f796..c46e2bb026 100644 --- a/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H +++ b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H @@ -56,6 +56,27 @@ SourceFiles namespace Foam { +/*---------------------------------------------------------------------------*\ + Class ThermoSurfaceFilmBase Declaration +\*---------------------------------------------------------------------------*/ + +class ThermoSurfaceFilmBase +{ +public: + + //- Interaction types + enum class interactionType + { + absorb, + bounce, + splashBai + }; + + //- Interaction type names + static const NamedEnum interactionTypeNames_; +}; + + /*---------------------------------------------------------------------------*\ Class ThermoSurfaceFilm Declaration \*---------------------------------------------------------------------------*/ @@ -63,33 +84,9 @@ namespace Foam template class ThermoSurfaceFilm : - public SurfaceFilmModel + public SurfaceFilmModel, + public ThermoSurfaceFilmBase { -public: - - // Public data - - // Interaction type enumerations - enum interactionType - { - itAbsorb, - itBounce, - itSplashBai - }; - - //- Word descriptions of interaction type names - static wordList interactionTypeNames_; - - - // Public Member Functions - - // Return interaction type enum from word - interactionType interactionTypeEnum(const word& it) const; - - // Return word from interaction type enum - word interactionTypeStr(const interactionType& it) const; - - protected: // Protected data @@ -101,6 +98,15 @@ protected: Random& rndGen_; + // Film models + + //- Names of the surface films + const wordList surfaceFilmNames_; + + //- Pointers to the surface films + mutable UPtrList surfaceFilms_; + + // Cached injector fields per film patch //- Film temperature / patch face @@ -162,7 +168,7 @@ protected: //- Absorb parcel into film void absorbInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel&, + regionModels::surfaceFilm&, const parcelType& p, const polyPatch& pp, const label facei, @@ -182,7 +188,7 @@ protected: //- Parcel interaction with dry surface void drySplashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel&, + regionModels::surfaceFilm&, const parcelType& p, const polyPatch& pp, const label facei, @@ -192,7 +198,7 @@ protected: //- Parcel interaction with wetted surface void wetSplashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel&, + regionModels::surfaceFilm&, parcelType& p, const polyPatch& pp, const label facei, @@ -202,7 +208,7 @@ protected: //- Bai parcel splash interaction model void splashInteraction ( - regionModels::surfaceFilmModels::surfaceFilmRegionModel&, + regionModels::surfaceFilm&, const parcelType& p, const polyPatch& pp, const label facei, @@ -214,23 +220,23 @@ protected: ); - // Injection from sheet (ejection) helper functions + //- Return pointers to the films + virtual UPtrList& surfaceFilmPtrs() const; - //- Cache the film fields in preparation for injection - virtual void cacheFilmFields - ( - const label filmPatchi, - const label primaryPatchi, - const regionModels::surfaceFilmModels::surfaceFilmRegionModel& - filmModel - ); + //- Cache the film fields in preparation for injection + virtual void cacheFilmFields + ( + const label filmPatchi, + const label primaryPatchi, + const regionModels::surfaceFilm& filmModel + ); - //- Set the individual parcel properties - virtual void setParcelProperties - ( - parcelType& p, - const label filmFacei - ) const; + //- Set the individual parcel properties + virtual void setParcelProperties + ( + parcelType& p, + const label filmFacei + ) const; public: diff --git a/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilmBase.C b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilmBase.C new file mode 100644 index 0000000000..e503357e8e --- /dev/null +++ b/src/lagrangian/parcel/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilmBase.C @@ -0,0 +1,48 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2022 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "ThermoSurfaceFilm.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + template<> + const char* NamedEnum + < + ThermoSurfaceFilmBase::interactionType, + 3 + >::names[] = {"absorb", "bounce", "splashBai"}; +} + + +const Foam::NamedEnum +< + Foam::ThermoSurfaceFilmBase::interactionType, + 3 +> Foam::ThermoSurfaceFilmBase::interactionTypeNames_; + + +// ************************************************************************* // diff --git a/src/regionModels/regionModel/Make/files b/src/regionModels/regionModel/Make/files index bc96ee0113..c0dc3c8404 100644 --- a/src/regionModels/regionModel/Make/files +++ b/src/regionModels/regionModel/Make/files @@ -1,4 +1,4 @@ regionModel/regionModel.C -singleLayerRegion/singleLayerRegion.C +singleLayerRegionModel/singleLayerRegionModel.C LIB = $(FOAM_LIBBIN)/libregionModels diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.C similarity index 88% rename from src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C rename to src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.C index b32368c1f9..0e5b7c6fd3 100644 --- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.C +++ b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.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 @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "singleLayerRegion.H" +#include "singleLayerRegionModel.H" #include "fvMesh.H" #include "surfaceFields.H" #include "Time.H" @@ -35,14 +35,14 @@ namespace Foam { namespace regionModels { - defineTypeNameAndDebug(singleLayerRegion, 0); + defineTypeNameAndDebug(singleLayerRegionModel, 0); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::regionModels::singleLayerRegion::singleLayerRegion +Foam::regionModels::singleLayerRegionModel::singleLayerRegionModel ( const fvMesh& mesh, const word& regionType, @@ -143,33 +143,35 @@ Foam::regionModels::singleLayerRegion::singleLayerRegion // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::regionModels::singleLayerRegion::~singleLayerRegion() +Foam::regionModels::singleLayerRegionModel::~singleLayerRegionModel() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -const Foam::volVectorField& Foam::regionModels::singleLayerRegion::nHat() const +const Foam::volVectorField& +Foam::regionModels::singleLayerRegionModel::nHat() const { return nHat_; } const Foam::volScalarField::Internal& -Foam::regionModels::singleLayerRegion::magSf() const +Foam::regionModels::singleLayerRegionModel::magSf() const { return magSf_; } -const Foam::volScalarField& Foam::regionModels::singleLayerRegion::VbyA() const +const Foam::volScalarField& +Foam::regionModels::singleLayerRegionModel::VbyA() const { return VbyA_; } const Foam::labelList& -Foam::regionModels::singleLayerRegion::passivePatchIDs() const +Foam::regionModels::singleLayerRegionModel::passivePatchIDs() const { return passivePatchIDs_; } diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H similarity index 88% rename from src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H rename to src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H index 7ec9035c9b..e7d02eaf2f 100644 --- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegion.H +++ b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModel.H @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::singleLayerRegion + Foam::regionModels::singleLayerRegionModel Description Base class for single layer region models SourceFiles - singleLayerRegion.C + singleLayerRegionModel.C \*---------------------------------------------------------------------------*/ -#ifndef singleLayerRegion_H -#define singleLayerRegion_H +#ifndef singleLayerRegionModel_H +#define singleLayerRegionModel_H #include "regionModel.H" #include "volFields.H" @@ -46,10 +46,10 @@ namespace regionModels { /*---------------------------------------------------------------------------*\ - Class singleLayerRegion Declaration + Class singleLayerRegionModel Declaration \*---------------------------------------------------------------------------*/ -class singleLayerRegion +class singleLayerRegionModel : public regionModel { @@ -82,7 +82,7 @@ public: // Constructors //- Construct from mesh, region type and name - singleLayerRegion + singleLayerRegionModel ( const fvMesh& mesh, const word& regionType, @@ -91,11 +91,11 @@ public: ); //- Disallow default bitwise copy construction - singleLayerRegion(const singleLayerRegion&) = delete; + singleLayerRegionModel(const singleLayerRegionModel&) = delete; //- Destructor - virtual ~singleLayerRegion(); + virtual ~singleLayerRegionModel(); // Member Functions @@ -133,7 +133,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const singleLayerRegion&) = delete; + void operator=(const singleLayerRegionModel&) = delete; }; @@ -145,7 +145,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "singleLayerRegionTemplates.C" + #include "singleLayerRegionModelTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C similarity index 92% rename from src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C rename to src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C index d99f9f41e4..d942fff7ae 100644 --- a/src/regionModels/regionModel/singleLayerRegion/singleLayerRegionTemplates.C +++ b/src/regionModels/regionModel/singleLayerRegionModel/singleLayerRegionModelTemplates.C @@ -23,15 +23,15 @@ License \*---------------------------------------------------------------------------*/ -#include "singleLayerRegion.H" +#include "singleLayerRegionModel.H" #include "zeroGradientFvPatchFields.H" #include "mappedValueAndPatchInternalValueFvPatchFields.H" // * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // template -Foam::wordList -Foam::regionModels::singleLayerRegion::mappedFieldAndInternalPatchTypes() const +Foam::wordList Foam::regionModels::singleLayerRegionModel:: +mappedFieldAndInternalPatchTypes() const { wordList bTypes(regionMesh().boundaryMesh().size()); diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files index 40fb0fcda9..1a174167e5 100644 --- a/src/regionModels/surfaceFilmModels/Make/files +++ b/src/regionModels/surfaceFilmModels/Make/files @@ -1,46 +1,45 @@ # Surface film models -surfaceFilmRegionModel/surfaceFilmRegionModel.C -kinematicSingleLayer/kinematicSingleLayer.C -thermoSingleLayer/thermoSingleLayer.C - +surfaceFilm/surfaceFilm.C +momentumSurfaceFilm/momentumSurfaceFilm.C +thermoSurfaceFilm/thermoSurfaceFilm.C # Sub-models submodels/filmSubModelBase.C -KINEMATICMODELS=submodels/kinematic -$(KINEMATICMODELS)/force/force/force.C -$(KINEMATICMODELS)/force/force/forceNew.C -$(KINEMATICMODELS)/force/forceList/forceList.C -$(KINEMATICMODELS)/force/contactAngleForces/contactAngleForce/contactAngleForce.C -$(KINEMATICMODELS)/force/contactAngleForces/distribution/distributionContactAngleForce.C -$(KINEMATICMODELS)/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C -$(KINEMATICMODELS)/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C -$(KINEMATICMODELS)/force/thermocapillaryForce/thermocapillaryForce.C +MOMENTUMMODELS=submodels/momentum +$(MOMENTUMMODELS)/force/force/force.C +$(MOMENTUMMODELS)/force/force/forceNew.C +$(MOMENTUMMODELS)/force/forceList/forceList.C +$(MOMENTUMMODELS)/force/contactAngleForces/contactAngleForce/contactAngleForce.C +$(MOMENTUMMODELS)/force/contactAngleForces/distribution/distributionContactAngleForce.C +$(MOMENTUMMODELS)/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C +$(MOMENTUMMODELS)/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C +$(MOMENTUMMODELS)/force/thermocapillaryForce/thermocapillaryForce.C -$(KINEMATICMODELS)/ejectionModel/ejectionModel/ejectionModel.C -$(KINEMATICMODELS)/ejectionModel/ejectionModel/ejectionModelNew.C -$(KINEMATICMODELS)/ejectionModel/ejectionModelList/ejectionModelList.C -$(KINEMATICMODELS)/ejectionModel/drippingEjection/drippingEjection.C -$(KINEMATICMODELS)/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C -$(KINEMATICMODELS)/ejectionModel/patchEjection/patchEjection.C -$(KINEMATICMODELS)/ejectionModel/curvatureSeparation/curvatureSeparation.C +$(MOMENTUMMODELS)/ejectionModel/ejectionModel/ejectionModel.C +$(MOMENTUMMODELS)/ejectionModel/ejectionModel/ejectionModelNew.C +$(MOMENTUMMODELS)/ejectionModel/ejectionModelList/ejectionModelList.C +$(MOMENTUMMODELS)/ejectionModel/drippingEjection/drippingEjection.C +$(MOMENTUMMODELS)/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C +$(MOMENTUMMODELS)/ejectionModel/patchEjection/patchEjection.C +$(MOMENTUMMODELS)/ejectionModel/curvatureSeparation/curvatureSeparation.C -$(KINEMATICMODELS)/transferModels/transferModel/transferModel.C -$(KINEMATICMODELS)/transferModels/transferModel/transferModelNew.C -$(KINEMATICMODELS)/transferModels/transferModelList/transferModelList.C +$(MOMENTUMMODELS)/transferModels/transferModel/transferModel.C +$(MOMENTUMMODELS)/transferModels/transferModel/transferModelNew.C +$(MOMENTUMMODELS)/transferModels/transferModelList/transferModelList.C -$(KINEMATICMODELS)/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C -$(KINEMATICMODELS)/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C -$(KINEMATICMODELS)/filmMomentumTransportModel/laminar/laminar.C +$(MOMENTUMMODELS)/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C +$(MOMENTUMMODELS)/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C +$(MOMENTUMMODELS)/filmMomentumTransportModel/laminar/laminar.C -$(KINEMATICMODELS)/filmViscosityModel/filmViscosityModel/filmViscosityModel.C -$(KINEMATICMODELS)/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C -$(KINEMATICMODELS)/filmViscosityModel/constant/constantViscosity.C -$(KINEMATICMODELS)/filmViscosityModel/Newtonian/NewtonianViscosity.C -$(KINEMATICMODELS)/filmViscosityModel/thixotropic/thixotropicViscosity.C -$(KINEMATICMODELS)/filmViscosityModel/Arrhenius/ArrheniusViscosity.C -$(KINEMATICMODELS)/filmViscosityModel/function1/function1Viscosity.C -$(KINEMATICMODELS)/filmViscosityModel/waxSolvent/waxSolventViscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/filmViscosityModel/filmViscosityModel.C +$(MOMENTUMMODELS)/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C +$(MOMENTUMMODELS)/filmViscosityModel/constant/constantViscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/Newtonian/NewtonianViscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/thixotropic/thixotropicViscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/Arrhenius/ArrheniusViscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/function1/function1Viscosity.C +$(MOMENTUMMODELS)/filmViscosityModel/waxSolvent/waxSolventViscosity.C THERMOMODELS=submodels/thermo $(THERMOMODELS)/phaseChangeModel/phaseChangeModel/phaseChangeModel.C @@ -63,7 +62,6 @@ $(THERMOMODELS)/filmRadiationModel/constantRadiation/constantRadiation.C $(THERMOMODELS)/filmRadiationModel/primaryRadiation/primaryRadiation.C $(THERMOMODELS)/filmRadiationModel/standardRadiation/standardRadiation.C - # Boundary conditions PATCHFIELDS=derivedFvPatchFields $(PATCHFIELDS)/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C @@ -72,6 +70,7 @@ $(PATCHFIELDS)/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocity $(PATCHFIELDS)/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C $(PATCHFIELDS)/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C -fvModels/surfaceFilm/surfaceFilm.C +# fvModel +fvModels/surfaceFilms/surfaceFilms.C LIB = $(FOAM_LIBBIN)/libsurfaceFilmModels diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C index 38489dd648..d106205bbe 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.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/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H index 63bfc2a7b9..bc121d1f00 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.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/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C index 9faaa2c06d..c7cc7259db 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "inclinedFilmNusseltHeightFvPatchScalarField.H" #include "volFields.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -38,6 +38,7 @@ inclinedFilmNusseltHeightFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), + filmName_(regionModels::surfaceFilm::typeName), GammaMean_(), a_(), omega_() @@ -53,6 +54,14 @@ inclinedFilmNusseltHeightFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), + filmName_ + ( + dict.lookupOrDefault + ( + "film", + regionModels::surfaceFilm::typeName + ) + ), GammaMean_(Function1::New("GammaMean", dict)), a_(Function1::New("a", dict)), omega_(Function1::New("omega", dict)) @@ -69,6 +78,7 @@ inclinedFilmNusseltHeightFvPatchScalarField ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), + filmName_(ptf.filmName_), GammaMean_(ptf.GammaMean_().clone().ptr()), a_(ptf.a_().clone().ptr()), omega_(ptf.omega_().clone().ptr()) @@ -83,6 +93,7 @@ inclinedFilmNusseltHeightFvPatchScalarField ) : fixedValueFvPatchScalarField(wmfrhpsf, iF), + filmName_(wmfrhpsf.filmName_), GammaMean_(wmfrhpsf.GammaMean_().clone().ptr()), a_(wmfrhpsf.a_().clone().ptr()), omega_(wmfrhpsf.omega_().clone().ptr()) @@ -102,18 +113,12 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs() // retrieve the film region from the database - const regionModels::regionModel& region = - db().time().lookupObject + const regionModels::momentumSurfaceFilm& film = + db().time().lookupObject ( - "surfaceFilmProperties" + filmName_ + "Properties" ); - const regionModels::surfaceFilmModels::kinematicSingleLayer& film = - dynamic_cast - < - const regionModels::surfaceFilmModels::kinematicSingleLayer& - >(region); - // calculate the vector tangential to the patch // note: normal pointing into the domain @@ -181,6 +186,13 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::write ) const { fixedValueFvPatchScalarField::write(os); + writeEntryIfDifferent + ( + os, + "film", + regionModels::surfaceFilm::typeName, + filmName_ + ); writeEntry(os, GammaMean_()); writeEntry(os, a_()); writeEntry(os, omega_()); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H index 1a3088ad67..446013e879 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,6 +56,9 @@ class inclinedFilmNusseltHeightFvPatchScalarField { // Private Data + //- The name of the film + const word filmName_; + //- Mean mass flow rate per unit length [kg/s/m] autoPtr> GammaMean_; diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C index 7ee5285681..7cecd2a76c 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "inclinedFilmNusseltInletVelocityFvPatchVectorField.H" #include "volFields.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -38,6 +38,7 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField ) : fixedValueFvPatchVectorField(p, iF), + filmName_(regionModels::surfaceFilm::typeName), GammaMean_(), a_(), omega_() @@ -53,6 +54,14 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField ) : fixedValueFvPatchVectorField(p, iF, dict), + filmName_ + ( + dict.lookupOrDefault + ( + "film", + regionModels::surfaceFilm::typeName + ) + ), GammaMean_(Function1::New("GammaMean", dict)), a_(Function1::New("a", dict)), omega_(Function1::New("omega", dict)) @@ -69,6 +78,7 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField ) : fixedValueFvPatchVectorField(ptf, p, iF, mapper), + filmName_(ptf.filmName_), GammaMean_(ptf.GammaMean_().clone().ptr()), a_(ptf.a_().clone().ptr()), omega_(ptf.omega_().clone().ptr()) @@ -83,6 +93,7 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField ) : fixedValueFvPatchVectorField(fmfrpvf, iF), + filmName_(fmfrpvf.filmName_), GammaMean_(fmfrpvf.GammaMean_().clone().ptr()), a_(fmfrpvf.a_().clone().ptr()), omega_(fmfrpvf.omega_().clone().ptr()) @@ -102,18 +113,12 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs() // Retrieve the film region from the database - const regionModels::regionModel& region = - db().time().lookupObject + const regionModels::momentumSurfaceFilm& film = + db().time().lookupObject ( - "surfaceFilmProperties" + filmName_ + "Properties" ); - const regionModels::surfaceFilmModels::kinematicSingleLayer& film = - dynamic_cast - < - const regionModels::surfaceFilmModels::kinematicSingleLayer& - >(region); - // Calculate the vector tangential to the patch // note: normal pointing into the domain const vectorField n(-patch().nf()); @@ -177,6 +182,13 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::write ) const { fvPatchVectorField::write(os); + writeEntryIfDifferent + ( + os, + "film", + regionModels::surfaceFilm::typeName, + filmName_ + ); writeEntry(os, GammaMean_()); writeEntry(os, a_()); writeEntry(os, omega_()); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H index d6f0b817eb..a207a2288e 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,6 +56,9 @@ class inclinedFilmNusseltInletVelocityFvPatchVectorField { // Private Data + //- The name of the film + const word filmName_; + //- Mean mass flow rate per unit length [kg/s/m] autoPtr> GammaMean_; diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C index 411be3687e..19a3f38213 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "alphatFilmWallFunctionFvPatchScalarField.H" #include "thermophysicalTransportModel.H" -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -51,6 +51,7 @@ alphatFilmWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), + filmName_(regionModels::surfaceFilm::typeName), B_(5.5), yPlusCrit_(11.05), Cmu_(0.09), @@ -68,6 +69,14 @@ alphatFilmWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), + filmName_ + ( + dict.lookupOrDefault + ( + "film", + regionModels::surfaceFilm::typeName + ) + ), B_(dict.lookupOrDefault("B", 5.5)), yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)), Cmu_(dict.lookupOrDefault("Cmu", 0.09)), @@ -86,6 +95,7 @@ alphatFilmWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(ptf, p, iF, mapper), + filmName_(ptf.filmName_), B_(ptf.B_), yPlusCrit_(ptf.yPlusCrit_), Cmu_(ptf.Cmu_), @@ -102,6 +112,7 @@ alphatFilmWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(fwfpsf, iF), + filmName_(fwfpsf.filmName_), B_(fwfpsf.B_), yPlusCrit_(fwfpsf.yPlusCrit_), Cmu_(fwfpsf.Cmu_), @@ -119,7 +130,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() return; } - typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType; + typedef regionModels::surfaceFilm modelType; // Since we're inside initEvaluate/evaluate there might be processor // comms underway. Change the tag we use. @@ -127,7 +138,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() UPstream::msgType() = oldTag+1; bool foundFilm = - db().time().foundObject("surfaceFilmProperties"); + db().time().foundObject(filmName_ + "Properties"); if (!foundFilm) { @@ -139,7 +150,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() // Retrieve phase change mass from surface film model const modelType& filmModel = - db().time().lookupObject("surfaceFilmProperties"); + db().time().lookupObject(filmName_ + "Properties"); const label filmPatchi = filmModel.regionPatchID(patchi); @@ -223,6 +234,13 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() void alphatFilmWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); + writeEntryIfDifferent + ( + os, + "film", + regionModels::surfaceFilm::typeName, + filmName_ + ); writeEntry(os, "B", B_); writeEntry(os, "yPlusCrit", yPlusCrit_); writeEntry(os, "Cmu", Cmu_); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H index 6cdb07ceb0..56dd90849b 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.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 @@ -88,6 +88,9 @@ protected: // Protected data + //- The name of the film + const word filmName_; + //- B Coefficient (default = 5.5) scalar B_; diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 3e5671bf44..c1b61b675d 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C @@ -28,7 +28,7 @@ License #include "volFields.H" #include "compressibleMomentumTransportModels.H" #include "addToRunTimeSelectionTable.H" -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" #include "mappedWallPolyPatch.H" #include "distributionMap.H" @@ -51,10 +51,10 @@ tmp nutkFilmWallFunctionFvPatchScalarField::calcUTau tmp tuTau(new scalarField(patch().size(), 0.0)); scalarField& uTau = tuTau.ref(); - typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType; + typedef regionModels::surfaceFilm modelType; bool foundFilm = - db().time().foundObject("surfaceFilmProperties"); + db().time().foundObject(filmName_+ "Properties"); if (!foundFilm) { @@ -66,7 +66,7 @@ tmp nutkFilmWallFunctionFvPatchScalarField::calcUTau // Retrieve phase change mass from surface film model const modelType& filmModel = - db().time().lookupObject("surfaceFilmProperties"); + db().time().lookupObject(filmName_+ "Properties"); const label filmPatchi = filmModel.regionPatchID(patchi); @@ -160,6 +160,7 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ) : nutkWallFunctionFvPatchScalarField(p, iF), + filmName_(regionModels::surfaceFilm::typeName), B_(5.5), yPlusCrit_(11.05) {} @@ -173,6 +174,14 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ) : nutkWallFunctionFvPatchScalarField(p, iF, dict), + filmName_ + ( + dict.lookupOrDefault + ( + "film", + regionModels::surfaceFilm::typeName + ) + ), B_(dict.lookupOrDefault("B", 5.5)), yPlusCrit_(dict.lookupOrDefault("yPlusCrit", 11.05)) {} @@ -187,8 +196,9 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ) : nutkWallFunctionFvPatchScalarField(ptf, p, iF, mapper), - B_(5.5), - yPlusCrit_(11.05) + filmName_(ptf.filmName_), + B_(ptf.B_), + yPlusCrit_(ptf.yPlusCrit_) {} @@ -199,6 +209,7 @@ nutkFilmWallFunctionFvPatchScalarField::nutkFilmWallFunctionFvPatchScalarField ) : nutkWallFunctionFvPatchScalarField(wfpsf, iF), + filmName_(wfpsf.filmName_), B_(wfpsf.B_), yPlusCrit_(wfpsf.yPlusCrit_) {} @@ -233,6 +244,13 @@ void nutkFilmWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField::write(os); writeLocalEntries(os); + writeEntryIfDifferent + ( + os, + "film", + regionModels::surfaceFilm::typeName, + filmName_ + ); writeEntry(os, "B", B_); writeEntry(os, "yPlusCrit", yPlusCrit_); writeEntry(os, "value", *this); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H index 43cc2c4526..eb7e764fcf 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.H +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.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 @@ -73,6 +73,9 @@ protected: // Protected data + //- The name of the film + const word filmName_; + //- B Coefficient (default = 5.5) scalar B_; diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C deleted file mode 100644 index 565e35b9c4..0000000000 --- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.C +++ /dev/null @@ -1,239 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "surfaceFilm.H" -#include "uniformDimensionedFields.H" -#include "basicSpecieMixture.H" -#include "fvMatrix.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // - -namespace Foam -{ - namespace fv - { - defineTypeNameAndDebug(surfaceFilm, 0); - - addToRunTimeSelectionTable - ( - fvModel, - surfaceFilm, - dictionary - ); - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::fv::surfaceFilm::surfaceFilm -( - const word& sourceName, - const word& modelType, - const dictionary& dict, - const fvMesh& mesh -) -: - fvModel(sourceName, modelType, dict, mesh), - surfaceFilm_ - ( - regionModels::surfaceFilmModels::thermoSingleLayer::typeName, - mesh, - mesh.lookupObject("g"), - "surfaceFilm" - ), - fieldNames_ - ( - { - mesh.foundObject - ( - IOobject::groupName("rho", surfaceFilm_.phaseName()) - ) - ? IOobject::groupName("rho", surfaceFilm_.phaseName()) - : surfaceFilm_.primaryThermo().rho()().name(), - surfaceFilm_.UPrimary().name(), - surfaceFilm_.primaryThermo().he().name() - } - ), - curTimeIndex_(-1) -{ - if (isA(surfaceFilm_.primaryThermo())) - { - const basicSpecieMixture& composition = - refCast(surfaceFilm_.primaryThermo()); - - const PtrList& Y = composition.Y(); - - forAll(Y, i) - { - if (composition.solve(i)) - { - fieldNames_.append(Y[i].name()); - } - } - } -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::wordList Foam::fv::surfaceFilm::addSupFields() const -{ - return fieldNames_; -} - - -Foam::scalar Foam::fv::surfaceFilm::maxDeltaT() const -{ - return surfaceFilm_.maxDeltaT(); -} - - -void Foam::fv::surfaceFilm::correct() -{ - if (curTimeIndex_ == mesh().time().timeIndex()) - { - return; - } - - surfaceFilm_.evolve(); - - curTimeIndex_ = mesh().time().timeIndex(); -} - - -void Foam::fv::surfaceFilm::addSup -( - fvMatrix& eqn, - const word& fieldName -) const -{ - if (debug) - { - Info<< type() << ": applying source to " << eqn.psi().name() << endl; - } - - if (fieldName == fieldNames_[0]) - { - eqn += surfaceFilm_.Srho(); - } - else - { - FatalErrorInFunction - << "Support for field " << fieldName << " is not implemented" - << exit(FatalError); - } -} - - -void Foam::fv::surfaceFilm::addSup -( - const volScalarField& rho, - fvMatrix& eqn, - const word& fieldName -) const -{ - if (debug) - { - Info<< type() << ": applying source to " << eqn.psi().name() << endl; - } - - if (fieldName == fieldNames_[0]) - { - eqn += surfaceFilm_.Srho(); - } - else if (fieldName == fieldNames_[2]) - { - eqn += surfaceFilm_.Sh(); - } - else if - ( - isA(surfaceFilm_.primaryThermo()) - && refCast(surfaceFilm_.primaryThermo()).contains - ( - eqn.psi().name() - ) - ) - { - eqn += surfaceFilm_.SYi - ( - refCast(surfaceFilm_.primaryThermo()) - .index(eqn.psi()) - ); - } - else - { - FatalErrorInFunction - << "Support for field " << fieldName << " is not implemented" - << exit(FatalError); - } -} - - -void Foam::fv::surfaceFilm::addSup -( - const volScalarField& rho, - fvMatrix& eqn, - const word& fieldName -) const -{ - if (debug) - { - Info<< type() << ": applying source to " << eqn.psi().name() << endl; - } - - if (fieldName == fieldNames_[1]) - { - eqn += surfaceFilm_.SU(); - } - else - { - FatalErrorInFunction - << "Support for field " << fieldName << " is not implemented" - << exit(FatalError); - } -} - - -void Foam::fv::surfaceFilm::topoChange(const polyTopoChangeMap&) -{} - - -void Foam::fv::surfaceFilm::mapMesh(const polyMeshMap& map) -{} - - -void Foam::fv::surfaceFilm::distribute(const polyDistributionMap&) -{} - - -bool Foam::fv::surfaceFilm::movePoints() -{ - return true; -} - - -// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C new file mode 100644 index 0000000000..084bb0b4e1 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.C @@ -0,0 +1,309 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "surfaceFilms.H" +#include "uniformDimensionedFields.H" +#include "basicSpecieMixture.H" +#include "fvMatrix.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + +namespace Foam +{ + namespace fv + { + defineTypeNameAndDebug(surfaceFilms, 0); + + addToRunTimeSelectionTable(fvModel, surfaceFilms, dictionary); + + // !!! Backwards compatible lookup name + addNamedToRunTimeSelectionTable + ( + fvModel, + surfaceFilms, + dictionary, + surfaceFilm + ); + } +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::fv::surfaceFilms::surfaceFilms +( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh +) +: + fvModel(sourceName, modelType, dict, mesh), + surfaceFilms_(), + surfaceFilmPrimaryRhoNames_(), + fieldNames_(), + curTimeIndex_(-1) +{ + const wordList surfaceFilmNames = + dict.lookupOrDefault + ( + "surfaceFilms", + wordList(1, regionModels::surfaceFilm::typeName) + ); + + surfaceFilms_.resize(surfaceFilmNames.size()); + surfaceFilmPrimaryRhoNames_.resize(surfaceFilmNames.size()); + + wordHashSet fieldNamesSet; + + forAll(surfaceFilmNames, i) + { + surfaceFilms_.set + ( + i, + new regionModels::thermoSurfaceFilm + ( + regionModels::thermoSurfaceFilm::typeName, + mesh, + mesh.lookupObject("g"), + surfaceFilmNames[i] + ) + ); + + const basicThermo& primaryThermo = surfaceFilms_[i].primaryThermo(); + + const word transportRhoName = + IOobject::groupName("rho", surfaceFilms_[i].phaseName()); + + surfaceFilmPrimaryRhoNames_[i] = + mesh.foundObject(transportRhoName) + ? transportRhoName + : primaryThermo.rho()().name(); + + fieldNamesSet.insert(surfaceFilmPrimaryRhoNames_[i]); + fieldNamesSet.insert(surfaceFilms_[i].UPrimary().name()); + fieldNamesSet.insert(primaryThermo.he().name()); + + if (isA(primaryThermo)) + { + const basicSpecieMixture& mixture = + refCast(primaryThermo); + + forAll(mixture.Y(), Yi) + { + if (mixture.solve(Yi)) + { + fieldNamesSet.insert(mixture.Y()[Yi].name()); + } + } + } + } + + fieldNames_ = fieldNamesSet.toc(); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::wordList Foam::fv::surfaceFilms::addSupFields() const +{ + return fieldNames_; +} + + +Foam::scalar Foam::fv::surfaceFilms::maxDeltaT() const +{ + scalar result = vGreat; + forAll(surfaceFilms_, i) + { + result = min(result, surfaceFilms_[i].maxDeltaT()); + } + return result; +} + + +void Foam::fv::surfaceFilms::correct() +{ + if (curTimeIndex_ == mesh().time().timeIndex()) + { + return; + } + + forAll(surfaceFilms_, i) + { + surfaceFilms_[i].evolve(); + } + + curTimeIndex_ = mesh().time().timeIndex(); +} + + +void Foam::fv::surfaceFilms::addSup +( + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + forAll(surfaceFilms_, i) + { + if (eqn.psi().group() == surfaceFilms_[i].phaseName()) + { + if (fieldName == surfaceFilmPrimaryRhoNames_[i]) + { + eqn += surfaceFilms_[i].Srho(); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName + << " is not implemented" << exit(FatalError); + } + } + } +} + + +void Foam::fv::surfaceFilms::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + forAll(surfaceFilms_, i) + { + const basicThermo& primaryThermo = surfaceFilms_[i].primaryThermo(); + + if (eqn.psi().group() == surfaceFilms_[i].phaseName()) + { + if (fieldName == surfaceFilmPrimaryRhoNames_[i]) + { + forAll(surfaceFilms_, i) + { + eqn += surfaceFilms_[i].Srho(); + } + } + else if (fieldName == primaryThermo.he().name()) + { + forAll(surfaceFilms_, i) + { + eqn += surfaceFilms_[i].Sh(); + } + } + else if + ( + isA(primaryThermo) + && refCast(primaryThermo).contains + ( + eqn.psi().name() + ) + ) + { + eqn += surfaceFilms_[i].SYi + ( + refCast(primaryThermo).index + ( + eqn.psi() + ) + ); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName + << " is not implemented" << exit(FatalError); + } + } + } +} + + +void Foam::fv::surfaceFilms::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + forAll(surfaceFilms_, i) + { + if (eqn.psi().group() == surfaceFilms_[i].phaseName()) + { + if (fieldName == surfaceFilms_[i].UPrimary().name()) + { + eqn += surfaceFilms_[i].SU(); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName + << " is not implemented" << exit(FatalError); + } + } + } +} + + +void Foam::fv::surfaceFilms::topoChange(const polyTopoChangeMap&) +{ + NotImplemented; +} + + +void Foam::fv::surfaceFilms::mapMesh(const polyMeshMap& map) +{ + NotImplemented; +} + + +void Foam::fv::surfaceFilms::distribute(const polyDistributionMap&) +{ + NotImplemented; +} + + +bool Foam::fv::surfaceFilms::movePoints() +{ + return true; +} + + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H similarity index 84% rename from src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H rename to src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H index a10c0afa80..5ed9e8b097 100644 --- a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm/surfaceFilm.H +++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilms/surfaceFilms.H @@ -22,30 +22,31 @@ License along with OpenFOAM. If not, see . Class - Foam::fv::surfaceFilm + Foam::fv::surfaceFilms Description - surfaceFilm fvModel + Surface films fvModel Usage Example usage: \verbatim - surfaceFilm + surfaceFilms { - type surfaceFilm; + type surfaceFilms; + libs ("libsurfaceFilmModels.so"); } \endverbatim SourceFiles - surfaceFilm.C + surfaceFilms.C \*---------------------------------------------------------------------------*/ -#ifndef surfaceFilm_H -#define surfaceFilm_H +#ifndef surfaceFilms_H +#define surfaceFilms_H #include "fvModel.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,17 +56,21 @@ namespace fv { /*---------------------------------------------------------------------------*\ - Class surfaceFilm Declaration + Class surfaceFilms Declaration \*---------------------------------------------------------------------------*/ -class surfaceFilm +class surfaceFilms : public fvModel { // Private Data - //- The surface film model - regionModels::surfaceFilmModels::thermoSingleLayer surfaceFilm_; + //- The surface film models + PtrList surfaceFilms_; + + //- For each surface film model, the corresponding density name in the + // primary region + wordList surfaceFilmPrimaryRhoNames_; //- List of fields for which the fvModel adds source term // to the transport equation @@ -78,13 +83,13 @@ class surfaceFilm public: //- Runtime type information - TypeName("surfaceFilm"); + TypeName("surfaceFilms"); // Constructors //- Construct from explicit source name and mesh - surfaceFilm + surfaceFilms ( const word& sourceName, const word& modelType, @@ -93,9 +98,9 @@ public: ); //- Disallow default bitwise copy construction - surfaceFilm + surfaceFilms ( - const surfaceFilm& + const surfaceFilms& ) = delete; @@ -113,7 +118,7 @@ public: // Correct - //- Solve the Lagrangian surfaceFilm and update the sources + //- Solve the Lagrangian surfaceFilms and update the sources virtual void correct(); @@ -161,7 +166,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const surfaceFilm&) = delete; + void operator=(const surfaceFilms&) = delete; }; diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H deleted file mode 100644 index 2d7ad20142..0000000000 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H +++ /dev/null @@ -1,234 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "surfaceInterpolate.H" -#include "fvcSurfaceIntegrate.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace regionModels -{ -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -inline const dimensionedScalar& kinematicSingleLayer::deltaSmall() const -{ - return deltaSmall_; -} - - -inline const word& kinematicSingleLayer::phaseName() const -{ - return phaseName_; -} - - -inline const volScalarField& kinematicSingleLayer::rho() const -{ - return thermo_->rho(); -} - - -inline const volScalarField& kinematicSingleLayer::mu() const -{ - return mu_; -} - - -inline const volScalarField& kinematicSingleLayer::delta() const -{ - return delta_; -} - - -inline const volScalarField& kinematicSingleLayer::alpha() const -{ - return alpha_; -} - - -inline const volVectorField& kinematicSingleLayer::U() const -{ - return U_; -} - - -inline tmp kinematicSingleLayer::Us() const -{ - return momentumTransport_->Us(); -} - - -inline const surfaceScalarField& kinematicSingleLayer::phi() const -{ - return phi_; -} - - -inline const surfaceScalarField& kinematicSingleLayer::phiU() const -{ - return phiU_; -} - - -inline const volScalarField::Internal& -kinematicSingleLayer::continuityErr() const -{ - return continuityErr_; -} - - -inline const volScalarField& kinematicSingleLayer::coverage() const -{ - return coverage_; -} - - -inline volVectorField& kinematicSingleLayer::USpPrimary() -{ - return USpPrimary_; -} - - -inline volScalarField& kinematicSingleLayer::pSpPrimary() -{ - return pSpPrimary_; -} - - -inline volScalarField& kinematicSingleLayer::rhoSpPrimary() -{ - return rhoSpPrimary_; -} - - -inline volVectorField::Internal& kinematicSingleLayer::USp() -{ - return USp_; -} - - -inline volScalarField::Internal& kinematicSingleLayer::pSp() -{ - return pSp_; -} - - -inline volScalarField::Internal& kinematicSingleLayer::rhoSp() -{ - return rhoSp_; -} - - -inline const volVectorField::Internal& kinematicSingleLayer::USp() const -{ - return USp_; -} - - -inline const volScalarField::Internal& kinematicSingleLayer::pSp() const -{ - return pSp_; -} - - -inline const volScalarField::Internal& kinematicSingleLayer::rhoSp() const -{ - return rhoSp_; -} - - -inline const volVectorField& kinematicSingleLayer::UPrimary() const -{ - return UPrimary_; -} - - -inline const volScalarField& kinematicSingleLayer::pPrimary() const -{ - return thermo_->p(); -} - - -inline const volScalarField& kinematicSingleLayer::rhoPrimary() const -{ - return rhoPrimary_; -} - - -inline const volScalarField& kinematicSingleLayer::muPrimary() const -{ - return muPrimary_; -} - - -inline const rhoThermo& kinematicSingleLayer::thermo() const -{ - return thermo_(); -} - - -inline ejectionModelList& kinematicSingleLayer::ejection() -{ - return ejection_; -} - - -inline transferModelList& kinematicSingleLayer::transfer() -{ - return transfer_; -} - - -inline const momentumTransportModel& -kinematicSingleLayer::momentumTransport() const -{ - return momentumTransport_(); -} - - -inline tmp kinematicSingleLayer::mass() const -{ - return rho()()*delta_()*magSf(); -} - - -inline tmp kinematicSingleLayer::deltaMass() const -{ - return rhoSp_*magSf()*time().deltaT(); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace surfaceFilmModels -} // End namespace regionModels -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C similarity index 89% rename from src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C rename to src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C index 0263d4c6dd..2fe29634ee 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "fvcDdt.H" #include "fvcDiv.H" @@ -49,22 +49,20 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -defineTypeNameAndDebug(kinematicSingleLayer, 0); - -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - -bool kinematicSingleLayer::read() -{ - return surfaceFilmRegionModel::read(); + defineTypeNameAndDebug(momentumSurfaceFilm, 0); +} } -void kinematicSingleLayer::resetPrimaryRegionSourceTerms() +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +bool Foam::regionModels::momentumSurfaceFilm::read() +{ + return surfaceFilm::read(); +} + + +void Foam::regionModels::momentumSurfaceFilm::resetPrimaryRegionSourceTerms() { DebugInFunction << endl; @@ -74,7 +72,8 @@ void kinematicSingleLayer::resetPrimaryRegionSourceTerms() } -void kinematicSingleLayer::transferPrimaryRegionThermoFields() +void Foam::regionModels::momentumSurfaceFilm:: +transferPrimaryRegionThermoFields() { DebugInFunction << endl; @@ -87,7 +86,8 @@ void kinematicSingleLayer::transferPrimaryRegionThermoFields() } -void kinematicSingleLayer::transferPrimaryRegionSourceFields() +void Foam::regionModels::momentumSurfaceFilm:: +transferPrimaryRegionSourceFields() { DebugInFunction << endl; @@ -134,13 +134,15 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields() } -tmp kinematicSingleLayer::pc() +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::pc() { return -fvc::laplacian(sigma(), delta_); } -tmp kinematicSingleLayer::pe() +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::pe() { tmp tpSp ( @@ -165,7 +167,8 @@ tmp kinematicSingleLayer::pe() } -tmp kinematicSingleLayer::rhog() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::rhog() const { return fvc::interpolate @@ -175,7 +178,8 @@ tmp kinematicSingleLayer::rhog() const } -tmp kinematicSingleLayer::gGradRho() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::gGradRho() const { return fvc::interpolate @@ -185,13 +189,13 @@ tmp kinematicSingleLayer::gGradRho() const } -void kinematicSingleLayer::correctCoverage() +void Foam::regionModels::momentumSurfaceFilm::correctCoverage() { coverage_ == pos(delta_ - deltaSmall_); } -void kinematicSingleLayer::updateSubmodels() +void Foam::regionModels::momentumSurfaceFilm::updateSubmodels() { DebugInFunction << endl; @@ -214,7 +218,7 @@ void kinematicSingleLayer::updateSubmodels() } -void kinematicSingleLayer::predictDelta() +void Foam::regionModels::momentumSurfaceFilm::predictDelta() { DebugInFunction << endl; @@ -230,13 +234,13 @@ void kinematicSingleLayer::predictDelta() } -void kinematicSingleLayer::updateContinuityErr() +void Foam::regionModels::momentumSurfaceFilm::updateContinuityErr() { continuityErr_ = (fvc::ddt(alpha_, rho()) + fvc::div(phi_))() + rhoSp_; } -void kinematicSingleLayer::continuityCheck() +void Foam::regionModels::momentumSurfaceFilm::continuityCheck() { const dimensionedScalar totalMass = fvc::domainIntegrate(mass()); @@ -268,7 +272,8 @@ void kinematicSingleLayer::continuityCheck() } -tmp kinematicSingleLayer::Uw() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::Uw() const { tmp tUw ( @@ -297,7 +302,8 @@ tmp kinematicSingleLayer::Uw() const } -tmp kinematicSingleLayer::solveMomentum +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::solveMomentum ( const volScalarField& pc, const volScalarField& pe @@ -363,7 +369,7 @@ tmp kinematicSingleLayer::solveMomentum } -void kinematicSingleLayer::solveAlpha +void Foam::regionModels::momentumSurfaceFilm::solveAlpha ( const fvVectorMatrix& UEqn, const volScalarField& pc, @@ -469,7 +475,7 @@ void kinematicSingleLayer::solveAlpha // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -kinematicSingleLayer::kinematicSingleLayer +Foam::regionModels::momentumSurfaceFilm::momentumSurfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -478,7 +484,7 @@ kinematicSingleLayer::kinematicSingleLayer const bool readFields ) : - surfaceFilmRegionModel(modelType, mesh, g, regionType), + surfaceFilm(modelType, mesh, g, regionType), phaseName_(coeffs_.lookupOrDefault("phase", word::null)), pimple_(regionMesh()), @@ -814,7 +820,7 @@ kinematicSingleLayer::kinematicSingleLayer this->mappedFieldAndInternalPatchTypes() ), - viscosity_(viscosityModel::New(*this, coeffs(), mu_)), + viscosity_(surfaceFilmSubModels::viscosityModel::New(*this, coeffs(), mu_)), sigma_(Function1::New("sigma", coeffs())), @@ -824,7 +830,10 @@ kinematicSingleLayer::kinematicSingleLayer transfer_(*this, coeffs_), - momentumTransport_(momentumTransportModel::New(*this, coeffs_)), + momentumTransport_ + ( + surfaceFilmSubModels::momentumTransportModel::New(*this, coeffs_) + ), forces_(*this, coeffs_), @@ -860,13 +869,14 @@ kinematicSingleLayer::kinematicSingleLayer // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -kinematicSingleLayer::~kinematicSingleLayer() +Foam::regionModels::momentumSurfaceFilm::~momentumSurfaceFilm() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -tmp kinematicSingleLayer::sigma() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::sigma() const { tmp tsigma ( @@ -887,7 +897,7 @@ tmp kinematicSingleLayer::sigma() const } -void kinematicSingleLayer::addSources +void Foam::regionModels::momentumSurfaceFilm::addSources ( const label patchi, const label facei, @@ -911,11 +921,11 @@ void kinematicSingleLayer::addSources } -void kinematicSingleLayer::preEvolveRegion() +void Foam::regionModels::momentumSurfaceFilm::preEvolveRegion() { DebugInFunction << endl; - surfaceFilmRegionModel::preEvolveRegion(); + surfaceFilm::preEvolveRegion(); transferPrimaryRegionThermoFields(); @@ -930,7 +940,7 @@ void kinematicSingleLayer::preEvolveRegion() } -void kinematicSingleLayer::evolveRegion() +void Foam::regionModels::momentumSurfaceFilm::evolveRegion() { DebugInFunction << endl; @@ -969,7 +979,8 @@ void kinematicSingleLayer::evolveRegion() } -scalar kinematicSingleLayer::CourantNumber() const +Foam::scalar +Foam::regionModels::momentumSurfaceFilm::CourantNumber() const { const scalarField sumPhi(fvc::surfaceSum(mag(phiU_))().primitiveField()); @@ -977,7 +988,8 @@ scalar kinematicSingleLayer::CourantNumber() const } -scalar kinematicSingleLayer::maxDeltaT() const +Foam::scalar +Foam::regionModels::momentumSurfaceFilm::maxDeltaT() const { if (maxCo_ > 0) { @@ -990,31 +1002,35 @@ scalar kinematicSingleLayer::maxDeltaT() const } -tmp kinematicSingleLayer::primaryMassTrans() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::primaryMassTrans() const { return primaryMassTrans_; } -const volScalarField& kinematicSingleLayer::cloudMassTrans() const +const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::cloudMassTrans() const { return cloudMassTrans_; } -const volScalarField& kinematicSingleLayer::cloudDiameterTrans() const +const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::cloudDiameterTrans() const { return cloudDiameterTrans_; } -tmp kinematicSingleLayer::primaryMomentumTrans() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::primaryMomentumTrans() const { return primaryMomentumTrans_; } -void kinematicSingleLayer::info() +void Foam::regionModels::momentumSurfaceFilm::info() { Info<< "\nSurface film: " << type() << endl; @@ -1040,13 +1056,14 @@ void kinematicSingleLayer::info() } -tmp kinematicSingleLayer::Srho() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::Srho() const { tmp tSrho ( volScalarField::Internal::New ( - "thermoSingleLayer::Srho", + typedName("Srho"), primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) @@ -1079,7 +1096,8 @@ tmp kinematicSingleLayer::Srho() const } -tmp kinematicSingleLayer::SYi +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::SYi ( const label i ) const @@ -1093,7 +1111,8 @@ tmp kinematicSingleLayer::SYi } -tmp kinematicSingleLayer::SU() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::SU() const { tmp tSU ( @@ -1131,7 +1150,8 @@ tmp kinematicSingleLayer::SU() const } -tmp kinematicSingleLayer::Sh() const +Foam::tmp +Foam::regionModels::momentumSurfaceFilm::Sh() const { return volScalarField::Internal::New ( @@ -1142,10 +1162,4 @@ tmp kinematicSingleLayer::Sh() const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace surfaceFilmModels -} // End namespace regionModels -} // End namespace Foam - // ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H similarity index 92% rename from src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H rename to src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H index bc278527bb..a3e20e1418 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::kinematicSingleLayer + Foam::regionModels::momentumSurfaceFilm Description Kinematic form of single-cell layer surface film model SourceFiles - kinematicSingleLayer.C + momentumSurfaceFilm.C \*---------------------------------------------------------------------------*/ -#ifndef kinematicSingleLayer_H -#define kinematicSingleLayer_H +#ifndef momentumSurfaceFilm_H +#define momentumSurfaceFilm_H -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" #include "fvMesh.H" #include "volFields.H" #include "surfaceFields.H" @@ -55,19 +55,20 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels -{ // Forward class declarations -class viscosityModel; +namespace surfaceFilmSubModels +{ + class viscosityModel; +} /*---------------------------------------------------------------------------*\ - Class kinematicSingleLayer Declaration + Class momentumSurfaceFilm Declaration \*---------------------------------------------------------------------------*/ -class kinematicSingleLayer +class momentumSurfaceFilm : - public surfaceFilmRegionModel + public surfaceFilm { protected: @@ -189,7 +190,7 @@ protected: // Sub-models //- Viscosity model - autoPtr viscosity_; + autoPtr viscosity_; //- Surface tension function autoPtr> sigma_; @@ -198,16 +199,17 @@ protected: scalarField availableMass_; //- Cloud ejection - ejectionModelList ejection_; + surfaceFilmSubModels::ejectionModelList ejection_; //- Transfer with the continuous phase - transferModelList transfer_; + surfaceFilmSubModels::transferModelList transfer_; //- Momentum transport model - autoPtr momentumTransport_; + autoPtr + momentumTransport_; //- List of film forces - forceList forces_; + surfaceFilmSubModels::forceList forces_; // Checks @@ -288,13 +290,13 @@ protected: public: //- Runtime type information - TypeName("kinematicSingleLayer"); + TypeName("momentumSurfaceFilm"); // Constructors //- Construct from components - kinematicSingleLayer + momentumSurfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -304,11 +306,11 @@ public: ); //- Disallow default bitwise copy construction - kinematicSingleLayer(const kinematicSingleLayer&) = delete; + momentumSurfaceFilm(const momentumSurfaceFilm&) = delete; //- Destructor - virtual ~kinematicSingleLayer(); + virtual ~momentumSurfaceFilm(); // Member Functions @@ -459,13 +461,14 @@ public: inline const rhoThermo& thermo() const; //- Ejection - inline ejectionModelList& ejection(); + inline surfaceFilmSubModels::ejectionModelList& ejection(); //- Transfer - inline transferModelList& transfer(); + inline surfaceFilmSubModels::transferModelList& transfer(); //- Momentum transport - inline const momentumTransportModel& momentumTransport() const; + inline const surfaceFilmSubModels::momentumTransportModel& + momentumTransport() const; // Helper functions @@ -513,25 +516,24 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const kinematicSingleLayer&) = delete; + void operator=(const momentumSurfaceFilm&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels } // End namespace regionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "kinematicSingleLayerTemplates.C" + #include "momentumSurfaceFilmTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "kinematicSingleLayerI.H" +#include "momentumSurfaceFilmI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H new file mode 100644 index 0000000000..3a8bc2bcf0 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmI.H @@ -0,0 +1,249 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "momentumSurfaceFilm.H" +#include "surfaceInterpolate.H" +#include "fvcSurfaceIntegrate.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +inline const Foam::dimensionedScalar& +Foam::regionModels::momentumSurfaceFilm::deltaSmall() const +{ + return deltaSmall_; +} + + +inline const Foam::word& +Foam::regionModels::momentumSurfaceFilm::phaseName() const +{ + return phaseName_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::rho() const +{ + return thermo_->rho(); +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::mu() const +{ + return mu_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::delta() const +{ + return delta_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::alpha() const +{ + return alpha_; +} + + +inline const Foam::volVectorField& +Foam::regionModels::momentumSurfaceFilm::U() const +{ + return U_; +} + + +inline Foam::tmp +Foam::regionModels::momentumSurfaceFilm::Us() const +{ + return momentumTransport_->Us(); +} + + +inline const Foam::surfaceScalarField& +Foam::regionModels::momentumSurfaceFilm::phi() const +{ + return phi_; +} + + +inline const Foam::surfaceScalarField& +Foam::regionModels::momentumSurfaceFilm::phiU() const +{ + return phiU_; +} + + +inline const Foam::volScalarField::Internal& +Foam::regionModels::momentumSurfaceFilm::continuityErr() const +{ + return continuityErr_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::coverage() const +{ + return coverage_; +} + + +inline Foam::volVectorField& +Foam::regionModels::momentumSurfaceFilm::USpPrimary() +{ + return USpPrimary_; +} + + +inline Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::pSpPrimary() +{ + return pSpPrimary_; +} + + +inline Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::rhoSpPrimary() +{ + return rhoSpPrimary_; +} + + +inline Foam::volVectorField::Internal& +Foam::regionModels::momentumSurfaceFilm::USp() +{ + return USp_; +} + + +inline Foam::volScalarField::Internal& +Foam::regionModels::momentumSurfaceFilm::pSp() +{ + return pSp_; +} + + +inline Foam::volScalarField::Internal& +Foam::regionModels::momentumSurfaceFilm::rhoSp() +{ + return rhoSp_; +} + + +inline const Foam::volVectorField::Internal& +Foam::regionModels::momentumSurfaceFilm::USp() const +{ + return USp_; +} + + +inline const Foam::volScalarField::Internal& +Foam::regionModels::momentumSurfaceFilm::pSp() const +{ + return pSp_; +} + + +inline const Foam::volScalarField::Internal& +Foam::regionModels::momentumSurfaceFilm::rhoSp() const +{ + return rhoSp_; +} + + +inline const Foam::volVectorField& +Foam::regionModels::momentumSurfaceFilm::UPrimary() const +{ + return UPrimary_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::pPrimary() const +{ + return thermo_->p(); +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::rhoPrimary() const +{ + return rhoPrimary_; +} + + +inline const Foam::volScalarField& +Foam::regionModels::momentumSurfaceFilm::muPrimary() const +{ + return muPrimary_; +} + + +inline const Foam::rhoThermo& +Foam::regionModels::momentumSurfaceFilm::thermo() const +{ + return thermo_(); +} + + +inline Foam::regionModels::surfaceFilmSubModels::ejectionModelList& +Foam::regionModels::momentumSurfaceFilm::ejection() +{ + return ejection_; +} + + +inline Foam::regionModels::surfaceFilmSubModels::transferModelList& +Foam::regionModels::momentumSurfaceFilm::transfer() +{ + return transfer_; +} + + +inline const Foam::regionModels::surfaceFilmSubModels::momentumTransportModel& +Foam::regionModels::momentumSurfaceFilm::momentumTransport() const +{ + return momentumTransport_(); +} + + +inline Foam::tmp +Foam::regionModels::momentumSurfaceFilm::mass() const +{ + return rho()()*delta_()*magSf(); +} + + +inline Foam::tmp +Foam::regionModels::momentumSurfaceFilm::deltaMass() const +{ + return rhoSp_*magSf()*time().deltaT(); +} + + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C similarity index 82% rename from src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C rename to src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C index edac1ad706..61a10b1c85 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerTemplates.C +++ b/src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilmTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,21 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "kinematicSingleLayer.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace regionModels -{ -namespace surfaceFilmModels -{ +#include "momentumSurfaceFilm.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template -tmp kinematicSingleLayer::constrainFilmField +Foam::tmp Foam::regionModels::momentumSurfaceFilm::constrainFilmField ( const tmp& tfield, const typename Type::cmptType& value @@ -73,10 +64,4 @@ tmp kinematicSingleLayer::constrainFilmField } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // end namespace Foam -} // end namespace regionModels -} // end namespace surfaceFilmModels - // ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C index 53e0c52769..c7d8cdb2e7 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.C +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.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 @@ -31,12 +31,12 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -filmSubModelBase::filmSubModelBase(surfaceFilmRegionModel& film) +filmSubModelBase::filmSubModelBase(surfaceFilm& film) : subModelBase(film.outputProperties()), filmModel_(film) @@ -45,7 +45,7 @@ filmSubModelBase::filmSubModelBase(surfaceFilmRegionModel& film) filmSubModelBase::filmSubModelBase ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& baseName, const word& modelType, @@ -67,7 +67,7 @@ filmSubModelBase::filmSubModelBase filmSubModelBase::filmSubModelBase ( const word& modelName, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& baseName, const word& modelType @@ -101,7 +101,7 @@ bool filmSubModelBase::writeTime() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H index e5ba5e5ab8..f321e29368 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBase.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::filmSubModelBase + Foam::regionModels::surfaceFilmSubModels::filmSubModelBase Description Base class for surface film sub-models @@ -36,7 +36,7 @@ SourceFiles #ifndef filmSubModelBase_H #define filmSubModelBase_H -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" #include "subModelBase.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -61,7 +61,7 @@ protected: // Protected data //- Reference to the film surface film model - surfaceFilmRegionModel& filmModel_; + surfaceFilm& filmModel_; public: @@ -69,12 +69,12 @@ public: // Constructors //- Construct null - filmSubModelBase(surfaceFilmRegionModel& film); + filmSubModelBase(surfaceFilm& film); //- Construct from film film without name filmSubModelBase ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& baseName, const word& modelType, @@ -85,7 +85,7 @@ public: filmSubModelBase ( const word& modelName, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& baseName, const word& modelType @@ -104,10 +104,10 @@ public: virtual bool writeTime() const; //- Return const access to the film surface film model - inline const surfaceFilmRegionModel& film() const; + inline const surfaceFilm& film() const; //- Return the reference to the film surface film model - inline surfaceFilmRegionModel& film(); + inline surfaceFilm& film(); template inline const FilmType& filmType() const; @@ -116,7 +116,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H index 8688aa1ff7..d6392759c2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,18 +29,18 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -inline const surfaceFilmRegionModel& filmSubModelBase::film() const +inline const surfaceFilm& filmSubModelBase::film() const { return filmModel_; } -inline surfaceFilmRegionModel& filmSubModelBase::film() +inline surfaceFilm& filmSubModelBase::film() { return filmModel_; } @@ -48,7 +48,7 @@ inline surfaceFilmRegionModel& filmSubModelBase::film() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C index 2bf73dcc62..74ef8a75b8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C +++ b/src/regionModels/surfaceFilmModels/submodels/filmSubModelBaseTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ const FilmType& filmSubModelBase::filmType() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C index 38d69a7746..bf5656a385 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "BrunDrippingEjection.H" #include "addToRunTimeSelectionTable.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -45,7 +45,7 @@ addToRunTimeSelectionTable(ejectionModel, BrunDrippingEjection, dictionary); BrunDrippingEjection::BrunDrippingEjection ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -72,8 +72,8 @@ void BrunDrippingEjection::correct scalarField& diameterToEject ) { - const kinematicSingleLayer& film = - refCast(this->film()); + const momentumSurfaceFilm& film = + refCast(this->film()); // Calculate available dripping mass tmp tsinAlpha((film.g()/mag(film.g())) & film.nHat()); @@ -139,7 +139,7 @@ void BrunDrippingEjection::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H index e90de21943..9a5001b484 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/BrunDrippingEjection/BrunDrippingEjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::BrunDrippingEjection + Foam::regionModels::surfaceFilmSubModels::BrunDrippingEjection Description Film Dripping mass transfer model. @@ -65,7 +65,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -109,7 +109,7 @@ public: //- Construct from surface film model BrunDrippingEjection ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -141,7 +141,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C similarity index 96% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.C index 824fe68457..5eee48e6f8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "curvatureSeparation.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "fvcGrad.H" #include "addToRunTimeSelectionTable.H" @@ -34,7 +34,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -171,7 +171,7 @@ tmp curvatureSeparation::calcCosAngle curvatureSeparation::curvatureSeparation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -241,8 +241,8 @@ void curvatureSeparation::correct scalarField& diameterToEject ) { - const kinematicSingleLayer& film = - refCast(this->film()); + const momentumSurfaceFilm& film = + refCast(this->film()); const fvMesh& mesh = film.regionMesh(); const volScalarField& delta = film.delta(); @@ -321,7 +321,7 @@ void curvatureSeparation::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.H index 4ff3301e29..2751df3b95 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/curvatureSeparation/curvatureSeparation.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/curvatureSeparation/curvatureSeparation.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::curvatureSeparation + Foam::regionModels::surfaceFilmSubModels::curvatureSeparation Description Curvature film separation model @@ -57,7 +57,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -114,7 +114,7 @@ public: //- Construct from surface film model curvatureSeparation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -148,7 +148,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.C index d1292e6f49..e7351dec19 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.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 @@ -30,7 +30,7 @@ License #include "mathematicalConstants.H" #include "Random.H" #include "volFields.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,7 +38,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ addToRunTimeSelectionTable(ejectionModel, drippingEjection, dictionary); drippingEjection::drippingEjection ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -85,8 +85,8 @@ void drippingEjection::correct scalarField& diameterToEject ) { - const kinematicSingleLayer& film = - refCast(this->film()); + const momentumSurfaceFilm& film = + refCast(this->film()); const scalar pi = constant::mathematical::pi; @@ -159,7 +159,7 @@ void drippingEjection::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.H index acd530f5d9..f391e7a1a9 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/drippingEjection/drippingEjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/drippingEjection/drippingEjection.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::drippingEjection + Foam::regionModels::surfaceFilmSubModels::drippingEjection Description Film Dripping mass transfer model. @@ -50,7 +50,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -94,7 +94,7 @@ public: //- Construct from surface film model drippingEjection ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -128,7 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.C index bfe8d55237..ccf8f66fc0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.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 @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ void ejectionModel::addToEjectedMass(const scalar dMass) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -ejectionModel::ejectionModel(surfaceFilmRegionModel& film) +ejectionModel::ejectionModel(surfaceFilm& film) : filmSubModelBase(film), ejectedMass_(0.0) @@ -59,7 +59,7 @@ ejectionModel::ejectionModel(surfaceFilmRegionModel& film) ejectionModel::ejectionModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -97,7 +97,7 @@ scalar ejectionModel::ejectedMassTotal() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.H index 2f2838a046..289aa3e36d 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::ejectionModel + Foam::regionModels::surfaceFilmSubModels::ejectionModel Description Base class for film ejection models, handling mass transfer from the @@ -47,7 +47,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -89,7 +89,7 @@ public: ejectionModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -99,13 +99,13 @@ public: // Constructors //- Construct null - ejectionModel(surfaceFilmRegionModel& film); + ejectionModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model ejectionModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -118,7 +118,7 @@ public: //- Return a reference to the selected ejection model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& mdoelType ); @@ -156,7 +156,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModelNew.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModelNew.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.C index 5f870f66c6..f111bed6ba 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModel/ejectionModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModel/ejectionModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr ejectionModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict, const word& modelType ) @@ -63,7 +63,7 @@ autoPtr ejectionModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C similarity index 95% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.C index bb6c6af8d5..b670e4af2f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.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 @@ -31,12 +31,12 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -ejectionModelList::ejectionModelList(surfaceFilmRegionModel& film) +ejectionModelList::ejectionModelList(surfaceFilm& film) : PtrList(), filmSubModelBase(film) @@ -45,7 +45,7 @@ ejectionModelList::ejectionModelList(surfaceFilmRegionModel& film) ejectionModelList::ejectionModelList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -194,7 +194,7 @@ void ejectionModelList::info(Ostream& os) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.H index ae9e391426..6a7e9c9248 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/ejectionModelList/ejectionModelList.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/ejectionModelList/ejectionModelList.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::ejectionModelList + Foam::regionModels::surfaceFilmSubModels::ejectionModelList Description List container for film ejection models @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -68,12 +68,12 @@ public: // Constructors //- Construct null - ejectionModelList(surfaceFilmRegionModel& film); + ejectionModelList(surfaceFilm& film); //- Construct from type name, dictionary and surface film model ejectionModelList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -113,7 +113,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.C b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C similarity index 97% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.C index 970904078f..d4bfa04721 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.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 @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -44,7 +44,7 @@ addToRunTimeSelectionTable(ejectionModel, patchEjection, dictionary); patchEjection::patchEjection ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -199,7 +199,7 @@ void patchEjection::patchEjectedMassTotals(scalarField& patchMasses) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.H b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.H index ea7c8a42e9..878c8e8fc5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/ejectionModel/patchEjection/patchEjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/ejectionModel/patchEjection/patchEjection.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::patchEjection + Foam::regionModels::surfaceFilmSubModels::patchEjection Description Remove and eject the mass in the film as it passes over the selected @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -77,7 +77,7 @@ public: // Constructors //- Construct from surface film model - patchEjection(surfaceFilmRegionModel& film, const dictionary& dict); + patchEjection(surfaceFilm& film, const dictionary& dict); //- Disallow default bitwise copy construction patchEjection(const patchEjection&) = delete; @@ -114,7 +114,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C index 2caca8aa33..1729d95d1a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.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 @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -43,7 +43,7 @@ defineRunTimeSelectionTable(momentumTransportModel, dictionary); momentumTransportModel::momentumTransportModel ( - surfaceFilmRegionModel& film + surfaceFilm& film ) : filmSubModelBase(film) @@ -53,7 +53,7 @@ momentumTransportModel::momentumTransportModel momentumTransportModel::momentumTransportModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -69,7 +69,7 @@ momentumTransportModel::~momentumTransportModel() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H similarity index 90% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H index 225ab9d649..c1eb189859 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::momentumTransportModel + Foam::regionModels::surfaceFilmSubModels::momentumTransportModel Description Base class for film momentum transport models @@ -47,7 +47,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -72,7 +72,7 @@ public: momentumTransportModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -81,13 +81,13 @@ public: // Constructors //- Construct null - momentumTransportModel(surfaceFilmRegionModel& film); + momentumTransportModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model momentumTransportModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -100,7 +100,7 @@ public: //- Return a reference to the selected ejection model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -132,7 +132,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C index fee5dc5d00..4ebcbf63be 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr momentumTransportModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict ) { @@ -86,7 +86,7 @@ autoPtr momentumTransportModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C index 926602d8c0..c153888132 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.C @@ -30,7 +30,7 @@ License #include "Time.H" #include "volFields.H" #include "fvmSup.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "extrapolatedCalculatedFvPatchFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,7 +39,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable(momentumTransportModel, laminar, dictionary); laminar::laminar ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -91,8 +91,8 @@ void laminar::correct() tmp laminar::Su(volVectorField& U) const { // local reference to film model - const kinematicSingleLayer& film = - static_cast(filmModel_); + const momentumSurfaceFilm& film = + static_cast(filmModel_); // local references to film fields const volScalarField::Internal& mu = film.mu(); @@ -120,7 +120,7 @@ tmp laminar::Su(volVectorField& U) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.H index a66a6f6ac9..8bf48915dd 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmMomentumTransportModel/laminar/laminar.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::laminar + Foam::regionModels::surfaceFilmSubModels::laminar Description Film laminar momentum transport model. @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -69,7 +69,7 @@ public: // Constructors //- Construct from surface film model - laminar(surfaceFilmRegionModel& film, const dictionary& dict); + laminar(surfaceFilm& film, const dictionary& dict); //- Disallow default bitwise copy construction laminar(const laminar&) = delete; @@ -102,7 +102,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.C index f5dbc15974..6bf79218d3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.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 @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable ArrheniusViscosity::ArrheniusViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -86,7 +86,7 @@ void ArrheniusViscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.H index 90b07d39b0..29295976e1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Arrhenius/ArrheniusViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Arrhenius/ArrheniusViscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::ArrheniusViscosity + Foam::regionModels::surfaceFilmSubModels::ArrheniusViscosity Description The Arrhenius temperature-dependent viscosity model multiplies the viscosity @@ -52,7 +52,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -91,7 +91,7 @@ public: //- Construct from surface film model ArrheniusViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -123,7 +123,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C similarity index 90% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.C index 9fe5a59aaf..0483f38ede 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "NewtonianViscosity.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable NewtonianViscosity::NewtonianViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -74,7 +74,7 @@ void NewtonianViscosity::correct const volScalarField& T ) { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); mu_ = film.thermo().mu(); } @@ -82,7 +82,7 @@ void NewtonianViscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.H index 9209cbec58..c9dc0caa1a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/Newtonian/NewtonianViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/Newtonian/NewtonianViscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::NewtonianViscosity + Foam::regionModels::surfaceFilmSubModels::NewtonianViscosity Description Newtonian viscosity model @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -66,7 +66,7 @@ public: //- Construct from surface film model NewtonianViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -100,7 +100,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.C index 02174f955f..5de54b44c8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.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 @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ addToRunTimeSelectionTable constantViscosity::constantViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -82,7 +82,7 @@ void constantViscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.H index 2beeb8f537..0b00b55626 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/constant/constantViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/constant/constantViscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::constantViscosity + Foam::regionModels::surfaceFilmSubModels::constantViscosity Description Constant viscosity model @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -74,7 +74,7 @@ public: //- Construct from surface film model constantViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -108,7 +108,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.C index 1fe8e97973..1d6fe7ac0e 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.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 @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -44,7 +44,7 @@ defineRunTimeSelectionTable(viscosityModel, dictionary); viscosityModel::viscosityModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -68,7 +68,7 @@ void viscosityModel::info(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // end namespace surfaceFilmModels +} // end namespace surfaceFilmSubModels } // end namespace regionModels } // end namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.H index 1bf46cdccf..ab3848c942 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::viscosityModel + Foam::regionModels::surfaceFilmSubModels::viscosityModel Description Base class for surface film viscosity models @@ -46,7 +46,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -79,7 +79,7 @@ public: viscosityModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ), @@ -92,7 +92,7 @@ public: viscosityModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -106,7 +106,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -143,7 +143,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C index ce4b358601..0159fe0148 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/filmViscosityModel/filmViscosityModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr viscosityModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict, volScalarField& mu ) @@ -84,7 +84,7 @@ autoPtr viscosityModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // end namespace surfaceFilmModels +} // end namespace surfaceFilmSubModels } // end namespace regionModels } // end namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.C index 9b438a0c53..05960632dd 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.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 @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable function1Viscosity::function1Viscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -87,7 +87,7 @@ void function1Viscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.H index a7f464d627..a72a89aa63 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/function1/function1Viscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/function1/function1Viscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::function1Viscosity + Foam::regionModels::surfaceFilmSubModels::function1Viscosity Description The Foam::Function1 temperature-dependent viscosity model multiplies the @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -87,7 +87,7 @@ public: //- Construct from surface film model function1Viscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -110,7 +110,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C similarity index 96% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C index 619e8f193c..bba888cc0d 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "thixotropicViscosity.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" #include "fvmDdt.H" @@ -38,7 +38,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ addToRunTimeSelectionTable thixotropicViscosity::thixotropicViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -113,7 +113,7 @@ void thixotropicViscosity::correct const volScalarField& T ) { - const kinematicSingleLayer& film = filmType(); + const momentumSurfaceFilm& film = filmType(); const volScalarField::Internal& delta = film.delta(); const volScalarField::Internal alphaRho(film.alpha()()*film.rho()()); @@ -182,7 +182,7 @@ void thixotropicViscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H similarity index 95% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.H index 5a6840b9af..761ca96bdc 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/thixotropic/thixotropicViscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::thixotropicViscosity + Foam::regionModels::surfaceFilmSubModels::thixotropicViscosity Description Thixotropic viscosity model based on the evolution of the structural @@ -78,7 +78,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -135,7 +135,7 @@ public: //- Construct from surface film model thixotropicViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -167,7 +167,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C similarity index 95% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C index 1753b29ec3..f70348fce2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "waxSolventViscosity.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" #include "waxSolventEvaporation.H" #include "addToRunTimeSelectionTable.H" @@ -34,7 +34,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -53,7 +53,7 @@ addToRunTimeSelectionTable void waxSolventViscosity::correctMu() { - const kinematicSingleLayer& film = filmType(); + const momentumSurfaceFilm& film = filmType(); const uniformDimensionedScalarField Wwax ( @@ -106,7 +106,7 @@ void waxSolventViscosity::correctMu() waxSolventViscosity::waxSolventViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ) @@ -184,7 +184,7 @@ void waxSolventViscosity::correct // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.H b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.H index d270a90a81..30faf5c611 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/filmViscosityModel/waxSolvent/waxSolventViscosity.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::waxSolventViscosity + Foam::regionModels::surfaceFilmSubModels::waxSolventViscosity Description Wax solvent mixture viscosity model. @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -88,7 +88,7 @@ public: //- Construct from surface film model waxSolventViscosity ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, volScalarField& mu ); @@ -120,7 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C similarity index 98% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C index 7507a8a4d4..2c364bebe1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.C @@ -35,7 +35,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -95,7 +95,7 @@ void contactAngleForce::initialise() contactAngleForce::contactAngleForce ( const word& typeName, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -233,7 +233,7 @@ tmp contactAngleForce::correct(volVectorField& U) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H index 623b51ccdf..c70b591cfe 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/contactAngleForce/contactAngleForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::contactAngleForce + Foam::regionModels::surfaceFilmSubModels::contactAngleForce Description Base-class for film contact angle force models. @@ -46,7 +46,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -90,7 +90,7 @@ public: contactAngleForce ( const word& typeName, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -117,7 +117,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C similarity index 97% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C index 2f47be1e39..5bb947fbd5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.C @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -45,7 +45,7 @@ addToRunTimeSelectionTable(force, distributionContactAngleForce, dictionary); distributionContactAngleForce::distributionContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -113,7 +113,7 @@ tmp distributionContactAngleForce::theta() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H index 3cc41ce21c..c0c734cf95 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/distribution/distributionContactAngleForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,13 +22,13 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::distributionContactAngleForce + Foam::regionModels::surfaceFilmSubModels::distributionContactAngleForce Description PDF distribution based film contact angle force See also - Foam::regionModels::surfaceFilmModels::contactAngleForce + Foam::regionModels::surfaceFilmSubModels::contactAngleForce Foam::distributionModel SourceFiles @@ -49,7 +49,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -92,7 +92,7 @@ public: //- Construct from surface film model distributionContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -116,7 +116,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C similarity index 95% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C index de3059a2b8..5c4ac02271 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "perturbedTemperatureDependentContactAngleForce.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ addToRunTimeSelectionTable perturbedTemperatureDependentContactAngleForce:: perturbedTemperatureDependentContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -95,7 +95,7 @@ perturbedTemperatureDependentContactAngleForce::theta() const volScalarField& theta = ttheta.ref(); volScalarField::Internal& thetai = theta.ref(); - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const volScalarField& T = film.thermo().T(); @@ -130,7 +130,7 @@ perturbedTemperatureDependentContactAngleForce::theta() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H similarity index 89% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H index d998c988fb..ecb910bd53 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels:: + Foam::regionModels::surfaceFilmSubModels:: perturbedTemperatureDependentContactAngleForce Description @@ -34,9 +34,10 @@ Description Foam::distributionModels::distributionModel See also - Foam::regionModels::surfaceFilmModels::contactAngleForce - Foam::regionModels::surfaceFilmModels::temperatureDependentContactAngleForce - Foam::regionModels::surfaceFilmModels::distributionContactAngleForce + Foam::regionModels::surfaceFilmSubModels::contactAngleForce + Foam::regionModels::surfaceFilmSubModels::\\ + temperatureDependentContactAngleForce + Foam::regionModels::surfaceFilmSubModels::distributionContactAngleForce Foam::Function1s Foam::distributionModel @@ -59,7 +60,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -99,7 +100,7 @@ public: //- Construct from surface film model perturbedTemperatureDependentContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -126,7 +127,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C similarity index 94% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C index 6ba2b889cf..02349d4c8a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "temperatureDependentContactAngleForce.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable temperatureDependentContactAngleForce::temperatureDependentContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -82,7 +82,7 @@ tmp temperatureDependentContactAngleForce::theta() const volScalarField& theta = ttheta.ref(); - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const volScalarField& T = film.thermo().T(); @@ -102,7 +102,7 @@ tmp temperatureDependentContactAngleForce::theta() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H similarity index 90% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H index f98b5a2323..829dd6480c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,8 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::temperatureDependentContactAngleForce + Foam::regionModels::surfaceFilmSubModels::\\ + temperatureDependentContactAngleForce Description Temperature dependent contact angle force @@ -31,7 +32,7 @@ Description enable the use of, e.g. constant, polynomial, table values. See also - Foam::regionModels::surfaceFilmModels::contactAngleForce + Foam::regionModels::surfaceFilmSubModels::contactAngleForce Foam::Function1s SourceFiles @@ -51,7 +52,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -85,7 +86,7 @@ public: //- Construct from surface film model temperatureDependentContactAngleForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -109,7 +110,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.C similarity index 90% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.C index e411588e3b..f72a4be821 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -41,7 +41,7 @@ defineRunTimeSelectionTable(force, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -force::force(surfaceFilmRegionModel& film) +force::force(surfaceFilm& film) : filmSubModelBase(film) {} @@ -50,7 +50,7 @@ force::force(surfaceFilmRegionModel& film) force::force ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -66,7 +66,7 @@ force::~force() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.H similarity index 90% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.H index 7b593a65fa..35062c674f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/force.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/force.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::force + Foam::regionModels::surfaceFilmSubModels::force Description Base class for film (stress-based) force models @@ -46,7 +46,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -71,7 +71,7 @@ public: force, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -80,13 +80,13 @@ public: // Constructors //- Construct null - force(surfaceFilmRegionModel& film); + force(surfaceFilm& film); //- Construct from type name, dictionary and surface film model force ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -99,7 +99,7 @@ public: //- Return a reference to the selected force model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& modelType ); @@ -126,7 +126,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/forceNew.C similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/force/forceNew.C index 99812aa3cc..4ee487281a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/force/forceNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/force/forceNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr force::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict, const word& modelType ) @@ -63,7 +63,7 @@ autoPtr force::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.C index ef02182a40..decf843aba 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.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 @@ -31,12 +31,12 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -forceList::forceList(surfaceFilmRegionModel& film) +forceList::forceList(surfaceFilm& film) : PtrList() {} @@ -44,7 +44,7 @@ forceList::forceList(surfaceFilmRegionModel& film) forceList::forceList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -119,7 +119,7 @@ tmp forceList::correct(volVectorField& U) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H similarity index 89% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.H index 3250f18b41..29f0b6c93a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/forceList/forceList.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::forceList + Foam::regionModels::surfaceFilmSubModels::forceList Description List container for film sources @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -60,12 +60,12 @@ public: // Constructors //- Construct null - forceList(surfaceFilmRegionModel& film); + forceList(surfaceFilm& film); //- Construct from type name, dictionary and surface film model forceList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -83,7 +83,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C b/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.C index 1b69ccff50..4db8783897 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.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 @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -45,7 +45,7 @@ addToRunTimeSelectionTable(force, thermocapillaryForce, dictionary); thermocapillaryForce::thermocapillaryForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -74,7 +74,7 @@ tmp thermocapillaryForce::correct(volVectorField& U) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H b/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.H index bb1fee4540..bf9f094d55 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/force/thermocapillaryForce/thermocapillaryForce.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::thermocapillaryForce + Foam::regionModels::surfaceFilmSubModels::thermocapillaryForce Description Thermocapillary force @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -65,7 +65,7 @@ public: //- Construct from surface film model thermocapillaryForce ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -94,7 +94,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.C b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C similarity index 91% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.C index d763daa495..badefe38e8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "transferModel.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ void transferModel::addToTransferredMass(const scalar dMass) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -transferModel::transferModel(surfaceFilmRegionModel& film) +transferModel::transferModel(surfaceFilm& film) : filmSubModelBase(film), transferredMass_(0.0) @@ -60,7 +60,7 @@ transferModel::transferModel(surfaceFilmRegionModel& film) transferModel::transferModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -98,7 +98,7 @@ scalar transferModel::transferredMassTotal() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.H index 053094915e..a2bf9a4396 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::transferModel + Foam::regionModels::surfaceFilmSubModels::transferModel Description Base class for film transfer models, handling mass transfer between the @@ -47,7 +47,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -89,7 +89,7 @@ public: transferModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -99,13 +99,13 @@ public: // Constructors //- Construct for film - transferModel(surfaceFilmRegionModel& film); + transferModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model transferModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -118,7 +118,7 @@ public: //- Return a reference to the selected ejection model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict, const word& modelType ); @@ -165,7 +165,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C similarity index 93% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModelNew.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C index c40b2b6b06..6d4fbb69ec 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModel/transferModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModel/transferModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr transferModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict, const word& modelType ) @@ -63,7 +63,7 @@ autoPtr transferModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.C b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C similarity index 96% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.C rename to src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.C index a947b36566..f867b908df 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.C +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.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 @@ -31,12 +31,12 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -transferModelList::transferModelList(surfaceFilmRegionModel& film) +transferModelList::transferModelList(surfaceFilm& film) : PtrList(), filmSubModelBase(film) @@ -45,7 +45,7 @@ transferModelList::transferModelList(surfaceFilmRegionModel& film) transferModelList::transferModelList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -228,7 +228,7 @@ void transferModelList::info(Ostream& os) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H similarity index 92% rename from src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H rename to src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.H index cd1ef0b74a..80c46839c4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/transferModels/transferModelList/transferModelList.H +++ b/src/regionModels/surfaceFilmModels/submodels/momentum/transferModels/transferModelList/transferModelList.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::transferModelList + Foam::regionModels::surfaceFilmSubModels::transferModelList Description List container for film transfer models @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -68,12 +68,12 @@ public: // Constructors //- Construct null - transferModelList(surfaceFilmRegionModel& film); + transferModelList(surfaceFilm& film); //- Construct from type name, dictionary and surface film model transferModelList ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -117,7 +117,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index f9e7854662..b0b91d4d5c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ addToRunTimeSelectionTable constantRadiation::constantRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -126,7 +126,7 @@ tmp constantRadiation::Shs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H index c56477f7ff..188da56958 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::constantRadiation + Foam::regionModels::surfaceFilmSubModels::constantRadiation Description Film constant radiation model. The constant radiative flux is specified @@ -47,7 +47,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -87,7 +87,7 @@ public: //- Construct from surface film model and dictionary constantRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -120,7 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C index b892f0bc41..4ac680e3a0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.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 @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -41,7 +41,7 @@ defineRunTimeSelectionTable(radiationModel, dictionary); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -radiationModel::radiationModel(surfaceFilmRegionModel& film) +radiationModel::radiationModel(surfaceFilm& film) : filmSubModelBase(film) {} @@ -50,7 +50,7 @@ radiationModel::radiationModel(surfaceFilmRegionModel& film) radiationModel::radiationModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -66,7 +66,7 @@ radiationModel::~radiationModel() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H index 288de7ebbf..8a50137652 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::radiationModel + Foam::regionModels::surfaceFilmSubModels::radiationModel Description Base class for film radiation models @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -70,7 +70,7 @@ public: radiationModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -80,13 +80,13 @@ public: // Constructors //- Construct null - radiationModel(surfaceFilmRegionModel& film); + radiationModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model radiationModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -99,7 +99,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -128,7 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C index c5368b69d1..f9536c0fb4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/filmRadiationModel/filmRadiationModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr radiationModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict ) { @@ -89,7 +89,7 @@ autoPtr radiationModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C index 5ffcd00ab8..8bf7b53ebb 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable noRadiation::noRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -84,7 +84,7 @@ tmp noRadiation::Shs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H index 3bb77a82b3..30463b3736 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::noRadiation + Foam::regionModels::surfaceFilmSubModels::noRadiation Description Dummy radiation model for 'none' option @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -66,7 +66,7 @@ public: //- Construct from surface film model and dictionary noRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index 713ea411f6..7d81e8cd81 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ addToRunTimeSelectionTable primaryRadiation::primaryRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -105,7 +105,7 @@ tmp primaryRadiation::Shs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H index fc0ff0da7d..98870752d1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::primaryRadiation + Foam::regionModels::surfaceFilmSubModels::primaryRadiation Description Radiation model whereby the radiative heat flux is mapped from the primary @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -73,7 +73,7 @@ public: //- Construct from surface film model and dictionary primaryRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -106,7 +106,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index bae4efee9a..004815662e 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -50,7 +50,7 @@ addToRunTimeSelectionTable standardRadiation::standardRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -108,7 +108,7 @@ tmp standardRadiation::Shs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H index 5a0099d0ef..8152d4cbc1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::standardRadiation + Foam::regionModels::surfaceFilmSubModels::standardRadiation Description Standard radiation model @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -81,7 +81,7 @@ public: //- Construct from surface film model and dictionary standardRadiation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -114,7 +114,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C index 21491ab629..60cbc181c6 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable constantHeatTransfer::constantHeatTransfer ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -89,7 +89,7 @@ tmp constantHeatTransfer::h() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H index c8212088bf..51e554899d 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::constantHeatTransfer + Foam::regionModels::surfaceFilmSubModels::constantHeatTransfer Description Constant heat transfer model @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -72,7 +72,7 @@ public: //- Construct from surface film model and dictionary constantHeatTransfer ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -104,7 +104,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C index db868257a5..04cf6757c4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -43,7 +43,7 @@ defineRunTimeSelectionTable(heatTransferModel, dictionary); heatTransferModel::heatTransferModel ( - surfaceFilmRegionModel& film + surfaceFilm& film ) : filmSubModelBase(film) @@ -53,7 +53,7 @@ heatTransferModel::heatTransferModel heatTransferModel::heatTransferModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -69,7 +69,7 @@ heatTransferModel::~heatTransferModel() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H index 2f9e8c1651..0c920ca543 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::heatTransferModel + Foam::regionModels::surfaceFilmSubModels::heatTransferModel Description Base class for film heat transfer models @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -70,7 +70,7 @@ public: heatTransferModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -80,13 +80,13 @@ public: // Constructors //- Construct null - heatTransferModel(surfaceFilmRegionModel& film); + heatTransferModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model heatTransferModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -99,7 +99,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -128,7 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C index be51a85bb9..e30d0c1b4e 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/heatTransferModel/heatTransferModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr heatTransferModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict ) { @@ -83,7 +83,7 @@ autoPtr heatTransferModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C index 4d7e95a619..02eb544ddf 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "mappedConvectiveHeatTransfer.H" #include "zeroGradientFvPatchFields.H" #include "addToRunTimeSelectionTable.H" -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -34,7 +34,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ addToRunTimeSelectionTable mappedConvectiveHeatTransfer::mappedConvectiveHeatTransfer ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -114,7 +114,7 @@ tmp mappedConvectiveHeatTransfer::h() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H index 947f2607d7..7e28caded4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvectiveHeatTransfer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::mappedConvectiveHeatTransfer + Foam::regionModels::surfaceFilmSubModels::mappedConvectiveHeatTransfer Description Convective heat transfer model based on a re-working of a Nusselt number @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -76,7 +76,7 @@ public: //- Construct from surface film model and dictionary mappedConvectiveHeatTransfer ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -111,7 +111,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C index 0a5231e497..c3662454d4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.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 @@ -32,7 +32,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -44,7 +44,7 @@ addToRunTimeSelectionTable(phaseChangeModel, noPhaseChange, dictionary); noPhaseChange::noPhaseChange ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& ) : @@ -82,7 +82,7 @@ void noPhaseChange::correctModel // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H index 869c3656dd..f77b8d0320 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::noPhaseChange + Foam::regionModels::surfaceFilmSubModels::noPhaseChange Description Dummy phase change model for 'none' @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -63,7 +63,7 @@ public: // Constructors //- Construct from surface film model - noPhaseChange(surfaceFilmRegionModel& film, const dictionary& dict); + noPhaseChange(surfaceFilm& film, const dictionary& dict); //- Disallow default bitwise copy construction noPhaseChange(const noPhaseChange&) = delete; @@ -105,7 +105,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C index a638e2d8eb..09e8dddc07 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.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 @@ -31,7 +31,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -43,7 +43,7 @@ defineRunTimeSelectionTable(phaseChangeModel, dictionary); phaseChangeModel::phaseChangeModel ( - surfaceFilmRegionModel& film + surfaceFilm& film ) : filmSubModelBase(film), @@ -55,7 +55,7 @@ phaseChangeModel::phaseChangeModel phaseChangeModel::phaseChangeModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -121,7 +121,7 @@ void phaseChangeModel::info(Ostream& os) const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // end namespace surfaceFilmModels +} // end namespace surfaceFilmSubModels } // end namespace regionModels } // end namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H index 91c64ebc71..621bb6c5a2 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::phaseChangeModel + Foam::regionModels::surfaceFilmSubModels::phaseChangeModel Description Base class for surface film phase change models @@ -46,7 +46,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -82,7 +82,7 @@ public: phaseChangeModel, dictionary, ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ), (film, dict) @@ -91,13 +91,13 @@ public: // Constructors //- Construct null - phaseChangeModel(surfaceFilmRegionModel& film); + phaseChangeModel(surfaceFilm& film); //- Construct from type name, dictionary and surface film model phaseChangeModel ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -110,7 +110,7 @@ public: //- Return a reference to the selected phase change model static autoPtr New ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -157,7 +157,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C index 5637d1e27d..4afe0cbb01 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModelNew.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 @@ -31,14 +31,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // autoPtr phaseChangeModel::New ( - surfaceFilmRegionModel& model, + surfaceFilm& model, const dictionary& dict ) { @@ -89,7 +89,7 @@ autoPtr phaseChangeModel::New // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // end namespace surfaceFilmModels +} // end namespace surfaceFilmSubModels } // end namespace regionModels } // end namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C index 8db81b13e5..948d6417fe 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C @@ -25,7 +25,7 @@ License #include "solidification.H" #include "addToRunTimeSelectionTable.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ addToRunTimeSelectionTable solidification::solidification ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -116,7 +116,7 @@ void solidification::correctModel scalarField& dEnergy ) { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const scalarField& T = film.thermo().T(); const scalarField& he = film.thermo().he(); @@ -155,7 +155,7 @@ void solidification::correctModel // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H index f60bb5674a..60a227d4cf 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::solidification + Foam::regionModels::surfaceFilmSubModels::solidification Description Solidification phase change model where all film mass is converted when the @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -87,7 +87,7 @@ public: // Constructors //- Construct from surface film model - solidification(surfaceFilmRegionModel& film, const dictionary& dict); + solidification(surfaceFilm& film, const dictionary& dict); //- Disallow default bitwise copy construction solidification(const solidification&) = delete; @@ -120,7 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C index 9e838499a0..88b381711b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "speciePhaseChange.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "fluidThermo.H" #include "basicSpecieMixture.H" #include "liquidThermo.H" @@ -36,7 +36,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ defineTypeNameAndDebug(speciePhaseChange, 0); speciePhaseChange::speciePhaseChange ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -67,7 +67,7 @@ speciePhaseChange::~speciePhaseChange() Foam::label speciePhaseChange::vapId() const { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); // Set local liquidThermo properties const liquidProperties& liquidThermo = @@ -83,7 +83,7 @@ Foam::label speciePhaseChange::vapId() const Foam::scalar speciePhaseChange::Wvap() const { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const basicSpecieMixture& primarySpecieThermo = refCast(film.primaryThermo()); @@ -94,7 +94,7 @@ Foam::scalar speciePhaseChange::Wvap() const // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H index 38c6d8f607..688489acbc 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/speciePhaseChange/speciePhaseChange.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::speciePhaseChange + Foam::regionModels::surfaceFilmSubModels::speciePhaseChange Description Specie phase change model abstract base class @@ -36,7 +36,7 @@ SourceFiles #define speciePhaseChange_H #include "phaseChangeModel.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,7 +44,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -68,7 +68,7 @@ public: speciePhaseChange ( const word& modelType, - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -96,7 +96,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C index 824421d93e..548820af59 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "standardPhaseChange.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "liquidThermo.H" #include "basicSpecieMixture.H" #include "zeroField.H" @@ -37,7 +37,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -74,7 +74,7 @@ scalar standardPhaseChange::Sh standardPhaseChange::standardPhaseChange ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -104,7 +104,7 @@ void standardPhaseChange::correctModel YInfType YInf ) { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); // Set local liquidThermo properties const liquidProperties& liquidThermo = @@ -222,7 +222,7 @@ void standardPhaseChange::correctModel } else { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const scalarField& YInf = film.YPrimary()[vapId()]; correctModel(dt, availableMass, dMass, dEnergy, YInf); @@ -232,7 +232,7 @@ void standardPhaseChange::correctModel // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H index 569abac041..39fe1f070f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::standardPhaseChange + Foam::regionModels::surfaceFilmSubModels::standardPhaseChange Description Standard phase change model with modification for boiling @@ -43,7 +43,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -99,7 +99,7 @@ public: //- Construct from surface film model standardPhaseChange ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -134,7 +134,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C index a70b121877..84c31231d0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "waxSolventEvaporation.H" -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "liquidThermo.H" #include "basicSpecieMixture.H" @@ -41,7 +41,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -78,7 +78,7 @@ scalar waxSolventEvaporation::Sh waxSolventEvaporation::waxSolventEvaporation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ) : @@ -155,7 +155,7 @@ void waxSolventEvaporation::correctModel YInfType YInf ) { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const volScalarField& alpha = film.alpha(); const volScalarField& delta = film.delta(); @@ -403,7 +403,7 @@ void waxSolventEvaporation::correctModel } else { - const thermoSingleLayer& film = filmType(); + const thermoSurfaceFilm& film = filmType(); const scalarField& YInf = film.YPrimary()[vapId()]; correctModel(dt, availableMass, dMass, dEnergy, YInf); @@ -413,7 +413,7 @@ void waxSolventEvaporation::correctModel // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H index c6f78998a9..4607301d1f 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.H +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::waxSolventEvaporation + Foam::regionModels::surfaceFilmSubModels::waxSolventEvaporation Description Wax solvent mixture evaporation model. @@ -45,7 +45,7 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels +namespace surfaceFilmSubModels { /*---------------------------------------------------------------------------*\ @@ -116,7 +116,7 @@ public: //- Construct from surface film model waxSolventEvaporation ( - surfaceFilmRegionModel& film, + surfaceFilm& film, const dictionary& dict ); @@ -149,7 +149,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels +} // End namespace surfaceFilmSubModels } // End namespace regionModels } // End namespace Foam diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.C b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.C similarity index 75% rename from src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.C rename to src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.C index 8f76a5c55f..f5dc1c1638 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.C +++ b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.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 @@ -23,26 +23,25 @@ License \*---------------------------------------------------------------------------*/ -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + namespace Foam { namespace regionModels { -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -defineTypeNameAndDebug(surfaceFilmRegionModel, 0); + defineTypeNameAndDebug(surfaceFilm, 0); +} +} // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -bool surfaceFilmRegionModel::read() +bool Foam::regionModels::surfaceFilm::read() { - if (singleLayerRegion::read()) + if (singleLayerRegionModel::read()) { return true; } @@ -55,7 +54,7 @@ bool surfaceFilmRegionModel::read() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -surfaceFilmRegionModel::surfaceFilmRegionModel +Foam::regionModels::surfaceFilm::surfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -63,7 +62,7 @@ surfaceFilmRegionModel::surfaceFilmRegionModel const word& regionType ) : - singleLayerRegion(mesh, regionType, modelType), + singleLayerRegionModel(mesh, regionType, modelType), g_(g) { read(); @@ -72,22 +71,16 @@ surfaceFilmRegionModel::surfaceFilmRegionModel // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -surfaceFilmRegionModel::~surfaceFilmRegionModel() +Foam::regionModels::surfaceFilm::~surfaceFilm() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void surfaceFilmRegionModel::evolve() +void Foam::regionModels::surfaceFilm::evolve() { - singleLayerRegion::evolve(); + singleLayerRegionModel::evolve(); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace surfaceFilmModels -} // End namespace regionModels -} // End namespace Foam - // ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.H similarity index 86% rename from src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H rename to src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.H index 0bc5b00446..6ee5c4fa5b 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModel.H +++ b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilm.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 @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::surfaceFilmRegionModel + Foam::regionModels::surfaceFilm Description Base class for surface film models SourceFiles - surfaceFilmRegionModel.C + surfaceFilm.C \*---------------------------------------------------------------------------*/ -#ifndef surfaceFilmRegionModel_H -#define surfaceFilmRegionModel_H +#ifndef surfaceFilm_H +#define surfaceFilm_H -#include "singleLayerRegion.H" +#include "singleLayerRegionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -43,16 +43,14 @@ namespace Foam { namespace regionModels { -namespace surfaceFilmModels -{ /*---------------------------------------------------------------------------*\ - Class surfaceFilmRegionModel Declaration + Class surfaceFilm Declaration \*---------------------------------------------------------------------------*/ -class surfaceFilmRegionModel +class surfaceFilm : - public singleLayerRegion + public singleLayerRegionModel { // Private data @@ -62,7 +60,6 @@ class surfaceFilmRegionModel protected: - // Protected member functions //- Read control parameters from dictionary @@ -72,13 +69,13 @@ protected: public: //- Runtime type information - TypeName("surfaceFilmRegionModel"); + TypeName("surfaceFilm"); // Constructors //- Construct from type name, mesh and gravity vector - surfaceFilmRegionModel + surfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -87,11 +84,11 @@ public: ); //- Disallow default bitwise copy construction - surfaceFilmRegionModel(const surfaceFilmRegionModel&) = delete; + surfaceFilm(const surfaceFilm&) = delete; //- Destructor - virtual ~surfaceFilmRegionModel(); + virtual ~surfaceFilm(); // Member Functions @@ -158,19 +155,18 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const surfaceFilmRegionModel&) = delete; + void operator=(const surfaceFilm&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels } // End namespace regionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "surfaceFilmRegionModelI.H" +#include "surfaceFilmI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModelI.H b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilmI.H similarity index 72% rename from src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModelI.H rename to src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilmI.H index 313ae97b1e..a69018a091 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmRegionModel/surfaceFilmRegionModelI.H +++ b/src/regionModels/surfaceFilmModels/surfaceFilm/surfaceFilmI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,29 +23,15 @@ License \*---------------------------------------------------------------------------*/ -#include "surfaceFilmRegionModel.H" +#include "surfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ -namespace regionModels -{ -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -inline const Foam::dimensionedVector& surfaceFilmRegionModel::g() const +inline const Foam::dimensionedVector& +Foam::regionModels::surfaceFilm::g() const { return g_; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace surfaceFilmModels -} // End namespace regionModels -} // End namespace Foam - // ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C similarity index 86% rename from src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C rename to src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C index 28fbcc772a..7ed445c097 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "fluidThermo.H" #include "basicSpecieMixture.H" #include "liquidThermo.H" @@ -47,43 +47,40 @@ License #include "addToRunTimeSelectionTable.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { namespace regionModels { -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -defineTypeNameAndDebug(thermoSingleLayer, 0); + defineTypeNameAndDebug(thermoSurfaceFilm, 0); +} +} // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -bool thermoSingleLayer::read() +bool Foam::regionModels::thermoSurfaceFilm::read() { // No additional properties to read - return kinematicSingleLayer::read(); + return momentumSurfaceFilm::read(); } -void thermoSingleLayer::resetPrimaryRegionSourceTerms() +void Foam::regionModels::thermoSurfaceFilm::resetPrimaryRegionSourceTerms() { DebugInFunction << endl; - kinematicSingleLayer::resetPrimaryRegionSourceTerms(); + momentumSurfaceFilm::resetPrimaryRegionSourceTerms(); hSpPrimary_ == dimensionedScalar(hSp_.dimensions(), 0); } -void thermoSingleLayer::transferPrimaryRegionThermoFields() +void Foam::regionModels::thermoSurfaceFilm::transferPrimaryRegionThermoFields() { DebugInFunction << endl; - kinematicSingleLayer::transferPrimaryRegionThermoFields(); + momentumSurfaceFilm::transferPrimaryRegionThermoFields(); // Update primary region fields on local region via direct mapped (coupled) // boundary conditions @@ -95,11 +92,11 @@ void thermoSingleLayer::transferPrimaryRegionThermoFields() } -void thermoSingleLayer::transferPrimaryRegionSourceFields() +void Foam::regionModels::thermoSurfaceFilm::transferPrimaryRegionSourceFields() { DebugInFunction << endl; - kinematicSingleLayer::transferPrimaryRegionSourceFields(); + momentumSurfaceFilm::transferPrimaryRegionSourceFields(); volScalarField::Boundary& hSpPrimaryBf = hSpPrimary_.boundaryFieldRef(); @@ -121,7 +118,7 @@ void thermoSingleLayer::transferPrimaryRegionSourceFields() } -void thermoSingleLayer::correctCoverage() +void Foam::regionModels::thermoSurfaceFilm::correctCoverage() { if (hydrophilic_) { @@ -149,7 +146,7 @@ void thermoSingleLayer::correctCoverage() } -void thermoSingleLayer::updateSubmodels() +void Foam::regionModels::thermoSurfaceFilm::updateSubmodels() { DebugInFunction << endl; @@ -201,7 +198,10 @@ void thermoSingleLayer::updateSubmodels() } -tmp thermoSingleLayer::q(volScalarField& h) const +Foam::tmp Foam::regionModels::thermoSurfaceFilm::q +( + volScalarField& h +) const { const volScalarField::Internal coverage(pos(delta_() - deltaSmall_)); @@ -223,7 +223,7 @@ tmp thermoSingleLayer::q(volScalarField& h) const } -void thermoSingleLayer::solveEnergy() +void Foam::regionModels::thermoSurfaceFilm::solveEnergy() { DebugInFunction << endl; @@ -249,7 +249,7 @@ void thermoSingleLayer::solveEnergy() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -thermoSingleLayer::thermoSingleLayer +Foam::regionModels::thermoSurfaceFilm::thermoSurfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -258,7 +258,7 @@ thermoSingleLayer::thermoSingleLayer const bool readFields ) : - kinematicSingleLayer(modelType, mesh, g, regionType, false), + momentumSurfaceFilm(modelType, mesh, g, regionType, false), primaryThermo_ ( @@ -335,16 +335,24 @@ thermoSingleLayer::thermoSingleLayer htcs_ ( - heatTransferModel::New(*this, coeffs().subDict("upperSurfaceModels")) + surfaceFilmSubModels::heatTransferModel::New + ( + *this, + coeffs().subDict("upperSurfaceModels") + ) ), htcw_ ( - heatTransferModel::New(*this, coeffs().subDict("lowerSurfaceModels")) + surfaceFilmSubModels::heatTransferModel::New + ( + *this, + coeffs().subDict("lowerSurfaceModels") + ) ), - phaseChange_(phaseChangeModel::New(*this, coeffs())), - radiation_(radiationModel::New(*this, coeffs())), + phaseChange_(surfaceFilmSubModels::phaseChangeModel::New(*this, coeffs())), + radiation_(surfaceFilmSubModels::radiationModel::New(*this, coeffs())), Tmin_(-vGreat), Tmax_(vGreat) { @@ -421,13 +429,13 @@ thermoSingleLayer::thermoSingleLayer // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -thermoSingleLayer::~thermoSingleLayer() +Foam::regionModels::thermoSurfaceFilm::~thermoSurfaceFilm() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void thermoSingleLayer::addSources +void Foam::regionModels::thermoSurfaceFilm::addSources ( const label patchi, const label facei, @@ -437,7 +445,7 @@ void thermoSingleLayer::addSources const scalar energySource ) { - kinematicSingleLayer::addSources + momentumSurfaceFilm::addSources ( patchi, facei, @@ -453,16 +461,16 @@ void thermoSingleLayer::addSources } -void thermoSingleLayer::preEvolveRegion() +void Foam::regionModels::thermoSurfaceFilm::preEvolveRegion() { DebugInFunction << endl; - kinematicSingleLayer::preEvolveRegion(); + momentumSurfaceFilm::preEvolveRegion(); primaryEnergyTrans_ == dimensionedScalar(dimEnergy, 0); } -void thermoSingleLayer::evolveRegion() +void Foam::regionModels::thermoSurfaceFilm::evolveRegion() { DebugInFunction << endl; @@ -504,13 +512,15 @@ void thermoSingleLayer::evolveRegion() } -tmp thermoSingleLayer::Ts() const +Foam::tmp +Foam::regionModels::thermoSurfaceFilm::Ts() const { return thermo().T(); } -tmp thermoSingleLayer::Tw() const +Foam::tmp +Foam::regionModels::thermoSurfaceFilm::Tw() const { tmp tTw ( @@ -539,9 +549,9 @@ tmp thermoSingleLayer::Tw() const } -void thermoSingleLayer::info() +void Foam::regionModels::thermoSurfaceFilm::info() { - kinematicSingleLayer::info(); + momentumSurfaceFilm::info(); const scalarField& Tinternal = thermo().T(); @@ -554,10 +564,8 @@ void thermoSingleLayer::info() } -tmp thermoSingleLayer::SYi -( - const label i -) const +Foam::tmp +Foam::regionModels::thermoSurfaceFilm::SYi(const label i) const { const basicSpecieMixture& primarySpecieThermo = refCast(primaryThermo_); @@ -609,7 +617,8 @@ tmp thermoSingleLayer::SYi } -tmp thermoSingleLayer::Sh() const +Foam::tmp +Foam::regionModels::thermoSurfaceFilm::Sh() const { tmp tSh ( @@ -647,10 +656,4 @@ tmp thermoSingleLayer::Sh() const } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // end namespace Foam -} // end namespace regionModels -} // end namespace surfaceFilmModels - // ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H similarity index 86% rename from src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H rename to src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H index be356111cf..9880ebe03c 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilm.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::regionModels::surfaceFilmModels::thermoSingleLayer + Foam::regionModels::thermoSurfaceFilm Description Thermodynamic form of single-cell layer surface film model @@ -34,14 +34,14 @@ Description packages. SourceFiles - thermoSingleLayer.C + thermoSurfaceFilm.C \*---------------------------------------------------------------------------*/ -#ifndef thermoSingleLayer_H -#define thermoSingleLayer_H +#ifndef thermoSurfaceFilm_H +#define thermoSurfaceFilm_H -#include "kinematicSingleLayer.H" +#include "momentumSurfaceFilm.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,22 +53,23 @@ class fluidThermo; namespace regionModels { -namespace surfaceFilmModels -{ // Forward declaration of classes -class viscosityModel; -class heatTransferModel; -class phaseChangeModel; -class radiationModel; +namespace surfaceFilmSubModels +{ + class viscosityModel; + class heatTransferModel; + class phaseChangeModel; + class radiationModel; +} /*---------------------------------------------------------------------------*\ - Class thermoSingleLayer Declaration + Class thermoSurfaceFilm Declaration \*---------------------------------------------------------------------------*/ -class thermoSingleLayer +class thermoSurfaceFilm : - public kinematicSingleLayer + public momentumSurfaceFilm { protected: @@ -135,16 +136,16 @@ protected: //- Heat transfer coefficient between film surface and primary // region [W/m^2/K] - autoPtr htcs_; + autoPtr htcs_; //- Heat transfer coefficient between wall and film [W/m^2/K] - autoPtr htcw_; + autoPtr htcw_; //- Phase change - autoPtr phaseChange_; + autoPtr phaseChange_; //- Radiation - autoPtr radiation_; + autoPtr radiation_; // Limits @@ -189,13 +190,13 @@ protected: public: //- Runtime type information - TypeName("thermoSingleLayer"); + TypeName("thermoSurfaceFilm"); // Constructors //- Construct from components - thermoSingleLayer + thermoSurfaceFilm ( const word& modelType, const fvMesh& mesh, @@ -205,11 +206,11 @@ public: ); //- Disallow default bitwise copy construction - thermoSingleLayer(const thermoSingleLayer&) = delete; + thermoSurfaceFilm(const thermoSurfaceFilm&) = delete; //- Destructor - virtual ~thermoSingleLayer(); + virtual ~thermoSurfaceFilm(); // Member Functions @@ -272,16 +273,18 @@ public: // Sub-models //- Return const access to the (surface) heat transfer model - inline const heatTransferModel& htcs() const; + inline const surfaceFilmSubModels::heatTransferModel& htcs() const; //- Return const access to the (wall) heat transfer model - inline const heatTransferModel& htcw() const; + inline const surfaceFilmSubModels::heatTransferModel& htcw() const; //- Return const access to the phase change model - inline const phaseChangeModel& phaseChange() const; + inline const surfaceFilmSubModels::phaseChangeModel& + phaseChange() const; //- Return const access to the radiation model - inline const radiationModel& radiation() const; + inline const surfaceFilmSubModels::radiationModel& + radiation() const; // Evolution @@ -316,19 +319,18 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const thermoSingleLayer&) = delete; + void operator=(const thermoSurfaceFilm&) = delete; }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace surfaceFilmModels } // End namespace regionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "thermoSingleLayerI.H" +#include "thermoSurfaceFilmI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H similarity index 60% rename from src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H rename to src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.H index b09edf5558..276c1bb254 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/thermoSurfaceFilm/thermoSurfaceFilmI.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 @@ -23,80 +23,74 @@ License \*---------------------------------------------------------------------------*/ -#include "thermoSingleLayer.H" +#include "thermoSurfaceFilm.H" #include "filmRadiationModel.H" #include "heatTransferModel.H" #include "phaseChangeModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ -namespace regionModels -{ -namespace surfaceFilmModels -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -inline const fluidThermo& thermoSingleLayer::primaryThermo() const +inline const Foam::fluidThermo& +Foam::regionModels::thermoSurfaceFilm::primaryThermo() const { return primaryThermo_; } -inline const volScalarField::Internal& thermoSingleLayer::hSp() const +inline const Foam::volScalarField::Internal& +Foam::regionModels::thermoSurfaceFilm::hSp() const { return hSp_; } -inline const volScalarField& thermoSingleLayer::hSpPrimary() const +inline const Foam::volScalarField& +Foam::regionModels::thermoSurfaceFilm::hSpPrimary() const { return hSpPrimary_; } -inline const volScalarField& thermoSingleLayer::TPrimary() const +inline const Foam::volScalarField& +Foam::regionModels::thermoSurfaceFilm::TPrimary() const { return TPrimary_; } -inline const PtrList& thermoSingleLayer::YPrimary() const +inline const Foam::PtrList& +Foam::regionModels::thermoSurfaceFilm::YPrimary() const { return YPrimary_; } -inline const heatTransferModel& thermoSingleLayer::htcs() const +inline const Foam::regionModels::surfaceFilmSubModels::heatTransferModel& +Foam::regionModels::thermoSurfaceFilm::htcs() const { return htcs_(); } -inline const heatTransferModel& thermoSingleLayer::htcw() const +inline const Foam::regionModels::surfaceFilmSubModels::heatTransferModel& +Foam::regionModels::thermoSurfaceFilm::htcw() const { return htcw_(); } -inline const phaseChangeModel& thermoSingleLayer::phaseChange() const +inline const Foam::regionModels::surfaceFilmSubModels::phaseChangeModel& +Foam::regionModels::thermoSurfaceFilm::phaseChange() const { return phaseChange_(); } -inline const radiationModel& thermoSingleLayer::radiation() const +inline const Foam::regionModels::surfaceFilmSubModels::radiationModel& +Foam::regionModels::thermoSurfaceFilm::radiation() const { return radiation_(); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace surfaceFilmModels -} // End namespace regionModels -} // End namespace Foam - // ************************************************************************* // diff --git a/tutorials/modules/multicomponentFluid/cylinder/constant/fvModels b/tutorials/modules/multicomponentFluid/cylinder/constant/fvModels index 85b595f233..c0ccd0a504 100644 --- a/tutorials/modules/multicomponentFluid/cylinder/constant/fvModels +++ b/tutorials/modules/multicomponentFluid/cylinder/constant/fvModels @@ -20,9 +20,9 @@ clouds libs ("liblagrangianParcel.so"); } -surfaceFilm +surfaceFilms { - type surfaceFilm; + type surfaceFilms; libs ("libsurfaceFilmModels.so"); } diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/constant/fvModels b/tutorials/modules/multicomponentFluid/hotBoxes/constant/fvModels index 85b595f233..c0ccd0a504 100644 --- a/tutorials/modules/multicomponentFluid/hotBoxes/constant/fvModels +++ b/tutorials/modules/multicomponentFluid/hotBoxes/constant/fvModels @@ -20,9 +20,9 @@ clouds libs ("liblagrangianParcel.so"); } -surfaceFilm +surfaceFilms { - type surfaceFilm; + type surfaceFilms; libs ("libsurfaceFilmModels.so"); } diff --git a/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties b/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties index d5f3122461..31bd3e2a24 100644 --- a/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/modules/multicomponentFluid/hotBoxes/constant/surfaceFilmProperties @@ -68,7 +68,6 @@ ejection drippingEjection { - cloudName reactingCloud1; deltaStable 0; particlesPerParcel 100.0; diff --git a/tutorials/modules/multicomponentFluid/rivuletPanel/constant/fvModels b/tutorials/modules/multicomponentFluid/rivuletPanel/constant/fvModels index f09766254c..0db3d70723 100644 --- a/tutorials/modules/multicomponentFluid/rivuletPanel/constant/fvModels +++ b/tutorials/modules/multicomponentFluid/rivuletPanel/constant/fvModels @@ -14,9 +14,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -surfaceFilm +surfaceFilms { - type surfaceFilm; + type surfaceFilms; libs ("libsurfaceFilmModels.so"); } diff --git a/tutorials/modules/multicomponentFluid/splashPanel/constant/fvModels b/tutorials/modules/multicomponentFluid/splashPanel/constant/fvModels index 85b595f233..c0ccd0a504 100644 --- a/tutorials/modules/multicomponentFluid/splashPanel/constant/fvModels +++ b/tutorials/modules/multicomponentFluid/splashPanel/constant/fvModels @@ -20,9 +20,9 @@ clouds libs ("liblagrangianParcel.so"); } -surfaceFilm +surfaceFilms { - type surfaceFilm; + type surfaceFilms; libs ("libsurfaceFilmModels.so"); }