zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lagrangian, surfaceFilm: Prevent "none" models from generating output property entries

Browse Source 
The property entries created by the "none" models were not formatted
correctly, oweing to the lack of a base name or model name in the
sub-model base. These erroneous entries then resulted in restart
failures.
This commit is contained in:
Will Bainbridge
2021-05-05 14:44:37 +01:00
parent eeb9b35a72
commit 50d491a209
8 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lagrangian/parcel/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,4 +78,9 @@ void Foam::NoPhaseChange<CloudType>::calculate
}
template<class CloudType>
void Foam::NoPhaseChange<CloudType>::info(Ostream& os)
{}
// ************************************************************************* //

9
src/lagrangian/parcel/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,6 +38,7 @@ Description
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class NoPhaseChange Declaration
\*---------------------------------------------------------------------------*/
@ -93,6 +94,12 @@ public:
const scalarField& X,
scalarField& dMassPC
) const;
// I-O
//- Write injection info to stream
virtual void info(Ostream& os);
};

7
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,4 +77,9 @@ void Foam::NoDevolatilisation<CloudType>::calculate
}
template<class CloudType>
void Foam::NoDevolatilisation<CloudType>::info(Ostream& os)
{}
// ************************************************************************* //

9
src/lagrangian/parcel/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,6 +38,7 @@ Description
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class NoDevolatilisation Declaration
\*---------------------------------------------------------------------------*/
@ -92,6 +93,12 @@ public:
label& canCombust,
scalarField& dMassDV
) const;
// I-O
//- Write injection info to stream
virtual void info(Ostream& os);
};

7
src/lagrangian/parcel/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -83,4 +83,9 @@ Foam::scalar Foam::NoSurfaceReaction<CloudType>::calculate
}
template<class CloudType>
void Foam::NoSurfaceReaction<CloudType>::info(Ostream& os)
{}
// ************************************************************************* //

9
src/lagrangian/parcel/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,6 +38,7 @@ Description
namespace Foam
{
/*---------------------------------------------------------------------------*\
Class NoSurfaceReaction Declaration
\*---------------------------------------------------------------------------*/
@ -98,6 +99,12 @@ public:
scalarField& dMassSolid,
scalarField& dMassSRCarrier
) const;
// I-O
//- Write injection info to stream
virtual void info(Ostream& os);
};

12
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -60,6 +60,16 @@ noPhaseChange::~noPhaseChange()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
void noPhaseChange::correct
(
const scalar dt,
scalarField& availableMass,
volScalarField& dMass,
volScalarField& dEnergy
)
{}
void noPhaseChange::correctModel
(
const scalar,

11
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -77,6 +77,15 @@ public:
// Evolution
//- Correct
virtual void correct
(
const scalar dt,
scalarField& availableMass,
volScalarField& dMass,
volScalarField& dEnergy
);
//- Correct
virtual void correctModel
(