modify for coupling-cpp and hpp

src/Interaction/CMakeLists.txt

@@ -1,9 +1,9 @@
 
 set(SourceFiles 
-contactSearch/contactSearch/contactSearch.C
-contactSearch/ContactSearch/ContactSearchs.C
-interaction/interaction.C
-sphereInteraction/sphereInteractions.C
+contactSearch/contactSearch/contactSearch.cpp
+contactSearch/ContactSearch/ContactSearchs.cpp
+interaction/interaction.cpp
+sphereInteraction/sphereInteractions.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Property Particles Geometry)

src/Interaction/Models/contactForce/linearCF.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __linearCF_H__
-#define __linearCF_H__
+#ifndef __linearCF_hpp__
+#define __linearCF_hpp__
 
-#include "types.H"
-#include "symArrays.H"
+#include "types.hpp"
+#include "symArrays.hpp"
 
 namespace pFlow::cfModels
 {
@@ -172,7 +172,7 @@ protected:
 public:
 
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	linear(){}

src/Interaction/Models/contactForce/nonLinearCF.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __nonLinearCF_H__
-#define __nonLinearCF_H__
+#ifndef __nonLinearCF_hpp__
+#define __nonLinearCF_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::cfModels
 {
@@ -164,7 +164,7 @@ protected:
 
 public:
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	nonLinear(){}

src/Interaction/Models/contactForce/nonLinearMod.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __nonLinearModCF_H__
-#define __nonLinearModCF_H__
+#ifndef __nonLinearModCF_hpp__
+#define __nonLinearModCF_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::cfModels
 {
@@ -148,7 +148,7 @@ protected:
 
 public:
 
-	TypeNameNV(modelName());
+	TypeInfoNV(modelName());
 
 	INLINE_FUNCTION_HD
 	nonLinearMod(){}
@@ -266,4 +266,4 @@ public:
 
 } //pFlow::CFModels
 
-#endif //__nonLinearModCF_H__
+#endif //__nonLinearModCF_hpp__

src/Interaction/Models/contactForceModels.hpp

@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __contactForceModels_H__
-#define __contactForceModels_H__
+#ifndef __contactForceModels_hpp__
+#define __contactForceModels_hpp__
 
 
-#include "linearCF.H"
-#include "nonLinearCF.H"
-#include "normalRolling.H"
-#include "nonLinearMod.H"
+#include "linearCF.hpp"
+#include "nonLinearCF.hpp"
+#include "normalRolling.hpp"
+#include "nonLinearMod.hpp"
 
 
 namespace pFlow::cfModels 
@@ -45,4 +45,4 @@ using nonLimitedNonLinearModNormalRolling  = normalRolling<nonLinearMod<false>>;
 
 
 
-#endif //__contactForceModels_H__
+#endif //__contactForceModels_hpp__

src/Interaction/Models/rolling/normalRolling.hpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __normalRolling_H__
-#define __normalRolling_H__
+#ifndef __normalRolling_hpp__
+#define __normalRolling_hpp__
 
 
 namespace pFlow::cfModels
@@ -58,7 +58,7 @@ public:
 
 public:
 
-	TypeNameNV(word("normal<"+contactForceModel::TYPENAME()+">"));
+	TypeInfoNV(word("normal<"+contactForceModel::TYPENAME()+">"));
 	
 
 	normalRolling(int32 nMaterial, const ViewType1D<real>& rho, const dictionary& dict)

src/Interaction/contactLists/sortedContactList.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sortedContactList_H__ 
-#define __sortedContactList_H__
+#ifndef __sortedContactList_hpp__ 
+#define __sortedContactList_hpp__
 
-#include "sortedPairs.H"
+#include "sortedPairs.hpp"
 
 namespace pFlow
 {
@@ -78,7 +78,7 @@ protected:
 
 public:
 
-	TypeNameNV("sortedContactList");
+	TypeInfoNV("sortedContactList");
 
 
 	sortedContactList(int32 initialSize =1)
@@ -168,4 +168,4 @@ public:
 
 
 
-#endif //__sortedContactList_H__
+#endif //__sortedContactList_hpp__

src/Interaction/contactLists/sortedPairs.hpp

@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __sortedPairs_H__
-#define __sortedPairs_H__
+#ifndef __sortedPairs_hpp__
+#define __sortedPairs_hpp__
 
-#include "unsortedPairs.H"
-#include "KokkosUtilities.H"
+#include "unsortedPairs.hpp"
+#include "KokkosUtilities.hpp"
 
 namespace pFlow
 {
@@ -106,7 +106,7 @@ protected:
 public:
 	
 	// - type info
-	TypeNameNV("sortedPairs");
+	TypeInfoNV("sortedPairs");
 
 
 	// constructors
@@ -255,4 +255,4 @@ public:
 
 }
 
-#endif //__sortedPairs_H__
+#endif //__sortedPairs_hpp__

src/Interaction/contactLists/unsortedContactList.hpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __unsortedContactList_H__
-#define __unsortedContactList_H__ 
+#ifndef __unsortedContactList_hpp__
+#define __unsortedContactList_hpp__ 
 
 namespace pFlow
 {
@@ -78,7 +78,7 @@ protected:
 
 public:
 
-	TypeNameNV("unsortedContactList");
+	TypeInfoNV("unsortedContactList");
 
 	unsortedContactList(int32 capacity=1)
 	:
@@ -172,4 +172,4 @@ public:
 } // pFlow
 
 
-#endif //__unsortedContactList_H__
+#endif //__unsortedContactList_hpp__

src/Interaction/contactLists/unsortedPairs.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __unsortedPairs_H__
-#define __unsortedPairs_H__
+#ifndef __unsortedPairs_hpp__
+#define __unsortedPairs_hpp__
 
-#include "KokkosTypes.H"
-#include "types.H"
+#include "KokkosTypes.hpp"
+#include "types.hpp"
 
 namespace pFlow
 {
@@ -81,7 +81,7 @@ protected:
 public:
 	
 	// - type info
-	TypeNameNV("unsorderedPairs");
+	TypeInfoNV("unsorderedPairs");
 
 	// constructor
 	unsortedPairs(int32 capacity=1)
@@ -213,4 +213,4 @@ public:
 
 }
 
-#endif //__unsortedPairs_H__
+#endif //__unsortedPairs_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,

src/Interaction/interaction/demInteraction.hpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __demInteraction_H__
-#define __demInteraction_H__
+#ifndef __demInteraction_hpp__
+#define __demInteraction_hpp__
 
-#include "property.H"
-#include "demComponent.H"
-#include "pointFields.H"
-#include "triSurfaceFields.H"
+#include "property.hpp"
+#include "demComponent.hpp"
+#include "pointFields.hpp"
+#include "triSurfaceFields.hpp"
 
 namespace pFlow
 {
@@ -56,4 +56,4 @@ public:
 
 }
 
-#endif //__interaction_H__ 
+#endif //__interaction_hpp__ 

src/Interaction/interaction/interaction.cpp

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

src/Interaction/interaction/interaction.hpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interaction_H__
-#define __interaction_H__
+#ifndef __interaction_hpp__
+#define __interaction_hpp__
 
-#include "demInteraction.H"
-#include "eventObserver.H"
-#include "interactionBase.H"
-#include "contactSearch.H"
+#include "demInteraction.hpp"
+#include "eventObserver.hpp"
+#include "interactionBase.hpp"
+#include "contactSearch.hpp"
 
 
 
@@ -55,7 +55,7 @@ protected:
 
 public:
 
-	TypeName("interaction");
+	TypeInfo("interaction");
 
 
 	//// - constructors 
@@ -106,4 +106,4 @@ public:
 
 }
 
-#endif //__interaction_H__ 
+#endif //__interaction_hpp__ 

src/Interaction/interaction/interactionBase.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interactionBase_H__ 
-#define __interactionBase_H__
+#ifndef __interactionBase_hpp__ 
+#define __interactionBase_hpp__
 
-#include "interactionTypes.H"
-#include "particles.H"
-#include "geometry.H"
+#include "interactionTypes.hpp"
+#include "particles.hpp"
+#include "geometry.hpp"
 
 namespace pFlow
 {
@@ -81,4 +81,4 @@ public:
 }
 
 
-#endif //__interactionBase_H__
+#endif //__interactionBase_hpp__

src/Interaction/interaction/interactionTypes.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __interactionTypes_H__
-#define __interactionTypes_H__
+#ifndef __interactionTypes_hpp__
+#define __interactionTypes_hpp__
 
 
 
-#include "types.H"
+#include "types.hpp"
 
 
 namespace pFlow
@@ -42,4 +42,4 @@ using ID_TYPE 			= int32;
 }
 
 
-#endif //__interactionTypes_H__
+#endif //__interactionTypes_hpp__

src/Interaction/sphereInteraction/pLine.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __pLine_H__
-#define __pLine_H__
+#ifndef __pLine_hpp__
+#define __pLine_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::sphTriInteraction
 {

src/Interaction/sphereInteraction/sphereInteraction.hpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereInteraction_H__ 
-#define __sphereInteraction_H__
+#ifndef __sphereInteraction_hpp__ 
+#define __sphereInteraction_hpp__
 
-#include "interaction.H"
-#include "sphereParticles.H"
+#include "interaction.hpp"
+#include "sphereParticles.hpp"
 
-#include "sphereInteractionKernels.H"
+#include "sphereInteractionKernels.hpp"
 
 namespace pFlow
 {
@@ -97,7 +97,7 @@ protected:
 
 public:
 
-	TypeNameTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
+	TypeInfoTemplate3("sphereInteraction", ContactForceModel, MotionModel, ContactListType);
 
 	// constructor
 
@@ -221,6 +221,6 @@ public:
 
 }
 
-#include "sphereInteraction.C"
+#include "sphereInteraction.cpp"
 
-#endif //__sphereInteraction_H__
+#endif //__sphereInteraction_hpp__

src/Interaction/sphereInteraction/sphereInteractionKernels.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereInteractionKernels_H__
-#define __sphereInteractionKernels_H__
+#ifndef __sphereInteractionKernels_hpp__
+#define __sphereInteractionKernels_hpp__
 
 
-#include "sphereTriSurfaceContact.H"
+#include "sphereTriSurfaceContact.hpp"
 
 namespace pFlow::sphereInteractionKernels
 {
@@ -322,4 +322,4 @@ struct pwInteractionFunctor
 
 } 
 
-#endif //__sphereInteractionKernels_H__
+#endif //__sphereInteractionKernels_hpp__

src/Interaction/sphereInteraction/sphereInteractions.cpp

@@ -18,13 +18,13 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereInteraction.H"
+#include "sphereInteraction.hpp"
 
-#include "geometryMotions.H"
+#include "geometryMotions.hpp"
 
-#include "contactForceModels.H"
-#include "unsortedContactList.H"
-#include "sortedContactList.H"
+#include "contactForceModels.hpp"
+#include "unsortedContactList.hpp"
+#include "sortedContactList.hpp"
 
 template class pFlow::sphereInteraction<
 	pFlow::cfModels::limitedLinearNormalRolling,

src/Interaction/sphereInteraction/sphereTriSurfaceContact.hpp

@@ -19,11 +19,11 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __sphereTriSurfaceContact_H__
-#define __sphereTriSurfaceContact_H__
+#ifndef __sphereTriSurfaceContact_hpp__
+#define __sphereTriSurfaceContact_hpp__
 
-#include "triWall.H"
-#include "pLine.H"
+#include "triWall.hpp"
+#include "pLine.hpp"
 
 namespace pFlow::sphTriInteraction
 {
@@ -228,4 +228,4 @@ bool isSphereInContactBothSides(
 } // pFlow::sphTriInteraction
 
 
-#endif //__sphereTriSurfaceContact_H__
+#endif //__sphereTriSurfaceContact_hpp__

src/Interaction/sphereInteraction/triWall.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __triWall_H__
-#define __triWall_H__
+#ifndef __triWall_hpp__
+#define __triWall_hpp__
 
-#include "types.H"
+#include "types.hpp"
 
 namespace pFlow::sphTriInteraction
 {