From ea9589c56072a6bc92a228d15caed7067f1a3802 Mon Sep 17 00:00:00 2001
From: Jian Sun <sunjian@ucar.edu>
Date: Mon, 8 Apr 2024 16:10:48 -0600
Subject: [PATCH 1/2] update the GPU settings on Derecho

---
 machines/Depends.nvhpc               | 3 ++-
 machines/derecho/config_machines.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/machines/Depends.nvhpc b/machines/Depends.nvhpc
index 0771da43..f94ee156 100644
--- a/machines/Depends.nvhpc
+++ b/machines/Depends.nvhpc
@@ -33,6 +33,7 @@ micro_mg1_0.o \
 micro_pumas_v1.o \
 micro_pumas_data.o \
 micro_pumas_utils.o \
+pumas_stochastic_collect_tau.o \
 micro_pumas_cam.o \
 wv_sat_methods.o \
 wv_saturation.o \
@@ -73,5 +74,5 @@ ifeq ($(DEBUG),FALSE)
   $(PUMAS_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $<
   $(RRTMGP_OBJS): %.o: %.F90
-	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $<
 endif
diff --git a/machines/derecho/config_machines.xml b/machines/derecho/config_machines.xml
index cd6d59d1..12446f37 100644
--- a/machines/derecho/config_machines.xml
+++ b/machines/derecho/config_machines.xml
@@ -64,7 +64,7 @@
         <command name="load">cray-libsci/23.02.1.1</command>
       </modules>
       <modules compiler="nvhpc">
-        <command name="load">nvhpc/23.7</command>
+        <command name="load">nvhpc/24.3</command>
       </modules>
 
       <modules>
@@ -122,6 +122,6 @@
       <env name="ESMF_RUNTIME_PROFILE_OUTPUT">SUMMARY</env>
     </environment_variables>
     <environment_variables compiler="nvhpc" gpu_offload="!none">
-      <env name="RTE_KERNELS">openacc</env>
+      <env name="NCAR_LIBS_CUDA">-lcuda -lcudart</env>
     </environment_variables>
   </machine>

From d0bfcd0a5789b5a96ca9b8f22f80b7126c1b2126 Mon Sep 17 00:00:00 2001
From: Jian Sun <sunjian@ucar.edu>
Date: Mon, 8 Apr 2024 16:16:01 -0600
Subject: [PATCH 2/2] bring back accidentally deleted option

---
 machines/Depends.nvhpc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/Depends.nvhpc b/machines/Depends.nvhpc
index f94ee156..e1c9b4e7 100644
--- a/machines/Depends.nvhpc
+++ b/machines/Depends.nvhpc
@@ -74,5 +74,5 @@ ifeq ($(DEBUG),FALSE)
   $(PUMAS_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $<
   $(RRTMGP_OBJS): %.o: %.F90
-	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $<
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $<
 endif