From a2deada5727e685695568af5bef0ab6ab7dfe37b Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 26 May 2017 11:45:40 +0100 Subject: [PATCH] Update fv SAMG interfaces --- .../constraint/processor/processorFvPatch.C | 21 ++++++++----------- .../constraint/processor/processorFvPatch.H | 3 +-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C index a0041ed22..851ae5fb1 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C @@ -178,29 +178,26 @@ tmp processorFvPatch::internalFieldTransfer void processorFvPatch::initProlongationTransfer ( const Pstream::commsTypes commsType, - const crMatrix& P + const crMatrix& filteredP ) const { - // Select the part of the prolongation matrix to send - - // Send prolongation matrix - Pout<< "HJ, in send for processorFvPatch" << endl; + // Send prolongation matrix, using IOstream operators + OPstream toNbr(Pstream::blocking, neighbProcNo()); + toNbr<< filteredP; } -tmp processorFvPatch::prolongationTransfer +autoPtr processorFvPatch::prolongationTransfer ( const Pstream::commsTypes commsType, - const crMatrix& P + const crMatrix& filteredP ) const { - // Receive and return prolongation matrix - Pout<< "HJ, in receive for processorFvPatch" << endl; + IPstream fromNbr(Pstream::blocking, neighbProcNo()); - // Dummy - tmp tcr(new crMatrix(5, 5, labelList(5))); + autoPtr tnbrP(new crMatrix(fromNbr)); - return tcr; + return tnbrP; } diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H index f3b724550..2172da00f 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H @@ -195,12 +195,11 @@ public: //- Transfer and return prolongation matrix adjacent to // the interface - virtual tmp prolongationTransfer + virtual autoPtr prolongationTransfer ( const Pstream::commsTypes commsType, const crMatrix& iF ) const; - };