pointStructure with boundaries, construction tested

utilities/CMakeLists.txt

@@ -1,13 +1,13 @@
 
-add_subdirectory(checkPhasicFlow)
+#add_subdirectory(checkPhasicFlow)
 
-add_subdirectory(particlesPhasicFlow)
+#add_subdirectory(particlesPhasicFlow)
 
-add_subdirectory(geometryPhasicFlow)
+#add_subdirectory(geometryPhasicFlow)
 
-add_subdirectory(pFlowToVTK)
+#add_subdirectory(pFlowToVTK)
 
-add_subdirectory(Utilities)
+#add_subdirectory(Utilities)
 
-add_subdirectory(postprocessPhasicFlow)
+#add_subdirectory(postprocessPhasicFlow)
 

utilities/particlesPhasicFlow/empty/empty.cpp

@@ -23,10 +23,11 @@ Licence:
 
 
 pFlow::empty::empty(
+  systemControl& control,
 	const dictionary& dict
 )
 :
-	positionParticles(dict),
+	positionParticles(control, dict),
 	position_
 	(
 		maxNumberOfParticles_, 0, RESERVE()

utilities/particlesPhasicFlow/empty/empty.hpp

@@ -44,7 +44,9 @@ public:
 	// - type Info
 	TypeInfo("empty");
 
-	empty(const dictionary& dict);
+	empty(
+		systemControl& control,
+		const dictionary& dict);
 
 	// - add this class to vCtor selection table 
 	add_vCtor(
@@ -56,12 +58,12 @@ public:
 
 	//// - Methods 
 
-	virtual label numPoints()const
+	virtual uint64 numPoints()const
 	{
 		return 0;
 	}
 
-	virtual label size()const
+	virtual uint64 size()const
 	{
 		return 0;
 	}

utilities/particlesPhasicFlow/particlesPhasicFlow.cpp

@@ -24,7 +24,7 @@ Licence:
 #include "setFields.hpp"
 #include "systemControl.hpp"
 #include "commandLine.hpp"
-#include "readControlDict.hpp"
+//#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;

utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp

@@ -123,6 +123,7 @@ bool pFlow::positionOrdered::positionPointsOrdered()
 
 pFlow::positionOrdered::positionOrdered
 (
+	systemControl& control,
 	const dictionary& dict
 )
 :

utilities/particlesPhasicFlow/positionOrdered/positionOrdered.hpp

@@ -62,7 +62,9 @@ public:
 	// - type Info
 	TypeInfo("positionOrdered");
 
-	positionOrdered(const dictionary& dict);
+	positionOrdered(
+		systemControl& control,
+		const dictionary& dict);
 
 	// - add this class to vCtor selection table 
 	add_vCtor(

utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp

@@ -76,6 +76,7 @@ pFlow::realx3Vector pFlow::positionParticles::sortByMortonCode(realx3Vector& pos
 
 pFlow::positionParticles::positionParticles
 (
+	systemControl& control,
 	const dictionary& dict
 )
 {
@@ -95,6 +96,11 @@ pFlow::positionParticles::positionParticles
 	{
 		region_ = makeUnique<region<sphere>>(dict.subDict("sphere"));
 	}
+	else
+	{
+		region_ = makeUnique<region<box>>( control.domainDict().subDict("globalBox"));
+	}
+	
 }
 
 

utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp

@@ -24,6 +24,7 @@ Licence:
 #include "virtualConstructor.hpp"
 #include "Vectors.hpp"
 #include "dictionary.hpp"
+#include "systemControl.hpp"
 
 namespace pFlow
 {
@@ -118,7 +119,9 @@ public:
 	// - type Info
 	TypeInfo("positionParticles");
 
-	positionParticles(const dictionary& dict);
+	positionParticles(
+		systemControl& control, 
+		const dictionary& dict);
 
 	create_vCtor
 	(
@@ -132,9 +135,9 @@ public:
 
 	//// - Methods 
 
-	virtual label numPoints()const = 0;
+	virtual uint64 numPoints()const = 0;
 
-	virtual label size()const = 0;
+	virtual uint64 size()const = 0;
 
 	virtual real maxDiameter() const = 0;
 

utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp

@@ -158,10 +158,11 @@ bool pFlow::positionRandom::inCollision
 
 pFlow::positionRandom::positionRandom
 (
+	systemControl& control,
 	const dictionary& dict
 )
 :
-	positionParticles(dict),
+	positionParticles(control, dict),
 	prDict_
 	(  
 		dict.subDict("positionRandomInfo")

utilities/particlesPhasicFlow/positionRandom/positionRandom.hpp

@@ -66,7 +66,9 @@ public:
 	// - type Info
 	TypeInfo("positionRandom");
 
-	positionRandom(const dictionary& dict);
+	positionRandom(
+		systemControl& control,
+		const dictionary& dict);
 
 	// - add this class to vCtor selection table 
 	add_vCtor(
@@ -78,12 +80,12 @@ public:
 
 	//// - Methods 
 
-	virtual label numPoints()const
+	virtual uint64 numPoints()const
 	{
 		return position_.size();
 	}
 
-	virtual label size()const
+	virtual uint64 size()const
 	{
 		return position_.size();
 	}