diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp index da4ba9d8b4ad094437ec17b17e7ea653842bf83e..eea34e6fb7b53e16387d48077296d5df22a3e031 100644 --- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp +++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp @@ -634,7 +634,7 @@ void GridReader::setNoSlipQs(std::shared_ptr<BoundaryQs> boundaryQ) const this->printQSize("no slip", boundaryQ, level); this->setSizeNoSlip(boundaryQ, level); this->initalQStruct(para->getParH(level)->noSlipBC, boundaryQ, level); - cudaMemoryManager->cudaCopyWallBC(level); + cudaMemoryManager->cudaCopyNoSlipBC(level); } } } @@ -766,7 +766,7 @@ void GridReader::setSizeNoSlip(std::shared_ptr<BoundaryQs> boundaryQ, unsigned i { para->getParH(level)->noSlipBC.numberOfBCnodes = boundaryQ->getSize(level); para->getParD(level)->noSlipBC.numberOfBCnodes = para->getParH(level)->noSlipBC.numberOfBCnodes; - cudaMemoryManager->cudaAllocWallBC(level); + cudaMemoryManager->cudaAllocNoSlipBC(level); } void GridReader::setSizeGeoQs(std::shared_ptr<BoundaryQs> boundaryQ, unsigned int level) const diff --git a/src/gpu/VirtualFluids_GPU/FindQ/DefineBCs.cpp b/src/gpu/VirtualFluids_GPU/FindQ/DefineBCs.cpp index a67f1d987cb9636ee447c5f5acd1410c44cb6a62..a4e3123873ea82e0904efa31c9fc018dcc79c227 100644 --- a/src/gpu/VirtualFluids_GPU/FindQ/DefineBCs.cpp +++ b/src/gpu/VirtualFluids_GPU/FindQ/DefineBCs.cpp @@ -33,13 +33,13 @@ void findQ27(Parameter* para, CudaMemoryManager* cudaMemoryManager) para->getParD(lev)->noSlipBC.numberOfBCnodes = para->getParH(lev)->noSlipBC.numberOfBCnodes; printf("numberOfBCnodes= %d\n", para->getParH(lev)->noSlipBC.numberOfBCnodes); - cudaMemoryManager->cudaAllocWallBC(lev); + cudaMemoryManager->cudaAllocNoSlipBC(lev); findQ(para, lev); para->getParD(lev)->noSlipBC.numberOfBCnodes = para->getParH(lev)->noSlipBC.numberOfBCnodes; printf("numberOfBCnodes= %d\n", para->getParH(lev)->noSlipBC.numberOfBCnodes); - cudaMemoryManager->cudaCopyWallBC(lev); + cudaMemoryManager->cudaCopyNoSlipBC(lev); } } diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp index 5267f83838dcf131c3a6ab41ec05467e174ccfe8..a2026863e126d8648def4ffff6bf8dd22a4a0ba5 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp +++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.cpp @@ -275,8 +275,8 @@ void CudaMemoryManager::cudaFreeOutflowBC(int lev) checkCudaErrors( cudaFreeHost(parameter->getParH(lev)->outflowBC.kN )); checkCudaErrors( cudaFreeHost(parameter->getParH(lev)->outflowBC.RhoBC )); } -//Wall -void CudaMemoryManager::cudaAllocWallBC(int lev) +//No-Slip +void CudaMemoryManager::cudaAllocNoSlipBC(int lev) { unsigned int mem_size_Q_k = sizeof(int)*parameter->getParH(lev)->noSlipBC.numberOfBCnodes; unsigned int mem_size_Q_q = sizeof(real)*parameter->getParH(lev)->noSlipBC.numberOfBCnodes; @@ -297,7 +297,7 @@ void CudaMemoryManager::cudaAllocWallBC(int lev) double tmp = (double)mem_size_Q_k + (double)parameter->getD3Qxx()*(double)mem_size_Q_q; setMemsizeGPU(tmp, false); } -void CudaMemoryManager::cudaCopyWallBC(int lev) +void CudaMemoryManager::cudaCopyNoSlipBC(int lev) { unsigned int mem_size_Q_k = sizeof(int)*parameter->getParH(lev)->noSlipBC.numberOfBCnodes; unsigned int mem_size_Q_q = sizeof(real)*parameter->getParH(lev)->noSlipBC.numberOfBCnodes; @@ -305,7 +305,7 @@ void CudaMemoryManager::cudaCopyWallBC(int lev) checkCudaErrors( cudaMemcpy(parameter->getParD(lev)->noSlipBC.q27[0], parameter->getParH(lev)->noSlipBC.q27[0], parameter->getD3Qxx()* mem_size_Q_q, cudaMemcpyHostToDevice)); checkCudaErrors( cudaMemcpy(parameter->getParD(lev)->noSlipBC.k, parameter->getParH(lev)->noSlipBC.k, mem_size_Q_k, cudaMemcpyHostToDevice)); } -void CudaMemoryManager::cudaFreeWallBC(int lev) +void CudaMemoryManager::cudaFreeNoSlipBC(int lev) { checkCudaErrors( cudaFreeHost(parameter->getParH(lev)->noSlipBC.q27[0])); checkCudaErrors( cudaFreeHost(parameter->getParH(lev)->noSlipBC.k)); diff --git a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h index 290a05671e5f2d60b08d634ac2b919cd8947cb96..a6a84f9218251df9f50d6e6cfcff8614cd3f5504 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h +++ b/src/gpu/VirtualFluids_GPU/GPU/CudaMemoryManager.h @@ -63,9 +63,9 @@ public: void cudaCopyOutflowBC(int lev); void cudaFreeOutflowBC(int lev); - void cudaAllocWallBC(int lev); - void cudaCopyWallBC(int lev); - void cudaFreeWallBC(int lev); + void cudaAllocNoSlipBC(int lev); + void cudaCopyNoSlipBC(int lev); + void cudaFreeNoSlipBC(int lev); void cudaAllocGeomBC(int lev); void cudaCopyGeomBC(int lev);