Merge remote-tracking branch 'origin/main' into coupling

CMakeLists.txt

@@ -75,7 +75,6 @@ add_subdirectory(src)
 add_subdirectory(solvers)
 
 add_subdirectory(utilities)
-
 #add_subdirectory(test_newFeatures)
 
 
@@ -88,3 +87,4 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${phasicFlow_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${phasicFlow_VERSION_MINOR}")
 include(CPack)
+

DEMSystems/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 set(SourceFiles 
-sphereDEMSystem/sphereDEMSystem.C
+sphereDEMSystem/sphereDEMSystem.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow Particles Geometry Property Interaction Interaction Utilities)

DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "sphereDEMSystem.H"
+#include "sphereDEMSystem.hpp"
 
 
 pFlow::sphereDEMSystem::sphereDEMSystem(int argc, char* argv[])

DEMSystems/sphereDEMSystem/sphereDEMSystem.hpp

@@ -18,19 +18,19 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __sphereDEMSystem_H__
-#define __sphereDEMSystem_H__
+#ifndef __sphereDEMSystem_hpp__
+#define __sphereDEMSystem_hpp__
 
 #include <array>
 
-#include "systemControl.H"
-#include "property.H"
-#include "uniquePtr.H"
-#include "geometry.H"
-#include "sphereParticles.H"
-#include "interaction.H"
-#include "Insertions.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "property.hpp"
+#include "uniquePtr.hpp"
+#include "geometry.hpp"
+#include "sphereParticles.hpp"
+#include "interaction.hpp"
+#include "Insertions.hpp"
+#include "readControlDict.hpp"
 
 
 

solvers/iterateGeometry/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 set(source_files
-iterateGeometry.C
+iterateGeometry.cpp
 )
 set(link_lib phasicFlow Geometry MotionModel Kokkos::kokkos Utilities)
 

solvers/iterateGeometry/iterateGeometry.cpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "systemControl.H"
-#include "geometryMotion.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "systemControl.hpp"
+#include "geometryMotion.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::commandLine;
 
@@ -43,10 +43,10 @@ commandLine cmds(
    
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 	
-	#include "setProperty.H"
-	#include "setSurfaceGeometry.H"
+	#include "setProperty.hpp"
+	#include "setSurfaceGeometry.hpp"
 
 	
 	do
@@ -56,7 +56,7 @@ commandLine cmds(
 	}while( Control++);
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 }
 

solvers/sphereGranFlow/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 set(source_files
-sphereGranFlow.C
+sphereGranFlow.cpp
 )
 set(link_lib Kokkos::kokkos phasicFlow Particles Geometry Property Interaction Interaction Utilities)
 

solvers/sphereGranFlow/sphereGranFlow.cpp

@@ -18,15 +18,15 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "property.H"
-#include "geometry.H"
-#include "sphereParticles.H"
-#include "Insertions.H"
-#include "systemControl.H"
-#include "contactSearch.H"
-#include "sphereInteraction.H"
-#include "commandLine.H"
-#include "readControlDict.H"
+#include "property.hpp"
+#include "geometry.hpp"
+#include "sphereParticles.hpp"
+#include "Insertions.hpp"
+#include "systemControl.hpp"
+#include "contactSearch.hpp"
+#include "sphereInteraction.hpp"
+#include "commandLine.hpp"
+#include "readControlDict.hpp"
 
 using pFlow::output;
 using pFlow::endl;
@@ -53,13 +53,13 @@ bool isCoupling = false;
 if(!cmds.parse(argc, argv)) return 0;
 
 // this should be palced in each main 
-#include "initialize_Control.H"
+#include "initialize_Control.hpp"
 	
-	#include "setProperty.H"
-	#include "setSurfaceGeometry.H"
+	#include "setProperty.hpp"
+	#include "setSurfaceGeometry.hpp"
 	
 
-	#include "createDEMComponents.H"
+	#include "createDEMComponents.hpp"
 	
 	Report(0)<<"\nStart of time loop . . .\n"<<endReport;
 
@@ -101,7 +101,7 @@ if(!cmds.parse(argc, argv)) return 0;
 	Report(0)<<"\nEnd of time loop.\n"<<endReport;
 
 // this should be palced in each main 
-#include "finalize.H"
+#include "finalize.hpp"
 
 
 }	

