Merge pull request #66 from PhasicFlow/vibratingWall

Vibrating wall

utilities/particlesPhasicFlow/empty/empty.cpp

@@ -29,8 +29,7 @@ pFlow::empty::empty(
 	positionParticles(dict),
 	position_
 	(
-		maxNumberOfParticles_, RESERVE()
+		maxNumberOfParticles_, 0, RESERVE()
 	)
 {
-	position_.clear();
 }

utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp

@@ -98,9 +98,23 @@ pFlow::positionParticles::positionParticles
 }
 
 
+pFlow::realx3Vector pFlow::positionParticles::getFinalPosition()
+{
+	if(mortonSorting_)
+	{
+		return sortByMortonCode(position());
+	}
+	else
+	{
+		realx3Vector vec(position().capacity(), RESERVE());
+		vec.assign( position().begin(), position().end());
 		
+		return std::move(vec);
+	}
+}
 
-pFlow::uniquePtr<pFlow::positionParticles> pFlow::positionParticles::create(const dictionary & dict)
+pFlow::uniquePtr<pFlow::positionParticles> 
+	pFlow::positionParticles::create(const dictionary & dict)
 {
 
 	word method = dict.getVal<word>("method");

utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp

@@ -145,21 +145,11 @@ public:
 	// - access to position 
 	virtual realx3Vector& position() = 0;
 	
-	virtual realx3Vector getFinalPosition()
+	virtual realx3Vector getFinalPosition();
-	{
-		if(mortonSorting_)
-		{
-			return sortByMortonCode(position());
-		}
-		else
-		{
-			return position();
-		}
-	}
-
 
 	static
 	uniquePtr<positionParticles> create(const dictionary & dict);
+	
 };