diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H index cc5cd933b6..1bff692cfc 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 bc4aa09c15..b4a993f11c 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("UName", "U")) + UName_(dynamicMeshCoeffs_.lookupOrDefault("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 8699ad31dc..4f4fbca978 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 001fa4ab17..52072044cc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C @@ -68,7 +68,7 @@ mappedPatchFieldBase::mappedPatchFieldBase ( dict.template lookupOrDefault ( - "fieldName", + "field", patchField_.internalField().name() ) ), @@ -314,7 +314,7 @@ tmp> mappedPatchFieldBase::mappedField() const template void mappedPatchFieldBase::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 63a64d9abb..6cb337ff09 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(p, iF, dict), - outletPatchName_(dict.lookup("outletPatchName")), + outletPatchName_(dict.lookup("outletPatch")), phiName_(dict.lookupOrDefault("phi", "phi")) {} @@ -168,7 +168,7 @@ template void Foam::outletMappedUniformInletFvPatchField::write(Ostream& os) const { fvPatchField::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 85eae30419..3fed1bf97b 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("phaseName", "alpha")), + phaseFraction_(dict.lookupOrDefault("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 ( - 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 41b5db3a7f..6cf1407c73 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 f0eb72c62c..d650d7f0ad 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(os, "U", "U", UName_); writeEntryIfDifferent(os, "phi", "phi", phiName_); writeEntryIfDifferent(os, "rho", "rho", rhoName_); - writeEntryIfDifferent(os, "ph_rghName", "ph_rghName", ph_rghName_); + writeEntryIfDifferent(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 bf9bf57392..5ecc9af8db 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::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 fe1ba583e8..0d607c86b4 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 deb36c716c..fa5d0278e0 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C @@ -59,7 +59,7 @@ uniformInterpolatedDisplacementPointPatchVectorField ) : fixedValuePointPatchField(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::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 2b73df7ebd..0e65b54ea7 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 b95e2f8b2e..d41dac0660 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("TName", "T"); + TName_ = coeffs_.lookupOrDefault("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 41e28a0cbb..64b9f5cd6b 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 ; // optional temperature field name } Note: diff --git a/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C b/src/fvOptions/sources/derived/buoyancyEnergy/buoyancyEnergy.C index 57b05575dc..41ebb7a955 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("UName", "U")) + UName_(coeffs_.lookupOrDefault("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 e513532a84..23c85d0b10 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 aa7f6b2db2..27980c1fb8 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("UName", "U")), - TName_(coeffs_.lookupOrDefault("TName", "T")), - phiName_(coeffs_.lookupOrDefault("phiName", "phi")), + UName_(coeffs_.lookupOrDefault("U", "U")), + TName_(coeffs_.lookupOrDefault("T", "T")), + phiName_(coeffs_.lookupOrDefault("phi", "phi")), 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 49c73adc3b..ae861256b5 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 45348ae6cb..afc5bad15f 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("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 9b3648c31a..129d5b1699 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 654b359be1..d421d40b7f 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("TName", "T")), - CpName_(coeffs_.lookupOrDefault("CpName", "Cp")), - UName_(coeffs_.lookupOrDefault("UName", "U")), - phiName_(coeffs_.lookupOrDefault("phiName", "phi")), + TName_(coeffs_.lookupOrDefault("T", "T")), + CpName_(coeffs_.lookupOrDefault("Cp", "Cp")), + UName_(coeffs_.lookupOrDefault("U", "U")), + phiName_(coeffs_.lookupOrDefault("phi", "phi")), Cu_(coeffs_.lookupOrDefault("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 1987ac991e..5578cddee2 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 9ead117783..d1e924d36f 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 5b70fbfbfc..a56c760282 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("UName", "U")), + UName_(coeffs_.lookupOrDefault("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 b88ba38f49..0291b20b3b 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("UName", "U")), - muName_(coeffs_.lookupOrDefault("muName", "thermo:mu")) + UName_(coeffs_.lookupOrDefault("U", "U")), + muName_(coeffs_.lookupOrDefault("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 956e5bd6c0..081977aa26 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("TName", "T")), - TNbrName_(coeffs_.lookupOrDefault("TNbrName", "T")) + TName_(coeffs_.lookupOrDefault("T", "T")), + TNbrName_(coeffs_.lookupOrDefault("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 f7a1c4a83c..86de071e8f 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("UName", "U")), - UNbrName_(coeffs_.lookupOrDefault("UNbrName", "U")), + UName_(coeffs_.lookupOrDefault("U", "U")), + UNbrName_(coeffs_.lookupOrDefault("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 c137c581ee..7fe1bc1a30 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("UNbrName", "U")), + UNbrName_(coeffs_.lookupOrDefault("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 3c258d1035..b911153f70 100644 --- a/src/lagrangian/basic/InteractionLists/InteractionLists.C +++ b/src/lagrangian/basic/InteractionLists/InteractionLists.C @@ -1107,7 +1107,7 @@ Foam::InteractionLists::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 4062fb7aae..ad03f5ace1 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::ParticleTrap CloudFunctionObject(dict, owner, modelName, typeName), alphaName_ ( - this->coeffDict().template lookupOrDefault("alphaName", "alpha") + this->coeffDict().template lookupOrDefault("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 987da01bda..c577013802 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::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 5ccaf9bc02..a652b3e882 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::PatchInteractionModel ) : CloudSubModelBase(owner), - UName_("unknown_UName") + UName_("unknown_U") {} @@ -123,7 +123,7 @@ Foam::PatchInteractionModel::PatchInteractionModel ) : CloudSubModelBase(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 32d84034db..ee97b1ffa2 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 67d576f916..d20b4e18d4 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 08a18c96a6..58d39c4ede 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 087a6f6c2f..aafb38bfb2 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 496849fd37..d94ddffee7 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 c610cc1d68..5aa0980b8a 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 4095d509f4..097350d990 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("fDName", "fD"); + fDName_ = dict.lookupOrDefault("fD", "fD"); } else { // Optional entries U and p - pName_ = dict.lookupOrDefault("pName", "p"); - UName_ = dict.lookupOrDefault("UName", "U"); - rhoName_ = dict.lookupOrDefault("rhoName", "rho"); + pName_ = dict.lookupOrDefault("p", "p"); + UName_ = dict.lookupOrDefault("U", "U"); + rhoName_ = dict.lookupOrDefault("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 d3d994df12..cfe38f3447 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 mu() const; - //- Return rho if rhoName is specified otherwise rhoRef + //- Return rho if specified otherwise rhoRef tmp 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 631c5541e9..41e17303c6 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 411ad032cc..a063ce82b0 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("phiName", "phi"); - dict.lookup("fieldName") >> fieldName_; + phiName_ = dict.lookupOrDefault("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 2a0fe99e70..7112598e72 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("phiName", "phi"); - UName_ = dict.lookupOrDefault("UName", "U"); - rhoName_ = dict.lookupOrDefault("rhoName", "rho"); + phiName_ = dict.lookupOrDefault("phi", "phi"); + UName_ = dict.lookupOrDefault("U", "U"); + rhoName_ = dict.lookupOrDefault("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 0becd46aa2..87f0bb599f 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("phiName", "phi"); + phiName_ = dict.lookupOrDefault("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 0f9167b247..9c3845102f 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 107b967d69..10822db6e9 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 fcff9df278..1de13ce14f 100644 --- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C +++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C @@ -114,7 +114,7 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion ), test_(coeffDict().lookupOrDefault("test", false)), rhoInf_(1.0), - rhoName_(coeffDict().lookupOrDefault("rhoName", "rho")), + rhoName_(coeffDict().lookupOrDefault("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 f97384e1db..c60bdc9a3d 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 b2ef71dc8f..daeb9adf8d 100644 --- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C +++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C @@ -68,7 +68,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField fixedValuePointPatchField(p, iF, dict), motion_(dict, dict), rhoInf_(1.0), - rhoName_(dict.lookupOrDefault("rhoName", "rho")), + rhoName_(dict.lookupOrDefault("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::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 6eb52b4c39..04b0017062 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 9aaf078563..12768a30de 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("test", false)), rhoInf_(1.0), - rhoName_(coeffDict().lookupOrDefault("rhoName", "rho")), + rhoName_(coeffDict().lookupOrDefault("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 2ad4921aaa..81022fd5c8 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 6e60dece1b..763a6b4886 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::mixtureFractionSoot sootMax_(-1), mappingFieldName_ ( - coeffsDict_.lookupOrDefault("mappingFieldName", "none") + coeffsDict_.lookupOrDefault("mappingField", "none") ), mapFieldMax_(1), thermo_(mesh.lookupObject(basicThermo::dictName)), diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.H index ca65aca1d1..46b933a6f3 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 4725daa9c9..f1bb383cff 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 cf7e9a8dc6..d30027bcf1 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 75ebdc085a..3ed912733e 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 df1b2ab5da..79dc67e82b 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 629aa0b799..1c5c60cb77 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 91036e1a56..60dc3c89f9 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 98bf184dec..6e4926f22c 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 418120f1e9..136b5517e2 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 cc3de91d28..359c5527d9 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 0ebaacfbc0..d7ffe8df6a 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 aaeee9d11c..688990cd48 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 2212e48d7c..6a25deb6ac 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 178527b915..30378f4ef9 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 fd53ea0248..f746f6fe5e 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 c670ea7e1d..6d7b301a07 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 02752e8e3d..da6eb73e6e 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 9956821b4e..16a4f29cf8 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 6b451a9d53..ad9baa1586 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 900fa3ae76..386d3ff0bd 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 5dfaf2e402..d736a34aaa 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 75186697cd..ed7f6dd8c7 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 fe75242d76..7c61961cd6 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 1da0ef50b9..510afad60c 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 6c15bb5118..a57f8c9604 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 deca9ba60d..1fec35ae1c 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 deca9ba60d..1fec35ae1c 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 807dc87866..0522075d32 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 3ddfa33af1..9db7dfe0aa 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 bf63a32f63..f2a7f63139 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 4fee89f86e..934b9a8380 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 9de87d0b3f..dbc613545f 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 6224731ba2..9412b2521d 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 e2b5d86221..37b1c45ea1 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 ed1ce104ab..c4f505ad0c 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 807dc87866..0522075d32 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 bdbc4f96ce..7b08f10125 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 846f03a390..d4695b805e 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 6c20d90831..0724cce578 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 c1cc7124ff..c062b4f37e 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 ea17f0ac0b..9580079084 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 a068b051ba..c2c44de3dc 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 b3a71a27e9..300739e0e8 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 fe75242d76..7c61961cd6 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 e70bf3dec0..707f7e78d8 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 95a8ab2419..6e876153cb 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 63a08c87a1..a77ceae774 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 a95dd145d5..eb3a65b0dc 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 1709662b51..815b0bad6b 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 ba99b13705..c30bffb777 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 2a68977f3d..a653992d95 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 b7bddf908d..d04fa16ac1 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 3c883e6ee2..38a07d287c 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 987aeb8b43..fcfcbf0fd9 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 ba99b13705..c30bffb777 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 2a68977f3d..a653992d95 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 d9188a1378..34857576c1 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 2938940b28..6ccc6a529b 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 c583021fa3..3883588c67 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 b9adae7e6f..6f3fbc138e 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 cf0d33b686..1ca402cad2 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 746ee5a881..afd25cdaa7 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 f5edd119d9..1e08e32ba3 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 8fcdd39fb4..92fe672c82 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 0bc9c2f89c..4220a7cd09 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 13d0937968..71c497cb61 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 8eb77896dc..4b6aaf34be 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 e1512cda4f..17217a216a 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 3648316bd3..ffc00b133b 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 99535be64b..b2b9fc33d4 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 141f5df839..81ed643392 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 473439d6de..0c6fffd3f8 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 477ced82cd..9dfff44aeb 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 9c44bca6cf..c533ff05be 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 0e563b4837..6b87e7f63e 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 052538b5f3..526775898d 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 1edf86c9cb..2636d7bd48 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 4c60def219..31b1f7ff22 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 75f6c6c1c9..599f21065b 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 cea20e3485..bf45c8c332 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 2d537d6f61..e2af8c3766 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 a7c3929dd9..b5078d6f91 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 070a82b341..55fee017e5 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 0f8cd0ff3e..c123729036 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 b7b5130a7e..dd3d9cae11 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 e2ec8389d8..1bb7d7eec9 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 deca9ba60d..1fec35ae1c 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 6fea304048..b2a2b87abc 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 6fea304048..b2a2b87abc 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 ff1b3927fd..a1e447eba6 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 03ae10303e..bbd4528808 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 b04e46ac47..597fef7ff6 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 1d9db272f8..b0ba39b815 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 f6e959b970..45ce551c88 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 fc5c60d4f0..d510ed62c9 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 0e43a02c4b..f38d034e7c 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 43f5306312..da1ee39373 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 d2dce29215..ae9ca9bcd9 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 2b48e33e15..5ec8c183af 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 2cb4dddf6f..b2f889ffdd 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 751a78b764..d6801db155 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 22afb75d57..fdd5db3dfe 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 a85f4b9d0d..7bde4729a4 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 22afb75d57..fdd5db3dfe 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 16835050d0..c97740b9fe 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 5d264eace7..7546ea7122 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 6d75bbfc4f..2248660876 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 e4a0e7e87a..bb91b933fe 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 e24799fc14..11d59b65de 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 b04e46ac47..597fef7ff6 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 cfabea4db1..64bcdfe9e2 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 7590b3df5d..69ce1c56b5 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 5d264eace7..7546ea7122 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 d29b79647b..3454ff5f40 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 cfabea4db1..64bcdfe9e2 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 d2958fafeb..128b2a26f5 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 e269ca081a..be4b54bc66 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 026164723a..a36f8077f7 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 cfabea4db1..64bcdfe9e2 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 03d383af53..7538444499 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 a22343315e..e7b43b0274 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 cfabea4db1..64bcdfe9e2 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 cfabea4db1..64bcdfe9e2 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 cfabea4db1..64bcdfe9e2 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 b497ec4143..31a100e56b 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 712edfa6c1..0d70bd5321 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 fcbfddee2a..14fd00829b 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 ca759f110f..4e3a37686c 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;