From 376d64349a18ffa8773fc3cf53b936ec90262e02 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Wed, 15 Sep 2021 12:29:41 +0200
Subject: [PATCH] Remove provisional tests for splitting f to c indices into
bulk an border
---
.../GridReaderGenerator/GridGenerator.cpp | 69 +------------------
.../GPU/CudaMemoryManager.cpp | 2 +-
2 files changed, 2 insertions(+), 69 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
index c26503dd6..54bf6ecff 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
@@ -925,6 +925,7 @@ void GridGenerator::allocArrays_OffsetScale()
// split fine-to-coarse indices into border and bulk
para->getParH(level)->intFCBorder.ICellFCC = para->getParH(level)->intFC.ICellFCC;
para->getParH(level)->intFCBorder.ICellFCF = para->getParH(level)->intFC.ICellFCF;
+
builder->getGridInterfaceIndicesFCCBorderBulk(
para->getParH(level)->intFCBorder.ICellFCC, para->getParH(level)->intFCBulk.ICellFCC,
para->getParH(level)->intFCBorder.ICellFCF, para->getParH(level)->intFCBulk.ICellFCF,
@@ -936,56 +937,7 @@ void GridGenerator::allocArrays_OffsetScale()
para->getParD(level)->intFCBulk.ICellFCC = para->getParD(level)->intFCBorder.ICellFCC + para->getParD(level)->intFCBorder.kFC;
para->getParD(level)->intFCBorder.ICellFCF = para->getParD(level)->intFC.ICellFCF;
para->getParD(level)->intFCBulk.ICellFCF = para->getParD(level)->intFCBorder.ICellFCF + para->getParD(level)->intFCBorder.kFC;
-
- std::cout << " ..............FCC " << std::endl;
- std::cout << "sizeOld " << para->getParH(level)->K_FC << std::endl;
- std::cout << "sizeNew " << para->getParH(level)->intFCBorder.kFC + para->getParH(level)->intFCBulk.kFC
- << " = border " << para->getParH(level)->intFCBorder.kFC << " + bulk "
- << para->getParH(level)->intFCBulk.kFC << std::endl;
- std::cout << "old pointer " << para->getParH(level)->intFC.ICellFCC << std::endl;
- std::cout << "border pointer (= old pointer) " << para->getParH(level)->intFCBorder.ICellFCC << std::endl;
- std::cout << "bulk pointer new " << para->getParH(level)->intFCBulk.ICellFCC << std::endl;
- std::cout << "first old " << para->getParH(level)->intFC.ICellFCC[0] << std::endl;
- std::cout << "first new " << para->getParH(level)->intFCBorder.ICellFCC[0] << std::endl;
- if (para->getParH(level)->intFCBorder.kFC > 0) {
- std::cout << "last border old "
- << para->getParH(level)->intFC.ICellFCC[para->getParH(level)->intFCBorder.kFC - 1]
- << std::endl;
- std::cout << "last border new "
- << para->getParH(level)->intFCBorder.ICellFCC[para->getParH(level)->intFCBorder.kFC - 1]
- << std::endl;
- }
- std::cout << "first bulk old "
- << para->getParH(level)->intFC.ICellFCC[para->getParH(level)->intFCBorder.kFC] << std::endl;
- std::cout << "first bulk new " << para->getParH(level)->intFCBulk.ICellFCC[0] << std::endl;
- std::cout << "last bulk old " << para->getParH(level)->intFC.ICellFCC[para->getParH(level)->K_FC - 1]
- << std::endl;
- std::cout << "last bulk new "
- << para->getParH(level)->intFCBulk.ICellFCC[para->getParH(level)->intFCBulk.kFC - 1] << std::endl;
-
- std::cout << " ..............FCF " << std::endl;
- std::cout << "old pointer " << para->getParH(level)->intFC.ICellFCF << std::endl;
- std::cout << "border pointer (= old pointer) " << para->getParH(level)->intFCBorder.ICellFCF << std::endl;
- std::cout << "bulk pointer new " << para->getParH(level)->intFCBulk.ICellFCF << std::endl;
- std::cout << "first old " << para->getParH(level)->intFC.ICellFCF[0] << std::endl;
- std::cout << "first new " << para->getParH(level)->intFCBorder.ICellFCF[0] << std::endl;
- if (para->getParH(level)->intFCBorder.kFC > 0) {
- std::cout << "last border old "
- << para->getParH(level)->intFC.ICellFCF[para->getParH(level)->intFCBorder.kFC - 1]
- << std::endl;
- std::cout << "last border new "
- << para->getParH(level)->intFCBorder.ICellFCF[para->getParH(level)->intFCBorder.kFC - 1]
- << std::endl;
- }
- std::cout << "first bulk old "
- << para->getParH(level)->intFC.ICellFCF[para->getParH(level)->intFCBorder.kFC] << std::endl;
- std::cout << "first bulk new " << para->getParH(level)->intFCBulk.ICellFCF[0] << std::endl;
- std::cout << "last bulk old " << para->getParH(level)->intFC.ICellFCF[para->getParH(level)->K_FC - 1]
- << std::endl;
- std::cout << "last bulk new "
- << para->getParH(level)->intFCBulk.ICellFCF[para->getParH(level)->intFCBulk.kFC - 1] << std::endl;
}
-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//copy
cudaMemoryManager->cudaCopyInterfaceCF(level);
@@ -993,25 +945,6 @@ void GridGenerator::allocArrays_OffsetScale()
cudaMemoryManager->cudaCopyInterfaceOffCF(level);
cudaMemoryManager->cudaCopyInterfaceOffFC(level);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
- if (para->getUseStreams()) {
- // cudaMemoryManager->cudaCheckInterfaceFCBulk(level);
-
- std::cout << "...Device FCC" << std::endl;
- std::cout << "old pointer " << para->getParD(level)->intFC.ICellFCC << std::endl;
- std::cout << "border pointer (= old pointer) " << para->getParD(level)->intFCBorder.ICellFCC << std::endl;
- std::cout << "bulk pointer new " << para->getParD(level)->intFCBulk.ICellFCC << std::endl;
- std::cout << "sizeOld " << para->getParD(level)->K_FC << std::endl;
- std::cout << "sizeNew " << para->getParD(level)->intFCBorder.kFC + para->getParD(level)->intFCBulk.kFC
- << " = border " << para->getParD(level)->intFCBorder.kFC << " + bulk "
- << para->getParD(level)->intFCBulk.kFC << std::endl;
-
- std::cout << "...Device FCF" << std::endl;
- std::cout << "old pointer " << para->getParD(level)->intFC.ICellFCF << std::endl;
- std::cout << "border pointer (= old pointer) " << para->getParD(level)->intFCBorder.ICellFCF << std::endl;
- std::cout << "bulk pointer new " << para->getParD(level)->intFCBulk.ICellFCF << std::endl;
- }
}
}
diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
index af937919a..a5e39aaad 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
+++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp
@@ -1068,7 +1068,7 @@ void CudaMemoryManager::cudaCheckInterfaceFCBulk(int lev)
// only use for testing!
size_t memsize = sizeof(uint) * parameter->getParH(lev)->intFCBulk.kFC;
checkCudaErrors(cudaMemcpy(parameter->getParD(lev)->intFCBulk.ICellFCC, parameter->getParH(lev)->intFCBulk.ICellFCC, memsize, cudaMemcpyDeviceToDevice));
- for (int i = 0; i < parameter->getParH(lev)->intFCBulk.kFC; i++)
+ for (uint i = 0; i < parameter->getParH(lev)->intFCBulk.kFC; i++)
printf("%d %d\n", i, parameter->getParH(lev)->intFCBulk.ICellFCC[i]);
}
void CudaMemoryManager::cudaFreeInterfaceFC(int lev)
--
GitLab