modify for coupling-cpp and hpp

src/Interaction/contactSearch/ContactSearch/ContactSearch.hpp

@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __ContactSearch_H__
-#define __ContactSearch_H__
+#ifndef __ContactSearch_hpp__
+#define __ContactSearch_hpp__
 
 
-#include "contactSearch.H"
-#include "box.H"
+#include "contactSearch.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {
@@ -64,7 +64,7 @@ protected:
 
 public:
 
-	TypeNameTemplate2("ContactSearch", ParticleContactSearchType, WallMappingType);
+	TypeInfoTemplate2("ContactSearch", ParticleContactSearchType, WallMappingType);
 
 	ContactSearch(
 		const dictionary& csDict,
@@ -245,4 +245,4 @@ public:
 }
 
 
-#endif //__ContactSearch_H__
+#endif //__ContactSearch_hpp__

src/Interaction/contactSearch/ContactSearch/ContactSearchs.cpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "ContactSearch.H"
+#include "ContactSearch.hpp"
 
-#include "cellMapping.H"
-#include "NBS.H"
-#include "multiGridNBS.H"
-#include "multiGridMapping.H"
+#include "cellMapping.hpp"
+#include "NBS.hpp"
+#include "multiGridNBS.hpp"
+#include "multiGridMapping.hpp"
 
 
 template class pFlow::ContactSearch<pFlow::NBS, pFlow::cellMapping>;

