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

INT: Additional integration updates

Browse Source
This commit is contained in:
Andrew Heather
2018-05-10 15:13:51 +01:00
parent e2c4472ab6
commit 910d1a3021
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/XiFoam/XiEngineFoam/logSummary.H
View File

@ -5,7 +5,7 @@ Info<< "Mean u':"
<< (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value() << (sqrt((2.0/3.0)*turbulence->k()))().weightedAverage(mesh.V()).value()
<< endl; << endl;
logSummaryFile logSummaryFile()
<< runTime.theta() << tab << runTime.theta() << tab
<< p.weightedAverage(mesh.V()).value() << tab << p.weightedAverage(mesh.V()).value() << tab
<< thermo.T().weightedAverage(mesh.V()).value() << tab << thermo.T().weightedAverage(mesh.V()).value() << tab

9
applications/solvers/combustion/XiFoam/XiEngineFoam/startSummary.H
View File

@ -4,10 +4,13 @@ autoPtr<OFstream> logSummaryFile;
if (Pstream::master()) if (Pstream::master())
{ {
logSummaryFile = new OFstream logSummaryFile.reset
( (
runTime.rootPath()/runTime.globalCaseName() new OFstream
/("logSummary." + runTime.timeName() + ".dat") (
runTime.rootPath()/runTime.globalCaseName()
/("logSummary." + runTime.timeName() + ".dat")
)
); );
logSummaryFile() logSummaryFile()

9
applications/solvers/combustion/coldEngineFoam/startSummary.H
View File

@ -4,10 +4,13 @@ autoPtr<OFstream> logSummaryFile;
if (Pstream::master()) if (Pstream::master())
{ {
logSummaryFile = new OFstream logSummaryFile.reset
( (
runTime.rootPath()/runTime.globalCaseName() new OFstream
/("logSummary." + runTime.timeName() + ".dat") (
runTime.rootPath()/runTime.globalCaseName()
/("logSummary." + runTime.timeName() + ".dat")
)
); );
logSummaryFile() logSummaryFile()

6
src/lagrangian/intermediate/integrationScheme/integrationScheme/integrationSchemeNew.C
View File

@ -39,16 +39,16 @@ Foam::autoPtr<Foam::integrationScheme> Foam::integrationScheme::New
Info<< "Selecting " << phiName << " integration scheme " Info<< "Selecting " << phiName << " integration scheme "
<< schemeName << endl; << schemeName << endl;
auto cstrIter = dictionaryConstructorTablePtr_->cfind(schemeName); auto cstrIter = wordConstructorTablePtr_->cfind(schemeName);
if (!cstrIter.found()) if (!cstrIter.found())
{ {
FatalErrorInFunction FatalIOErrorInFunction(dict)
<< "Unknown integration scheme type " << "Unknown integration scheme type "
<< schemeName << nl << nl << schemeName << nl << nl
<< "Valid integration scheme types are:" << nl << "Valid integration scheme types are:" << nl
<< wordConstructorTablePtr_->sortedToc() << nl << wordConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError); << exit(FatalIOError);
} }
return autoPtr<integrationScheme>(cstrIter()()); return autoPtr<integrationScheme>(cstrIter()());

4
src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
View File

@ -177,13 +177,13 @@ void standardPhaseChange::correctModel
const scalar Dab = filmThermo.D(pc, Tloc); const scalar Dab = filmThermo.D(pc, Tloc);
// Schmidt number // Schmidt number
const scalar Sc = muInfc/(rhoInfc*(Dab + rootVSmall)); const scalar Sc = muInfc/(rhoInfc*(Dab + ROOTVSMALL));
// Sherwood number // Sherwood number
const scalar Sh = this->Sh(Re, Sc); const scalar Sh = this->Sh(Re, Sc);
// Mass transfer coefficient [m/s] // Mass transfer coefficient [m/s]
const scalar hm = Sh*Dab/(L_ + rootVSmall); const scalar hm = Sh*Dab/(L_ + ROOTVSMALL);
// Add mass contribution to source // Add mass contribution to source
dm = dt*magSf[celli]*rhoInfc*hm*(Ys - YInf[celli])/(1.0 - Ys); dm = dt*magSf[celli]*rhoInfc*hm*(Ys - YInf[celli])/(1.0 - Ys);

4
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
View File

@ -170,8 +170,8 @@ void Foam::semiPermeableBaffleMassFractionFvPatchScalarField::write
{ {
fvPatchScalarField::write(os); fvPatchScalarField::write(os);
mappedPatchBase::write(os); mappedPatchBase::write(os);
writeEntryIfDifferent<scalar>(os, "c", scalar(0), c_); os.writeEntryIfDifferent<scalar>("c", scalar(0), c_);
writeEntryIfDifferent<word>(os, "phi", "phi", phiName_); os.writeEntryIfDifferent<word>("phi", "phi", phiName_);
writeEntry("value", os); writeEntry("value", os);
} }

2
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
View File

@ -168,7 +168,7 @@ void Foam::semiPermeableBaffleVelocityFvPatchVectorField::write
) const ) const
{ {
fvPatchVectorField::write(os); fvPatchVectorField::write(os);
writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_); os.writeEntryIfDifferent<word>("rho", "rho", rhoName_);
writeEntry("value", os); writeEntry("value", os);
} }