research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
Henry 2014-04-28 15:32:22 +01:00
commit 698fb8217c
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/OpenFOAM/db/Time/subCycleTime.H
View file

@ -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-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,6 +75,18 @@ public:
//- End the sub-cycling and reset the time-state
void endSubCycle();
//- Return the total number of sub-cycles
label nSubCycles() const
{
return nSubCycles_;
}
//- Return the current sub-cycle index
label index() const
{
return subCycleIndex_;
}
// Member operators

15
src/TurbulenceModels/turbulenceModels/laminar/laminar.C
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,7 +38,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
const alphaField& alpha,
const rhoField& rho,
const volVectorField& U,
const surfaceScalarField& alphaPhi,
const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi,
const transportModel& transport,
const word& propertiesName
@ -49,7 +49,7 @@ Foam::laminar<BasicTurbulenceModel>::laminar
alpha,
rho,
U,
alphaPhi,
alphaRhoPhi,
phi,
transport,
propertiesName
@ -66,7 +66,7 @@ Foam::laminar<BasicTurbulenceModel>::New
const alphaField& alpha,
const rhoField& rho,
const volVectorField& U,
const surfaceScalarField& alphaPhi,
const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi,
const transportModel& transport,
const word& propertiesName
@ -79,7 +79,7 @@ Foam::laminar<BasicTurbulenceModel>::New
alpha,
rho,
U,
alphaPhi,
alphaRhoPhi,
phi,
transport,
propertiesName
@ -141,7 +141,10 @@ Foam::laminar<BasicTurbulenceModel>::nuEff() const
{
return tmp<volScalarField>
(
new volScalarField("nuEff", this->nu())
new volScalarField
(
IOobject::groupName("nuEff", this->U_.group()), this->nu()
)
);
}

2
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
View file

@ -125,7 +125,7 @@ public:
"steady-state solver, use 'bounded Gauss' "
"to ensure boundedness.\n"
<< " To remove this warning switch off "
<< "'boundedGauss' in "
<< "'warnUnboundedGauss' in "
<< controlDictFiles[controlDictFiles.size()-1]
<< endl;
}