Merge with EMC #ce5f3b1 (2024Nov21)

.github/CODEOWNERS

@@ -9,6 +9,6 @@
 
 
 # Support for public releases and documentation 
-docs/*  @hertneky @fossell @camshe
-scripts/run_upp @hertneky @fossell @camshe
+docs/*  @gspetro-NOAA
+scripts/run_upp @FernandoAndrade-NOAA @gspetro-NOAA
 

.github/workflows/gcc.yml

@@ -31,7 +31,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
@@ -67,7 +67,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp

.github/workflows/intel.yml

@@ -110,6 +110,6 @@ jobs:
           export FC=mpiifort
           cd UPP
           mkdir -p build && cd build
-          cmake -DCMAKE_INSTALL_PREFIX=../install ..
+          cmake -DENABLE_DOCS=ON -DCMAKE_INSTALL_PREFIX=../install ..
           make -j2 VERBOSE=1
           make install

.gitignore

@@ -9,6 +9,8 @@
 # USE CAUTION WHEN ADDING WILDCARDS, as some builds use different filename   #
 # conventions than others                                                    #
 ##############################################################################
+build
+install
 build/*/
 install*/
 

CMakeLists.txt

@@ -30,7 +30,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "^(Debug|Release|RelWithDebInfo|MinSizeRel)$")
                                                "MinSizeRel" "RelWithDebInfo")
 endif()
 
-if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|GNU|Clang|AppleClang)$")
+if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel|IntelLLVM|GNU|Clang|AppleClang)$")
   message(WARNING "Compiler not officially supported: ${CMAKE_Fortran_COMPILER_ID}")
 endif()
 
@@ -113,7 +113,6 @@ if(IFI_FOUND OR INTERNAL_IFI)
 endif()
 
 add_subdirectory(sorc)
-add_subdirectory(parm)
 
 # If desired, build the doxygen docs.
 if(ENABLE_DOCS)

ci/Jenkinsfile

@@ -97,7 +97,22 @@ pipeline {
 					sh '''
 					echo $(pwd)
 					cd ci/
-					./rt.sh -a ${ACCNR} -r `pwd`/rundir -t `pwd`/../
+                                        echo $CHANGE_ID
+                                        export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
+                                        export FORK_BRANCH=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.ref')
+					./rt.sh -a ${ACCNR} -r `pwd`/rundir
+                                        cd ../tests/logs
+					git remote -v
+                                        git fetch --no-recurse-submodules origin
+                                        git config user.email "[email protected]"
+                                        git config user.name "epic-cicd-jenkins"
+                                        echo "Orion testing concluded..."
+					git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
+					git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
+                                        git pull sshorigin $FORK_BRANCH
+					git add rt.log.ORION
+                                        git commit -m "Orion Jobs Completed."
+                                        git push sshorigin HEAD:$FORK_BRANCH
 					'''
 				}
 			}
@@ -124,7 +139,22 @@ pipeline {
 					sh '''
 					echo $(pwd)
 					cd ci/
-					./rt.sh -a ${ACCNR} -r `pwd`/rundir -t `pwd`/../
+                                        echo $CHANGE_ID
+                                        export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
+                                        export FORK_BRANCH=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.ref')
+					./rt.sh -a ${ACCNR} -r `pwd`/rundir
+                                        cd ../tests/logs
+					git remote -v
+                                        git fetch --no-recurse-submodules origin
+                                        git config user.email "[email protected]"
+                                        git config user.name "epic-cicd-jenkins"
+                                        echo "Hera testing concluded..."
+                                        git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
+					git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
+                                        git pull sshorigin $FORK_BRANCH
+					git add rt.log.HERA
+                                        git commit -m "Hera Jobs Completed."
+                                        git push sshorigin HEAD:$FORK_BRANCH
 					'''
 				}
 			}
@@ -151,7 +181,22 @@ pipeline {
 					sh '''
 					echo $(pwd)
 					cd ci/
-					./rt.sh -a ${ACCNR} -r `pwd`/rundir -t `pwd`/../
+                                        echo $CHANGE_ID
+                                        export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
+                                        export FORK_BRANCH=$(curl --silent https://api.github.com/repos/NOAA-EMC/UPP/pulls/$CHANGE_ID | jq -r '.head.ref')
+					./rt.sh -a ${ACCNR} -r `pwd`/rundir
+                                        cd ../tests/logs
+					git remote -v
+                                        git fetch --no-recurse-submodules origin
+                                        git config user.email "[email protected]"
+                                        git config user.name "epic-cicd-jenkins"
+                                        echo "Hercules testing concluded..."
+                                        git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
+					git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
+                                        git pull sshorigin $FORK_BRANCH
+					git add rt.log.HERCULES
+                                        git commit -m "Hercules Jobs Completed."
+                                        git push sshorigin HEAD:$FORK_BRANCH
 					'''
 				}
 			}