src/Interaction/contactSearch/cells.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cells_H__
-#define __cells_H__
+#ifndef __cells_hpp__
+#define __cells_hpp__
 
 
-#include "types.H"
-#include "box.H"
+#include "types.hpp"
+#include "box.hpp"
 
 namespace pFlow
 {

src/Interaction/contactSearch/contactSearch/contactSearch.cpp

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

src/Interaction/contactSearch/contactSearch/contactSearch.hpp

@@ -19,14 +19,14 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __contactSearch_H__
-#define __contactSearch_H__
+#ifndef __contactSearch_hpp__
+#define __contactSearch_hpp__
 
 
-#include "interactionBase.H"
-#include "unsortedPairs.H"
-#include "box.H"
-#include "dictionary.H"
+#include "interactionBase.hpp"
+#include "unsortedPairs.hpp"
+#include "box.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -62,7 +62,7 @@ protected:
 	
 public:
 
-	TypeName("contactSearch");
+	TypeInfo("contactSearch");
 
 	contactSearch(
 		const dictionary& dict,
@@ -132,4 +132,4 @@ public:
 }
 
 
-#endif //__ContactSearch_H__
+#endif //__ContactSearch_hpp__

src/Interaction/contactSearch/contactSearchFunctions.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __broadSearchFunctions_H__
-#define __broadSearchFunctions_H__
+#ifndef __broadSearchFunctions_hpp__
+#define __broadSearchFunctions_hpp__
 
-#include "types.H"
-#include "iBox.H"
+#include "types.hpp"
+#include "iBox.hpp"
 
 namespace pFlow
 {
@@ -109,4 +109,4 @@ bool sphereSphereCheck(const realx3& p1, const realx3 p2, real d1, real d2)
 
 }
 
-#endif //__broadSearchFunctions_H__
+#endif //__broadSearchFunctions_hpp__

src/Interaction/contactSearch/methods/NBS.hpp

@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __NBS_H__
-#define __NBS_H__
+#ifndef __NBS_hpp__
+#define __NBS_hpp__
 
-#include "NBSLevel0.H"
+#include "NBSLevel0.hpp"
 
 namespace pFlow
 {
@@ -80,7 +80,7 @@ private:
 
 public:
 
-	TypeNameNV("NBS");
+	TypeInfoNV("NBS");
 
 		NBS(
 			const dictionary& dict,

src/Interaction/contactSearch/methods/NBSLevel.hpp

@@ -1,8 +1,8 @@
-#ifndef __NBSLevel_H__
-#define __NBSLevel_H__
+#ifndef __NBSLevel_hpp__
+#define __NBSLevel_hpp__
 
 
-#include "NBSLevel0.H"
+#include "NBSLevel0.hpp"
 
 
 namespace pFlow
@@ -51,7 +51,7 @@ protected:
 	
 public:
 	
-	TypeNameNV("NBSLevel0");
+	TypeInfoNV("NBSLevel0");
 
 	INLINE_FUNCTION_HD
 	NBSLevel(){}
@@ -105,7 +105,7 @@ public:
 			"NBSLevel::findPairsCountCross",
 			mdrPolicy,
 			CLASS_LAMBDA_HD(int32 i, int32 j, int32 k, int32& getFullUpdate){
-				#include "NBSCrossLoop.H"
+				#include "NBSCrossLoop.hpp"
 			}, notInsertedPairs);
 			
 		return notInsertedPairs;	

src/Interaction/contactSearch/methods/NBSLevel0.hpp

@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __NBSLevel0_H__
-#define __NBSLevel0_H__
+#ifndef __NBSLevel0_hpp__
+#define __NBSLevel0_hpp__
 
-#include "mapperNBS.H"
+#include "mapperNBS.hpp"
 
 namespace pFlow
 {
@@ -82,7 +82,7 @@ protected:
 
 public:
 
-	TypeNameNV("NBSLevel0");
+	TypeInfoNV("NBSLevel0");
 
 		INLINE_FUNCTION_HD
 		NBSLevel0(){}
@@ -226,7 +226,7 @@ public:
 			"NBSLevel0::findPairs",
 			mdrPolicy,
 			CLASS_LAMBDA_HD(int32 i, int32 j, int32 k, int32& getFullUpdate){
-				#include "NBSLoop.H"
+				#include "NBSLoop.hpp"
 			}, notInsertedPairs);
 			
 		return notInsertedPairs;
@@ -237,4 +237,4 @@ public:
 
 } // pFlow
 
-#endif // __NBSLevel0_H__
+#endif // __NBSLevel0_hpp__

src/Interaction/contactSearch/methods/NBSLevels.hpp

@@ -1,9 +1,9 @@
-#ifndef __NBSLevels_H__
-#define __NBSLevels_H__
+#ifndef __NBSLevels_hpp__
+#define __NBSLevels_hpp__
 
-#include "NBSLevel.H"
-#include "NBSLevel0.H"
-#include "KokkosTypes.H"
+#include "NBSLevel.hpp"
+#include "NBSLevel0.hpp"
+#include "KokkosTypes.hpp"
 
 namespace pFlow
 {

src/Interaction/contactSearch/methods/mapperNBS.hpp

@@ -19,13 +19,13 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __mapperNBS_H__
-#define __mapperNBS_H__
+#ifndef __mapperNBS_hpp__
+#define __mapperNBS_hpp__
 
-#include "cells.H"
-#include "contactSearchFunctions.H"
-#include "baseAlgorithms.H"
-#include "ViewAlgorithms.H"
+#include "cells.hpp"
+#include "contactSearchFunctions.hpp"
+#include "baseAlgorithms.hpp"
+#include "ViewAlgorithms.hpp"
 
 namespace pFlow
 {
@@ -157,7 +157,7 @@ protected:
 	
 public:
 
-	TypeNameNV("mapperNBS");
+	TypeInfoNV("mapperNBS");
 
 		INLINE_FUNCTION_HD
 		mapperNBS(){}
@@ -386,4 +386,4 @@ public:
 
 } // pFlow
 
-#endif // __mapperNBS_H__
+#endif // __mapperNBS_hpp__

src/Interaction/contactSearch/methods/multiGridNBS.hpp

@@ -19,10 +19,10 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __multiGridNBS_H__
-#define __multiGridNBS_H__
+#ifndef __multiGridNBS_hpp__
+#define __multiGridNBS_hpp__
 
-#include "NBSLevels.H"
+#include "NBSLevels.hpp"
 
 namespace pFlow
 {
@@ -80,7 +80,7 @@ private:
 
 public:
 
-	TypeNameNV("multiGridNBS");
+	TypeInfoNV("multiGridNBS");
 
 		multiGridNBS(
 			const 	dictionary& dict,

src/Interaction/contactSearch/wallMappings/cellMapping.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellMapping_H__
-#define __cellMapping_H__
+#ifndef __cellMapping_hpp__
+#define __cellMapping_hpp__
 
-#include "cellsWallLevel0.H"
-#include "dictionary.H"
+#include "cellsWallLevel0.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -84,7 +84,7 @@ private:
 
 public:
 
-	TypeNameNV("cellMapping");
+	TypeInfoNV("cellMapping");
 
 	cellMapping(
 		const dictionary&  		dict,

src/Interaction/contactSearch/wallMappings/cellsWallLevel0.hpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellsWallLevel0_H__
-#define __cellsWallLevel0_H__
+#ifndef __cellsWallLevel0_hpp__
+#define __cellsWallLevel0_hpp__
 
-#include "types.H"
-#include "KokkosTypes.H"	
-#include "cells.H"
-#include "iBox.H"
+#include "types.hpp"
+#include "KokkosTypes.hpp"	
+#include "cells.hpp"
+#include "iBox.hpp"
 
 
 
@@ -95,7 +95,7 @@ protected:
 
 public:
 
-	TypeNameNV("cellsWallLevel0");
+	TypeInfoNV("cellsWallLevel0");
 
 	INLINE_FUNCTION_HD
 	cellsWallLevel0(){}
@@ -282,4 +282,4 @@ public:
 } // pFlow
 
 
-#endif // __cellsWallLevel0_H__
+#endif // __cellsWallLevel0_hpp__

src/Interaction/contactSearch/wallMappings/cellsWallLevels.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __cellsWallLevels_H__
-#define __cellsWallLevels_H__
+#ifndef __cellsWallLevels_hpp__
+#define __cellsWallLevels_hpp__
 
-#include "cellsWallLevel0.H"
+#include "cellsWallLevel0.hpp"
 
 namespace pFlow
 {
@@ -58,7 +58,7 @@ protected:
 
 public:
 
-	TypeNameNV("cellsWallLevels");
+	TypeInfoNV("cellsWallLevels");
 
 	FUNCTION_H
 	cellsWallLevels(
@@ -149,4 +149,4 @@ public:
 } // pFlow
 
 
-#endif // __cellsWallLevels_H__
+#endif // __cellsWallLevels_hpp__

src/Interaction/contactSearch/wallMappings/multiGridMapping.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __multiGridMapping_H__
-#define __multiGridMapping_H__
+#ifndef __multiGridMapping_hpp__
+#define __multiGridMapping_hpp__
 
-#include "cellsWallLevels.H"
-#include "dictionary.H"
+#include "cellsWallLevels.hpp"
+#include "dictionary.hpp"
 
 
 namespace pFlow
@@ -84,7 +84,7 @@ private:
 
 public:
 
-	TypeNameNV("multiGridMapping");
+	TypeInfoNV("multiGridMapping");
 
 	multiGridMapping(
 		const dictionary&  			dict,