modify for coupling-cpp and hpp

src/Particles/CMakeLists.txt

@@ -1,14 +1,14 @@
 
 set(SourceFiles 
-dynamicPointStructure/dynamicPointStructure.C
-particles/particles.C
-SphereParticles/sphereShape/sphereShape.C
-SphereParticles/sphereParticles/sphereParticles.C
-Insertion/shapeMixture/shapeMixture.C
-Insertion/insertion/insertion.C
-Insertion/Insertion/Insertions.C
-Insertion/insertionRegion/insertionRegion.C
-Insertion/insertionRegion/timeFlowControl.C
+dynamicPointStructure/dynamicPointStructure.cpp
+particles/particles.cpp
+SphereParticles/sphereShape/sphereShape.cpp
+SphereParticles/sphereParticles/sphereParticles.cpp
+Insertion/shapeMixture/shapeMixture.cpp
+Insertion/insertion/insertion.cpp
+Insertion/Insertion/Insertions.cpp
+Insertion/insertionRegion/insertionRegion.cpp
+Insertion/insertionRegion/timeFlowControl.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Integration Property)

src/Particles/Insertion/Insertion/Insertion.hpp

@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Insertion_H__
-#define __Insertion_H__
+#ifndef __Insertion_hpp__
+#define __Insertion_hpp__
 
 
-#include "insertion.H"
-#include "ListPtr.H"
-#include "InsertionRegion.H"
-#include "particles.H"
+#include "insertion.hpp"
+#include "ListPtr.hpp"
+#include "InsertionRegion.hpp"
+#include "particles.hpp"
 
 namespace pFlow
 {
@@ -50,7 +50,7 @@ protected:
 
 public:
 
-	TypeNameTemplateNV("Insertion",ShapeType);
+	TypeInfoTemplateNV("Insertion",ShapeType);
 
 	Insertion(particles& prtcl, const ShapeType& shapes);
 
@@ -65,6 +65,6 @@ public:
 
 }
 
-#include "Insertion.C"
+#include "Insertion.cpp"
 
 #endif

src/Particles/Insertion/Insertion/Insertions.cpp

@@ -19,6 +19,6 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "Insertions.H"
+#include "Insertions.hpp"
 
 template class pFlow::Insertion<pFlow::sphereShape>;

src/Particles/Insertion/Insertion/Insertions.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __Insertions_H__
-#define __Insertions_H__
+#ifndef __Insertions_hpp__
+#define __Insertions_hpp__
 
 
-#include "Insertion.H"
-#include "sphereShape.H"
+#include "Insertion.hpp"
+#include "sphereShape.hpp"
 
 namespace pFlow
 {

src/Particles/Insertion/InsertionRegion/InsertionRegion.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __InsertionRegion_H__
-#define __InsertionRegion_H__
+#ifndef __InsertionRegion_hpp__
+#define __InsertionRegion_hpp__
 
 
-#include "insertionRegion.H"
-#include "dictionary.H"
+#include "insertionRegion.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -46,7 +46,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameTemplateNV("insertionRegion", ShapeType);
+	TypeInfoTemplateNV("insertionRegion", ShapeType);
 
 	InsertionRegion(const dictionary& dict, const ShapeType& shapes);
 
@@ -90,6 +90,6 @@ public:
 } // pFlow
 
 
-#include "InsertionRegion.C"
+#include "InsertionRegion.cpp"
 
 #endif

src/Particles/Insertion/insertion/insertion.cpp

