Merge pull request #248 from sjsprecious/some_bug_fixes

Miscellaneous bug fixes and performance improvements

Author: jedwards4b

machines/Depends.nvhpc

@@ -55,6 +55,7 @@ macrop_driver.o \
 shr_spfn_mod.o
 
 RRTMGP_OBJS=\
+radiation.o \
 rrtmgp_allsky.o \
 rrtmgp_rfmip_lw.o \
 rrtmgp_rfmip_sw.o \

machines/cmake_macros/gnu.cmake

@@ -44,7 +44,7 @@ else()
   endif()
 endif()
 if (NOT DEBUG)
-  string(APPEND CFLAGS " -O")
-  string(APPEND CXXFLAGS " -O")
-  string(APPEND FFLAGS " -O")
+  string(APPEND CFLAGS " -O2 -ffp-contract=off")
+  string(APPEND CXXFLAGS " -O2 -ffp-contract=off")
+  string(APPEND FFLAGS " -O2 -ffp-contract=off")
 endif()

machines/cmake_macros/nvhpc.cmake

@@ -5,7 +5,7 @@ endif()
 
 if (NOT DEBUG)
   string(APPEND CFLAGS " -O -Mnofma")
-  string(APPEND CXXFLAGS " -O -Mnofma")
+  string(APPEND CXXFLAGS " -O2 -Mnofma")
   string(APPEND FFLAGS " -O -Mnofma")
 else()
   string(APPEND CFLAGS " -O0 -Mnofma -g -Wall -Kieee -traceback")
@@ -51,28 +51,30 @@ else()
   string(APPEND CXXFLAGS " -std=c++17")
 endif()
 
+set(OPENACC_GPU_FLAGS " -noacc ")
+set(OPENMP_GPU_FLAGS "")
 if (GPU_TYPE STREQUAL v100)
   if (OPENACC_GPU_OFFLOAD)
-    string(APPEND OPENACC_GPU_FLAGS " -acc -gpu=cc70,lineinfo,nofma -Minfo=accel ")
+    set(OPENACC_GPU_FLAGS " -acc -gpu=cc70,lineinfo,nofma -Minfo=accel ")
   endif()
   if (OPENMP_GPU_OFFLOAD)
-    string(APPEND OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc70,lineinfo,nofma -Minfo=accel ")
+    set(OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc70,lineinfo,nofma -Minfo=accel ")
   endif()
 endif()
 if (GPU_TYPE STREQUAL a100)
   if (OPENACC_GPU_OFFLOAD)
-    string(APPEND OPENACC_GPU_FLAGS " -acc -gpu=cc80,lineinfo,nofma -Minfo=accel ")
+    set(OPENACC_GPU_FLAGS " -acc -gpu=cc80,lineinfo,nofma -Minfo=accel ")
   endif()
   if (OPENMP_GPU_OFFLOAD)
-    string(APPEND OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc80,lineinfo,nofma -Minfo=accel ")
+    set(OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc80,lineinfo,nofma -Minfo=accel ")
   endif()
 endif()
 if (GPU_TYPE STREQUAL h100)
   if (OPENACC_GPU_OFFLOAD)
-    string(APPEND OPENACC_GPU_FLAGS " -acc -gpu=cc90,lineinfo,nofma -Minfo=accel ")
+    set(OPENACC_GPU_FLAGS " -acc -gpu=cc90,lineinfo,nofma -Minfo=accel ")
   endif()
   if (OPENMP_GPU_OFFLOAD)
-    string(APPEND OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc90,lineinfo,nofma -Minfo=accel ")
+    set(OPENMP_GPU_FLAGS " -mp=gpu -gpu=cc90,lineinfo,nofma -Minfo=accel ")
   endif()
 endif()
 if (OPENACC_GPU_FLAGS)

machines/derecho/gnu_derecho.cmake

@@ -2,8 +2,6 @@ string(APPEND CONFIG_ARGS " --host=cray")
 if (COMP_NAME STREQUAL gptl)
   string(APPEND CPPDEFS " -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY")
 endif()
-string(APPEND CMAKE_C_FLAGS_RELEASE " -O2 -g")
-string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -O2 -g")
 set(MPICC "cc")
 set(MPICXX "CC")
 set(MPIFC "ftn")