minor changes after MPI merge

hamidrezanorouzi · hamidrezanorouzi · commit e8ee35791f82 · 2025-05-19T13:53:34.000+03:30
diff --git a/src/Particles/SphereParticles/processorBoundarySphereParticles.cpp b/src/Particles/SphereParticles/processorBoundarySphereParticles.cpp
@@ -26,7 +26,7 @@ bool pFlow::processorBoundarySphereParticles::acceleration(const timeInfo &ti, c
         auto I = Particles().I().BoundaryField(thisIndex).neighborProcField().deviceView();
         auto cf = Particles().contactForce().BoundaryField(thisIndex).neighborProcField().deviceView();
         auto ct = Particles().contactTorque().BoundaryField(thisIndex).neighborProcField().deviceView();
-        auto acc = Particles().accelertion().BoundaryField(thisIndex).neighborProcField().deviceView();
+        auto acc = Particles().acceleration().BoundaryField(thisIndex).neighborProcField().deviceView();
         auto rAcc = Particles().rAcceleration().BoundaryField(thisIndex).neighborProcField().deviceView();
 
         Kokkos::parallel_for(
diff --git a/src/phasicFlow/MPIParallelization/dataIOMPI/dataIOMPIs.cpp b/src/phasicFlow/MPIParallelization/dataIOMPI/dataIOMPIs.cpp
@@ -16,7 +16,7 @@ template class pFlow::MPI::dataIOMPI<pFlow::uint32x3>;
 
 template class pFlow::MPI::dataIOMPI<pFlow::uint64>;
 
-template class pFlow::MPI::dataIOMPI<pFlow::size_t>;
+//template class pFlow::MPI::dataIOMPI<pFlow::size_t>;
 
 template class pFlow::MPI::dataIOMPI<pFlow::real>;
 
diff --git a/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp b/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp
@@ -24,9 +24,9 @@
 #include "scatteredMasterDistribute.hpp"
 #include "scatteredMasterDistributeChar.hpp"
 
-pFlow::MPI::MPISimulationDomain::MPISimulationDomain(systemControl& control)
+pFlow::MPI::MPISimulationDomain::MPISimulationDomain(systemControl& control, real maxBSphere)
 :
-    simulationDomain(control),
+    simulationDomain(control, maxBSphere),
     communication_(pFlowProcessors()),
     subDomainsAll_(pFlowProcessors()),
     numPointsAll_(pFlowProcessors()),
diff --git a/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.hpp b/src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.hpp
@@ -61,7 +61,7 @@ class MPISimulationDomain : public simulationDomain
 
 	TypeInfo("simulationDomain<MPI>");
 
-	explicit MPISimulationDomain(systemControl& control);
+	explicit MPISimulationDomain(systemControl& control, real maxBSphere);
 
 	~MPISimulationDomain() final = default;
 
diff --git a/src/phasicFlow/MPIParallelization/pointField/processorBoundaryField.cpp b/src/phasicFlow/MPIParallelization/pointField/processorBoundaryField.cpp
@@ -47,7 +47,7 @@ pFlow::MPI::processorBoundaryField<T, MemorySpace>::updateBoundary(
 )
 {
 #ifndef BoundaryModel1
-	if(!this->boundary().performBoundarytUpdate())
+	if(!this->boundary().performBoundaryUpdate())
 		return true;
 #endif
 
@@ -128,21 +128,19 @@ const typename pFlow::MPI::processorBoundaryField<T, MemorySpace>::
 
 template<class T, class MemorySpace>
 bool pFlow::MPI::processorBoundaryField<T, MemorySpace>::hearChanges(
-	real t,
-	real dt,
-	uint32 iter,
+	const timeInfo & ti,
 	const message& msg, 
 	const anyList& varList
 )
 {
-	BoundaryFieldType::hearChanges(t,dt,iter, msg,varList);
+	
 	if(msg.equivalentTo(message::BNDR_PROC_SIZE_CHANGED))
 	{
-		auto newProcSize = varList.getObject<uint32>("size");
+		auto newProcSize = varList.getObject<uint32>(
+			message::eventName(message::BNDR_PROC_SIZE_CHANGED));
 		neighborProcField_.resize(newProcSize);
 	}
-
-	if(msg.equivalentTo(message::BNDR_PROCTRANSFER_SEND))
+	else if(msg.equivalentTo(message::BNDR_PROCTRANSFER_SEND))
 	{
 		const auto& indices = varList.getObject<uint32Vector_D>(
 			message::eventName(message::BNDR_PROCTRANSFER_SEND)
@@ -169,7 +167,6 @@ bool pFlow::MPI::processorBoundaryField<T, MemorySpace>::hearChanges(
 		    thisFieldInNeighbor_.sendData(pFlowProcessors(),transferData);
         }
 
-		
 	}
 	else if(msg.equivalentTo(message::BNDR_PROCTRANSFER_RECIEVE))
 	{
@@ -182,30 +179,38 @@ bool pFlow::MPI::processorBoundaryField<T, MemorySpace>::hearChanges(
 	{
 		
 		uint32 numRecieved = neighborProcField_.waitBufferForUse();
-
-		if(msg.equivalentTo(message::CAP_CHANGED))
+		if(numRecieved == 0u)
 		{
-			auto newCap = varList.getObject<uint32>(
-				message::eventName(message::CAP_CHANGED));
-			this->internal().field().reserve(newCap);
-
+			return true;
 		}
-		if(msg.equivalentTo(message::SIZE_CHANGED))
+
+		if(msg.equivalentTo(message::RANGE_CHANGED))
 		{
-			auto newSize = varList.getObject<uint32>(
-				message::eventName(message::SIZE_CHANGED));
-			this->internal().field().resize(newSize);
+			auto newRange = varList.getObject<rangeU32>(
+				message::eventName(message::RANGE_CHANGED));
+			this->internal().field().resize(newRange.end());
 		}
 		
-		const auto& indices = varList.getObject<uint32IndexContainer>(
-			message::eventName(message::ITEM_INSERT));
-		
-		this->internal().field().insertSetElement(indices, neighborProcField_.buffer().deviceView());
-
-		return true;
+		if(msg.equivalentTo(message::ITEMS_INSERT))
+		{
+			const auto& indices = varList.getObject<uint32IndexContainer>(
+				message::eventName(message::ITEMS_INSERT));	
+			
+			this->internal().field().insertSetElement(
+				indices, 
+				neighborProcField_.buffer().deviceView());
+		}
+	}
+	else
+	{
+		if(!BoundaryFieldType::hearChanges(ti, msg,varList) )
+		{
+			return false;
+		}
 	}
 
 	return true;
+	
 }
 template <class T, class MemorySpace>
 void pFlow::MPI::processorBoundaryField<T, MemorySpace>::sendBackData() const
diff --git a/src/phasicFlow/MPIParallelization/pointField/processorBoundaryField.hpp b/src/phasicFlow/MPIParallelization/pointField/processorBoundaryField.hpp
@@ -91,9 +91,7 @@ class processorBoundaryField
 	}
 
 	bool hearChanges(
-		real t,
-		real dt,
-		uint32 iter,
+		const timeInfo & ti,
 		const message& msg, 
     	const anyList& varList
 	) override;
diff --git a/src/phasicFlow/MPIParallelization/pointStructure/boundaries/boundaryProcessor.cpp b/src/phasicFlow/MPIParallelization/pointStructure/boundaries/boundaryProcessor.cpp
@@ -83,15 +83,15 @@ pFlow::MPI::boundaryProcessor::beforeIteration(
 	else if(step == 2 )
 	{
 
-#ifdef BoundaryModel1
-	callAgain = true;
-#else
-	if(!performBoundarytUpdate())
-	{
-		callAgain = false;
-		return true;
-	}
-#endif
+    #ifdef BoundaryModel1
+        callAgain = true;
+    #else
+        if(!performBoundaryUpdate())
+        {
+            callAgain = false;
+            return true;
+        }
+    #endif
 
 	thisNumPoints_ = size();
 
@@ -136,7 +136,7 @@ pFlow::MPI::boundaryProcessor::beforeIteration(
 
 		varList.emplaceBack(msg.addAndName(message::BNDR_PROC_SIZE_CHANGED), neighborProcNumPoints_);
 
-		if( !notify(ti.iter(), ti.t(), ti.dt(), msg, varList) )
+		if( !notify(ti, msg, varList) )
 		{
 			fatalErrorInFunction;
 			callAgain = false;
@@ -343,8 +343,9 @@ bool pFlow::MPI::boundaryProcessor::transferData(
 		neighborProcPoints_.waitBufferForUse();
 		internal().insertPointsOnly(neighborProcPoints_.buffer(), msg, varList);
 		
-		const auto& indices = varList.getObject<uint32IndexContainer>(message::eventName(message::ITEM_INSERT));
+		const auto& indices = varList.getObject<uint32IndexContainer>(message::eventName(message::ITEMS_INSERT));
 		
+        // creates a view (does not copy data)
 		auto indView = deviceViewType1D<uint32>(indices.deviceView().data(), indices.deviceView().size());
 		
 		uint32Vector_D newIndices("newIndices", indView);
@@ -356,7 +357,7 @@ bool pFlow::MPI::boundaryProcessor::transferData(
 			return false;
 		}
 
-		const auto ti = internal().time().TimeInfo();
+		const auto& ti = internal().time().TimeInfo();
 		if(!notify(ti, msg, varList))
 		{
 			fatalErrorInFunction;
diff --git a/src/phasicFlow/containers/pointField/boundaryField/boundaryField/boundaryField.hpp b/src/phasicFlow/containers/pointField/boundaryField/boundaryField/boundaryField.hpp
@@ -114,8 +114,8 @@ class boundaryField
 			return true;
 		}
 
-		fatalErrorInFunction<<"Event"<< msg.eventNames()<<"with code "<< msg <<
-		" is not handled in boundaryField."<<endl;
+		fatalErrorInFunction<<"Event "<< msg.eventNames()<<" with code "<< msg <<
+		" is not handled in boundaryField "<< name()<<endl;
 		return false;
 	}
 
diff --git a/src/phasicFlow/containers/pointField/internalField/internalField.cpp b/src/phasicFlow/containers/pointField/internalField/internalField.cpp
@@ -223,7 +223,7 @@ bool pFlow::internalField<T, MemorySpace>:: hearChanges
 	else
 	{
 		fatalErrorInFunction<<"hear changes in internal field is not processing "<< 
-		message::eventName(message::RANGE_CHANGED)<<
+		msg.eventNames()<<
 		" event with message code "<< msg<<endl;
 		return false;
 	}
diff --git a/src/phasicFlow/streams/dataIO/dataIORegulars.cpp b/src/phasicFlow/streams/dataIO/dataIORegulars.cpp
@@ -25,8 +25,8 @@ template class pFlow::dataIORegular<pFlow::uint32x3>;
 template class pFlow::dataIO<pFlow::uint64>;
 template class pFlow::dataIORegular<pFlow::uint64>;
 
-template class pFlow::dataIO<size_t>;
-template class pFlow::dataIORegular<size_t>;
+//template class pFlow::dataIO<size_t>;
+//template class pFlow::dataIORegular<size_t>;
 
 template class pFlow::dataIO<pFlow::real>;
 template class pFlow::dataIORegular<pFlow::real>;
diff --git a/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.hpp b/src/phasicFlow/structuredData/boundaries/boundaryBase/boundaryBase.hpp
@@ -246,7 +246,7 @@ class boundaryBase
 
 	/// Is this iter the right time for updating bounday list
 	inline
-	bool performBoundarytUpdate()const
+	bool performBoundaryUpdate()const
 	{
 		return updateTime_;
 	}
diff --git a/src/phasicFlow/structuredData/boundaries/boundaryExit/boundaryExit.cpp b/src/phasicFlow/structuredData/boundaries/boundaryExit/boundaryExit.cpp
@@ -60,7 +60,7 @@ bool pFlow::boundaryExit::beforeIteration
 	{
 		callAgain = false;
 
-		if( !performBoundarytUpdate())
+		if( !performBoundaryUpdate())
 		{
 			return true;
 		}
diff --git a/src/phasicFlow/structuredData/boundaries/boundaryPeriodic/boundaryPeriodic.cpp b/src/phasicFlow/structuredData/boundaries/boundaryPeriodic/boundaryPeriodic.cpp
@@ -60,7 +60,7 @@ bool pFlow::boundaryPeriodic::beforeIteration(
 		return true;
 	}
 	//output<<this->thisBoundaryIndex()<<"  ->"<<ti.iter()<<" update called\n";
-	if(!performBoundarytUpdate())
+	if(!performBoundaryUpdate())
 	{
 		return true;
 	}
diff --git a/thirdParty/Zoltan/buildlib b/thirdParty/Zoltan/buildlib
@@ -1,18 +1,33 @@
 #!/bin/bash
+cd ${0%/*} || exit 1    # Run from this directory
 
-rm -rf build/ include/ lib/
-mkdir build
+# Source the configurations - if there's a ./configurations file
+[ -f ./configurations ] && source ./configurations
 
+# Set environment variables to ensure shared library creation
+export CFLAGS="-fPIC"
+export CXXFLAGS="-fPIC"
+export FCFLAGS="-fPIC"
+
+# Create build directory
+mkdir -p build
 cd build
 
-../configure \
---prefix=$HOME/PhasicFlow/phasicFlow-v-1.0/thirdParty/Zoltan/ \
---with-gnumake \
---with-id-type=uint
---disable-tests
---disable-examples
+# Run configure with shared library options
+echo "Running configure with options to build shared library..."
+../configure --prefix=$PWD/.. --enable-shared --disable-static
 
-make everything -j4
+# Run make and install
+echo "Building and installing Zoltan..."
 make install
 
-cd ../
+# Convert static to shared library if static library exists and shared doesn't
+echo "Checking for static library and converting to shared if needed..."
+if [ -f "$PWD/../lib/libzoltan.a" ] && [ ! -f "$PWD/../lib/libzoltan.so" ]; then
+    echo "Converting static library to shared library..."
+    cd $PWD/../lib
+    gcc -shared -o libzoltan.so -Wl,--whole-archive libzoltan.a -Wl,--no-whole-archive
+    echo "Shared library created as libzoltan.so"
+fi
+
+echo "Build completed"

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ class boundaryField`
`114`	`114`	`return true;`
`115`	`115`	`}`
`116`	`116`
`117`		`- fatalErrorInFunction<<"Event"<< msg.eventNames()<<"with code "<< msg <<`
`118`		`- " is not handled in boundaryField."<<endl;`
	`117`	`+ fatalErrorInFunction<<"Event "<< msg.eventNames()<<" with code "<< msg <<`
	`118`	`+ " is not handled in boundaryField "<< name()<<endl;`
`119`	`119`	`return false;`
`120`	`120`	`}`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ bool pFlow::internalField<T, MemorySpace>:: hearChanges`
`223`	`223`	`else`
`224`	`224`	`{`
`225`	`225`	`fatalErrorInFunction<<"hear changes in internal field is not processing "<<`
`226`		`- message::eventName(message::RANGE_CHANGED)<<`
	`226`	`+ msg.eventNames()<<`
`227`	`227`	`" event with message code "<< msg<<endl;`
`228`	`228`	`return false;`
`229`	`229`	`}`