diff --git a/src/OpenFOAM/db/Time/subCycleTime.H b/src/OpenFOAM/db/Time/subCycleTime.H index 594ee56e..9bec0326 100644 --- a/src/OpenFOAM/db/Time/subCycleTime.H +++ b/src/OpenFOAM/db/Time/subCycleTime.H @@ -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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C index c2799e5c..eac733d4 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminar.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminar.C @@ -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::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::laminar alpha, rho, U, - alphaPhi, + alphaRhoPhi, phi, transport, propertiesName @@ -66,7 +66,7 @@ Foam::laminar::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::New alpha, rho, U, - alphaPhi, + alphaRhoPhi, phi, transport, propertiesName @@ -141,7 +141,10 @@ Foam::laminar::nuEff() const { return tmp ( - new volScalarField("nuEff", this->nu()) + new volScalarField + ( + IOobject::groupName("nuEff", this->U_.group()), this->nu() + ) ); } diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H index a3ce0d1e..37761441 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H +++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H @@ -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; }