modify for coupling-cpp and hpp

utilities/particlesPhasicFlow/CMakeLists.txt

@@ -1,10 +1,10 @@
 
 set(source_files
-particlesPhasicFlow.C
-positionParticles/positionParticles.C 
-positionOrdered/positionOrdered.C 
-positionRandom/positionRandom.C
-empty/empty.C
+particlesPhasicFlow.cpp
+positionParticles/positionParticles.cpp 
+positionOrdered/positionOrdered.cpp 
+positionRandom/positionRandom.cpp
+empty/empty.cpp
 )
 set(link_lib phasicFlow Kokkos::kokkos Interaction Utilities)
 

utilities/particlesPhasicFlow/empty/empty.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "empty.H"
+#include "empty.hpp"
 
 
 

utilities/particlesPhasicFlow/empty/empty.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __empty_H__
-#define __empty_H__
+#ifndef __empty_hpp__
+#define __empty_hpp__
 
-#include "positionParticles.H"
-#include "box.H"
+#include "positionParticles.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {
@@ -42,7 +42,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("empty");
+	TypeInfo("empty");
 
 	empty(const dictionary& dict);
 
@@ -91,4 +91,4 @@ public:
 
 
 
-#endif // __empety_H__
+#endif // __empety_hpp__

utilities/particlesPhasicFlow/particlesPhasicFlow.cpp

@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "positionParticles.H"
-#include "pointStructure.H"
-#include "setFields.H"
-#include "systemControl.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "positionParticles.hpp"
+#include "pointStructure.hpp"
+#include "setFields.hpp"
+#include "systemControl.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;
@@ -79,7 +79,7 @@ int main( int argc, char* argv[] )
 	}	
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 
 	auto objCPDict = IOobject::make<dictionary>
 	(
@@ -195,7 +195,7 @@ int main( int argc, char* argv[] )
 
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 	return 0;
 } 

utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "positionOrdered.H"
-#include "error.H"
+#include "positionOrdered.hpp"
+#include "error.hpp"
 
 
-#include "streams.H"
+#include "streams.hpp"
 
 
 bool pFlow::positionOrdered::findAxisIndex()

utilities/particlesPhasicFlow/positionOrdered/positionOrdered.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __positionOrdered_H__
-#define __positionOrdered_H__
+#ifndef __positionOrdered_hpp__
+#define __positionOrdered_hpp__
 
-#include "positionParticles.H"
+#include "positionParticles.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionOrdered");
+	TypeInfo("positionOrdered");
 
 	positionOrdered(const dictionary& dict);
 
@@ -109,4 +109,4 @@ public:
 
 
 
-#endif // __positionOrdered_H__
+#endif // __positionOrdered_hpp__

utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp

@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "positionParticles.H"
-#include "box.H"
-#include "cylinder.H"
-#include "sphere.H"
-#include "cells.H"
-#include "contactSearchFunctions.H"
+#include "positionParticles.hpp"
+#include "box.hpp"
+#include "cylinder.hpp"
+#include "sphere.hpp"
+#include "cells.hpp"
+#include "contactSearchFunctions.hpp"
 
-#include "streams.H"
+#include "streams.hpp"
 
 
 pFlow::realx3Vector pFlow::positionParticles::sortByMortonCode(realx3Vector& position)const

utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __positionParticles_H__
-#define __positionParticles_H__
+#ifndef __positionParticles_hpp__
+#define __positionParticles_hpp__
 
-#include "virtualConstructor.H"
-#include "Vectors.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "Vectors.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -116,7 +116,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionParticles");
+	TypeInfo("positionParticles");
 
 	positionParticles(const dictionary& dict);
 
@@ -167,4 +167,4 @@ public:
 
 
 
-#endif // __positionParticles_H__
+#endif // __positionParticles_hpp__

utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp

@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "positionRandom.H"
-#include "uniformRandomReal.H"
-#include "NBSLevel0.H"
-#include "unsortedPairs.H"
-#include "box.H"
+#include "positionRandom.hpp"
+#include "uniformRandomReal.hpp"
+#include "NBSLevel0.hpp"
+#include "unsortedPairs.hpp"
+#include "box.hpp"
 
 
 

utilities/particlesPhasicFlow/positionRandom/positionRandom.hpp

@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __positionOrdered_H__
-#define __positionOrdered_H__
+#ifndef __positionOrdered_hpp__
+#define __positionOrdered_hpp__
 
-#include "positionParticles.H"
-#include "VectorSingles.H"
-#include "VectorDuals.H"
+#include "positionParticles.hpp"
+#include "VectorSingles.hpp"
+#include "VectorDuals.hpp"
 
 
 namespace pFlow
@@ -64,7 +64,7 @@ protected:
 public:
 
 	// - type Info
-	TypeName("positionRandom");
+	TypeInfo("positionRandom");
 
 	positionRandom(const dictionary& dict);
 
@@ -115,4 +115,4 @@ public:
 
 
 
-#endif // __positionOrdered_H__
+#endif // __positionOrdered_hpp__

utilities/particlesPhasicFlow/setFields.hpp

@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __setFields_H__
-#define __setFields_H__
+#ifndef __setFields_hpp__
+#define __setFields_hpp__
 
-#include "pStructSelector.H"
-#include "pointFields.H"
-#include "setFieldList.H"
-#include "systemControl.H"
+#include "pStructSelector.hpp"
+#include "pointFields.hpp"
+#include "setFieldList.hpp"
+#include "systemControl.hpp"
 
 namespace pFlow
 {
@@ -53,4 +53,4 @@ bool applySelector(systemControl& control, const pointStructure& pStruct, const
 
 } // pFlow
 
-#endif //__setFields_H__
+#endif //__setFields_hpp__