diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index c23d85bfe8..85bba58da3 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 26467976f5..49f280e428 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 77287eed87..76c70fffd9 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 d672386e50..be0905796b 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 c21100b0be..6b64ce99f3 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 9f728049f9..9aa648ce5f 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H @@ -51,7 +51,7 @@ autoPtr turbulence const word kinematicCloudName ( - args.optionLookupOrDefault("cloudName", "kinematicCloud") + args.optionLookupOrDefault("cloud", "kinematicCloud") ); Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index d3a1f829fd..006c98b7a8 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 2f7abc7015..63c85938cf 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::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 b2af2f1c4a..f0f224d353 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 68bea7b8ef..96fcc35282 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 25c536e103..7385fd5029 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 nameAndType; nameAndType[0] = key; nameAndType[1] = wallName; diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options index 84027a1c28..18d4dfeb9f 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 78738e321d..267d0959a8 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 309d7718f6..67699d3c0a 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 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 1522f65838..55a81ea6ec 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("phi", "phi")), Q_(readScalar(dict.lookup("Q"))), minTempLimit_(dict.lookupOrDefault("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(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 ee61b69337..4dcd688555 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 c777ff623a..dd367ca3f8 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 { 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 360af5136c..bb94a12767 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 7a27f18527..cfe7a3e18c 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("phiName", "phi"); + phiName_= dict.lookupOrDefault("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 2a489fdc78..9b6daeee12 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("cloudName", type()); + cloudName_ = dict.lookupOrDefault("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 a5a7100aed..7b26468a4f 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("window", -1); diff --git a/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C b/src/functionObjects/graphics/runTimePostProcessing/fieldVisualisationBase.C index e88d6a7eb7..f43b60c172 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 044ed7b51e..a414f269c9 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::New(); diff --git a/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C b/src/functionObjects/utilities/runTimeControl/runTimeCondition/averageCondition/averageCondition.C index 8f0c5d72af..37e19ce07e 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("window", -1)), diff --git a/src/fvOptions/interRegionOption/interRegionOption.C b/src/fvOptions/interRegionOption/interRegionOption.C index cb848dc4d8..5456019055 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("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 767f022489..b6c2be4abc 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::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 b0ecd8c43d..89de057f5d 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("UName", "U"); - TName_ = coeffs_.lookupOrDefault("TName", "T"); - phiName_ = coeffs_.lookupOrDefault("phiName", "phi"); + UName_ = coeffs_.lookupOrDefault("U", "U"); + TName_ = coeffs_.lookupOrDefault("T", "T"); + phiName_ = coeffs_.lookupOrDefault("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 4190a1deb2..af0894d4f4 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("UName", "U")), - UNbrName_(coeffs_.lookupOrDefault("UNbrName", "U")), - rhoName_(coeffs_.lookupOrDefault("rhoName", "rho")), - rhoNbrName_(coeffs_.lookupOrDefault("rhoNbrName", "rho")), + UName_(coeffs_.lookupOrDefault("U", "U")), + UNbrName_(coeffs_.lookupOrDefault("UNbr", "U")), + rhoName_(coeffs_.lookupOrDefault("rho", "rho")), + rhoNbrName_(coeffs_.lookupOrDefault("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 fb488418d4..4e0e0170ce 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 41b1555d38..c1fd0f678e 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::PatchFlowRateInjection ) : InjectionModel(dict, owner, modelName,typeName), - patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patchName")), + patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")), phiName_(this->coeffDict().template lookupOrDefault("phi", "phi")), rhoName_(this->coeffDict().template lookupOrDefault("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 58d67c726b..13227e34ef 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::PatchInjection ) : InjectionModel(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 edff573a0f..5d1077cef3 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::InterfaceForce ) : ParticleForce(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 -Foam::InterfaceForce::InterfaceForce -( - const InterfaceForce& pf -) +Foam::InterfaceForce::InterfaceForce(const InterfaceForce& pf) : ParticleForce(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 9630f242b2..e023c1d0ea 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::NonInertialFrameForce ( this->coeffs().template lookupOrDefault ( - "linearAccelerationName", + "linearAcceleration", "linearAcceleration" ) ), @@ -50,7 +50,7 @@ Foam::NonInertialFrameForce::NonInertialFrameForce ( this->coeffs().template lookupOrDefault ( - "angularVelocityName", + "angularVelocity", "angularVelocity" ) ), @@ -59,7 +59,7 @@ Foam::NonInertialFrameForce::NonInertialFrameForce ( this->coeffs().template lookupOrDefault ( - "angularAccelerationName", + "angularAcceleration", "angularAcceleration" ) ), @@ -68,7 +68,7 @@ Foam::NonInertialFrameForce::NonInertialFrameForce ( this->coeffs().template lookupOrDefault ( - "centreOfRotationName", + "centreOfRotation", "centreOfRotation" ) ), diff --git a/src/meshTools/coordinateSystems/cartesianCS.H b/src/meshTools/coordinateSystems/cartesianCS.H index cdfafc52e4..d499f790b4 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 048bacd25c..97e4575fc3 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 70a3a0f2c1..34bdfe2f85 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& 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& iF, @@ -97,8 +94,7 @@ thermalBaffleFvPatchScalarField if (thisMesh.name() == polyMesh::defaultRegion) { - const word regionName = - dict_.lookupOrDefault("regionName", "none"); + const word regionName = dict_.lookupOrDefault("region", "none"); const word baffleName("3DBaffle" + regionName); @@ -121,8 +117,7 @@ thermalBaffleFvPatchScalarField } -thermalBaffleFvPatchScalarField:: -thermalBaffleFvPatchScalarField +thermalBaffleFvPatchScalarField::thermalBaffleFvPatchScalarField ( const thermalBaffleFvPatchScalarField& ptf, const DimensionedField& 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 regionPatches(3); List 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 225ee132d3..80694beb77 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 f092944850..3eeb9c3295 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::DAC HO2Id_(-1), H2OId_(-1), NOId_(-1), - automaticSIS_(true), - phiTol_(this->tolerance()), - NOxThreshold_(1800), - CO2Name_ + automaticSIS_ ( - dict.subDict("reduction").lookupOrDefault - ( - "CO2Name","CO2" - ) + this->coeffsDict_.lookupOrDefault("automaticSIS", true) ), - COName_ + phiTol_ ( - dict.subDict("reduction").lookupOrDefault - ( - "COName","CO" - ) + this->coeffsDict_.lookupOrDefault("phiTol", this->tolerance()) ), - HO2Name_ + NOxThreshold_ ( - dict.subDict("reduction").lookupOrDefault - ( - "HO2Name","HO2" - ) + this->coeffsDict_.lookupOrDefault("NOxThreshold", 1800) ), - H2OName_ + CO2Name_(dict.subDict("reduction").lookupOrDefault("CO2","CO2")), + COName_(dict.subDict("reduction").lookupOrDefault("CO","CO")), + HO2Name_(dict.subDict("reduction").lookupOrDefault("HO2","HO2")), + H2OName_(dict.subDict("reduction").lookupOrDefault("H2O","H2O")), + NOName_(dict.subDict("reduction").lookupOrDefault("NO","NO")), + forceFuelInclusion_ ( - dict.subDict("reduction").lookupOrDefault - ( - "H2OName","H2O" - ) - ), - NOName_ - ( - dict.subDict("reduction").lookupOrDefault - ( - "NOName","NO" - ) - ), - forceFuelInclusion_(false) + this->coeffsDict_.lookupOrDefault("forceFuelInclusion", false) + ) { - label j=0; + label j = 0; dictionary initSet = this->coeffsDict_.subDict("initialSet"); - for (label i=0; i::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>& specieComposition = chemistry.specieComp(); @@ -134,11 +97,12 @@ Foam::chemistryReductionMethods::DAC::DAC { const List& 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::DAC } else { - Info<< "element not considered"<chemistry_.Y()[i].name() == CO2Name_) @@ -287,7 +251,7 @@ void Foam::chemistryReductionMethods::DAC::reduceMechanism c1[this->nSpecie_+1] = p; // Compute the rAB matrix - RectangularMatrix rABNum(this->nSpecie_,this->nSpecie_,0.0); + RectangularMatrix 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::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 wA(R.lhs().size()+R.rhs().size()); - DynamicList