From 0c32a0d662e5819a0198496cfac21225155d08af Mon Sep 17 00:00:00 2001
From: Martin Schoenherr <m.schoenherr@tu-braunschweig.de>
Date: Fri, 28 Apr 2023 15:47:53 +0200
Subject: [PATCH] rename folders of K17 Kernels
---
.../K17CompressibleNavierStokes.cu | 4 ++--
.../K17CompressibleNavierStokes.h | 0
.../K17CompressibleNavierStokes_Device.cu | 0
.../K17CompressibleNavierStokes_Device.cuh | 0
.../K17CompressibleNavierStokesBulkViscosity.cu | 2 +-
.../K17CompressibleNavierStokesBulkViscosity.h | 0
.../K17CompressibleNavierStokesBulkViscosity_Device.cu | 0
.../K17CompressibleNavierStokesBulkViscosity_Device.cuh | 0
.../K17CompressibleNavierStokesChimeraLegacy.cu | 2 +-
.../K17CompressibleNavierStokesChimeraLegacy.h | 0
.../K17CompressibleNavierStokesChimeraLegacy_Device.cu | 0
.../K17CompressibleNavierStokesChimeraLegacy_Device.cuh | 0
.../K17CompressibleNavierStokesUnified.cu | 2 +-
.../K17CompressibleNavierStokesUnified.h | 0
.../Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp | 8 ++++----
15 files changed, 9 insertions(+), 9 deletions(-)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17 => K17CompressibleNavierStokes}/K17CompressibleNavierStokes.cu (98%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17 => K17CompressibleNavierStokes}/K17CompressibleNavierStokes.h (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17 => K17CompressibleNavierStokes}/K17CompressibleNavierStokes_Device.cu (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17 => K17CompressibleNavierStokes}/K17CompressibleNavierStokes_Device.cuh (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Bulk => K17CompressibleNavierStokesBulkViscosity}/K17CompressibleNavierStokesBulkViscosity.cu (94%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Bulk => K17CompressibleNavierStokesBulkViscosity}/K17CompressibleNavierStokesBulkViscosity.h (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Bulk => K17CompressibleNavierStokesBulkViscosity}/K17CompressibleNavierStokesBulkViscosity_Device.cu (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Bulk => K17CompressibleNavierStokesBulkViscosity}/K17CompressibleNavierStokesBulkViscosity_Device.cuh (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chim => K17CompressibleNavierStokesChimeraLegacy}/K17CompressibleNavierStokesChimeraLegacy.cu (94%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chim => K17CompressibleNavierStokesChimeraLegacy}/K17CompressibleNavierStokesChimeraLegacy.h (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chim => K17CompressibleNavierStokesChimeraLegacy}/K17CompressibleNavierStokesChimeraLegacy_Device.cu (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17chim => K17CompressibleNavierStokesChimeraLegacy}/K17CompressibleNavierStokesChimeraLegacy_Device.cuh (100%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Unified => K17CompressibleNavierStokesUnified}/K17CompressibleNavierStokesUnified.cu (94%)
rename src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/{CumulantK17Unified => K17CompressibleNavierStokesUnified}/K17CompressibleNavierStokesUnified.h (100%)
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.cu
similarity index 98%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.cu
index ea1f587fd..fccd9bfd2 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.cu
@@ -31,7 +31,7 @@ void K17CompressibleNavierStokes<turbulenceModel>::run()
para->getParD(level)->taggedFluidNodeIndices[CollisionTemplate::Default],
para->getParD(level)->numberOfTaggedFluidNodes[CollisionTemplate::Default]);
- getLastCudaError("LB_Kernel_CumulantK17 execution failed");
+ getLastCudaError("K17CompressibleNavierStokes_Device execution failed");
}
template<TurbulenceModel turbulenceModel>
@@ -118,7 +118,7 @@ void K17CompressibleNavierStokes<turbulenceModel>::runOnIndices( const unsigned
break;
}
- getLastCudaError("LB_Kernel_CumulantK17 execution failed");
+ getLastCudaError("K17CompressibleNavierStokes_Device execution failed");
}
template<TurbulenceModel turbulenceModel>
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.h
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.h
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes_Device.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes_Device.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes_Device.cu
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes_Device.cuh b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes_Device.cuh
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes_Device.cuh
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes_Device.cuh
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.cu
similarity index 94%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.cu
index 1f3d9af89..bf6e7801c 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.cu
@@ -29,7 +29,7 @@ void K17CompressibleNavierStokesBulkViscosity::run()
para->getForcesDev(),
para->getQuadricLimitersDev(),
para->getParD(level)->isEvenTimestep);
- getLastCudaError("LB_Kernel_CumulantK17BulkComp execution failed");
+ getLastCudaError("K17CompressibleNavierStokesBulkViscosity_Device execution failed");
}
K17CompressibleNavierStokesBulkViscosity::K17CompressibleNavierStokesBulkViscosity(std::shared_ptr<Parameter> para, int level)
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.h
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.h
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity_Device.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity_Device.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity_Device.cu
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity_Device.cuh b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity_Device.cuh
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity_Device.cuh
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity_Device.cuh
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.cu
similarity index 94%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.cu
index 76ee826b7..5ef177d77 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.cu
@@ -27,7 +27,7 @@ void K17CompressibleNavierStokesChimeraLegacy::run()
para->getParD(level)->forceZ_SP,
para->getQuadricLimitersDev(),
para->getParD(level)->isEvenTimestep);
- getLastCudaError("LB_Kernel_CumulantK17CompChim execution failed");
+ getLastCudaError("K17CompressibleNavierStokesChimeraLegacy_Device execution failed");
}
K17CompressibleNavierStokesChimeraLegacy::K17CompressibleNavierStokesChimeraLegacy(std::shared_ptr<Parameter> para, int level): KernelImp(para, level)
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.h
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.h
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy_Device.cu
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy_Device.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy_Device.cu
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy_Device.cuh b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy_Device.cuh
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy_Device.cuh
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy_Device.cuh
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.cu
similarity index 94%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.cu
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.cu
index e6b04a2a4..45a998e21 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.cu
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.cu
@@ -48,7 +48,7 @@ void K17CompressibleNavierStokesUnified::run()
runKernel<<<cudaGrid.grid, cudaGrid.threads>>>(lambda, kernelParameter);
- getLastCudaError("LB_Kernel_CumulantK17Unified execution failed");
+ getLastCudaError("K17CompressibleNavierStokesUnified execution failed");
}
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.h b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.h
similarity index 100%
rename from src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.h
rename to src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.h
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index 90932f04b..ee7010804 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -12,10 +12,10 @@
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cascade/CascadeCompSP27.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cumulant/CumulantCompSP27.h"
-#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Unified/K17CompressibleNavierStokesUnified.h"
-#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/K17CompressibleNavierStokesChimeraLegacy.h"
-#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/K17CompressibleNavierStokes.h"
-#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/K17CompressibleNavierStokesBulkViscosity.h"
+#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesUnified/K17CompressibleNavierStokesUnified.h"
+#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesChimeraLegacy/K17CompressibleNavierStokesChimeraLegacy.h"
+#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokes/K17CompressibleNavierStokes.h"
+#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/K17CompressibleNavierStokesBulkViscosity/K17CompressibleNavierStokesBulkViscosity.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp.h"
#include "Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK20/CumulantK20Comp.h"
--
GitLab