exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/bugfix/namedDdtOperators' into nextRelease

Browse source
This commit is contained in:
Dominik Christ 2014-02-17 11:04:19 +00:00
commit dd1d7c5c51
4 changed files with 170 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/finiteVolume/finiteVolume/fvm/fvmD2dt2.C
View file

@ -44,17 +44,63 @@ template<class Type>
tmp<fvMatrix<Type> >
d2dt2
(
GeometricField<Type, fvPatchField, volMesh>& vf
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::d2dt2Scheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().d2dt2Scheme("d2dt2(" + vf.name() + ')')
vf.mesh().schemesDict().d2dt2Scheme(name)
)().fvmD2dt2(vf);
}
template<class Type>
tmp<fvMatrix<Type> >
d2dt2
(
const dimensionedScalar& rho,
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::d2dt2Scheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().d2dt2Scheme(name)
)().fvmD2dt2(rho, vf);
}
template<class Type>
tmp<fvMatrix<Type> >
d2dt2
(
const volScalarField& rho,
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::d2dt2Scheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().d2dt2Scheme(name)
)().fvmD2dt2(rho, vf);
}
template<class Type>
tmp<fvMatrix<Type> >
d2dt2
(
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fvm::d2dt2(vf, "d2dt2(" + vf.name() + ')');
}
template<class Type>
tmp<fvMatrix<Type> >
d2dt2
@ -63,14 +109,7 @@ d2dt2
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fv::d2dt2Scheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().d2dt2Scheme
(
"d2dt2(" + rho.name() + ',' + vf.name() + ')'
)
)().fvmD2dt2(rho, vf);
return fvm::d2dt2(rho, vf, "d2dt2(" + rho.name() + ',' + vf.name() + ')');
}
@ -82,14 +121,7 @@ d2dt2
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fv::d2dt2Scheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().d2dt2Scheme
(
"d2dt2(" + rho.name() + ',' + vf.name() + ')'
)
)().fvmD2dt2(rho, vf);
return fvm::d2dt2(rho, vf, "d2dt2(" + rho.name() + ',' + vf.name() + ')');
}

26
src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H
View file

@ -53,7 +53,31 @@ namespace fvm
tmp<fvMatrix<Type> > d2dt2
(
const dimensionedScalar&,
GeometricField<Type, fvPatchField, volMesh>&
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > d2dt2
(
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > d2dt2
(
const volScalarField&,
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > d2dt2
(
const dimensionedScalar&,
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>

83
src/finiteVolume/finiteVolume/fvm/fvmDdt.C
View file

@ -44,17 +44,76 @@ template<class Type>
tmp<fvMatrix<Type> >
ddt
(
GeometricField<Type, fvPatchField, volMesh>& vf
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::ddtScheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().ddtScheme("ddt(" + vf.name() + ')')
vf.mesh().schemesDict().ddtScheme(name)
)().fvmDdt(vf);
}
template<class Type>
tmp<fvMatrix<Type> >
ddt
(
const geometricOneField&,
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fvm::ddt(vf, name);
}
template<class Type>
tmp<fvMatrix<Type> >
ddt
(
const dimensionedScalar& rho,
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::ddtScheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().ddtScheme(name)
)().fvmDdt(rho, vf);
}
template<class Type>
tmp<fvMatrix<Type> >
ddt
(
const volScalarField& rho,
GeometricField<Type, fvPatchField, volMesh>& vf,
const word& name
)
{
return fv::ddtScheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().ddtScheme(name)
)().fvmDdt(rho, vf);
}
template<class Type>
tmp<fvMatrix<Type> >
ddt
(
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fvm::ddt(vf, "ddt(" + vf.name() + ')');
}
template<class Type>
tmp<fvMatrix<Type> >
ddt
@ -63,7 +122,7 @@ ddt
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return ddt(vf);
return fvm::ddt(vf);
}
@ -75,14 +134,7 @@ ddt
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fv::ddtScheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().ddtScheme
(
"ddt(" + rho.name() + ',' + vf.name() + ')'
)
)().fvmDdt(rho, vf);
return fvm::ddt(rho, vf, "ddt(" + rho.name() + ',' + vf.name() + ')');
}
@ -94,14 +146,7 @@ ddt
GeometricField<Type, fvPatchField, volMesh>& vf
)
{
return fv::ddtScheme<Type>::New
(
vf.mesh(),
vf.mesh().schemesDict().ddtScheme
(
"ddt(" + rho.name() + ',' + vf.name() + ')'
)
)().fvmDdt(rho, vf);
return fvm::ddt(rho, vf, "ddt(" + rho.name() + ',' + vf.name() + ')');
}

31
src/finiteVolume/finiteVolume/fvm/fvmDdt.H
View file

@ -50,6 +50,37 @@ namespace Foam
namespace fvm
{
template<class Type>
tmp<fvMatrix<Type> > ddt
(
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > ddt
(
const geometricOneField&,
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > ddt
(
const dimensionedScalar&,
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > ddt
(
const volScalarField&,
GeometricField<Type, fvPatchField, volMesh>&,
const word& name
);
template<class Type>
tmp<fvMatrix<Type> > ddt
(