Skip to content
Snippets Groups Projects
Commit 09892917 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

parents 4e8f36a9 f472fe31
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 630 additions and 7 deletions
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.C
+ 6
− 0
View file @ 09892917
......@@ -69,4 +69,10 @@ void Foam::surfaceFilmModels::noPhaseChange::correct
}
void Foam::surfaceFilmModels::noPhaseChange::info() const
{
// do nothing
}
// ************************************************************************* //
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/noPhaseChange/noPhaseChange.H
+ 6
− 0
View file @ 09892917
......@@ -90,6 +90,12 @@ public:
scalarField& dMass,
scalarField& dEnergy
);
// Input/output
//- Output model statistics
virtual void info() const;
};
......
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/phaseChangeModel/phaseChangeModel.H
+ 6
− 0
View file @ 09892917
......@@ -143,6 +143,12 @@ public:
scalarField& dMass,
scalarField& dEnergy
) = 0;
// Input/output
//- Output model statistics
virtual void info() const = 0;
};
......
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+ 16
− 1
View file @ 09892917
......@@ -76,7 +76,9 @@ Foam::surfaceFilmModels::standardPhaseChange::standardPhaseChange
phaseChangeModel(typeName, owner, dict),
Tb_(readScalar(coeffs_.lookup("Tb"))),
deltaMin_(readScalar(coeffs_.lookup("deltaMin"))),
L_(readScalar(coeffs_.lookup("L")))
L_(readScalar(coeffs_.lookup("L"))),
totalMass_(0.0),
vapourRate_(0.0)
{}
......@@ -191,6 +193,19 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct
dEnergy[cellI] = dMass[cellI]*hVap;
}
}
const scalar sumdMass = sum(dMass);
totalMass_ += sumdMass;
vapourRate_ = sumdMass/owner().time().deltaTValue();
}
void Foam::surfaceFilmModels::standardPhaseChange::info() const
{
Info<< indent << "mass phase change = "
<< returnReduce(totalMass_, sumOp<scalar>()) << nl
<< indent << "vapourisation rate = "
<< returnReduce(vapourRate_, sumOp<scalar>()) << nl;
}
......
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.H
+ 12
− 0
View file @ 09892917
......@@ -76,6 +76,12 @@ protected:
//- Length scale / [m]
const scalar L_;
//- Total mass evolved / [kg]
scalar totalMass_;
//- Vapouristaion rate / kg/s
scalar vapourRate_;
// Protected member functions
......@@ -114,6 +120,12 @@ public:
scalarField& dMass,
scalarField& dEnergy
);
// Input/output
//- Output model statistics
virtual void info() const;
};
......
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
+ 5
− 6
View file @ 09892917
......@@ -212,7 +212,8 @@ void Foam::surfaceFilmModels::thermoSingleLayer::solveEnergy()
fvm::ddt(deltaRho_, hs_)
+ fvm::div(phi_, hs_)
==
fvm::Sp(hsSp_/hs_, hs_)
// fvm::Sp(hsSp_/hs_, hs_)
hsSp_
+ q(hs_)
- fvm::Sp(massForPrimary_/magSf_/time_.deltaT(), hs_)
);
......@@ -570,11 +571,9 @@ void Foam::surfaceFilmModels::thermoSingleLayer::info() const
kinematicSingleLayer::info();
Info<< indent << "min/max(T) = " << min(T_).value() << ", "
<< max(T_).value() << nl
<< indent << "mass phase change = "
<< returnReduce(totalMassPhaseChange_, sumOp<scalar>()) << nl
<< indent << "vapourisation rate = "
<< sum(massPhaseChangeForPrimary_).value()/time_.deltaTValue() << nl;
<< max(T_).value() << nl;
phaseChange_->info();
}
......
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/H2O 0 → 100644
+ 36
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object H2O;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0.0;
boundaryField
{
"(.*)"
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type zeroGradient;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/N2 0 → 100644
+ 36
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object N2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0.79;
boundaryField
{
"(.*)"
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type zeroGradient;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/O2 0 → 100644
+ 36
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object O2;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0.21;
boundaryField
{
"(.*)"
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type zeroGradient;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/T 0 → 100644
+ 39
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
location "0";
class volScalarField;
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
internalField uniform 500;
boundaryField
{
"(.*)"
{
type fixedValue;
value uniform 300;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type directMappedNamedFixedValue;
fieldName Tsf;
average 300;
setAverage no;
value uniform 300;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/U 0 → 100644
+ 40
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volVectorField;
location "0";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
"(.*)"
{
type fixedValue;
value uniform (0 0 0);
}
region0_to_wallFilmRegion_wallFilmFaces
{
type directMappedNamedFixedValue;
fieldName Usf;
average ( 0 0 0 );
setAverage no;
value uniform (0 0 0);
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/alphat 0 → 100644
+ 39
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.7.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object alphat;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
"(.*)"
{
type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type alphatWallFunction;
Prt 0.85;
value uniform 0;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/epsilon 0 → 100644
+ 43
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.7.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object epsilon;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -3 0 0 0 0];
internalField uniform 1e-07;
boundaryField
{
"(.*)"
{
type compressible::epsilonWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 1e-07;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type compressible::epsilonWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 1e-07;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/htcConv 0 → 100644
+ 39
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.7.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object htcConv;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 0 -1 1 0 0 0];
internalField uniform 0;
boundaryField
{
"(.*)"
{
type calculated;
value uniform 0;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type htcConvection;
L 1.0;
value uniform 0;
}
}
// ************************************************************************* //
/* vim: set filetype=cpp : */
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/k 0 → 100644
+ 37
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.7.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object k;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 2 -2 0 0 0 0];
internalField uniform 1e-05;
boundaryField
{
"(.*)"
{
type compressible::kqRWallFunction;
value uniform 1e-05;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type compressible::kqRWallFunction;
value uniform 1e-05;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/mut 0 → 100644
+ 43
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.7.x |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object mut;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -1 0 0 0 0];
internalField uniform 0;
boundaryField
{
"(.*)"
{
type mutWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type mutWallFunction;
Cmu 0.09;
kappa 0.41;
E 9.8;
value uniform 0;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/p 0 → 100644
+ 34
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0";
object p;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
internalField uniform 100000;
boundaryField
{
"(.*)"
{
type zeroGradient; // buoyantPressure;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type zeroGradient; // buoyantPressure;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/wallFilmRegion/T 0 → 100644
+ 53
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0/wallFilmRegion";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
internalField uniform 300;
boundaryField
{
wallFilmFaces_top
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type directMappedFixedInternalValue;
average 300;
setAverage no;
value uniform 300;
}
left
{
type zeroGradient;
}
right
{
type zeroGradient;
}
frontAndBack
{
type zeroGradient;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/wallFilmRegion/Tf 0 → 100644
+ 51
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "0/wallFilmRegion";
object Tf;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
internalField uniform 288;
boundaryField
{
wallFilmFaces_top
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type fixedValue;
value uniform 312.3;
}
left
{
type zeroGradient;
}
right
{
type zeroGradient;
}
frontAndBack
{
type zeroGradient;
}
}
// ************************************************************************* //
tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/0.org/wallFilmRegion/U 0 → 100644
+ 53
− 0
View file @ 09892917
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volVectorField;
location "0/wallFilmRegion";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
wallFilmFaces_top
{
type zeroGradient;
}
region0_to_wallFilmRegion_wallFilmFaces
{
type directMappedFixedInternalValue;
average (0 0 0);
setAverage no;
value uniform (0 0 0);
}
left
{
type zeroGradient;
}
right
{
type zeroGradient;
}
frontAndBack
{
type zeroGradient;
}
}
// ************************************************************************* //
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment