zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-3193-READ_IF_PRESENT' into 'develop'

Browse Source 
BUG: READ_IF_PRESENT: return false if not read. Fixes #3193

See merge request Development/openfoam!698
This commit is contained in:
Mattijs Janssens
2024-12-12 16:21:59 +00:00
parent ab30b0301c aaaa80589f
commit 15059f78b8
3 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.C
View File

@ -34,50 +34,38 @@ License
template<class T, class BaseType>
bool Foam::CompactIOField<T, BaseType>::readIOcontents(bool readOnProc)
{
if (readOpt() == IOobject::MUST_READ)
if (isReadRequired() || (isReadOptional() && headerOk()))
{
// Reading
}
else if (isReadOptional())
{
if (!headerOk())
// Do reading
Istream& is = readStream(word::null, readOnProc);
if (readOnProc)
{
readOnProc = false;
if (headerClassName() == IOField<T>::typeName)
{
is >> static_cast<Field<T>&>(*this);
close();
}
else if (headerClassName() == typeName)
{
is >> *this;
close();
}
else
{
FatalIOErrorInFunction(is)
<< "Unexpected class name " << headerClassName()
<< " expected " << typeName
<< " or " << IOField<T>::typeName << nl
<< " while reading object " << name()
<< exit(FatalIOError);
}
}
}
else
{
return false;
return true;
}
// Do reading
Istream& is = readStream(word::null, readOnProc);
if (readOnProc)
{
if (headerClassName() == IOField<T>::typeName)
{
is >> static_cast<Field<T>&>(*this);
close();
}
else if (headerClassName() == typeName)
{
is >> *this;
close();
}
else
{
FatalIOErrorInFunction(is)
<< "Unexpected class name " << headerClassName()
<< " expected " << typeName
<< " or " << IOField<T>::typeName << nl
<< " while reading object " << name()
<< exit(FatalIOError);
}
}
return true;
return false;
}

30
src/OpenFOAM/db/IOobjects/IOField/IOField.C
View File

@ -33,32 +33,20 @@ License
template<class Type>
bool Foam::IOField<Type>::readIOcontents(bool readOnProc)
{
if (isReadRequired())
if (isReadRequired() || (isReadOptional() && headerOk()))
{
// Reading
}
else if (isReadOptional())
{
if (!headerOk())
// Do reading
Istream& is = readStream(typeName, readOnProc);
if (readOnProc)
{
readOnProc = false;
is >> *this;
}
}
else
{
return false;
close();
return true;
}
// Do reading
Istream& is = readStream(typeName, readOnProc);
if (readOnProc)
{
is >> *this;
}
close();
return true;
return false;
}

14
src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
Copyright (C) 2020,2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -75,12 +75,15 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
supplyTotalTemperature_(dict.get<scalar>("supplyTotalTemperature")),
plenumVolume_(dict.get<scalar>("plenumVolume")),
plenumDensity_(dict.get<scalar>("plenumDensity")),
plenumDensityOld_(1.0),
plenumTemperature_(dict.get<scalar>("plenumTemperature")),
plenumTemperatureOld_(300.0),
rho_(1.0),
hasRho_(false),
inletAreaRatio_(dict.get<scalar>("inletAreaRatio")),
inletDischargeCoefficient_(dict.get<scalar>("inletDischargeCoefficient")),
timeScale_(dict.getOrDefault<scalar>("timeScale", 0)),
timeIndex_(-1),
phiName_(dict.getOrDefault<word>("phi", "phi")),
UName_(dict.getOrDefault<word>("U", "U"))
{
@ -103,12 +106,15 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
supplyTotalTemperature_(ptf.supplyTotalTemperature_),
plenumVolume_(ptf.plenumVolume_),
plenumDensity_(ptf.plenumDensity_),
plenumDensityOld_(ptf.plenumDensityOld_),
plenumTemperature_(ptf.plenumTemperature_),
plenumTemperatureOld_(ptf.plenumTemperatureOld_),
rho_(ptf.rho_),
hasRho_(ptf.hasRho_),
inletAreaRatio_(ptf.inletAreaRatio_),
inletDischargeCoefficient_(ptf.inletDischargeCoefficient_),
timeScale_(ptf.timeScale_),
timeIndex_(ptf.timeIndex_),
phiName_(ptf.phiName_),
UName_(ptf.UName_)
{}
@ -126,12 +132,15 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
supplyTotalTemperature_(tppsf.supplyTotalTemperature_),
plenumVolume_(tppsf.plenumVolume_),
plenumDensity_(tppsf.plenumDensity_),
plenumDensityOld_(tppsf.plenumDensityOld_),
plenumTemperature_(tppsf.plenumTemperature_),
plenumTemperatureOld_(tppsf.plenumTemperatureOld_),
rho_(tppsf.rho_),
hasRho_(tppsf.hasRho_),
inletAreaRatio_(tppsf.inletAreaRatio_),
inletDischargeCoefficient_(tppsf.inletDischargeCoefficient_),
timeScale_(tppsf.timeScale_),
timeIndex_(tppsf.timeIndex_),
phiName_(tppsf.phiName_),
UName_(tppsf.UName_)
{}
@ -150,12 +159,15 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
supplyTotalTemperature_(tppsf.supplyTotalTemperature_),
plenumVolume_(tppsf.plenumVolume_),
plenumDensity_(tppsf.plenumDensity_),
plenumDensityOld_(tppsf.plenumDensityOld_),
plenumTemperature_(tppsf.plenumTemperature_),
plenumTemperatureOld_(tppsf.plenumTemperatureOld_),
rho_(tppsf.rho_),
hasRho_(tppsf.hasRho_),
inletAreaRatio_(tppsf.inletAreaRatio_),
inletDischargeCoefficient_(tppsf.inletDischargeCoefficient_),
timeScale_(tppsf.timeScale_),
timeIndex_(tppsf.timeIndex_),
phiName_(tppsf.phiName_),
UName_(tppsf.UName_)
{}