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

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

Browse Source
This commit is contained in:
andy
2012-11-19 17:43:15 +00:00
parent 98a0ae49b0 53996d445d
commit b32ba6fbde
13 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/controlDict
View File

@ -112,7 +112,7 @@ DebugSwitches
ConeInjection 0;
Constant 0;
ConstantRateDevolatilisation 0;
CrankNicholson 0;
CrankNicolson 0;
CrossPowerLaw 0;
Cs 0;
DIC 0;

2
src/finiteVolume/Make/files
View File

@ -310,7 +310,7 @@ $(ddtSchemes)/localEulerDdtScheme/localEulerDdtSchemes.C
$(ddtSchemes)/backwardDdtScheme/backwardDdtSchemes.C
$(ddtSchemes)/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C
$(ddtSchemes)/boundedBackwardDdtScheme/boundedBackwardDdtSchemes.C
$(ddtSchemes)/CrankNicholsonDdtScheme/CrankNicholsonDdtSchemes.C
$(ddtSchemes)/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
$(ddtSchemes)/boundedDdtScheme/boundedDdtSchemes.C
d2dt2Schemes = finiteVolume/d2dt2Schemes

6
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
View File

@ -28,7 +28,7 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "EulerDdtScheme.H"
#include "CrankNicholsonDdtScheme.H"
#include "CrankNicolsonDdtScheme.H"
#include "backwardDdtScheme.H"
@ -229,7 +229,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
if
(
ddtScheme == fv::EulerDdtScheme<scalar>::typeName
|| ddtScheme == fv::CrankNicholsonDdtScheme<scalar>::typeName
|| ddtScheme == fv::CrankNicolsonDdtScheme<scalar>::typeName
)
{
this->refValue() =
@ -266,7 +266,7 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
if
(
ddtScheme == fv::EulerDdtScheme<scalar>::typeName
|| ddtScheme == fv::CrankNicholsonDdtScheme<scalar>::typeName
|| ddtScheme == fv::CrankNicolsonDdtScheme<scalar>::typeName
)
{
this->refValue() = field.oldTime().boundaryField()[patchi];

2
src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.H
View File

@ -31,7 +31,7 @@ Description
This boundary condition provides an advective outflow condition, based on
solving DDt(psi, U) = 0 at the boundary.
The standard (Euler, backward, CrankNicholson) time schemes are
The standard (Euler, backward, CrankNicolson) time schemes are
supported. Additionally an optional mechanism to relax the value at
the boundary to a specified far-field value is provided which is
switched on by specifying the relaxation length-scale \c lInf and the

8
src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
View File

@ -30,7 +30,7 @@ License
#include "surfaceFields.H"
#include "uniformDimensionedFields.H"
#include "EulerDdtScheme.H"
#include "CrankNicholsonDdtScheme.H"
#include "CrankNicolsonDdtScheme.H"
#include "backwardDdtScheme.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -45,7 +45,7 @@ namespace Foam
>::names[] =
{
fv::EulerDdtScheme<scalar>::typeName_(),
fv::CrankNicholsonDdtScheme<scalar>::typeName_(),
fv::CrankNicolsonDdtScheme<scalar>::typeName_(),
fv::backwardDdtScheme<scalar>::typeName_()
};
}
@ -183,7 +183,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
switch (timeScheme)
{
case tsEuler:
case tsCrankNicholson:
case tsCrankNicolson:
{
zetap = zeta.oldTime().boundaryField()[patchI] + dZetap;
@ -197,7 +197,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
scalar c00 = dt*dt/(dt0*(dt + dt0));
scalar c0 = c + c00;
zetap =
zetap =
(
c0*zeta.oldTime().boundaryField()[patchI]
- c00*zeta.oldTime().oldTime().boundaryField()[patchI]

4
src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H
View File

@ -45,7 +45,7 @@ Description
local volumetric flux.
\heading Patch usage
\table
Property | Description | Required | Default value
phi | flux field name | no | phi
@ -103,7 +103,7 @@ public:
enum timeSchemeType
{
tsEuler,
tsCrankNicholson,
tsCrankNicolson,
tsBackward
};

2
src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
View File

@ -28,7 +28,7 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "EulerDdtScheme.H"
#include "CrankNicholsonDdtScheme.H"
#include "CrankNicolsonDdtScheme.H"
#include "backwardDdtScheme.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

54
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C → src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "CrankNicholsonDdtScheme.H"
#include "CrankNicolsonDdtScheme.H"
#include "surfaceInterpolate.H"
#include "fvcDiv.H"
#include "fvMatrices.H"
@ -42,7 +42,7 @@ namespace fv
template<class Type>
template<class GeoField>
CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
(
const IOobject& io,
const fvMesh& mesh
@ -60,7 +60,7 @@ CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
template<class Type>
template<class GeoField>
CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
(
const IOobject& io,
const fvMesh& mesh,
@ -74,7 +74,7 @@ CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::DDt0Field
template<class Type>
template<class GeoField>
label CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::
label CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::
startTimeIndex() const
{
return startTimeIndex_;
@ -83,7 +83,7 @@ startTimeIndex() const
template<class Type>
template<class GeoField>
GeoField& CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::
GeoField& CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::
operator()()
{
return *this;
@ -92,7 +92,7 @@ operator()()
template<class Type>
template<class GeoField>
void CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>::
void CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>::
operator=(const GeoField& gf)
{
GeoField::operator=(gf);
@ -101,8 +101,8 @@ operator=(const GeoField& gf)
template<class Type>
template<class GeoField>
CrankNicholsonDdtScheme<Type>::DDt0Field<GeoField>&
CrankNicholsonDdtScheme<Type>::ddt0_
CrankNicolsonDdtScheme<Type>::DDt0Field<GeoField>&
CrankNicolsonDdtScheme<Type>::ddt0_
(
const word& name,
const dimensionSet& dims
@ -183,7 +183,7 @@ CrankNicholsonDdtScheme<Type>::ddt0_
template<class Type>
template<class GeoField>
bool CrankNicholsonDdtScheme<Type>::evaluate
bool CrankNicolsonDdtScheme<Type>::evaluate
(
const DDt0Field<GeoField>& ddt0
) const
@ -193,7 +193,7 @@ bool CrankNicholsonDdtScheme<Type>::evaluate
template<class Type>
template<class GeoField>
scalar CrankNicholsonDdtScheme<Type>::coef_
scalar CrankNicolsonDdtScheme<Type>::coef_
(
const DDt0Field<GeoField>& ddt0
) const
@ -211,7 +211,7 @@ scalar CrankNicholsonDdtScheme<Type>::coef_
template<class Type>
template<class GeoField>
scalar CrankNicholsonDdtScheme<Type>::coef0_
scalar CrankNicolsonDdtScheme<Type>::coef0_
(
const DDt0Field<GeoField>& ddt0
) const
@ -229,7 +229,7 @@ scalar CrankNicholsonDdtScheme<Type>::coef0_
template<class Type>
template<class GeoField>
dimensionedScalar CrankNicholsonDdtScheme<Type>::rDtCoef_
dimensionedScalar CrankNicolsonDdtScheme<Type>::rDtCoef_
(
const DDt0Field<GeoField>& ddt0
) const
@ -240,7 +240,7 @@ dimensionedScalar CrankNicholsonDdtScheme<Type>::rDtCoef_
template<class Type>
template<class GeoField>
dimensionedScalar CrankNicholsonDdtScheme<Type>::rDtCoef0_
dimensionedScalar CrankNicolsonDdtScheme<Type>::rDtCoef0_
(
const DDt0Field<GeoField>& ddt0
) const
@ -251,7 +251,7 @@ dimensionedScalar CrankNicholsonDdtScheme<Type>::rDtCoef0_
template<class Type>
template<class GeoField>
tmp<GeoField> CrankNicholsonDdtScheme<Type>::offCentre_
tmp<GeoField> CrankNicolsonDdtScheme<Type>::offCentre_
(
const GeoField& ddt0
) const
@ -281,7 +281,7 @@ const FieldField<fvPatchField, Type>& ff
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
CrankNicholsonDdtScheme<Type>::fvcDdt
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
)
@ -343,7 +343,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
CrankNicholsonDdtScheme<Type>::fvcDdt
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
)
@ -432,7 +432,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
CrankNicholsonDdtScheme<Type>::fvcDdt
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -522,7 +522,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh> >
CrankNicholsonDdtScheme<Type>::fvcDdt
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -622,7 +622,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<fvMatrix<Type> >
CrankNicholsonDdtScheme<Type>::fvmDdt
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
)
@ -705,7 +705,7 @@ CrankNicholsonDdtScheme<Type>::fvmDdt
template<class Type>
tmp<fvMatrix<Type> >
CrankNicholsonDdtScheme<Type>::fvmDdt
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -787,7 +787,7 @@ CrankNicholsonDdtScheme<Type>::fvmDdt
template<class Type>
tmp<fvMatrix<Type> >
CrankNicholsonDdtScheme<Type>::fvmDdt
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
@ -877,8 +877,8 @@ CrankNicholsonDdtScheme<Type>::fvmDdt
template<class Type>
tmp<typename CrankNicholsonDdtScheme<Type>::fluxFieldType>
CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rA,
const GeometricField<Type, fvPatchField, volMesh>& U,
@ -964,8 +964,8 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<typename CrankNicholsonDdtScheme<Type>::fluxFieldType>
CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rA,
const volScalarField& rho,
@ -1158,7 +1158,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
{
FatalErrorIn
(
"CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr"
"CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr"
) << "dimensions of phi are not correct"
<< abort(FatalError);
@ -1169,7 +1169,7 @@ CrankNicholsonDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> CrankNicholsonDdtScheme<Type>::meshPhi
tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf
)

32
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.H → src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
View File

@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::fv::CrankNicholsonDdtScheme
Foam::fv::CrankNicolsonDdtScheme
Description
Second-oder CrankNicholson implicit ddt using the current and
Second-oder CrankNicolson implicit ddt using the current and
previous time-step fields as well as the previous time-step ddt.
SourceFiles
CrankNicholsonDdtScheme.C
CrankNicolsonDdtScheme.C
\*---------------------------------------------------------------------------*/
#ifndef CrankNicholsonDdtScheme_H
#define CrankNicholsonDdtScheme_H
#ifndef CrankNicolsonDdtScheme_H
#define CrankNicolsonDdtScheme_H
#include "ddtScheme.H"
@ -49,11 +49,11 @@ namespace fv
{
/*---------------------------------------------------------------------------*\
Class CrankNicholsonDdtScheme Declaration
Class CrankNicolsonDdtScheme Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
class CrankNicholsonDdtScheme
class CrankNicolsonDdtScheme
:
public fv::ddtScheme<Type>
{
@ -105,10 +105,10 @@ class CrankNicholsonDdtScheme
// Private Member Functions
//- Disallow default bitwise copy construct
CrankNicholsonDdtScheme(const CrankNicholsonDdtScheme&);
CrankNicolsonDdtScheme(const CrankNicolsonDdtScheme&);
//- Disallow default bitwise assignment
void operator=(const CrankNicholsonDdtScheme&);
void operator=(const CrankNicolsonDdtScheme&);
template<class GeoField>
DDt0Field<GeoField>& ddt0_
@ -149,20 +149,20 @@ class CrankNicholsonDdtScheme
public:
//- Runtime type information
TypeName("CrankNicholson");
TypeName("CrankNicolson");
// Constructors
//- Construct from mesh
CrankNicholsonDdtScheme(const fvMesh& mesh)
CrankNicolsonDdtScheme(const fvMesh& mesh)
:
ddtScheme<Type>(mesh),
ocCoeff_(1.0)
{}
//- Construct from mesh and Istream
CrankNicholsonDdtScheme(const fvMesh& mesh, Istream& is)
CrankNicolsonDdtScheme(const fvMesh& mesh, Istream& is)
:
ddtScheme<Type>(mesh, is),
ocCoeff_(readScalar(is))
@ -171,7 +171,7 @@ public:
{
FatalIOErrorIn
(
"CrankNicholsonDdtScheme(const fvMesh& mesh, Istream& is)",
"CrankNicolsonDdtScheme(const fvMesh& mesh, Istream& is)",
is
) << "coefficient = " << ocCoeff_
<< " should be >= 0 and <= 1"
@ -253,7 +253,7 @@ public:
template<>
tmp<surfaceScalarField> CrankNicholsonDdtScheme<scalar>::fvcDdtPhiCorr
tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
(
const volScalarField& rA,
const volScalarField& U,
@ -262,7 +262,7 @@ tmp<surfaceScalarField> CrankNicholsonDdtScheme<scalar>::fvcDdtPhiCorr
template<>
tmp<surfaceScalarField> CrankNicholsonDdtScheme<scalar>::fvcDdtPhiCorr
tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtPhiCorr
(
const volScalarField& rA,
const volScalarField& rho,
@ -282,7 +282,7 @@ tmp<surfaceScalarField> CrankNicholsonDdtScheme<scalar>::fvcDdtPhiCorr
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "CrankNicholsonDdtScheme.C"
# include "CrankNicolsonDdtScheme.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicholsonDdtScheme/CrankNicholsonDdtSchemes.C → src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "CrankNicholsonDdtScheme.H"
#include "CrankNicolsonDdtScheme.H"
#include "fvMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -32,7 +32,7 @@ namespace Foam
{
namespace fv
{
makeFvDdtScheme(CrankNicholsonDdtScheme)
makeFvDdtScheme(CrankNicolsonDdtScheme)
}
}

2
src/finiteVolume/finiteVolume/fvm/fvm.H
View File

@ -29,7 +29,7 @@ Description
matrix.
Temporal derivatives are calculated using Euler-implicit, backward
differencing or Crank-Nicholson. Spatial derivatives are calculated
differencing or Crank-Nicolson. Spatial derivatives are calculated
using Gauss' Theorem.

1
tutorials/incompressible/shallowWaterFoam/squareBump/constant/polyMesh/boundary
View File

@ -38,6 +38,7 @@ FoamFile
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 800;
startFace 840;
}

2
tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
View File

@ -16,7 +16,7 @@ FoamFile
ddtSchemes
{
default CrankNicholson 0.9;
default CrankNicolson 0.9;
}
gradSchemes