From 94d5dd2aa2123ce54f04e67e5a996eb908236b9b Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 13 Dec 2012 11:36:08 +0000 Subject: [PATCH 1/4] 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 abf4523afd..1ce855b3ae 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.H @@ -453,7 +453,7 @@ public: void interpolateToSource ( const UList& fld, - const CombineOp& bop, + const CombineOp& cop, List& result ) const; @@ -463,7 +463,7 @@ public: void interpolateToTarget ( const UList& fld, - const CombineOp& bop, + const CombineOp& cop, List& result ) const; diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H index b63747abfd..45aef51952 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 + template void interpolate ( const UList& fld, - const BinaryOp& bop, + const CombineOp& cop, List& result ) const; diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatchTemplates.C index e4457dffad..bf4507ff8e 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::cyclicAMIPolyPatch::interpolate } -template +template void Foam::cyclicAMIPolyPatch::interpolate ( const UList& fld, - const BinaryOp& bop, + const CombineOp& cop, List& 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); } } From 9211b64e0d70e9753ad23d46f55d296e740b0380 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 13 Dec 2012 17:02:30 +0000 Subject: [PATCH 2/4] STYLE: Minor code formatting --- .../interRegionHeatTransferModel/interRegionHeatTransferModel.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C index 1cd4178faf..fd3f1b4475 100644 --- a/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C +++ b/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C @@ -127,7 +127,6 @@ Foam::interRegionHeatTransferModel::~interRegionHeatTransferModel() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - void Foam::interRegionHeatTransferModel::addSup ( fvMatrix& eEqn, From e89ace02d0ada62b3bd85cba5a74f10b3a2535c8 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 17 Dec 2012 12:35:22 +0000 Subject: [PATCH 3/4] ENH: VanDriest delta - reset cutoff after usage --- .../compressible/LES/vanDriestDelta/vanDriestDelta.C | 4 +++- .../incompressible/LES/vanDriestDelta/vanDriestDelta.C | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C index f6d85d5464..8c9137846d 100644 --- a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C +++ b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.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 @@ -82,8 +82,10 @@ void vanDriestDelta::calcDelta() } } + scalar cutOff = wallPointYPlus::yPlusCutOff; wallPointYPlus::yPlusCutOff = 500; wallDistData y(mesh_, ystar); + wallPointYPlus::yPlusCutOff = cutOff; delta_ = min ( diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C index 22aa5cb076..35cf23f686 100644 --- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C +++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.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 @@ -81,8 +81,10 @@ void vanDriestDelta::calcDelta() } } + scalar cutOff = wallPointYPlus::yPlusCutOff; wallPointYPlus::yPlusCutOff = 500; wallDistData y(mesh_, ystar); + wallPointYPlus::yPlusCutOff = cutOff; delta_ = min ( From 1d3aaec814e4e9708e31a78d9812bd0eb1c94242 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 17 Dec 2012 14:33:52 +0000 Subject: [PATCH 4/4] BUG: Added missing functions --- .../utilities/codedFunctionObject/codedFunctionObject.C | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C index 0248190cde..98b57ec487 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C @@ -266,4 +266,12 @@ bool Foam::codedFunctionObject::read(const dictionary& dict) } +void Foam::codedFunctionObject::updateMesh(const mapPolyMesh&) +{} + + +void Foam::codedFunctionObject::movePoints(const polyMesh&) +{} + + // ************************************************************************* //