From 6ac46dd2a20859f954b2d5dce02491d2f9d6850b Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Wed, 20 Oct 2021 16:41:42 +0200
Subject: [PATCH] Remove provisional tests
---
src/gpu/GridGenerator/grid/GridImp.cu | 31 ++-----------------
.../GridReaderGenerator/GridGenerator.cpp | 3 --
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/gpu/GridGenerator/grid/GridImp.cu b/src/gpu/GridGenerator/grid/GridImp.cu
index ae317411c..6372c2c0c 100644
--- a/src/gpu/GridGenerator/grid/GridImp.cu
+++ b/src/gpu/GridGenerator/grid/GridImp.cu
@@ -1967,7 +1967,7 @@ void GridImp::getGridInterfaceIndicesFCBorderBulk(uint *iCellFccBorder, uint *&i
intFCBorderKfc = (uint)iCellFccBorderVector.size();
intFCBulkKfc = (uint)iCellFccBulkVector.size();
- iCellFccBulk = iCellFccBorder + intFCBorderKfc;
+ iCellFccBulk = iCellFccBorder + intFCBorderKfc;
iCellFcfBulk = iCellFcfBorder + intFCBorderKfc;
for (uint i = 0; i < (uint)iCellFccBorderVector.size(); i++) {
@@ -1993,21 +1993,18 @@ void GridImp::getGridInterfaceIndicesCFBorderBulk(uint *iCellCfcBorder, uint *&i
std::vector<uint> iCellCffBorderVector;
std::vector<uint> iCellCffBulkVector;
- std::vector<uint> sparseIndexOld;
-
uint sparseIndexOfICellBSW;
for (uint i = 0; i < this->gridInterface->cf.numberOfEntries; i++) {
sparseIndexOfICellBSW = iCellCfcAll[i];
- sparseIndexOld.push_back(sparseIndexOfICellBSW);
- if (i>1000/*isSparseIndexInFluidNodeIndicesBorder(sparseIndexOfICellBSW)
+ if (isSparseIndexInFluidNodeIndicesBorder(sparseIndexOfICellBSW)
|| isSparseIndexInFluidNodeIndicesBorder(neighborX_SP[sparseIndexOfICellBSW])
|| isSparseIndexInFluidNodeIndicesBorder(neighborY_SP[sparseIndexOfICellBSW])
|| isSparseIndexInFluidNodeIndicesBorder(neighborZ_SP[sparseIndexOfICellBSW])
|| isSparseIndexInFluidNodeIndicesBorder(neighborY_SP[neighborX_SP[sparseIndexOfICellBSW]])
|| isSparseIndexInFluidNodeIndicesBorder(neighborZ_SP[neighborX_SP[sparseIndexOfICellBSW]])
|| isSparseIndexInFluidNodeIndicesBorder(neighborZ_SP[neighborY_SP[sparseIndexOfICellBSW]])
- || isSparseIndexInFluidNodeIndicesBorder(neighborZ_SP[neighborY_SP[neighborX_SP[sparseIndexOfICellBSW]]])*/) {
+ || isSparseIndexInFluidNodeIndicesBorder(neighborZ_SP[neighborY_SP[neighborX_SP[sparseIndexOfICellBSW]]])) {
iCellCfcBorderVector.push_back(iCellCfcAll[i]);
iCellCffBorderVector.push_back(iCellCffAll[i]);
@@ -2030,28 +2027,6 @@ void GridImp::getGridInterfaceIndicesCFBorderBulk(uint *iCellCfcBorder, uint *&i
iCellCfcBulk[i] = iCellCfcBulkVector[i];
iCellCffBulk[i] = iCellCffBulkVector[i];
}
-
- uint inBorder=0;
- uint inBulk=0;
- bool notFound;
- for (auto x : sparseIndexOld) {
- notFound = true;
- for (uint i = 0; i < intCFBorderKcf; i++)
- if (iCellCfcBorder[i] == x) {
- inBorder++;
- notFound = false;
- break;
- }
- for (uint i = 0; i < intCFBulkKcf; i++)
- if (iCellCfcBulk[i] == x) {
- inBulk++;
- notFound = false;
- break;
- }
- if (notFound)
- std::cout << x << std::endl;
- }
-
}
bool GridImp::isSparseIndexInFluidNodeIndicesBorder(uint &sparseIndex) const
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
index 4c0736bef..0e50aaff4 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
@@ -1410,9 +1410,6 @@ void GridGenerator::allocArrays_OffsetScale()
para->getParD(level)->intCFBulk.ICellCFC = para->getParD(level)->intCFBorder.ICellCFC + para->getParD(level)->intCFBorder.kCF;
para->getParD(level)->intCFBorder.ICellCFF = para->getParD(level)->intCF.ICellCFF;
para->getParD(level)->intCFBulk.ICellCFF = para->getParD(level)->intCFBorder.ICellCFF + para->getParD(level)->intCFBorder.kCF;
-
-
-
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//copy
--
GitLab