Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
1f826361
Commit
1f826361
authored
Nov 22, 2016
by
Andrew Heather
Browse files
STYLE: Consistency updates to change input of <var>Name to <var>. Fixes
#306
parent
143e9919
Changes
89
Hide whitespace changes
Inline
Side-by-side
applications/solvers/lagrangian/DPMFoam/DPMFoam.C
View file @
1f826361
...
...
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
{
argList
::
addOption
(
"cloud
Name
"
,
"cloud"
,
"name"
,
"specify alternative cloud name. default is 'kinematicCloud'"
);
...
...
applications/solvers/lagrangian/DPMFoam/createFields.H
View file @
1f826361
...
...
@@ -11,7 +11,7 @@ word continuousPhaseName
mesh
,
IOobject
::
MUST_READ
)
).
lookup
(
"continuousPhase
Name
"
)
).
lookup
(
"continuousPhase"
)
);
Info
<<
"Reading field U
\n
"
<<
endl
;
...
...
@@ -123,7 +123,7 @@ volScalarField alphac
);
word
kinematicCloudName
(
"kinematicCloud"
);
args
.
optionReadIfPresent
(
"cloud
Name
"
,
kinematicCloudName
);
args
.
optionReadIfPresent
(
"cloud"
,
kinematicCloudName
);
Info
<<
"Constructing kinematicCloud "
<<
kinematicCloudName
<<
endl
;
basicKinematicTypeCloud
kinematicCloud
...
...
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
View file @
1f826361
...
...
@@ -58,7 +58,7 @@ volScalarField mu
);
word
kinematicCloudName
(
"kinematicCloud"
);
args
.
optionReadIfPresent
(
"cloud
Name
"
,
kinematicCloudName
);
args
.
optionReadIfPresent
(
"cloud"
,
kinematicCloudName
);
Info
<<
"Constructing kinematicCloud "
<<
kinematicCloudName
<<
endl
;
basicKinematicCollidingCloud
kinematicCloud
...
...
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C
View file @
1f826361
...
...
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
{
argList
::
addOption
(
"cloud
Name
"
,
"cloud"
,
"name"
,
"specify alternative cloud name. default is 'kinematicCloud'"
);
...
...
applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
View file @
1f826361
...
...
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
{
argList
::
addOption
(
"cloud
Name
"
,
"cloud"
,
"name"
,
"specify alternative cloud name. default is 'kinematicCloud'"
);
...
...
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H
View file @
1f826361
...
...
@@ -51,7 +51,7 @@ autoPtr<compressible::turbulenceModel> turbulence
const
word
kinematicCloudName
(
args
.
optionLookupOrDefault
<
word
>
(
"cloud
Name
"
,
"kinematicCloud"
)
args
.
optionLookupOrDefault
<
word
>
(
"cloud"
,
"kinematicCloud"
)
);
Info
<<
"Constructing kinematicCloud "
<<
kinematicCloudName
<<
endl
;
...
...
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
View file @
1f826361
...
...
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
{
argList
::
addOption
(
"cloud
Name
"
,
"cloud"
,
"name"
,
"specify alternative cloud name. default is 'kinematicCloud'"
);
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C
View file @
1f826361
...
...
@@ -49,7 +49,7 @@ Foam::copiedFixedValueFvPatchScalarField::copiedFixedValueFvPatchScalarField
)
:
fixedValueFvPatchScalarField
(
p
,
iF
,
dict
),
sourceFieldName_
(
dict
.
lookup
(
"sourceField
Name
"
))
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
(
"sourceField
Name
"
)
os
.
writeKeyword
(
"sourceField"
)
<<
sourceFieldName_
<<
token
::
END_STATEMENT
<<
nl
;
writeEntry
(
"value"
,
os
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H
View file @
1f826361
...
...
@@ -62,6 +62,7 @@ protected:
word
sourceFieldName_
;
public:
//- Runtime type information
...
...
applications/test/passiveParticle/Test-passiveParticle.C
View file @
1f826361
...
...
@@ -36,7 +36,7 @@ Description
int
main
(
int
argc
,
char
*
argv
[])
{
argList
::
validArgs
.
append
(
"cloud
Name
"
);
argList
::
validArgs
.
append
(
"cloud"
);
#include
"setRootCase.H"
#include
"createTime.H"
#include
"createMesh.H"
...
...
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View file @
1f826361
...
...
@@ -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
(
"cyclicMasterPatch
Name
"
);
const
word
wallName
=
dict
.
lookup
(
"wallPatch
Name
"
);
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
View file @
1f826361
...
...
@@ -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 \
-l
immiscibleIncompressibleTwoPhaseMixture
\
-l
helpTypes
\
-lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-linterfaceProperties \
-llagrangianFunctionObjects \
-llagrangianIntermediate \
-llagrangian \
-llagrangianSpray \
-llagrangianTurbulence \
-llaminarFlameSpeedModels \
-lliquid
Mixture
Properties \
-lliquidProperties
FvPatchFields
\
-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 \
-lS
LGThermo
\
-lS
loanRenumber
\
-lsnappyHexMesh \
-lsolidChemistryModel \
-lsolidMixtureProperties \
-lsolidParticle \
-lsolidProperties \
-lsolidSpecie \
-lsolidThermo \
...
...
@@ -92,13 +94,12 @@ EXE_LIBS = \
-lsurfaceFilmDerivedFvPatchFields \
-lsurfaceFilmModels \
-lsurfMesh \
-ltabulatedWallFunctions \
-lthermalBaffleModels \
-lthermophysicalFunctions \
-ltopoChangerFvMesh \
-lt
riSurface
\
-lt
urbulenceModelSchemes
\
-lturbulenceModels \
-ltwoPhaseMixture \
-ltwoPhaseMixtureThermo \
-ltwoPhaseProperties \
-ltwoPhaseReactingTurbulenceModels \
-lutilityFunctionObjects
applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
View file @
1f826361
...
...
@@ -9,7 +9,7 @@ IOdictionary propsDict
)
);
const
word
cloudName
(
propsDict
.
lookup
(
"cloud
Name
"
));
const
word
cloudName
(
propsDict
.
lookup
(
"cloud"
));
label
sampleFrequency
(
readLabel
(
propsDict
.
lookup
(
"sampleFrequency"
)));
...
...
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/createFields.H
View file @
1f826361
...
...
@@ -4,6 +4,6 @@ const word dictName("particleTrackDict");
IOdictionary
propsDict
(
dictIO
);
word
cloudName
(
propsDict
.
lookup
(
"cloud
Name
"
));
word
cloudName
(
propsDict
.
lookup
(
"cloud"
));
List
<
word
>
userFields
(
propsDict
.
lookup
(
"fields"
));
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
View file @
1f826361
...
...
@@ -74,7 +74,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
)
:
fixedValueFvPatchScalarField
(
p
,
iF
,
dict
),
outletPatchName_
(
dict
.
lookup
(
"outletPatch
Name
"
)),
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
(
"outletPatch
Name
"
)
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
View file @
1f826361
...
...
@@ -29,7 +29,7 @@ Group
Description
This temperature boundary conditon averages the temperature over the
"outlet" patch specified by name "outletPatch
Name
" 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
outletPatch
Name
| 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;
outletPatch
Name
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
View file @
1f826361
...
...
@@ -29,13 +29,13 @@ Group
Description
This boundary conditon averages the field over the "outlet" patch specified
by name "outletPatch
Name
" 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
outletPatch
Name
| 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;
outletPatch
Name
aPatch;
outletPatch
aPatch;
phi phi;
value uniform 0;
}
...
...
src/functionObjects/field/DESModelRegions/DESModelRegions.C
View file @
1f826361
...
...
@@ -113,7 +113,7 @@ bool Foam::functionObjects::DESModelRegions::read(const dictionary& dict)
fvMeshFunctionObject
::
read
(
dict
);
writeFile
::
read
(
dict
);
dict
.
readIfPresent
(
"result
Name
"
,
resultName_
);
dict
.
readIfPresent
(
"result"
,
resultName_
);
return
true
;
}
...
...
src/functionObjects/field/fluxSummary/fluxSummary.C
View file @
1f826361
...
...
@@ -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
>
(
"phi
Name
"
,
"phi"
);
phiName_
=
dict
.
lookupOrDefault
<
word
>
(
"phi"
,
"phi"
);
dict
.
readIfPresent
(
"scaleFactor"
,
scaleFactor_
);
dict
.
readIfPresent
(
"tolerance"
,
tolerance_
);
...
...
src/functionObjects/field/streamLine/streamLineBase.C
View file @
1f826361
...
...
@@ -558,7 +558,7 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
//Info<< " using interpolation " << interpolationScheme_ << endl;
cloudName_
=
dict
.
lookupOrDefault
<
word
>
(
"cloud
Name
"
,
type
());
cloudName_
=
dict
.
lookupOrDefault
<
word
>
(
"cloud"
,
type
());
dict
.
lookup
(
"seedSampleSet"
)
>>
seedSet_
;
const
dictionary
&
coeffsDict
=
dict
.
subDict
(
seedSet_
+
"Coeffs"
);
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment