Skip to content

Update UPP control files for GFS, RRFS and HAFS #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junwang-noaa merged 12 commits into from
Jun 17, 2021
Merged

Update UPP control files for GFS, RRFS and HAFS #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
40f2e30
1)Update with g2tmpl/1.10.0 and upp/10.0.8; 2)Update the UPP control …
WenMeng-NOAA Jun 15, 2021
7a2ccb9
1)Update g2/3.4.2; 2)Change BL_DATE to 20210616 in rt.sh.
WenMeng-NOAA Jun 16, 2021
700d14a
Merge with upstream/develop and solve conflict in rt.sh.
WenMeng-NOAA Jun 16, 2021
1dcfc51
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Jun 17, 2021
fd0505a
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Jun 17, 2021
9a9d350
RT JOBS PASSED: wcoss_dell_p3.log file uploaded.
WenMeng-NOAA Jun 17, 2021
45bd58c
Merge branch 'feature/upp_control_files' of github.com:WenMeng-NOAA/u…
WenMeng-NOAA Jun 17, 2021
12f38dd
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Jun 17, 2021
6322bc0
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Jun 17, 2021
0f7d3d0
1) Update ufs module for wcoss_cray with upp/10.0.8 and g2tmp2/1.10.0.
WenMeng-NOAA Jun 17, 2021
731df0a
RT JOBS PASSED: jet.intel.log uploaded.
WenMeng-NOAA Jun 17, 2021
c71694f
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modulefiles/ufs_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ module load fms/2020.04.03

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load g2/3.4.2
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.6
module load upp/10.0.8
6 changes: 3 additions & 3 deletions modulefiles/ufs_common_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ module load fms/2020.04.03

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load g2/3.4.2
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.6
module load upp/10.0.8
4 changes: 2 additions & 2 deletions modulefiles/ufs_wcoss_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
Expand All @@ -52,7 +52,7 @@ module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.4
module load upp/10.0.8

## WCOSS Cray execution prereqs:
module load rca
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/ufs_wcoss_cray_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
Expand All @@ -52,7 +52,7 @@ module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.4
module load upp/10.0.8

## WCOSS Cray execution prereqs:
module load rca
Expand Down
188 changes: 94 additions & 94 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

582 changes: 291 additions & 291 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

574 changes: 287 additions & 287 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

192 changes: 96 additions & 96 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

598 changes: 299 additions & 299 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

599 changes: 306 additions & 293 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

480 changes: 257 additions & 223 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

