Merge pull request #47 from PhasicFlow/multistepIntegration

AdamsMoulton4

src/Integration/AdamsMoulton3/AdamsMoulton3.C

@@ -113,7 +113,7 @@ bool pFlow::AdamsMoulton3::setInitialVals(
 	const realx3Vector& y)
 {
 	y0_.insertSetElement(newIndices, y);
-	//output<< "y0_  "<< y0_<<endl<<endl;
+	
 	return true;
 }
 

src/Integration/AdamsMoulton3/AdamsMoulton3.H

@@ -163,9 +163,9 @@ bool pFlow::AdamsMoulton3::intRange(
 					  static_cast<real>(5.0/12.0)*d_dy[i] 
 					+ static_cast<real>(8.0/12.0)*d_dy0[i] 
 					- static_cast<real>(1.0/12.0)*d_dy1[i]);
-				d_y[i]  = corrct_y;
-				d_y0[i] = corrct_y;
 				d_dy1[i]= d_dy0[i];
+				d_y0[i] = corrct_y;
+				d_y[i]  = corrct_y;
 			}
 		});
 	Kokkos::fence();

src/Integration/AdamsMoulton4/AdamsMoulton4.C

@@ -0,0 +1,194 @@
+/*------------------------------- phasicFlow ---------------------------------
+      O        C enter of
+     O O       E ngineering and
+    O   O      M ultiscale modeling of
+   OOOOOOO     F luid flow       
+------------------------------------------------------------------------------
+  Copyright (C): www.cemf.ir
+  email: hamid.r.norouzi AT gmail.com
+------------------------------------------------------------------------------  
+Licence:
+  This file is part of phasicFlow code. It is a free software for simulating 
+  granular and multiphase flows. You can redistribute it and/or modify it under
+  the terms of GNU General Public License v3 or any other later versions. 
+ 
+  phasicFlow is distributed to help others in their research in the field of 
+  granular and multiphase flows, but WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-----------------------------------------------------------------------------*/
+
+#include "AdamsMoulton4.H"
+
+//const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
+
+pFlow::AdamsMoulton4::AdamsMoulton4
+(
+	const word& baseName,
+	repository& owner,
+	const pointStructure& pStruct,
+	const word& method
+)
+:
+	integration(baseName, owner, pStruct, method),
+	y0_(
+		owner.emplaceObject<realx3PointField_D>(
+			objectFile(
+				groupNames(baseName,"y0"),
+				"",
+				objectFile::READ_IF_PRESENT,
+				objectFile::WRITE_ALWAYS),
+			pStruct,
+			zero3,
+			false
+			)
+		),
+	dy0_(
+		owner.emplaceObject<realx3PointField_D>(
+			objectFile(
+				groupNames(baseName,"dy0"),
+				"",
+				objectFile::READ_IF_PRESENT,
+				objectFile::WRITE_ALWAYS),
+			pStruct,
+			zero3
+			)
+		),
+	dy1_(
+		owner.emplaceObject<realx3PointField_D>(
+			objectFile(
+				groupNames(baseName,"dy1"),
+				"",
+				objectFile::READ_IF_PRESENT,
+				objectFile::WRITE_ALWAYS),
+			pStruct,
+			zero3
+			)
+		),
+	dy2_(
+		owner.emplaceObject<realx3PointField_D>(
+			objectFile(
+				groupNames(baseName,"dy2"),
+				"",
+				objectFile::READ_IF_PRESENT,
+				objectFile::WRITE_ALWAYS),
+			pStruct,
+			zero3
+			)
+		)
+{
+
+}
+
+bool pFlow::AdamsMoulton4::predict
+(
+	real dt,
+	realx3Vector_D& y,
+	realx3Vector_D& dy
+)
+{
+
+	if(this->pStruct().allActive())
+	{
+		return predictAll(dt, y, dy, this->pStruct().activeRange());
+	}
+	else
+	{
+		return predictRange(dt, y, dy, this->pStruct().activePointsMaskD());
+	}
+
+	return true;
+}
+
+bool pFlow::AdamsMoulton4::correct
+(
+	real dt,
+	realx3Vector_D& y,
+	realx3Vector_D& dy
+)
+{
+	if(this->pStruct().allActive())
+	{
+		return intAll(dt, y, dy, this->pStruct().activeRange());
+	}
+	else
+	{
+		return intRange(dt, y, dy, this->pStruct().activePointsMaskD());
+	}
+
+	return true;
+}
+
+bool pFlow::AdamsMoulton4::setInitialVals(
+	const int32IndexContainer& newIndices,
+	const realx3Vector& y)
+{
+	y0_.insertSetElement(newIndices, y);
+	
+	return true;
+}
+
+bool pFlow::AdamsMoulton4::predictAll(
+	real dt, 
+	realx3Vector_D& y, 
+	realx3Vector_D& dy, 
+	range activeRng)
+{
+
+	auto d_dy  = dy.deviceVectorAll();
+	auto d_y   = y.deviceVectorAll();
+
+	auto d_y0  = y0_.deviceVectorAll();
+	auto d_dy0 = dy0_.deviceVectorAll();
+	auto d_dy1 = dy1_.deviceVectorAll();
+	auto d_dy2 = dy2_.deviceVectorAll();
+
+	Kokkos::parallel_for(
+		"AdamsMoulton4::predict",
+		rpIntegration (activeRng.first, activeRng.second),
+		LAMBDA_HD(int32 i){
+			d_dy0[i] = d_dy[i];
+			d_y[i] = d_y0[i] + dt*(
+				  static_cast<real>(23.0 /12.0 ) * d_dy[i] 
+				- static_cast<real>(16.0 / 12.0) * d_dy1[i]
+				+ static_cast<real>( 5.0 / 12.0) * d_dy2[i]);
+		});
+	Kokkos::fence();
+
+	return true;	
+}
+
+bool pFlow::AdamsMoulton4::intAll(
+	real dt, 
+	realx3Vector_D& y, 
+	realx3Vector_D& dy, 
+	range activeRng)
+{
+
+	auto d_dy = dy.deviceVectorAll();
+	auto d_y  = y.deviceVectorAll();
+
+	auto d_dy0 = dy0_.deviceVectorAll();
+	auto d_y0  = y0_.deviceVectorAll();
+	auto d_dy1 = dy1_.deviceVectorAll();
+	auto d_dy2 = dy2_.deviceVectorAll();
+
+	Kokkos::parallel_for(
+		"AdamsMoulton4::correct",
+		rpIntegration (activeRng.first, activeRng.second),
+		LAMBDA_HD(int32 i){
+			auto corrct_y = d_y0[i] + dt*(
+				  static_cast<real>(9.0/24.0)*d_dy[i] 
+				+ static_cast<real>(19.0/24.0)*d_dy0[i] 
+				- static_cast<real>( 5.0/24.0)*d_dy1[i]
+				+ static_cast<real>( 1.0/24.0)*d_dy2[i]);
+			
+			d_dy2[i]= d_dy1[i];
+			d_dy1[i]= d_dy0[i];
+			d_y0[i] = corrct_y;
+			d_y[i]  = corrct_y;
+		});
+	Kokkos::fence();
+	
+	return true;	
+}

