From efdcb418f7014b1cdf05b082e388ed6d6c036962 Mon Sep 17 00:00:00 2001
From: "LEGOLAS\\lenz" <lenz@irmb.tu-bs.de>
Date: Tue, 17 Mar 2020 16:48:41 +0100
Subject: [PATCH] introduces namespace for boundary conditions
---
src/GksGpu/BoundaryConditions/AdiabaticWall.cu | 4 ++++
src/GksGpu/BoundaryConditions/AdiabaticWall.h | 4 ++++
.../BoundaryConditions/BoundaryCondition.cpp | 4 ++++
.../BoundaryConditions/BoundaryCondition.h | 18 +++++++++++++++++-
.../BoundaryConditions/ConcreteHeatFlux.cu | 4 ++++
.../BoundaryConditions/ConcreteHeatFlux.h | 4 ++++
.../BoundaryConditions/CreepingMassFlux.cu | 4 ++++
.../BoundaryConditions/CreepingMassFlux.h | 4 ++++
src/GksGpu/BoundaryConditions/Extrapolation.cu | 4 ++++
src/GksGpu/BoundaryConditions/Extrapolation.h | 4 ++++
src/GksGpu/BoundaryConditions/HeatFlux.cu | 4 ++++
src/GksGpu/BoundaryConditions/HeatFlux.h | 4 ++++
src/GksGpu/BoundaryConditions/Inflow.cu | 4 ++++
src/GksGpu/BoundaryConditions/Inflow.h | 4 ++++
.../BoundaryConditions/InflowComplete.cu | 4 ++++
src/GksGpu/BoundaryConditions/InflowComplete.h | 4 ++++
.../BoundaryConditions/IsothermalWall.cu | 4 ++++
src/GksGpu/BoundaryConditions/IsothermalWall.h | 4 ++++
.../BoundaryConditions/MassCompensation.cu | 4 ++++
.../BoundaryConditions/MassCompensation.h | 4 ++++
src/GksGpu/BoundaryConditions/Open.cu | 4 ++++
src/GksGpu/BoundaryConditions/Open.h | 4 ++++
.../PassiveScalarDiriclet.cu | 4 ++++
.../BoundaryConditions/PassiveScalarDiriclet.h | 4 ++++
src/GksGpu/BoundaryConditions/Periodic.cu | 4 ++++
src/GksGpu/BoundaryConditions/Periodic.h | 4 ++++
src/GksGpu/BoundaryConditions/Pressure.cu | 4 ++++
src/GksGpu/BoundaryConditions/Pressure.h | 4 ++++
src/GksGpu/BoundaryConditions/Pressure2.cu | 4 ++++
src/GksGpu/BoundaryConditions/Pressure2.h | 4 ++++
.../BoundaryConditions/SalinasVazquez.cu | 4 ++++
src/GksGpu/BoundaryConditions/SalinasVazquez.h | 4 ++++
src/GksGpu/BoundaryConditions/Symmetry.cu | 4 ++++
src/GksGpu/BoundaryConditions/Symmetry.h | 4 ++++
src/GksGpu/DataBase/DataBase.h | 4 ++--
src/GksGpu/DataBase/DataBaseAllocator.h | 6 +++---
src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp | 4 ++--
src/GksGpu/DataBase/DataBaseAllocatorCPU.h | 4 ++--
src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp | 4 ++--
src/GksGpu/DataBase/DataBaseAllocatorGPU.h | 4 ++--
src/GksGpu/Definitions/PassiveScalar.h | 2 +-
src/GksGpu/TimeStepping/NestedTimeStep.cpp | 2 +-
src/GksVtkAdapter/VTKAdapter.cpp | 2 +-
src/GksVtkAdapter/VTKInterface.h | 4 ++--
44 files changed, 167 insertions(+), 19 deletions(-)
diff --git a/src/GksGpu/BoundaryConditions/AdiabaticWall.cu b/src/GksGpu/BoundaryConditions/AdiabaticWall.cu
index 642dcbe80..47786d214 100644
--- a/src/GksGpu/BoundaryConditions/AdiabaticWall.cu
+++ b/src/GksGpu/BoundaryConditions/AdiabaticWall.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -156,3 +158,5 @@ bool AdiabaticWall::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/AdiabaticWall.h b/src/GksGpu/BoundaryConditions/AdiabaticWall.h
index a499fd031..55cabf1b1 100644
--- a/src/GksGpu/BoundaryConditions/AdiabaticWall.h
+++ b/src/GksGpu/BoundaryConditions/AdiabaticWall.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct AdiabaticWallStruct
{
uint numberOfCells;
@@ -60,4 +62,6 @@ struct VF_PUBLIC AdiabaticWall : public BoundaryCondition //, public IsothermalW
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp b/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp
index 9ef87ba1c..1fca7d9b3 100644
--- a/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp
+++ b/src/GksGpu/BoundaryConditions/BoundaryCondition.cpp
@@ -11,6 +11,8 @@
#include "DataBase/DataBaseAllocator.h"
#include "DataBase/DataBaseStruct.h"
+namespace GksGpu{
+
BoundaryCondition::BoundaryCondition( SPtr<DataBase> dataBase )
: myAllocator ( dataBase->myAllocator )
{
@@ -125,3 +127,5 @@ bool BoundaryCondition::secondCellsNeeded()
{
return false;
}
+
+} // namespace GksGpu
\ No newline at end of file
diff --git a/src/GksGpu/BoundaryConditions/BoundaryCondition.h b/src/GksGpu/BoundaryConditions/BoundaryCondition.h
index 1aee9660d..8ec82c2c0 100644
--- a/src/GksGpu/BoundaryConditions/BoundaryCondition.h
+++ b/src/GksGpu/BoundaryConditions/BoundaryCondition.h
@@ -17,7 +17,8 @@
class GksMeshAdapter;
class DataBaseAllocator;
struct DataBase;
-struct BoundaryConditionStruct;
+
+namespace GksGpu{
struct BoundaryConditionStruct
{
@@ -53,6 +54,21 @@ struct VF_PUBLIC BoundaryCondition : virtual public BoundaryConditionStruct, pub
const Parameters parameters,
const uint level ) = 0;
+ BoundaryConditionStruct toStruct()
+ {
+ BoundaryConditionStruct boundaryCondition;
+
+ boundaryCondition.numberOfCells = this->numberOfCells;
+
+ boundaryCondition.ghostCells = this->ghostCells;
+ boundaryCondition.domainCells = this->domainCells;
+ boundaryCondition.secondCells = this->secondCells;
+
+ return boundaryCondition;
+ }
+
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu b/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
index 08112425a..00691bd4e 100644
--- a/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
+++ b/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.cu
@@ -33,6 +33,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -225,3 +227,5 @@ bool ConcreteHeatFlux::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h b/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
index 0df8bb4b7..899e82eb1 100644
--- a/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
+++ b/src/GksGpu/BoundaryConditions/ConcreteHeatFlux.h
@@ -15,6 +15,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct ConcreteHeatFluxStruct
{
uint numberOfCells;
@@ -102,4 +104,6 @@ struct VF_PUBLIC ConcreteHeatFlux : public BoundaryCondition //, public Isotherm
void writeVTKFile( SPtr<DataBase> dataBase, Parameters& parameters, std::string filename );
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu b/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu
index c8bb75f37..d7b7f72ce 100644
--- a/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu
+++ b/src/GksGpu/BoundaryConditions/CreepingMassFlux.cu
@@ -29,6 +29,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -144,3 +146,5 @@ bool CreepingMassFlux::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/CreepingMassFlux.h b/src/GksGpu/BoundaryConditions/CreepingMassFlux.h
index cc9ceea77..7f60f7a88 100644
--- a/src/GksGpu/BoundaryConditions/CreepingMassFlux.h
+++ b/src/GksGpu/BoundaryConditions/CreepingMassFlux.h
@@ -13,6 +13,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct CreepingMassFluxStruct
{
uint numberOfCells;
@@ -62,4 +64,6 @@ struct VF_PUBLIC CreepingMassFlux : public BoundaryCondition //, public Isotherm
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Extrapolation.cu b/src/GksGpu/BoundaryConditions/Extrapolation.cu
index 7a24585cb..67e936759 100644
--- a/src/GksGpu/BoundaryConditions/Extrapolation.cu
+++ b/src/GksGpu/BoundaryConditions/Extrapolation.cu
@@ -21,6 +21,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -102,3 +104,5 @@ bool Extrapolation::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Extrapolation.h b/src/GksGpu/BoundaryConditions/Extrapolation.h
index 9502a9fe1..c089085c0 100644
--- a/src/GksGpu/BoundaryConditions/Extrapolation.h
+++ b/src/GksGpu/BoundaryConditions/Extrapolation.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct ExtrapolationStruct
{
uint numberOfCells;
@@ -46,4 +48,6 @@ struct VF_PUBLIC Extrapolation : public BoundaryCondition //, public IsothermalW
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/HeatFlux.cu b/src/GksGpu/BoundaryConditions/HeatFlux.cu
index 4ae79ee75..402ca580b 100644
--- a/src/GksGpu/BoundaryConditions/HeatFlux.cu
+++ b/src/GksGpu/BoundaryConditions/HeatFlux.cu
@@ -29,6 +29,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -131,3 +133,5 @@ bool HeatFlux::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/HeatFlux.h b/src/GksGpu/BoundaryConditions/HeatFlux.h
index 28f5f36e8..ec3ee0b43 100644
--- a/src/GksGpu/BoundaryConditions/HeatFlux.h
+++ b/src/GksGpu/BoundaryConditions/HeatFlux.h
@@ -13,6 +13,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct HeatFluxStruct
{
uint numberOfCells;
@@ -56,4 +58,6 @@ struct VF_PUBLIC HeatFlux : public BoundaryCondition //, public IsothermalWallSt
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Inflow.cu b/src/GksGpu/BoundaryConditions/Inflow.cu
index 1308566b2..cf7e8a1c0 100644
--- a/src/GksGpu/BoundaryConditions/Inflow.cu
+++ b/src/GksGpu/BoundaryConditions/Inflow.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -161,3 +163,5 @@ bool Inflow::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Inflow.h b/src/GksGpu/BoundaryConditions/Inflow.h
index 18df4173f..27eb602df 100644
--- a/src/GksGpu/BoundaryConditions/Inflow.h
+++ b/src/GksGpu/BoundaryConditions/Inflow.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct InflowStruct
{
uint numberOfCells;
@@ -72,4 +74,6 @@ struct VF_PUBLIC Inflow : public BoundaryCondition //, public IsothermalWallStru
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/InflowComplete.cu b/src/GksGpu/BoundaryConditions/InflowComplete.cu
index 336f07bb2..b8e62893c 100644
--- a/src/GksGpu/BoundaryConditions/InflowComplete.cu
+++ b/src/GksGpu/BoundaryConditions/InflowComplete.cu
@@ -29,6 +29,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -316,3 +318,5 @@ bool InflowComplete::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/InflowComplete.h b/src/GksGpu/BoundaryConditions/InflowComplete.h
index e444bd1ba..04eead9f4 100644
--- a/src/GksGpu/BoundaryConditions/InflowComplete.h
+++ b/src/GksGpu/BoundaryConditions/InflowComplete.h
@@ -13,6 +13,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct InflowCompleteStruct
{
uint numberOfCells;
@@ -56,4 +58,6 @@ struct VF_PUBLIC InflowComplete : public BoundaryCondition //, public Isothermal
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/IsothermalWall.cu b/src/GksGpu/BoundaryConditions/IsothermalWall.cu
index ec6136293..f53387adb 100644
--- a/src/GksGpu/BoundaryConditions/IsothermalWall.cu
+++ b/src/GksGpu/BoundaryConditions/IsothermalWall.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -153,3 +155,5 @@ bool IsothermalWall::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/IsothermalWall.h b/src/GksGpu/BoundaryConditions/IsothermalWall.h
index 75481f6d9..b6db01459 100644
--- a/src/GksGpu/BoundaryConditions/IsothermalWall.h
+++ b/src/GksGpu/BoundaryConditions/IsothermalWall.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct IsothermalWallStruct
{
uint numberOfCells;
@@ -67,4 +69,6 @@ struct VF_PUBLIC IsothermalWall : public BoundaryCondition //, public Isothermal
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/MassCompensation.cu b/src/GksGpu/BoundaryConditions/MassCompensation.cu
index 668a60aeb..b010ae8e3 100644
--- a/src/GksGpu/BoundaryConditions/MassCompensation.cu
+++ b/src/GksGpu/BoundaryConditions/MassCompensation.cu
@@ -29,6 +29,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -148,3 +150,5 @@ bool MassCompensation::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/MassCompensation.h b/src/GksGpu/BoundaryConditions/MassCompensation.h
index 9ca10cc80..3a10a2e48 100644
--- a/src/GksGpu/BoundaryConditions/MassCompensation.h
+++ b/src/GksGpu/BoundaryConditions/MassCompensation.h
@@ -13,6 +13,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct MassCompensationStruct
{
uint numberOfCells;
@@ -62,4 +64,6 @@ struct VF_PUBLIC MassCompensation : public BoundaryCondition //, public Isotherm
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Open.cu b/src/GksGpu/BoundaryConditions/Open.cu
index ceaf06fb1..8afcee1b1 100644
--- a/src/GksGpu/BoundaryConditions/Open.cu
+++ b/src/GksGpu/BoundaryConditions/Open.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -187,3 +189,5 @@ bool Open::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Open.h b/src/GksGpu/BoundaryConditions/Open.h
index 1fdb0e891..9630c7fdb 100644
--- a/src/GksGpu/BoundaryConditions/Open.h
+++ b/src/GksGpu/BoundaryConditions/Open.h
@@ -13,6 +13,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct OpenStruct
{
uint numberOfCells;
@@ -60,4 +62,6 @@ struct VF_PUBLIC Open : public BoundaryCondition //, public IsothermalWallStruct
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu b/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
index ff31d1010..169afb422 100644
--- a/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
+++ b/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -197,3 +199,5 @@ bool PassiveScalarDiriclet::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h b/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
index 4e415c3d1..c4cbeac9d 100644
--- a/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
+++ b/src/GksGpu/BoundaryConditions/PassiveScalarDiriclet.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
//struct IsothermalWallStruct : virtual public BoundaryConditionStruct
//{
// Vec3 velocity;
@@ -62,4 +64,6 @@ struct VF_PUBLIC PassiveScalarDiriclet : public BoundaryCondition
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Periodic.cu b/src/GksGpu/BoundaryConditions/Periodic.cu
index 802054854..c3811d5a1 100644
--- a/src/GksGpu/BoundaryConditions/Periodic.cu
+++ b/src/GksGpu/BoundaryConditions/Periodic.cu
@@ -24,6 +24,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -148,3 +150,5 @@ bool Periodic::isWall()
{
return false;
}
+
+} // namespace GksGpu
diff --git a/src/GksGpu/BoundaryConditions/Periodic.h b/src/GksGpu/BoundaryConditions/Periodic.h
index e0418d3e7..73ff2242e 100644
--- a/src/GksGpu/BoundaryConditions/Periodic.h
+++ b/src/GksGpu/BoundaryConditions/Periodic.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct VF_PUBLIC Periodic : public BoundaryCondition
{
Periodic( SPtr<DataBase> dataBase ) : BoundaryCondition( dataBase ){}
@@ -37,4 +39,6 @@ struct VF_PUBLIC Periodic : public BoundaryCondition
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Pressure.cu b/src/GksGpu/BoundaryConditions/Pressure.cu
index fba52d0ad..1823029a4 100644
--- a/src/GksGpu/BoundaryConditions/Pressure.cu
+++ b/src/GksGpu/BoundaryConditions/Pressure.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -144,3 +146,5 @@ bool Pressure::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Pressure.h b/src/GksGpu/BoundaryConditions/Pressure.h
index ffb2889a2..5e302b60e 100644
--- a/src/GksGpu/BoundaryConditions/Pressure.h
+++ b/src/GksGpu/BoundaryConditions/Pressure.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
//struct IsothermalWallStruct : virtual public BoundaryConditionStruct
//{
// Vec3 velocity;
@@ -59,4 +61,6 @@ struct VF_PUBLIC Pressure : public BoundaryCondition
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Pressure2.cu b/src/GksGpu/BoundaryConditions/Pressure2.cu
index 0652c9eaa..2caafeec3 100644
--- a/src/GksGpu/BoundaryConditions/Pressure2.cu
+++ b/src/GksGpu/BoundaryConditions/Pressure2.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -182,3 +184,5 @@ bool Pressure2::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Pressure2.h b/src/GksGpu/BoundaryConditions/Pressure2.h
index 59bede385..586108327 100644
--- a/src/GksGpu/BoundaryConditions/Pressure2.h
+++ b/src/GksGpu/BoundaryConditions/Pressure2.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
//struct IsothermalWallStruct : virtual public BoundaryConditionStruct
//{
// Vec3 velocity;
@@ -59,4 +61,6 @@ struct VF_PUBLIC Pressure2 : public BoundaryCondition
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/SalinasVazquez.cu b/src/GksGpu/BoundaryConditions/SalinasVazquez.cu
index d1169f9ca..158378c42 100644
--- a/src/GksGpu/BoundaryConditions/SalinasVazquez.cu
+++ b/src/GksGpu/BoundaryConditions/SalinasVazquez.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -170,3 +172,5 @@ bool SalinasVazquez::secondCellsNeeded()
return true;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/SalinasVazquez.h b/src/GksGpu/BoundaryConditions/SalinasVazquez.h
index 3104f9f9e..6e0f63906 100644
--- a/src/GksGpu/BoundaryConditions/SalinasVazquez.h
+++ b/src/GksGpu/BoundaryConditions/SalinasVazquez.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct SalinasVazquezStruct
{
uint numberOfCells;
@@ -70,4 +72,6 @@ struct VF_PUBLIC SalinasVazquez : public BoundaryCondition //, public Isothermal
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/BoundaryConditions/Symmetry.cu b/src/GksGpu/BoundaryConditions/Symmetry.cu
index 152b42395..dc14b8b2d 100644
--- a/src/GksGpu/BoundaryConditions/Symmetry.cu
+++ b/src/GksGpu/BoundaryConditions/Symmetry.cu
@@ -22,6 +22,8 @@
#include "CudaUtility/CudaRunKernel.hpp"
+namespace GksGpu{
+
//////////////////////////////////////////////////////////////////////////
__global__ void boundaryConditionKernel ( const DataBaseStruct dataBase,
@@ -122,3 +124,5 @@ bool Symmetry::secondCellsNeeded()
return false;
}
+} // namespace GksGpu
+
diff --git a/src/GksGpu/BoundaryConditions/Symmetry.h b/src/GksGpu/BoundaryConditions/Symmetry.h
index 165ad040a..84385e0ac 100644
--- a/src/GksGpu/BoundaryConditions/Symmetry.h
+++ b/src/GksGpu/BoundaryConditions/Symmetry.h
@@ -11,6 +11,8 @@
#include "BoundaryConditions/BoundaryCondition.h"
+namespace GksGpu{
+
struct SymmetryStruct
{
uint numberOfCells;
@@ -52,4 +54,6 @@ struct VF_PUBLIC Symmetry : public BoundaryCondition //, public IsothermalWallSt
}
};
+} // namespace GksGpu
+
#endif
diff --git a/src/GksGpu/DataBase/DataBase.h b/src/GksGpu/DataBase/DataBase.h
index e6b5dd6d3..5a8820ace 100644
--- a/src/GksGpu/DataBase/DataBase.h
+++ b/src/GksGpu/DataBase/DataBase.h
@@ -19,7 +19,7 @@
class GksMeshAdapter;
-struct BoundaryCondition;
+namespace GksGpu{ struct BoundaryCondition; }
class DataBaseAllocator;
struct DataBase;
struct PerLevelCounts;
@@ -34,7 +34,7 @@ struct VF_PUBLIC DataBase : public std::enable_shared_from_this<DataBase>
SPtr<DataBaseAllocator> myAllocator;
- std::vector< SPtr<BoundaryCondition> > boundaryConditions;
+ std::vector< SPtr<GksGpu::BoundaryCondition> > boundaryConditions;
std::vector< std::array< SPtr< Communicator >, 6 > > communicators;
diff --git a/src/GksGpu/DataBase/DataBaseAllocator.h b/src/GksGpu/DataBase/DataBaseAllocator.h
index 397951e67..b69058898 100644
--- a/src/GksGpu/DataBase/DataBaseAllocator.h
+++ b/src/GksGpu/DataBase/DataBaseAllocator.h
@@ -11,7 +11,7 @@
class GksMeshAdapter;
struct DataBase;
-struct BoundaryCondition;
+namespace GksGpu { struct BoundaryCondition; };
struct Communicator;
class VF_PUBLIC DataBaseAllocator {
@@ -36,9 +36,9 @@ public:
//////////////////////////////////////////////////////////////////////////
- virtual void freeMemory( BoundaryCondition& boundaryCondition ) = 0;
+ virtual void freeMemory( GksGpu::BoundaryCondition& boundaryCondition ) = 0;
- virtual void allocateMemory( SPtr<BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) = 0;
+ virtual void allocateMemory( SPtr<GksGpu::BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) = 0;
//////////////////////////////////////////////////////////////////////////
diff --git a/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp b/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
index ecf1ed5b9..8ec4898d3 100644
--- a/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
+++ b/src/GksGpu/DataBase/DataBaseAllocatorCPU.cpp
@@ -192,14 +192,14 @@ int DataBaseAllocatorCPU::getCrashCellIndex(SPtr<DataBase> dataBase)
return *dataBase->crashCellIndex;
}
-void DataBaseAllocatorCPU::freeMemory(BoundaryCondition& boundaryCondition)
+void DataBaseAllocatorCPU::freeMemory(GksGpu::BoundaryCondition& boundaryCondition)
{
delete [] boundaryCondition.ghostCells ;
delete [] boundaryCondition.domainCells;
delete [] boundaryCondition.secondCells;
}
-void DataBaseAllocatorCPU::allocateMemory(SPtr<BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells)
+void DataBaseAllocatorCPU::allocateMemory(SPtr<GksGpu::BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells)
{
boundaryCondition->ghostCells = new uint[ ghostCells.size() ];
boundaryCondition->domainCells = new uint[ domainCells.size() ];
diff --git a/src/GksGpu/DataBase/DataBaseAllocatorCPU.h b/src/GksGpu/DataBase/DataBaseAllocatorCPU.h
index dfcb8d68d..30829ae91 100644
--- a/src/GksGpu/DataBase/DataBaseAllocatorCPU.h
+++ b/src/GksGpu/DataBase/DataBaseAllocatorCPU.h
@@ -26,9 +26,9 @@ public:
//////////////////////////////////////////////////////////////////////////
- virtual void freeMemory( BoundaryCondition& boundaryCondition ) override;
+ virtual void freeMemory( GksGpu::BoundaryCondition& boundaryCondition ) override;
- virtual void allocateMemory( SPtr<BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) override;
+ virtual void allocateMemory( SPtr<GksGpu::BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) override;
//////////////////////////////////////////////////////////////////////////
diff --git a/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp b/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
index f0b5985dd..f5b88d37d 100644
--- a/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
+++ b/src/GksGpu/DataBase/DataBaseAllocatorGPU.cpp
@@ -233,14 +233,14 @@ int DataBaseAllocatorGPU::getCrashCellIndex(SPtr<DataBase> dataBase)
return crashCellIndex;
}
-void DataBaseAllocatorGPU::freeMemory(BoundaryCondition& boundaryCondition)
+void DataBaseAllocatorGPU::freeMemory(GksGpu::BoundaryCondition& boundaryCondition)
{
checkCudaErrors( cudaFree ( boundaryCondition.ghostCells ) );
checkCudaErrors( cudaFree ( boundaryCondition.domainCells ) );
checkCudaErrors( cudaFree ( boundaryCondition.secondCells ) );
}
-void DataBaseAllocatorGPU::allocateMemory(SPtr<BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells)
+void DataBaseAllocatorGPU::allocateMemory(SPtr<GksGpu::BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells)
{
checkCudaErrors( cudaMalloc ( &boundaryCondition->ghostCells , sizeof(uint) * ghostCells.size() ) );
checkCudaErrors( cudaMalloc ( &boundaryCondition->domainCells, sizeof(uint) * domainCells.size() ) );
diff --git a/src/GksGpu/DataBase/DataBaseAllocatorGPU.h b/src/GksGpu/DataBase/DataBaseAllocatorGPU.h
index 0741584ed..4f60d1855 100644
--- a/src/GksGpu/DataBase/DataBaseAllocatorGPU.h
+++ b/src/GksGpu/DataBase/DataBaseAllocatorGPU.h
@@ -26,9 +26,9 @@ public:
//////////////////////////////////////////////////////////////////////////
- virtual void freeMemory( BoundaryCondition& boundaryCondition ) override;
+ virtual void freeMemory( GksGpu::BoundaryCondition& boundaryCondition ) override;
- virtual void allocateMemory( SPtr<BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) override;
+ virtual void allocateMemory( SPtr<GksGpu::BoundaryCondition> boundaryCondition, std::vector<uint> ghostCells, std::vector<uint> domainCells, std::vector<uint> secondCells ) override;
//////////////////////////////////////////////////////////////////////////
diff --git a/src/GksGpu/Definitions/PassiveScalar.h b/src/GksGpu/Definitions/PassiveScalar.h
index 97fca44e5..b71ada48a 100644
--- a/src/GksGpu/Definitions/PassiveScalar.h
+++ b/src/GksGpu/Definitions/PassiveScalar.h
@@ -1,6 +1,6 @@
#ifndef PassiveScalar_H
#define PassiveScalar_H
-#define USE_PASSIVE_SCALAR
+//#define USE_PASSIVE_SCALAR
#endif
diff --git a/src/GksGpu/TimeStepping/NestedTimeStep.cpp b/src/GksGpu/TimeStepping/NestedTimeStep.cpp
index 05c745950..4653d93b5 100644
--- a/src/GksGpu/TimeStepping/NestedTimeStep.cpp
+++ b/src/GksGpu/TimeStepping/NestedTimeStep.cpp
@@ -30,7 +30,7 @@ void TimeStepping::nestedTimeStep( SPtr<DataBase> dataBase,
//////////////////////////////////////////////////////////////////////////
- for( SPtr<BoundaryCondition> bc : dataBase->boundaryConditions )
+ for( SPtr<GksGpu::BoundaryCondition> bc : dataBase->boundaryConditions )
{
bc->runBoundaryConditionKernel( dataBase, parameters, level );
}
diff --git a/src/GksVtkAdapter/VTKAdapter.cpp b/src/GksVtkAdapter/VTKAdapter.cpp
index 00657f950..d8db04f9d 100644
--- a/src/GksVtkAdapter/VTKAdapter.cpp
+++ b/src/GksVtkAdapter/VTKAdapter.cpp
@@ -712,7 +712,7 @@ void mapFlowField(std::shared_ptr<DataBase> base, std::shared_ptr<DataBase> targ
}
}
-void VF_PUBLIC writeConcreteHeatFluxVtkXML(std::shared_ptr<DataBase> dataBase, std::shared_ptr<ConcreteHeatFlux> bc, Parameters parameters, int mode, std::string filename)
+void VF_PUBLIC writeConcreteHeatFluxVtkXML(std::shared_ptr<DataBase> dataBase, std::shared_ptr<GksGpu::ConcreteHeatFlux> bc, Parameters parameters, int mode, std::string filename)
{
*logging::out << logging::Logger::INFO_INTERMEDIATE << "Write " << filename << ".vtu" << " ... \n";
diff --git a/src/GksVtkAdapter/VTKInterface.h b/src/GksVtkAdapter/VTKInterface.h
index 61f68937e..a25a049f7 100644
--- a/src/GksVtkAdapter/VTKInterface.h
+++ b/src/GksVtkAdapter/VTKInterface.h
@@ -7,7 +7,7 @@
struct DataBase;
class TurbulenceAnalyzer;
-struct ConcreteHeatFlux;
+namespace GksGpu{ struct ConcreteHeatFlux; }
void VF_PUBLIC writeVtkXML(std::shared_ptr<DataBase> dataBase,
Parameters parameters,
@@ -33,7 +33,7 @@ void VF_PUBLIC writeTurbulenceVtkXMLParallelSummaryFile(std::shared_ptr<DataBase
void VF_PUBLIC mapFlowField( std::shared_ptr<DataBase> base, std::shared_ptr<DataBase> target );
void VF_PUBLIC writeConcreteHeatFluxVtkXML(std::shared_ptr<DataBase> dataBase,
- std::shared_ptr<ConcreteHeatFlux> bc,
+ std::shared_ptr<GksGpu::ConcreteHeatFlux> bc,
Parameters parameters,
int mode,
std::string filename);
--
GitLab