Merge remote-tracking branch 'upstream/develop' into develop

YaliMao-NOAA · Aug 23, 2024 · f57231a · f57231a
2 parents acf9de7 + 6c88ef4
commit f57231a
Show file tree

Hide file tree

Showing 11 changed files with 263 additions and 205 deletions.
diff --git a/.github/CODEOWNERS b/.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
 
diff --git a/.github/workflows/intel.yml b/.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
diff --git a/ci/Jenkinsfile b/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 "ecc.platform@noaa.gov"
+                                        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 "ecc.platform@noaa.gov"
+                                        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 "ecc.platform@noaa.gov"
+                                        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
 					'''
 				}
 			}

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -10,8 +10,8 @@ spack:
   - netcdf-fortran@4.6.1
   - bacio@2.4.1
   - w3emc@2.10.0
-  - g2@3.4.5
-  - g2tmpl@1.12.0
+  - g2@3.5.1
+  - g2tmpl@1.13.0
   - sp@2.5.0
   - ip@4.3.0
   - sigio@2.3.2

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -891,7 +891,7 @@ WARN_IF_UNDOC_ENUM_VAL = NO
 # Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
 # The default value is: NO.
 
-WARN_AS_ERROR          = NO
+WARN_AS_ERROR          = YES
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which

diff --git a/modulefiles/upp_common.lua b/modulefiles/upp_common.lua
@@ -11,8 +11,8 @@ local ufs_modules = {
   {["netcdf-fortran"]  = "4.6.1"},
   {["bacio"]           = "2.4.1"},
   {["crtm"]            = "2.4.0.1"},
-  {["g2"]              = "3.4.5"},
-  {["g2tmpl"]          = "1.12.0"},
+  {["g2"]              = "3.5.1"},
+  {["g2tmpl"]          = "1.13.0"},
   {["ip"]              = "4.3.0"},
   {["sp"]              = "2.5.0"},
   {["w3emc"]           = "2.10.0"},

diff --git a/modulefiles/wcoss2.lua b/modulefiles/wcoss2.lua
@@ -23,8 +23,8 @@ load(pathJoin("jasper", jasper_ver))
 load(pathJoin("libpng", libpng_ver))
 load(pathJoin("zlib", zlib_ver))
 
-g2_ver=os.getenv("g2_ver") or "3.4.5"
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.12.0"
+g2_ver=os.getenv("g2_ver") or "3.5.1"
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.13.0"
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 ip_ver=os.getenv("ip_ver") or "3.3.3"
 sp_ver=os.getenv("sp_ver") or "2.3.3"

diff --git a/sorc/ncep_post.fd/grib2_module.f b/sorc/ncep_post.fd/grib2_module.f
@@ -10,6 +10,7 @@
 !> July  2021   | Jesse Meng | 2D decomsition
 !> June  2022   | Lin Zhu    | Change the dx/dy to reading in from calculating for latlon grid
 !> January 2023 | Sam Trahan | Foot & meter unit conversions for IFI
+!> August 2024  | Li Pan     | Enable template 4-49 to obtain aerosol ensemble information
 !-------------------------------------------------------------------------
   module grib2_module
 !
@@ -497,7 +498,8 @@ subroutine gengrb2msg(idisc,icatg, iparm,nprm,nlvl,fldlvl1,fldlvl2,ntrange,tinvs
     use grib2_all_tables_module, only: g2sec0,g2sec1,                                    &
                            g2sec4_temp0,g2sec4_temp8,g2sec4_temp9,g2sec4_temp44,         &
                            g2sec4_temp46,g2sec4_temp48,g2sec5_temp0,g2sec5_temp2,        &
-                           g2sec5_temp3,g2sec5_temp40,get_g2_sec5packingmethod       
+                           g2sec5_temp3,g2sec5_temp40,get_g2_sec5packingmethod,          &
+			   g2sec4_temp49
     !use gdtsec3, only: getgdtnum
     implicit none
 !
@@ -520,6 +522,7 @@ subroutine gengrb2msg(idisc,icatg, iparm,nprm,nlvl,fldlvl1,fldlvl2,ntrange,tinvs
     integer, parameter :: ipdstmp4_44len=21
     integer, parameter :: ipdstmp4_46len=35
     integer, parameter :: ipdstmp4_48len=26
+    integer, parameter :: ipdstmp4_49len=29
 !
     integer, parameter :: idrstmplenmax=50
     integer, parameter :: idrstmp5_0len=5
@@ -592,6 +595,8 @@ subroutine gengrb2msg(idisc,icatg, iparm,nprm,nlvl,fldlvl1,fldlvl2,ntrange,tinvs
         pset%param(nprm)%pdstmpl='tmpl4_1'
       elseif (trim(pset%param(nprm)%pdstmpl)=='tmpl4_8') then
         pset%param(nprm)%pdstmpl='tmpl4_11'
+      elseif (trim(pset%param(nprm)%pdstmpl)=='tmpl4_48') then
+        pset%param(nprm)%pdstmpl='tmpl4_49'	
       endif
     endif
 !
@@ -984,6 +989,35 @@ subroutine gengrb2msg(idisc,icatg, iparm,nprm,nlvl,fldlvl1,fldlvl2,ntrange,tinvs
 !       print *,'aft g2sec4_temp48,name=',trim(pset%param(nprm)%shortname),&
 !          'ipdstmpl48=',ipdstmpl(1:ipdstmp4_48len)
 
+       elseif(trim(pset%param(nprm)%pdstmpl)=='tmpl4_49') then
+!
+         ipdsnum=49
+         ipdstmpllen=ipdstmp4_49len
+         call g2sec4_temp49(icatg,iparm,pset%param(nprm)%aerosol_type, &
+              pset%param(nprm)%typ_intvl_size,                 &
+              pset%param(nprm)%scale_fact_1st_size,            &
+              pset%param(nprm)%scale_val_1st_size,             &
+              pset%param(nprm)%scale_fact_2nd_size,            &
+              pset%param(nprm)%scale_val_2nd_size,             &
+              pset%param(nprm)%typ_intvl_wvlen,                &
+              pset%param(nprm)%scale_fact_1st_wvlen,           &
+              pset%param(nprm)%scale_val_1st_wvlen,            &
+              pset%param(nprm)%scale_fact_2nd_wvlen,           &
+              pset%param(nprm)%scale_val_2nd_wvlen,            &
+              pset%gen_proc_type,                              &
+              pset%gen_proc,hrs_obs_cutoff,min_obs_cutoff,     &
+              pset%time_range_unit,ifhr,                       &
+              pset%param(nprm)%fixed_sfc1_type,                &
+              scale_fct_fixed_sfc1,                            &
+              scaled_val_fixed_sfc1,                           &
+              pset%param(nprm)%fixed_sfc2_type,                &
+              scale_fct_fixed_sfc2,                            &
+              scaled_val_fixed_sfc2,                           &
+	      pset%type_ens_fcst,perturb_num,num_ens_fcst,     &
+              ipdstmpl(1:ipdstmpllen))
+!       print *,'aft g2sec4_temp49,name=',trim(pset%param(nprm)%shortname),&
+!          'ipdstmpl49=',ipdstmpl(1:ipdstmp4_49len)
+
       endif
 
       if((modelname=='RAPR'.or.modelname=='FV3R').and.vtimeunits=='FMIN') then