diff --git a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
index 7ecaa362cfa4253017b021cacb549ef018683a2b..5c9d40c96735b8b7e4ac159ac0bdb221e0e6c304 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
@@ -44,7 +44,7 @@ void calcCp(Parameter* para, CudaMemoryManager* cudaManager, int lev)
para->getParH(lev)->cpTop.push_back(cpTopRow);
//////////////////////////////////////////////////////////////////////////
//calc cp bottom
- for (int it = 0; it < para->getParH(lev)->numberOfPointsCpBottom; it++)
+ for (uint it = 0; it < para->getParH(lev)->numberOfPointsCpBottom; it++)
{
pressSI = (double)(para->getParH(lev)->cpPressBottom[it] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio());
cp = (double) (pressSI / (0.5 * rhoSI * veloSI * veloSI));
@@ -53,7 +53,7 @@ void calcCp(Parameter* para, CudaMemoryManager* cudaManager, int lev)
para->getParH(lev)->cpBottom.push_back(cpBottomRow);
//////////////////////////////////////////////////////////////////////////
//calc cp bottom 2
- for (int it = 0; it < para->getParH(lev)->numberOfPointsCpBottom2; it++)
+ for (uint it = 0; it < para->getParH(lev)->numberOfPointsCpBottom2; it++)
{
pressSI = (double)(para->getParH(lev)->cpPressBottom2[it] / (double)3.0 * (double)para->getDensityRatio() * (double)para->getVelocityRatio() * (double)para->getVelocityRatio());
cp = (double) (pressSI / (0.5 * rhoSI * veloSI * veloSI));
@@ -232,14 +232,14 @@ void excludeGridInterfaceNodesForMirror(Parameter* para, int lev)
{
for (unsigned int ifit = 0; ifit < para->getParH(lev)->K_CF; ifit++)
{
- if ((para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev)->intCF.ICellCFF[ifit]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborY_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborY_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborY_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
- (para->getParH(lev + 1)->cpTopIndex[it] == para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborY_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]]))
+ if ((para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev)->intCF.ICellCFF[ifit]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborY_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborY_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborY_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]) ||
+ (para->getParH(lev + 1)->cpTopIndex[it] == (int)para->getParH(lev + 1)->neighborZ_SP[para->getParH(lev + 1)->neighborY_SP[para->getParH(lev + 1)->neighborX_SP[para->getParH(lev)->intCF.ICellCFF[ifit]]]]))
{
para->getParH(lev + 1)->isOutsideInterface.push_back(false);
tempBool = false;
@@ -258,7 +258,7 @@ void excludeGridInterfaceNodesForMirror(Parameter* para, int lev)
{
for (unsigned int ifit = 0; ifit < para->getParH(lev)->K_FC; ifit++)
{
- if (para->getParH(lev)->cpTopIndex[it] == para->getParH(lev)->intFC.ICellFCC[ifit])
+ if (para->getParH(lev)->cpTopIndex[it] == (int)para->getParH(lev)->intFC.ICellFCC[ifit])
{
para->getParH(lev)->isOutsideInterface.push_back(false);
tempBool = false;
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
index df153312b489ebbe6d1cb7057797a1a3663b583f..1ebbfb6861458550a0442e927d138fb450baa2ba 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
@@ -122,7 +122,7 @@ void printDragLift(Parameter* para, CudaMemoryManager* cudaManager, int timestep
//close file
ostr.close();
//////////////////////////////////////////////////////////////////////////
- if (timestep == para->getTEnd())
+ if (timestep == (int)para->getTEnd())
{
cudaManager->cudaFreeDragLift(lev);
}
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
index d6b7ca332fbd51293471a8a54e90ce44cef130d0..42d6a3cf4845ed52648e6f65e91250bae0344cc8 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
@@ -45,7 +45,7 @@ void ForceCalculations::calcPIDControllerForForce(Parameter* para, CudaMemoryMan
{
//////////////////////////////////////////////////////////////////////////
double tempVeloX = 0.0, tempVeloY = 0.0, tempVeloZ = 0.0;
- double veloAverageX = 0.0, veloAverageY = 0.0, veloAverageZ = 0.0;
+ double veloAverageX = 0.0; //, veloAverageY = 0.0, veloAverageZ = 0.0;
double levelVeloAverageX = 0.0, levelVeloAverageY = 0.0, levelVeloAverageZ = 0.0;
int counter = 0;
//////////////////////////////////////////////////////////////////////////
@@ -94,8 +94,8 @@ void ForceCalculations::calcPIDControllerForForce(Parameter* para, CudaMemoryMan
}
//////////////////////////////////////////////////////////////////////////
veloAverageX = levelVeloAverageX / (double)counter;
- veloAverageY = levelVeloAverageY / (double)counter;
- veloAverageZ = levelVeloAverageZ / (double)counter;
+ //veloAverageY = levelVeloAverageY / (double)counter;
+ //veloAverageZ = levelVeloAverageZ / (double)counter;
//////////////////////////////////////////////////////////////////////////
if (isPID)
{
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
index e8d1cee6017c43a1447b0ba671ae9c247f75b16d..bca6574bf74671eb998b037e90d23214874683e8 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
@@ -56,10 +56,8 @@ void calcPressure(Parameter* para, std::string inorout, int lev)
{
unsigned int m = para->getParH(lev)->startP;
unsigned int anz = 0;
- real rho = 0.0f;
double sumrho = 0.0, mrho = 0.0;
double PressIn, PressOut;
- real dummyux = 0.0f, dummyuy = 0.0f, dummyuz = 0.0f;
for (unsigned int i = 0; i < para->getParH(lev)->sizePlanePress; i++)
{
@@ -97,9 +95,7 @@ void calcFlowRate(Parameter* para, int lev)
unsigned int anz = 0;
double FlowRate = 0.0;
- real rho = 0.0f;
double sumvelo = 0.0, mvelo = 0.0;
- real dummyux = 0.0f, dummyuy = 0.0f, dummyuz = 0.0f;
for (unsigned int i = 0; i < sizePlane; i++)
{
@@ -357,10 +353,10 @@ void printRE(Parameter* para, CudaMemoryManager* cudaManager, int timestep)
//////////////////////////////////////////////////////////////////////////
//fill file with data
bool doNothing = false;
- for (size_t i = 0; i < para->getParH(lev)->QPress.kQ; i++)
+ for (int i = 0; i < para->getParH(lev)->QPress.kQ; i++)
{
doNothing = false;
- for (size_t j = 0; j < 27; j++)
+ for (std::size_t j = 0; j < 27; j++)
{
if (para->getParH(lev)->kDistTestRE.f[0][j*para->getParH(lev)->QPress.kQ + i]==0)
{
@@ -379,7 +375,7 @@ void printRE(Parameter* para, CudaMemoryManager* cudaManager, int timestep)
//close file
ostr.close();
//////////////////////////////////////////////////////////////////////////
- if (timestep == para->getTEnd())
+ if (timestep == (int)para->getTEnd())
{
cudaManager->cudaFreeTestRE(lev);
}
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
index b40d67517f6c72c6fefe64249ab956e8bda739a8..45323203a1d540ddd630c9e7751a4340329e0da9 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/UpdateGrid27.cpp
@@ -78,7 +78,7 @@ void collision(Parameter* para, std::vector<std::shared_ptr<PorousMedia>>& pm, i
void collisionPorousMedia(Parameter* para, std::vector<std::shared_ptr<PorousMedia>>& pm, int level)
{
- for( int i = 0; i < pm.size(); i++ )
+ for( std::size_t i = 0; i < pm.size(); i++ )
{
KernelPMCumOneCompSP27(para->getParD(level)->numberofthreads,
para->getParD(level)->omega,
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp
index 4aade86affb031d3dbb7b9336ce051b8f348b395..a0539073347f999e680a9d96ac3d02fee65d7bec 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp
@@ -168,14 +168,14 @@ unsigned int BoundaryQs::getLevel()
void BoundaryQs::setValues(real** q27, unsigned int level) const
{
- for (int column = 0; column < values[level].size(); column++)
- for (int index = 0; index < values[level][column].size(); index++)
+ for (std::size_t column = 0; column < values[level].size(); column++)
+ for (std::size_t index = 0; index < values[level][column].size(); index++)
q27[column][index] = values[level][column][index];
}
void BoundaryQs::setIndex(int *data, unsigned int level) const
{
- for (int index = 0; index < indices[level].size(); index++)
+ for (std::size_t index = 0; index < indices[level].size(); index++)
data[index] = indices[level][index];
}
@@ -197,8 +197,8 @@ void BoundaryQs::getQs(std::vector<std::vector<std::vector<real> > > &qs) {
}
void BoundaryQs::getIndices(std::vector<std::vector<uint> > &indices) {
- for (int level = 0; level < this->indices.size(); level++)
- for (int index = 0; index < this->indices[level].size(); index++)
+ for (std::size_t level = 0; level < this->indices.size(); level++)
+ for (std::size_t index = 0; index < this->indices[level].size(); index++)
indices[level].push_back(this->indices[level][index]);
}
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp
index 434500d6f5591a27dbc2eb56ae54f658ae063d87..e987e74be46c881da98fea35cfad6606395f0aca 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp
@@ -193,13 +193,13 @@ void BoundaryValues::setBoundarys(std::vector<std::vector<std::vector<real> > >
void BoundaryValues::setValues(real* velo, unsigned int level, unsigned int column) const
{
- for (int index = 0; index < values[level][column].size(); index++)
+ for (std::size_t index = 0; index < values[level][column].size(); index++)
velo[index] = values[level][column][index];
}
void BoundaryValues::initIndex(/*unsigned*/ int *ptr, unsigned int level)
{
- for (int i = 0; i < indices[level].size(); i++)
+ for (std::size_t i = 0; i < indices[level].size(); i++)
ptr[i] = indices[level][i];
}
@@ -232,8 +232,8 @@ bool BoundaryValues::getProcNeighbor()
void BoundaryValues::setPressValues(real *RhoBC, int* kN, int level) const
{
- for (int column = 0; column < values[level].size(); column++) {
- for (int index = 0; index < values[level][column].size(); index++) {
+ for (std::size_t column = 0; column < values[level].size(); column++) {
+ for (std::size_t index = 0; index < values[level][column].size(); index++) {
if (column == 0) RhoBC[index] = values[level][column][index];
if (column == 1) kN[index] = (int)values[level][column][index];
}
@@ -242,8 +242,8 @@ void BoundaryValues::setPressValues(real *RhoBC, int* kN, int level) const
void BoundaryValues::setVelocityValues(real *vx, real *vy, real *vz, int level) const
{
- for (int column = 0; column < values[level].size(); column++) {
- for (int index = 0; index < values[level][column].size(); index++) {
+ for (std::size_t column = 0; column < values[level].size(); column++) {
+ for (std::size_t index = 0; index < values[level][column].size(); index++) {
if (column == 0) vx[index] = values[level][column][index];
if (column == 1) vy[index] = values[level][column][index];
if (column == 2) vz[index] = values[level][column][index];
@@ -253,8 +253,8 @@ void BoundaryValues::setVelocityValues(real *vx, real *vy, real *vz, int level)
void BoundaryValues::setOutflowValues(real *RhoBC, int* kN, int level) const
{
- for (int column = 0; column < values[level].size(); column++) {
- for (int index = 0; index < values[level][column].size(); index++) {
+ for (std::size_t column = 0; column < values[level].size(); column++) {
+ for (std::size_t index = 0; index < values[level][column].size(); index++) {
if (column == 0) RhoBC[index] = values[level][column][index];
if (column == 1) kN[index] = (int)values[level][column][index];
}
@@ -263,8 +263,8 @@ void BoundaryValues::setOutflowValues(real *RhoBC, int* kN, int level) const
void BoundaryValues::setStreetVelocityFractions(real *vxf, real *vyf, int level) const
{
- for (int column = 0; column < values[level].size(); column++) {
- for (int index = 0; index < values[level][column].size(); index++) {
+ for (std::size_t column = 0; column < values[level].size(); column++) {
+ for (std::size_t index = 0; index < values[level][column].size(); index++) {
if (column == 0) vxf[index] = values[level][column][index];
if (column == 1) vyf[index] = values[level][column][index];
}
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp
index 48c5199e8a27fc309c6c775a4c5ec4ad95e91fc8..4b857e0d4f7d8bcab407eb8954235d23c9325395 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp
@@ -146,13 +146,13 @@ void CoordNeighborGeoV::setVec(unsigned int level, std::vector<unsigned int> vec
void CoordNeighborGeoV::initalCoords(real *data, unsigned int level) const
{
- for (int index = 0; index < coordinates[level].size(); index++)
+ for (std::size_t index = 0; index < coordinates[level].size(); index++)
data[index] = coordinates[level][index];
}
void CoordNeighborGeoV::initalNeighbors(unsigned int *data, unsigned int level) const
{
- for (int index = 0; index < neighbors[level].size(); index++)
+ for (std::size_t index = 0; index < neighbors[level].size(); index++)
data[index] = neighbors[level][index];
}
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp
index 1916986d790e62849a951860c4498fb3b489b889..7ec0f3d3705cb6408ee6045f3442e5ea0f6b8f97 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp
@@ -38,7 +38,7 @@ void MeasuredPoints::init() {
this->levelSizes.resize(maxLevel);
this->points.resize(maxLevel);
- for (int i=0; i<maxLevel;i++) {
+ for (uint i=0; i<maxLevel; i++) {
getline(file,bufferString);
bufferInt = atoi(bufferString.c_str());
@@ -46,7 +46,7 @@ void MeasuredPoints::init() {
this->points[i].resize(levelSizes[i]);
if(levelSizes[i] != 0) {
- for ( int j=0; j<levelSizes[i]; j++) {
+ for ( uint j = 0; j < levelSizes[i]; j++) {
getline(file,bufferString);
bufferInt = atoi(bufferString.c_str());
this->points[i][j]=bufferInt;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp
index 54ee53d79065210a9aca830f42e2fdcd8bc48955..1c2363d3edd5ddba10e50d2998552b929144623d 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp
@@ -123,7 +123,7 @@ void OffsetScale::initOffset()
void OffsetScale::initArrayOffset(real *x_ptr,real *y_ptr,real *z_ptr, uint level)
{
int coordIndex = 0;
- for (int index = 0; index < offset[level].size(); index+=3)
+ for (std::size_t index = 0; index < offset[level].size(); index+=3)
{
x_ptr[coordIndex] = offset[level][index];
y_ptr[coordIndex] = offset[level][index + 1];
@@ -134,7 +134,7 @@ void OffsetScale::initArrayOffset(real *x_ptr,real *y_ptr,real *z_ptr, uint leve
void OffsetScale::initScale(unsigned int* data, unsigned int level)
{
- for (int index = 0; index < scale[level].size(); index++)
+ for (std::size_t index = 0; index < scale[level].size(); index++)
data[index] = scale[level][index];
}
diff --git a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
index e85c3680a12c167385c1641c1c5e48e2dee8da2b..7677157c4f380a914c1703248a2776250df1b1e2 100644
--- a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
+++ b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
@@ -72,7 +72,7 @@ void findQ(Parameter* para, int lev)
for(l=0;l<=26;l++){
mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
if((geo_mat[mm] == GEO_SOLID) || (geo_mat[mm] == GEO_VOID)){
- //ON[l] = -(((real)ex[l]*(real)relx + (real)ey[l]*(real)rely + (real)ez[l]*(real)relz +/*+/- Achtung, innen und außen nicht verwechseln!!*/
+ //ON[l] = -(((real)ex[l]*(real)relx + (real)ey[l]*(real)rely + (real)ez[l]*(real)relz +/*+/- Achtung, innen und au�en nicht verwechseln!!*/
// sqrt(pow((real)ex[l]*(real)relx + (real)ey[l]*(real)rely + (real)ez[l]*(real)relz,2) +
// (pow((real)ex[l],2) + pow((real)ey[l],2) + pow((real)ez[l],2))* (pow(radius,2) -
// pow((real)relx,2) - pow((real)rely,2) - pow((real)relz,2))))
@@ -389,9 +389,9 @@ void findQInflow(Parameter* para)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
- int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
//real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
unsigned int i, j, k, m;//, mm, l;
@@ -410,7 +410,7 @@ void findQInflow(Parameter* para)
int* geo_mat = para->getParH(para->getCoarse())->geo;
unsigned int* kk = para->getParH(para->getCoarse())->k;
unsigned int sizeQ = para->getParH(para->getCoarse())->kInflowQ;
- real* rhoBC = para->getParH(para->getCoarse())->Qinflow.RhoBC;
+ //real* rhoBC = para->getParH(para->getCoarse())->Qinflow.RhoBC;
real u0 = para->getVelocity();
real* vx = para->getParH(para->getCoarse())->Qinflow.Vx;
real* vy = para->getParH(para->getCoarse())->Qinflow.Vy;
@@ -418,7 +418,7 @@ void findQInflow(Parameter* para)
real*deltaVz = para->getParH(para->getCoarse())->Qinflow.deltaVz;
real* QQ = para->getParH(para->getCoarse())->Qinflow.q27[0];
QforBoundaryConditions &QIN = para->getParH(para->getCoarse())->Qinflow;
- unsigned int nxny = nx*ny;
+ //unsigned int nxny = nx*ny;
QIN.kQ = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QforBoundaryConditions Q;
@@ -450,8 +450,8 @@ void findQInflow(Parameter* para)
Q.q27[dirBSE ] = &QQ[dirBSE *sizeQ];
Q.q27[dirBNW ] = &QQ[dirBNW *sizeQ];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
- unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
+ //unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
+ //unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
//k = STARTOFFZ + 1;
k = nnz+STARTOFFZ - 1/*3*/;
@@ -656,12 +656,13 @@ void findKforQInflow(Parameter* para)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- unsigned int i, j, k, m, mm, l;
+ //unsigned int mm;
+ unsigned int i, j, k, m, l;
real test = 0.f;
//int nx = para->getParH(para->getFine())->nx;
//int ny = para->getParH(para->getFine())->ny;
@@ -688,7 +689,7 @@ void findKforQInflow(Parameter* para)
if(geo_mat[m]==GEO_FLUID){
test = (real)0.f;
for(l=0;l<=26;l++){
- mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
+ //mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
if(ez[l]==1/*-1*/){
ON[l] = (real) 1.f;
}
@@ -738,9 +739,9 @@ void findQOutflow(Parameter* para)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
- int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
//real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
unsigned int i, j, k, m;//, mm, l;
@@ -800,8 +801,8 @@ void findQOutflow(Parameter* para)
Q.q27[dirBNW ] = &QQ[dirBNW *sizeQ];
- unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
- unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
+ //unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
+ //unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
k = nnz + STARTOFFZ - 3;
@@ -865,12 +866,13 @@ void findKforQOutflow(Parameter* para)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- unsigned int i, j, k, m, mm, l;
+ //unsigned int mm;
+ unsigned int i, j, k, m, l;
real test = (real) 0.f;
//int nx = para->getParH(para->getFine())->nx;
//int ny = para->getParH(para->getFine())->ny;
@@ -896,7 +898,7 @@ void findKforQOutflow(Parameter* para)
if(geo_mat[m]==GEO_FLUID){
test = (real)0.f;
for(l=0;l<=26;l++){
- mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
+ //mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
if(ez[l]==1){
ON[l] = (real) 1.f;
}
@@ -1016,9 +1018,9 @@ void findQPressX0(Parameter* para, int lev)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
- int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
unsigned int i, j, k, m;
int nx = para->getParH(lev)->nx;
@@ -1038,7 +1040,7 @@ void findQPressX0(Parameter* para, int lev)
real*deltaVz = para->getParH(lev)->QpressX0.deltaVz;
real* QQ = para->getParH(lev)->QpressX0.q27[0];
QforBoundaryConditions &QIN = para->getParH(lev)->QpressX0;
- unsigned int nxny = nx*ny;
+ //unsigned int nxny = nx*ny;
QIN.kQ = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QforBoundaryConditions Q;
@@ -1071,8 +1073,8 @@ void findQPressX0(Parameter* para, int lev)
Q.q27[dirBNW ] = &QQ[dirBNW *sizeQ];
- unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
- unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
+ //unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
+ //unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
i=STARTOFFX+1;
//k=nnz+STARTOFFZ-3;
@@ -1129,16 +1131,17 @@ void findKforQPressX0(Parameter* para, int lev)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- unsigned int i, j, k, m, mm, l;
+ //unsigned int mm;
+ unsigned int i, j, k, m, l;
real test = (real) 0.f;
int nx = para->getParH(lev)->nx;
int ny = para->getParH(lev)->ny;
- unsigned int nnx = para->getParH(lev)->gridNX;
+ //unsigned int nnx = para->getParH(lev)->gridNX;
unsigned int nny = para->getParH(lev)->gridNY;
unsigned int nnz = para->getParH(lev)->gridNZ;
int* geo_mat = para->getParH(lev)->geo;
@@ -1156,7 +1159,7 @@ void findKforQPressX0(Parameter* para, int lev)
if(geo_mat[m]==GEO_FLUID){
test = (real)0.f;
for(l=0;l<=26;l++){
- mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
+ //mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
if(ez[l]==1){
ON[l] = (real) 1.f;
}
@@ -1181,9 +1184,9 @@ void findQPressX1(Parameter* para, int lev)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
- int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
unsigned int i, j, k, m;
int nx = para->getParH(lev)->nx;
@@ -1203,7 +1206,7 @@ void findQPressX1(Parameter* para, int lev)
real*deltaVz = para->getParH(lev)->QpressX1.deltaVz;
real* QQ = para->getParH(lev)->QpressX1.q27[0];
QforBoundaryConditions &QIN = para->getParH(lev)->QpressX1;
- unsigned int nxny = nx*ny;
+ //unsigned int nxny = nx*ny;
QIN.kQ = 0;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QforBoundaryConditions Q;
@@ -1236,8 +1239,8 @@ void findQPressX1(Parameter* para, int lev)
Q.q27[dirBNW ] = &QQ[dirBNW *sizeQ];
- unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
- unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
+ //unsigned int li = ((nnx+STARTOFFX-2)-(STARTOFFX+1)-1);
+ //unsigned int lj = ((nny+STARTOFFY-2)-(STARTOFFY+1)-1);
i=nnx+STARTOFFX-3;
//k=nnz+STARTOFFZ-3;
@@ -1294,12 +1297,13 @@ void findKforQPressX1(Parameter* para, int lev)
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////// E W N S T B NE SW SE NW TE BW BE TW TN BS BN TS ZERO TNE BNE TSE BSE TNW BNW TSW BSW ////////////////////////
- int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
- int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
+ //int ex[27]={ 1, -1, 0, 0, 0, 0, 1, -1, 1, -1, 1, -1, 1, -1, 0, 0, 0, 0, 0, 1, 1, 1, 1, -1, -1, -1, -1};
+ //int ey[27]={ 0, 0, 1, -1, 0, 0, 1, -1, -1, 1, 0, 0, 0, 0, 1, -1, 1, -1, 0, 1, 1, -1, -1, 1, 1, -1, -1};
int ez[27]={ 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, -1, -1, 1, 1, -1, -1, 1, 0, 1, -1, 1, -1, 1, -1, 1, -1};
real ON[27];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- unsigned int i, j, k, m, mm, l;
+ //unsigned int mm;
+ unsigned int i, j, k, m, l;
real test = (real) 0.f;
int nx = para->getParH(lev)->nx;
int ny = para->getParH(lev)->ny;
@@ -1321,7 +1325,7 @@ void findKforQPressX1(Parameter* para, int lev)
if(geo_mat[m]==GEO_FLUID){
test = (real)0.f;
for(l=0;l<=26;l++){
- mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
+ //mm = nx*(ny*(k+ez[l]) + (j+ey[l])) + (i+ex[l]);
if(ez[l]==1){
ON[l] = (real) 1.f;
}
diff --git a/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu
index bdb6c8c28d427b0e48c055cd73f5db0c37ccee04..b044bb70f4c12e27659d8075d74f9f39bbb4fea1 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu
@@ -4117,7 +4117,7 @@ extern "C" __global__ void QNoSlipADincomp7( int inx,
real vx1 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
real vx2 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
real vx3 = ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
- ////dörrrrrty !!!!!!!!!!!!!
+ ////d�rrrrrty !!!!!!!!!!!!!
// real vx1 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
// real vx2 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
// real vx3 = ten * ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
@@ -4134,8 +4134,8 @@ extern "C" __global__ void QNoSlipADincomp7( int inx,
//real ae = diffusivity/nue_d - one; //zero;
real f7_ZERO,f7_E,f7_W,f7_N,f7_S,f7_T,f7_B;
- real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
- real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
+ //real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
+ //real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
real TempD = temp[k];
@@ -4592,7 +4592,7 @@ extern "C" __global__ void QNoSlipADincomp27(int inx,
real f_TN = (D.f[dirBS ])[kbs ];
real f_TS = (D.f[dirBN ])[kbn ];
real f_BN = (D.f[dirTS ])[kts ];
- real f_ZERO = (D.f[dirZERO])[kzero];
+ //real f_ZERO = (D.f[dirZERO])[kzero];
real f_BSW = (D.f[dirTNE ])[ktne ];
real f_BNE = (D.f[dirTSW ])[ktsw ];
real f_BNW = (D.f[dirTSE ])[ktse ];
@@ -5034,7 +5034,7 @@ extern "C" __global__ void QADVeloIncomp7( int inx,
real vx1 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
real vx2 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
real vx3 = ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
- ////dörrrrrty !!!!!!!!!!!!!
+ ////d�rrrrrty !!!!!!!!!!!!!
// real vx1 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
// real vx2 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
// real vx3 = ten * ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
@@ -5045,8 +5045,8 @@ extern "C" __global__ void QADVeloIncomp7( int inx,
real uz_sq = vx3 * vx3;
real f7_ZERO,f7_E,f7_W,f7_N,f7_S,f7_T,f7_B;
- real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
- real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
+ //real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
+ //real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
real TempD = temp[k];
f7_ZERO = (D7.f[0])[kzero];
@@ -5556,7 +5556,7 @@ extern "C" __global__ void QADVeloIncomp27( int inx,
real f_TN = (D.f[dirBS ])[kbs ];
real f_TS = (D.f[dirBN ])[kbn ];
real f_BN = (D.f[dirTS ])[kts ];
- real f_ZERO = (D.f[dirZERO])[kzero];
+ //real f_ZERO = (D.f[dirZERO])[kzero];
real f_BSW = (D.f[dirTNE ])[ktne ];
real f_BNE = (D.f[dirTSW ])[ktsw ];
real f_BNW = (D.f[dirTSE ])[ktse ];
@@ -6025,7 +6025,7 @@ extern "C" __global__ void QADPressIncomp7(int inx,
real vx1 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
real vx2 = ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
real vx3 = ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
- ////dörrrrrty !!!!!!!!!!!!!
+ ////d�rrrrrty !!!!!!!!!!!!!
// real vx1 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)+(f_BSE-f_TNW) +(f_NE-f_SW)+(f_SE-f_NW)+(f_TE-f_BW)+(f_BE-f_TW)+(f_E-f_W));
// real vx2 = ten * ((f_TNE-f_BSW)+(f_BNE-f_TSW)+(f_BNW-f_TSE)+(f_TNW-f_BSE) +(f_NE-f_SW)+(f_NW-f_SE)+(f_TN-f_BS)+(f_BN-f_TS)+(f_N-f_S));
// real vx3 = ten * ((f_TNE-f_BSW)+(f_TSW-f_BNE)+(f_TSE-f_BNW)+(f_TNW-f_BSE) +(f_TE-f_BW)+(f_TW-f_BE)+(f_TN-f_BS)+(f_TS-f_BN)+(f_T-f_B));
@@ -6043,8 +6043,8 @@ extern "C" __global__ void QADPressIncomp7(int inx,
//real ae = diffusivity/nue_d - one;
real f7_ZERO,f7_E,f7_W,f7_N,f7_S,f7_T,f7_B;
- real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
- real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
+ //real /*feq7_ZERO,*/feq7_E,feq7_W,feq7_N,feq7_S,feq7_T,feq7_B;
+ //real /*feqW7_ZERO,*/feqW7_E,feqW7_W,feqW7_N,feqW7_S,feqW7_T,feqW7_B;
//real TempD = temp[k];
@@ -6512,7 +6512,7 @@ extern "C" __global__ void QADPressIncomp27( int inx,
real f_TN = (D.f[dirBS ])[kbs ];
real f_TS = (D.f[dirBN ])[kbn ];
real f_BN = (D.f[dirTS ])[kts ];
- real f_ZERO = (D.f[dirZERO])[kzero];
+ //real f_ZERO = (D.f[dirZERO])[kzero];
real f_BSW = (D.f[dirTNE ])[ktne ];
real f_BNE = (D.f[dirTSW ])[ktsw ];
real f_BNW = (D.f[dirTSE ])[ktse ];
diff --git a/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu b/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu
index 9484629bad04ad3af73056ccb9cc7a4f3fd16b04..684aa3687c52294c8f447f59a9a91c33fd6f4c08 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu
@@ -293,7 +293,7 @@ extern "C" __global__ void LBCalc2ndMomentsCompSP27(real* kxyFromfcNEQ,
{
//////////////////////////////////////////////////////////////////////////
//index
- unsigned int kzero= k;
+ //unsigned int kzero= k;
unsigned int ke = k;
unsigned int kw = neighborX[k];
unsigned int kn = k;
@@ -321,7 +321,8 @@ extern "C" __global__ void LBCalc2ndMomentsCompSP27(real* kxyFromfcNEQ,
unsigned int ktne = k;
unsigned int kbsw = neighborZ[ksw];
//////////////////////////////////////////////////////////////////////////
- real f_E,f_W,f_N,f_S,f_T,f_B,f_NE,f_SW,f_SE,f_NW,f_TE,f_BW,f_BE,f_TW,f_TN,f_BS,f_BN,f_TS,f_ZERO,f_TNE, f_TSW, f_TSE, f_TNW, f_BNE, f_BSW, f_BSE, f_BNW;
+ // real f_ZERO;
+ real f_E,f_W,f_N,f_S,f_T,f_B,f_NE,f_SW,f_SE,f_NW,f_TE,f_BW,f_BE,f_TW,f_TN,f_BS,f_BN,f_TS,f_TNE, f_TSW, f_TSE, f_TNW, f_BNE, f_BSW, f_BSE, f_BNW;
f_E = (D.f[dirE ])[ke ];
f_W = (D.f[dirW ])[kw ];
f_N = (D.f[dirN ])[kn ];
@@ -340,7 +341,7 @@ extern "C" __global__ void LBCalc2ndMomentsCompSP27(real* kxyFromfcNEQ,
f_BS = (D.f[dirBS ])[kbs ];
f_BN = (D.f[dirBN ])[kbn ];
f_TS = (D.f[dirTS ])[kts ];
- f_ZERO = (D.f[dirZERO])[kzero];
+ //f_ZERO = (D.f[dirZERO])[kzero];
f_TNE = (D.f[dirTNE ])[ktne ];
f_TSW = (D.f[dirTSW ])[ktsw ];
f_TSE = (D.f[dirTSE ])[ktse ];
@@ -350,18 +351,23 @@ extern "C" __global__ void LBCalc2ndMomentsCompSP27(real* kxyFromfcNEQ,
f_BSE = (D.f[dirBSE ])[kbse ];
f_BNW = (D.f[dirBNW ])[kbnw ];
//////////////////////////////////////////////////////////////////////////
- real vx1, vx2, vx3, drho, rho;
+ // real drho;
+ real vx1, vx2, vx3, rho;
kxyFromfcNEQ[k] = c0o1;
kyzFromfcNEQ[k] = c0o1;
kxzFromfcNEQ[k] = c0o1;
kxxMyyFromfcNEQ[k] = c0o1;
kxxMzzFromfcNEQ[k] = c0o1;
+ // TODO: warning #549-D: variable "rho" is used before its value is set
+ // https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/12
+ rho = 0;
+
if(geoD[k] == GEO_FLUID)
{
- drho = ((f_TNE+f_BSW)+(f_BSE+f_TNW)+(f_BNE+f_TSW)+(f_TSE+f_BNW)) +
- ((f_NE+f_SW)+(f_TE+f_BW)+(f_SE+f_NW)+(f_BE+f_TW)+(f_BN+f_TS)+(f_TN+f_BS)) +
- ((f_E-f_W) + (f_N-f_S) + (f_T-f_B)) + f_ZERO;
+ // drho = ((f_TNE+f_BSW)+(f_BSE+f_TNW)+(f_BNE+f_TSW)+(f_TSE+f_BNW)) +
+ // ((f_NE+f_SW)+(f_TE+f_BW)+(f_SE+f_NW)+(f_BE+f_TW)+(f_BN+f_TS)+(f_TN+f_BS)) +
+ // ((f_E-f_W) + (f_N-f_S) + (f_T-f_B)) + f_ZERO;
rho = rho + c1o1;
vx1 = ((f_TNE-f_BSW)+(f_BSE-f_TNW)+(f_BNE-f_TSW)+(f_TSE-f_BNW)) + (((f_NE-f_SW)+(f_TE-f_BW))+((f_SE-f_NW)+(f_BE-f_TW))) + (f_E-f_W) / rho;
vx2 = ((f_TNE-f_BSW)+(f_TNW-f_BSE)+(f_BNE-f_TSW)+(f_BNW-f_TSE)) + (((f_NE-f_SW)+(f_TN-f_BS))+((f_BN-f_TS)+(f_NW-f_SE))) + (f_N-f_S) / rho;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu b/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu
index b626a1b847d13f888562b69065b151818c2bb86e..69c0b88596f185812c5cb30fac47daca8d820ddf 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu
@@ -1494,7 +1494,7 @@ extern "C" __global__ void LBCalcMedCompSP27( real* vxD,
{
//////////////////////////////////////////////////////////////////////////
//index
- unsigned int kzero= k;
+ //unsigned int kzero= k;
unsigned int ke = k;
unsigned int kw = neighborX[k];
unsigned int kn = k;
@@ -1836,7 +1836,7 @@ extern "C" __global__ void LBCalcMedCompAD27(
{
//////////////////////////////////////////////////////////////////////////
//index
- unsigned int kzero = k;
+ //unsigned int kzero = k;
unsigned int ke = k;
unsigned int kw = neighborX[k];
unsigned int kn = k;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu
index bc86f1a90fb7a61c8679b261eae5176572d059c6..d0ee5eb6175216937f21b0a3c95876a018a6a45b 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu
@@ -3531,8 +3531,8 @@ extern "C" __global__ void LB_Kernel_Kum_New_SP_27( real omega,
vy2=vvy*vvy;
vz2=vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimit = 0.01f;
+ //real wadjust;
+ //real qudricLimit = 0.01f;
//real s9 = minusomega;
//test
//s9 = 0.;
@@ -5630,10 +5630,10 @@ extern "C" __global__ void LB_Kernel_Kum_New_Comp_SRT_SP_27(
vy2 = vvy*vvy;
vz2 = vvz*vvz;
//////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimitP = c1o100;// * 0.0001f;
- real qudricLimitM = c1o100;// * 0.0001f;
- real qudricLimitD = c1o100;// * 0.001f;
+ //real wadjust;
+ //real qudricLimitP = c1o100;// * 0.0001f;
+ //real qudricLimitM = c1o100;// * 0.0001f;
+ //real qudricLimitD = c1o100;// * 0.001f;
////////////////////////////////////////////////////////////////////////////////////
//Hin
////////////////////////////////////////////////////////////////////////////////////
@@ -5875,7 +5875,7 @@ extern "C" __global__ void LB_Kernel_Kum_New_Comp_SRT_SP_27(
//////////////////////////////
real OxyyPxzz = omega;
real OxyyMxzz = omega;
- real Oxyz = omega;
+ //real Oxyz = omega;
////////////////////////////////////////////////////////////
//4.
//////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu
index 8bfdfb3b9421baa4290cd305542520b28aa5fd17..b6d77f648e81c73b6ee472b62e18f7b98c83676e 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu
@@ -265,8 +265,8 @@ extern "C" __global__ void Cumulant_One_preconditioned_errorDiffusion_chim_Comp_
//real omega = omega_in;
////////////////////////////////////////////////////////////////////////////////////
//fast
- real oMdrho = c1o1; // comp special
- real m0, m1, m2;
+ //real oMdrho = c1o1; // comp special
+ //real m0, m1, m2;
real vx2;
real vy2;
real vz2;
@@ -274,10 +274,10 @@ extern "C" __global__ void Cumulant_One_preconditioned_errorDiffusion_chim_Comp_
vy2 = vvy*vvy;
vz2 = vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimitP = c1o100;// * 0.0001f;
- real qudricLimitM = c1o100;// * 0.0001f;
- real qudricLimitD = c1o100;// * 0.001f;
+ //real wadjust;
+ //real qudricLimitP = c1o100;// * 0.0001f;
+ //real qudricLimitM = c1o100;// * 0.0001f;
+ //real qudricLimitD = c1o100;// * 0.001f;
//real s9 = minusomega;
//test
//s9 = 0.;
@@ -486,7 +486,7 @@ extern "C" __global__ void Cumulant_One_preconditioned_errorDiffusion_chim_Comp_
//////////////////////////////
real OxyyPxzz = c1o1;
real OxyyMxzz = c1o1;
- real Oxyz = c1o1;
+ //real Oxyz = c1o1;
////////////////////////////////////////////////////////////
//4.
//////////////////////////////
@@ -1180,8 +1180,8 @@ extern "C" __global__ void Cumulant_One_preconditioned_chim_Comp_SP_27(
//real omega = omega_in;
////////////////////////////////////////////////////////////////////////////////////
//fast
- real oMdrho = c1o1; // comp special
- real m0, m1, m2;
+ //real oMdrho = c1o1; // comp special
+ //real m0, m1, m2;
real vx2;
real vy2;
real vz2;
@@ -1189,10 +1189,10 @@ extern "C" __global__ void Cumulant_One_preconditioned_chim_Comp_SP_27(
vy2 = vvy*vvy;
vz2 = vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimitP = c1o100;// * 0.0001f;
- real qudricLimitM = c1o100;// * 0.0001f;
- real qudricLimitD = c1o100;// * 0.001f;
+ //real wadjust;
+ //real qudricLimitP = c1o100;// * 0.0001f;
+ //real qudricLimitM = c1o100;// * 0.0001f;
+ //real qudricLimitD = c1o100;// * 0.001f;
//real s9 = minusomega;
//test
//s9 = 0.;
@@ -1401,7 +1401,7 @@ extern "C" __global__ void Cumulant_One_preconditioned_chim_Comp_SP_27(
//////////////////////////////
real OxyyPxzz = c1o1;
real OxyyMxzz = c1o1;
- real Oxyz = c1o1;
+ //real Oxyz = c1o1;
////////////////////////////////////////////////////////////
//4.
//////////////////////////////
@@ -1953,8 +1953,8 @@ extern "C" __global__ void Cumulant_One_chim_Comp_SP_27(
//real omega = omega_in;
////////////////////////////////////////////////////////////////////////////////////
//fast
- real oMdrho = c1o1; // comp special
- real m0, m1, m2;
+ //real oMdrho = c1o1; // comp special
+ //real m0, m1, m2;
real vx2;
real vy2;
real vz2;
@@ -1962,10 +1962,10 @@ extern "C" __global__ void Cumulant_One_chim_Comp_SP_27(
vy2 = vvy*vvy;
vz2 = vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimitP = c1o100;// * 0.0001f;
- real qudricLimitM = c1o100;// * 0.0001f;
- real qudricLimitD = c1o100;// * 0.001f;
+ //real wadjust;
+ //real qudricLimitP = c1o100;// * 0.0001f;
+ //real qudricLimitM = c1o100;// * 0.0001f;
+ //real qudricLimitD = c1o100;// * 0.001f;
////////////////////////////////////////////////////////////////////////////////////
//Hin
////////////////////////////////////////////////////////////////////////////////////
@@ -2019,7 +2019,7 @@ extern "C" __global__ void Cumulant_One_chim_Comp_SP_27(
//////////////////////////////
real OxyyPxzz = c1o1;
real OxyyMxzz = c1o1;
- real Oxyz = c1o1;
+ //real Oxyz = c1o1;
////////////////////////////////////////////////////////////
//4.
//////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu
index 71d839609ec400fac4addb22224f18a69a5a9035..feb392b1d400b28ce91397ca22af7c789d947afb 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu
@@ -230,10 +230,10 @@ extern "C" __global__ void LB_PostProcessor_F3_2018_Fehlberg(real omega,
vy2 = vvy*vvy;
vz2 = vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
- real wadjust;
- real qudricLimitP = 0.01f;// * 0.0001f;
- real qudricLimitM = 0.01f;// * 0.0001f;
- real qudricLimitD = 0.01f;// * 0.001f;
+ //real wadjust;
+ //real qudricLimitP = 0.01f;// * 0.0001f;
+ //real qudricLimitM = 0.01f;// * 0.0001f;
+ //real qudricLimitD = 0.01f;// * 0.001f;
////////////////////////////////////////////////////////////////////////////////////
//Hin
////////////////////////////////////////////////////////////////////////////////////
@@ -476,22 +476,6 @@ extern "C" __global__ void LB_PostProcessor_F3_2018_Fehlberg(real omega,
real OxyyMxzz = c8o1*(-c2o1 + omega)*(-c7o1 + c4o1*omega) / (c56o1 - c50o1*omega + c9o1*omega*omega);//one;
real Oxyz = c24o1*(-c2o1 + omega)*(-c2o1 - c7o1*omega + c3o1*omega*omega) / (c48o1 + c152o1*omega - c130o1*omega*omega + c29o1*omega*omega*omega);//one;
////////////////////////////////////////////////////////////
- //4.
- //////////////////////////////
- real O4 = c1o1;
- //////////////////////////////
- //real O4 = omega;//TRT
- ////////////////////////////////////////////////////////////
- //5.
- //////////////////////////////
- real O5 = c1o1;
- ////////////////////////////////////////////////////////////
- //6.
- //////////////////////////////
- real O6 = c1o1;
- ////////////////////////////////////////////////////////////
-
-
//central moments to cumulants
//4.
real CUMcbb = mfcbb - ((mfcaa + c1o3) * mfabb + c2o1 * mfbba * mfbab) / rho;
@@ -2239,7 +2223,7 @@ extern "C" __global__ void LB_PostProcessor_F3_2018_Fehlberg(real omega,
// // mfbbc-mfbba;
// ////////////////////////////////////////////////////////////////////////////////////
// // oMdrho assembler style -------> faaaaaastaaaa
-// // or much sloooowaaaa ... it depändssssss on sadaku
+// // or much sloooowaaaa ... it dep�ndssssss on sadaku
// real m0, m1, m2;
// //real oMdrho;
// //{
diff --git a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu
index 39c63e152c7a5ab88d8d416591a737d56a5d23b3..193a1c2e7e1217429e90d7ec2cf6c2a06e1098d1 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu
@@ -195,7 +195,8 @@ extern "C" __global__ void MoveParticles( real* coordX,
const unsigned k = nx*(ny*iz + iy) + ix;
//////////////////////////////////////////////////////////////////////////
- real press,vx1,vx2,vx3;
+ //real press;
+ real vx1,vx2,vx3;
real drho_SWT,vx1_SWT,vx2_SWT,vx3_SWT;
real drho_NWT,vx1_NWT,vx2_NWT,vx3_NWT;
real drho_NET,vx1_NET,vx2_NET,vx3_NET;
@@ -215,7 +216,7 @@ extern "C" __global__ void MoveParticles( real* coordX,
real kxyFromfcNEQ_NEB, kyzFromfcNEQ_NEB, kxzFromfcNEQ_NEB, kxxMyyFromfcNEQ_NEB, kxxMzzFromfcNEQ_NEB;
real kxyFromfcNEQ_SEB, kyzFromfcNEQ_SEB, kxzFromfcNEQ_SEB, kxxMyyFromfcNEQ_SEB, kxxMzzFromfcNEQ_SEB;
real a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
- real d0, dx, dy, dz, dxy, dxz, dyz, dxyz;
+ //real d0, dx, dy, dz, dxy, dxz, dyz, dxyz;
real x,y,z;
@@ -862,14 +863,14 @@ extern "C" __global__ void MoveParticles( real* coordX,
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//drho
- d0 = ( drho_NEB + drho_NET + drho_NWB + drho_NWT + drho_SEB + drho_SET + drho_SWB + drho_SWT) * c1o8;
- dx = ( drho_NEB + drho_NET - drho_NWB - drho_NWT + drho_SEB + drho_SET - drho_SWB - drho_SWT) * c1o4;
- dy = ( drho_NEB + drho_NET + drho_NWB + drho_NWT - drho_SEB - drho_SET - drho_SWB - drho_SWT) * c1o4;
- dz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT - drho_SEB + drho_SET - drho_SWB + drho_SWT) * c1o4;
- dxy = ( drho_NEB + drho_NET - drho_NWB - drho_NWT - drho_SEB - drho_SET + drho_SWB + drho_SWT) * c1o2;
- dxz = (-drho_NEB + drho_NET + drho_NWB - drho_NWT - drho_SEB + drho_SET + drho_SWB - drho_SWT) * c1o2;
- dyz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT + drho_SEB - drho_SET + drho_SWB - drho_SWT) * c1o2;
- dxyz = -drho_NEB + drho_NET + drho_NWB - drho_NWT + drho_SEB - drho_SET - drho_SWB + drho_SWT;
+ // d0 = ( drho_NEB + drho_NET + drho_NWB + drho_NWT + drho_SEB + drho_SET + drho_SWB + drho_SWT) * c1o8;
+ // dx = ( drho_NEB + drho_NET - drho_NWB - drho_NWT + drho_SEB + drho_SET - drho_SWB - drho_SWT) * c1o4;
+ // dy = ( drho_NEB + drho_NET + drho_NWB + drho_NWT - drho_SEB - drho_SET - drho_SWB - drho_SWT) * c1o4;
+ // dz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT - drho_SEB + drho_SET - drho_SWB + drho_SWT) * c1o4;
+ // dxy = ( drho_NEB + drho_NET - drho_NWB - drho_NWT - drho_SEB - drho_SET + drho_SWB + drho_SWT) * c1o2;
+ // dxz = (-drho_NEB + drho_NET + drho_NWB - drho_NWT - drho_SEB + drho_SET + drho_SWB - drho_SWT) * c1o2;
+ // dyz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT + drho_SEB - drho_SET + drho_SWB - drho_SWT) * c1o2;
+ // dxyz = -drho_NEB + drho_NET + drho_NWB - drho_NWT + drho_SEB - drho_SET - drho_SWB + drho_SWT;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -882,7 +883,7 @@ extern "C" __global__ void MoveParticles( real* coordX,
y = (localY * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4;
z = (localZ * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz;
+ //press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz;
vx1 = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz);
vx2 = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz);
vx3 = (c0 + x*cx + y*cy + z*cz + x*x*cxx + y*y*cyy + z*z*czz + x*y*cxy + x*z*cxz + y*z*cyz + x*y*z*cxyz);
@@ -1066,7 +1067,8 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX,
const unsigned k = nx*(ny*iz + iy) + ix;
//////////////////////////////////////////////////////////////////////////
- real press,vx1,vx2,vx3;
+ //real press;
+ real vx1,vx2,vx3;
real drho_SWT,vx1_SWT,vx2_SWT,vx3_SWT;
real drho_NWT,vx1_NWT,vx2_NWT,vx3_NWT;
real drho_NET,vx1_NET,vx2_NET,vx3_NET;
@@ -1086,7 +1088,7 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX,
real kxyFromfcNEQ_NEB, kyzFromfcNEQ_NEB, kxzFromfcNEQ_NEB, kxxMyyFromfcNEQ_NEB, kxxMzzFromfcNEQ_NEB;
real kxyFromfcNEQ_SEB, kyzFromfcNEQ_SEB, kxzFromfcNEQ_SEB, kxxMyyFromfcNEQ_SEB, kxxMzzFromfcNEQ_SEB;
real a0, ax, ay, az, axx, ayy, azz, axy, axz, ayz, b0, bx, by, bz, bxx, byy, bzz, bxy, bxz, byz, c0, cx, cy, cz, cxx, cyy, czz, cxy, cxz, cyz, axyz, bxyz, cxyz;
- real d0, dx, dy, dz, dxy, dxz, dyz, dxyz;
+ //real d0, dx, dy, dz, dxy, dxz, dyz, dxyz;
real x,y,z;
@@ -1727,14 +1729,14 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX,
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//drho
- d0 = ( drho_NEB + drho_NET + drho_NWB + drho_NWT + drho_SEB + drho_SET + drho_SWB + drho_SWT) * c1o8;
- dx = ( drho_NEB + drho_NET - drho_NWB - drho_NWT + drho_SEB + drho_SET - drho_SWB - drho_SWT) * c1o4;
- dy = ( drho_NEB + drho_NET + drho_NWB + drho_NWT - drho_SEB - drho_SET - drho_SWB - drho_SWT) * c1o4;
- dz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT - drho_SEB + drho_SET - drho_SWB + drho_SWT) * c1o4;
- dxy = ( drho_NEB + drho_NET - drho_NWB - drho_NWT - drho_SEB - drho_SET + drho_SWB + drho_SWT) * c1o2;
- dxz = (-drho_NEB + drho_NET + drho_NWB - drho_NWT - drho_SEB + drho_SET + drho_SWB - drho_SWT) * c1o2;
- dyz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT + drho_SEB - drho_SET + drho_SWB - drho_SWT) * c1o2;
- dxyz = -drho_NEB + drho_NET + drho_NWB - drho_NWT + drho_SEB - drho_SET - drho_SWB + drho_SWT;
+ // d0 = ( drho_NEB + drho_NET + drho_NWB + drho_NWT + drho_SEB + drho_SET + drho_SWB + drho_SWT) * c1o8;
+ // dx = ( drho_NEB + drho_NET - drho_NWB - drho_NWT + drho_SEB + drho_SET - drho_SWB - drho_SWT) * c1o4;
+ // dy = ( drho_NEB + drho_NET + drho_NWB + drho_NWT - drho_SEB - drho_SET - drho_SWB - drho_SWT) * c1o4;
+ // dz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT - drho_SEB + drho_SET - drho_SWB + drho_SWT) * c1o4;
+ // dxy = ( drho_NEB + drho_NET - drho_NWB - drho_NWT - drho_SEB - drho_SET + drho_SWB + drho_SWT) * c1o2;
+ // dxz = (-drho_NEB + drho_NET + drho_NWB - drho_NWT - drho_SEB + drho_SET + drho_SWB - drho_SWT) * c1o2;
+ // dyz = (-drho_NEB + drho_NET - drho_NWB + drho_NWT + drho_SEB - drho_SET + drho_SWB - drho_SWT) * c1o2;
+ // dxyz = -drho_NEB + drho_NET + drho_NWB - drho_NWT + drho_SEB - drho_SET - drho_SWB + drho_SWT;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1747,7 +1749,7 @@ extern "C" __global__ void MoveParticlesWithoutBCs( real* coordX,
y = (localY * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4;
z = (localZ * (real)(pow((double)c2o1, (double)level))) - c1o2; //-c1o4;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz;
+ //press = d0 + x*dx + y*dy + z*dz + x*y*dxy + x*z*dxz + y*z*dyz + x*y*z*dxyz;
vx1 = (a0 + x*ax + y*ay + z*az + x*x*axx + y*y*ayy + z*z*azz + x*y*axy + x*z*axz + y*z*ayz + x*y*z*axyz);
vx2 = (b0 + x*bx + y*by + z*bz + x*x*bxx + y*y*byy + z*z*bzz + x*y*bxy + x*z*bxz + y*z*byz + x*y*z*bxyz);
vx3 = (c0 + x*cx + y*cy + z*cz + x*x*cxx + y*y*cyy + z*z*czz + x*y*cxy + x*z*cxz + y*z*cyz + x*y*z*cxyz);
@@ -2002,133 +2004,134 @@ extern "C" __global__ void ParticleNoSlipDeviceComp27(real* coordX,
if(k<sizeQ)
{
////////////////////////////////////////////////////////////////////////////////
- real *q_dirE, *q_dirW, *q_dirN, *q_dirS, *q_dirT, *q_dirB,
- *q_dirNE, *q_dirSW, *q_dirSE, *q_dirNW, *q_dirTE, *q_dirBW,
- *q_dirBE, *q_dirTW, *q_dirTN, *q_dirBS, *q_dirBN, *q_dirTS,
- *q_dirTNE, *q_dirTSW, *q_dirTSE, *q_dirTNW, *q_dirBNE, *q_dirBSW,
- *q_dirBSE, *q_dirBNW;
- q_dirE = &QQ[dirE *sizeQ];
- q_dirW = &QQ[dirW *sizeQ];
- q_dirN = &QQ[dirN *sizeQ];
- q_dirS = &QQ[dirS *sizeQ];
- q_dirT = &QQ[dirT *sizeQ];
- q_dirB = &QQ[dirB *sizeQ];
- q_dirNE = &QQ[dirNE *sizeQ];
- q_dirSW = &QQ[dirSW *sizeQ];
- q_dirSE = &QQ[dirSE *sizeQ];
- q_dirNW = &QQ[dirNW *sizeQ];
- q_dirTE = &QQ[dirTE *sizeQ];
- q_dirBW = &QQ[dirBW *sizeQ];
- q_dirBE = &QQ[dirBE *sizeQ];
- q_dirTW = &QQ[dirTW *sizeQ];
- q_dirTN = &QQ[dirTN *sizeQ];
- q_dirBS = &QQ[dirBS *sizeQ];
- q_dirBN = &QQ[dirBN *sizeQ];
- q_dirTS = &QQ[dirTS *sizeQ];
- q_dirTNE = &QQ[dirTNE *sizeQ];
- q_dirTSW = &QQ[dirTSW *sizeQ];
- q_dirTSE = &QQ[dirTSE *sizeQ];
- q_dirTNW = &QQ[dirTNW *sizeQ];
- q_dirBNE = &QQ[dirBNE *sizeQ];
- q_dirBSW = &QQ[dirBSW *sizeQ];
- q_dirBSE = &QQ[dirBSE *sizeQ];
- q_dirBNW = &QQ[dirBNW *sizeQ];
+ real *q_dirW, *q_dirS, *q_dirB;
+ // real *q_dirE, *q_dirW, *q_dirN, *q_dirS, *q_dirT, *q_dirB,
+ // *q_dirNE, *q_dirSW, *q_dirSE, *q_dirNW, *q_dirTE, *q_dirBW,
+ // *q_dirBE, *q_dirTW, *q_dirTN, *q_dirBS, *q_dirBN, *q_dirTS,
+ // *q_dirTNE, *q_dirTSW, *q_dirTSE, *q_dirTNW, *q_dirBNE, *q_dirBSW,
+ // *q_dirBSE, *q_dirBNW;
+ // q_dirE = &QQ[dirE *sizeQ];
+ q_dirW = &QQ[dirW *sizeQ];
+ // q_dirN = &QQ[dirN *sizeQ];
+ q_dirS = &QQ[dirS *sizeQ];
+ // q_dirT = &QQ[dirT *sizeQ];
+ q_dirB = &QQ[dirB *sizeQ];
+ // q_dirNE = &QQ[dirNE *sizeQ];
+ // q_dirSW = &QQ[dirSW *sizeQ];
+ // q_dirSE = &QQ[dirSE *sizeQ];
+ // q_dirNW = &QQ[dirNW *sizeQ];
+ // q_dirTE = &QQ[dirTE *sizeQ];
+ // q_dirBW = &QQ[dirBW *sizeQ];
+ // q_dirBE = &QQ[dirBE *sizeQ];
+ // q_dirTW = &QQ[dirTW *sizeQ];
+ // q_dirTN = &QQ[dirTN *sizeQ];
+ // q_dirBS = &QQ[dirBS *sizeQ];
+ // q_dirBN = &QQ[dirBN *sizeQ];
+ // q_dirTS = &QQ[dirTS *sizeQ];
+ // q_dirTNE = &QQ[dirTNE *sizeQ];
+ // q_dirTSW = &QQ[dirTSW *sizeQ];
+ // q_dirTSE = &QQ[dirTSE *sizeQ];
+ // q_dirTNW = &QQ[dirTNW *sizeQ];
+ // q_dirBNE = &QQ[dirBNE *sizeQ];
+ // q_dirBSW = &QQ[dirBSW *sizeQ];
+ // q_dirBSE = &QQ[dirBSE *sizeQ];
+ // q_dirBNW = &QQ[dirBNW *sizeQ];
////////////////////////////////////////////////////////////////////////////////
- real *nx_dirE, *nx_dirW, *nx_dirN, *nx_dirS, *nx_dirT, *nx_dirB,
- *nx_dirNE, *nx_dirSW, *nx_dirSE, *nx_dirNW, *nx_dirTE, *nx_dirBW,
- *nx_dirBE, *nx_dirTW, *nx_dirTN, *nx_dirBS, *nx_dirBN, *nx_dirTS,
- *nx_dirTNE, *nx_dirTSW, *nx_dirTSE, *nx_dirTNW, *nx_dirBNE, *nx_dirBSW,
- *nx_dirBSE, *nx_dirBNW;
- nx_dirE = &NormalX[dirE *sizeQ];
- nx_dirW = &NormalX[dirW *sizeQ];
- nx_dirN = &NormalX[dirN *sizeQ];
- nx_dirS = &NormalX[dirS *sizeQ];
- nx_dirT = &NormalX[dirT *sizeQ];
- nx_dirB = &NormalX[dirB *sizeQ];
- nx_dirNE = &NormalX[dirNE *sizeQ];
- nx_dirSW = &NormalX[dirSW *sizeQ];
- nx_dirSE = &NormalX[dirSE *sizeQ];
- nx_dirNW = &NormalX[dirNW *sizeQ];
- nx_dirTE = &NormalX[dirTE *sizeQ];
- nx_dirBW = &NormalX[dirBW *sizeQ];
- nx_dirBE = &NormalX[dirBE *sizeQ];
- nx_dirTW = &NormalX[dirTW *sizeQ];
- nx_dirTN = &NormalX[dirTN *sizeQ];
- nx_dirBS = &NormalX[dirBS *sizeQ];
- nx_dirBN = &NormalX[dirBN *sizeQ];
- nx_dirTS = &NormalX[dirTS *sizeQ];
- nx_dirTNE = &NormalX[dirTNE *sizeQ];
- nx_dirTSW = &NormalX[dirTSW *sizeQ];
- nx_dirTSE = &NormalX[dirTSE *sizeQ];
- nx_dirTNW = &NormalX[dirTNW *sizeQ];
- nx_dirBNE = &NormalX[dirBNE *sizeQ];
- nx_dirBSW = &NormalX[dirBSW *sizeQ];
- nx_dirBSE = &NormalX[dirBSE *sizeQ];
- nx_dirBNW = &NormalX[dirBNW *sizeQ];
+ // real *nx_dirE, *nx_dirW, *nx_dirN, *nx_dirS, *nx_dirT, *nx_dirB,
+ // *nx_dirNE, *nx_dirSW, *nx_dirSE, *nx_dirNW, *nx_dirTE, *nx_dirBW,
+ // *nx_dirBE, *nx_dirTW, *nx_dirTN, *nx_dirBS, *nx_dirBN, *nx_dirTS,
+ // *nx_dirTNE, *nx_dirTSW, *nx_dirTSE, *nx_dirTNW, *nx_dirBNE, *nx_dirBSW,
+ // *nx_dirBSE, *nx_dirBNW;
+ // nx_dirE = &NormalX[dirE *sizeQ];
+ // nx_dirW = &NormalX[dirW *sizeQ];
+ // nx_dirN = &NormalX[dirN *sizeQ];
+ // nx_dirS = &NormalX[dirS *sizeQ];
+ // nx_dirT = &NormalX[dirT *sizeQ];
+ // nx_dirB = &NormalX[dirB *sizeQ];
+ // nx_dirNE = &NormalX[dirNE *sizeQ];
+ // nx_dirSW = &NormalX[dirSW *sizeQ];
+ // nx_dirSE = &NormalX[dirSE *sizeQ];
+ // nx_dirNW = &NormalX[dirNW *sizeQ];
+ // nx_dirTE = &NormalX[dirTE *sizeQ];
+ // nx_dirBW = &NormalX[dirBW *sizeQ];
+ // nx_dirBE = &NormalX[dirBE *sizeQ];
+ // nx_dirTW = &NormalX[dirTW *sizeQ];
+ // nx_dirTN = &NormalX[dirTN *sizeQ];
+ // nx_dirBS = &NormalX[dirBS *sizeQ];
+ // nx_dirBN = &NormalX[dirBN *sizeQ];
+ // nx_dirTS = &NormalX[dirTS *sizeQ];
+ // nx_dirTNE = &NormalX[dirTNE *sizeQ];
+ // nx_dirTSW = &NormalX[dirTSW *sizeQ];
+ // nx_dirTSE = &NormalX[dirTSE *sizeQ];
+ // nx_dirTNW = &NormalX[dirTNW *sizeQ];
+ // nx_dirBNE = &NormalX[dirBNE *sizeQ];
+ // nx_dirBSW = &NormalX[dirBSW *sizeQ];
+ // nx_dirBSE = &NormalX[dirBSE *sizeQ];
+ // nx_dirBNW = &NormalX[dirBNW *sizeQ];
////////////////////////////////////////////////////////////////////////////////
- real *ny_dirE, *ny_dirW, *ny_dirN, *ny_dirS, *ny_dirT, *ny_dirB,
- *ny_dirNE, *ny_dirSW, *ny_dirSE, *ny_dirNW, *ny_dirTE, *ny_dirBW,
- *ny_dirBE, *ny_dirTW, *ny_dirTN, *ny_dirBS, *ny_dirBN, *ny_dirTS,
- *ny_dirTNE, *ny_dirTSW, *ny_dirTSE, *ny_dirTNW, *ny_dirBNE, *ny_dirBSW,
- *ny_dirBSE, *ny_dirBNW;
- ny_dirE = &NormalY[dirE *sizeQ];
- ny_dirW = &NormalY[dirW *sizeQ];
- ny_dirN = &NormalY[dirN *sizeQ];
- ny_dirS = &NormalY[dirS *sizeQ];
- ny_dirT = &NormalY[dirT *sizeQ];
- ny_dirB = &NormalY[dirB *sizeQ];
- ny_dirNE = &NormalY[dirNE *sizeQ];
- ny_dirSW = &NormalY[dirSW *sizeQ];
- ny_dirSE = &NormalY[dirSE *sizeQ];
- ny_dirNW = &NormalY[dirNW *sizeQ];
- ny_dirTE = &NormalY[dirTE *sizeQ];
- ny_dirBW = &NormalY[dirBW *sizeQ];
- ny_dirBE = &NormalY[dirBE *sizeQ];
- ny_dirTW = &NormalY[dirTW *sizeQ];
- ny_dirTN = &NormalY[dirTN *sizeQ];
- ny_dirBS = &NormalY[dirBS *sizeQ];
- ny_dirBN = &NormalY[dirBN *sizeQ];
- ny_dirTS = &NormalY[dirTS *sizeQ];
- ny_dirTNE = &NormalY[dirTNE *sizeQ];
- ny_dirTSW = &NormalY[dirTSW *sizeQ];
- ny_dirTSE = &NormalY[dirTSE *sizeQ];
- ny_dirTNW = &NormalY[dirTNW *sizeQ];
- ny_dirBNE = &NormalY[dirBNE *sizeQ];
- ny_dirBSW = &NormalY[dirBSW *sizeQ];
- ny_dirBSE = &NormalY[dirBSE *sizeQ];
- ny_dirBNW = &NormalY[dirBNW *sizeQ];
+ // real *ny_dirE, *ny_dirW, *ny_dirN, *ny_dirS, *ny_dirT, *ny_dirB,
+ // *ny_dirNE, *ny_dirSW, *ny_dirSE, *ny_dirNW, *ny_dirTE, *ny_dirBW,
+ // *ny_dirBE, *ny_dirTW, *ny_dirTN, *ny_dirBS, *ny_dirBN, *ny_dirTS,
+ // *ny_dirTNE, *ny_dirTSW, *ny_dirTSE, *ny_dirTNW, *ny_dirBNE, *ny_dirBSW,
+ // *ny_dirBSE, *ny_dirBNW;
+ // ny_dirE = &NormalY[dirE *sizeQ];
+ // ny_dirW = &NormalY[dirW *sizeQ];
+ // ny_dirN = &NormalY[dirN *sizeQ];
+ // ny_dirS = &NormalY[dirS *sizeQ];
+ // ny_dirT = &NormalY[dirT *sizeQ];
+ // ny_dirB = &NormalY[dirB *sizeQ];
+ // ny_dirNE = &NormalY[dirNE *sizeQ];
+ // ny_dirSW = &NormalY[dirSW *sizeQ];
+ // ny_dirSE = &NormalY[dirSE *sizeQ];
+ // ny_dirNW = &NormalY[dirNW *sizeQ];
+ // ny_dirTE = &NormalY[dirTE *sizeQ];
+ // ny_dirBW = &NormalY[dirBW *sizeQ];
+ // ny_dirBE = &NormalY[dirBE *sizeQ];
+ // ny_dirTW = &NormalY[dirTW *sizeQ];
+ // ny_dirTN = &NormalY[dirTN *sizeQ];
+ // ny_dirBS = &NormalY[dirBS *sizeQ];
+ // ny_dirBN = &NormalY[dirBN *sizeQ];
+ // ny_dirTS = &NormalY[dirTS *sizeQ];
+ // ny_dirTNE = &NormalY[dirTNE *sizeQ];
+ // ny_dirTSW = &NormalY[dirTSW *sizeQ];
+ // ny_dirTSE = &NormalY[dirTSE *sizeQ];
+ // ny_dirTNW = &NormalY[dirTNW *sizeQ];
+ // ny_dirBNE = &NormalY[dirBNE *sizeQ];
+ // ny_dirBSW = &NormalY[dirBSW *sizeQ];
+ // ny_dirBSE = &NormalY[dirBSE *sizeQ];
+ // ny_dirBNW = &NormalY[dirBNW *sizeQ];
////////////////////////////////////////////////////////////////////////////////
- real *nz_dirE, *nz_dirW, *nz_dirN, *nz_dirS, *nz_dirT, *nz_dirB,
- *nz_dirNE, *nz_dirSW, *nz_dirSE, *nz_dirNW, *nz_dirTE, *nz_dirBW,
- *nz_dirBE, *nz_dirTW, *nz_dirTN, *nz_dirBS, *nz_dirBN, *nz_dirTS,
- *nz_dirTNE, *nz_dirTSW, *nz_dirTSE, *nz_dirTNW, *nz_dirBNE, *nz_dirBSW,
- *nz_dirBSE, *nz_dirBNW;
- nz_dirE = &NormalZ[dirE *sizeQ];
- nz_dirW = &NormalZ[dirW *sizeQ];
- nz_dirN = &NormalZ[dirN *sizeQ];
- nz_dirS = &NormalZ[dirS *sizeQ];
- nz_dirT = &NormalZ[dirT *sizeQ];
- nz_dirB = &NormalZ[dirB *sizeQ];
- nz_dirNE = &NormalZ[dirNE *sizeQ];
- nz_dirSW = &NormalZ[dirSW *sizeQ];
- nz_dirSE = &NormalZ[dirSE *sizeQ];
- nz_dirNW = &NormalZ[dirNW *sizeQ];
- nz_dirTE = &NormalZ[dirTE *sizeQ];
- nz_dirBW = &NormalZ[dirBW *sizeQ];
- nz_dirBE = &NormalZ[dirBE *sizeQ];
- nz_dirTW = &NormalZ[dirTW *sizeQ];
- nz_dirTN = &NormalZ[dirTN *sizeQ];
- nz_dirBS = &NormalZ[dirBS *sizeQ];
- nz_dirBN = &NormalZ[dirBN *sizeQ];
- nz_dirTS = &NormalZ[dirTS *sizeQ];
- nz_dirTNE = &NormalZ[dirTNE *sizeQ];
- nz_dirTSW = &NormalZ[dirTSW *sizeQ];
- nz_dirTSE = &NormalZ[dirTSE *sizeQ];
- nz_dirTNW = &NormalZ[dirTNW *sizeQ];
- nz_dirBNE = &NormalZ[dirBNE *sizeQ];
- nz_dirBSW = &NormalZ[dirBSW *sizeQ];
- nz_dirBSE = &NormalZ[dirBSE *sizeQ];
- nz_dirBNW = &NormalZ[dirBNW *sizeQ];
+ // real *nz_dirE, *nz_dirW, *nz_dirN, *nz_dirS, *nz_dirT, *nz_dirB,
+ // *nz_dirNE, *nz_dirSW, *nz_dirSE, *nz_dirNW, *nz_dirTE, *nz_dirBW,
+ // *nz_dirBE, *nz_dirTW, *nz_dirTN, *nz_dirBS, *nz_dirBN, *nz_dirTS,
+ // *nz_dirTNE, *nz_dirTSW, *nz_dirTSE, *nz_dirTNW, *nz_dirBNE, *nz_dirBSW,
+ // *nz_dirBSE, *nz_dirBNW;
+ // nz_dirE = &NormalZ[dirE *sizeQ];
+ // nz_dirW = &NormalZ[dirW *sizeQ];
+ // nz_dirN = &NormalZ[dirN *sizeQ];
+ // nz_dirS = &NormalZ[dirS *sizeQ];
+ // nz_dirT = &NormalZ[dirT *sizeQ];
+ // nz_dirB = &NormalZ[dirB *sizeQ];
+ // nz_dirNE = &NormalZ[dirNE *sizeQ];
+ // nz_dirSW = &NormalZ[dirSW *sizeQ];
+ // nz_dirSE = &NormalZ[dirSE *sizeQ];
+ // nz_dirNW = &NormalZ[dirNW *sizeQ];
+ // nz_dirTE = &NormalZ[dirTE *sizeQ];
+ // nz_dirBW = &NormalZ[dirBW *sizeQ];
+ // nz_dirBE = &NormalZ[dirBE *sizeQ];
+ // nz_dirTW = &NormalZ[dirTW *sizeQ];
+ // nz_dirTN = &NormalZ[dirTN *sizeQ];
+ // nz_dirBS = &NormalZ[dirBS *sizeQ];
+ // nz_dirBN = &NormalZ[dirBN *sizeQ];
+ // nz_dirTS = &NormalZ[dirTS *sizeQ];
+ // nz_dirTNE = &NormalZ[dirTNE *sizeQ];
+ // nz_dirTSW = &NormalZ[dirTSW *sizeQ];
+ // nz_dirTSE = &NormalZ[dirTSE *sizeQ];
+ // nz_dirTNW = &NormalZ[dirTNW *sizeQ];
+ // nz_dirBNE = &NormalZ[dirBNE *sizeQ];
+ // nz_dirBSW = &NormalZ[dirBSW *sizeQ];
+ // nz_dirBSE = &NormalZ[dirBSE *sizeQ];
+ // nz_dirBNW = &NormalZ[dirBNW *sizeQ];
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool changeCell = false;
unsigned int KQK = k_Q[k];
@@ -2209,7 +2212,8 @@ extern "C" __global__ void ParticleNoSlipDeviceComp27(real* coordX,
real f_TNW = (D.f[dirBSE ])[kbse ];
real f_TSE = (D.f[dirBNW ])[kbnw ];
////////////////////////////////////////////////////////////////////////////////
- real vx1, vx2, vx3, drho, feq, q;
+ // real feq, q;
+ real vx1, vx2, vx3, drho;
drho = f_TSE + f_TNW + f_TNE + f_TSW + f_BSE + f_BNW + f_BNE + f_BSW +
f_BN + f_TS + f_TN + f_BS + f_BE + f_TW + f_TE + f_BW + f_SE + f_NW + f_NE + f_SW +
f_T + f_B + f_N + f_S + f_E + f_W + ((D.f[dirZERO])[kzero]);
@@ -2290,52 +2294,5 @@ extern "C" __global__ void ParticleNoSlipDeviceComp27(real* coordX,
D.f[dirBSE ] = &DD[dirTNW *size_Mat];
D.f[dirBNW ] = &DD[dirTSE *size_Mat];
}
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- real VeloX = vx1;
- real VeloY = vx2;
- real VeloZ = vx3;
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
}
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu
index f6fdc67945db9136f4ab4fe604b508cc527fdc16..35bc18bc017792f105588b7396d5d10496ee3ed4 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu
@@ -155,7 +155,8 @@ extern "C" __global__ void scaleCF_0817_comp_27( real* DC,
real xoff, yoff, zoff;
real xoff_sq, yoff_sq, zoff_sq;
- real vvx, vvy, vvz, vx2, vy2, vz2, drho;
+ // real drho;
+ real vvx, vvy, vvz, vx2, vy2, vz2;
real press;//,drho,vx1,vx2,vx3;
real /*pressMMP,*/drhoMMP,vx1MMP,vx2MMP,vx3MMP;
real /*pressMPP,*/drhoMPP,vx1MPP,vx2MPP,vx3MPP;
@@ -4244,11 +4245,11 @@ extern "C" __global__ void scaleCF_AA2016_comp_27(real* DC,
real x,y,z;
//////////////////////////////////////////////////////////////////////////////////////
real mfcbb, mfabb, mfbcb, mfbab, mfbbc, mfbba, mfccb, mfaab, mfcab, mfacb, mfcbc, mfaba, mfcba, mfabc, mfbcc, mfbaa, mfbca, mfbac, mfbbb, mfccc, mfaac, mfcac, mfacc, mfcca, mfaaa, mfcaa, mfaca;
- real wadjust;
- real qudricLimitP = 0.01f;// * 0.0001f;
- real qudricLimitM = 0.01f;// * 0.0001f;
- real qudricLimitD = 0.01f;// * 0.001f;
- real omega = omCoarse;
+ //real wadjust;
+ //real qudricLimitP = 0.01f;// * 0.0001f;
+ //real qudricLimitM = 0.01f;// * 0.0001f;
+ //real qudricLimitD = 0.01f;// * 0.001f;
+ //real omega = omCoarse;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
real m0, m1, m2, vvx, vvy, vvz, vx2, vy2, vz2, oMdrho;
real mxxPyyPzz, mxxMyy, mxxMzz, mxxyPyzz, mxxyMyzz, mxxzPyyz, mxxzMyyz, mxyyPxzz, mxyyMxzz;
@@ -26463,7 +26464,8 @@ extern "C" __global__ void scaleCF_Fix_comp_27( real* DC,
real xoff, yoff, zoff;
real xoff_sq, yoff_sq, zoff_sq;
- real vvx, vvy, vvz, vx2, vy2, vz2, drho;
+ //real dhro;
+ real vvx, vvy, vvz, vx2, vy2, vz2;
real press;//,drho,vx1,vx2,vx3;
real /*press_SWT,*/drho_SWT,vx1_SWT,vx2_SWT,vx3_SWT;
real /*press_NWT,*/drho_NWT,vx1_NWT,vx2_NWT,vx3_NWT;