diff --git a/src/surfaceFilmModels/Make/files b/src/surfaceFilmModels/Make/files index 8b84a94e14..3f2aaef301 100644 --- a/src/surfaceFilmModels/Make/files +++ b/src/surfaceFilmModels/Make/files @@ -26,7 +26,6 @@ submodels/thermo/heatTransferModel/mappedConvectiveHeatTransfer/mappedConvective /* Boundary conditions */ derivedFvPatchFields/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C -derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C derivedFvPatchFields/directMappedFixedPushedInternalValue/directMappedFixedPushedInternalValueFvPatchFields.C derivedFvPatchFields/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C derivedFvPatchFields/htcConv/htcConvFvPatchScalarField.C diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C deleted file mode 100644 index c9e799e08a..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.C +++ /dev/null @@ -1,334 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "directMappedNamedFixedValueFvPatchField.H" -#include "directMappedPatchBase.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -directMappedNamedFixedValueFvPatchField:: -directMappedNamedFixedValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF -) -: - fixedValueFvPatchField(p, iF), - fieldName_(iF.name()), - setAverage_(false), - average_(pTraits::zero) -{} - - -template -directMappedNamedFixedValueFvPatchField:: -directMappedNamedFixedValueFvPatchField -( - const directMappedNamedFixedValueFvPatchField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - fieldName_(ptf.fieldName_), - setAverage_(ptf.setAverage_), - average_(ptf.average_) -{ - if (!isA(this->patch().patch())) - { - FatalErrorIn - ( - "directMappedNamedFixedValueFvPatchField::" - "directMappedNamedFixedValueFvPatchField\n" - "(" - "const directMappedNamedFixedValueFvPatchField&, " - "const fvPatch&, " - "const Field&, " - "const fvPatchFieldMapper& " - ")" - ) << " patch type '" << p.type() - << "' not type '" << directMappedPatchBase::typeName << "'" - << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() - << exit(FatalError); - } -} - - -template -directMappedNamedFixedValueFvPatchField:: -directMappedNamedFixedValueFvPatchField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - fieldName_(dict.lookupOrDefault("fieldName", iF.name())), - setAverage_(readBool(dict.lookup("setAverage"))), - average_(pTraits(dict.lookup("average"))) -{ - if (!isA(this->patch().patch())) - { - FatalErrorIn - ( - "directMappedNamedFixedValueFvPatchField::" - "directMappedNamedFixedValueFvPatchField" - "(" - "const fvPatch&, " - "const DimensionedField& iF, " - "const dictionary&" - ")" - ) << " patch type '" << p.type() - << "' not type '" << directMappedPatchBase::typeName << "'" - << "\n for patch " << p.name() - << " of field " << fieldName_ - << " in file " << this->dimensionedInternalField().objectPath() - << exit(FatalError); - } - - //// Force calculation of schedule (uses parallel comms) - //const directMappedPatchBase& mpp = refCast - //( - // this->patch().patch() - //); - //(void)mpp.map().schedule(); -} - - -template -directMappedNamedFixedValueFvPatchField:: -directMappedNamedFixedValueFvPatchField -( - const directMappedNamedFixedValueFvPatchField& ptf -) -: - fixedValueFvPatchField(ptf), - fieldName_(ptf.fieldName_), - setAverage_(ptf.setAverage_), - average_(ptf.average_) -{} - - -template -directMappedNamedFixedValueFvPatchField:: -directMappedNamedFixedValueFvPatchField -( - const directMappedNamedFixedValueFvPatchField& ptf, - const DimensionedField& iF -) -: - fixedValueFvPatchField(ptf, iF), - fieldName_(ptf.fieldName_), - setAverage_(ptf.setAverage_), - average_(ptf.average_) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void directMappedNamedFixedValueFvPatchField::updateCoeffs() -{ - if (this->updated()) - { - return; - } - - typedef GeometricField fieldType; - - // Get the scheduling information from the directMappedPatchBase - const directMappedPatchBase& mpp = refCast - ( - directMappedNamedFixedValueFvPatchField::patch().patch() - ); - const mapDistribute& distMap = mpp.map(); - - // Force recalculation of schedule - (void)distMap.schedule(); - - const fvMesh& nbrMesh = refCast(mpp.sampleMesh()); - - // Result of obtaining remote values - Field newValues; - - switch (mpp.mode()) - { - case directMappedPatchBase::NEARESTCELL: - { - if (mpp.sameRegion()) - { - newValues = this->internalField(); - } - else - { - newValues = nbrMesh.lookupObject - ( - fieldName_ - ).internalField(); - } - mapDistribute::distribute - ( - Pstream::defaultCommsType, - distMap.schedule(), - distMap.constructSize(), - distMap.subMap(), - distMap.constructMap(), - newValues - ); - - break; - } - case directMappedPatchBase::NEARESTPATCHFACE: - { - const label nbrPatchID = - nbrMesh.boundaryMesh().findPatchID(mpp.samplePatch()); - if (nbrPatchID < 0) - { - FatalErrorIn - ( - "void directMappedNamedFixedValueFvPatchField::" - "updateCoeffs()" - )<< "Unable to find sample patch " << mpp.samplePatch() - << " in region " << mpp.sampleRegion() - << " for patch " << this->patch().name() << nl - << abort(FatalError); - } - - const fieldType& nbrField = - nbrMesh.lookupObject(fieldName_); - newValues = nbrField.boundaryField()[nbrPatchID]; - mapDistribute::distribute - ( - Pstream::defaultCommsType, - distMap.schedule(), - distMap.constructSize(), - distMap.subMap(), - distMap.constructMap(), - newValues - ); - - break; - } - case directMappedPatchBase::NEARESTFACE: - { - Field allValues(nbrMesh.nFaces(), pTraits::zero); - - const fieldType& nbrField = - nbrMesh.lookupObject(fieldName_); - forAll(nbrField.boundaryField(), patchI) - { - const fvPatchField& pf = - nbrField.boundaryField()[patchI]; - label faceStart = pf.patch().patch().start(); - - forAll(pf, faceI) - { - allValues[faceStart++] = pf[faceI]; - } - } - - mapDistribute::distribute - ( - Pstream::defaultCommsType, - distMap.schedule(), - distMap.constructSize(), - distMap.subMap(), - distMap.constructMap(), - allValues - ); - - newValues = this->patch().patchSlice(allValues); - - break; - } - default: - { - FatalErrorIn - ( - "directMappedNamedFixedValueFvPatchField::updateCoeffs()" - )<< "Unknown sampling mode: " << mpp.mode() - << nl << abort(FatalError); - } - } - - if (setAverage_) - { - Type averagePsi = - gSum(this->patch().magSf()*newValues) - /gSum(this->patch().magSf()); - - if (mag(averagePsi)/mag(average_) > 0.5) - { - newValues *= mag(average_)/mag(averagePsi); - } - else - { - newValues += (average_ - averagePsi); - } - } - - this->operator==(newValues); - - if (debug) - { - Info<< "directMapped on field:" << fieldName_ - << " patch:" << this->patch().name() - << " avg:" << gAverage(*this) - << " min:" << gMin(*this) - << " max:" << gMax(*this) - << endl; - } - - fixedValueFvPatchField::updateCoeffs(); -} - - -template -void directMappedNamedFixedValueFvPatchField::write(Ostream& os) const -{ - fvPatchField::write(os); - os.writeKeyword("fieldName") << fieldName_ << token::END_STATEMENT << nl; - os.writeKeyword("setAverage") << setAverage_ << token::END_STATEMENT << nl; - os.writeKeyword("average") << average_ << token::END_STATEMENT << nl; - this->writeEntry("value", os); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H deleted file mode 100644 index 711ed1ec98..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchField.H +++ /dev/null @@ -1,164 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::directMappedNamedFixedValueFvPatchField - -Description - Variant of directMappedFixedValueFvPatch where the name of the field to - map is input. - -SourceFiles - directMappedNamedFixedValueFvPatchField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef directMappedNamedFixedValueFvPatchField_H -#define directMappedNamedFixedValueFvPatchField_H - -#include "fixedValueFvPatchField.H" -#include "directMappedFvPatch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class directMappedNamesFixedValueFvPatchField Declaration -\*---------------------------------------------------------------------------*/ - -template -class directMappedNamedFixedValueFvPatchField -: - public fixedValueFvPatchField -{ - // Private data - - //- Name of field to sample - defaults to field associated with this - // patch if not specified - word fieldName_; - - //- If true adjust the mapped field to maintain average value average_ - bool setAverage_; - - //- Average value the mapped field is adjusted to maintain if - // setAverage_ is set true - Type average_; - - -public: - - //- Runtime type information - TypeName("directMappedNamedFixedValue"); - - - // Constructors - - //- Construct from patch and internal field - directMappedNamedFixedValueFvPatchField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - directMappedNamedFixedValueFvPatchField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given directMappedNamedFixedValueFvPatchField - // onto a new patch - directMappedNamedFixedValueFvPatchField - ( - const directMappedNamedFixedValueFvPatchField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - directMappedNamedFixedValueFvPatchField - ( - const directMappedNamedFixedValueFvPatchField& - ); - - //- Construct and return a clone - virtual tmp > clone() const - { - return tmp > - ( - new directMappedNamedFixedValueFvPatchField(*this) - ); - } - - //- Construct as copy setting internal field reference - directMappedNamedFixedValueFvPatchField - ( - const directMappedNamedFixedValueFvPatchField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp > clone - ( - const DimensionedField& iF - ) const - { - return tmp > - ( - new directMappedNamedFixedValueFvPatchField(*this, iF) - ); - } - - - // Member functions - - // Evaluation functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository -# include "directMappedNamedFixedValueFvPatchField.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C deleted file mode 100644 index 849cc55825..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "directMappedNamedFixedValueFvPatchFields.H" -#include "volMesh.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makePatchFields(directMappedNamedFixedValue); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H deleted file mode 100644 index 2f815fb81a..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFields.H +++ /dev/null @@ -1,49 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef directMappedNamedFixedValueFvPatchFields_H -#define directMappedNamedFixedValueFvPatchFields_H - -#include "directMappedNamedFixedValueFvPatchField.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeFieldTypedefs(directMappedNamedFixedValue) - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H deleted file mode 100644 index c7d6e5c11c..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamedFixedValueFvPatchFieldsFwd.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef directMappedNamedFixedValueFvPatchFieldsFwd_H -#define directMappedNamedFixedValueFvPatchFieldsFwd_H - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -template class directMappedNamedFixedValueFvPatchField; - -makePatchTypeFieldTypedefs(directMappedNamedFixedValue) - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H b/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H deleted file mode 100644 index c7d6e5c11c..0000000000 --- a/src/surfaceFilmModels/derivedFvPatchFields/directMappedNamedFixedValue/directMappedNamesFixedValueFvPatchFieldsFwd.H +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#ifndef directMappedNamedFixedValueFvPatchFieldsFwd_H -#define directMappedNamedFixedValueFvPatchFieldsFwd_H - -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -template class directMappedNamedFixedValueFvPatchField; - -makePatchTypeFieldTypedefs(directMappedNamedFixedValue) - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T index f34ddb4387..877f52af23 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T @@ -28,7 +28,7 @@ boundaryField } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedNamedFixedValue; + type directMapped; fieldName Tsf; average 300; setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U index 4622cf8a48..d3def72f0c 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U @@ -28,7 +28,7 @@ boundaryField } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedNamedFixedValue; + type directMapped; fieldName Usf; average ( 0 0 0 ); setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T index f34ddb4387..877f52af23 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/T @@ -28,7 +28,7 @@ boundaryField } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedNamedFixedValue; + type directMapped; fieldName Tsf; average 300; setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U index 4622cf8a48..d3def72f0c 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0/U @@ -28,7 +28,7 @@ boundaryField } region0_to_wallFilmRegion_wallFilmFaces { - type directMappedNamedFixedValue; + type directMapped; fieldName Usf; average ( 0 0 0 ); setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T index 21a4eadb2c..082d4cb3bc 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/T @@ -29,7 +29,7 @@ boundaryField wallFilm { type zeroGradient; -// type directMappedNamedFixedValue; +// type directMapped; // fieldName Tsf; // average 300; // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U index d114c24c03..9464847840 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0.org/U @@ -30,7 +30,7 @@ boundaryField { type fixedValue; value uniform (0 0 0); -// type directMappedNamedFixedValue; +// type directMapped; // fieldName Usf; // average (0 0 0); // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T index 21a4eadb2c..082d4cb3bc 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/T @@ -29,7 +29,7 @@ boundaryField wallFilm { type zeroGradient; -// type directMappedNamedFixedValue; +// type directMapped; // fieldName Tsf; // average 300; // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U index d114c24c03..9464847840 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/0/U @@ -30,7 +30,7 @@ boundaryField { type fixedValue; value uniform (0 0 0); -// type directMappedNamedFixedValue; +// type directMapped; // fieldName Usf; // average (0 0 0); // setAverage no; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict index 055c1549d0..e8bc6994f0 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/changeDictionaryDict @@ -22,7 +22,7 @@ dictionaryReplacement { wallFilm { - type directMappedNamedFixedValue; + type directMapped; fieldName Tsf; average 300; setAverage no; @@ -37,7 +37,7 @@ dictionaryReplacement { wallFilm { - type directMappedNamedFixedValue; + type directMapped; fieldName Usf; average (0 0 0); setAverage no;