zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/sampling/meshToMesh/meshToMesh.C
View File

@ -63,7 +63,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -76,7 +76,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -89,7 +89,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -102,7 +102,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -115,7 +115,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -128,7 +128,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -141,7 +141,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -154,7 +154,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -167,7 +167,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -180,7 +180,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -193,7 +193,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}
@ -206,7 +206,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
mapSrcToTgt(field, cop, result.internalField());
mapSrcToTgt(field, cop, result.primitiveFieldRef());
}

31
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -554,7 +554,7 @@ void Foam::meshToMesh::mapSrcToTgt
const bool secondOrder
) const
{
mapInternalSrcToTgt(field, cop, result.primitiveFieldRef(), secondOrder);
mapInternalSrcToTgt(field, cop, result, secondOrder);
const PtrList<AMIPatchToPatchInterpolation>& AMIList = patchAMIs();
@ -751,14 +751,14 @@ void Foam::meshToMesh::mapInternalTgtToSrc
mapTgtToSrc
(
field,
fvc::grad(field)().internalField(),
fvc::grad(field)().primitiveField(),
cop,
result.internalField()
result.primitiveFieldRef()
);
}
else
{
mapTgtToSrc(field, cop, result.internalField());
mapTgtToSrc(field, cop, result.primitiveFieldRef());
}
}
@ -784,27 +784,6 @@ void Foam::meshToMesh::mapAndOpTgtToSrc
}
template<class Type, class CombineOp>
void Foam::meshToMesh::mapAndOpTgtToSrc
(
const AMIPatchToPatchInterpolation& AMI,
Field<Type>& srcField,
const Field<Type>& tgtField,
const CombineOp& cop
) const
{
srcField = pTraits<Type>::zero;
AMI.interpolateToSource
(
tgtField,
multiplyWeightedOp<Type, CombineOp>(cop),
srcField,
UList<Type>::null()
);
}
template<class Type, class CombineOp>
void Foam::meshToMesh::mapTgtToSrc
(
@ -814,7 +793,7 @@ void Foam::meshToMesh::mapTgtToSrc
const bool secondOrder
) const
{
mapInternalTgtToSrc(field, cop, result.primitiveFieldRef(), secondOrder);
mapInternalTgtToSrc(field, cop, result, secondOrder);
const PtrList<AMIPatchToPatchInterpolation>& AMIList = patchAMIs();