modify for coupling-cpp and hpp

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__