diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C index 098b4282a1..26ecedfb0a 100644 --- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C +++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.C @@ -50,7 +50,7 @@ Foam::fv::atmPlantCanopyTurbSource::calcPlantCanopyTerm ) const { // (SP:Eq. 42) - return 12.0*Foam::sqrt(Cmu_)*plantCd_()*leafAreaDensity_()*mag(U); + return 12.0*Foam::sqrt(Cmu_)*Cd_()*LAD_()*mag(U); } @@ -70,11 +70,11 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource Cmu_(Zero), C1_(Zero), C2_(Zero), - plantCd_ + Cd_ ( IOobject ( - "plantCd", + "Cd", mesh.time().timeName(), mesh, IOobject::MUST_READ, @@ -82,11 +82,11 @@ Foam::fv::atmPlantCanopyTurbSource::atmPlantCanopyTurbSource ), mesh ), - leafAreaDensity_ + LAD_ ( IOobject ( - "leafAreaDensity", + "LAD", mesh.time().timeName(), mesh, IOobject::MUST_READ, diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H index e6a053ee53..a0bb3e2f76 100644 --- a/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H +++ b/src/atmosphericModels/fvOptions/atmPlantCanopyTurbSource/atmPlantCanopyTurbSource.H @@ -43,8 +43,8 @@ Description Required fields: \verbatim epsilon/omega | Dissipation rate OR Spec. dissipation rate [m2/s3]/[1/s] - plantCd | Plant canopy drag coefficient [-] - leafAreaDensity | Leaf area density [1/m] + Cd | Plant canopy drag coefficient [-] + LAD | Leaf area density [1/m] \endverbatim References: @@ -133,10 +133,10 @@ class atmPlantCanopyTurbSource // Fields //- Plant canopy drag coefficient field [-] - volScalarField plantCd_; + volScalarField Cd_; //- Leaf area density field [1/m] - volScalarField leafAreaDensity_; + volScalarField LAD_; // Private Member Functions diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C index 15f448ff57..b8697d1fa3 100644 --- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C +++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.C @@ -54,11 +54,11 @@ Foam::fv::atmPlantCanopyUSource::atmPlantCanopyUSource : fv::cellSetOption(sourceName, modelType, dict, mesh), rhoName_(coeffs_.getOrDefault("rho", "rho")), - plantCd_ + Cd_ ( IOobject ( - "plantCd", + "Cd", mesh.time().timeName(), mesh, IOobject::MUST_READ, @@ -66,11 +66,11 @@ Foam::fv::atmPlantCanopyUSource::atmPlantCanopyUSource ), mesh ), - leafAreaDensity_ + LAD_ ( IOobject ( - "leafAreaDensity", + "LAD", mesh.time().timeName(), mesh, IOobject::MUST_READ, @@ -100,7 +100,7 @@ void Foam::fv::atmPlantCanopyUSource::addSup if (V_ > VSMALL) { // (SP:Eq. 42) - eqn -= fvm::Sp(plantCd_*leafAreaDensity_*mag(U), U); + eqn -= fvm::Sp(Cd_*LAD_*mag(U), U); } } @@ -116,7 +116,7 @@ void Foam::fv::atmPlantCanopyUSource::addSup if (V_ > VSMALL) { - eqn -= fvm::Sp(rho*plantCd_*leafAreaDensity_*mag(U), U); + eqn -= fvm::Sp(rho*Cd_*LAD_*mag(U), U); } } @@ -133,7 +133,7 @@ void Foam::fv::atmPlantCanopyUSource::addSup if (V_ > VSMALL) { - eqn -= fvm::Sp(alpha*rho*plantCd_*leafAreaDensity_*mag(U), U); + eqn -= fvm::Sp(alpha*rho*Cd_*LAD_*mag(U), U); } } diff --git a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H index 035204be7e..9d0723904c 100644 --- a/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H +++ b/src/atmosphericModels/fvOptions/atmPlantCanopyUSource/atmPlantCanopyUSource.H @@ -42,8 +42,8 @@ Description Required fields: \verbatim U | Velocity [m/s] - plantCd | Plant canopy drag coefficient [-] - leafAreaDensity | Leaf area density [1/m] + Cd | Plant canopy drag coefficient [-] + LAD | Leaf area density [1/m] \endverbatim References: @@ -124,10 +124,10 @@ class atmPlantCanopyUSource // Fields //- Plant canopy drag coefficient field [-] - volScalarField plantCd_; + volScalarField Cd_; //- Leaf area density field [1/m] - volScalarField leafAreaDensity_; + volScalarField LAD_; public: diff --git a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C index 94e393c2ee..0b06f04c14 100644 --- a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C +++ b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.C @@ -67,10 +67,8 @@ tmp kL::nutPrime() const template tmp kL::epsilonCanopy() const { - const auto* CdPtr = - this->mesh_.template findObject("plantCd"); - const auto* LADPtr = - this->mesh_.template findObject("leafAreaDensity"); + const auto* CdPtr = this->mesh_.template findObject("Cd"); + const auto* LADPtr = this->mesh_.template findObject("LAD"); const volVectorField& U = this->U_; if (CdPtr && LADPtr) diff --git a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.H b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.H index 870b38ac69..46caa1b5b4 100644 --- a/src/atmosphericModels/turbulenceModels/RAS/kL/kL.H +++ b/src/atmosphericModels/turbulenceModels/RAS/kL/kL.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2021 OpenCFD Ltd. + Copyright (C) 2021-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -104,8 +104,8 @@ Usage \heading Input fields (optional) \plaintable canopyHeight | Canopy height [m] - plantCd | Plant canopy drag coefficient [-] - leafAreaDensity | Leaf area density [1/m] + Cd | Plant canopy drag coefficient [-] + LAD | Leaf area density [1/m] Rt | Turbulent Richardson number [-] L | Characteristic length scale [m] \endplaintable diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd similarity index 97% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/plantCd rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd index 937ded772d..60ea922677 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/plantCd +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/Cd @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object plantCd; + object Cd; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD similarity index 97% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/leafAreaDensity rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD index 3b7b597b54..c6f2009fae 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/leafAreaDensity +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/setups.orig/common/0.orig/LAD @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object leafAreaDensity; + object LAD; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/plantCd b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/plantCd rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/Cd diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/leafAreaDensity b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD similarity index 97% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/leafAreaDensity rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD index 3a65f8347c..48b1a76306 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/leafAreaDensity +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/common/0.orig/LAD @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object leafAreaDensity; + object LAD; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict index 725d7d2cbd..4752c8f1a5 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/neutral/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } ); diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict index 2b64fb1997..aa8aecfb3f 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyStable/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } ); diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict index 49e7e54314..906afbfdcc 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/slightlyUnstable/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } ); diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict index 10593c0cac..07a4f536e3 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/stable/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } ); diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict index ed88dd4404..54debfbeb7 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/unstable/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } ); diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict index a9a5a0cb5c..0d41b0c508 100644 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/setups.orig/veryStable/system/setFieldsDict @@ -17,8 +17,8 @@ FoamFile defaultFieldValues ( volScalarFieldValue qPlant 0 - volScalarFieldValue plantCd 0 - volScalarFieldValue leafAreaDensity 0 + volScalarFieldValue Cd 0 + volScalarFieldValue LAD 0 ); regions @@ -37,8 +37,8 @@ regions box (0 0 0) (200 200 18.2192); fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } @@ -47,8 +47,8 @@ regions patch bottom; fieldValues ( - volScalarFieldValue plantCd 0.2 - volScalarFieldValue leafAreaDensity 0.14 + volScalarFieldValue Cd 0.2 + volScalarFieldValue LAD 0.14 ); } );