STYLE: Consistency updates to change input of <var>Name to <var>. Fixes #306

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'"
     );

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

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

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'"
     );

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'"
     );

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;

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'"
     );

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);
 }

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H

@@ -62,6 +62,7 @@ protected:
 
         word sourceFieldName_;
 
+
 public:
 
     //- Runtime type information

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"

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;

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

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")));
 

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"));

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

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

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;
     }

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;
 }

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_);
 

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");