From 94d5dd2aa2123ce54f04e67e5a996eb908236b9b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Thu, 13 Dec 2012 11:36:08 +0000
Subject: [PATCH] ENH: AMI - Updated binary ops -> combine ops
---
.../AMIInterpolation/AMIInterpolation.H | 4 ++--
.../cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H | 4 ++--
.../cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
index abf4523afde..1ce855b3aec 100644
--- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
+++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H
@@ -453,7 +453,7 @@ public:
void interpolateToSource
(
const UList<Type>& fld,
- const CombineOp& bop,
+ const CombineOp& cop,
List<Type>& result
) const;
@@ -463,7 +463,7 @@ public:
void interpolateToTarget
(
const UList<Type>& fld,
- const CombineOp& bop,
+ const CombineOp& cop,
List<Type>& result
) const;
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index b63747abfdf..45aef519524 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
@@ -321,11 +321,11 @@ public:
) const;
//- Low-level interpolate List
- template<class Type, class BinaryOp>
+ template<class Type, class CombineOp>
void interpolate
(
const UList<Type>& fld,
- const BinaryOp& bop,
+ const CombineOp& cop,
List<Type>& result
) const;
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
index e4457dffade..bf4507ff8e0 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -59,21 +59,21 @@ Foam::tmp<Foam::Field<Type> > Foam::cyclicAMIPolyPatch::interpolate
}
-template<class Type, class BinaryOp>
+template<class Type, class CombineOp>
void Foam::cyclicAMIPolyPatch::interpolate
(
const UList<Type>& fld,
- const BinaryOp& bop,
+ const CombineOp& cop,
List<Type>& result
) const
{
if (owner())
{
- AMI().interpolateToSource(fld, bop, result);
+ AMI().interpolateToSource(fld, cop, result);
}
else
{
- neighbPatch().AMI().interpolateToTarget(fld, bop, result);
+ neighbPatch().AMI().interpolateToTarget(fld, cop, result);
}
}
--
GitLab