@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "particles.H"
-#include "dictionary.H"
-#include "insertion.H"
-#include "streams.H"
+#include "particles.hpp"
+#include "dictionary.hpp"
+#include "insertion.hpp"
+#include "streams.hpp"
 
 bool pFlow::insertion::readInsertionDict
 (

src/Particles/Insertion/insertion/insertion.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __insertion_H__
-#define __insertion_H__
+#ifndef __insertion_hpp__
+#define __insertion_hpp__
 
 
-#include "streams.H"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -50,7 +50,7 @@ protected:
 public:
 
 	// type info
-	TypeName("insertion");
+	TypeInfo("insertion");
 
 	insertion(particles& prtcl);
 

src/Particles/Insertion/insertionRegion/insertionRegion.cpp

@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "insertionRegion.H"
-#include "dictionary.H"
+#include "insertionRegion.hpp"
+#include "dictionary.hpp"
 
 bool pFlow::insertionRegion::readInsertionRegion
 (

src/Particles/Insertion/insertionRegion/insertionRegion.hpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __insertionRegion_H__
-#define __insertionRegion_H__
+#ifndef __insertionRegion_hpp__
+#define __insertionRegion_hpp__
 
-#include "timeFlowControl.H"
-#include "shapeMixture.H"
-#include "peakableRegions.H"
-#include "setFieldList.H"
+#include "timeFlowControl.hpp"
+#include "shapeMixture.hpp"
+#include "peakableRegions.hpp"
+#include "setFieldList.hpp"
 
 namespace pFlow
 {
@@ -60,7 +60,7 @@ protected:
 
 public:
 
-	TypeNameNV("insertionRegion");
+	TypeInfoNV("insertionRegion");
 
 	//// - Constructors
 
@@ -111,4 +111,4 @@ public:
 
 } //pFlow
 
-#endif //__insertionRegion_H__
+#endif //__insertionRegion_hpp__

src/Particles/Insertion/insertionRegion/timeFlowControl.cpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "timeFlowControl.H"
-#include "dictionary.H"
+#include "timeFlowControl.hpp"
+#include "dictionary.hpp"
 
 bool pFlow::timeFlowControl::readTimeFlowControl
 (

src/Particles/Insertion/insertionRegion/timeFlowControl.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __timeFlowControl_H__ 
-#define __timeFlowControl_H__ 
+#ifndef __timeFlowControl_hpp__ 
+#define __timeFlowControl_hpp__ 
 
-#include "types.H"
-#include "streams.H"
+#include "types.hpp"
+#include "streams.hpp"
 
 namespace pFlow
 {
@@ -95,4 +95,4 @@ public:
 
 }
 
-#endif //__timeFlowControl_H__ 
+#endif //__timeFlowControl_hpp__ 

src/Particles/Insertion/shapeMixture/shapeMixture.cpp

@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "shapeMixture.H"
-#include "dictionary.H"
+#include "shapeMixture.hpp"
+#include "dictionary.hpp"
 
 
 pFlow::shapeMixture::shapeMixture

src/Particles/Insertion/shapeMixture/shapeMixture.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __shapeMixture_H__
-#define __shapeMixture_H__
+#ifndef __shapeMixture_hpp__
+#define __shapeMixture_hpp__
 
 
-#include "Vectors.H"
+#include "Vectors.hpp"
 
 namespace pFlow
 {
@@ -47,7 +47,7 @@ protected:
 public:
 
 	//- type Info
-	TypeNameNV("shapeMixture");
+	TypeInfoNV("shapeMixture");
 
 	//// - constrcutores 
 		
@@ -101,4 +101,4 @@ public:
 
 } // pFlow
 
-#endif //__shapeMixture_H__
+#endif //__shapeMixture_hpp__

src/Particles/SphereParticles/sphereParticles/sphereParticles.cpp

@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereParticles.H"
-#include "setFieldList.H"
-#include "sphereParticlesKernels.H"
+#include "sphereParticles.hpp"
+#include "setFieldList.hpp"
+#include "sphereParticlesKernels.hpp"
 
 pFlow::uniquePtr<pFlow::List<pFlow::eventObserver*>> 
 pFlow::sphereParticles::getFieldObjectList()const

src/Particles/SphereParticles/sphereParticles/sphereParticles.hpp

@@ -27,14 +27,14 @@ Licence:
    defining spherical prticles in a DEM simulation.
  */
 
-#ifndef __sphereParticles_H__
-#define __sphereParticles_H__ 
+#ifndef __sphereParticles_hpp__
+#define __sphereParticles_hpp__ 
 
-#include "systemControl.H"
-#include "particles.H"
-#include "sphereShape.H"
-#include "property.H"
-#include "indexContainer.H"
+#include "systemControl.hpp"
+#include "particles.hpp"
+#include "sphereShape.hpp"
+#include "property.hpp"
+#include "indexContainer.hpp"
 
 
 
@@ -185,4 +185,4 @@ public:
 
 } // pFlow
 
-#endif //__sphereParticles_H__
+#endif //__sphereParticles_hpp__

src/Particles/SphereParticles/sphereParticles/sphereParticlesKernels.hpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereParticlesKernels_H__
-#define __sphereParticlesKernels_H__
+#ifndef __sphereParticlesKernels_hpp__
+#define __sphereParticlesKernels_hpp__
 
 namespace pFlow::sphereParticlesKernels
 {

src/Particles/SphereParticles/sphereShape/sphereShape.cpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereShape.H"
-#include "dictionary.H"
-#include "vocabs.H"
-#include "streams.H"
+#include "sphereShape.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
+#include "streams.hpp"
 
 
 bool pFlow::sphereShape::insertNames

src/Particles/SphereParticles/sphereShape/sphereShape.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereShape_H__
-#define __sphereShape_H__
+#ifndef __sphereShape_hpp__
+#define __sphereShape_hpp__
 
-#include "Vectors.H"
-#include "hashMap.H"
+#include "Vectors.hpp"
+#include "hashMap.hpp"
 
 namespace pFlow
 {
@@ -54,7 +54,7 @@ protected:
 public:
 
 	// - type info
-	TypeNameNV("sphereShape");
+	TypeInfoNV("sphereShape");
 
 
 		sphereShape(){}
@@ -174,4 +174,4 @@ public:
 
 } // pFlow
 
-#endif //__sphereShape_H__
+#endif //__sphereShape_hpp__

src/Particles/dynamicPointStructure/dynamicPointStructure.cpp

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

src/Particles/dynamicPointStructure/dynamicPointStructure.hpp

@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __dynamicPointStructure_H__
-#define __dynamicPointStructure_H__
+#ifndef __dynamicPointStructure_hpp__
+#define __dynamicPointStructure_hpp__
 
-#include "Time.H"
-#include "pointFields.H"
-#include "integrations.H"
-#include "uniquePtr.H"
+#include "Time.hpp"
+#include "pointFields.hpp"
+#include "integrations.hpp"
+#include "uniquePtr.hpp"
 
 namespace pFlow
 {
@@ -51,7 +51,7 @@ protected:
 
 public:
 
-	TypeName("dynamicPointStructure");
+	TypeInfo("dynamicPointStructure");
 
 	dynamicPointStructure(Time& time, const word& integrationMethod);
 

src/Particles/particles/demParticles.hpp

@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __demParticles_H__ 
-#define __demParticles_H__
+#ifndef __demParticles_hpp__ 
+#define __demParticles_hpp__
 
-#include "demComponent.H"
+#include "demComponent.hpp"
 
 namespace pFlow
 {

src/Particles/particles/particleIdHandler.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __particleIdHandler_H__
-#define __particleIdHandler_H__
+#ifndef __particleIdHandler_hpp__
+#define __particleIdHandler_hpp__
 
 
-#include "pointFields.H"
+#include "pointFields.hpp"
 
 namespace pFlow
 {

src/Particles/particles/particles.cpp

@@ -19,7 +19,7 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#include "particles.H"
+#include "particles.hpp"
 
 
 pFlow::particles::particles

src/Particles/particles/particles.hpp

@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __particles_H__
-#define __particles_H__
+#ifndef __particles_hpp__
+#define __particles_hpp__
 
-#include "dynamicPointStructure.H"
-#include "particleIdHandler.H"
-#include "demParticles.H"
+#include "dynamicPointStructure.hpp"
+#include "particleIdHandler.hpp"
+#include "demParticles.hpp"
 namespace pFlow
 {
 
@@ -88,7 +88,7 @@ protected:
 public:
 
 	// type info
-	TypeName("particles");
+	TypeInfo("particles");
 
 	particles(systemControl& control, const word& integrationMethod);
 
@@ -288,4 +288,4 @@ public:
 
 } // pFlow
 
-#endif //__particles_H__
+#endif //__particles_hpp__