diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
index cc5cd933b6f33ac532c473453493d2945b1ce64d..1bff692cfc9052ab3a689cdde93488e8979a2d42 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H
@@ -47,9 +47,9 @@ Description
\heading Patch usage
\table
- Property | Description | Required | Default value
- pName | Pressure field name | no | p
- psiName | Compressibility field name | no | thermo:psi
+ Property | Description | Required | Default value
+ p | Pressure field name | no | p
+ psi | Compressibility field name | no | thermo:psi
\endtable
Example of the boundary condition specification:
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
index bc4aa09c15c0c9e7dd9c0c5014cbc35244b4707f..b4a993f11c62f685e229cfa802d2b5739560bdb5 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.C
@@ -77,7 +77,7 @@ Foam::solidBodyMotionFvMesh::solidBodyMotionFvMesh(const IOobject& io)
),
pointIDs_(),
moveAllCells_(false),
- UName_(dynamicMeshCoeffs_.lookupOrDefault<word>("UName", "U"))
+ UName_(dynamicMeshCoeffs_.lookupOrDefault<word>("U", "U"))
{
if (undisplacedPoints_.size() != nPoints())
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
index 8699ad31dcaa7f0fa17036e243f2482ea1df0655..4f4fbca9783d7a57984e9755396bf389b9c7156a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H
@@ -34,8 +34,8 @@ Description
For a mass-based flux:
- the flow rate should be provided in kg/s
- - if \c rhoName is "none" the flow rate is in m3/s
- - otherwise \c rhoName should correspond to the name of the density field
+ - if \c rho is "none" the flow rate is in m3/s
+ - otherwise \c rho should correspond to the name of the density field
- if the density field cannot be found in the database, the user must
specify the inlet density using the \c rhoInlet entry
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
index 001fa4ab177d042398cf83e044e06ddf16d5234e..52072044ccfcde88cfb8a564df28fe5804a88cdc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
@@ -68,7 +68,7 @@ mappedPatchFieldBase<Type>::mappedPatchFieldBase
(
dict.template lookupOrDefault<word>
(
- "fieldName",
+ "field",
patchField_.internalField().name()
)
),
@@ -314,7 +314,7 @@ tmp<Field<Type>> mappedPatchFieldBase<Type>::mappedField() const
template<class Type>
void mappedPatchFieldBase<Type>::write(Ostream& os) const
{
- os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("field") << fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl;
os.writeKeyword("average") << average_ << token::END_STATEMENT << nl;
os.writeKeyword("interpolationScheme") << interpolationScheme_
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
index 63a64d9abb18649f38658e9c0c5eb6d51c1cbae0..6cb337ff099a438be3b8cb4dacc22cea4890dc3c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
@@ -69,7 +69,7 @@ outletMappedUniformInletFvPatchField
)
:
fixedValueFvPatchField<Type>(p, iF, dict),
- outletPatchName_(dict.lookup("outletPatchName")),
+ outletPatchName_(dict.lookup("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi"))
{}
@@ -168,7 +168,7 @@ template<class Type>
void Foam::outletMappedUniformInletFvPatchField<Type>::write(Ostream& os) const
{
fvPatchField<Type>::write(os);
- os.writeKeyword("outletPatchName")
+ os.writeKeyword("outletPatch")
<< outletPatchName_ << token::END_STATEMENT << nl;
if (phiName_ != "phi")
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 85eae304198a2a8c40f9d911a371ab4307e77c98..3fed1bf97b27e2cc8ec7466c4bc3aa3e422294b1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -40,7 +40,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- phaseName_("alpha"),
+ phaseFraction_("alpha"),
rho_(0.0),
pRefValue_(0.0),
pRefPoint_(Zero)
@@ -60,7 +60,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(p, iF),
- phaseName_(dict.lookupOrDefault<word>("phaseName", "alpha")),
+ phaseFraction_(dict.lookupOrDefault<word>("phaseFraction", "alpha")),
rho_(readScalar(dict.lookup("rho"))),
pRefValue_(readScalar(dict.lookup("pRefValue"))),
pRefPoint_(dict.lookup("pRefPoint"))
@@ -94,7 +94,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, p, iF, mapper),
- phaseName_(ptf.phaseName_),
+ phaseFraction_(ptf.phaseFraction_),
rho_(ptf.rho_),
pRefValue_(ptf.pRefValue_),
pRefPoint_(ptf.pRefPoint_)
@@ -108,7 +108,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf),
- phaseName_(ptf.phaseName_)
+ phaseFraction_(ptf.phaseFraction_)
{}
@@ -120,7 +120,7 @@ phaseHydrostaticPressureFvPatchScalarField
)
:
mixedFvPatchScalarField(ptf, iF),
- phaseName_(ptf.phaseName_),
+ phaseFraction_(ptf.phaseFraction_),
rho_(ptf.rho_),
pRefValue_(ptf.pRefValue_),
pRefPoint_(ptf.pRefPoint_)
@@ -139,7 +139,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
const scalarField& alphap =
patch().lookupPatchField<volScalarField, scalar>
(
- phaseName_
+ phaseFraction_
);
const uniformDimensionedVectorField& g =
@@ -161,10 +161,10 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::updateCoeffs()
void Foam::phaseHydrostaticPressureFvPatchScalarField::write(Ostream& os) const
{
fvPatchScalarField::write(os);
- if (phaseName_ != "alpha")
+ if (phaseFraction_ != "alpha")
{
- os.writeKeyword("phaseName")
- << phaseName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("phaseFraction")
+ << phaseFraction_ << token::END_STATEMENT << nl;
}
os.writeKeyword("rho") << rho_ << token::END_STATEMENT << nl;
os.writeKeyword("pRefValue") << pRefValue_ << token::END_STATEMENT << nl;
@@ -182,8 +182,7 @@ void Foam::phaseHydrostaticPressureFvPatchScalarField::operator=
{
fvPatchScalarField::operator=
(
- valueFraction()*refValue()
- + (1 - valueFraction())*ptf
+ valueFraction()*refValue() + (1 - valueFraction())*ptf
);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
index 41b5db3a7f6b6c651f93ed374d3ad252cba90125..6cf1407c73bf4143959dd678144d341436b6bda4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
@@ -51,11 +51,11 @@ Description
\heading Patch usage
\table
- Property | Description | Required | Default value
- phaseName | phase field name | no | alpha
- rho | density field name | no | rho
- pRefValue | reference pressure [Pa] | yes |
- pRefPoint | reference pressure location | yes |
+ Property | Description | Required | Default value
+ phaseFraction | phase-fraction field name | no | alpha
+ rho | density field name | no | rho
+ pRefValue | reference pressure [Pa] | yes |
+ pRefPoint | reference pressure location | yes |
\endtable
Example of the boundary condition specification:
@@ -63,7 +63,7 @@ Description
myPatch
{
type phaseHydrostaticPressure;
- phaseName alpha1;
+ phaseFraction alpha1;
rho rho;
pRefValue 1e5;
pRefPoint (0 0 0);
@@ -103,7 +103,7 @@ protected:
// Protected data
//- Name of phase-fraction field
- word phaseName_;
+ word phaseFraction_;
//- Constant density in the far-field
scalar rho_;
@@ -196,16 +196,16 @@ public:
// Access
- //- Return the phaseName
- const word& phaseName() const
+ //- Return the phaseFraction
+ const word& phaseFraction() const
{
- return phaseName_;
+ return phaseFraction_;
}
- //- Return reference to the phaseName to allow adjustment
- word& phaseName()
+ //- Return reference to the phaseFraction to allow adjustment
+ word& phaseFraction()
{
- return phaseName_;
+ return phaseFraction_;
}
//- Return the constant density in the far-field
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
index f0eb72c62c7bd3f19d7e2cd20fe2d3adc21a13a6..d650d7f0ad6f6feec3660f976af058a3786a9766 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/prghTotalHydrostaticPressure/prghTotalHydrostaticPressureFvPatchScalarField.C
@@ -149,7 +149,7 @@ void Foam::prghTotalHydrostaticPressureFvPatchScalarField::write
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
- writeEntryIfDifferent<word>(os, "ph_rghName", "ph_rghName", ph_rghName_);
+ writeEntryIfDifferent<word>(os, "ph_rgh", "ph_rgh", ph_rghName_);
writeEntry("value", os);
}
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index bf9bf5739227992debfe2a619fcd879fda16c594..5ecc9af8dbbb7bba5e003196ef3aecb9972ed0a3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -98,7 +98,7 @@ timeVaryingMappedFixedValueFvPatchField
}
- dict.readIfPresent("fieldTableName", fieldTableName_);
+ dict.readIfPresent("fieldTable", fieldTableName_);
if (dict.found("value"))
{
@@ -565,7 +565,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::write
if (fieldTableName_ != this->internalField().name())
{
- os.writeKeyword("fieldTableName") << fieldTableName_
+ os.writeKeyword("fieldTable") << fieldTableName_
<< token::END_STATEMENT << nl;
}
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
index fe1ba583e8b07685515726b5a2b336f2d54e3847..0d607c86b4b53442eade3a65c0d9ab841cfc55e5 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdt.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
Foam::word Foam::fv::localEulerDdt::rDeltaTName("rDeltaT");
-Foam::word Foam::fv::localEulerDdt::rSubDeltaTName("rSubDeltaTName");
+Foam::word Foam::fv::localEulerDdt::rSubDeltaTName("rSubDeltaT");
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index deb36c716c762d4b298ead51a30264a9d695a7dd..fa5d0278e0a35c872eb070fa5d8cbe963208a6a7 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -59,7 +59,7 @@ uniformInterpolatedDisplacementPointPatchVectorField
)
:
fixedValuePointPatchField<vector>(p, iF, dict),
- fieldName_(dict.lookup("fieldName")),
+ fieldName_(dict.lookup("field")),
interpolationScheme_(dict.lookup("interpolationScheme"))
{
const pointMesh& pMesh = this->internalField().mesh();
@@ -260,7 +260,7 @@ void uniformInterpolatedDisplacementPointPatchVectorField::write(Ostream& os)
const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("fieldName")
+ os.writeKeyword("field")
<< fieldName_ << token::END_STATEMENT << nl;
os.writeKeyword("interpolationScheme")
<< interpolationScheme_ << token::END_STATEMENT << nl;
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
index 2b73df7ebd0105aff2f86890f9c3fd3cafc75b62..0e65b54ea7c027b310a58e1faee2d85a286e5b07 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.H
@@ -37,7 +37,7 @@ Description
{
type uniformInterpolatedDisplacement;
value uniform (0 0 0);
- fieldName wantedDisplacement;
+ field wantedDisplacement;
interpolationScheme linear;
}
\endverbatim
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index b95e2f8b2e72ffefe404e4646832257c554905ad..d41dac0660de04a3761aac3d9f703780ec972949 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -84,7 +84,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
}
case tmLookup:
{
- TName_ = coeffs_.lookupOrDefault<word>("TName", "T");
+ TName_ = coeffs_.lookupOrDefault<word>("T", "T");
break;
}
default:
@@ -157,7 +157,7 @@ bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
);
}
- coeffs_.readIfPresent("TName", TName_);
+ coeffs_.readIfPresent("T", TName_);
return true;
}
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
index 41e28a0cbb6916c74228e0693caa149c006fc778..64b9f5cd6be0e089966bd193b20cc531671bbc6f 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
@@ -33,11 +33,11 @@ Description
{
mode uniform; // uniform or lookup
- // uniform option
+ // For uniform option
temperature constant 500; // fixed temperature with time [K]
- // lookup option
- // TName T; // optional temperature field name
+ // For lookup option
+ // T <Tname>; // optional temperature field name
}
Note:
diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
index 57b05575dcc1d2be9ca994ee775a7b869712be2d..41ebb7a955c214083fa2e7c9a3df09acd93d066c 100644
--- a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
+++ b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C
@@ -56,9 +56,9 @@ Foam::fv::buoyancyEnergy::buoyancyEnergy
)
:
option(sourceName, modelType, dict, mesh),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U"))
+ UName_(coeffs_.lookupOrDefault<word>("U", "U"))
{
- coeffs_.lookup("fieldNames") >> fieldNames_;
+ coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
diff --git a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
index e513532a8499e21df864fee3b3ecad9202f78608..23c85d0b10c0e9c3568ecaac87f26dac05465dd1 100644
--- a/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
+++ b/src/fvOptions/sources/derived/buoyancyForce/buoyancyForce.C
@@ -68,7 +68,7 @@ Foam::fv::buoyancyForce::buoyancyForce
)
)
{
- coeffs_.lookup("fieldNames") >> fieldNames_;
+ coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
diff --git a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
index aa7f6b2db22348863cdea241711d660101094860..27980c1fb87de2ee8e1c7bd991f6a35eedf472ae 100644
--- a/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
+++ b/src/fvOptions/sources/derived/effectivenessHeatExchangerSource/effectivenessHeatExchangerSource.C
@@ -156,9 +156,9 @@ Foam::fv::effectivenessHeatExchangerSource::effectivenessHeatExchangerSource
secondaryInletT_(readScalar(coeffs_.lookup("secondaryInletT"))),
primaryInletT_(readScalar(coeffs_.lookup("primaryInletT"))),
eTable_(),
- 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")),
faceZoneName_(coeffs_.lookup("faceZone")),
zoneID_(mesh_.faceZones().findZoneID(faceZoneName_)),
faceId_(),
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
index 49c73adc3b39660b681bae338ea84433d87da8fc..ae861256b5062409dd8ba0b744c3d3aaaa152ce4 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
@@ -130,9 +130,9 @@ bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
{
coeffs_.lookup("UNames") >> fieldNames_;
}
- else if (coeffs_.found("UName"))
+ else if (coeffs_.found("U"))
{
- word UName(coeffs_.lookup("UName"));
+ word UName(coeffs_.lookup("U"));
fieldNames_ = wordList(1, UName);
}
else
diff --git a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
index 45348ae6cbb2fcc8f61d616ebc9380719053642a..afc5bad15fa553f6ce25cab64b74fe4eeb34bdca 100644
--- a/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
+++ b/src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
@@ -93,7 +93,7 @@ Foam::fv::meanVelocityForce::meanVelocityForce
relaxation_(coeffs_.lookupOrDefault<scalar>("relaxation", 1.0)),
rAPtr_(NULL)
{
- coeffs_.lookup("fieldNames") >> fieldNames_;
+ coeffs_.lookup("fields") >> fieldNames_;
if (fieldNames_.size() != 1)
{
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 9b3648c31ac49c3ff96181cc6ec54fbb9c01ff6c..129d5b1699841cd58e3b99971bbefdd19aec8bc1 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -586,7 +586,7 @@ bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
- coeffs_.lookup("fieldNames") >> fieldNames_;
+ coeffs_.lookup("fields") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false);
// Read co-ordinate system/geometry invariant properties
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 654b359be168383a31d4ec03350eecf97a9bed76..d421d40b7f4480b06f68cb7258bc6e12891c6fac 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -193,10 +193,10 @@ Foam::fv::solidificationMeltingSource::solidificationMeltingSource
relax_(coeffs_.lookupOrDefault("relax", 0.9)),
mode_(thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"))),
rhoRef_(readScalar(coeffs_.lookup("rhoRef"))),
- TName_(coeffs_.lookupOrDefault<word>("TName", "T")),
- CpName_(coeffs_.lookupOrDefault<word>("CpName", "Cp")),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- phiName_(coeffs_.lookupOrDefault<word>("phiName", "phi")),
+ TName_(coeffs_.lookupOrDefault<word>("T", "T")),
+ CpName_(coeffs_.lookupOrDefault<word>("Cp", "Cp")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ phiName_(coeffs_.lookupOrDefault<word>("phi", "phi")),
Cu_(coeffs_.lookupOrDefault<scalar>("Cu", 100000)),
q_(coeffs_.lookupOrDefault("q", 0.001)),
beta_(readScalar(coeffs_.lookup("beta"))),
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
index 1987ac991eef184e309fc35bbc881f31ffa6671d..5578cddee2d67838c495fd7d9449f60d76f76474 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.H
@@ -75,11 +75,11 @@ Description
relax | Relaxation coefficient [0-1] | no | 0.9
thermoMode | Thermo mode [thermo|lookup] | yes |
rhoRef | Reference (solid) density | yes |
- rhoName | Name of density field | no | rho
- TName | Name of temperature field | no | T
- CpName | Name of specific heat capacity field | no | Cp
- UName | Name of velocity field | no | U
- phiName | Name of flux field | no | phi
+ rho | Name of density field | no | rho
+ T | Name of temperature field | no | T
+ Cp | Name of specific heat capacity field | no | Cp
+ U | Name of velocity field | no | U
+ phi | Name of flux field | no | phi
Cu | Model coefficient | no | 100000
q | Model coefficient | no | 0.001
beta | Thermal expansion coefficient [1/K] | yes |
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
index 9ead11778371f999a5daf78fa081457f78383c3f..d1e924d36f69e79807c6ba5fe4cac62e7fc62595 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSourceIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -39,8 +39,8 @@ bool Foam::fv::solidificationMeltingSource::read(const dictionary& dict)
mode_ = thermoModeTypeNames_.read(coeffs_.lookup("thermoMode"));
coeffs_.lookup("rhoRef") >> rhoRef_;
- coeffs_.readIfPresent("TName", TName_);
- coeffs_.readIfPresent("UName", UName_);
+ coeffs_.readIfPresent("T", TName_);
+ coeffs_.readIfPresent("U", UName_);
coeffs_.readIfPresent("Cu", Cu_);
coeffs_.readIfPresent("q", q_);
diff --git a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
index 5b70fbfbfcf735f2cf2e8d0553337227d9f9621b..a56c76028219c1f56cc0e434be02656c342fc64f 100644
--- a/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
+++ b/src/fvOptions/sources/derived/tabulatedAccelerationSource/tabulatedAccelerationSource.C
@@ -58,7 +58,7 @@ Foam::fv::tabulatedAccelerationSource::tabulatedAccelerationSource
:
option(name, modelType, dict, mesh),
motion_(coeffs_, mesh.time()),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
g0_("g0", dimAcceleration, Zero)
{
fieldNames_.setSize(1, UName_);
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
index b88ba38f49e9a958cbe5e20ada78f6cd333f94e8..0291b20b3b276fdcfff3009be05c55a1c20901bc 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.C
@@ -118,8 +118,8 @@ Foam::fv::interRegionExplicitPorositySource::interRegionExplicitPorositySource
interRegionOption(name, modelType, dict, mesh),
porosityPtr_(NULL),
firstIter_(true),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- muName_(coeffs_.lookupOrDefault<word>("muName", "thermo:mu"))
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ muName_(coeffs_.lookupOrDefault<word>("mu", "thermo:mu"))
{
if (active_)
{
@@ -289,8 +289,8 @@ bool Foam::fv::interRegionExplicitPorositySource::read(const dictionary& dict)
{
if (interRegionOption::read(dict))
{
- coeffs_.readIfPresent("UName", UName_);
- coeffs_.readIfPresent("muName", muName_);
+ coeffs_.readIfPresent("U", UName_);
+ coeffs_.readIfPresent("mu", muName_);
// Reset the porosity model?
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 956e5bd6c096eb1e550817ae73c6e1bafca636ce..081977aa26e25a8ab8c6694537923cebe22f232e 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -119,7 +119,7 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel
dict,
mesh
),
- nbrModelName_(coeffs_.lookup("nbrModelName")),
+ nbrModelName_(coeffs_.lookup("nbrModel")),
nbrModel_(NULL),
firstIter_(true),
timeIndex_(-1),
@@ -143,12 +143,12 @@ Foam::fv::interRegionHeatTransferModel::interRegionHeatTransferModel
zeroGradientFvPatchScalarField::typeName
),
semiImplicit_(false),
- TName_(coeffs_.lookupOrDefault<word>("TName", "T")),
- TNbrName_(coeffs_.lookupOrDefault<word>("TNbrName", "T"))
+ TName_(coeffs_.lookupOrDefault<word>("T", "T")),
+ TNbrName_(coeffs_.lookupOrDefault<word>("TNbr", "T"))
{
if (active())
{
- coeffs_.lookup("fieldNames") >> fieldNames_;
+ coeffs_.lookup("fields") >> fieldNames_;
applied_.setSize(fieldNames_.size(), false);
coeffs_.lookup("semiImplicit") >> semiImplicit_;
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
index f7a1c4a83c3653408c5aaddfb66a3f437c9a78a9..86de071e8f9e07a5d2bddc16797320885e807c34 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/tabulatedHeatTransfer/tabulatedHeatTransfer.C
@@ -93,8 +93,8 @@ Foam::fv::tabulatedHeatTransfer::tabulatedHeatTransfer
)
:
interRegionHeatTransferModel(name, modelType, dict, mesh),
- UName_(coeffs_.lookupOrDefault<word>("UName", "U")),
- UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
+ UName_(coeffs_.lookupOrDefault<word>("U", "U")),
+ UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
hTable_(),
AoV_(),
startTimeName_(mesh.time().timeName())
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
index c137c581eef1eaf9b714e7f6466d4cdf13da6a87..7fe1bc1a30c3ecda09edb1e90b0a6da723076049 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@@ -55,7 +55,7 @@ Foam::fv::variableHeatTransfer::variableHeatTransfer
)
:
interRegionHeatTransferModel(name, modelType, dict, mesh),
- UNbrName_(coeffs_.lookupOrDefault<word>("UNbrName", "U")),
+ UNbrName_(coeffs_.lookupOrDefault<word>("UNbr", "U")),
a_(0),
b_(0),
c_(0),
@@ -130,7 +130,7 @@ bool Foam::fv::variableHeatTransfer::read(const dictionary& dict)
{
if (interRegionHeatTransferModel::read(dict))
{
- coeffs_.readIfPresent("UNbrName", UNbrName_);
+ coeffs_.readIfPresent("UNbr", UNbrName_);
coeffs_.readIfPresent("a", a_);
coeffs_.readIfPresent("b", b_);
diff --git a/src/lagrangian/basic/InteractionLists/InteractionLists.C b/src/lagrangian/basic/InteractionLists/InteractionLists.C
index 3c258d1035858e8af01f06187e0f05ac92d23677..b911153f705ae751aa94bb17fb22ab65abf84376 100644
--- a/src/lagrangian/basic/InteractionLists/InteractionLists.C
+++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C
@@ -1107,7 +1107,7 @@ Foam::InteractionLists<ParticleType>::InteractionLists(const polyMesh& mesh)
cellIndexAndTransformToDistribute_(),
wallFaceIndexAndTransformToDistribute_(),
referredWallFaces_(),
- UName_("unknown_UName"),
+ UName_("unknown_U"),
referredWallData_(),
referredParticles_()
{}
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
index 4062fb7aaea8acd83dffe20c38eb67f16538be66..ad03f5ace1b6d8ff1d61cec176895c7f01826350 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
@@ -39,7 +39,7 @@ Foam::ParticleTrap<CloudType>::ParticleTrap
CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
alphaName_
(
- this->coeffDict().template lookupOrDefault<word>("alphaName", "alpha")
+ this->coeffDict().template lookupOrDefault<word>("alpha", "alpha")
),
alphaPtr_(NULL),
gradAlphaPtr_(NULL),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 987da01bda9102b84455b9305ff27715c94f6c12..c577013802b7463206fc755bf211728edb05c0bf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -591,7 +591,7 @@ Foam::PairCollision<CloudType>::PairCollision
false
)
),
- this->coeffDict().lookupOrDefault("UName", word("U"))
+ this->coeffDict().lookupOrDefault("U", word("U"))
)
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
index 5ccaf9bc02814807724b6b929d960628aa7a5461..a652b3e88282df3c361917e8cc04b1949a8ff1b6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -110,7 +110,7 @@ Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
)
:
CloudSubModelBase<CloudType>(owner),
- UName_("unknown_UName")
+ UName_("unknown_U")
{}
@@ -123,7 +123,7 @@ Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
)
:
CloudSubModelBase<CloudType>(owner, dict, typeName, type),
- UName_(this->coeffDict().lookupOrDefault("UName", word("U")))
+ UName_(this->coeffDict().lookupOrDefault("U", word("U")))
{}
diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict
index 32d84034db2e112253d3e615f8533f1d32620c42..ee97b1ffa253d95b154184fff1f286b5616e1b83 100644
--- a/src/postProcessing/functionObjects/field/streamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/streamLine/controlDict
@@ -59,9 +59,6 @@ functions
setFormat vtk; //gnuplot, raw etc. See sampleDict.
- // Velocity field to use for tracking.
- UName U;
-
// Interpolation method. Default is cellPoint. See sampleDict.
//interpolationScheme pointMVC;
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.C b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
index 67d576f916fd78a15d6fa0eb2e5d236105430896..d20b4e18d4e36ffb23816517ff709d8e32acd105 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.C
@@ -324,9 +324,9 @@ bool Foam::functionObjects::streamLine::read(const dictionary& dict)
Info<< type() << " " << name() << ":" << nl;
dict.lookup("fields") >> fields_;
- if (dict.found("UName"))
+ if (dict.found("U"))
{
- dict.lookup("UName") >> UName_;
+ dict.lookup("U") >> UName_;
}
else
{
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index 08a18c96a6eb3713e165aafa731dfdfe0754b44a..58d39c4ede416ae781f1807bece69fe9bf0093ee 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
@@ -40,7 +40,6 @@ Description
libs ("libfieldFunctionObjects.so");
...
setFormat vtk;
- UName U;
trackForward yes;
fields
(
@@ -66,15 +65,15 @@ Description
\heading Function object usage
\table
Property | Description | Required | Default value
- type | type name: streamLine | yes |
- setFormat | output data type | yes |
- UName | tracking velocity field name | yes |
- fields | fields to sample | yes |
- lifetime | maximum number of particle tracking steps | yes |
- trackLength | tracking segment length | no |
- nSubCycle | number of tracking steps per cell | no|
- cloudName | cloud name to use | yes |
- seedSampleSet| seeding method (see below)| yes |
+ type | Type name: streamLine | yes |
+ setFormat | Output data type | yes |
+ U | Tracking velocity field name | yes |
+ fields | Fields to sample | yes |
+ lifetime | Maximum number of particle tracking steps | yes |
+ trackLength | Tracking segment length | no |
+ nSubCycle | Number of tracking steps per cell | no|
+ cloudName | Cloud name to use | yes |
+ seedSampleSet| Seeding method (see below)| yes |
\endtable
\linebreak
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
index 087a6f6c2f56d02af75580fad227ab41670a4c29..aafb38bfb2c907e5a58dd52bfc4b0d84e0111a21 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict
@@ -92,7 +92,7 @@ functions
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
- UName UNear;
+ U UNear;
// Interpolation method. Default is cellPoint. See sampleDict.
//interpolationScheme pointMVC;
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
index 496849fd37b576358bd575596d2e2ea93d1f1a0b..d94ddffee713c6fa4ab9c371eb42ca2eed3a9719 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.C
@@ -441,9 +441,9 @@ bool Foam::functionObjects::wallBoundedStreamLine::read(const dictionary& dict)
{
//dict_ = dict;
dict.lookup("fields") >> fields_;
- if (dict.found("UName"))
+ if (dict.found("U"))
{
- dict.lookup("UName") >> UName_;
+ dict.lookup("U") >> UName_;
}
else
{
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index c610cc1d688fe6fe944e6599d5217abf0a3ea680..5aa0980b8a60fe786ad719437952cdedb0a1910c 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
@@ -40,7 +40,7 @@ Description
libs ("libfieldFunctionObjects.so");
...
setFormat vtk;
- UName UNear;
+ U UNear;
trackForward yes;
fields
(
@@ -65,15 +65,15 @@ Description
\heading Function object usage
\table
Property | Description | Required | Default value
- type | type name: wallBoundedStreamLine| yes |
- setFormat | output data type | yes |
- UName | tracking velocity field name | yes |
- fields | fields to sample | yes |
- lifetime | maximum number of particle tracking steps | yes |
- trackLength | tracking segment length | no |
- nSubCycle | number of tracking steps per cell | no|
- cloudName | cloud name to use | yes |
- seedSampleSet| seeding method (see below)| yes |
+ type | Type name: wallBoundedStreamLine| yes |
+ setFormat | Output data type | yes |
+ U | Tracking velocity field name | yes |
+ fields | Fields to sample | yes |
+ lifetime | Maximum number of particle tracking steps | yes |
+ trackLength | Tracking segment length | no |
+ nSubCycle | Number of tracking steps per cell | no|
+ cloudName | Cloud name to use | yes |
+ seedSampleSet| Seeding method (see below)| yes |
\endtable
\linebreak
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C
index 4095d509f4b9f675c528a6d73004d5ab487926cb..097350d9901819aad0d63df7d94c47b5c1abe1c4 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.C
+++ b/src/postProcessing/functionObjects/forces/forces/forces.C
@@ -624,14 +624,14 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
if (directForceDensity_)
{
// Optional entry for fDName
- fDName_ = dict.lookupOrDefault<word>("fDName", "fD");
+ fDName_ = dict.lookupOrDefault<word>("fD", "fD");
}
else
{
// Optional entries U and p
- pName_ = dict.lookupOrDefault<word>("pName", "p");
- UName_ = dict.lookupOrDefault<word>("UName", "U");
- rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+ pName_ = dict.lookupOrDefault<word>("p", "p");
+ UName_ = dict.lookupOrDefault<word>("U", "U");
+ rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
// Reference density needed for incompressible calculations
rhoRef_ = readScalar(dict.lookup("rhoInf"));
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index d3d994df12e5ee4894eafdc29dc1c7b9846df978..cfe38f3447a8638d9fbceb045edafa3bb83d1f5e 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -57,15 +57,15 @@ Description
\heading Function object usage
\table
Property | Description | Required | Default value
- type | type name: forces | yes |
- log | write force data to standard output | no | no
- patches | patches included in the forces calculation | yes |
- pName | pressure field name | no | p
- UName | velocity field name | no | U
- rhoName | density field name (see below) | no | rho
- CofR | centre of rotation (see below) | no |
- directForceDensity | force density supplied directly (see below)|no|no
- fDName | name of force density field (see below) | no | fD
+ type | Type name: forces | yes |
+ log | Write force data to standard output | no | no
+ patches | Patches included in the forces calculation | yes |
+ p | Pressure field name | no | p
+ U | Velocity field name | no | U
+ rho | Density field name (see below) | no | rho
+ CofR | Centre of rotation (see below) | no |
+ directForceDensity | Force density supplied directly (see below)|no|no
+ fD | Name of force density field (see below) | no | fD
\endtable
Bin data is optional, but if the dictionary is present, the entries must
@@ -77,7 +77,7 @@ Description
\endtable
Note
- - For incompressible cases, set \c rhoName to \c rhoInf. You will then be
+ - For incompressible cases, set \c rho to \c rhoInf. You will then be
required to provide a \c rhoInf value corresponding to the free-stream
constant density.
- If the force density is supplied directly, set the \c directForceDensity
@@ -222,7 +222,7 @@ protected:
//- Dynamic viscosity field
tmp<volScalarField> mu() const;
- //- Return rho if rhoName is specified otherwise rhoRef
+ //- Return rho if specified otherwise rhoRef
tmp<volScalarField> rho() const;
//- Return rhoRef if the pressure field is dynamic, i.e. p/rho
diff --git a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
index 631c5541e942eb6f4be28aa71a561954576987e7..41e17303c6cfec435fbd6f775e220d4022a977fe 100644
--- a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
@@ -240,9 +240,9 @@ Foam::functionObjects::pressureTools::~pressureTools()
bool Foam::functionObjects::pressureTools::read(const dictionary& dict)
{
- dict.readIfPresent("pName", pName_);
- dict.readIfPresent("UName", UName_);
- dict.readIfPresent("rhoName", rhoName_);
+ dict.readIfPresent("p", pName_);
+ dict.readIfPresent("U", UName_);
+ dict.readIfPresent("rho", rhoName_);
if (rhoName_ == "rhoInf")
{
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
index 411ad032ccff58a5a05b5cb74b50c360bf91f6b2..a063ce82b007fd6892b529d2be4bd6cdecf6456f 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.C
@@ -64,8 +64,8 @@ Foam::functionObjects::blendingFactor::~blendingFactor()
bool Foam::functionObjects::blendingFactor::read(const dictionary& dict)
{
- phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
- dict.lookup("fieldName") >> fieldName_;
+ phiName_ = dict.lookupOrDefault<word>("phi", "phi");
+ dict.lookup("field") >> fieldName_;
return true;
}
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
index 2a0fe99e705b66af053da4296113096b43be02a1..7112598e72ab14a75ce3a722c3ba97d0a0655120 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.C
@@ -197,9 +197,9 @@ bool Foam::functionObjects::scalarTransport::read(const dictionary& dict)
{
Info<< type() << ":" << nl;
- phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
- UName_ = dict.lookupOrDefault<word>("UName", "U");
- rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
+ phiName_ = dict.lookupOrDefault<word>("phi", "phi");
+ UName_ = dict.lookupOrDefault<word>("U", "U");
+ rhoName_ = dict.lookupOrDefault<word>("rho", "rho");
userDT_ = false;
if (dict.readIfPresent("DT", DT_))
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
index 0becd46aa24f09c8a920b61a0f538656e7b62c3e..87f0bb599fdc37005911dbc527abec99428c3f39 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.C
@@ -116,7 +116,7 @@ Foam::functionObjects::yPlus::~yPlus()
bool Foam::functionObjects::yPlus::read(const dictionary& dict)
{
writeFiles::read(dict);
- phiName_ = dict.lookupOrDefault<word>("phiName", "phi");
+ phiName_ = dict.lookupOrDefault<word>("phi", "phi");
return true;
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
index 0f9167b2471349579efd00045ce2b2b680179fa2..9c3845102ff2042de0f9973e553c33e078f58597 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@@ -66,7 +66,7 @@ constantFilmThermo::constantFilmThermo
)
:
filmThermoModel(typeName, owner, dict),
- name_(coeffDict_.lookup("specieName")),
+ name_(coeffDict_.lookup("specie")),
rho0_("rho0"),
mu0_("mu0"),
sigma0_("sigma0"),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
index 107b967d690c4fc9c5c436329df73ab0d7009412..10822db6e995766dd350f7fe6b1fd927881d4112 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -59,27 +59,23 @@ public:
struct thermoData
{
-// private:
word name_;
scalar value_;
bool set_;
-// public:
thermoData()
:
name_("unknown"),
value_(0.0),
set_(false)
{}
+
thermoData(const word& n)
:
name_(n),
value_(0.0),
set_(false)
{}
-
-// virtual ~thermoData()
-// {}
};
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index fcff9df278e09ceb78350406dd40989c0aae50f2..1de13ce14ffae6b8610e0e1fd9e9dd4408be2694 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -114,7 +114,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
),
test_(coeffDict().lookupOrDefault<Switch>("test", false)),
rhoInf_(1.0),
- rhoName_(coeffDict().lookupOrDefault<word>("rhoName", "rho")),
+ rhoName_(coeffDict().lookupOrDefault<word>("rho", "rho")),
curTimeIndex_(-1)
{
if (rhoName_ == "rhoInf")
@@ -253,7 +253,7 @@ void Foam::rigidBodyMeshMotion::solve()
forcesDict.add("type", functionObjects::forces::typeName);
forcesDict.add("patches", bodyMeshes_[bi].patches_);
forcesDict.add("rhoInf", rhoInf_);
- forcesDict.add("rhoName", rhoName_);
+ forcesDict.add("rho", rhoName_);
forcesDict.add("CofR", vector::zero);
functionObjects::forces f("forces", db(), forcesDict);
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
index f97384e1db5b61ce6bec88c68e613b1bee576245..c60bdc9a3d710e4c18b23d60cb4ad75c76efa062 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.H
@@ -108,7 +108,7 @@ class rigidBodyMeshMotion
Switch test_;
//- Reference density required by the forces object for
- // incompressible calculations, required if rhoName == rhoInf
+ // incompressible calculations, required if rho == rhoInf
scalar rhoInf_;
//- Name of density field, optional unless used for an
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index b2ef71dc8f301fbaef96d585b5b493d3f5a47026..daeb9adf8d976ad0d9f0e6355842790494cee6d8 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -68,7 +68,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
fixedValuePointPatchField<vector>(p, iF, dict),
motion_(dict, dict),
rhoInf_(1.0),
- rhoName_(dict.lookupOrDefault<word>("rhoName", "rho")),
+ rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
lookupGravity_(-1),
g_(Zero),
curTimeIndex_(-1)
@@ -213,7 +213,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
forcesDict.add("type", functionObjects::forces::typeName);
forcesDict.add("patches", wordList(1, ptPatch.name()));
forcesDict.add("rhoInf", rhoInf_);
- forcesDict.add("rhoName", rhoName_);
+ forcesDict.add("rho", rhoName_);
forcesDict.add("CofR", motion_.centreOfRotation());
functionObjects::forces f("forces", db(), forcesDict);
@@ -255,7 +255,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::write(Ostream& os) const
{
pointPatchField<vector>::write(os);
- os.writeKeyword("rhoName") << rhoName_ << token::END_STATEMENT << nl;
+ os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
if (rhoName_ == "rhoInf")
{
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
index 6eb52b4c39aa760872a25483fd0d5c54c8e50788..04b001706239324ea83324304d280e93b7d07b1d 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.H
@@ -60,7 +60,7 @@ class sixDoFRigidBodyDisplacementPointPatchVectorField
pointField initialPoints_;
//- Reference density required by the forces object for
- // incompressible calculations, required if rhoName == rhoInf
+ // incompressible calculations, required if rho == rhoInf
scalar rhoInf_;
//- Name of density field, optional unless used for an
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index 9aaf0785636f535b0e7d11c5933c287c3529331e..12768a30de74d61cec1c1e7843ff3849b7dc1b16 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -87,7 +87,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
do_(readScalar(coeffDict().lookup("outerDistance"))),
test_(coeffDict().lookupOrDefault<Switch>("test", false)),
rhoInf_(1.0),
- rhoName_(coeffDict().lookupOrDefault<word>("rhoName", "rho")),
+ rhoName_(coeffDict().lookupOrDefault<word>("rho", "rho")),
scale_
(
IOobject
@@ -219,7 +219,7 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
forcesDict.add("type", functionObjects::forces::typeName);
forcesDict.add("patches", patches_);
forcesDict.add("rhoInf", rhoInf_);
- forcesDict.add("rhoName", rhoName_);
+ forcesDict.add("rho", rhoName_);
forcesDict.add("CofR", motion_.centreOfRotation());
functionObjects::forces f("forces", db(), forcesDict);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
index 2ad4921aaa961183ed9b1040a7da90fdde1c764f..81022fd5c8abaee10358e6b2f1dce16f063cb493 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -75,7 +75,7 @@ class sixDoFRigidBodyMotionSolver
Switch test_;
//- Reference density required by the forces object for
- // incompressible calculations, required if rhoName == rhoInf
+ // incompressible calculations, required if rho == rhoInf
scalar rhoInf_;
//- Name of density field, optional unless used for an
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index 6e60dece1bb70c429810bad4405e9489b5852648..763a6b4886bdbfe60732fb8002318ec8a5318407 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -88,7 +88,7 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::mixtureFractionSoot
sootMax_(-1),
mappingFieldName_
(
- coeffsDict_.lookupOrDefault<word>("mappingFieldName", "none")
+ coeffsDict_.lookupOrDefault<word>("mappingField", "none")
),
mapFieldMax_(1),
thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
index ca65aca1d10e7dfcbfc53dc77b9cf65a892583a1..46b933a6f333d44139d455420f695977e4da9208 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H
@@ -47,7 +47,7 @@ Description
{
nuSoot 0.015;
Wsoot 12;
- mappingFieldName P;
+ mappingField P;
}
SourceFiles
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
index 4725daa9c9fd7631303e7a8ef44c06cabbc4f0d9..f1bb383cff4fc48ec73f8d7bff48e25ad8653924 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
@@ -31,7 +31,7 @@ Description
\table
Property | Description | Required | Default value
- TName | Temperature field name | no | T
+ T | Temperature field name | no | T
theta0 | Contact angle data | yes |
\endtable
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.orig/U b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.orig/U
index cf7e9a8dc63113edb0f2434056269f8e1e31961f..d30027bcf130d07677116f0bcb16afb2c0445fed 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.orig/U
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/0.orig/U
@@ -44,7 +44,6 @@ boundaryField
openingTime 0.01;
maxOpenFractionDelta 0.1;
openFraction 0;
- p p;
minThresholdValue 8000;
forceBased 0;
}
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
index 75ebdc085a4622eb2b8c309312dfb3d107f61aeb..3ed912733e8a36d3f7015efd3ad4e136475a5dac 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/changeDictionaryDict
@@ -56,7 +56,6 @@ dictionaryReplacement
openingTime 0.01;
maxOpenFractionDelta 0.1;
openFraction 0;
- p p;
minThresholdValue 8000;
forceBased 0;
value uniform (0 0 0);
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
index df1b2ab5da25d2c8bc795e41fb4958debf9871c7..79dc67e82be94bdf5ea4fddc847c62adc8fe4ead 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/C3H8
@@ -45,16 +45,12 @@ boundaryField
inlet
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
value uniform 1;
}
region0_to_pyrolysisRegion_coupledWall
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
massFluxFraction 1.0;
value $internalField;
}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
index 629aa0b799c783524f36a1d5f5c3efe5efede723..1c5c60cb77ad33a7f841b6b26acfe6396676833a 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/IDefault
@@ -24,7 +24,6 @@ boundaryField
region0_to_pyrolysisRegion_coupledWall
{
type greyDiffusiveRadiation;
- T T;
emissivityMode solidRadiation;
emissivity uniform 1.0;
value uniform 0;
@@ -38,7 +37,6 @@ boundaryField
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2 b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
index 91036e1a56a1e3de15df95dca82cfb89de9d852f..60dc3c89f9a8f6ef4c00e3bfa4a905f215e0fa3c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/O2
@@ -50,8 +50,6 @@ boundaryField
region0_to_pyrolysisRegion_coupledWall
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
massFluxFraction 0.0;
value $internalField;
}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
index 98bf184dec1324928d0075b441dd67a8391c2d80..6e4926f22c5bde5aadf22e23ec7be6a8d4424a2b 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/T
@@ -52,10 +52,9 @@ boundaryField
pyrolysisRegion pyrolysisRegion;
filmRegion filmRegion;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
filmDeltaDry 0.0;
filmDeltaWet 2e-4;
value $internalField;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
index 418120f1e9c49a0440c802c19d1de79096552286..136b5517e2aac441d246049aacb9e74925752f75 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/U
@@ -38,7 +38,6 @@ boundaryField
side
{
type pressureInletOutletVelocity;
- phi phi;
value $internalField;
}
@@ -52,9 +51,7 @@ boundaryField
region0_to_pyrolysisRegion_coupledWall
{
type mappedFlowRate;
- phi phi;
nbrPhi phiGas;
- rho rho;
value uniform (0 0 0);
}
}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
index cc3de91d28160e9a0e88611399e7bfd7169d1834..359c5527d942aed4ce0f7629b87980543a14f924 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/Ydefault
@@ -44,16 +44,12 @@ boundaryField
inlet
{
type fixedValue;
- phi phi;
- rho rho;
value uniform 0;
}
region0_to_pyrolysisRegion_coupledWall
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
massFluxFraction 0.0;
value $internalField;
}
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
index 0ebaacfbc0ab1c93ba060480a5536c7e3e829515..d7ffe8df6aafb73b61d60fdc4abbe5b42fed2b1c 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/filmRegion/Tf
@@ -29,7 +29,7 @@ boundaryField
sampleMode nearestPatchFace;
samplePatch region0_to_pyrolysisRegion_coupledWall;
offset (0 0 0);
- fieldName T;
+ field T;
setAverage no;
average 0;
value uniform 298;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
index aaeee9d11c502629db6277670b0e16e1bd4394e6..688990cd4804e8768ab47747c0b639f64cc1e80a 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/Qr
@@ -38,7 +38,7 @@ boundaryField
sampleMode nearestPatchFace;
samplePatch region0_to_pyrolysisRegion_coupledWall;
offset (0 0 0);
- fieldName Qr; // this is the name of Qr field in region0
+ field Qr; // this is the name of Qr field in region0
setAverage no;
average 0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
index 2212e48d7c3a3e13b74b8efb7b0d2808407fce8b..6a25deb6ac8141e55dd45445860bce13464fdb3b 100644
--- a/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
+++ b/tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/0/pyrolysisRegion/T
@@ -37,8 +37,7 @@ boundaryField
pyrolysisRegion pyrolysisRegion;
filmRegion filmRegion;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
filmDeltaDry 0.0;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8 b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
index 178527b915c338ea8a5bbd9f0ba318da9ce18312..30378f4ef9fd46d3b3eed158883bba0a22805f47 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/C3H8
@@ -40,15 +40,11 @@ boundaryField
burner
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
value uniform 1.0;
}
"(region0_to.*)"
{
type totalFlowRateAdvectiveDiffusive;
- phi phi;
- rho rho;
value $internalField;
}
}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
index fd53ea0248aaf4a8606f7279ed40389e74d99863..f746f6fe5e4ccdc5bbe98deb96db389088f5f941 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/G
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -32,7 +31,6 @@ boundaryField
"(region0_to.*)"
{
type MarshakRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
index c670ea7e1df6fd253fe9f0c57b0123ad382748bb..6d7b301a07ae7f0b961ba952958e9fe47d00fccf 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/IDefault
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -31,7 +30,6 @@ boundaryField
"(region0_to.*)"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
index 02752e8e3dd247b3f4f09c732a5deb9db986820e..da6eb73e6eb0414ff6fda3a4d49d19f3f45c0cb3 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/T
@@ -50,10 +50,9 @@ boundaryField
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
value $internalField;
}
}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
index 9956821b4e9af2a31ead410d25c99e899aae3910..16a4f29cf843ea6c189401160b76b9e137f8a755 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/U
@@ -37,16 +37,13 @@ boundaryField
"(top|sides)"
{
type pressureInletOutletVelocity;
- phi phi;
value $internalField;
}
"(region0_to.*)"
{
type mappedFlowRate;
- phi phi;
nbrPhi phiGas;
- rho rho;
value uniform (0 0 0);
}
}
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
index 6b451a9d538b6f405e3829855900e4d390f60d76..ad9baa15862e3a18b95aa6bdebb80232365f3095 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/Qr
@@ -43,7 +43,7 @@ boundaryField
sampleMode nearestPatchFace;
samplePatch region0_to_panelRegion_fLeft_zone;
offset (0 0 0);
- fieldName Qr;
+ field Qr;
setAverage no;
average 0;
value uniform 0;
@@ -56,7 +56,7 @@ boundaryField
sampleMode nearestPatchFace;
samplePatch region0_to_panelRegion_fRight_zone;
offset (0 0 0);
- fieldName Qr;
+ field Qr;
setAverage no;
average 0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
index 900fa3ae767b2b05409da71b9611a23e779a1c29..386d3ff0bdf0fc943921f617ab99a5beeac185b2 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/panelRegion/T
@@ -41,8 +41,7 @@ boundaryField
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
value uniform 298.15;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
index 5dfaf2e402f2cb98b4dad9d3a82f6c12391d43d0..d736a34aaa9634557fb698be9fdf7c04963570f0 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/G
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
index 75186697cdca51b0ae8e9f000efdf71cf1b656c0..ed7f6dd8c7158bf0b779b471b65ebde55b32a6e9 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/IDefault
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
index fe75242d76939285cab48e4fc610b174e845687a..7c61961cd6ea79ba5d0c3af2388447934e1b44a2 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
index 1da0ef50b95b0471f73122f9ac4d9627c93d363b..510afad60c215fa9f3daf5aada18ab920d25a1ad 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1;
value uniform 0;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
index 6c15bb5118e39b0bd6a30cef99dd7dde635cd476..a57f8c96046032d38a5ae83366dee8b5a00e957f 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
@@ -25,7 +25,6 @@ boundaryField
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
- phi phi;
}
base
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
index deca9ba60da613c61097d7624095469169b50c65..1fec35ae1c6fe7ff33fd795f122030e5c3460bb7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/0/p
@@ -33,8 +33,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
index deca9ba60da613c61097d7624095469169b50c65..1fec35ae1c6fe7ff33fd795f122030e5c3460bb7 100644
--- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
+++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/0/p
@@ -33,8 +33,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
index 807dc8786672c48f1e553ffcd2fbe9866f2ec579..0522075d327a906cac6b9639571804da446229f7 100644
--- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
+++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/0/p
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T
index 3ddfa33af1cc4faa80700b3981855743bc50800d..9db7dfe0aa9e0882f8799e4a1bbbaffefb800e2e 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T
@@ -36,8 +36,6 @@ boundaryField
type totalTemperature;
value uniform 297;
T0 uniform 297;
- U U;
- phi phi;
rho none;
psi thermo:psi;
gamma 1.4;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p
index bf63a32f63b4218ce1616722a73f1367215000a5..f2a7f631394022a3325e0f5eceaede424834efe3 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p
@@ -30,8 +30,6 @@ boundaryField
{
type waveTransmissive;
field p;
- phi phi;
- rho rho;
psi thermo:psi;
fieldInf 101325;
gamma 1.4;
@@ -44,8 +42,6 @@ boundaryField
type totalPressure;
value uniform 101325;
p0 uniform 101325;
- U U;
- phi phi;
rho none;
psi thermo:psi;
gamma 1.4;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
index 4fee89f86e76dba1287952d26dc7c97f80836833..934b9a838076ded1532d2ca1b0719ac91d84d322 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T
@@ -1241,8 +1241,6 @@ boundaryField
freestream
{
type totalTemperature;
- U U;
- phi phi;
psi thermo:psi;
gamma 1.4;
T0 uniform 297;
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
index 9de87d0b3f89fddad04d3c5a42733512bf59c8d9..dbc613545f64fc723b108e91158cc2133aa623de 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p
@@ -1233,8 +1233,6 @@ boundaryField
{
type waveTransmissive;
field p;
- phi phi;
- rho rho;
psi thermo:psi;
gamma 1.4;
fieldInf 101325;
@@ -1272,8 +1270,6 @@ boundaryField
freestream
{
type totalPressure;
- U U;
- phi phi;
rho none;
psi thermo:psi;
gamma 1.4;
diff --git a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
index 6224731ba238e302116d6e961d5cd6469f1cb5d2..9412b2521d669312d74035b7adbf3cbd90a91207 100644
--- a/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
+++ b/tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/constant/boundaryConditions
@@ -44,8 +44,6 @@ outlet
type totalPressure;
value uniform 1e5;
p0 uniform 1e5;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1.4;
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
index e2b5d86221249444728aca90bbdb5520e4895ae5..37b1c45ea10966b672d05bb9766e0add319ef2e7 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/0/U
@@ -24,8 +24,6 @@ boundaryField
inlet
{
type flowRateInletVelocity;
- phi phi;
- rho rho;
massFlowRate 0.0001;
value uniform (0 0 0);
}
@@ -51,8 +49,6 @@ boundaryField
plenum
{
type pressureInletVelocity;
- phi phi;
- rho rho;
value uniform (0 0 0);
}
}
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
index ed1ce104abea31666e64537cdd9efe17c74280b9..c4f505ad0cf8cdc03274a878d35a4da27de2751c 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/0/p
@@ -28,7 +28,6 @@ boundaryField
outlet
{
type waveTransmissive;
- phi phi;
psi thermo:psi;
gamma 1.3;
fieldInf 1e5;
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/p b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
index 807dc8786672c48f1e553ffcd2fbe9866f2ec579..0522075d327a906cac6b9639571804da446229f7 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/p
+++ b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
index bdbc4f96ce910e8e160544dd595aa116766e1bf5..7b08f10125e3cad7f89a94f257b9f69413c7a66f 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
@@ -30,8 +30,6 @@ boundaryField
{
type waveTransmissive;
field p;
- phi phi;
- rho rho;
psi thermo:psi;
gamma 1.4;
fieldInf 1;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
index 846f03a390f09795ca44e94ab170b883f30f3c97..d4695b805e8d004883643cae10fa658edd2dba36 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/0/p
@@ -29,8 +29,6 @@ boundaryField
{
type waveTransmissive;
field p;
- phi phi;
- rho rho;
psi thermo:psi;
gamma 1.3;
fieldInf 100000;
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index 6c20d90831e31d2d600efc2ba5c9b5bc1bdb80f7..0724cce578838f630c6b0b37ab17ccab23884711 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -59,8 +59,6 @@ functions
WALL10
);
- pName p;
- UName U;
log true;
rhoInf 1;
CofR (0 0 0);
diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/p b/tutorials/compressible/sonicFoam/ras/prism/0/p
index c1cc7124ff9f8cf2012de0fa92a5cd1173939012..c062b4f37e9eb6b198c3f20058258997e2b6e1e2 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/0/p
+++ b/tutorials/compressible/sonicFoam/ras/prism/0/p
@@ -30,8 +30,6 @@ boundaryField
{
type waveTransmissive;
field p;
- phi phi;
- rho rho;
psi thermo:psi;
gamma 1.3;
fieldInf 100000;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
index ea17f0ac0becc588b329465ee2768d12ba8a4203..95800790849f36d389cf4de06ee9cffbb657f1d8 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/baffle3DRegion/T
@@ -24,8 +24,7 @@ boundaryField
bottom
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
side
@@ -35,8 +34,7 @@ boundaryField
top
{
type compressible::thermalBaffle;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
index a068b051ba8ac32fe1153cb2adc3c662d80e4d69..c2c44de3dcbc5aedef9a52a2c1c6a46790ef15cd 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.orig/include/3DBaffle/3DTemperatureMasterBafflePatches
@@ -9,18 +9,16 @@
T
{
type compressible::thermalBaffle;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
value uniform 300;
- regionName ${baffleRegionName};
- active yes;
+ regionName ${baffleRegionName};
+ active yes;
# include "3DbaffleSolidThermo"
// New fvMesh (region) information
# include "extrudeModel"
-
}
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
index b3a71a27e9f4561a5a03bcba075d9eda3af01ee9..300739e0e8979787e6a9a5799b9da24392b16969 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/0/G
@@ -23,7 +23,6 @@ boundaryField
floor
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -32,7 +31,6 @@ boundaryField
fixedWalls
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -41,7 +39,6 @@ boundaryField
ceiling
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -50,7 +47,6 @@ boundaryField
box
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
index fe75242d76939285cab48e4fc610b174e845687a..7c61961cd6ea79ba5d0c3af2388447934e1b44a2 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/G
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
index e70bf3dec049007f0f422f82e0a9cab1950acdec..707f7e78d8edc47136bcfaf1a949f82ebd2ec330 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/0/IDefault
@@ -23,7 +23,6 @@ boundaryField
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
index 95a8ab241931ed280d6d27cedd3cffa19a46fe42..6e876153cb4e89694d3f66b0ab8ec7c864b705f4 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/0/bottomWater/T
@@ -52,24 +52,21 @@ boundaryField
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 300;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidthermo;
}
bottomWater_to_leftSolid
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 300;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidthermo;
}
bottomWater_to_heater
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
value uniform 300;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidthermo;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
index 63a08c87a1d5a617fcd24e720b5e8af983834c51..a77ceae77458e419c76196f604c1a17fdb7ff533 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomWater/changeDictionaryDict
@@ -70,8 +70,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
index a95dd145d5be853f560a30afe4b52bb35e3e9132..eb3a65b0dcb523985f0850f5f0f5220b045888df 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/heater/changeDictionaryDict
@@ -47,8 +47,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
@@ -56,8 +55,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
index 1709662b518d6561e59d932bf3c8f408e7253b21..815b0bad6b81a2492c735692dc2df5d6f6219eee 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
@@ -52,8 +51,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
thicknessLayers (1e-3);
kappaLayers (5e-4);
value uniform 300;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
index ba99b13705c6d415e7828d3138d85bebb00b4f68..c30bffb777a63cef2ad13a252627e26dbc725799 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
index 2a68977f3db3e0b833f8470b9dca99bf48fe2f6b..a653992d95d2467028872ef17a25f7b38d5a9870 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,8 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
index b7bddf908d94b128e91289d44c0caa3227d526f6..d04fa16ac1ca55aaf39723dcb99965211529c73b 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict
@@ -57,8 +57,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
index 3c883e6ee28e541f5b7c24d1ab983c1d023a9f6c..38a07d287c2bd2bdaf72f2bd076f5a19b6720297 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict
@@ -47,8 +47,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
minY
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
index 987aeb8b43d500d7035a236014457b716e40a6c9..fcfcbf0fd949d4db585ecb9e8de8bb83b124bc39 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict
@@ -43,8 +43,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
index ba99b13705c6d415e7828d3138d85bebb00b4f68..c30bffb777a63cef2ad13a252627e26dbc725799 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict
@@ -43,8 +43,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
index 2a68977f3db3e0b833f8470b9dca99bf48fe2f6b..a653992d95d2467028872ef17a25f7b38d5a9870 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict
@@ -68,8 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa fluidThermo;
- kappaName none;
+ kappaMethod fluidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index d9188a1378ae097f08db0b1e34c82b340dd8a74f..34857576c18df153704dc05a344d2762642fbae9 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -26,8 +26,8 @@ airToporous
nbrRegionName porous;
master false;
- nbrModelName porousToair;
- fieldNames (h);
+ nbrModel porousToair;
+ fields (h);
semiImplicit no;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
index 2938940b28a495d754f038feb13f3f00571c2618..6ccc6a529b049ee67baf62bbab2e43aa57b4057f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/porous/fvOptions
@@ -26,8 +26,8 @@ porousToair
nbrRegionName air;
master true;
- nbrModelName airToporous;
- fieldNames (h);
+ nbrModel airToporous;
+ fields (h);
semiImplicit no;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
index c583021fa3cc0a49bff0ba9356b5028055710e57..3883588c67c66b66a086ef5dafc5f7e33a70b76e 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/bottomAir/changeDictionaryDict
@@ -55,10 +55,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
value uniform 300;
}
}
@@ -148,7 +147,6 @@ dictionaryReplacement
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -157,7 +155,6 @@ dictionaryReplacement
"bottomAir_to_.*"
{
type MarshakRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
@@ -172,7 +169,6 @@ dictionaryReplacement
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -181,7 +177,6 @@ dictionaryReplacement
"bottomAir_to_.*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
index b9adae7e6f6cdc3e50641fc02a8523ae87cf1e98..6f3fbc138e1372709b8e645e36c5b4b5e40805da 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/heater/changeDictionaryDict
@@ -48,10 +48,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -59,10 +58,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -70,8 +68,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
minY
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
index cf0d33b686baf0873c6c3968ba6cf7c7124d402b..1ca402cad2f1418fbcb6101c3bd53fbef50a03f2 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/leftSolid/changeDictionaryDict
@@ -44,10 +44,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -55,10 +54,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -66,8 +64,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
index 746ee5a8816aef56597082b050d1349b772398c3..afd25cdaa7278edee3793d03daaebfab679f6a29 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/rightSolid/changeDictionaryDict
@@ -44,10 +44,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -55,10 +54,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa solidThermo;
+ kappaMethod solidThermo;
QrNbr Qr;
Qr none;
- kappaName none;
value uniform 300;
}
@@ -66,8 +64,7 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureCoupledBaffleMixed;
Tnbr T;
- kappa solidThermo;
- kappaName none;
+ kappaMethod solidThermo;
value uniform 300;
}
}
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
index f5edd119d98b202a1e612d906134397753e122a7..1e08e32ba3ddb6a3df8a3bc2b449af8bebed3e2f 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/system/topAir/changeDictionaryDict
@@ -66,10 +66,9 @@ dictionaryReplacement
{
type compressible::turbulentTemperatureRadCoupledMixed;
Tnbr T;
- kappa fluidThermo;
+ kappaMethod fluidThermo;
QrNbr none;
Qr Qr;
- kappaName none;
value uniform 300;
}
}
@@ -195,7 +194,6 @@ dictionaryReplacement
".*"
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -204,7 +202,6 @@ dictionaryReplacement
"topAir_to_.*"
{
type MarshakRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
@@ -219,7 +216,6 @@ dictionaryReplacement
".*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -228,7 +224,6 @@ dictionaryReplacement
"topAir_to_.*"
{
type greyDiffusiveRadiation;
- T T;
emissivityMode solidRadiation;
value uniform 0;
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
index 8fcdd39fb4843c26b536b2c2e3a4d3453f1c7ecf..92fe672c8223056fe60cc03d1147cdfc66554a7d 100644
--- a/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/0/p
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
index 0bc9c2f89c974e9f8ec9e84a4d1ecaa54f498496..4220a7cd09dd38930a2cca7c18caee84e39ceef9 100644
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces
@@ -18,9 +18,7 @@ forces
log yes;
patches ( "propeller.*" );
- pName p;
- UName U;
- rhoName rhoInf; // Indicates incompressible
+ rho rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
index 13d0937968571b27eab91dacefac70fe0672c97a..71c497cb61d00ba8d1c8d374bb95bd353faca88b 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
@@ -37,7 +37,7 @@ sixDoFRigidBodyMotionCoeffs
);
angularMomentum (0 0 -2);
g (0 -9.81 0);
- rhoName rhoInf;
+ rho rhoInf;
rhoInf 1;
report on;
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
index 8eb77896dc89692236a5c93a16123954c27092ca..4b6aaf34bedafe3d246a1b194353f0d0a57262f2 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict
@@ -51,12 +51,10 @@ functions
{
type forces;
libs ( "libforces.so" );
- writeControl timeStep;
- writeInterval 10;
+ writeControl timeStep;
+ writeInterval 10;
patches (wing);
- pName p;
- UName U;
- rhoName rhoInf;
+ rho rhoInf;
log true;
rhoInf 1;
CofR (0.4974612746 -0.01671895744 0.125);
diff --git a/tutorials/incompressible/pimpleFoam/TJunction/0/p b/tutorials/incompressible/pimpleFoam/TJunction/0/p
index e1512cda4fad76c8bb21a7882670f197ee9e43d6..17217a216a1ccd8ed0d5507501635e7a8bc9199b 100644
--- a/tutorials/incompressible/pimpleFoam/TJunction/0/p
+++ b/tutorials/incompressible/pimpleFoam/TJunction/0/p
@@ -29,8 +29,6 @@ boundaryField
(1 40)
);
p0 40; // only used for restarts
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon
index 3648316bd38090a5f638d8d65a466019caaa3173..ffc00b133b32b315219b12e68acc745b392b7c26 100644
--- a/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/0.orig/epsilon
@@ -25,8 +25,6 @@ boundaryField
{
type turbulentMixingLengthDissipationRateInlet;
mixingLength 0.01;
- phi phi;
- k k;
value uniform 200;
}
outlet1
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions b/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
index 99535be64b8b6a6b97244e6cf51bc809675b88eb..b2b9fc33d4453bad67db5d8f6ef15671c5b7eee5 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/fvOptions
@@ -24,7 +24,7 @@ momentumSource
{
selectionMode all;
- fieldNames (U);
+ fields (U);
Ubar (0.1335 0 0);
}
}
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
index 141f5df839397b42cdef4b558d34c4f102928e8c..81ed6433926f7e5c5e82b3111eee05b9c752d898 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict
@@ -54,7 +54,6 @@ functions
type streamLine;
writeControl writeTime;
setFormat vtk;
- UName U;
trackForward true;
fields (p U);
lifeTime 10000;
@@ -100,9 +99,7 @@ functions
writeControl timeStep;
writeInterval 1;
patches ( "motorBike.*" );
- pName p;
- UName U;
- rhoName rhoInf;
+ rho rhoInf;
log true;
rhoInf 1;
liftDir (0 0 1);
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
index 473439d6de834ae86d50aef47e7b45d02ef254e9..0c6fffd3f8566a9c5931feee467115afb8af42df 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs
@@ -14,9 +14,7 @@ forces
writeInterval 1;
patches ( "motorBike.*" );
- pName p;
- UName U;
- rhoName rhoInf; // Indicates incompressible
+ rho rhoInf; // Indicates incompressible
log true;
rhoInf 1; // Redundant for incompressible
liftDir (0 0 1);
diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
index 477ced82cda5f88b4600c085c111c1709b58a5f2..9dfff44aeb95469686180e2ac371da3914f85cb5 100644
--- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
+++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/streamLines
@@ -16,9 +16,6 @@ streamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
- // Velocity field to use for tracking.
- UName U;
-
// Tracked forwards (+U) or backwards (-U)
trackForward true;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
index 9c44bca6cf6456ccfd44161b31ad85e0eff3f460..c533ff05bed5521974711df4dce97aeb78c45673 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs
@@ -17,8 +17,8 @@ forceCoeffs1
log yes;
- patches ( motorBikeGroup );
- rhoName rhoInf; // Indicates incompressible
+ patches (motorBikeGroup);
+ rho rhoInf; // Indicates incompressible
rhoInf 1; // Redundant for incompressible
liftDir (0 0 1);
dragDir (1 0 0);
@@ -27,14 +27,14 @@ forceCoeffs1
magUInf 20;
lRef 1.42; // Wheelbase length
Aref 0.75; // Estimated
-/*
+ /*
binData
{
nBin 20; // output data into 20 bins
direction (1 0 0); // bin direction
cumulative yes;
}
-*/
+ */
}
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
index 0e563b4837c35eeac90d306bc4a3c98dea7ed85c..6b87e7f63e1bedf87a789b90c267ff4fd5f92400 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines
@@ -19,9 +19,6 @@ streamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot; //csv; //ensight;
- // Velocity field to use for tracking.
- UName U;
-
// Tracked forwards (+U) or backwards (-U)
trackForward true;
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
index 052538b5f3344ca5a1d939c0a9008acef9129b51..526775898ded1e12966668f626a28b42db89dd2c 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines
@@ -48,7 +48,7 @@ wallBoundedStreamLines
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
// Velocity field to use for tracking.
- UName UNear;
+ U UNear;
// Interpolation method. Default is cellPoint. See sampleDict.
//interpolationScheme pointMVC;
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 1edf86c9cb62572de3ebac7547c4e2bf875a4b5f..2636d7bd48397144889bba4d87edfe7285f589b5 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -60,9 +60,6 @@ functions
setFormat vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
- // Velocity field to use for tracking.
- UName U;
-
// Tracked forwards (+U) or backwards (-U)
trackForward true;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 4c60def21932aca0493597564e6d058f57b08e12..31b1f7ff22d947184d8fd83752eba66e5c1368ae 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -60,9 +60,6 @@ functions
setFormat vtk; //gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
- // Velocity field to use for tracking.
- UName U;
-
// Tracked forwards (+U) or backwards (-U)
trackForward true;
diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
index 75f6c6c1c9522b4161df894e6114def6701104f0..599f21065ba5b6b239b80d1e24e2b360dca8acd3 100644
--- a/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/system/fvOptions
@@ -24,7 +24,7 @@ disk
selectionMode cellZone;
cellZone rotatingZone;
- fieldNames (U); // Names of fields on which to apply source
+ fields (U); // Names of fields on which to apply source
nBlades 3; // Number of blades
tipEffect 0.96; // Normalised radius above which lift = 0
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
index cea20e348599b90eb59fded6133009eefe5f5180..bf45c8c33267ed5c0b629d9fc4caad3857da3d74 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/fvOptions
@@ -22,7 +22,7 @@ disk1
actuationDiskSourceCoeffs
{
- fieldNames (U);
+ fields (U);
selectionMode cellSet;
cellSet actuationDisk1;
@@ -41,7 +41,7 @@ disk2
actuationDiskSourceCoeffs
{
- fieldNames (U);
+ fields (U);
selectionMode cellSet;
cellSet actuationDisk2;
diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
index 2d537d6f61bae070f1c66033c6525e35772e46f1..e2af8c3766e0f07bf1662b6b7297130fa72f6ece 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties
@@ -172,7 +172,7 @@ subModels
cohesionEnergyDensity 0;
};
- UName U.air;
+ U U.air;
}
stochasticCollisionModel none;
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
index a7c3929dd912f8b6628d2b1229a3eab816ae33dc..b5078d6f913dd8195d319376518b6e5eab4e7f8f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/G
@@ -24,7 +24,6 @@ boundaryField
top
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -32,7 +31,6 @@ boundaryField
bottom
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -40,7 +38,6 @@ boundaryField
walls
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/T
index 070a82b3411042ba703a018933ce539aadacf8f0..55fee017e55376cafda59317b7b603a69756c62b 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/T
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/T
@@ -30,7 +30,7 @@ boundaryField
{
type zeroGradient;
// type mapped;
-// fieldName Tsf;
+// field Tsf;
// average 300;
// setAverage no;
// value uniform 300;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/U
index 0f8cd0ff3e8ee222736e275b7768d9ced8e9b88b..c1237290365f9fa68be2f7d5181547e580a3f6dc 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/U
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.orig/U
@@ -31,7 +31,7 @@ boundaryField
type uniformFixedValue;
uniformValue (0 0 0);
// type mapped;
-// fieldName Usf;
+// field Usf;
// average (0 0 0);
// setAverage no;
// value uniform (0 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
index b7b5130a7e529c9f361ba377a96b221390c19b0f..dd3d9cae114234f72a045fd3c2c574ad5db7291a 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict
@@ -23,7 +23,7 @@ dictionaryReplacement
wallFilm
{
type mapped;
- fieldName Tsf;
+ field Tsf;
average 300;
setAverage no;
value uniform 300;
@@ -38,7 +38,7 @@ dictionaryReplacement
wallFilm
{
type mapped;
- fieldName Usf;
+ field Usf;
average (0 0 0);
setAverage no;
value uniform (0 0 0);
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
index e2ec8389d8e7d52f81460dbe4334ae6e28392e36..1bb7d7eec9f53134b11f0e361f0e6173499820f7 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/constant/surfaceFilmProperties
@@ -26,7 +26,7 @@ kinematicSingleLayerCoeffs
filmThermoModel constant;
constantCoeffs
{
- specieName water;
+ specie water;
rho0 1000;
mu0 1e-3;
sigma0 0.07;
diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
index deca9ba60da613c61097d7624095469169b50c65..1fec35ae1c6fe7ff33fd795f122030e5c3460bb7 100644
--- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
+++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/0/p
@@ -33,8 +33,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
index 6fea304048863acd6ba17c42fc3c4cb47095ab30..b2a2b87abc1d8c615c2fe24bae493a286f288d45 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0.orig/G
@@ -24,7 +24,6 @@ boundaryField
walls
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1;
value uniform 0;
@@ -35,7 +34,6 @@ boundaryField
inlet
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1;
value uniform 0;
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/G b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
index 6fea304048863acd6ba17c42fc3c4cb47095ab30..b2a2b87abc1d8c615c2fe24bae493a286f288d45 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/0/G
@@ -24,7 +24,6 @@ boundaryField
walls
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1;
value uniform 0;
@@ -35,7 +34,6 @@ boundaryField
inlet
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1;
value uniform 0;
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
index ff1b3927fd521a17fa61888199310b74406d3fca..a1e447eba643a8f7aa2ae545cac92c362e4a3a37 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/0/G
@@ -32,7 +32,6 @@ boundaryField
walls
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
@@ -44,7 +43,6 @@ boundaryField
inlet
{
type MarshakRadiation;
- T T;
emissivityMode lookup;
emissivity uniform 1.0;
value uniform 0;
diff --git a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
index 03ae10303e7b0724ba72c8fce5db5ae5611aafe3..bbd4528808c86b79198555a2544db8735092b5be 100644
--- a/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
+++ b/tutorials/mesh/foamyHexMesh/flange/system/topoSetDict-background
@@ -136,7 +136,7 @@ FoamFile
// // values of field within certain range
// source fieldToCell;
// {
-// fieldName U; // Note: uses mag(U) since volVectorField
+// field U; // Note: uses mag(U) since volVectorField
// min 0.1;
// max 0.5;
// }
diff --git a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
index b04e46ac47a1aafc0cc8379f29158fb6babb93cb..597fef7ff6f7b29b478f7236305de3190361146a 100644
--- a/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
+++ b/tutorials/mesh/foamyHexMesh/mixerVessel/0.orig/U
@@ -35,7 +35,6 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
- phi phi;
value $internalField;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
index 1d9db272f8fb3331b3677b4350b2958b7c8dd4eb..b0ba39b8150adb2484fe33e3cf625d03c739ac17 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range1
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 13.36;
max 18.47;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
index f6e959b970be810a2ed6067b2bdb42f38c902736..45ce551c8851b92c915de5c49d57a5346cd2c306 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range2
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 7.00;
max 18.47;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
index fc5c60d4f0c9687c4d0cbf7ac6878ef5b0abe8c2..d510ed62c9402da1733214c4729bdfe0cbc42382 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.range3
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 3.67;
max 18.47;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
index 0e43a02c4bd4e848c83b2ef6695f75411ad71e0e..f38d034e7ccb553397148a0d036f021551605290 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier1
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 0.64;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
index 43f5306312b20c0d3327fd031d80adb980c29bed..da1ee39373f899541e11979345227febdf2e290a 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier2
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 1.03;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
index d2dce29215f67f633cc13b2642d523d2e807ef5b..ae9ca9bcd9b43db315177f24e1d8d107dc633515 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier3
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 1.94;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
index 2b48e33e15984484f0e8bf8eab5d62e4fa6f304f..5ec8c183af2feb90aaf5d410e38fa8cfe9ecbb21 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier4
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 3.67;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
index 2cb4dddf6fdbec4a5485bd4363b0bc6fdd88b578..b2f889ffddd5ba41910146864d23ee34e65df3ad 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier5
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 7.00;
}
diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
index 751a78b7640ceb3214661722f1080c47f2a3eeb5..d6801db155a55f32a854153e970bffb05ec78293 100644
--- a/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/topoSetDict.tier6
@@ -24,7 +24,7 @@ actions
source fieldToCell;
sourceInfo
{
- fieldName radiusFieldXY;
+ field radiusFieldXY;
min 0.0;
max 13.36;
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
index 22afb75d5778c1b86d166cdbe3c089ee702fe95f..fdd5db3dfeae6c1d9f139dc0df041feb7d07eba4 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p
@@ -23,7 +23,6 @@ boundaryField
inlet
{
type totalPressure;
- U U;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p
index a85f4b9d0d49fa7cb865291c69d33919bd220085..7bde4729a42fc80282ed5d50647929f3e59f2f07 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.orig/p
@@ -23,7 +23,6 @@ boundaryField
inlet
{
type totalPressure;
- U U;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
index 22afb75d5778c1b86d166cdbe3c089ee702fe95f..fdd5db3dfeae6c1d9f139dc0df041feb7d07eba4 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p
@@ -23,7 +23,6 @@ boundaryField
inlet
{
type totalPressure;
- U U;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index 16835050d0f6090661d306d9d9e371b29d422ce6..c97740b9fe8fede872cf1979831cd9e318f493fe 100644
--- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 1e5;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh
index 5d264eace76b9d25efb2499244a5699399ac257e..7546ea7122e43a27396e42f3e8d3083cf997ed43 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/0.orig/p_rgh
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
index 6d75bbfc4f367402225f5edd47fcd1f8e5864700..2248660876d06f98027d505a8d39e139b7f980b8 100644
--- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict
@@ -59,8 +59,6 @@ functions
libs ( "libforces.so" );
patches (hull);
rhoInf 998.8;
- rhoName rho;
- UName U;
log on;
writeControl timeStep;
writeInterval 1;
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh
index e4a0e7e87a21dc10c5778e836ed335fdc0d43a2d..bb91b933fe027f4fb60884f42c88db3f67036823 100644
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0.orig/p_rgh
@@ -38,8 +38,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh
index e24799fc142dceac24cdc489930837bd6163db4f..11d59b65de82fc225e937afdac86ac34eac60ed9 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/0.orig/p_rgh
@@ -28,8 +28,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U
index b04e46ac47a1aafc0cc8379f29158fb6babb93cb..597fef7ff6f7b29b478f7236305de3190361146a 100644
--- a/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U
+++ b/tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/0.orig/U
@@ -35,7 +35,6 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
- phi phi;
value $internalField;
}
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/0/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
index 7590b3df5d5f51e719d2a2a592abddaf15ec0d2d..69ce1c56b5718f6f5bcdde91ca28daf1178c35be 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh b/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh
index 5d264eace76b9d25efb2499244a5699399ac257e..7546ea7122e43a27396e42f3e8d3083cf997ed43 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/0.orig/p_rgh
@@ -39,8 +39,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
index d29b79647b9ad47fef5e5899e1f33a76e9a200b8..3454ff5f40b8bb580da9b02211002d72965a816b 100644
--- a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
+++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict
@@ -53,8 +53,6 @@ functions
libs ( "libforces.so" );
patches (hull);
rhoInf 998.8;
- rhoName rho;
- UName U;
log on;
writeControl timeStep;
writeInterval 1;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreak/damBreak/0/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
index d2958fafeba6f4d7d01b1649c3b6e39baea65f4a..128b2a26f526e11886630b5724ec0f27958ff64c 100644
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
@@ -24,8 +24,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U b/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U
index e269ca081a690f7fce876bbd4b5fe2616ba76409..be4b54bc6654d0af46f01bb9738123b8591c90c3 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/U
@@ -43,7 +43,6 @@ boundaryField
atmosphere
{
type pressureInletOutletVelocity;
- phi phi;
value uniform (0 0 0);
}
diff --git a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh b/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh
index 026164723a181e39cb132e04a3a40d6333abb0b9..a36f8077f7ee95f3224a6e0b276b9fe040c3d956 100644
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.orig/p_rgh
@@ -41,8 +41,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho none;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/0/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
index 03d383af53565c8d3220e7f6df9d00d8d60e408b..7538444499981491864a85ba9be3fed52630ee14 100644
--- a/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
+++ b/tutorials/multiphase/interPhaseChangeDyMFoam/propeller/0.orig/p_rgh
@@ -33,8 +33,6 @@ boundaryField
{
type totalPressure;
p0 $internalField;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
index a22343315e4bbee375ae579f56a9c7f843dd9f46..e7b43b027417e688462e57e53562dd7e7f536bbc 100644
--- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
+++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/0.orig/U
@@ -30,7 +30,6 @@ boundaryField
outlet
{
type pressureInletOutletVelocity;
- phi phi;
value $internalField;
}
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.orig/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
index cfabea4db1c624bd7b28007c7e1c119856b1a412..64bcdfe9e2a2817f52911141065992e85cea3788 100644
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/p_rgh
@@ -42,8 +42,6 @@ boundaryField
{
type totalPressure;
p0 uniform 0;
- U U;
- phi phi;
rho rho;
psi none;
gamma 1;
diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
index b497ec41436dedf482138759e3683899dcef6ca4..31a100e56b325c5b2e0e324012445996e4ce37e2 100644
--- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict
@@ -59,9 +59,7 @@ functions
libs ("libforces.so");
writeControl writeTime;
patches (floatingObject);
- pName p;
- UName U;
- rhoName rhoInf;
+ rho rhoInf;
log yes;
rhoInf 1000;
CofR (0 0 0);
diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
index 712edfa6c1138dc3e23516ee3885998cc2a88076..0d70bd5321b0f3f82064f87b9138e62bccdc3847 100644
--- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
+++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict
@@ -57,11 +57,9 @@ functions
{
type forces;
libs ("libforces.so");
- writeControl writeTime;
+ writeControl writeTime;
patches (floatingObject);
- pName p;
- UName U;
- rhoName rhoInf;
+ rho rhoInf;
log yes;
rhoInf 1000;
CofR (0 0 0);
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
index fcbfddee2a5c023b6382128a8f4bb058200ca402..14fd00829b57089bc5d0edc88c80b4443292a512 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/epsilon.liquid
@@ -1903,7 +1903,7 @@ boundaryField
inlet
{
type mapped;
- fieldName epsilon.liquid;
+ field epsilon.liquid;
setAverage 0;
average 0;
interpolationScheme cell;
diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
index ca759f110fdf47be73d5f48bee9304d7fa52dbcb..4e3a37686c3a12dd11bd762a00b90144917f9b4a 100644
--- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
+++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/0/k.liquid
@@ -1903,7 +1903,7 @@ boundaryField
inlet
{
type mapped;
- fieldName k.liquid;
+ field k.liquid;
setAverage 0;
average 0;
interpolationScheme cell;