diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H index 767d626880..4fc525a3a9 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H @@ -22,9 +22,9 @@ cachedRandom rndGen(label(0), -1); - autoPtr p + autoPtr p ( - distributionModels::distributionModel::New + distributionModel::New ( pdfDictionary, rndGen diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C index b6dc0fe45a..e8d1b6d68b 100644 --- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C +++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,7 +109,7 @@ Foam::solverPerformance Foam::fvMatrix::fvSolver::solve scalarField totalSource(fvMat_.source()); fvMat_.addBoundarySource(totalSource, false); - // assign new solver controls + // Assign new solver controls solver_->read(solverControls); solverPerformance solverPerf = solver_->solve diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C index af5aa745cb..a6786f743d 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModel.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,17 +29,14 @@ License namespace Foam { - namespace distributionModels - { - defineTypeNameAndDebug(distributionModel, 0); - defineRunTimeSelectionTable(distributionModel, dictionary); - } + defineTypeNameAndDebug(distributionModel, 0); + defineRunTimeSelectionTable(distributionModel, dictionary); } // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -void Foam::distributionModels::distributionModel::check() const +void Foam::distributionModel::check() const { if (minValue() < 0) { @@ -62,7 +59,7 @@ void Foam::distributionModels::distributionModel::check() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::distributionModels::distributionModel::distributionModel +Foam::distributionModel::distributionModel ( const word& name, const dictionary& dict, @@ -74,7 +71,7 @@ Foam::distributionModels::distributionModel::distributionModel {} -Foam::distributionModels::distributionModel::distributionModel +Foam::distributionModel::distributionModel ( const distributionModel& p ) @@ -86,7 +83,7 @@ Foam::distributionModels::distributionModel::distributionModel // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::distributionModels::distributionModel::~distributionModel() +Foam::distributionModel::~distributionModel() {} diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H index 5e712e10ec..04ab693482 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModel.H +++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,8 +61,6 @@ SourceFiles namespace Foam { -namespace distributionModels -{ /*---------------------------------------------------------------------------*\ Class distributionModel Declaration @@ -155,7 +153,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C index fabb796e0b..c06f65e01e 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,8 +27,7 @@ License // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::distributionModels::distributionModel::New +Foam::autoPtr Foam::distributionModel::New ( const dictionary& dict, cachedRandom& rndGen diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C index 07ec1e9b26..90bb3c7031 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -179,7 +179,7 @@ Foam::CellZoneInjection::CellZoneInjection U0_(this->coeffDict().lookup("U0")), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H index be21d3f5ec..f5fd666537 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ class CellZoneInjection const vector U0_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; // Private Member Functions diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index 88c30c6e0e..6498de08f2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ Foam::ConeInjection::ConeInjection ), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 9cd2a829f5..60228dd149 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ class ConeInjection const TimeFunction1 thetaOuter_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C index 4649b7a7d6..06026be6e6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C @@ -146,7 +146,7 @@ Foam::ConeNozzleInjection::ConeNozzleInjection ), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H index 1ccce9208e..abcca10153 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,7 @@ private: const TimeFunction1 thetaOuter_; //- Parcel size PDF model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index 94c25b01c8..7a0a2ff842 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection diameters_(positions_.size()), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index 8597458062..8190da2fa8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ class FieldActivatedInjection scalarList diameters_; //- Parcel size distribution model - const autoPtr + const autoPtr sizeDistribution_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C index d0f697955b..d104eb8388 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C @@ -72,7 +72,7 @@ Foam::InflationInjection::InflationInjection dSeed_(SMALL), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H index e2248282d5..3cd11f6476 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ class InflationInjection scalar dSeed_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; public: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index 21fc2471f6..60895201d4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::ManualInjection::ManualInjection U0_(this->coeffDict().lookup("U0")), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index d8789a9646..193d01e471 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ class ManualInjection const vector U0_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; //- Flag to suppress errors if particle injection site is out-of-bounds Switch ignoreOutOfBounds_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C index 01873a3091..87842710ba 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ Foam::PatchFlowRateInjection::PatchFlowRateInjection ), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H index 9df1aac0b9..98367b8581 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ class PatchFlowRateInjection const scalar parcelConcentration_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; public: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index b73c4c0d74..6fe472c8ec 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ Foam::PatchInjection::PatchInjection ), sizeDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( this->coeffDict().subDict("sizeDistribution"), owner.rndGen() diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 61ce2c971d..bbd9e77341 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ class PatchInjection const TimeFunction1 flowRateProfile_; //- Parcel size distribution model - const autoPtr sizeDistribution_; + const autoPtr sizeDistribution_; public: diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files index 236a1c2d95..f53e0a0389 100644 --- a/src/regionModels/surfaceFilmModels/Make/files +++ b/src/regionModels/surfaceFilmModels/Make/files @@ -16,6 +16,7 @@ $(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 $(KINEMATICMODELS)/injectionModel/injectionModel/injectionModel.C diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C index c4195ad2b5..85333cc828 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C @@ -53,7 +53,7 @@ distributionContactAngleForce::distributionContactAngleForce rndGen_(label(0), -1), distribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( coeffDict_.subDict("distribution"), rndGen_ diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H index 508b66ad6c..2a0ace4303 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H @@ -29,7 +29,7 @@ Description See also Foam::regionModels::surfaceFilmModels::contactAngleForce - Foam::distributionModels::distributionModel + Foam::distributionModel SourceFiles distributionContactAngleForce.C @@ -53,7 +53,7 @@ namespace surfaceFilmModels { /*---------------------------------------------------------------------------*\ - Class distributionContactAngleForce Declaration + Class distributionContactAngleForce Declaration \*---------------------------------------------------------------------------*/ class distributionContactAngleForce @@ -66,7 +66,7 @@ class distributionContactAngleForce cachedRandom rndGen_; //- Parcel size PDF model - const autoPtr distribution_; + const autoPtr distribution_; // Private member functions diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C new file mode 100644 index 0000000000..62ffeba4f9 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C @@ -0,0 +1,139 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 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 "perturbedTemperatureDependentContactAngleForce.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace regionModels +{ +namespace surfaceFilmModels +{ + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +defineTypeNameAndDebug(perturbedTemperatureDependentContactAngleForce, 0); +addToRunTimeSelectionTable +( + force, + perturbedTemperatureDependentContactAngleForce, + dictionary +); + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +perturbedTemperatureDependentContactAngleForce:: +perturbedTemperatureDependentContactAngleForce +( + surfaceFilmModel& film, + const dictionary& dict +) +: + contactAngleForce(typeName, film, dict), + thetaPtr_(Function1::New("theta", coeffDict_)), + rndGen_(label(0), -1), + distribution_ + ( + distributionModel::New + ( + coeffDict_.subDict("distribution"), + rndGen_ + ) + ) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +perturbedTemperatureDependentContactAngleForce:: +~perturbedTemperatureDependentContactAngleForce() +{} + + +// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // + +tmp +perturbedTemperatureDependentContactAngleForce::theta() const +{ + tmp ttheta + ( + new volScalarField + ( + IOobject + ( + typeName + ":theta", + filmModel_.time().timeName(), + filmModel_.regionMesh() + ), + filmModel_.regionMesh(), + dimensionedScalar("0", dimless, 0) + ) + ); + + volScalarField& theta = ttheta.ref(); + volScalarField::Internal& thetai = theta.ref(); + + const volScalarField& T = filmModel_.T(); + + // Initialize with the function of temperature + thetai.field() = thetaPtr_->value(T()); + + // Add the stochastic perturbation + forAll(thetai, celli) + { + thetai[celli] += distribution_->sample(); + } + + forAll(theta.boundaryField(), patchi) + { + if (!filmModel_.isCoupledPatch(patchi)) + { + fvPatchField& thetaf = theta.boundaryFieldRef()[patchi]; + + // Initialize with the function of temperature + thetaf = thetaPtr_->value(T.boundaryField()[patchi]); + + // Add the stochastic perturbation + forAll(thetaf, facei) + { + thetaf[facei] += distribution_->sample(); + } + } + } + + return ttheta; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace surfaceFilmModels +} // End namespace regionModels +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H new file mode 100644 index 0000000000..00dddb2577 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H @@ -0,0 +1,134 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2017 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 . + +Class + Foam::regionModels::surfaceFilmModels:: + perturbedTemperatureDependentContactAngleForce + +Description + Temperature dependent contact angle force with a stochastic perturbation + + The contact angle in degrees is specified as a Foam::Function1 type, to + enable the use of, e.g. contant, polynomial, table values and the + stochastic perturbation obtained from a + Foam::distributionModels::distributionModel + +See also + Foam::regionModels::surfaceFilmModels::contactAngleForce + Foam::regionModels::surfaceFilmModels::temperatureDependentContactAngleForce + Foam::regionModels::surfaceFilmModels::distributionContactAngleForce + Foam::Function1Types + Foam::distributionModel + +SourceFiles + perturbedTemperatureDependentContactAngleForce.C + +\*---------------------------------------------------------------------------*/ + +#ifndef perturbedTemperatureDependentContactAngleForce_H +#define perturbedTemperatureDependentContactAngleForce_H + +#include "contactAngleForce.H" +#include "Function1.H" +#include "distributionModel.H" +#include "cachedRandom.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace regionModels +{ +namespace surfaceFilmModels +{ + +/*---------------------------------------------------------------------------*\ + Class perturbedTemperatureDependentContactAngleForce Declaration +\*---------------------------------------------------------------------------*/ + +class perturbedTemperatureDependentContactAngleForce +: + public contactAngleForce +{ + // Private Data + + //- Contact angle function + autoPtr> thetaPtr_; + + //- Random number generator + cachedRandom rndGen_; + + //- Parcel size PDF model + const autoPtr distribution_; + + + // Private member functions + + //- Disallow default bitwise copy construct + perturbedTemperatureDependentContactAngleForce + ( + const perturbedTemperatureDependentContactAngleForce& + ); + + //- Disallow default bitwise assignment + void operator=(const perturbedTemperatureDependentContactAngleForce&); + + +protected: + + //- Return the contact angle field + virtual tmp theta() const; + + +public: + + //- Runtime type information + TypeName("perturbedTemperatureDependentContactAngle"); + + + // Constructors + + //- Construct from surface film model + perturbedTemperatureDependentContactAngleForce + ( + surfaceFilmModel& film, + const dictionary& dict + ); + + + //- Destructor + virtual ~perturbedTemperatureDependentContactAngleForce(); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace surfaceFilmModels +} // End namespace regionModels +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H index 780b2b3288..ca15ec0c6a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.H @@ -27,7 +27,7 @@ Class Description Temperature dependent contact angle force - The contact angle in degrees is specified as a \c Function1 type, to + The contact angle in degrees is specified as a Foam::Function1 type, to enable the use of, e.g. contant, polynomial, table values. See also @@ -55,7 +55,7 @@ namespace surfaceFilmModels { /*---------------------------------------------------------------------------*\ - Class temperatureDependentContactAngleForce Declaration + Class temperatureDependentContactAngleForce Declaration \*---------------------------------------------------------------------------*/ class temperatureDependentContactAngleForce diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C index 47559956da..cfd6d408f0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C @@ -60,7 +60,7 @@ drippingInjection::drippingInjection rndGen_(label(0), -1), parcelDistribution_ ( - distributionModels::distributionModel::New + distributionModel::New ( coeffDict_.subDict("parcelDistribution"), rndGen_ diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H index c6bc895c3a..af9583bf22 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H @@ -87,7 +87,7 @@ protected: cachedRandom rndGen_; //- Parcel size PDF model - const autoPtr + const autoPtr parcelDistribution_; //- Diameters of particles to inject into the dripping