src/Integration/AdamsMoulton4/AdamsMoulton4.H

@@ -0,0 +1,185 @@
+/*------------------------------- phasicFlow ---------------------------------
+      O        C enter of
+     O O       E ngineering and
+    O   O      M ultiscale modeling of
+   OOOOOOO     F luid flow       
+------------------------------------------------------------------------------
+  Copyright (C): www.cemf.ir
+  email: hamid.r.norouzi AT gmail.com
+------------------------------------------------------------------------------  
+Licence:
+  This file is part of phasicFlow code. It is a free software for simulating 
+  granular and multiphase flows. You can redistribute it and/or modify it under
+  the terms of GNU General Public License v3 or any other later versions. 
+ 
+  phasicFlow is distributed to help others in their research in the field of 
+  granular and multiphase flows, but WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+-----------------------------------------------------------------------------*/
+
+#ifndef __AdamsMoulton4_H__
+#define __AdamsMoulton4_H__
+
+
+#include "integration.H"
+#include "pointFields.H"
+
+namespace pFlow
+{
+
+
+class AdamsMoulton4
+:
+	public integration
+{
+protected:
+
+	realx3PointField_D& y0_;
+
+	realx3PointField_D& dy0_;
+
+	realx3PointField_D& dy1_;
+
+	realx3PointField_D& dy2_;
+
+	using rpIntegration = Kokkos::RangePolicy<
+			DefaultExecutionSpace,
+			Kokkos::Schedule<Kokkos::Static>,
+			Kokkos::IndexType<int32>
+			>;
+public:
+
+	// type info
+	TypeName("AdamsMoulton4");
+
+	//// - Constructors
+		AdamsMoulton4(
+			const word& baseName,
+			repository& owner,
+			const pointStructure& pStruct,
+			const word& method);
+
+		virtual ~AdamsMoulton4()=default;
+
+		// - add a virtual constructor 
+		add_vCtor(
+			integration,
+			AdamsMoulton4,
+			word);
+
+
+	//// - Methods
+		bool predict(real dt, realx3Vector_D& y, realx3Vector_D& dy) override;
+
+		bool correct(real dt, realx3Vector_D& y, realx3Vector_D& dy) override;
+
+		bool setInitialVals(
+			const int32IndexContainer& newIndices,
+			const realx3Vector& y) override;
+
+		bool needSetInitialVals()const override
+		{
+			return true;
+		}
+
+		uniquePtr<integration> clone()const override
+		{
+			return makeUnique<AdamsMoulton4>(*this);
+		}
+
+		bool predictAll(real dt, realx3Vector_D& y, realx3Vector_D& dy, range activeRng);
+
+		template<typename activeFunctor>
+		bool predictRange(real dt, realx3Vector_D& y, realx3Vector_D& dy, activeFunctor activeP);
+
+		bool intAll(real dt, realx3Vector_D& y, realx3Vector_D& dy, range activeRng);
+
+		template<typename activeFunctor>
+		bool intRange(real dt, realx3Vector_D& y, realx3Vector_D& dy, activeFunctor activeP );
+
+};
+
+
+template<typename activeFunctor>
+bool AdamsMoulton4::predictRange(
+	real dt, 
+	realx3Vector_D& y,
+	realx3Vector_D& dy,
+	activeFunctor activeP )
+{
+	auto d_dy = dy.deviceVectorAll();
+	auto d_y  = y.deviceVectorAll();
+
+	auto d_y0 = y0_.deviceVectorAll();
+	auto d_dy0 = dy0_.deviceVectorAll();
+	auto d_dy1 = dy1_.deviceVectorAll();
+	auto d_dy2 = dy2_.deviceVectorAll();
+	
+	auto activeRng = activeP.activeRange();
+
+	Kokkos::parallel_for(
+		"AdamsMoulton4::predictRange",
+		rpIntegration (activeRng.first, activeRng.second),
+		LAMBDA_HD(int32 i){
+			if(activeP(i))
+			{
+				d_dy0[i] = d_dy[i];
+				d_y[i] = d_y0[i] + dt*(
+				  static_cast<real>(23.0 /12.0 ) * d_dy[i] 
+				- static_cast<real>(16.0 / 12.0) * d_dy1[i]
+				+ static_cast<real>( 5.0 / 12.0) * d_dy2[i]);
+			}
+		});
+	Kokkos::fence();
+
+	return true;
+
+}
+
+
+template<typename activeFunctor>
+bool pFlow::AdamsMoulton4::intRange(
+	real dt, 
+	realx3Vector_D& y,
+	realx3Vector_D& dy,
+	activeFunctor activeP )
+{
+
+	auto d_dy = dy.deviceVectorAll();
+	auto d_y  = y.deviceVectorAll();
+
+	auto d_dy0 = dy0_.deviceVectorAll();
+	auto d_y0  = y0_.deviceVectorAll();
+	auto d_dy1 = dy1_.deviceVectorAll();
+	auto d_dy2 = dy2_.deviceVectorAll();
+
+	auto activeRng = activeP.activeRange();
+
+	Kokkos::parallel_for(
+		"AdamsMoulton4::correct",
+		rpIntegration (activeRng.first, activeRng.second),
+		LAMBDA_HD(int32 i){
+			if( activeP(i))
+			{
+				auto corrct_y = d_y0[i] + dt*(
+					  static_cast<real>(9.0/24.0)*d_dy[i] 
+					+ static_cast<real>(19.0/24.0)*d_dy0[i] 
+					- static_cast<real>( 5.0/24.0)*d_dy1[i]
+					+ static_cast<real>( 1.0/24.0)*d_dy2[i]);
+				
+				d_dy2[i]= d_dy1[i];
+				d_dy1[i]= d_dy0[i];
+				d_y0[i] = corrct_y;
+				d_y[i]  = corrct_y;
+			}
+		});
+	Kokkos::fence();
+
+
+	return true;
+}
+
+} // pFlow
+
+#endif //__integration_H__

src/Integration/CMakeLists.txt

@@ -6,6 +6,7 @@ AdamsBashforth4/AdamsBashforth4.C
 AdamsBashforth3/AdamsBashforth3.C
 AdamsBashforth2/AdamsBashforth2.C
 AdamsMoulton3/AdamsMoulton3.C
+AdamsMoulton4/AdamsMoulton4.C
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)