Skip to content

Bugfix 131 main_v5.0 remove duplication #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jprestop merged 2 commits into from
Aug 12, 2026
Merged

Bugfix 131 main_v5.0 remove duplication #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608f504
Per #131, removed duplicate lines and moved gpuErrchk line which woul…
jprestop Aug 5, 2026
9e2824b
Per #131, removing the added gpuErrchk because it is already called a…
jprestop Aug 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions SRC/HYDRO_CORE/CUDA/cuda_hydroCoreDevice.cu
View file
Open in desktop
Comment thread
jprestop marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -146,36 +146,6 @@ extern "C" int cuda_hydroCoreDeviceSetup(){
errorCode = cuda_auxScalarsDeviceSetup();
}//end if NhydroAuxScalars > 0

/*PRESSURE*/
if(pgfSelector > 0){
errorCode = cuda_pressureDeviceSetup();
}//end if pgfSelector > 0

/*BASESTATE*/
errorCode = cuda_BaseStateDeviceSetup();

/*SGSTURB*/
if(turbulenceSelector > 0){
errorCode = cuda_sgsTurbDeviceSetup();
/* SGSTKE */
if (TKESelector > 0) {
errorCode = cuda_sgstkeDeviceSetup();
} // end if TKESelector > 0
}//end if turbulenceSelector > 0

if (diffusionSelector > 0) {
errorCode = cuda_molecularDiffDeviceSetup();
}
if (surflayerSelector > 0) {
errorCode = cuda_surfaceLayerDeviceSetup();
}
gpuErrchk( cudaPeekAtLastError() ); /*Check for errors in the cudaMalloc calls*/

/* CANOPY */
if (canopySelector > 0){
errorCode = cuda_canopyDeviceSetup();
}

/*ADVECTION*/
if(advectionSelector >= 0){
errorCode = cuda_advectionDeviceSetup();
Expand Down Expand Up @@ -204,7 +174,7 @@ extern "C" int cuda_hydroCoreDeviceSetup(){
if (surflayerSelector > 0) {
errorCode = cuda_surfaceLayerDeviceSetup();
}

/* CELL PERTURBATION METHOD */
if (cellpertSelector > 0) {
errorCode = cuda_cellpertDeviceSetup();
Expand Down
Loading