src/Geometry/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 list(APPEND SourceFiles 
-geometry/geometry.C
-geometryMotion/geometryMotions.C
+geometry/geometry.cpp
+geometryMotion/geometryMotions.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow MotionModel Property)

src/Geometry/geometry/demGeometry.hpp

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

src/Geometry/geometry/geometry.cpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "geometry.H"
-#include "vocabs.H"
+#include "geometry.hpp"
+#include "vocabs.hpp"
 
 
 bool pFlow::geometry::findPropertyId()

src/Geometry/geometry/geometry.hpp

@@ -18,18 +18,18 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __geometry_H__
-#define __geometry_H__
+#ifndef __geometry_hpp__
+#define __geometry_hpp__
 
 
-#include "virtualConstructor.H"
-#include "demGeometry.H"
-#include "property.H"
-#include "Fields.H"
-#include "Vectors.H"
-#include "multiTriSurface.H"
-#include "triSurfaceFields.H"
-#include "dictionary.H"
+#include "virtualConstructor.hpp"
+#include "demGeometry.hpp"
+#include "property.hpp"
+#include "Fields.hpp"
+#include "Vectors.hpp"
+#include "multiTriSurface.hpp"
+#include "triSurfaceFields.hpp"
+#include "dictionary.hpp"
 
 namespace pFlow
 {
@@ -71,7 +71,7 @@ protected:
 public:
 
 	// - type info
-	TypeName("geometry");
+	TypeInfo("geometry");
 
 	//// - Constructors 
 		

src/Geometry/geometryMotion/geometryMotion.hpp

@@ -19,12 +19,12 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __geometryMotion_H__
-#define __geometryMotion_H__
+#ifndef __geometryMotion_hpp__
+#define __geometryMotion_hpp__
 
 
-#include "geometry.H"
-#include "VectorDuals.H"
+#include "geometry.hpp"
+#include "VectorDuals.hpp"
 
 namespace pFlow
 {
@@ -62,7 +62,7 @@ protected:
 public:
 
 	// type info
-	TypeNameTemplate("geometry", MotionModel);
+	TypeInfoTemplate("geometry", MotionModel);
 
 	//// - Constructors
 		
@@ -145,11 +145,11 @@ public:
 
 }
 
-#include "geometryMotion.C"
+#include "geometryMotion.cpp"
 
 #ifndef BUILD_SHARED_LIBS
-	#include "geometryMotionsInstantiate.C"
+	#include "geometryMotionsInstantiate.cpp"
 #endif
 
 
-#endif  //__geometryMotion_H__
+#endif  //__geometryMotion_hpp__

src/Geometry/geometryMotion/geometryMotions.cpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "geometryMotions.H"
+#include "geometryMotions.hpp"
 
 #ifdef BUILD_SHARED_LIBS
-#include "geometryMotionsInstantiate.C"
+#include "geometryMotionsInstantiate.cpp"
 #endif

src/Geometry/geometryMotion/geometryMotions.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __geometryMotions_H__
-#define __geometryMotions_H__
+#ifndef __geometryMotions_hpp__
+#define __geometryMotions_hpp__
 
-#include "geometryMotion.H"
-#include "fixedWall.H"
-#include "rotatingAxisMotion.H"
+#include "geometryMotion.hpp"
+#include "fixedWall.hpp"
+#include "rotatingAxisMotion.hpp"
 
 
 namespace pFlow

src/Geometry/geometryMotion/geometryMotionsInstantiate.cpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "fixedWall.H"
-#include "rotatingAxisMotion.H"
+#include "fixedWall.hpp"
+#include "rotatingAxisMotion.hpp"
 
 template class pFlow::geometryMotion<pFlow::fixedWall>;
 

src/Integration/AdamsBashforth2/AdamsBashforth2.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth2.H"
+#include "AdamsBashforth2.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 

src/Integration/AdamsBashforth2/AdamsBashforth2.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth2_H__
-#define __AdamsBashforth2_H__
+#ifndef __AdamsBashforth2_hpp__
+#define __AdamsBashforth2_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -45,7 +45,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth2");
+	TypeInfo("AdamsBashforth2");
 
 	//// - Constructors
 		AdamsBashforth2(
@@ -120,4 +120,4 @@ bool pFlow::AdamsBashforth2::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsBashforth3/AdamsBashforth3.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsBashforth3.H"
+#include "AdamsBashforth3.hpp"
 
 //const real AB3_coef[] = { 23.0 / 12.0, 16.0 / 12.0, 5.0 / 12.0 };
 

src/Integration/AdamsBashforth3/AdamsBashforth3.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth3_H__
-#define __AdamsBashforth3_H__
+#ifndef __AdamsBashforth3_hpp__
+#define __AdamsBashforth3_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -33,7 +33,7 @@ struct AB3History
 	realx3 dy1_={0,0,0};
 	realx3 dy2_={0,0,0};
 
-	TypeNameNV("AB3History");
+	TypeInfoNV("AB3History");
 };
 
 
@@ -89,7 +89,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth3");
+	TypeInfo("AdamsBashforth3");
 
 	//// - Constructors
 		AdamsBashforth3(
@@ -177,4 +177,4 @@ bool pFlow::AdamsBashforth3::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsBashforth4/AdamsBashforth4.cpp

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

src/Integration/AdamsBashforth4/AdamsBashforth4.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth4_H__
-#define __AdamsBashforth4_H__
+#ifndef __AdamsBashforth4_hpp__
+#define __AdamsBashforth4_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -34,7 +34,7 @@ struct AB4History
 	realx3 dy2_={0,0,0};
 	realx3 dy3_={0,0,0};
 
-	TypeNameNV("AB4History");
+	TypeInfoNV("AB4History");
 };
 
 
@@ -94,7 +94,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth4");
+	TypeInfo("AdamsBashforth4");
 
 	//// - Constructors
 		AdamsBashforth4(
@@ -187,4 +187,4 @@ bool pFlow::AdamsBashforth4::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsBashforth5/AdamsBashforth5.cpp

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

src/Integration/AdamsBashforth5/AdamsBashforth5.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsBashforth5_H__
-#define __AdamsBashforth5_H__
+#ifndef __AdamsBashforth5_hpp__
+#define __AdamsBashforth5_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -35,7 +35,7 @@ struct AB5History
 	realx3 dy3_={0,0,0};
 	realx3 dy4_={0,0,0};
 
-	TypeNameNV("AB5History");
+	TypeInfoNV("AB5History");
 };
 
 
@@ -92,7 +92,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsBashforth5");
+	TypeInfo("AdamsBashforth5");
 
 	//// - Constructors
 		AdamsBashforth5(
@@ -184,4 +184,4 @@ bool pFlow::AdamsBashforth5::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsMoulton3/AdamsMoulton3.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsMoulton3.H"
+#include "AdamsMoulton3.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 

src/Integration/AdamsMoulton3/AdamsMoulton3.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton3_H__
-#define __AdamsMoulton3_H__
+#ifndef __AdamsMoulton3_hpp__
+#define __AdamsMoulton3_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -49,7 +49,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton3");
+	TypeInfo("AdamsMoulton3");
 
 	//// - Constructors
 		AdamsMoulton3(
@@ -176,4 +176,4 @@ bool pFlow::AdamsMoulton3::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsMoulton4/AdamsMoulton4.cpp

@@ -18,7 +18,7 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "AdamsMoulton4.H"
+#include "AdamsMoulton4.hpp"
 
 //const real AB2_coef[] = { 3.0 / 2.0, 1.0 / 2.0};
 

src/Integration/AdamsMoulton4/AdamsMoulton4.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton4_H__
-#define __AdamsMoulton4_H__
+#ifndef __AdamsMoulton4_hpp__
+#define __AdamsMoulton4_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -51,7 +51,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton4");
+	TypeInfo("AdamsMoulton4");
 
 	//// - Constructors
 		AdamsMoulton4(
@@ -182,4 +182,4 @@ bool pFlow::AdamsMoulton4::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/AdamsMoulton5/AdamsMoulton5.cpp

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

src/Integration/AdamsMoulton5/AdamsMoulton5.hpp

@@ -18,12 +18,12 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __AdamsMoulton5_H__
-#define __AdamsMoulton5_H__
+#ifndef __AdamsMoulton5_hpp__
+#define __AdamsMoulton5_hpp__
 
 
-#include "integration.H"
-#include "pointFields.H"
+#include "integration.hpp"
+#include "pointFields.hpp"
 
 namespace pFlow
 {
@@ -53,7 +53,7 @@ protected:
 public:
 
 	// type info
-	TypeName("AdamsMoulton5");
+	TypeInfo("AdamsMoulton5");
 
 	//// - Constructors
 		AdamsMoulton5(
@@ -188,4 +188,4 @@ bool pFlow::AdamsMoulton5::intRange(
 
 } // pFlow
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/CMakeLists.txt

@@ -1,13 +1,13 @@
 
 list(APPEND SourceFiles 
-integration/integration.C 
-AdamsBashforth5/AdamsBashforth5.C
-AdamsBashforth4/AdamsBashforth4.C
-AdamsBashforth3/AdamsBashforth3.C
-AdamsBashforth2/AdamsBashforth2.C
-AdamsMoulton3/AdamsMoulton3.C
-AdamsMoulton4/AdamsMoulton4.C
-AdamsMoulton5/AdamsMoulton5.C
+integration/integration.cpp 
+AdamsBashforth5/AdamsBashforth5.cpp
+AdamsBashforth4/AdamsBashforth4.cpp
+AdamsBashforth3/AdamsBashforth3.cpp
+AdamsBashforth2/AdamsBashforth2.cpp
+AdamsMoulton3/AdamsMoulton3.cpp
+AdamsMoulton4/AdamsMoulton4.cpp
+AdamsMoulton5/AdamsMoulton5.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)

src/Integration/integration/integration.cpp

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

src/Integration/integration/integration.hpp

@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __integration_H__
-#define __integration_H__
+#ifndef __integration_hpp__
+#define __integration_hpp__
 
 
-#include "virtualConstructor.H"
-#include "Vectors.H"
-#include "pointStructure.H"
-#include "repository.H"
+#include "virtualConstructor.hpp"
+#include "Vectors.hpp"
+#include "pointStructure.hpp"
+#include "repository.hpp"
 
 
 namespace pFlow
@@ -45,7 +45,7 @@ protected:
 public:
 
 	// type info
-	TypeName("integration");
+	TypeInfo("integration");
 
 	//// - Constructors
 		integration(
@@ -108,4 +108,4 @@ public:
 } // pFlow
 
 
-#endif //__integration_H__
+#endif //__integration_hpp__

src/Integration/integration/integrations.hpp

@@ -18,11 +18,11 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __integrations_H__
-#define __integrations_H__
+#ifndef __integrations_hpp__
+#define __integrations_hpp__
 
-#include "integration.H"
-#include "AdamsBashforth2.H"
-#include "AdamsBashforth3.H"
+#include "integration.hpp"
+#include "AdamsBashforth2.hpp"
+#include "AdamsBashforth3.hpp"
 
 #endif

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,12 +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 "cells.hpp"
+#include "contactSearchFunctions.hpp"
+#include "baseAlgorithms.hpp"
+#include "ViewAlgorithms.hpp"
 
 namespace pFlow
 {
@@ -156,7 +157,7 @@ protected:
 	
 public:
 
-	TypeNameNV("mapperNBS");
+	TypeInfoNV("mapperNBS");
 
 		INLINE_FUNCTION_HD
 		mapperNBS(){}
@@ -385,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
 {

src/MotionModel/CMakeLists.txt

@@ -1,8 +1,8 @@
 
 list(APPEND SourceFiles 
-entities/rotatingAxis/rotatingAxis.C
-fixedWall/fixedWall.C
-rotatingAxisMotion/rotatingAxisMotion.C
+entities/rotatingAxis/rotatingAxis.cpp
+fixedWall/fixedWall.cpp
+rotatingAxisMotion/rotatingAxisMotion.cpp
 )
 
 set(link_libs Kokkos::kokkos phasicFlow)

src/MotionModel/entities/rotatingAxis/rotatingAxis.cpp

@@ -18,8 +18,8 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "rotatingAxis.H"
-#include "dictionary.H"
+#include "rotatingAxis.hpp"
+#include "dictionary.hpp"
 
 /*FUNCTION_HD
 pFlow::rotatingAxis::rotatingAxis()

src/MotionModel/entities/rotatingAxis/rotatingAxis.hpp

@@ -18,10 +18,10 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rotatingAxis_H__
-#define __rotatingAxis_H__
+#ifndef __rotatingAxis_hpp__
+#define __rotatingAxis_hpp__
 
-#include "line.H"
+#include "line.hpp"
 
 namespace pFlow
 {
@@ -29,7 +29,7 @@ namespace pFlow
 class dictionary;
 class rotatingAxis;
 
-#include "rotatingAxisFwd.H"
+#include "rotatingAxisFwd.hpp"
 
 class rotatingAxis
 :
@@ -107,6 +107,6 @@ inline iIstream& operator >>(iIstream& is, rotatingAxis& ax)
 }
 
 
-#include "rotatingAxisI.H"
+#include "rotatingAxisI.hpp"
 
 #endif

src/MotionModel/fixedWall/fixedWall.cpp

@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "fixedWall.H"
-#include "dictionary.H"
-#include "vocabs.H"
+#include "fixedWall.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
 
 bool pFlow::fixedWall::readDictionary
 (

src/MotionModel/fixedWall/fixedWall.hpp

@@ -18,14 +18,14 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __fixedWall_H__
-#define __fixedWall_H__
+#ifndef __fixedWall_hpp__
+#define __fixedWall_hpp__
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "Vectors.H"
-#include "uniquePtr.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "Vectors.hpp"
+#include "uniquePtr.hpp"
 
 
 
@@ -89,7 +89,7 @@ protected:
 
 public:
 	
-	TypeNameNV("fixedWall");
+	TypeInfoNV("fixedWall");
 
 	// empty
 	fixedWall();
@@ -167,4 +167,4 @@ public:
 
 } // pFlow
 
-#endif //__fixed_H__
+#endif //__fixed_hpp__

src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.cpp

@@ -18,9 +18,9 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#include "rotatingAxisMotion.H"
-#include "dictionary.H"
-#include "vocabs.H"
+#include "rotatingAxisMotion.hpp"
+#include "dictionary.hpp"
+#include "vocabs.hpp"
 
 
 bool pFlow::rotatingAxisMotion::readDictionary

src/MotionModel/rotatingAxisMotion/rotatingAxisMotion.hpp

@@ -18,16 +18,16 @@ Licence:
 
 -----------------------------------------------------------------------------*/
 
-#ifndef __rotatingAxisMotion_H__
-#define __rotatingAxisMotion_H__
+#ifndef __rotatingAxisMotion_hpp__
+#define __rotatingAxisMotion_hpp__
 
 
-#include "types.H"
-#include "typeInfo.H"
-#include "VectorDual.H"
-#include "Vectors.H"
-#include "List.H"
-#include "rotatingAxis.H"
+#include "types.hpp"
+#include "typeInfo.hpp"
+#include "VectorDual.hpp"
+#include "Vectors.hpp"
+#include "List.hpp"
+#include "rotatingAxis.hpp"
 
 
 namespace pFlow
@@ -104,7 +104,7 @@ protected:
 
 public:
 	
-	TypeNameNV("rotatingAxisMotion");
+	TypeInfoNV("rotatingAxisMotion");
 
 	// empty
 	FUNCTION_H
@@ -215,4 +215,4 @@ public:
 
 } // pFlow
 
-#endif //__rotatingAxisMotion_H__
+#endif //__rotatingAxisMotion_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__