Console Output

+ diff --exclude=.git --exclude=version_clubb_core.txt --exclude=version_silhs.txt -r clubb clubb_release
Only in clubb/compile/config: linux_x86_64_ifort_gpu_openmp.bash
Only in clubb_release/compile/config: linux_x86_64_nvhpc_gpu.bash
Only in clubb/compile/config: linux_x86_64_nvhpc_gpu_openacc.bash
Only in clubb/compile/config: linux_x86_64_nvhpc_gpu_openmp.bash
Only in clubb/compile: convert_acc_to_omp.bash
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/jenkins_tests/clubb_nvhpc_gpu_acc_vs_cpu_diffness/Jenkinsfile clubb_release/jenkins_tests/clubb_nvhpc_gpu_acc_vs_cpu_diffness/Jenkinsfile
29c29
<         sh '''compile/compile.bash -c config/linux_x86_64_nvhpc_gpu_openacc.bash'''
---
>         sh '''compile/compile.bash -c config/linux_x86_64_nvhpc_gpu.bash'''
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_clubb_core_module.F90 clubb_release/src/CLUBB_core/advance_clubb_core_module.F90
4173c4173
< #ifdef CLUBB_GPU
---
> #ifdef _OPENACC
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/latin_hypercube_driver_module.F90 clubb_release/src/SILHS/latin_hypercube_driver_module.F90
235c235
< #ifdef CLUBB_GPU
---
> #ifdef _OPENACC
237c237
<       error stop "CLUBB ERROR: Running SILHS on GPUs requires lh_straight_mc=true"
---
>       error stop "CLUBB ERROR: Running SILHS with OpenACC requires lh_straight_mc=true"
306c306
< 
---
>                                
480,483c480
<   !     we compile with -DCLUBB_GPU has been specified at compile time.
<   !     We use a CUDA routine to generate on a GPU when available, but if
<   !     -DCUDA is not specified then we generate randoms on the GPU and
<   !     copy the results to the GPU.
---
>   !     openacc has been specified at compile time.
501c498
< #if defined(CUDA) && defined(CLUBB_GPU)
---
> #ifdef _OPENACC
532c529
< #if defined(CUDA) && defined(CLUBB_GPU)
---
> #ifdef _OPENACC
549c546
< #if defined(CUDA) && defined(CLUBB_GPU)
---
> #ifdef _OPENACC
551c548
<     ! Generate randoms on GPU using a CUDA function
---
>     ! Generate randoms on GPU
568c565
<     ! Generate randoms on CPU using an Mersenne Twister
---
>     ! Generate randoms on CPU
585,589d581
< #ifdef CLUBB_GPU
<     ! If we are using the GPU, we need to copy the CPU generated randoms to it
<     !$acc update device( rand_pool )
< #endif
< 
1168,1169c1160,1161
< #ifdef CLUBB_GPU
<        error stop "CLUBB ERROR: Running SILHS on the GPUs requires l_clip_hydromet_samples=false"
---
> #ifdef _OPENACC
>        error stop "CLUBB ERROR: Running SILHS with OpenACC requires l_clip_hydromet_samples=false"