From ba8f307c569e59e3e59e19422446e6c4400f36c7 Mon Sep 17 00:00:00 2001 From: HRN Date: Fri, 18 Oct 2024 23:10:42 +0330 Subject: [PATCH] Code recovery MPI part --- .../processorAB2BoundaryIntegration.cpp | 10 +++++----- .../domain/MPISimulationDomain.cpp | 14 +++----------- .../boundaries/boundaryProcessor.cpp | 5 +---- .../boundaries/boundaryProcessor.hpp | 1 + 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/Integration/AdamsBashforth2/processorAB2BoundaryIntegration.cpp b/src/Integration/AdamsBashforth2/processorAB2BoundaryIntegration.cpp index 494f9938..2fd9dbc1 100644 --- a/src/Integration/AdamsBashforth2/processorAB2BoundaryIntegration.cpp +++ b/src/Integration/AdamsBashforth2/processorAB2BoundaryIntegration.cpp @@ -50,16 +50,16 @@ bool pFlow::processorAB2BoundaryIntegration::correctPStruct(real dt, const realx #ifndef BoundaryModel1 if(this->isBoundaryMaster()) { - const uint32 thisIndex = thisBoundaryIndex(); + const uint32 thisIndex = thisBoundaryIndex(); const auto& AB2 = static_cast(Integration()); - const auto& dy1View = AB2.BoundaryField(thisIndex).neighborProcField().deviceView(); + const auto& dy1View = AB2.BoundaryField(thisIndex).neighborProcField().deviceView(); const auto& velView = vel.BoundaryField(thisIndex).neighborProcField().deviceView(); const auto& xposView = boundary().neighborProcPoints().deviceView(); - const rangeU32 aRange(0u, dy1View.size()); - return AB2Kernels::intAllActive( + const rangeU32 aRange(0u, dy1View.size()); + return AB2Kernels::intAllActive( "AB2Integration::correctPStruct."+this->boundaryName(), dt, - aRange, + aRange, xposView, velView, dy1View diff --git a/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp b/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp index 34890575..37ecb052 100644 --- a/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp +++ b/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp @@ -36,16 +36,9 @@ pFlow::MPI::MPISimulationDomain::MPISimulationDomain(systemControl& control) bool pFlow::MPI::MPISimulationDomain::createBoundaryDicts() { - if(!prepareBoundaryDicts()) - { - return false; - } - - auto& boundaries = this->subDict("boundaries"); + dictionary& boundaries = this->subDict("boundaries"); - - auto& thisBoundaries = this->subDict(thisBoundariesDictName()); - + dictionary& thisBoundaries = this->subDict(thisBoundariesDictName()); auto neighbors = findPlaneNeighbors(); @@ -133,8 +126,7 @@ bool pFlow::MPI::MPISimulationDomain::setThisDomain() fatalErrorInFunction<< "Failed to distributed domains"<