ci/rt.sh

@@ -4,9 +4,11 @@
 # Wen Meng, 12/2020, First version.
 # Fernando Andrade-Maldonado 5/2023 rework for CLI Options
 # Fernando Andrade-Maldonado / Wen Meng 9/2023 Add Hercules, fix typos, and refactor
-#
+# Fernando Andrade-Maldonado 4/2024 Additional Log info
 ######################################################################
 
+SECONDS=0
+
 git_branch="develop"
 git_url="https://github.com/NOAA-EMC/UPP.git"
 clone_on="no"
@@ -65,27 +67,28 @@ if [ $mac2 = hf ]; then # for HERA
  export machine=HERA
  export homedir=${homedir:-"/scratch2/NAGAPE/epic/UPP/test_suite"}
  export rundir=${rundir:-"/scratch1/NCEPDEV/stmp2/${USER}"}
- module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core
+ module use /scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
  module load stack-intel/2021.5.0
  module load stack-intel-oneapi-mpi/2021.5.1
  module load prod_util/2.1.1
-elif [ $mac = O ] ; then
+elif [ $mac3 = orio ] ; then
  export machine=ORION
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
- module load stack-intel/2022.0.2
- module load stack-intel-oneapi-mpi/2021.5.1
+ module use /work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
+ module load stack-intel/2021.9.0
+ module load stack-intel-oneapi-mpi/2021.9.0
  module load prod_util/2.1.1
+ module load python/3.10.8
 elif [ $mac3 = herc ] ; then
  export machine=HERCULES
  export homedir=${homedir:-"/work/noaa/epic/UPP"}
  export rundir=${rundir:-"/work2/noaa/stmp/$USER"}
- module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
+ module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core
  module load stack-intel/2021.9.0
  module load stack-intel-oneapi-mpi/2021.9.0
  module load prod_util/2.1.1
- module load stack-python/3.10.13
+ module load python/3.10.8
 fi
 
 #set working directory
@@ -236,17 +239,42 @@ for job_id in $jobid_list; do
   fi
 done
 
+elapsed_time=$( printf '%02dh:%02dm:%02ds\n' $((SECONDS%86400/3600)) $((SECONDS%3600/60)) $((SECONDS%60)) )
+
 python ${test_v}/ci/rt-status.py
 test_results=$?
 
 # Cleanup rt log
+cd ${test_v}
+
+UPP_HASH=$(git rev-parse HEAD)
+SUBMODULE_HASHES=$(git submodule status --recursive)
+DATE="$(date '+%Y%m%d %T')"
+
 cd ${test_v}/ci
-echo "rundir: ${rundir}" > rt.log.${machine}.temp
+
+cat << EOF > rt.log.${machine}.temp
+===== Start of UPP Regression Testing Log =====
+UPP Hash Tested:
+${UPP_HASH}
+
+Submodule hashes:
+${SUBMODULE_HASHES}
+
+Run directory: ${rundir}
+Baseline directory: ${homedir}
+
+Total runtime: ${elapsed_time}
+Test Date: ${DATE}
+Summary Results:
+
+EOF
+
 cat rt.log.${machine} | grep "test:" >> rt.log.${machine}.temp
 cat rt.log.${machine} | grep "baseline" >> rt.log.${machine}.temp
 python ${test_v}/ci/rt-status.py >> rt.log.${machine}.temp
-cat rt.log.${machine}.temp > rt.log.${machine}
-rm rt.log.${machine}.temp
+echo "===== End of UPP Regression Testing Log =====" >> rt.log.${machine}.temp
+mv rt.log.${machine}.temp rt.log.${machine}
 mv rt.log.${machine} ${test_v}/tests/logs
 
 # should indicate failure to Jenkins

ci/spack.yaml

@@ -10,8 +10,8 @@ spack:
   - [email protected]
   - [email protected]
   - [email protected]
-  - g2@3.4.5
-  - g2tmpl@1.10.2
+  - g2@3.5.1
+  - g2tmpl@1.13.0
   - [email protected]
   - [email protected]
   - [email protected]