zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code simplification: GeometricField<Type, fvPatchField, volMesh> -> VolField<Type>

Browse Source 
Using the VolField<Type> partial specialisation of
GeometricField<Type, fvPatchField, volMesh>
simplifies the code and improves readability.
This commit is contained in:
Henry Weller
2022-12-02 22:04:45 +00:00
parent fe368d5332
commit 2f4dd4fe27
274 changed files with 1796 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H
View File

@ -5,7 +5,7 @@ namespace Foam
template<class Type>
tmp<SurfaceField<Type>> interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const surfaceScalarField& dir,
const word& reconFieldName = word::null
)

2
applications/solvers/incompressible/adjointShapeOptimisationFoam/adjointShapeOptimisationFoam.C
View File

@ -56,7 +56,7 @@ Description
template<class Type>
void zeroCells
(
GeometricField<Type, fvPatchField, volMesh>& vf,
VolField<Type>& vf,
const labelList& cells
)
{

2
applications/test/volField/Test-volField.C
View File

@ -72,7 +72,7 @@ int main(int argc, char *argv[])
#include "createPhi.H"
GeometricField<symmTensor, fvPatchField, volMesh> st
VolField<symmTensor> st
(
IOobject
(

4
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -129,7 +129,7 @@ void subsetVolFields
const label patchi,
const Type& exposedValue,
const word GeomVolType,
PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
PtrList<VolField<Type>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
@ -144,7 +144,7 @@ void subsetVolFields
Info<< "Subsetting field " << fieldName << endl;
GeometricField<Type, fvPatchField, volMesh> volField
VolField<Type> volField
(
*iter(),
baseMesh

4
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
View File

@ -52,7 +52,7 @@ void subsetVolFields
(
const fvMeshSubset& subsetter,
const wordList& fieldNames,
PtrList<GeometricField<Type, fvPatchField, volMesh>>& subFields
PtrList<VolField<Type>>& subFields
)
{
const fvMesh& baseMesh = subsetter.baseMesh();
@ -63,7 +63,7 @@ void subsetVolFields
Info<< "Subsetting field " << fieldName << endl;
GeometricField<Type, fvPatchField, volMesh> fld
VolField<Type> fld
(
IOobject
(

4
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
View File

@ -146,10 +146,10 @@ public:
//- Decompose volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
decomposeField
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Decompose surface field

10
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C
View File

@ -86,7 +86,7 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::fvFieldDecomposer::decomposeField
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
// Create dummy patch fields
@ -106,9 +106,9 @@ Foam::fvFieldDecomposer::decomposeField
}
// Create the processor field with the dummy patch fields
tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
tmp<VolField<Type>> tresF
(
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
IOobject
(
@ -125,11 +125,11 @@ Foam::fvFieldDecomposer::decomposeField
patchFields
)
);
GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
VolField<Type>& resF = tresF.ref();
// Change the patch fields to the correct type using a mapper constructor
// (with reference to the now correct internal field)
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& bf = resF.boundaryFieldRef();
forAll(bf, procPatchi)
{

6
applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H
View File

@ -152,16 +152,16 @@ public:
//- Reconstruct volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
reconstructFvVolumeField
(
const IOobject& fieldIoObject,
const PtrList<GeometricField<Type, fvPatchField, volMesh>>&
const PtrList<VolField<Type>>&
) const;
//- Read and reconstruct volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
reconstructFvVolumeField(const IOobject& fieldIoObject) const;

14
applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
View File

@ -142,7 +142,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::fvFieldReconstructor::reconstructFvVolumeField
(
const IOobject& fieldIoObject,
const PtrList<GeometricField<Type, fvPatchField, volMesh>>& procFields
const PtrList<VolField<Type>>& procFields
) const
{
// Create the internalField
@ -153,7 +153,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
forAll(procFields, proci)
{
const GeometricField<Type, fvPatchField, volMesh>& procField =
const VolField<Type>& procField =
procFields[proci];
// Set the cell values in the reconstructed field
@ -240,9 +240,9 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
}
// Construct and return the field
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
fieldIoObject,
completeMesh_,
@ -261,7 +261,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
const IOobject& fieldIoObject
) const
{
PtrList<GeometricField<Type, fvPatchField, volMesh>>
PtrList<VolField<Type>>
procFields(procMeshes_.size());
forAll(procMeshes_, proci)
@ -269,7 +269,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
procFields.set
(
proci,
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
IOobject
(
@ -507,7 +507,7 @@ void Foam::fvFieldReconstructor::reconstructFvVolumeFields
)
{
const word& fieldClassName =
GeometricField<Type, fvPatchField, volMesh>::typeName;
VolField<Type>::typeName;
IOobjectList fields = objects.lookupClass(fieldClassName);

10
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View File

@ -40,16 +40,16 @@ using namespace Foam;
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
volField
(
const fvMeshSubset& meshSubsetter,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
if (meshSubsetter.hasSubMesh())
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tfld
tmp<VolField<Type>> tfld
(
meshSubsetter.interpolate(vf)
);
@ -300,7 +300,7 @@ void writePatchField
template<class Type>
void ensightField
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const ensightMesh& eMesh,
const fileName& postProcPath,
const word& prepend,
@ -717,7 +717,7 @@ void ensightPointField
template<class Type>
void ensightField
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const ensightMesh& eMesh,
const fileName& postProcPath,
const word& prepend,

2
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
View File

@ -229,7 +229,7 @@ void Foam::ensightVolField
partsList.writeField
(
os,
GeometricField<Type, fvPatchField, volMesh>
VolField<Type>
(
fieldObject,
mesh

2
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H
View File

@ -123,7 +123,7 @@ public:
tmp<Field<Type>> getPatchField
(
const bool nearCellValue,
const GeometricField<Type, fvPatchField, volMesh>& vfld,
const VolField<Type>& vfld,
const label patchi
) const;

2
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
View File

@ -68,7 +68,7 @@ template<class Type>
Foam::tmp<Field<Type>> Foam::tecplotWriter::getPatchField
(
const bool nearCellValue,
const GeometricField<Type, fvPatchField, volMesh>& vfld,
const VolField<Type>& vfld,
const label patchi
) const
{

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -104,7 +104,7 @@ public:
void write
(
const volPointInterpolation&,
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
const UPtrList<const VolField<Type>>&
);
};

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,7 +58,7 @@ template<class Type>
void Foam::internalWriter::write
(
const volPointInterpolation& pInterp,
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
const UPtrList<const VolField<Type>>& flds
)
{
forAll(flds, i)

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H
View File

@ -114,7 +114,7 @@ public:
template<class Type>
void write
(
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
const UPtrList<const VolField<Type>>&
);
//- Write pointFields
@ -132,7 +132,7 @@ public:
void write
(
const PrimitivePatchInterpolation<primitivePatch>&,
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>&
const UPtrList<const VolField<Type>>&
);
};

8
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriterTemplates.C
View File

@ -31,12 +31,12 @@ License
template<class Type>
void Foam::patchWriter::write
(
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
const UPtrList<const VolField<Type>>& flds
)
{
forAll(flds, fieldi)
{
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
const VolField<Type>& fld = flds[fieldi];
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
<< nFaces_ << " float" << std::endl;
@ -96,12 +96,12 @@ template<class Type>
void Foam::patchWriter::write
(
const PrimitivePatchInterpolation<primitivePatch>& pInter,
const UPtrList<const GeometricField<Type, fvPatchField, volMesh>>& flds
const UPtrList<const VolField<Type>>& flds
)
{
forAll(flds, fieldi)
{
const GeometricField<Type, fvPatchField, volMesh>& fld = flds[fieldi];
const VolField<Type>& fld = flds[fieldi];
os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '
<< nPoints_ << " float" << std::endl;

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOps.H
View File

@ -79,7 +79,7 @@ namespace vtkWriteOps
(
std::ostream&,
const bool binary,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const PointField<Type>&,
const vtkMesh&
);
@ -101,7 +101,7 @@ namespace vtkWriteOps
std::ostream&,
const bool binary,
const volPointInterpolation&,
const PtrList<GeometricField<Type, fvPatchField, volMesh>>&,
const PtrList<VolField<Type>>&,
const vtkMesh&
);

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkWriteFieldOpsTemplates.C
View File

@ -97,7 +97,7 @@ void Foam::vtkWriteOps::write
(
std::ostream& os,
const bool binary,
const GeometricField<Type, fvPatchField, volMesh>& vvf,
const VolField<Type>& vvf,
const PointField<Type>& pvf,
const vtkMesh& vMesh
)
@ -147,7 +147,7 @@ void Foam::vtkWriteOps::write
std::ostream& os,
const bool binary,
const volPointInterpolation& pInterp,
const PtrList<GeometricField<Type, fvPatchField, volMesh>>& flds,
const PtrList<VolField<Type>>& flds,
const vtkMesh& vMesh
)
{

10
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
View File

@ -534,7 +534,7 @@ class vtkPVFoam
template<class Type>
void convertVolFieldBlock
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
autoPtr<PointField<Type>>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
@ -545,7 +545,7 @@ class vtkPVFoam
template<class Type>
void convertVolInternalFieldBlock
(
const typename GeometricField<Type, fvPatchField, volMesh>
const typename VolField<Type>
::Internal&,
vtkMultiBlockDataSet* output,
const arrayRange&,
@ -556,7 +556,7 @@ class vtkPVFoam
template<class Type>
void convertVolInternalField
(
const typename GeometricField<Type, fvPatchField, volMesh>
const typename VolField<Type>
::Internal&,
vtkMultiBlockDataSet* output,
const arrayRange&,
@ -579,7 +579,7 @@ class vtkPVFoam
template<class Type>
void convertSurfaceField
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
const label datasetNo,
@ -652,7 +652,7 @@ class vtkPVFoam
void convertPointField
(
const PointField<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
vtkMultiBlockDataSet* output,
const arrayRange&,
const label datasetNo,

8
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamPointFields.H
View File

@ -187,7 +187,7 @@ void Foam::vtkPVFoam::convertPointFieldBlock
convertPointField
(
ptf,
GeometricField<Type, fvPatchField, volMesh>::null(),
VolField<Type>::null(),
output,
range,
datasetNo,
@ -202,7 +202,7 @@ template<class Type>
void Foam::vtkPVFoam::convertPointField
(
const PointField<Type>& ptf,
const GeometricField<Type, fvPatchField, volMesh>& tf,
const VolField<Type>& tf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
const label datasetNo,
@ -232,7 +232,7 @@ void Foam::vtkPVFoam::convertPointField
// Note: using the name of the original volField
// not the name generated by the interpolation "volPointInterpolate(<name>)"
if (&tf != &GeometricField<Type, fvPatchField, volMesh>::null())
if (&tf != &VolField<Type>::null())
{
pointData->SetName(tf.name().c_str());
}
@ -285,7 +285,7 @@ void Foam::vtkPVFoam::convertPointField
// continue insertion from here
label i = nPoints;
if (&tf != &GeometricField<Type, fvPatchField, volMesh>::null())
if (&tf != &VolField<Type>::null())
{
forAll(addPointCellLabels, apI)
{

2
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H
View File

@ -45,7 +45,7 @@ InClass
template<class Type>
void Foam::vtkPVFoam::convertSurfaceField
(
const GeometricField<Type, fvPatchField, volMesh>& tf,
const VolField<Type>& tf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
const label datasetNo,

14
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamVolFields.H
View File

@ -59,14 +59,14 @@ void Foam::vtkPVFoam::convertVolFields
if
(
iter()->headerClassName()
!= GeometricField<Type, fvPatchField, volMesh>::typeName
!= VolField<Type>::typeName
)
{
continue;
}
// Load field
GeometricField<Type, fvPatchField, volMesh> tf
VolField<Type> tf
(
*iter(),
mesh
@ -282,14 +282,14 @@ void Foam::vtkPVFoam::convertVolInternalFields
if
(
iter()->headerClassName()
!= GeometricField<Type, fvPatchField, volMesh>::Internal::typeName
!= VolField<Type>::Internal::typeName
)
{
continue;
}
// Load field
typename GeometricField<Type, fvPatchField, volMesh>::Internal tf
typename VolField<Type>::Internal tf
(
*iter(),
mesh
@ -328,7 +328,7 @@ void Foam::vtkPVFoam::convertVolInternalFields
template<class Type>
void Foam::vtkPVFoam::convertVolFieldBlock
(
const GeometricField<Type, fvPatchField, volMesh>& tf,
const VolField<Type>& tf,
autoPtr<PointField<Type>>& ptfPtr,
vtkMultiBlockDataSet* output,
const arrayRange& range,
@ -370,7 +370,7 @@ void Foam::vtkPVFoam::convertVolFieldBlock
template<class Type>
void Foam::vtkPVFoam::convertVolInternalFieldBlock
(
const typename GeometricField<Type, fvPatchField, volMesh>::Internal& tf,
const typename VolField<Type>::Internal& tf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
const List<polyDecomp>& decompLst
@ -398,7 +398,7 @@ void Foam::vtkPVFoam::convertVolInternalFieldBlock
template<class Type>
void Foam::vtkPVFoam::convertVolInternalField
(
const typename GeometricField<Type, fvPatchField, volMesh>::Internal& tf,
const typename VolField<Type>::Internal& tf,
vtkMultiBlockDataSet* output,
const arrayRange& range,
const label datasetNo,

26
applications/utilities/preProcessing/mapFields/meshToMesh0.H
View File

@ -267,7 +267,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelList& adr,
const scalarListList& weights
) const;
@ -277,7 +277,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelListList& adr,
const scalarListList& weights
) const;
@ -288,7 +288,7 @@ public:
void interpolateField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const labelList& adr,
const vectorField& centres
)const;
@ -299,7 +299,7 @@ public:
void interpolateInternalField
(
Field<Type>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
@ -307,7 +307,7 @@ public:
void interpolateInternalField
(
Field<Type>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
@ -316,32 +316,32 @@ public:
template<class Type>
void interpolate
(
GeometricField<Type, fvPatchField, volMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
VolField<Type>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
template<class Type>
void interpolate
(
GeometricField<Type, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
VolField<Type>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
//- Interpolate volume field
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
tmp<VolField<Type>> interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
order=INTERPOLATE
) const;
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> interpolate
tmp<VolField<Type>> interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
order=INTERPOLATE
) const;
};

30
applications/utilities/preProcessing/mapFields/meshToMesh0Templates.C
View File

@ -57,7 +57,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelListList& adr,
const scalarListList& weights
) const
@ -83,7 +83,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelList& adr,
const scalarListList& weights
) const
@ -117,7 +117,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
const labelList& adr,
const vectorField& centres
) const
@ -139,7 +139,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateInternalField
(
Field<Type>& toF,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
@ -216,7 +216,7 @@ template<class Type>
void Foam::meshToMesh0::interpolateInternalField
(
Field<Type>& toF,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
@ -228,14 +228,14 @@ void Foam::meshToMesh0::interpolateInternalField
template<class Type>
void Foam::meshToMesh0::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
VolField<Type>& toVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
interpolateInternalField(toVf, fromVf, ord);
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& toVfBf = toVf.boundaryFieldRef();
forAll(toMesh_.boundaryMesh(), patchi)
@ -322,8 +322,8 @@ void Foam::meshToMesh0::interpolate
template<class Type>
void Foam::meshToMesh0::interpolate
(
GeometricField<Type, fvPatchField, volMesh>& toVf,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
VolField<Type>& toVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
@ -336,7 +336,7 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh0::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& fromVf,
const VolField<Type>& fromVf,
meshToMesh0::order ord
) const
{
@ -380,9 +380,9 @@ Foam::meshToMesh0::interpolate
// Create the complete field from the pieces
tmp<GeometricField<Type, fvPatchField, volMesh>> ttoF
tmp<VolField<Type>> ttoF
(
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
IOobject
(
@ -408,11 +408,11 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::meshToMesh0::interpolate
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tfromVf,
const tmp<VolField<Type>>& tfromVf,
meshToMesh0::order ord
) const
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tint =
tmp<VolField<Type>> tint =
interpolate(tfromVf(), ord);
tfromVf.clear();

4
applications/utilities/preProcessing/mapFieldsPar/mapGeometricFields.C
View File

@ -36,9 +36,9 @@ namespace Foam
{
template<class Type>
void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
void evaluateConstraintTypes(VolField<Type>& fld)
{
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& fldBf = fld.boundaryFieldRef();
if

2
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -101,7 +101,7 @@ bool setCellFieldType
}
}
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& fieldBf = field.boundaryFieldRef();
forAll(field.boundaryField(), patchi)

4
src/conversion/ensight/part/ensightParts.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -140,7 +140,7 @@ public:
void writeField
(
ensightFile&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;

4
src/conversion/ensight/part/ensightPartsTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ template<class Type>
void Foam::ensightParts::writeField
(
ensightFile& os,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
// find offset to patch parts (ie, the first face data)

4
src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
View File

@ -86,8 +86,8 @@ class fvMeshAdder
(
const mapAddedPolyMesh& meshMap,
GeometricField<Type, fvPatchField, volMesh>& fld,
const GeometricField<Type, fvPatchField, volMesh>& fldToAdd
VolField<Type>& fld,
const VolField<Type>& fldToAdd
);
//- Update single surfaceField.

22
src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C
View File

@ -36,8 +36,8 @@ void Foam::fvMeshAdder::MapVolField
(
const mapAddedPolyMesh& meshMap,
GeometricField<Type, fvPatchField, volMesh>& fld,
const GeometricField<Type, fvPatchField, volMesh>& fldToAdd
VolField<Type>& fld,
const VolField<Type>& fldToAdd
)
{
const fvMesh& mesh = fld.mesh();
@ -62,7 +62,7 @@ void Foam::fvMeshAdder::MapVolField
// Patch fields from old mesh
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& bfld = fld.boundaryFieldRef();
{
@ -256,37 +256,37 @@ void Foam::fvMeshAdder::MapVolFields
const fvMesh& meshToAdd
)
{
HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fields
HashTable<const VolField<Type>*> fields
(
mesh.objectRegistry::lookupClass
<GeometricField<Type, fvPatchField, volMesh>>
<VolField<Type>>
()
);
HashTable<const GeometricField<Type, fvPatchField, volMesh>*> fieldsToAdd
HashTable<const VolField<Type>*> fieldsToAdd
(
meshToAdd.objectRegistry::lookupClass
<GeometricField<Type, fvPatchField, volMesh>>
<VolField<Type>>
()
);
for
(
typename HashTable<const GeometricField<Type, fvPatchField, volMesh>*>::
typename HashTable<const VolField<Type>*>::
iterator fieldIter = fields.begin();
fieldIter != fields.end();
++fieldIter
)
{
GeometricField<Type, fvPatchField, volMesh>& fld =
const_cast<GeometricField<Type, fvPatchField, volMesh>&>
VolField<Type>& fld =
const_cast<VolField<Type>&>
(
*fieldIter()
);
if (fieldsToAdd.found(fld.name()))
{
const GeometricField<Type, fvPatchField, volMesh>& fldToAdd =
const VolField<Type>& fldToAdd =
*fieldsToAdd[fld.name()];
if (debug)

8
src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
View File

@ -253,10 +253,10 @@ public:
//- Map volume field
template<class Type>
static tmp<GeometricField<Type, fvPatchField, volMesh>>
static tmp<VolField<Type>>
interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const fvMesh& sMesh,
const labelList& patchMap,
const labelList& cellMap,
@ -264,10 +264,10 @@ public:
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
interpolate
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
//- Map surface field. Optionally negates value if flipping

12
src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
View File

@ -38,7 +38,7 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::fvMeshSubset::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const fvMesh& sMesh,
const labelList& patchMap,
const labelList& cellMap,
@ -80,9 +80,9 @@ Foam::fvMeshSubset::interpolate
}
}
tmp<GeometricField<Type, fvPatchField, volMesh>> tresF
tmp<VolField<Type>> tresF
(
new GeometricField<Type, fvPatchField, volMesh>
new VolField<Type>
(
IOobject
(
@ -99,13 +99,13 @@ Foam::fvMeshSubset::interpolate
patchFields
)
);
GeometricField<Type, fvPatchField, volMesh>& resF = tresF.ref();
VolField<Type>& resF = tresF.ref();
// 2. Change the fvPatchFields to the correct type using a mapper
// constructor (with reference to the now correct internal field)
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& bf = resF.boundaryFieldRef();
forAll(bf, patchi)
@ -158,7 +158,7 @@ template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
Foam::fvMeshSubset::interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return interpolate

2
src/finiteVolume/cfdTools/general/fvConstraints/fvConstraints.H
View File

@ -127,7 +127,7 @@ public:
template<class Type>
bool constrain
(
GeometricField<Type, fvPatchField, volMesh>& field
VolField<Type>& field
) const;

4
src/finiteVolume/cfdTools/general/fvConstraints/fvConstraintsTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -60,7 +60,7 @@ bool Foam::fvConstraints::constrain(fvMatrix<Type>& eqn) const
template<class Type>
bool Foam::fvConstraints::constrain
(
GeometricField<Type, fvPatchField, volMesh>& field
VolField<Type>& field
) const
{
const word& fieldName = field.name();

28
src/finiteVolume/cfdTools/general/fvModels/fvModel.H
View File

@ -113,7 +113,7 @@ protected:
template<class Type, class ... AlphaRhoFieldTypes>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName,
const dimensionSet& ds,
const AlphaRhoFieldTypes& ... alphaRhos
@ -154,7 +154,7 @@ public:
>
inline static dimensionSet sourceDims
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const dimensionSet& ds,
const AlphaRhoFieldType& alphaRho,
const AlphaRhoFieldTypes& ... alphaRhos
@ -165,7 +165,7 @@ public:
template<class Type>
inline static dimensionSet sourceDims
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const dimensionSet& ds
);
@ -280,14 +280,14 @@ public:
template<class Type>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a specified name
template<class Type>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -296,7 +296,7 @@ public:
tmp<fvMatrix<Type>> source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a compressible equation with a specified name
@ -304,7 +304,7 @@ public:
tmp<fvMatrix<Type>> source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -314,7 +314,7 @@ public:
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation with a specified name
@ -323,7 +323,7 @@ public:
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -333,7 +333,7 @@ public:
(
const volScalarField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation
@ -342,7 +342,7 @@ public:
(
const geometricOneField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation
@ -351,21 +351,21 @@ public:
(
const geometricOneField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a second time derivative
template<class Type>
tmp<fvMatrix<Type>> d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a second time derivative
template<class Type>
tmp<fvMatrix<Type>> d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;

28
src/finiteVolume/cfdTools/general/fvModels/fvModelTemplates.C
View File

@ -28,7 +28,7 @@ License
template<class Type, class AlphaRhoFieldType, class ... AlphaRhoFieldTypes>
Foam::dimensionSet Foam::fvModel::sourceDims
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const dimensionSet& ds,
const AlphaRhoFieldType& alphaRho,
const AlphaRhoFieldTypes& ... alphaRhos
@ -41,7 +41,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims
template<class Type>
Foam::dimensionSet Foam::fvModel::sourceDims
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const dimensionSet& ds
)
{
@ -54,7 +54,7 @@ Foam::dimensionSet Foam::fvModel::sourceDims
template<class Type, class ... AlphaRhoFieldTypes>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName,
const dimensionSet& ds,
const AlphaRhoFieldTypes& ... alphaRhos
@ -84,7 +84,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(field, field.name());
@ -94,7 +94,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -106,7 +106,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(rho, field, field.name());
@ -117,7 +117,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -130,7 +130,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(alpha, rho, field, field.name());
@ -142,7 +142,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -155,7 +155,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const geometricOneField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(field, field.name());
@ -167,7 +167,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const volScalarField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
volScalarField one
@ -194,7 +194,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
(
const geometricOneField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(rho, field, field.name());
@ -206,7 +206,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->d2dt2(field, field.name());
@ -216,7 +216,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModel::d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{

24
src/finiteVolume/cfdTools/general/fvModels/fvModels.H
View File

@ -85,7 +85,7 @@ class fvModels
template<class Type, class ... AlphaRhoFieldTypes>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName,
const dimensionSet& ds,
const AlphaRhoFieldTypes& ... alphaRhos
@ -144,14 +144,14 @@ public:
template<class Type>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a specified name
template<class Type>
tmp<fvMatrix<Type>> source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -160,7 +160,7 @@ public:
tmp<fvMatrix<Type>> source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a compressible equation with a specified name
@ -168,7 +168,7 @@ public:
tmp<fvMatrix<Type>> source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -178,7 +178,7 @@ public:
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation with a specified name
@ -187,7 +187,7 @@ public:
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;
@ -197,7 +197,7 @@ public:
(
const volScalarField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation
@ -206,7 +206,7 @@ public:
(
const geometricOneField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for a phase equation
@ -215,21 +215,21 @@ public:
(
const geometricOneField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a second time derivative
template<class Type>
tmp<fvMatrix<Type>> d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const;
//- Return source for an equation with a second time derivative
template<class Type>
tmp<fvMatrix<Type>> d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const;

24
src/finiteVolume/cfdTools/general/fvModels/fvModelsTemplates.C
View File

@ -28,7 +28,7 @@ License
template<class Type, class ... AlphaRhoFieldTypes>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName,
const dimensionSet& ds,
const AlphaRhoFieldTypes& ... alphaRhos
@ -75,7 +75,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(field, field.name());
@ -85,7 +85,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -97,7 +97,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(rho, field, field.name());
@ -108,7 +108,7 @@ template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -121,7 +121,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(alpha, rho, field, field.name());
@ -133,7 +133,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{
@ -146,7 +146,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const geometricOneField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(field, field.name());
@ -158,7 +158,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const volScalarField& alpha,
const geometricOneField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
volScalarField one
@ -185,7 +185,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
(
const geometricOneField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->source(rho, field, field.name());
@ -197,7 +197,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::source
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field
const VolField<Type>& field
) const
{
return this->d2dt2(field, field.name());
@ -207,7 +207,7 @@ Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
template<class Type>
Foam::tmp<Foam::fvMatrix<Type>> Foam::fvModels::d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& field,
const VolField<Type>& field,
const word& fieldName
) const
{

6
src/finiteVolume/cfdTools/general/levelSet/levelSet.H
View File

@ -73,13 +73,13 @@ tmp<Field<Type>> levelSetAverage
//- As the above overload, but both in cells and on patch faces
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> levelSetAverage
tmp<VolField<Type>> levelSetAverage
(
const volScalarField& levelC,
const pointScalarField& levelP,
const GeometricField<Type, fvPatchField, volMesh>& positiveC,
const VolField<Type>& positiveC,
const PointField<Type>& positiveP,
const GeometricField<Type, fvPatchField, volMesh>& negativeC,
const VolField<Type>& negativeC,
const PointField<Type>& negativeP
);

10
src/finiteVolume/cfdTools/general/levelSet/levelSetTemplates.C
View File

@ -175,24 +175,24 @@ Foam::levelSetAverage
(
const volScalarField& levelC,
const pointScalarField& levelP,
const GeometricField<Type, fvPatchField, volMesh>& positiveC,
const VolField<Type>& positiveC,
const PointField<Type>& positiveP,
const GeometricField<Type, fvPatchField, volMesh>& negativeC,
const VolField<Type>& negativeC,
const PointField<Type>& negativeP
)
{
const fvMesh& mesh = levelC.mesh();
tmp<GeometricField<Type, fvPatchField, volMesh>> tResult
tmp<VolField<Type>> tResult
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
positiveC.name() + ":levelSetAverage",
mesh,
dimensioned<Type>("0", positiveC.dimensions(), Zero)
)
);
GeometricField<Type, fvPatchField, volMesh>& result = tResult.ref();
VolField<Type>& result = tResult.ref();
result.primitiveFieldRef() =
levelSetAverage

4
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View File

@ -135,8 +135,8 @@ template<class Type>
const Foam::cyclicFvPatchField<Type>&
Foam::cyclicFvPatchField<Type>::nbrPatchField() const
{
const GeometricField<Type, fvPatchField, volMesh>& fld =
static_cast<const GeometricField<Type, fvPatchField, volMesh>&>
const VolField<Type>& fld =
static_cast<const VolField<Type>&>
(
this->primitiveField()
);

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

@ -184,9 +184,9 @@ void Foam::advectiveFvPatchField<Type>::updateCoeffs()
);
scalar deltaT = this->db().time().deltaTValue();
const GeometricField<Type, fvPatchField, volMesh>& field =
const VolField<Type>& field =
this->db().objectRegistry::template
lookupObject<GeometricField<Type, fvPatchField, volMesh>>
lookupObject<VolField<Type>>
(
this->internalField().name()
);

6
src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -98,9 +98,9 @@ void Foam::outletMappedUniformInletFvPatchField<Type>::updateCoeffs()
return;
}
const GeometricField<Type, fvPatchField, volMesh>& f
const VolField<Type>& f
(
dynamic_cast<const GeometricField<Type, fvPatchField, volMesh>&>
dynamic_cast<const VolField<Type>&>
(
this->internalField()
)

8
src/finiteVolume/fields/volFields/volFields.C
View File

@ -58,8 +58,8 @@ defineTemplateTypeNameAndDebug(volTensorField, 0);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<>
tmp<GeometricField<scalar, fvPatchField, volMesh>>
GeometricField<scalar, fvPatchField, volMesh>::component
tmp<VolField<scalar>>
VolField<scalar>::component
(
const direction
) const
@ -69,10 +69,10 @@ GeometricField<scalar, fvPatchField, volMesh>::component
template<>
void GeometricField<scalar, fvPatchField, volMesh>::replace
void VolField<scalar>::replace
(
const direction,
const GeometricField<scalar, fvPatchField, volMesh>& gsf
const VolField<scalar>& gsf
)
{
*this == gsf;

10
src/finiteVolume/fields/volFields/volFields.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -49,17 +49,17 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<>
tmp<GeometricField<scalar, fvPatchField, volMesh>>
GeometricField<scalar, fvPatchField, volMesh>::component
tmp<VolField<scalar>>
VolField<scalar>::component
(
const direction
) const;
template<>
void GeometricField<scalar, fvPatchField, volMesh>::replace
void VolField<scalar>::replace
(
const direction,
const GeometricField<scalar, fvPatchField, volMesh>& sf
const VolField<scalar>& sf
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

13
src/finiteVolume/fields/volFields/volFieldsFwd.H
View File

@ -57,13 +57,12 @@ using VolField = GeometricField<Type, fvPatchField, volMesh>;
template<class Type>
using VolInternalField = typename VolField<Type>::Internal;
typedef GeometricField<label, fvPatchField, volMesh> volLabelField;
typedef GeometricField<scalar, fvPatchField, volMesh> volScalarField;
typedef GeometricField<vector, fvPatchField, volMesh> volVectorField;
typedef GeometricField<sphericalTensor, fvPatchField, volMesh>
volSphericalTensorField;
typedef GeometricField<symmTensor, fvPatchField, volMesh> volSymmTensorField;
typedef GeometricField<tensor, fvPatchField, volMesh> volTensorField;
typedef VolField<label> volLabelField;
typedef VolField<scalar> volScalarField;
typedef VolField<vector> volVectorField;
typedef VolField<sphericalTensor> volSphericalTensorField;
typedef VolField<symmTensor> volSymmTensorField;
typedef VolField<tensor> volTensorField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C
View File

@ -45,7 +45,7 @@ tmp<SurfaceField<Type>>
boundedConvectionScheme<Type>::interpolate
(
const surfaceScalarField& phi,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return scheme_().interpolate(phi, vf);
@ -57,7 +57,7 @@ tmp<SurfaceField<Type>>
boundedConvectionScheme<Type>::flux
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return scheme_().flux(faceFlux, vf);
@ -69,7 +69,7 @@ tmp<fvMatrix<Type>>
boundedConvectionScheme<Type>::fvmDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return
@ -79,11 +79,11 @@ boundedConvectionScheme<Type>::fvmDiv
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedConvectionScheme<Type>::fvcDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return

10
src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H
View File

@ -100,25 +100,25 @@ public:
tmp<SurfaceField<Type>> interpolate
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<fvMatrix<Type>> fvmDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
tmp<VolField<Type>> fvcDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;

10
src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H
View File

@ -163,25 +163,25 @@ public:
interpolate
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const = 0;
virtual tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const = 0;
virtual tmp<fvMatrix<Type>> fvmDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
virtual tmp<VolField<Type>> fvcDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const = 0;

12
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C
View File

@ -52,7 +52,7 @@ tmp<SurfaceField<Type>>
gaussConvectionScheme<Type>::interpolate
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return tinterpScheme_().interpolate(vf);
@ -64,7 +64,7 @@ tmp<SurfaceField<Type>>
gaussConvectionScheme<Type>::flux
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return faceFlux*interpolate(faceFlux, vf);
@ -76,7 +76,7 @@ tmp<fvMatrix<Type>>
gaussConvectionScheme<Type>::fvmDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
tmp<surfaceScalarField> tweights = tinterpScheme_().weights(vf);
@ -116,14 +116,14 @@ gaussConvectionScheme<Type>::fvmDiv
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
gaussConvectionScheme<Type>::fvcDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tConvection
tmp<VolField<Type>> tConvection
(
fvc::surfaceIntegrate(flux(faceFlux, vf))
);

10
src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H
View File

@ -107,25 +107,25 @@ public:
tmp<SurfaceField<Type>> interpolate
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<fvMatrix<Type>> fvmDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
tmp<VolField<Type>> fvcDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;

10
src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C
View File

@ -44,7 +44,7 @@ tmp<SurfaceField<Type>>
multivariateGaussConvectionScheme<Type>::interpolate
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return gaussConvectionScheme<Type>
@ -61,7 +61,7 @@ tmp<SurfaceField<Type>>
multivariateGaussConvectionScheme<Type>::flux
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return gaussConvectionScheme<Type>
@ -78,7 +78,7 @@ tmp<fvMatrix<Type>>
multivariateGaussConvectionScheme<Type>::fvmDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return gaussConvectionScheme<Type>
@ -91,11 +91,11 @@ multivariateGaussConvectionScheme<Type>::fvmDiv
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
multivariateGaussConvectionScheme<Type>::fvcDiv
(
const surfaceScalarField& faceFlux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) const
{
return gaussConvectionScheme<Type>

10
src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H
View File

@ -101,25 +101,25 @@ public:
tmp<SurfaceField<Type>> interpolate
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<fvMatrix<Type>> fvmDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDiv
tmp<VolField<Type>> fvcDiv
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) const;
};

24
src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,10 +40,10 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerD2dt2Scheme<Type>::fvcD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT2
@ -67,7 +67,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
const volScalarField::Internal VV0(mesh().V() + mesh().V0());
const volScalarField::Internal V0V00(mesh().V0() + mesh().V00());
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
d2dt2name,
halfRdeltaT2*
@ -89,7 +89,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
d2dt2name,
rDeltaT2*
@ -104,11 +104,11 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerD2dt2Scheme<Type>::fvcD2dt2
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT2
@ -143,7 +143,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
)
);
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
d2dt2name,
quarterRdeltaT2*
@ -190,7 +190,7 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
const volScalarField rhoRho0(rho + rho.oldTime());
const volScalarField rho0Rho00(rho.oldTime() +rho.oldTime().oldTime());
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
d2dt2name,
halfRdeltaT2*
@ -208,7 +208,7 @@ template<class Type>
tmp<fvMatrix<Type>>
EulerD2dt2Scheme<Type>::fvmD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -268,7 +268,7 @@ tmp<fvMatrix<Type>>
EulerD2dt2Scheme<Type>::fvmD2dt2
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -328,7 +328,7 @@ tmp<fvMatrix<Type>>
EulerD2dt2Scheme<Type>::fvmD2dt2
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm

16
src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,32 +89,32 @@ public:
return fv::d2dt2Scheme<Type>::mesh();
}
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
tmp<VolField<Type>> fvcD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
tmp<VolField<Type>> fvcD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);

16
src/finiteVolume/finiteVolume/d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -132,32 +132,32 @@ public:
return mesh_;
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
virtual tmp<VolField<Type>> fvcD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
virtual tmp<VolField<Type>> fvcD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmD2dt2
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;

20
src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,13 +40,13 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateD2dt2Scheme<Type>::fvcD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"d2dt2("+vf.name()+')',
mesh(),
@ -61,14 +61,14 @@ steadyStateD2dt2Scheme<Type>::fvcD2dt2
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateD2dt2Scheme<Type>::fvcD2dt2
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"d2dt2("+rho.name()+','+vf.name()+')',
mesh(),
@ -86,7 +86,7 @@ template<class Type>
tmp<fvMatrix<Type>>
steadyStateD2dt2Scheme<Type>::fvmD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -107,7 +107,7 @@ tmp<fvMatrix<Type>>
steadyStateD2dt2Scheme<Type>::fvmD2dt2
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -128,7 +128,7 @@ tmp<fvMatrix<Type>>
steadyStateD2dt2Scheme<Type>::fvmD2dt2
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm

16
src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -88,32 +88,32 @@ public:
return fv::d2dt2Scheme<Type>::mesh();
}
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
tmp<VolField<Type>> fvcD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<GeometricField<Type, fvPatchField, volMesh>> fvcD2dt2
tmp<VolField<Type>> fvcD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
tmp<fvMatrix<Type>> fvmD2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);

82
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
View File

@ -142,7 +142,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::CofrDeltaT() const
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CoEulerDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -154,9 +154,9 @@ CoEulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
tmp<VolField<Type>> tdtdt
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -177,9 +177,9 @@ CoEulerDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -197,10 +197,10 @@ CoEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CoEulerDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(CorDeltaT());
@ -209,9 +209,9 @@ CoEulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*
@ -228,9 +228,9 @@ CoEulerDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(vf - vf.oldTime())
@ -241,11 +241,11 @@ CoEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CoEulerDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(CorDeltaT());
@ -254,9 +254,9 @@ CoEulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*rho.value()*
@ -273,9 +273,9 @@ CoEulerDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*rho*(vf - vf.oldTime())
@ -286,11 +286,11 @@ CoEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CoEulerDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(CorDeltaT());
@ -299,9 +299,9 @@ CoEulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*
@ -321,9 +321,9 @@ CoEulerDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@ -334,12 +334,12 @@ CoEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CoEulerDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(CorDeltaT());
@ -348,9 +348,9 @@ CoEulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*
@ -378,9 +378,9 @@ CoEulerDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT
@ -398,7 +398,7 @@ template<class Type>
tmp<fvMatrix<Type>>
CoEulerDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -434,7 +434,7 @@ tmp<fvMatrix<Type>>
CoEulerDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -471,7 +471,7 @@ tmp<fvMatrix<Type>>
CoEulerDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -511,7 +511,7 @@ CoEulerDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -552,7 +552,7 @@ template<class Type>
tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
CoEulerDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -576,7 +576,7 @@ template<class Type>
tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
CoEulerDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -601,7 +601,7 @@ tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
CoEulerDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -613,7 +613,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == dimDensity*dimVelocity
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -668,7 +668,7 @@ tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
CoEulerDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -680,7 +680,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -739,7 +739,7 @@ CoEulerDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
)
{
return surfaceScalarField::New
@ -754,7 +754,7 @@ tmp<surfaceScalarField> CoEulerDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> CoEulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H
View File

@ -114,95 +114,95 @@ public:
return fv::ddtScheme<Type>::mesh();
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -217,7 +217,7 @@ public:
template<>
tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

122
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
View File

@ -341,14 +341,14 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + dt.name() + ')',
dt.dimensions()
@ -356,9 +356,9 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
const word ddtName("ddt(" + dt.name() + ')');
tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
tmp<VolField<Type>> tdtdt
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -398,14 +398,14 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + vf.name() + ')',
vf.dimensions()
@ -440,7 +440,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
);
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
(
@ -464,7 +464,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
- offCentre_(ddt0());
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDtCoef*(vf - vf.oldTime()) - offCentre_(ddt0())
@ -474,15 +474,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + rho.name() + ',' + vf.name() + ')',
rho.dimensions()*vf.dimensions()
@ -517,7 +517,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
);
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
(
@ -541,7 +541,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
- offCentre_(ddt0());
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDtCoef*rho*(vf - vf.oldTime()) - offCentre_(ddt0())
@ -551,15 +551,15 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + rho.name() + ',' + vf.name() + ')',
rho.dimensions()*vf.dimensions()
@ -598,7 +598,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
);
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
(
@ -627,7 +627,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
) - offCentre_(ddt0());
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDtCoef*(rho*vf - rho.oldTime()*vf.oldTime()) - offCentre_(ddt0())
@ -637,16 +637,16 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
CrankNicolsonDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
alpha.dimensions()*rho.dimensions()*vf.dimensions()
@ -696,7 +696,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
);
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
(
@ -734,7 +734,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdt
) - offCentre_(ddt0());
}
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDtCoef
@ -752,11 +752,11 @@ template<class Type>
tmp<fvMatrix<Type>>
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + vf.name() + ')',
vf.dimensions()
@ -835,11 +835,11 @@ tmp<fvMatrix<Type>>
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + rho.name() + ',' + vf.name() + ')',
rho.dimensions()*vf.dimensions()
@ -917,11 +917,11 @@ tmp<fvMatrix<Type>>
CrankNicolsonDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + rho.name() + ',' + vf.name() + ')',
rho.dimensions()*vf.dimensions()
@ -1008,11 +1008,11 @@ CrankNicolsonDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddt0(" + alpha.name() + ',' + rho.name() + ',' + vf.name() + ')',
alpha.dimensions()*rho.dimensions()*vf.dimensions()
@ -1117,12 +1117,12 @@ template<class Type>
tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + U.name() + ')',
U.dimensions()
@ -1170,12 +1170,12 @@ template<class Type>
tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + U.name() + ')',
U.dimensions()
@ -1225,7 +1225,7 @@ tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -1235,8 +1235,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == rho.dimensions()*dimVelocity
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + rho.name() + ',' + U.name() + ')',
rho.dimensions()*U.dimensions()
@ -1251,7 +1251,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
dimensionedScalar rDtCoef = rDtCoef_(ddt0);
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -1296,8 +1296,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == rho.dimensions()*dimVelocity
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + U.name() + ')',
U.dimensions()
@ -1363,7 +1363,7 @@ tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -1373,8 +1373,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + rho.name() + ',' + U.name() + ')',
rho.dimensions()*U.dimensions()
@ -1389,7 +1389,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
dimensionedScalar rDtCoef = rDtCoef_(ddt0);
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -1430,8 +1430,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
ddt0_<GeometricField<Type, fvPatchField, volMesh>>
DDt0Field<VolField<Type>>& ddt0 =
ddt0_<VolField<Type>>
(
"ddtCorrDdt0(" + U.name() + ')',
U.dimensions()
@ -1488,7 +1488,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
DDt0Field<surfaceScalarField>& meshPhi0 = ddt0_<surfaceScalarField>
@ -1514,7 +1514,7 @@ tmp<surfaceScalarField> CrankNicolsonDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> CrankNicolsonDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H
View File

@ -228,95 +228,95 @@ public:
return ocCoeff_->value(mesh().time().value());
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -331,7 +331,7 @@ public:
template<>
tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

64
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
View File

@ -41,7 +41,7 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -53,9 +53,9 @@ EulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
tmp<VolField<Type>> tdtdt
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -75,7 +75,7 @@ EulerDdtScheme<Type>::fvcDdt
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
mesh(),
@ -92,10 +92,10 @@ EulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -104,7 +104,7 @@ EulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*
@ -120,7 +120,7 @@ EulerDdtScheme<Type>::fvcDdt
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*(vf - vf.oldTime())
@ -130,11 +130,11 @@ EulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -143,7 +143,7 @@ EulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*rho*
@ -159,7 +159,7 @@ EulerDdtScheme<Type>::fvcDdt
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*rho*(vf - vf.oldTime())
@ -169,11 +169,11 @@ EulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -182,7 +182,7 @@ EulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*
@ -201,7 +201,7 @@ EulerDdtScheme<Type>::fvcDdt
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@ -211,12 +211,12 @@ EulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
EulerDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -225,7 +225,7 @@ EulerDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT*
@ -252,7 +252,7 @@ EulerDdtScheme<Type>::fvcDdt
}
else
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
ddtName,
rDeltaT
@ -288,7 +288,7 @@ template<class Type>
tmp<fvMatrix<Type>>
EulerDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -324,7 +324,7 @@ tmp<fvMatrix<Type>>
EulerDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -361,7 +361,7 @@ tmp<fvMatrix<Type>>
EulerDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -401,7 +401,7 @@ EulerDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -442,7 +442,7 @@ template<class Type>
tmp<typename EulerDdtScheme<Type>::fluxFieldType>
EulerDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -466,7 +466,7 @@ template<class Type>
tmp<typename EulerDdtScheme<Type>::fluxFieldType>
EulerDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -491,7 +491,7 @@ tmp<typename EulerDdtScheme<Type>::fluxFieldType>
EulerDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -503,7 +503,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == rho.dimensions()*dimVelocity
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -558,7 +558,7 @@ tmp<typename EulerDdtScheme<Type>::fluxFieldType>
EulerDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -570,7 +570,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -629,7 +629,7 @@ EulerDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> EulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
)
{
return mesh().phi();
@ -639,7 +639,7 @@ tmp<surfaceScalarField> EulerDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> EulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H
View File

@ -85,33 +85,33 @@ public:
using ddtScheme<Type>::mesh;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<SurfaceField<Type>> fvcDdt
@ -121,64 +121,64 @@ public:
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -193,7 +193,7 @@ public:
template<>
tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

82
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
View File

@ -146,7 +146,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
SLTSDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -158,9 +158,9 @@ SLTSDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
tmp<VolField<Type>> tdtdt
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -180,9 +180,9 @@ SLTSDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -200,10 +200,10 @@ SLTSDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
SLTSDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(SLrDeltaT());
@ -212,9 +212,9 @@ SLTSDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*(vf() - vf.oldTime()()*mesh().V0()/mesh().V()),
@ -227,9 +227,9 @@ SLTSDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(vf - vf.oldTime())
@ -240,11 +240,11 @@ SLTSDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
SLTSDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(SLrDeltaT());
@ -253,9 +253,9 @@ SLTSDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*rho*(vf() - vf.oldTime()()*mesh().V0()/mesh().V()),
@ -268,9 +268,9 @@ SLTSDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*rho*(vf - vf.oldTime())
@ -281,11 +281,11 @@ SLTSDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
SLTSDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(SLrDeltaT());
@ -294,9 +294,9 @@ SLTSDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*
@ -315,9 +315,9 @@ SLTSDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@ -328,12 +328,12 @@ SLTSDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
SLTSDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField rDeltaT(SLrDeltaT());
@ -342,9 +342,9 @@ SLTSDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT()*
@ -368,9 +368,9 @@ SLTSDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT
@ -387,7 +387,7 @@ template<class Type>
tmp<fvMatrix<Type>>
SLTSDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -423,7 +423,7 @@ tmp<fvMatrix<Type>>
SLTSDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -460,7 +460,7 @@ tmp<fvMatrix<Type>>
SLTSDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -500,7 +500,7 @@ SLTSDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -541,7 +541,7 @@ template<class Type>
tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
SLTSDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -566,7 +566,7 @@ template<class Type>
tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
SLTSDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -591,7 +591,7 @@ tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
SLTSDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -603,7 +603,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == dimDensity*dimVelocity
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -658,7 +658,7 @@ tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
SLTSDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -670,7 +670,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -729,7 +729,7 @@ SLTSDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
)
{
return surfaceScalarField::New
@ -744,7 +744,7 @@ tmp<surfaceScalarField> SLTSDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> SLTSDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H
View File

@ -116,95 +116,95 @@ public:
return fv::ddtScheme<Type>::mesh();
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -219,7 +219,7 @@ public:
template<>
tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

86
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
View File

@ -72,7 +72,7 @@ scalar backwardDdtScheme<Type>::deltaT0_(const GeoField& vf) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
backwardDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -91,9 +91,9 @@ backwardDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tdtdt
tmp<VolField<Type>> tdtdt
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -115,9 +115,9 @@ backwardDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -135,10 +135,10 @@ backwardDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
backwardDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -154,9 +154,9 @@ backwardDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -181,9 +181,9 @@ backwardDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -199,11 +199,11 @@ backwardDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
backwardDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -219,9 +219,9 @@ backwardDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*rho*
@ -246,9 +246,9 @@ backwardDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*rho*
@ -264,11 +264,11 @@ backwardDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
backwardDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -284,9 +284,9 @@ backwardDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -314,9 +314,9 @@ backwardDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -332,12 +332,12 @@ backwardDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
backwardDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@ -353,9 +353,9 @@ backwardDdtScheme<Type>::fvcDdt
if (mesh().moving())
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -393,9 +393,9 @@ backwardDdtScheme<Type>::fvcDdt
}
else
{
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*
@ -415,7 +415,7 @@ template<class Type>
tmp<fvMatrix<Type>>
backwardDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -467,7 +467,7 @@ tmp<fvMatrix<Type>>
backwardDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -518,7 +518,7 @@ tmp<fvMatrix<Type>>
backwardDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -573,7 +573,7 @@ backwardDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -637,7 +637,7 @@ template<class Type>
tmp<typename backwardDdtScheme<Type>::fluxFieldType>
backwardDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -673,7 +673,7 @@ template<class Type>
tmp<typename backwardDdtScheme<Type>::fluxFieldType>
backwardDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -708,7 +708,7 @@ tmp<typename backwardDdtScheme<Type>::fluxFieldType>
backwardDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -727,12 +727,12 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == rho.dimensions()*dimVelocity
)
{
const GeometricField<Type, fvPatchField, volMesh> rhoU0
const VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
const GeometricField<Type, fvPatchField, volMesh> rhoU00
const VolField<Type> rhoU00
(
rho.oldTime().oldTime()*U.oldTime().oldTime()
);
@ -801,7 +801,7 @@ tmp<typename backwardDdtScheme<Type>::fluxFieldType>
backwardDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -820,12 +820,12 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
const GeometricField<Type, fvPatchField, volMesh> rhoU0
const VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
const GeometricField<Type, fvPatchField, volMesh> rhoU00
const VolField<Type> rhoU00
(
rho.oldTime().oldTime()*U.oldTime().oldTime()
);
@ -880,7 +880,7 @@ backwardDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const scalar deltaT = deltaT_();
@ -903,7 +903,7 @@ tmp<surfaceScalarField> backwardDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> backwardDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H
View File

@ -117,95 +117,95 @@ public:
return fv::ddtScheme<Type>::mesh();
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -220,7 +220,7 @@ public:
template<>
tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

38
src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C
View File

@ -42,7 +42,7 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -53,10 +53,10 @@ boundedDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvcDdt(vf);
@ -64,11 +64,11 @@ boundedDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvcDdt(rho, vf);
@ -76,11 +76,11 @@ boundedDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvcDdt(rho, vf) - fvc::ddt(rho)*vf;
@ -88,12 +88,12 @@ boundedDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
boundedDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvcDdt(alpha, rho, vf) - fvc::ddt(alpha, rho)*vf;
@ -104,7 +104,7 @@ template<class Type>
tmp<fvMatrix<Type>>
boundedDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvmDdt(vf);
@ -116,7 +116,7 @@ tmp<fvMatrix<Type>>
boundedDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvmDdt(rho, vf);
@ -128,7 +128,7 @@ tmp<fvMatrix<Type>>
boundedDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().fvmDdt(rho, vf) - fvm::Sp(fvc::ddt(rho), vf);
@ -141,7 +141,7 @@ boundedDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return
@ -154,7 +154,7 @@ template<class Type>
tmp<typename boundedDdtScheme<Type>::fluxFieldType>
boundedDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -166,7 +166,7 @@ template<class Type>
tmp<typename boundedDdtScheme<Type>::fluxFieldType>
boundedDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -179,7 +179,7 @@ tmp<typename boundedDdtScheme<Type>::fluxFieldType>
boundedDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -192,7 +192,7 @@ tmp<typename boundedDdtScheme<Type>::fluxFieldType>
boundedDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -203,7 +203,7 @@ boundedDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> boundedDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return scheme_.ref().meshPhi(vf);
@ -213,7 +213,7 @@ tmp<surfaceScalarField> boundedDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> boundedDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H
View File

@ -98,95 +98,95 @@ public:
return fv::ddtScheme<Type>::mesh();
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -201,7 +201,7 @@ public:
template<>
tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

18
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C
View File

@ -93,18 +93,18 @@ ddtScheme<Type>::~ddtScheme()
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddtScheme<Type>::fvcDdt
tmp<VolField<Type>> ddtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
NotImplemented;
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::null()
VolField<Type>::null()
);
}
@ -114,7 +114,7 @@ tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
NotImplemented;
@ -150,7 +150,7 @@ tmp<SurfaceField<Type>> ddtScheme<Type>::fvcDdt
template<class Type>
tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const fluxFieldType& phiCorr
)
@ -204,7 +204,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
template<class Type>
tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const fluxFieldType& phiCorr,
const volScalarField& rho
@ -217,7 +217,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
template<class Type>
tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -228,7 +228,7 @@ tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
template<class Type>
tmp<surfaceScalarField> ddtScheme<Type>::fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const volScalarField& rho
)

46
src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H
View File

@ -132,33 +132,33 @@ public:
return mesh_;
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
) = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<SurfaceField<Type>> fvcDdt
@ -168,40 +168,40 @@ public:
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
) = 0;
typedef SurfaceField<typename flux<Type>::type> fluxFieldType;
virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const fluxFieldType& phiCorr
);
virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const fluxFieldType& phiCorr,
const volScalarField& rho
@ -209,51 +209,51 @@ public:
virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const volScalarField& rho
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
) = 0;
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
) = 0;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
) = 0;
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
) = 0;
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
) = 0;

64
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
View File

@ -54,7 +54,7 @@ const surfaceScalarField& localEulerDdtScheme<Type>::localRDeltaTf() const
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
localEulerDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
@ -62,9 +62,9 @@ localEulerDdtScheme<Type>::fvcDdt
{
const word ddtName("ddt(" + dt.name() + ')');
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
mesh(),
@ -81,19 +81,19 @@ localEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
localEulerDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField& rDeltaT = localRDeltaT();
const word ddtName("ddt(" + vf.name() + ')');
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(vf - vf.oldTime())
@ -103,20 +103,20 @@ localEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
localEulerDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField& rDeltaT = localRDeltaT();
const word ddtName("ddt(" + rho.name() + ',' + vf.name() + ')');
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*rho*(vf - vf.oldTime())
@ -126,20 +126,20 @@ localEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
localEulerDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField& rDeltaT = localRDeltaT();
const word ddtName("ddt(" + rho.name() + ',' + vf.name() + ')');
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT*(rho*vf - rho.oldTime()*vf.oldTime())
@ -149,21 +149,21 @@ localEulerDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
localEulerDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
const volScalarField& rDeltaT = localRDeltaT();
const word ddtName("ddt("+alpha.name()+','+rho.name()+','+vf.name()+')');
return tmp<GeometricField<Type, fvPatchField, volMesh>>
return tmp<VolField<Type>>
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
ddtName,
rDeltaT
@ -199,7 +199,7 @@ template<class Type>
tmp<fvMatrix<Type>>
localEulerDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -227,7 +227,7 @@ tmp<fvMatrix<Type>>
localEulerDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -256,7 +256,7 @@ tmp<fvMatrix<Type>>
localEulerDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -287,7 +287,7 @@ localEulerDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<fvMatrix<Type>> tfvm
@ -319,7 +319,7 @@ localEulerDdtScheme<Type>::fvmDdt
template<class Type>
tmp<surfaceScalarField> localEulerDdtScheme<Type>::fvcDdtPhiCoeff
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi,
const fluxFieldType& phiCorr
)
@ -364,7 +364,7 @@ template<class Type>
tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
localEulerDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -397,7 +397,7 @@ template<class Type>
tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
localEulerDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -430,7 +430,7 @@ tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
localEulerDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -442,7 +442,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
&& Uf.dimensions() == dimDensity*dimVelocity
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -515,7 +515,7 @@ tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
localEulerDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -527,7 +527,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
&& phi.dimensions() == rho.dimensions()*dimFlux
)
{
GeometricField<Type, fvPatchField, volMesh> rhoU0
VolField<Type> rhoU0
(
rho.oldTime()*U.oldTime()
);
@ -604,7 +604,7 @@ localEulerDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
)
{
return surfaceScalarField::New
@ -619,7 +619,7 @@ tmp<surfaceScalarField> localEulerDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> localEulerDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
)
{

42
src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H
View File

@ -152,33 +152,33 @@ public:
using ddtScheme<Type>::mesh;
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<SurfaceField<Type>> fvcDdt
@ -188,26 +188,26 @@ public:
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
@ -216,45 +216,45 @@ public:
// virtual tmp<surfaceScalarField> fvcDdtPhiCoeff
// (
// const GeometricField<Type, fvPatchField, volMesh>& U,
// const VolField<Type>& U,
// const fluxFieldType& phi,
// const fluxFieldType& phiCorr
// );
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -269,7 +269,7 @@ public:
template<>
tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

48
src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C
View File

@ -40,13 +40,13 @@ namespace fv
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateDdtScheme<Type>::fvcDdt
(
const dimensioned<Type>& dt
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"ddt("+dt.name()+')',
mesh(),
@ -61,13 +61,13 @@ steadyStateDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateDdtScheme<Type>::fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"ddt("+vf.name()+')',
mesh(),
@ -82,14 +82,14 @@ steadyStateDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateDdtScheme<Type>::fvcDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"ddt("+rho.name()+','+vf.name()+')',
mesh(),
@ -104,14 +104,14 @@ steadyStateDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateDdtScheme<Type>::fvcDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"ddt("+rho.name()+','+vf.name()+')',
mesh(),
@ -126,15 +126,15 @@ steadyStateDdtScheme<Type>::fvcDdt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
steadyStateDdtScheme<Type>::fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"ddt("+alpha.name()+','+rho.name()+','+vf.name()+')',
mesh(),
@ -152,7 +152,7 @@ template<class Type>
tmp<fvMatrix<Type>>
steadyStateDdtScheme<Type>::fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return tmp<fvMatrix<Type>>
@ -171,7 +171,7 @@ tmp<fvMatrix<Type>>
steadyStateDdtScheme<Type>::fvmDdt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return tmp<fvMatrix<Type>>
@ -190,7 +190,7 @@ tmp<fvMatrix<Type>>
steadyStateDdtScheme<Type>::fvmDdt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return tmp<fvMatrix<Type>>
@ -210,7 +210,7 @@ steadyStateDdtScheme<Type>::fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return tmp<fvMatrix<Type>>
@ -228,7 +228,7 @@ template<class Type>
tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
steadyStateDdtScheme<Type>::fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -250,7 +250,7 @@ template<class Type>
tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
steadyStateDdtScheme<Type>::fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -273,7 +273,7 @@ tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
steadyStateDdtScheme<Type>::fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -296,7 +296,7 @@ tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
steadyStateDdtScheme<Type>::fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
)
{
@ -317,7 +317,7 @@ steadyStateDdtScheme<Type>::fvcDdtPhiCorr
template<class Type>
tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return surfaceScalarField::New
@ -332,7 +332,7 @@ tmp<surfaceScalarField> steadyStateDdtScheme<Type>::meshPhi
template<class Type>
tmp<scalarField> steadyStateDdtScheme<Type>::meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
)
{

40
src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H
View File

@ -88,95 +88,95 @@ public:
return fv::ddtScheme<Type>::mesh();
}
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensioned<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<GeometricField<Type, fvPatchField, volMesh>> fvcDdt
virtual tmp<VolField<Type>> fvcDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<fvMatrix<Type>> fvmDdt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
);
typedef typename ddtScheme<Type>::fluxFieldType fluxFieldType;
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<fluxFieldType> fvcDdtUfCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
virtual tmp<fluxFieldType> fvcDdtPhiCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const fluxFieldType& phi
);
virtual tmp<surfaceScalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
virtual tmp<scalarField> meshPhi
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const label patchi
);
@ -191,7 +191,7 @@ public:
template<>
tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtUfCorr
(
const GeometricField<scalar, fvPatchField, volMesh>& U,
const VolField<scalar>& U,
const SurfaceField<scalar>& Uf
);

4
src/finiteVolume/finiteVolume/divSchemes/divScheme/divScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -141,7 +141,7 @@ public:
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> fvcDiv
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
) = 0;

4
src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,7 +47,7 @@ tmp
>
gaussDivScheme<Type>::fvcDiv
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp

4
src/finiteVolume/finiteVolume/divSchemes/gaussDivScheme/gaussDivScheme.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -89,7 +89,7 @@ public:
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> fvcDiv
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);

24
src/finiteVolume/finiteVolume/fvc/fvcAverage.C
View File

@ -41,7 +41,7 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
average
(
const SurfaceField<Type>& ssf
@ -49,9 +49,9 @@ average
{
const fvMesh& mesh = ssf.mesh();
tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
tmp<VolField<Type>> taverage
(
GeometricField<Type, fvPatchField, volMesh>::New
VolField<Type>::New
(
"average("+ssf.name()+')',
mesh,
@ -64,7 +64,7 @@ average
return taverage;
}
GeometricField<Type, fvPatchField, volMesh>& av = taverage.ref();
VolField<Type>& av = taverage.ref();
av.primitiveFieldRef() =
(
@ -72,7 +72,7 @@ average
/surfaceSum(mesh.magSf())().primitiveField()
);
typename GeometricField<Type, fvPatchField, volMesh>::
typename VolField<Type>::
Boundary& bav = av.boundaryFieldRef();
forAll(bav, patchi)
@ -87,13 +87,13 @@ average
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
average
(
const tmp<SurfaceField<Type>>& tssf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
tmp<VolField<Type>> taverage
(
fvc::average(tssf())
);
@ -103,10 +103,10 @@ average
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
average
(
const GeometricField<Type, fvPatchField, volMesh>& vtf
const VolField<Type>& vtf
)
{
return fvc::average(linearInterpolate(vtf));
@ -114,13 +114,13 @@ average
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
average
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvtf
const tmp<VolField<Type>>& tvtf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> taverage
tmp<VolField<Type>> taverage
(
fvc::average(tvtf())
);

12
src/finiteVolume/finiteVolume/fvc/fvcAverage.H
View File

@ -52,14 +52,14 @@ namespace fvc
{
//- Area-weighted average a surfaceField creating a volField
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> average
tmp<VolField<Type>> average
(
const SurfaceField<Type>&
);
//- Area-weighted average a surfaceField creating a volField
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> average
tmp<VolField<Type>> average
(
const tmp<SurfaceField<Type>>&
);
@ -67,16 +67,16 @@ namespace fvc
//- Area-weighted average a surfaceField creating a volField
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> average
tmp<VolField<Type>> average
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
//- Area-weighted average a surfaceField creating a volField
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> average
tmp<VolField<Type>> average
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

2
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
View File

@ -88,7 +88,7 @@ Foam::fvc::cellReduce
const Type& nullValue
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
tmp<VolField<Type>> tvf
(
cellReduce
(

4
src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H
View File

@ -50,7 +50,7 @@ namespace Foam
namespace fvc
{
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
tmp<VolField<Type>> cellReduce
(
const SurfaceField<Type>&,
const CombineOp& cop,
@ -58,7 +58,7 @@ namespace fvc
);
template<class Type, class CombineOp>
tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
tmp<VolField<Type>> cellReduce
(
const tmp<SurfaceField<Type>>&,
const CombineOp& cop,

16
src/finiteVolume/finiteVolume/fvc/fvcCurl.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,20 +40,20 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
curl
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
word nameCurlVf = "curl(" + vf.name() + ')';
// Gausses theorem curl
// tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
// tmp<VolField<Type>> tcurlVf =
// fvc::surfaceIntegrate(vf.mesh().Sf() ^ fvc::interpolate(vf));
// Calculate curl as the Hodge dual of the skew-symmetric part of grad
tmp<GeometricField<Type, fvPatchField, volMesh>> tcurlVf =
tmp<VolField<Type>> tcurlVf =
2.0*(*skew(fvc::grad(vf, nameCurlVf)));
tcurlVf.ref().rename(nameCurlVf);
@ -63,13 +63,13 @@ curl
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
curl
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Curl(fvc::curl(tvf()));
tmp<VolField<Type>> Curl(fvc::curl(tvf()));
tvf.clear();
return Curl;
}

10
src/finiteVolume/finiteVolume/fvc/fvcCurl.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,15 +51,15 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> curl
tmp<VolField<Type>> curl
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> curl
tmp<VolField<Type>> curl
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

8
src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C
View File

@ -40,10 +40,10 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::d2dt2Scheme<Type>::New
@ -55,11 +55,11 @@ d2dt2
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
d2dt2
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::d2dt2Scheme<Type>::New

10
src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,16 +50,16 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
tmp<VolField<Type>> d2dt2
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> d2dt2
tmp<VolField<Type>> d2dt2
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
}

14
src/finiteVolume/finiteVolume/fvc/fvcDDt.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,14 +40,14 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
DDt
(
const surfaceScalarField& phi,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> ddtDivPhiPsi
tmp<VolField<Type>> ddtDivPhiPsi
= fvc::ddt(psi) + fvc::div(phi, psi);
if (phi.mesh().moving())
@ -62,14 +62,14 @@ DDt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
DDt
(
const tmp<surfaceScalarField>& tphi,
const GeometricField<Type, fvPatchField, volMesh>& psi
const VolField<Type>& psi
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> DDtPsi
tmp<VolField<Type>> DDtPsi
(
fvc::DDt(tphi(), psi)
);

10
src/finiteVolume/finiteVolume/fvc/fvcDDt.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,17 +51,17 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
tmp<VolField<Type>> DDt
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> DDt
tmp<VolField<Type>> DDt
(
const tmp<surfaceScalarField>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
}

46
src/finiteVolume/finiteVolume/fvc/fvcDdt.C
View File

@ -40,7 +40,7 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const dimensioned<Type> dt,
@ -56,10 +56,10 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::ddtScheme<Type>::New
@ -71,11 +71,11 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const dimensionedScalar& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::ddtScheme<Type>::New
@ -87,11 +87,11 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::ddtScheme<Type>::New
@ -103,11 +103,11 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const one&,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return ddt(vf);
@ -115,12 +115,12 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const volScalarField& alpha,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fv::ddtScheme<Type>::New
@ -138,12 +138,12 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const one&,
const one&,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return ddt(vf);
@ -151,12 +151,12 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const one&,
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return ddt(rho, vf);
@ -164,12 +164,12 @@ ddt
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
ddt
(
const volScalarField& alpha,
const one&,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return ddt(alpha, vf);
@ -195,7 +195,7 @@ template<class Type>
tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -211,7 +211,7 @@ template<class Type>
tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename flux<Type>::type,
@ -232,7 +232,7 @@ template<class Type>
tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename flux<Type>::type,
@ -258,7 +258,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
)
{
@ -275,7 +275,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename flux<Type>::type,
@ -297,7 +297,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename flux<Type>::type,

46
src/finiteVolume/finiteVolume/fvc/fvcDdt.H
View File

@ -54,69 +54,69 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const dimensioned<Type>,
const fvMesh&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const dimensionedScalar&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const one&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const volScalarField&,
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const one&,
const one&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const one&,
const volScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> ddt
tmp<VolField<Type>> ddt
(
const volScalarField&,
const one&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
@ -137,7 +137,7 @@ namespace fvc
>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
@ -153,7 +153,7 @@ namespace fvc
>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename Foam::flux<Type>::type,
@ -174,7 +174,7 @@ namespace fvc
>
ddtCorr
(
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename Foam::flux<Type>::type,
@ -197,7 +197,7 @@ namespace fvc
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const SurfaceField<Type>& Uf
);
@ -214,7 +214,7 @@ namespace fvc
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename Foam::flux<Type>::type,
@ -236,7 +236,7 @@ namespace fvc
ddtCorr
(
const volScalarField& rho,
const GeometricField<Type, fvPatchField, volMesh>& U,
const VolField<Type>& U,
const GeometricField
<
typename Foam::flux<Type>::type,

64
src/finiteVolume/finiteVolume/fvc/fvcDiv.C
View File

@ -42,13 +42,13 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const SurfaceField<Type>& ssf
)
{
return GeometricField<Type, fvPatchField, volMesh>::New
return VolField<Type>::New
(
"div("+ssf.name()+')',
fvc::surfaceIntegrate(ssf)
@ -57,13 +57,13 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const tmp<SurfaceField<Type>>& tssf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div(fvc::div(tssf()));
tmp<VolField<Type>> Div(fvc::div(tssf()));
tssf.clear();
return Div;
}
@ -79,7 +79,7 @@ tmp
>
div
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -100,12 +100,12 @@ tmp
>
div
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf,
const tmp<VolField<Type>>& tvvf,
const word& name
)
{
typedef typename innerProduct<vector, Type>::type DivType;
tmp<GeometricField<DivType, fvPatchField, volMesh>> Div
tmp<VolField<DivType>> Div
(
fvc::div(tvvf(), name)
);
@ -123,7 +123,7 @@ tmp
>
div
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::div(vf, "div("+vf.name()+')');
@ -140,22 +140,22 @@ tmp
>
div
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvvf
const tmp<VolField<Type>>& tvvf
)
{
typedef typename innerProduct<vector, Type>::type DivType;
tmp<GeometricField<DivType, fvPatchField, volMesh>> Div(fvc::div(tvvf()));
tmp<VolField<DivType>> Div(fvc::div(tvvf()));
tvvf.clear();
return Div;
}
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const surfaceScalarField& flux,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -169,15 +169,15 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const tmp<surfaceScalarField>& tflux,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(tflux(), vf, name)
);
@ -187,15 +187,15 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const surfaceScalarField& flux,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(flux, tvf(), name)
);
@ -205,15 +205,15 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const tmp<surfaceScalarField>& tflux,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(tflux(), tvf(), name)
);
@ -224,11 +224,11 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const surfaceScalarField& flux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::div
@ -239,14 +239,14 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const tmp<surfaceScalarField>& tflux,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(tflux(), vf)
);
@ -256,14 +256,14 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const surfaceScalarField& flux,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(flux, tvf())
);
@ -273,14 +273,14 @@ div
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
div
(
const tmp<surfaceScalarField>& tflux,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Div
tmp<VolField<Type>> Div
(
fvc::div(tflux(), tvf())
);

44
src/finiteVolume/finiteVolume/fvc/fvcDiv.H
View File

@ -51,13 +51,13 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const SurfaceField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const tmp<SurfaceField<Type>>&
);
@ -70,7 +70,7 @@ namespace fvc
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> div
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
@ -81,7 +81,7 @@ namespace fvc
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> div
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
@ -93,7 +93,7 @@ namespace fvc
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> div
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
@ -103,69 +103,69 @@ namespace fvc
<typename innerProduct<vector, Type>::type, fvPatchField, volMesh>
> div
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const tmp<surfaceScalarField>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const surfaceScalarField&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const tmp<surfaceScalarField>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const tmp<surfaceScalarField>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const surfaceScalarField&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> div
tmp<VolField<Type>> div
(
const tmp<surfaceScalarField>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

20
src/finiteVolume/finiteVolume/fvc/fvcFlux.H
View File

@ -60,14 +60,14 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type>
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
Istream& schemeData
);
@ -75,7 +75,7 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
@ -83,7 +83,7 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const tmp<surfaceScalarField>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
@ -91,7 +91,7 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
@ -99,7 +99,7 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const tmp<surfaceScalarField>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
@ -108,28 +108,28 @@ namespace fvc
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<SurfaceField<Type>> flux
(
const tmp<surfaceScalarField>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<SurfaceField<Type>> flux
(
const surfaceScalarField&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type>
tmp<SurfaceField<Type>> flux
(
const tmp<surfaceScalarField>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

18
src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C
View File

@ -44,7 +44,7 @@ tmp<SurfaceField<Type>>
flux
(
const surfaceScalarField& phi,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
Istream& schemeData
)
{
@ -62,7 +62,7 @@ tmp<SurfaceField<Type>>
flux
(
const surfaceScalarField& phi,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -75,7 +75,7 @@ tmp<SurfaceField<Type>>
flux
(
const tmp<surfaceScalarField>& tphi,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -93,7 +93,7 @@ tmp<SurfaceField<Type>>
flux
(
const surfaceScalarField& phi,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
@ -111,7 +111,7 @@ tmp<SurfaceField<Type>>
flux
(
const tmp<surfaceScalarField>& tphi,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
@ -130,7 +130,7 @@ tmp<SurfaceField<Type>>
flux
(
const surfaceScalarField& phi,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::flux
@ -145,7 +145,7 @@ tmp<SurfaceField<Type>>
flux
(
const tmp<surfaceScalarField>& tphi,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<SurfaceField<Type>> Flux
@ -162,7 +162,7 @@ tmp<SurfaceField<Type>>
flux
(
const surfaceScalarField& phi,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<SurfaceField<Type>> Flux
@ -179,7 +179,7 @@ tmp<SurfaceField<Type>>
flux
(
const tmp<surfaceScalarField>& tphi,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<SurfaceField<Type>> Flux

12
src/finiteVolume/finiteVolume/fvc/fvcGrad.C
View File

@ -71,7 +71,7 @@ grad
)
{
typedef typename outerProduct<vector, Type>::type GradType;
tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
tmp<VolField<GradType>> Grad
(
fvc::grad(tssf())
);
@ -90,7 +90,7 @@ tmp
>
grad
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -112,7 +112,7 @@ tmp
>
grad
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
@ -141,7 +141,7 @@ tmp
>
grad
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::grad(vf, "grad(" + vf.name() + ')');
@ -158,11 +158,11 @@ tmp
>
grad
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
typedef typename outerProduct<vector, Type>::type GradType;
tmp<GeometricField<GradType, fvPatchField, volMesh>> Grad
tmp<VolField<GradType>> Grad
(
fvc::grad(tvf())
);

8
src/finiteVolume/finiteVolume/fvc/fvcGrad.H
View File

@ -77,7 +77,7 @@ namespace fvc
<typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
> grad
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word& name
);
@ -88,7 +88,7 @@ namespace fvc
<typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
> grad
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word& name
);
@ -99,7 +99,7 @@ namespace fvc
<typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
> grad
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
@ -109,7 +109,7 @@ namespace fvc
<typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
> grad
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

138
src/finiteVolume/finiteVolume/fvc/fvcLaplacian.C
View File

@ -40,10 +40,10 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -56,14 +56,14 @@ laplacian
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tvf(), name)
);
@ -73,10 +73,10 @@ laplacian
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::laplacian(vf, "laplacian(" + vf.name() + ')');
@ -84,13 +84,13 @@ laplacian
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tvf())
);
@ -102,11 +102,11 @@ laplacian
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const dimensioned<GType>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -128,15 +128,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const dimensioned<GType>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(gamma, tvf(), name)
);
@ -146,11 +146,11 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const dimensioned<GType>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
GeometricField<GType, fvsPatchField, surfaceMesh> Gamma
@ -171,14 +171,14 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const dimensioned<GType>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(gamma, tvf())
);
@ -190,11 +190,11 @@ laplacian
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvPatchField, volMesh>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<GType>& gamma,
const VolField<Type>& vf,
const word& name
)
{
@ -207,15 +207,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const tmp<VolField<GType>>& tgamma,
const VolField<Type>& vf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), vf, name)
);
@ -225,15 +225,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvPatchField, volMesh>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const VolField<GType>& gamma,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(gamma, tvf(), name)
);
@ -243,15 +243,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<GType>>& tgamma,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), tvf(), name)
);
@ -262,11 +262,11 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvPatchField, volMesh>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<GType>& gamma,
const VolField<Type>& vf
)
{
return fvc::laplacian
@ -279,11 +279,11 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
const GeometricField<Type, fvPatchField, volMesh>& vf
const tmp<VolField<GType>>& tgamma,
const VolField<Type>& vf
)
{
return fvc::laplacian
@ -296,11 +296,11 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvPatchField, volMesh>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const VolField<GType>& gamma,
const tmp<VolField<Type>>& tvf
)
{
return fvc::laplacian
@ -313,11 +313,11 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>& tgamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<GType>>& tgamma,
const tmp<VolField<Type>>& tvf
)
{
return fvc::laplacian
@ -332,11 +332,11 @@ laplacian
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
@ -349,15 +349,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const GeometricField<Type, fvPatchField, volMesh>& vf,
const VolField<Type>& vf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), vf, name)
);
@ -367,15 +367,15 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(gamma, tvf(), name)
);
@ -385,14 +385,14 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
const tmp<VolField<Type>>& tvf,
const word& name
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), tvf(), name)
);
@ -403,11 +403,11 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
return fvc::laplacian
@ -420,14 +420,14 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const GeometricField<Type, fvPatchField, volMesh>& vf
const VolField<Type>& vf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), vf)
);
@ -437,14 +437,14 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>>
tmp<VolField<Type>>
laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>& gamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(gamma, tvf())
);
@ -454,13 +454,13 @@ laplacian
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>& tgamma,
const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
const tmp<VolField<Type>>& tvf
)
{
tmp<GeometricField<Type, fvPatchField, volMesh>> Laplacian
tmp<VolField<Type>> Laplacian
(
fvc::laplacian(tgamma(), tvf())
);

114
src/finiteVolume/finiteVolume/fvc/fvcLaplacian.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -52,182 +52,182 @@ namespace Foam
namespace fvc
{
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const dimensioned<GType>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const dimensioned<GType>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const dimensioned<GType>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const dimensioned<GType>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvPatchField, volMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<GType>&,
const VolField<Type>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const tmp<VolField<GType>>&,
const VolField<Type>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const VolField<GType>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<GType>>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvPatchField, volMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<GType>&,
const VolField<Type>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
const GeometricField<Type, fvPatchField, volMesh>&
const tmp<VolField<GType>>&,
const VolField<Type>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvPatchField, volMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const VolField<GType>&,
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvPatchField, volMesh>>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<GType>>&,
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const GeometricField<Type, fvPatchField, volMesh>&,
const VolField<Type>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
const tmp<VolField<Type>>&,
const word&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const GeometricField<Type, fvPatchField, volMesh>&
const VolField<Type>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const GeometricField<GType, fvsPatchField, surfaceMesh>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
template<class Type, class GType>
tmp<GeometricField<Type, fvPatchField, volMesh>> laplacian
tmp<VolField<Type>> laplacian
(
const tmp<GeometricField<GType, fvsPatchField, surfaceMesh>>&,
const tmp<GeometricField<Type, fvPatchField, volMesh>>&
const tmp<VolField<Type>>&
);
}

Some files were not shown because too many files have changed in this diff Show More