modify for coupling-cpp and hpp

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