diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C index 3e095272db..2167d15b6d 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -165,8 +165,14 @@ Foam::Istream& Foam::UIPstream::read(token& t) } // String - case token::STRING : case token::VERBATIMSTRING : + { + // Recurse to read actual string + read(t); + t.type() = token::VERBATIMSTRING; + return *this; + } + case token::STRING : { string* pval = new string; if (read(*pval)) diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C index c257826c04..e01e8de01b 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C +++ b/src/OpenFOAM/db/IOstreams/Pstreams/UOPstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -151,10 +151,19 @@ Foam::UOPstream::~UOPstream() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::Ostream& Foam::UOPstream::write(const token&) +Foam::Ostream& Foam::UOPstream::write(const token& t) { - notImplemented("Ostream& UOPstream::write(const token&)"); - setBad(); + // Raw token output only supported for verbatim strings for now + if (t.type() == token::VERBATIMSTRING) + { + write(char(token::VERBATIMSTRING)); + write(t.stringToken()); + } + else + { + notImplemented("Ostream& UOPstream::write(const token&)"); + setBad(); + } return *this; } diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C index 2dbf0c1150..4cbf8bf1fa 100644 --- a/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C +++ b/src/OpenFOAM/db/IOstreams/Sstreams/OSstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,8 +29,16 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::Ostream& Foam::OSstream::write(const token&) +Foam::Ostream& Foam::OSstream::write(const token& t) { + if (t.type() == token::VERBATIMSTRING) + { + write(char(token::HASH)); + write(char(token::BEGIN_BLOCK)); + writeQuoted(t.stringToken(), false); + write(char(token::HASH)); + write(char(token::END_BLOCK)); + } return *this; } diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C index b46a9b8109..7ca977bf97 100644 --- a/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C +++ b/src/OpenFOAM/db/IOstreams/Sstreams/prefixOSstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,8 +65,16 @@ void Foam::prefixOSstream::print(Ostream& os) const } -Foam::Ostream& Foam::prefixOSstream::write(const token&) +Foam::Ostream& Foam::prefixOSstream::write(const token& t) { + if (t.type() == token::VERBATIMSTRING) + { + write(char(token::HASH)); + write(char(token::BEGIN_BLOCK)); + writeQuoted(t.stringToken(), false); + write(char(token::HASH)); + write(char(token::END_BLOCK)); + } return *this; } diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C index 021f146536..fd442af47a 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -225,9 +225,9 @@ void Foam::primitiveEntry::write(Ostream& os, const bool contentsOnly) const const token& t = operator[](i); if (t.type() == token::VERBATIMSTRING) { - os << token::HASH << token::BEGIN_BLOCK; - os.writeQuoted(t.stringToken(), false); - os << token::HASH << token::END_BLOCK; + // Bypass token output operator to avoid losing verbatimness. + // Handle in Ostreams themselves + os.write(t); } else { diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C index bf103c2254..b180a5965b 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C @@ -25,7 +25,6 @@ License #include "primitiveMesh.H" #include "pyramidPointFaceRef.H" -#include "tetrahedron.H" #include "ListOps.H" #include "unitConversion.H" #include "SortableList.H" diff --git a/src/dynamicMesh/createShellMesh/Make/files b/src/dynamicMesh/createShellMesh/Make/files deleted file mode 100644 index 4aa716f022..0000000000 --- a/src/dynamicMesh/createShellMesh/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -createShellMesh.C - -LIB = $(FOAM_LIBBIN)/libcreateShellMesh diff --git a/src/dynamicMesh/createShellMesh/Make/options b/src/dynamicMesh/createShellMesh/Make/options deleted file mode 100644 index 295f0b0bc9..0000000000 --- a/src/dynamicMesh/createShellMesh/Make/options +++ /dev/null @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude -DFULLDEBUG -g -O0 - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -ldynamicMesh diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 3691354d0b..22988f3216 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -174,6 +174,7 @@ $(derivedFvPatchFields)/waveSurfacePressure/waveSurfacePressureFvPatchScalarFiel $(derivedFvPatchFields)/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C $(derivedFvPatchFields)/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C $(derivedFvPatchFields)/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C +$(derivedFvPatchFields)/temperatureJump/temperatureJumpFvPatchScalarField.C fvsPatchFields = fields/fvsPatchFields $(fvsPatchFields)/fvsPatchField/fvsPatchFields.C diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C index e3ca2d79e9..c82ed7f7a6 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ void wedgeFvPatchField::evaluate(const Pstream::commsTypes) updateCoeffs(); } - operator==(patchInternalField()); + this->operator==(patchInternalField()); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.C new file mode 100644 index 0000000000..99be42e3d6 --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.C @@ -0,0 +1,129 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ 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 "addToRunTimeSelectionTable.H" +#include "temperatureJumpFvPatchScalarField.H" +#include "volFields.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::temperatureJumpFvPatchScalarField::temperatureJumpFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF +) +: + fixedJumpFvPatchField(p, iF), + jumpTable_(0) +{} + + +Foam::temperatureJumpFvPatchScalarField::temperatureJumpFvPatchScalarField +( + const temperatureJumpFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpFvPatchField(ptf, p, iF, mapper), + jumpTable_(ptf.jumpTable_().clone().ptr()) +{} + + +Foam::temperatureJumpFvPatchScalarField::temperatureJumpFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedJumpFvPatchField(p, iF), + jumpTable_(new DataEntry("jumpTable")) +{ + + if (this->cyclicPatch().owner()) + { + jumpTable_ = DataEntry::New("jumpTable", dict); + } + + if (dict.found("value")) + { + fvPatchScalarField::operator= + ( + scalarField("value", dict, p.size()) + ); + } +} + + +Foam::temperatureJumpFvPatchScalarField::temperatureJumpFvPatchScalarField +( + const temperatureJumpFvPatchScalarField& ptf +) +: + cyclicLduInterfaceField(), + fixedJumpFvPatchField(ptf), + jumpTable_(ptf.jumpTable_().clone().ptr()) +{} + + +Foam::temperatureJumpFvPatchScalarField::temperatureJumpFvPatchScalarField +( + const temperatureJumpFvPatchScalarField& ptf, + const DimensionedField& iF +) +: + fixedJumpFvPatchField(ptf, iF), + jumpTable_(ptf.jumpTable_().clone().ptr()) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + + +void Foam::temperatureJumpFvPatchScalarField::write(Ostream& os) const +{ + fixedJumpFvPatchField::write(os); + if (this->cyclicPatch().owner()) + { + jumpTable_->writeData(os); + } + this->writeEntry("value", os); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + temperatureJumpFvPatchScalarField + ); +} + +// ************************************************************************* // diff --git a/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.H new file mode 100644 index 0000000000..55364eac5d --- /dev/null +++ b/src/finiteVolume/fields/fvPatchFields/derived/temperatureJump/temperatureJumpFvPatchScalarField.H @@ -0,0 +1,159 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ 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::temperatureJumpFvPatchScalarField + +Description + Introduce a jump in temperature on a cycle patch + front + { + type temperatureJump; + patchType cyclic; + jumpTable constant 100; + value uniform 300; + } + +SourceFiles + temperatureJumpFvPatchScalarField.C + +\*---------------------------------------------------------------------------*/ + +#ifndef temperatureJumpFvPatchScalarField_H +#define temperatureJumpFvPatchScalarField_H + +#include "fixedJumpFvPatchField.H" +#include "DataEntry.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class temperatureJumpFvPatchScalarField Declaration +\*---------------------------------------------------------------------------*/ + +class temperatureJumpFvPatchScalarField +: + public fixedJumpFvPatchField +{ + + // Private data + + //- Interpolation table + autoPtr > jumpTable_; + + +public: + + //- Runtime type information + TypeName("temperatureJump"); + + // Constructors + + //- Construct from patch and internal field + temperatureJumpFvPatchScalarField + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + temperatureJumpFvPatchScalarField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given temperatureJumpFvPatchScalarField onto a + // new patch + temperatureJumpFvPatchScalarField + ( + const temperatureJumpFvPatchScalarField&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + temperatureJumpFvPatchScalarField + ( + const temperatureJumpFvPatchScalarField& + ); + + //- Construct and return a clone + virtual tmp > clone() const + { + return tmp > + ( + new temperatureJumpFvPatchScalarField(*this) + ); + } + + //- Construct as copy setting internal field reference + temperatureJumpFvPatchScalarField + ( + const temperatureJumpFvPatchScalarField&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp > clone + ( + const DimensionedField& iF + ) const + { + return tmp > + ( + new temperatureJumpFvPatchScalarField(*this, iF) + ); + } + + + // Member functions + + + // Access functions + + //- Return jumpTable + const DataEntry& jumpTable() const + { + return jumpTable_(); + } + + + //- Write + virtual void write(Ostream&) const; +}; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C index 75d674e306..561d9fbe46 100644 --- a/src/meshTools/sets/topoSets/topoSet.C +++ b/src/meshTools/sets/topoSets/topoSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -135,7 +135,7 @@ Foam::fileName Foam::topoSet::topoSet::localPath const word& name ) { - return mesh.facesInstance()/polyMesh::meshSubDir/"sets"/name; + return mesh.facesInstance()/mesh.dbDir()/polyMesh::meshSubDir/"sets"/name; } diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index 1c08f455df..ba53ed7740 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -22,6 +22,7 @@ derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C +derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.C derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index 8b8c0733d0..4eba2f1e11 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -1,6 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I/home/tom3/sergio/development/chtMultiRegionCoupledFoam/lnInclude LIB_LIBS = \ - -lfiniteVolume + -lfiniteVolume \ + -L$(FOAM_USER_LIBBIN)/FvPatchScalarFieldEnthalpyJump diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index 59c0056040..bb6acc01ed 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C @@ -33,6 +33,8 @@ License #include "fixedInternalEnergyFvPatchScalarField.H" #include "gradientInternalEnergyFvPatchScalarField.H" #include "mixedInternalEnergyFvPatchScalarField.H" +#include "temperatureJumpFvPatchScalarField.H" +#include "enthalpyJumpFvPatchScalarField.H" /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ @@ -64,10 +66,14 @@ Foam::wordList Foam::basicThermo::hBoundaryTypes() { hbt[patchi] = gradientEnthalpyFvPatchScalarField::typeName; } - else if (isA(tbf[patchi])) + else if(isA(tbf[patchi])) { hbt[patchi] = mixedEnthalpyFvPatchScalarField::typeName; } + else if (isA(tbf[patchi])) + { + hbt[patchi] = enthalpyJumpFvPatchScalarField::typeName; + } } return hbt; @@ -85,7 +91,7 @@ void Foam::basicThermo::hBoundaryCorrection(volScalarField& h) refCast(hbf[patchi]).gradient() = hbf[patchi].fvPatchField::snGrad(); } - else if (isA(hbf[patchi])) + else if(isA(hbf[patchi])) { refCast(hbf[patchi]).refGrad() = hbf[patchi].fvPatchField::snGrad(); diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.C new file mode 100644 index 0000000000..4337dd2ffb --- /dev/null +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.C @@ -0,0 +1,165 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ 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 "addToRunTimeSelectionTable.H" +#include "enthalpyJumpFvPatchScalarField.H" +#include "temperatureJumpFvPatchScalarField.H" +#include "basicThermo.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::enthalpyJumpFvPatchScalarField::enthalpyJumpFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF +) +: + fixedJumpFvPatchField(p, iF) +{} + + +Foam::enthalpyJumpFvPatchScalarField::enthalpyJumpFvPatchScalarField +( + const enthalpyJumpFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedJumpFvPatchField(ptf, p, iF, mapper) +{} + + +Foam::enthalpyJumpFvPatchScalarField::enthalpyJumpFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedJumpFvPatchField(p, iF) +{ + + if (dict.found("value")) + { + fvPatchScalarField::operator= + ( + scalarField("value", dict, p.size()) + ); + } +} + + +Foam::enthalpyJumpFvPatchScalarField::enthalpyJumpFvPatchScalarField +( + const enthalpyJumpFvPatchScalarField& ptf +) +: + cyclicLduInterfaceField(), + fixedJumpFvPatchField(ptf) +{} + + +Foam::enthalpyJumpFvPatchScalarField::enthalpyJumpFvPatchScalarField +( + const enthalpyJumpFvPatchScalarField& ptf, + const DimensionedField& iF +) +: + fixedJumpFvPatchField(ptf, iF) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::enthalpyJumpFvPatchScalarField::updateCoeffs() +{ + if (this->updated()) + { + return; + } + + if (this->cyclicPatch().owner()) + { + const basicThermo& thermo = db().lookupObject + ( + "thermophysicalProperties" + ); + + label patchID = patch().index(); + + const temperatureJumpFvPatchScalarField& TbPatch = + refCast + ( + thermo.T().boundaryField()[patchID] + ); + + const scalar time = this->db().time().value(); + const scalarField jumpTb + ( + patch().size(), TbPatch.jumpTable().value(time) + ); + + const labelUList& faceCells = this->patch().faceCells(); + + if (db().foundObject("h")) + { + jump_ = thermo.h(jumpTb, faceCells); + } + else if (db().foundObject("hs")) + { + jump_ = thermo.hs(jumpTb, faceCells); + } + else + { + FatalErrorIn("enthalpyJumpFvPatchScalarField::updateCoeffs()") + << " hs or h are not found in db()" + << exit(FatalError); + } + } + + fixedJumpFvPatchField::updateCoeffs(); +} + + +void Foam::enthalpyJumpFvPatchScalarField::write(Ostream& os) const +{ + fixedJumpFvPatchField::write(os); + this->writeEntry("value", os); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + makePatchTypeField + ( + fvPatchScalarField, + enthalpyJumpFvPatchScalarField + ); +} + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.H new file mode 100644 index 0000000000..770e2a4739 --- /dev/null +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/enthalpyJump/enthalpyJumpFvPatchScalarField.H @@ -0,0 +1,142 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ 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::enthalpyJumpFvPatchScalarField + +Description + +SourceFiles + enthalpyJumpFvPatchScalarField.C + +\*---------------------------------------------------------------------------*/ + +#ifndef enthalpyJumpFvPatchScalarField_H +#define enthalpyJumpFvPatchScalarField_H + +#include "fixedJumpFvPatchField.H" +#include "DataEntry.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class enthalpyJumpFvPatchScalarField Declaration +\*---------------------------------------------------------------------------*/ + +class enthalpyJumpFvPatchScalarField +: + public fixedJumpFvPatchField +{ + +public: + + //- Runtime type information + TypeName("enthalpyJump"); + + // Constructors + + //- Construct from patch and internal field + enthalpyJumpFvPatchScalarField + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + enthalpyJumpFvPatchScalarField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given enthalpyJumpFvPatchScalarField onto a + // new patch + enthalpyJumpFvPatchScalarField + ( + const enthalpyJumpFvPatchScalarField&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + enthalpyJumpFvPatchScalarField + ( + const enthalpyJumpFvPatchScalarField& + ); + + //- Construct and return a clone + virtual tmp > clone() const + { + return tmp > + ( + new enthalpyJumpFvPatchScalarField(*this) + ); + } + + //- Construct as copy setting internal field reference + enthalpyJumpFvPatchScalarField + ( + const enthalpyJumpFvPatchScalarField&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp > clone + ( + const DimensionedField& iF + ) const + { + return tmp > + ( + new enthalpyJumpFvPatchScalarField(*this, iF) + ); + } + + + // Member functions + + + // Evaluation functions + + //- Update the coefficients + virtual void updateCoeffs(); + + + //- Write + virtual void write(Ostream&) const; +}; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C index 7f4d0fe188..9260406840 100644 --- a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C @@ -113,7 +113,8 @@ Foam::hPsiThermo::hPsiThermo(const fvMesh& mesh) ), mesh, dimEnergy/dimMass, - this->hBoundaryTypes() + this->hBoundaryTypes(), + mesh.boundaryMesh().types() ) { scalarField& hCells = h_.internalField(); diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C index a8010f8700..7d1cae28f9 100644 --- a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C @@ -113,7 +113,8 @@ Foam::hsPsiThermo::hsPsiThermo(const fvMesh& mesh) ), mesh, dimEnergy/dimMass, - this->hBoundaryTypes() + this->hBoundaryTypes(), + mesh.boundaryMesh().types() ) { scalarField& hsCells = hs_.internalField(); diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C index e2e7503cfc..d27b7b31cd 100644 --- a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C @@ -118,9 +118,11 @@ Foam::hRhoThermo::hRhoThermo(const fvMesh& mesh) ), mesh, dimEnergy/dimMass, - this->hBoundaryTypes() + this->hBoundaryTypes(), + mesh.boundaryMesh().types() ) { + scalarField& hCells = h_.internalField(); const scalarField& TCells = this->T_.internalField(); @@ -138,6 +140,7 @@ Foam::hRhoThermo::hRhoThermo(const fvMesh& mesh) hBoundaryCorrection(h_); calculate(); + } diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C index f8697bf675..8d55e26d93 100644 --- a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C @@ -118,7 +118,8 @@ Foam::hsRhoThermo::hsRhoThermo(const fvMesh& mesh) ), mesh, dimEnergy/dimMass, - this->hBoundaryTypes() + this->hBoundaryTypes(), + mesh.boundaryMesh().types() ) { scalarField& hsCells = hs_.internalField();