944 changes: 282 additions & 662 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 18 additions & 6 deletions tests/parm/params_grib2_tbl_new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
0 20 108 0 ALBGRD
0 20 107 0 ALBSAT
10 0 38 0 ALCWH
0 14 204 1 ALD2
0 20 110 0 ALEGRD
0 20 109 0 ALESAT
10 0 39 0 ALRRC
Expand All @@ -46,6 +47,7 @@
0 20 5 0 ANPEMFLX
0 20 4 0 ANPMFLX
10 3 197 1 AOHFLX
0 3 21 0 AOSGSO
3 1 20 0 AOT06
3 1 21 0 AOT08
3 1 22 0 AOT16
Expand All @@ -55,7 +57,6 @@
0 0 21 0 APTMP
0 1 221 1 ARAIN
0 20 8 0 AREMFLX
0 3 21 0 ASGSO
0 3 24 0 ASGSO
10 3 198 1 ASHFL
0 20 60 0 ASNCON
Expand Down Expand Up @@ -157,8 +158,8 @@
3 1 16 0 CLDRAD
3 2 3 0 CLDTYPE
0 1 235 1 CLLMR
0 1 22 0 CLMR
3 0 7 0 CLOUDM
0 1 22 0 CLWMR
0 2 216 1 CNGWDU
0 2 217 1 CNGWDV
0 3 209 1 CNVDEMF
Expand Down Expand Up @@ -285,23 +286,27 @@
0 4 194 1 DUVB
0 4 12 0 DWUVR
0 2 9 0 DZDT
0 7 207 1 E3KH
3 2 11 0 EAODR
3 5 5 0 EBSDSSTS
3 5 4 0 EBSSTSTD
0 19 30 0 EDPARM
0 7 204 1 EFHL
0 3 222 1 EFSH
0 7 9 0 EHLX
4 2 1 0 ELCDEN
4 0 1 0 ELECTMP
10 3 194 1 ELEV
0 19 238 1 ELLINX
0 0 205 1 ELMELT
0 191 197 1 ELONN
0 191 193 1 ELON
0 1 211 1 EMNP
0 0 3 0 EPOT
0 19 218 1 EPSR
10 3 252 1 EROSNP
1 0 3 0 ESCT
0 2 233 1 ESHR
0 7 205 1 ESP
3 1 0 0 ESTP
3 1 4 0 ESTUGRD
Expand Down Expand Up @@ -349,8 +354,8 @@
0 1 43 0 FRAIN
0 1 202 1 FRAIN
10 0 63 0 FREWWW
10 0 17 0 FRICVW
0 2 30 0 FRICV
10 0 17 0 FRICV
0 2 197 1 FRICV
0 1 227 1 FROZR
2 3 24 0 FRSTINX
Expand Down Expand Up @@ -524,9 +529,9 @@
10 0 24 0 MAXWH
0 6 4 0 MCDC
0 1 26 0 MCONV
0 1 197 1 MCONV
0 6 40 0 MDCCWD
0 1 38 0 MDIVER
0 1 197 1 MDIV
0 1 112 0 MDLWGVA
0 1 109 0 MDLWHVA
0 1 115 0 MDLWSVA
Expand All @@ -539,6 +544,7 @@
0 19 3 0 MIXHT
0 19 204 1 MIXLY
0 1 2 0 MIXR
0 7 212 1 MLFC
0 191 195 1 MLYNO
0 1 114 0 MMLWGDA
0 1 111 0 MMLWHDA
Expand All @@ -555,7 +561,6 @@
0 20 16 0 MSSRDRYA
0 20 17 0 MSSRWETA
10 0 20 0 MSSW
0 11 1 0 MSTAV
2 0 11 0 MSTAV
2 0 194 1 MSTAV
2 0 7 0 MTERH
Expand Down Expand Up @@ -813,6 +818,7 @@
3 192 53 0 SBTAGR8
3 192 54 0 SBTAGR9
3 0 2 0 SBTMP
0 7 210 1 SCCP
4 2 10 0 SCINT
0 1 84 0 SCLIWC
0 1 83 0 SCLLWC
Expand Down Expand Up @@ -862,8 +868,10 @@
0 7 13 0 SHWINX
10 2 3 0 SICED
4 9 1 0 SIGHAL
0 7 209 1 SIGH
4 9 2 0 SIGPAR
4 9 0 0 SIGPED
0 7 211 1 SIGT
0 19 217 1 SIPD
0 0 17 0 SKINT
3 5 1 0 SKSSTMP
Expand Down Expand Up @@ -948,6 +956,7 @@
10 3 199 1 SSTT
0 6 35 0 SSWTC
0 19 200 1 STORPROB
0 7 208 1 STPC
0 2 4 0 STRM
0 1 87 0 STRPRATE
0 6 33 0 SUNSD
Expand Down Expand Up @@ -1086,6 +1095,8 @@
0 1 119 0 UCSCLW
0 0 28 0 UCTMP
0 3 29 0 UDRATE
0 2 236 1 UEID
0 2 234 1 UESH
0 2 17 0 UFLX
0 2 2 0 UGRD
0 2 23 0 UGUST
Expand Down Expand Up @@ -1132,9 +1143,11 @@
2 0 231 1 VEGMIN
2 0 210 1 VEGT
2 0 4 0 VEG
0 2 237 1 VEID
4 1 1 0 VEL1
4 1 2 0 VEL2
4 1 3 0 VEL3
0 2 235 1 VESH
0 2 18 0 VFLX
0 6 48 0 VFRCICE
0 6 49 0 VFRCIW
Expand Down Expand Up @@ -1247,4 +1260,3 @@
4 8 0 0 XRAYRAD
4 6 2 0 XSHRT
10 2 10 0 ZVCICEP
0 0 0 1
Loading