From 1f826361c6720c2c3b0b1af9711a5ebed8381fa0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Tue, 22 Nov 2016 14:50:33 +0000
Subject: [PATCH] STYLE: Consistency updates to change input of <var>Name to
<var>. Fixes #306
---
.../solvers/lagrangian/DPMFoam/DPMFoam.C | 2 +-
.../solvers/lagrangian/DPMFoam/createFields.H | 4 +-
.../createFields.H | 2 +-
.../icoUncoupledKinematicParcelDyMFoam.C | 2 +-
.../icoUncoupledKinematicParcelFoam.C | 2 +-
.../createFields.H | 2 +-
.../uncoupledKinematicParcelFoam.C | 2 +-
.../copiedFixedValueFvPatchScalarField.C | 4 +-
.../copiedFixedValueFvPatchScalarField.H | 1 +
.../passiveParticle/Test-passiveParticle.C | 2 +-
.../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 4 +-
.../miscellaneous/foamList/Make/options | 33 ++---
.../lagrangian/particleTracks/createFields.H | 2 +-
.../steadyParticleTracks/createFields.H | 2 +-
...ppedUniformInletHeatAdditionFvPatchField.C | 14 ++-
...ppedUniformInletHeatAdditionFvPatchField.H | 7 +-
.../outletMappedUniformInletFvPatchField.H | 6 +-
.../field/DESModelRegions/DESModelRegions.C | 2 +-
.../field/fluxSummary/fluxSummary.C | 2 +-
.../field/streamLine/streamLineBase.C | 2 +-
.../field/valueAverage/valueAverage.C | 4 +-
.../fieldVisualisationBase.C | 2 +-
.../functionObjectCloud.C | 4 +-
.../averageCondition/averageCondition.C | 2 +-
.../interRegionOption/interRegionOption.C | 2 +-
.../acousticDampingSource.C | 2 +-
.../effectivenessHeatExchangerSource.C | 6 +-
.../tabulatedNTUHeatTransfer.C | 16 +--
.../tabulatedNTUHeatTransfer.H | 4 +-
.../PatchFlowRateInjection.C | 2 +-
.../PatchInjection/PatchInjection.C | 2 +-
.../ParticleForces/Interface/InterfaceForce.C | 15 +--
.../NonInertialFrame/NonInertialFrameForce.C | 8 +-
src/meshTools/coordinateSystems/cartesianCS.H | 2 +-
.../regionModel/regionModel/regionModel.C | 4 +-
.../thermalBaffleFvPatchScalarField.C | 26 ++--
src/sampling/probes/patchProbes.C | 2 +-
.../TDACChemistryModel/reduction/DAC/DAC.C | 114 ++++++------------
.../TDACChemistryModel/reduction/DAC/DAC.H | 10 +-
...emperatureCoupledMixedFvPatchScalarField.C | 4 +-
.../system/PDRMeshDict | 4 +-
.../LES/compartmentFire/0/panelRegion/T | 2 +-
.../compartmentFire/constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../LES/compartmentFire/system/controlDict | 4 +-
.../constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../simplePMMApanel/constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../smallPoolFire2D/constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../smallPoolFire3D/constant/pyrolysisZones | 2 +-
.../constant/surfaceFilmProperties | 4 +-
.../3DBaffle/3DTemperatureMasterBafflePatches | 16 +--
.../0.orig/include/baffle3DSetup | 18 +--
.../windshieldCondensation/0.orig/cabin/T | 2 +-
.../system/cabin/fvSchemes | 1 +
.../heatExchanger/constant/air/fvOptions | 4 +-
.../heatExchanger/constant/porous/fvOptions | 2 +-
.../RAS/pitzDaily/system/controlDict | 14 +++
.../motorBike/motorBike/system/controlDict | 2 +-
.../motorBike/system/runtimePostProcessing | 4 +-
.../motorBike/motorBike/system/streamLines | 2 +-
.../motorBike/system/decomposeParDict.6 | 2 +-
.../simpleFoam/motorBike/system/streamLines | 2 +-
.../motorBike/system/wallBoundedStreamLines | 10 +-
.../pitzDailyExptInlet/system/controlDict | 6 +-
.../Goldschmidt/constant/transportProperties | 2 +-
.../Goldschmidt/constant/transportProperties | 2 +-
.../column/constant/transportProperties | 2 +-
.../cyclone/constant/kinematicCloudProperties | 2 +-
.../cyclone/constant/transportProperties | 2 +-
.../constant/kinematicCloudProperties | 4 +-
.../constant/transportProperties | 2 +-
.../cylinder/constant/surfaceFilmProperties | 4 +-
.../hotBoxes/constant/surfaceFilmProperties | 6 +-
.../constant/surfaceFilmProperties | 4 +-
.../constant/surfaceFilmProperties | 4 +-
.../filter/constant/particleTrackProperties | 2 +-
.../constant/particleTrackProperties | 2 +-
.../constant/reactingCloud1Properties | 2 +-
.../constant/particleTrackDict | 2 +-
.../constant/reactingCloud1Properties | 2 +-
.../constant/particleTrackDict | 2 +-
.../constant/reactingCloud1Properties | 2 +-
.../filter/constant/particleTrackProperties | 2 +-
.../constant/kinematicCloudProperties | 4 +-
89 files changed, 242 insertions(+), 271 deletions(-)
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index c23d85bfe85..85bba58da3f 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index 26467976f5e..49f280e428c 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -11,7 +11,7 @@ word continuousPhaseName
mesh,
IOobject::MUST_READ
)
- ).lookup("continuousPhaseName")
+ ).lookup("continuousPhase")
);
Info<< "Reading field U\n" << endl;
@@ -123,7 +123,7 @@ volScalarField alphac
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicTypeCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 77287eed876..76c70fffd95 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -58,7 +58,7 @@ volScalarField mu
);
word kinematicCloudName("kinematicCloud");
-args.optionReadIfPresent("cloudName", kinematicCloudName);
+args.optionReadIfPresent("cloud", kinematicCloudName);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
basicKinematicCollidingCloud kinematicCloud
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
index d672386e50f..be0905796ba 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index c21100b0be8..6b64ce99f3e 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
index 9f728049f9b..9aa648ce5f9 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
const word kinematicCloudName
(
- args.optionLookupOrDefault<word>("cloudName", "kinematicCloud")
+ args.optionLookupOrDefault<word>("cloud", "kinematicCloud")
);
Info<< "Constructing kinematicCloud " << kinematicCloudName << endl;
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index d3a1f829fdf..006c98b7a88 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
{
argList::addOption
(
- "cloudName",
+ "cloud",
"name",
"specify alternative cloud name. default is 'kinematicCloud'"
);
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
index 2f7abc70151..63c85938cfd 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
@@ -49,7 +49,7 @@ Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- sourceFieldName_(dict.lookup("sourceFieldName"))
+ sourceFieldName_(dict.lookup("sourceField"))
{}
@@ -109,7 +109,7 @@ void Foam::copiedFixedValueFvPatchScalarField::updateCoeffs()
void Foam::copiedFixedValueFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
- os.writeKeyword("sourceFieldName")
+ os.writeKeyword("sourceField")
<< sourceFieldName_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
index b2af2f1c4a8..f0f224d3535 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
@@ -62,6 +62,7 @@ protected:
word sourceFieldName_;
+
public:
//- Runtime type information
diff --git a/applications/test/passiveParticle/Test-passiveParticle.C b/applications/test/passiveParticle/Test-passiveParticle.C
index 68bea7b8efa..96fcc352827 100644
--- a/applications/test/passiveParticle/Test-passiveParticle.C
+++ b/applications/test/passiveParticle/Test-passiveParticle.C
@@ -36,7 +36,7 @@ Description
int main(int argc, char *argv[])
{
- argList::validArgs.append("cloudName");
+ argList::validArgs.append("cloud");
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
index 25c536e1032..7385fd50293 100644
--- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
+++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
@@ -602,8 +602,8 @@ int main(int argc, char *argv[])
const word& key = iter().keyword();
const dictionary& dict = iter().dict();
- const word cyclicName = dict.lookup("cyclicMasterPatchName");
- const word wallName = dict.lookup("wallPatchName");
+ const word cyclicName = dict.lookup("cyclicMasterPatch");
+ const word wallName = dict.lookup("wallPatch");
FixedList<word, 3> nameAndType;
nameAndType[0] = key;
nameAndType[1] = wallName;
diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options
index 84027a1c28d..18d4dfeb9fa 100644
--- a/applications/utilities/miscellaneous/foamList/Make/options
+++ b/applications/utilities/miscellaneous/foamList/Make/options
@@ -15,10 +15,12 @@ EXE_LIBS = \
-lchemistryModel \
-lcoalCombustion \
-lcombustionModels \
- -lcompressibleTransportModels \
+ -lcompressibleEulerianInterfacialModels \
+ -lcompressibleMultiphaseEulerianInterfacialModels \
-lcompressibleTurbulenceModels \
- -lconversion \
- -ldecompose \
+ -lCompressibleTwoPhaseMixtureTurbulenceModels \
+ -lcompressibleTwoPhaseSystem \
+ -lconformalVoronoiMesh \
-ldecompositionMethods \
-ldistributed \
-ldistributionModels \
@@ -35,29 +37,32 @@ EXE_LIBS = \
-lfileFormats \
-lfiniteVolume \
-lfluidThermophysicalModels \
+ -lfoamToVTK \
-lforces \
-lfvMotionSolvers \
-lfvOptions \
-lgenericPatchFields \
- -limmiscibleIncompressibleTwoPhaseMixture \
+ -lhelpTypes \
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-linterfaceProperties \
-llagrangianFunctionObjects \
-llagrangianIntermediate \
- -llagrangian \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
- -lliquidMixtureProperties \
+ -lliquidPropertiesFvPatchFields \
-lliquidProperties \
-lmeshTools \
- -lmolecularMeasurements \
- -lmolecule \
+ -lmultiphaseInterFoam \
+ -lmultiphaseMixtureThermo \
+ -lmultiphaseReactingTurbulenceModels \
+ -lmultiphaseSystem \
-lODE \
-lOpenFOAM \
- -lpairPatchAgglomeration \
-lphaseChangeTwoPhaseMixtures \
+ -lphaseCompressibleTurbulenceModels \
+ -lphaseTemperatureChangeTwoPhaseMixtures \
-lpotential \
-lpyrolysisModels \
-lradiationModels \
@@ -68,7 +73,6 @@ EXE_LIBS = \
-lreactingPhaseSystem \
-lreactingTwoPhaseSystem \
-lreactionThermophysicalModels \
- -lreconstruct \
-lregionCoupled \
-lregionCoupling \
-lregionModels \
@@ -79,11 +83,9 @@ EXE_LIBS = \
-lsampling \
-lscotchDecomp \
-lsixDoFRigidBodyMotion \
- -lSLGThermo \
+ -lSloanRenumber \
-lsnappyHexMesh \
-lsolidChemistryModel \
- -lsolidMixtureProperties \
- -lsolidParticle \
-lsolidProperties \
-lsolidSpecie \
-lsolidThermo \
@@ -92,13 +94,12 @@ EXE_LIBS = \
-lsurfaceFilmDerivedFvPatchFields \
-lsurfaceFilmModels \
-lsurfMesh \
+ -ltabulatedWallFunctions \
-lthermalBaffleModels \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
- -ltriSurface \
+ -lturbulenceModelSchemes \
-lturbulenceModels \
- -ltwoPhaseMixture \
- -ltwoPhaseMixtureThermo \
-ltwoPhaseProperties \
-ltwoPhaseReactingTurbulenceModels \
-lutilityFunctionObjects
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index 78738e321d8..267d0959a8d 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -9,7 +9,7 @@ IOdictionary propsDict
)
);
-const word cloudName(propsDict.lookup("cloudName"));
+const word cloudName(propsDict.lookup("cloud"));
label sampleFrequency(readLabel(propsDict.lookup("sampleFrequency")));
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
index 309d7718f66..67699d3c0ab 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
@@ -4,6 +4,6 @@ const word dictName("particleTrackDict");
IOdictionary propsDict(dictIO);
-word cloudName(propsDict.lookup("cloudName"));
+word cloudName(propsDict.lookup("cloud"));
List<word> userFields(propsDict.lookup("fields"));
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 1522f658388..55a81ea6ecd 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -74,7 +74,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- outletPatchName_(dict.lookup("outletPatchName")),
+ outletPatchName_(dict.lookup("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
Q_(readScalar(dict.lookup("Q"))),
minTempLimit_(dict.lookupOrDefault<scalar>("minTempLimit", 0)),
@@ -167,8 +167,7 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
scalar averageOutletField =
gSum(outletPatchPhi*outletPatchField)/sumOutletPatchPhi;
- const scalarField Cpf =
- thermo.Cp()().boundaryField()[outletPatchID];
+ const scalarField Cpf(thermo.Cp()().boundaryField()[outletPatchID]);
scalar totalPhiCp = gSum(outletPatchPhi)*gAverage(Cpf);
@@ -198,11 +197,13 @@ void Foam::outletMappedUniformInletHeatAdditionFvPatchField::updateCoeffs()
}
-void Foam::outletMappedUniformInletHeatAdditionFvPatchField::
-write(Ostream& os) const
+void Foam::outletMappedUniformInletHeatAdditionFvPatchField::write
+(
+ Ostream& os
+) const
{
fvPatchScalarField::write(os);
- os.writeKeyword("outletPatchName")
+ os.writeKeyword("outletPatch")
<< outletPatchName_ << token::END_STATEMENT << nl;
writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
@@ -216,6 +217,7 @@ write(Ostream& os) const
this->writeEntry("value", os);
}
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
index ee61b693379..4dcd6885555 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
@@ -29,7 +29,7 @@ Group
Description
This temperature boundary conditon averages the temperature over the
- "outlet" patch specified by name "outletPatchName" and applies an extra
+ "outlet" patch specified by name "outletPatch" and applies an extra
heat source. This is set as a uniform temperature value on this patch.
Additionally minTempLimit/maxTempLimit limits can be applied
@@ -37,7 +37,7 @@ Description
\table
Property | Description | Required | Default value
- outletPatchName | name of outlet patch | yes |
+ outletPatch | name of outlet patch | yes |
Q | Heat addition | yes
phi | flux field name | no | phi
minTempLimit | min temperature limit | no | 0.0
@@ -49,7 +49,7 @@ Description
myPatch
{
type outletMappedUniformInletHeatAddition;
- outletPatchName aPatch;
+ outletPatch aPatch;
Q 10; // Heat addition in W
phi phi;
value uniform 0;
@@ -100,6 +100,7 @@ class outletMappedUniformInletHeatAdditionFvPatchField
//- Maxmum Temperature Limit
scalar maxTempLimit_;
+
public:
//- Runtime type information
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
index c777ff623a4..dd367ca3f8b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.H
@@ -29,13 +29,13 @@ Group
Description
This boundary conditon averages the field over the "outlet" patch specified
- by name "outletPatchName" and applies this as the uniform value of the
+ by name "outletPatch" and applies this as the uniform value of the
field over this patch.
Usage
\table
Property | Description | Required | Default value
- outletPatchName | name of outlet patch | yes |
+ outletPatch | name of outlet patch | yes |
phi | flux field name | no | phi
\endtable
@@ -44,7 +44,7 @@ Usage
<patchName>
{
type outletMappedUniformInlet;
- outletPatchName aPatch;
+ outletPatch aPatch;
phi phi;
value uniform 0;
}
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 360af5136c9..bb94a127677 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -113,7 +113,7 @@ bool Foam::functionObjects::DESModelRegions::read(const dictionary& dict)
fvMeshFunctionObject::read(dict);
writeFile::read(dict);
- dict.readIfPresent("resultName", resultName_);
+ dict.readIfPresent("result", resultName_);
return true;
}
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 7a27f185272..cfe7a3e18c2 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -623,7 +623,7 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict)
writeFile::read(dict);
mode_ = modeTypeNames_.read(dict.lookup("mode"));
- phiName_= dict.lookupOrDefault<word>("phiName", "phi");
+ phiName_= dict.lookupOrDefault<word>("phi", "phi");
dict.readIfPresent("scaleFactor", scaleFactor_);
dict.readIfPresent("tolerance", tolerance_);
diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C
index 2a489fdc78a..9b6daeee12c 100644
--- a/src/functionObjects/field/streamLine/streamLineBase.C
+++ b/src/functionObjects/field/streamLine/streamLineBase.C
@@ -558,7 +558,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
//Info<< " using interpolation " << interpolationScheme_ << endl;
- cloudName_ = dict.lookupOrDefault<word>("cloudName", type());
+ cloudName_ = dict.lookupOrDefault<word>("cloud", type());
dict.lookup("seedSampleSet") >> seedSet_;
const dictionary& coeffsDict = dict.subDict(seedSet_ + "Coeffs");
diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C
index a5a7100aed6..7b26468a4fb 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/functionObjects/field/valueAverage/valueAverage.C
@@ -70,7 +70,7 @@ Foam::functionObjects::valueAverage::valueAverage
:
regionFunctionObject(name, runTime, dict),
writeFile(obr_, name, typeName, dict),
- functionObjectName_("unknown-functionObjectName"),
+ functionObjectName_("unknown-functionObject"),
fieldNames_(),
window_(-1),
totalTime_(),
@@ -109,7 +109,7 @@ bool Foam::functionObjects::valueAverage::read(const dictionary& dict)
regionFunctionObject::read(dict);
writeFile::read(dict);
- dict.lookup("functionObjectName") >> functionObjectName_;
+ dict.lookup("functionObject") >> functionObjectName_;
dict.lookup("fields") >> fieldNames_;
window_ = dict.lookupOrDefault<scalar>("window", -1);
diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
index e88d6a7eb74..f43b60c172d 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C
@@ -514,7 +514,7 @@ Foam::functionObjects::fieldVisualisationBase::fieldVisualisationBase
:
parent_(parent),
colours_(colours),
- fieldName_(dict.lookup("fieldName")),
+ fieldName_(dict.lookup("field")),
colourBy_(cbColour),
colourMap_(cmRainbow),
range_()
diff --git a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
index 044ed7b51ea..a414f269c9e 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/functionObjectCloud.C
@@ -63,9 +63,9 @@ Foam::functionObjects::runTimePostPro::functionObjectCloud::functionObjectCloud
:
pointData(parent, dict, colours),
fieldVisualisationBase(parent, dict, colours),
- cloudName_(dict.lookup("cloudName")),
+ cloudName_(dict.lookup("cloud")),
functionObject_(dict.lookup("functionObject")),
- colourFieldName_(dict.lookup("colourFieldName")),
+ colourFieldName_(dict.lookup("colourField")),
actor_()
{
actor_ = vtkSmartPointer<vtkActor>::New();
diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
index 8f0c5d72afa..37e19ce07e7 100644
--- a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
+++ b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C
@@ -53,7 +53,7 @@ Foam::functionObjects::runTimeControls::averageCondition::averageCondition
)
:
runTimeCondition(name, obr, dict, state),
- functionObjectName_(dict.lookup("functionObjectName")),
+ functionObjectName_(dict.lookup("functionObject")),
fieldNames_(dict.lookup("fields")),
tolerance_(readScalar(dict.lookup("tolerance"))),
window_(dict.lookupOrDefault<scalar>("window", -1)),
diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C
index cb848dc4d88..54560190558 100644
--- a/src/fvOptions/interRegionOption/interRegionOption.C
+++ b/src/fvOptions/interRegionOption/interRegionOption.C
@@ -102,7 +102,7 @@ Foam::fv::interRegionOption::interRegionOption
mesh
),
master_(coeffs_.lookupOrDefault<bool>("master", true)),
- nbrRegionName_(coeffs_.lookup("nbrRegionName")),
+ nbrRegionName_(coeffs_.lookup("nbrRegion")),
meshInterpPtr_()
{
if (active())
diff --git a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
index 767f0224897..b6c2be4abc6 100644
--- a/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
+++ b/src/fvOptions/sources/derived/acousticDampingSource/acousticDampingSource.C
@@ -106,7 +106,7 @@ Foam::fv::acousticDampingSource::acousticDampingSource
zeroGradientFvPatchField<vector>::typeName
)
),
- URefName_("unknown-URefName"),
+ URefName_("unknown-URef"),
x0_(Zero),
r1_(0),
r2_(0),
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index b0ecd8c43dd..89de057f5d0 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -304,9 +304,9 @@ bool Foam::fv::effectivenessHeatExchangerSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
- UName_ = coeffs_.lookupOrDefault<word>("UName", "U");
- TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
- phiName_ = coeffs_.lookupOrDefault<word>("phiName", "phi");
+ UName_ = coeffs_.lookupOrDefault<word>("U", "U");
+ TName_ = coeffs_.lookupOrDefault<word>("T", "T");
+ phiName_ = coeffs_.lookupOrDefault<word>("phi", "phi");
coeffs_.lookup("faceZone") >> faceZoneName_;
coeffs_.lookup("secondaryMassFlowRate") >> secondaryMassFlowRate_;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
index 4190a1deb2b..af0894d4f49 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.C
@@ -207,10 +207,10 @@ Foam::fv::tabulatedNTUHeatTransfer::tabulatedNTUHeatTransfer
)
:
interRegionHeatTransferModel(name, modelType, dict, mesh),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
- rhoName_(coeffs_.lookupOrDefault<word>("rhoName", "rho")),
- rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbrName", "rho")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
+ rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
+ rhoNbrName_(coeffs_.lookupOrDefault<word>("rhoNbr", "rho")),
ntuTable_(),
geometryMode_(gmCalculated),
Ain_(-1),
@@ -275,10 +275,10 @@ bool Foam::fv::tabulatedNTUHeatTransfer::read(const dictionary& dict)
{
if (option::read(dict))
{
- coeffs_.readIfPresent("UName", UName_);
- coeffs_.readIfPresent("UNbrName", UNbrName_);
- coeffs_.readIfPresent("rhoName", rhoName_);
- coeffs_.readIfPresent("rhoNbrName", rhoNbrName_);
+ coeffs_.readIfPresent("U", UName_);
+ coeffs_.readIfPresent("UNbr", UNbrName_);
+ coeffs_.readIfPresent("rho", rhoName_);
+ coeffs_.readIfPresent("rhoNbr", rhoNbrName_);
// Force geometry re-initialisation
Ain_ = -1;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
index fb488418d4f..4e0e0170ce8 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedNTUHeatTransfer/tabulatedNTUHeatTransfer.H
@@ -68,13 +68,13 @@ Description
tabulatedNTUHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
fieldNames (h);
outOfBounds clamp;
fileName "ntuTable";
- nbrModelName airToCooler;
+ nbrModel airToCooler;
semiImplicit no;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 41b1555d383..c1fd0f678e0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -40,7 +40,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName,typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 58d67c726bd..13227e34ef4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -38,7 +38,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName, typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
duration_(readScalar(this->coeffDict().lookup("duration"))),
parcelsPerSecond_
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index edff573a0fe..5d1077cef3a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -37,23 +37,14 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
)
:
ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
- alpaName_
- (
- this->coeffs().template lookup("alphaName")
- ),
- C_
- (
- readScalar(this->coeffs().lookup("C"))
- ),
+ alpaName_(this->coeffs().lookup("alpha")),
+ C_(readScalar(this->coeffs().lookup("C"))),
gradInterForceInterpPtr_(nullptr)
{}
template<class CloudType>
-Foam::InterfaceForce<CloudType>::InterfaceForce
-(
- const InterfaceForce& pf
-)
+Foam::InterfaceForce<CloudType>::InterfaceForce(const InterfaceForce& pf)
:
ParticleForce<CloudType>(pf),
alpaName_(pf.alpaName_),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
index 9630f242b28..e023c1d0ea4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/NonInertialFrame/NonInertialFrameForce.C
@@ -41,7 +41,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "linearAccelerationName",
+ "linearAcceleration",
"linearAcceleration"
)
),
@@ -50,7 +50,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularVelocityName",
+ "angularVelocity",
"angularVelocity"
)
),
@@ -59,7 +59,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "angularAccelerationName",
+ "angularAcceleration",
"angularAcceleration"
)
),
@@ -68,7 +68,7 @@ Foam::NonInertialFrameForce<CloudType>::NonInertialFrameForce
(
this->coeffs().template lookupOrDefault<word>
(
- "centreOfRotationName",
+ "centreOfRotation",
"centreOfRotation"
)
),
diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H
index cdfafc52e4b..d499f790b47 100644
--- a/src/meshTools/coordinateSystems/cartesianCS.H
+++ b/src/meshTools/coordinateSystems/cartesianCS.H
@@ -25,7 +25,7 @@ Class
Foam::cartesianCS
Description
- Cylindrical coordinate system
+ Cartesian coordinate system
SourceFiles
cartesianCS.C
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 048bacd25c9..97e4575fc37 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -431,7 +431,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(lookup("regionName")),
+ regionName_(lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
@@ -479,7 +479,7 @@ Foam::regionModels::regionModel::regionModel
outputPropertiesPtr_(nullptr),
primaryPatchIDs_(),
intCoupledPatchIDs_(),
- regionName_(dict.lookup("regionName")),
+ regionName_(dict.lookup("region")),
functions_(*this, subOrEmptyDict("functions"))
{
if (active_)
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 70a3a0f2c18..34bdfe2f85f 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -38,8 +38,7 @@ namespace compressible
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -53,8 +52,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const fvPatch& p,
@@ -76,8 +74,7 @@ thermalBaffleFvPatchScalarField
{}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -97,8 +94,7 @@ thermalBaffleFvPatchScalarField
if (thisMesh.name() == polyMesh::defaultRegion)
{
- const word regionName =
- dict_.lookupOrDefault<word>("regionName", "none");
+ const word regionName = dict_.lookupOrDefault<word>("region", "none");
const word baffleName("3DBaffle" + regionName);
@@ -121,8 +117,7 @@ thermalBaffleFvPatchScalarField
}
-thermalBaffleFvPatchScalarField::
-thermalBaffleFvPatchScalarField
+thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField
(
const thermalBaffleFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
@@ -160,10 +155,9 @@ void thermalBaffleFvPatchScalarField::rmap
void thermalBaffleFvPatchScalarField::createPatchMesh()
{
-
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- word regionName = dict_.lookup("regionName");
+ word regionName = dict_.lookup("region");
List<polyPatch*> regionPatches(3);
List<word> patchNames(regionPatches.size());
@@ -270,9 +264,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- if (thisMesh.name() == polyMesh::defaultRegion && owner_)
+ if (owner_ && (thisMesh.name() == polyMesh::defaultRegion))
{
-
os.writeKeyword("extrudeModel");
os << word(dict_.lookup("extrudeModel"))
<< token::END_STATEMENT << nl;
@@ -293,9 +286,8 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
os.writeKeyword(extrudeModel);
os << dict_.subDict(extrudeModel) << nl;
- word regionName = dict_.lookup("regionName");
- os.writeKeyword("regionName") << regionName
- << token::END_STATEMENT << nl;
+ word regionName = dict_.lookup("region");
+ os.writeKeyword("region") << regionName << token::END_STATEMENT << nl;
bool active = readBool(dict_.lookup("active"));
os.writeKeyword("active") << active
diff --git a/src/sampling/probes/patchProbes.C b/src/sampling/probes/patchProbes.C
index 225ee132d39..80694beb774 100644
--- a/src/sampling/probes/patchProbes.C
+++ b/src/sampling/probes/patchProbes.C
@@ -263,7 +263,7 @@ bool Foam::patchProbes::read(const dictionary& dict)
{
if (!dict.readIfPresent("patches", patchNames_))
{
- word patchName(dict.lookup("patchName"));
+ word patchName(dict.lookup("patch"));
patchNames_ = wordReList(1, wordRe(patchName));
}
return probes::read(dict);
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index f092944850f..3eeb9c32952 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -47,56 +47,40 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
HO2Id_(-1),
H2OId_(-1),
NOId_(-1),
- automaticSIS_(true),
- phiTol_(this->tolerance()),
- NOxThreshold_(1800),
- CO2Name_
+ automaticSIS_
(
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "CO2Name","CO2"
- )
- ),
- COName_
- (
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "COName","CO"
- )
+ this->coeffsDict_.lookupOrDefault<Switch>("automaticSIS", true)
),
- HO2Name_
+ phiTol_
(
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "HO2Name","HO2"
- )
+ this->coeffsDict_.lookupOrDefault<scalar>("phiTol", this->tolerance())
),
- H2OName_
+ NOxThreshold_
(
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "H2OName","H2O"
- )
+ this->coeffsDict_.lookupOrDefault<scalar>("NOxThreshold", 1800)
),
- NOName_
+ CO2Name_(dict.subDict("reduction").lookupOrDefault<word>("CO2","CO2")),
+ COName_(dict.subDict("reduction").lookupOrDefault<word>("CO","CO")),
+ HO2Name_(dict.subDict("reduction").lookupOrDefault<word>("HO2","HO2")),
+ H2OName_(dict.subDict("reduction").lookupOrDefault<word>("H2O","H2O")),
+ NOName_(dict.subDict("reduction").lookupOrDefault<word>("NO","NO")),
+ forceFuelInclusion_
(
- dict.subDict("reduction").lookupOrDefault<word>
- (
- "NOName","NO"
- )
- ),
- forceFuelInclusion_(false)
+ this->coeffsDict_.lookupOrDefault<Switch>("forceFuelInclusion", false)
+ )
{
- label j=0;
+ label j = 0;
dictionary initSet = this->coeffsDict_.subDict("initialSet");
- for (label i=0; i<chemistry.nSpecie(); i++)
+
+ for (label i = 0; i < chemistry.nSpecie(); i++)
{
if (initSet.found(chemistry.Y()[i].name()))
{
searchInitSet_[j++] = i;
}
}
- if (j<searchInitSet_.size())
+
+ if (j < searchInitSet_.size())
{
FatalErrorInFunction
<< searchInitSet_.size()-j
@@ -105,28 +89,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
<< exit(FatalError);
}
- if (this->coeffsDict_.found("automaticSIS"))
- {
- automaticSIS_.readIfPresent("automaticSIS", this->coeffsDict_);
- }
- if (this->coeffsDict_.found("forceFuelInclusion"))
- {
- forceFuelInclusion_.readIfPresent
- (
- "forceFuelInclusion",this->coeffsDict_
- );
- }
-
- if (this->coeffsDict_.found("phiTol"))
- {
- phiTol_ = readScalar(this->coeffsDict_.lookup("phiTol"));
- }
-
- if (this->coeffsDict_.found("NOxThreshold"))
- {
- NOxThreshold_ = readScalar(this->coeffsDict_.lookup("NOxThreshold"));
- }
const List<List<specieElement>>& specieComposition =
chemistry.specieComp();
@@ -134,11 +97,12 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
{
const List<specieElement>& curSpecieComposition =
specieComposition[i];
+
// For all elements in the current species
forAll(curSpecieComposition, j)
{
- const specieElement& curElement =
- curSpecieComposition[j];
+ const specieElement& curElement = curSpecieComposition[j];
+
if (curElement.name() == "C")
{
sC_[i] = curElement.nAtoms();
@@ -157,7 +121,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
}
else
{
- Info<< "element not considered"<<endl;
+ Info<< "element not considered" <<endl;
}
}
if (this->chemistry_.Y()[i].name() == CO2Name_)
@@ -287,7 +251,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
c1[this->nSpecie_+1] = p;
// Compute the rAB matrix
- RectangularMatrix<scalar> rABNum(this->nSpecie_,this->nSpecie_,0.0);
+ RectangularMatrix<scalar> rABNum(this->nSpecie_, this->nSpecie_,0.0);
scalarField PA(this->nSpecie_,0.0);
scalarField CA(this->nSpecie_,0.0);
@@ -319,8 +283,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// of the species. It stores the species encountered in the reaction but
// use another list to see if this species has already been used
- DynamicList<scalar> wA(R.lhs().size()+R.rhs().size());
- DynamicList<label> wAID(R.lhs().size()+R.rhs().size());
+ DynamicList<scalar> wA(R.lhs().size() + R.rhs().size());
+ DynamicList<label> wAID(R.lhs().size() + R.rhs().size());
forAll(R.lhs(), s) // Compute rAB for all species in the left hand side
{
@@ -344,7 +308,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable for self reference (by definition rAA=0)
deltaBi[ss] = false;
- while(!usedIndex.empty())
+ while (!usedIndex.empty())
{
label curIndex = usedIndex.pop();
if (deltaBi[curIndex])
@@ -352,7 +316,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// Disable to avoid counting it more than once
deltaBi[curIndex] = false;
// Test if this rAB is not initialized
- if (rABPos(ss, curIndex)==-1)
+ if (rABPos(ss, curIndex) == -1)
{
// It starts at rABPos(ss, sj)=0
rABPos(ss, curIndex) = NbrABInit[ss];
@@ -372,7 +336,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
bool found(false);
forAll(wAID, id)
{
- if (ss==wAID[id])
+ if (ss == wAID[id])
{
wA[id] += sl*omegai;
found = true;
@@ -385,7 +349,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
}
}
- forAll(R.rhs(), s) // Compute rAB for all species in the right hand side
+ // Compute rAB for all species in the right hand side
+ forAll(R.rhs(), s)
{
label ss = R.rhs()[s].index;
scalar sl = R.rhs()[s].stoichCoeff; // vAi = v''-v' => here v''
@@ -488,8 +453,8 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
label nElements = 4; // 4 main elements (C, H, O, N)
// Total number of C, H and O (in this order)
- scalarList Na(nElements,0.0);
- scalarList Nal(nElements,0.0); // for large hydrocarbons
+ scalarList Na(nElements, 0.0);
+ scalarList Nal(nElements, 0.0); // for large hydrocarbons
for (label i=0; i<this->nSpecie_; i++)
{
@@ -502,6 +467,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
{
continue;
}
+
Na[0] += sC_[i]*c[i];
Na[1] += sH_[i]*c[i];
Na[2] += sO_[i]*c[i];
@@ -523,12 +489,12 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
// 2Cl + Hl/2
// Equivalence ratio for fuel decomposition = ----------
// Ol(+O2)
- phiLarge = (2*Nal[0]+Nal[1]/2)/Nal[2];
+ phiLarge = (2*Nal[0] + Nal[1]/2)/Nal[2];
}
// Using the rAB matrix (numerator and denominator separated)
// compute the R value according to the search initiating set
- scalarField Rvalue(this->nSpecie_,0.0);
+ scalarField Rvalue(this->nSpecie_, 0.0);
label speciesNumber = 0;
// Set all species to inactive and activate them according
@@ -583,7 +549,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -607,7 +573,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
Rvalue[H2OId_] = 1.0;
if (forceFuelInclusion_)
{
- forAll(fuelSpeciesID_,i)
+ forAll(fuelSpeciesID_, i)
{
Q.push(fuelSpeciesID_[i]);
speciesNumber++;
@@ -641,7 +607,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
while (!Q.empty())
{
label u = Q.pop();
- scalar Den = max(PA[u],CA[u]);
+ scalar Den = max(PA[u], CA[u]);
if (Den!=0.0)
{
for (label v=0; v<NbrABInit[u]; v++)
@@ -709,7 +675,7 @@ void Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::reduceMechanism
this->NsSimp_ = speciesNumber;
scalarField& simplifiedC(this->chemistry_.simplifiedC());
- simplifiedC.setSize(this->NsSimp_+2);
+ simplifiedC.setSize(this->NsSimp_ + 2);
DynamicList<label>& s2c(this->chemistry_.simplifiedToCompleteIndex());
s2c.setSize(this->NsSimp_);
Field<label>& c2s(this->chemistry_.completeToSimplifiedIndex());
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
index fc0f36a9a5a..d42c830febf 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.H
@@ -25,7 +25,7 @@ Class
Foam::chemistryReductionMethods::DAC
Description
- The Dynamic Adaptive Chemistry (DAC) method [1] simplify the chemistry
+ The Dynamic Adaptive Chemistry (DAC) method [1] simplifies the chemistry
using the matrix rAB defined by (DRGEP algorithm [2])
|sum_i=1->Nr vAi wi dBi|
@@ -40,13 +40,14 @@ Description
stoechiometric coefficient of species A in the ith reaction (vAi = v''-v')
, wi is the progress variable of reaction i and dBi equals 1 if reaction i
involves B and O otherwise.
- rAB show the error introduced to the production rates of A when B and all
+
+ rAB shows the error introduced to the production rates of A when B and all
the reactions including it are removed. It is computed as in [3] so that
the algorithm is O(Nr).
- DAC uses a initial set of species that represents the major parts of the
+ DAC uses an initial set of species that represent the major parts of the
combustion mechanism, i.e. H2/O2, fuel decomposition and CO2 production.
- Usualy, it includes the fuel, HO2 and CO. Then it computes the dependance
+ Usually, it includes the fuel, HO2 and CO. Then it computes the dependance
of these set to the other species. This is done by introducing R-value
defined by
@@ -122,6 +123,7 @@ class DAC
word CO2Name_, COName_, HO2Name_, H2OName_, NOName_;
Switch forceFuelInclusion_;
+
public:
//- Runtime type information
diff --git a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index 440c41e9f90..f0c36d21ea2 100644
--- a/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/properties/liquidPropertiesFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -226,7 +226,7 @@ humidityTemperatureCoupledMixedFvPatchScalarField
TnbrName_(dict.lookupOrDefault<word>("Tnbr", "T")),
QrNbrName_(dict.lookupOrDefault<word>("QrNbr", "none")),
QrName_(dict.lookupOrDefault<word>("Qr", "none")),
- specieName_(dict.lookupOrDefault<word>("specieName", "none")),
+ specieName_(dict.lookupOrDefault<word>("specie", "none")),
liquid_(nullptr),
liquidDict_(),
mass_(patch().size(), 0.0),
@@ -749,7 +749,7 @@ void Foam::humidityTemperatureCoupledMixedFvPatchScalarField::write
os.writeKeyword("mode")<< massModeTypeNames_[mode_]
<< token::END_STATEMENT <<nl;
- writeEntryIfDifferent<word>(os, "specieName", "none", specieName_);
+ writeEntryIfDifferent<word>(os, "specie", "none", specieName_);
os.writeKeyword("carrierMolWeight")<< Mcomp_
<< token::END_STATEMENT <<nl;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
index b393b43b536..c8dba9d60a0 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/PDRMeshDict
@@ -23,8 +23,8 @@ coupledFaces
coupledFacesSet
{
- wallPatchName baffleWall;
- cyclicMasterPatchName baffleCyclic_half0;
+ wallPatch baffleWall;
+ cyclicMasterPatch baffleCyclic_half0;
}
}
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
index d6badd923f8..7f7395413b9 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/0/panelRegion/T
@@ -44,7 +44,7 @@ boundaryField
"region0_to_.*"
{
type compressible::turbulentTemperatureRadCoupledMixed;
- neighbourFieldName T;
+ neighbourField T;
kappaMethod solidThermo;
QrNbr Qr;
Qr none;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
index 3092ba2020d..5faa7ba0c3e 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/pyrolysisZones
@@ -20,7 +20,7 @@ FoamFile
pyrolysisModel thermo;
- regionName panelRegion;
+ region panelRegion;
noPyrolysisCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
index 86de22e33ce..6efe72eb274 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
index 5fef5019a69..a3010f4c550 100644
--- a/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
+++ b/tutorials/combustion/fireFoam/LES/compartmentFire/system/controlDict
@@ -77,7 +77,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
- patchName region0_to_panelRegion_wallPanel;
+ patch region0_to_panelRegion_wallPanel;
probeLocations
(
(0.15 0.0 0.01) // HF2
@@ -94,7 +94,7 @@ functions
writeControl timeStep;
writeInterval 200;
log true;
- patchName inlet;
+ patch inlet;
probeLocations
(
( 0.0 0.0 0.0 ) // HF1
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
index eb0432c914a..11f9c8cee2b 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName pyrolysisRegion;
+ region pyrolysisRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
index 533b5c022e4..9b3c6deeae2 100644
--- a/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,7 +19,7 @@ active true;
surfaceFilmModel thermoSingleLayer;
-regionName filmRegion;
+region filmRegion;
thermoSingleLayerCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
index 9741bf6aa2a..5de2a6e8162 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
index 0c06604be72..3dfc5162953 100644
--- a/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/oppositeBurningPanels/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
index 4074c3e862c..a099495670d 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/pyrolysisZones
@@ -21,7 +21,7 @@ FoamFile
pyrolysisModel reactingOneDim;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
index 5d869e9a24b..b4ae8c3b340 100644
--- a/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/simplePMMApanel/constant/surfaceFilmProperties
@@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -19,5 +19,5 @@ active false;
surfaceFilmModel none;
-regionName none;
+region none;
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
index d0661cb3402..641f34fa0fd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
index 0c06604be72..3dfc5162953 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
index d0661cb3402..641f34fa0fd 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/pyrolysisZones
@@ -21,7 +21,7 @@ pyrolysis
pyrolysisModel none;
- regionName panelRegion;
+ region panelRegion;
reactingOneDimCoeffs
{
diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
index 0c06604be72..e833ca17355 100644
--- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
+++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/surfaceFilmProperties
@@ -11,12 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel none;
-regionName none;
+region none;
active false;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index 6536b870ee1..bac87c7272f 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -8,17 +8,17 @@
T
{
- type compressible::thermalBaffle;
- kappaMethod fluidThermo;
- value uniform 300;
+ type compressible::thermalBaffle;
+ kappaMethod fluidThermo;
+ value uniform 300;
- regionName ${baffleRegionName};
- active yes;
+ region ${baffleRegion};
+ active yes;
- # include "3DbaffleSolidThermo"
+ # include "3DbaffleSolidThermo"
- // New fvMesh (region) information
- # include "extrudeModel"
+ // New fvMesh (region) information
+ # include "extrudeModel"
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
index 346318d87f3..b3e07455bb7 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/baffle3DSetup
@@ -6,22 +6,22 @@
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
-baffleRegionName baffle3DRegion;
+baffleRegion baffle3DRegion;
-masterPatchName baffle3DRegionMaster;
+masterPatch baffle3DRegionMaster;
-slavePatchName baffle3DRegionSlave;
+slavePatch baffle3DRegionSlave;
-oneD false;
+oneD false;
-nLayers 50;
+nLayers 50;
-thickness 0.02;
+thickness 0.02;
-Kappa 0.01;
+Kappa 0.01;
-Cp 15;
+Cp 15;
-rho 80;
+rho 80;
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
index e1f36abd656..2cfabccf8b1 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/0.orig/cabin/T
@@ -55,7 +55,7 @@ boundaryField
// Mode of operation: inert, condensation, vaporization,
// condensationAndEvaporation
mode condensationAndEvaporation;
- specieName H2O;
+ specie H2O;
carrierMolWeight 28.9 ;//Air from thermophysicalProperties
L 0.1;
Tvap 273; //Minimum temperature for evaporation
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
index c7695aeec0f..76ab4c70bd5 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/cabin/fvSchemes
@@ -47,6 +47,7 @@ laplacianSchemes
laplacian(rhorAUf,p_rgh) Gauss linear corrected;
laplacian(alphaEff,h) Gauss linear corrected;
laplacian(((rho*nut)+thermo:mu),H2O) Gauss linear corrected;
+ laplacian(DH2O,H2O) Gauss linear corrected;
}
interpolationSchemes
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 760323fa2a2..065a7b8ed96 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -23,7 +23,7 @@ airToporous
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
master false;
nbrModel porousToair;
@@ -40,7 +40,7 @@ porosityBlockage
interRegionExplicitPorositySourceCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName porous;
+ nbrRegion porous;
type DarcyForchheimer;
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 7d8917bec1e..fffed7d1718 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -23,7 +23,7 @@ porousToair
constantHeatTransferCoeffs
{
interpolationMethod cellVolumeWeight;
- nbrRegionName air;
+ nbrRegion air;
master true;
nbrModel airToporous;
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index e93b8f3939f..c6ac48a1bb3 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -48,5 +48,19 @@ runTimeModifiable yes;
adjustTimeStep yes;
maxCo 5;
+functions
+{
+ mag(U)
+ {
+ type mag;
+ libs ( "libfieldFunctionObjects.so" );
+ field U;
+ executeControl writeTime;
+ writeControl writeTime;
+ fields 1 ( U );
+ result myMagU;
+ }
+}
+
// ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
index 4251bfa4faa..3cc5de831dd 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/controlDict
@@ -58,7 +58,7 @@ functions
fields (p U);
lifeTime 10000;
nSubCycle 5;
- cloudName particleTracks;
+ cloud particleTracks;
seedSampleSet uniform;
uniformCoeffs
{
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
index 8ba9bf34dae..d7bc5d2289d 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/runtimePostProcessing
@@ -57,7 +57,7 @@ postPro1
visible yes;
tubeRadius 0.01;
colourBy field;
- fieldName U;
+ field U;
range (0 20);
opacity 1;
scalarBar
@@ -97,7 +97,7 @@ postPro1
visible yes;
featureEdges no;
colourBy field;
- fieldName U;
+ field U;
range (0 30);
opacity 1;
scalarBar
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
index 83ec2e4018a..47fc1a305d5 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamLines
@@ -32,7 +32,7 @@ streamLines
nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6 b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
index 1f9924aa37b..82f0a4e81a9 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/decomposeParDict.6
@@ -15,7 +15,7 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 6;
+numberOfSubdomains 4;
method hierarchical;
// method ptscotch;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 9578c6e11ee..1e671e71b89 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -39,7 +39,7 @@ streamLines
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 46783963135..9e6bfda88cc 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -18,7 +18,7 @@ near
writeControl writeTime;
// Calculate every
- executeControl writeTime;
+ executeControl writeTime;
// Fields to be sampled. Per field original name and mapped field to
// create.
@@ -29,10 +29,10 @@ near
);
// Patches/groups to sample (regular expressions)
- patches (motorBikeGroup);
+ patches (motorBikeGroup);
// Distance to sample
- distance 0.001;
+ distance 0.001;
}
// Use UNear to track along wall
@@ -48,7 +48,7 @@ wallBoundedStreamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
- U UNear;
+ U UNear;
// Interpolation method. Default is cellPoint.
// interpolationScheme pointMVC;
@@ -65,7 +65,7 @@ wallBoundedStreamLines
lifeTime 100;
// Cloud name to use
- cloudName wallBoundedParticleTracks;
+ cloud wallBoundedParticleTracks;
// Seeding method.
seedSampleSet patchSeed; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 46492576ed5..498774b1087 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -64,16 +64,16 @@ functions
trackForward true;
// Names of fields to sample. Should contain above velocity field!
- fields (p k U);
+ fields (p k U);
// Steps particles can travel before being removed
lifeTime 10000;
// Number of steps per cell (estimate). Set to 1 to disable subcycling.
- nSubCycle 5;
+ nSubCycle 5;
// Cloud name to use
- cloudName particleTracks;
+ cloud particleTracks;
// Seeding method.
seedSampleSet uniform; //cloud; //triSurfaceMeshPointSet;
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
index e9a4d3ce554..c464c2fb190 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
index 7a8b3888466..7d479f3caa7 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
index e9a4d3ce554..c464c2fb190 100644
--- a/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/column/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
index 3a685fa3552..ef6d5c15f83 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties
@@ -72,7 +72,7 @@ subModels
massTotal 40;
SOI 1;
parcelBasisType mass;
- patchName inlet;
+ patch inlet;
duration 4;
parcelsPerSecond 100644;
U0 (-10 0 0);
diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
index 7a8b3888466..7d479f3caa7 100644
--- a/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
index 67943e71f16..aa34863b9b7 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties
@@ -80,7 +80,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName lowerInlet;
+ patch lowerInlet;
U0 (18.7939 6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
@@ -105,7 +105,7 @@ subModels
{
type patchInjection;
parcelBasisType fixed;
- patchName upperInlet;
+ patch upperInlet;
U0 (18.7939 -6.8404 0);
nParticle 1;
parcelsPerSecond 1390885;
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
index e9a4d3ce554..c464c2fb190 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-continuousPhaseName air;
+continuousPhase air;
rho.air 1.2;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
index af4915a63be..13a5320893a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
index efb2938c819..7cf97c65049 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
@@ -108,7 +108,7 @@ thermoSingleLayerCoeffs
drippingInjectionCoeffs
{
- cloudName reactingCloud1;
+ cloud reactingCloud1;
deltaStable 0;
particlesPerParcel 100.0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index ef488bebdd8..f51e31b47ed 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel kinematicSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
index 0a3d88057d6..b26b2d3c9ae 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/surfaceFilmProperties
@@ -11,13 +11,13 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object SurfaceFilmProperties;
+ object surfaceFilmProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
surfaceFilmModel thermoSingleLayer;
-regionName wallFilmRegion;
+region wallFilmRegion;
active true;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
index 731fbd81ed3..1263b4357db 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
index 731fbd81ed3..1263b4357db 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 2fa5343300f..d20347dc74d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -80,7 +80,7 @@ subModels
SOI 0.01;
massTotal 8;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
duration 10000;
parcelsPerSecond 1e5;
U0 (40 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
index d05adc58c13..07257081e17 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
index 1ff58d619cd..e6e16bed972 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
index d05adc58c13..07257081e17 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/particleTrackDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1Tracks;
+cloud reactingCloud1Tracks;
fields
(
diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
index 1ff58d619cd..e6e16bed972 100644
--- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
+++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties
@@ -84,7 +84,7 @@ subModels
type patchInjection;
massFlowRate 0.8e-03;
parcelBasisType mass;
- patchName inletCentral;
+ patch inletCentral;
parcelsPerSecond 100;
duration 1; // NOTE: set to 1 for steady state
U0 (0 40 0);
diff --git a/tutorials/mesh/parallel/filter/constant/particleTrackProperties b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
index 731fbd81ed3..1263b4357db 100644
--- a/tutorials/mesh/parallel/filter/constant/particleTrackProperties
+++ b/tutorials/mesh/parallel/filter/constant/particleTrackProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-cloudName reactingCloud1;
+cloud reactingCloud1;
sampleFrequency 1;
diff --git a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
index 8372cf2fbdb..2a4fcbf4fb0 100644
--- a/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
+++ b/tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/constant/kinematicCloudProperties
@@ -66,7 +66,7 @@ subModels
interface
{
C -10;
- alphaName alpha.water;
+ alpha alpha.water;
}
}
@@ -79,7 +79,7 @@ subModels
SOI 0;
parcelBasisType fixed;//mass;
nParticle 1;
- patchName inlet;
+ patch inlet;
duration 1;
parcelsPerSecond 1e5;
U0 (0 0 0.1);
--
GitLab