From 0a59565b614dea82f2d55ff5c7b85bfbba613b69 Mon Sep 17 00:00:00 2001
From: Dustin Swales <dustin.swales@noaa.gov>
Date: Mon, 10 Jun 2024 04:06:50 +0000
Subject: [PATCH] Update CI

---
 .../workflows/ci_build_scm_ubuntu_22.04_nvidia.yml   | 12 ++++++------
 .github/workflows/ci_plt_scm_rts.yml                 |  5 ++++-
 scm/src/CMakeLists.txt                               |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
index 7e9822ade..a4ecf6cf0 100644
--- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
+++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml
@@ -100,17 +100,17 @@ jobs:
         nvhpc_2024_241_Linux_x86_64_cuda_12.3/install
         export PATH=${PATH}:${NVCOMPILERS}/${NVARCH}/24.1/compilers/bin
         export MANPATH=${MANPATH}:${NVCOMPILERS}/${NVARCH}/24.1/compilers/man
-        echo "The mpifort installed is:"
-        mpifort --version
-        echo "The path to mpifort is:"
-        command -v mpifort
+        echo "The nvfortran installed is:"
+        nvfortran --version
+        echo "The path to nvfortran is:"
+        command -v nvfortran
         echo "Removing tarball"
         rm nvhpc_2024_241_Linux_x86_64_cuda_12.3.tar.gz
 
     - name: Set environment for Nvidia compiler.
       run: |
-        echo "CC=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/mpicc" >> $GITHUB_ENV
-        echo "FC=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/mpifort" >> $GITHUB_ENV
+        echo "CC=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/nvc" >> $GITHUB_ENV
+        echo "FC=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/nvfortran" >> $GITHUB_ENV
         echo "CMAKE_C_COMPILER=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/mpicc" >> $GITHUB_ENV
         echo "CMAKE_Fortran_COMPILER=/home/runner/hpc_sdk/Linux_x86_64/24.1/compilers/bin/mpifort" >> $GITHUB_ENV
 
diff --git a/.github/workflows/ci_plt_scm_rts.yml b/.github/workflows/ci_plt_scm_rts.yml
index 7389dc935..683dba3a3 100644
--- a/.github/workflows/ci_plt_scm_rts.yml
+++ b/.github/workflows/ci_plt_scm_rts.yml
@@ -1,4 +1,4 @@
-name: CI test to plot SCM regression tests.
+name: CI test to plot SCM regression test baseliness.
 
 on: [pull_request, workflow_dispatch]
 
@@ -50,6 +50,9 @@ jobs:
     #######################################################################################
     # Plot latest SCM regression tests baselines
     #######################################################################################
+    - name: Create directory for SCM RT baselines
+      run: mkdir ${dir_bl}
+
     - name: Download SCM regression tests baselines.
       run: |
         cd ${dir_bl}
diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt
index e8e8f7bbb..856a5d1f2 100644
--- a/scm/src/CMakeLists.txt
+++ b/scm/src/CMakeLists.txt
@@ -192,11 +192,11 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
 
 elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "NVHPC")
   if(ENABLE_NVIDIA_OPENACC MATCHES "true")
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -acc -Minfo=accel")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -acc -Minfo=accel")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mstandard -fPIC -acc -Minfo=accel ")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Mstandard -fPIC -acc -Minfo=accel")
   else()
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mstandard -fPIC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Mstandard -fPIC")
   endif()
 
   if(NOT 32BIT)