From b98442d6c71bc5ef0e984695c9e1178f2822781f Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 12 Jun 2024 18:15:06 +0000 Subject: [PATCH 01/18] point to number-concentration branch of upp --- .gitmodules | 4 ++-- upp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..f4ff8072c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ branch = ufs/dev [submodule "upp"] path = upp - url = https://github.com/NOAA-EMC/UPP - branch = develop + url = https://github.com/SamuelTrahanNOAA/UPP + branch = number-concentration diff --git a/upp b/upp index be0410ece..04e6913d5 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit be0410ece28f2b5b9c089f8ca09ce0c80c79fe6c +Subproject commit 04e6913d5af7b63acbed4beb9cdafa551d885c51 From be274ccfc60cb19c7aceefcfdc8bc171160845f9 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 13 Jun 2024 16:35:43 +0000 Subject: [PATCH 02/18] update upp hash --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 04e6913d5..f456428bc 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 04e6913d5af7b63acbed4beb9cdafa551d885c51 +Subproject commit f456428bce3fd3a68032dfb77bba4c5fee43f812 From 9a8e95f574ff4cd356328a978744eb8e63956de3 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 13 Jun 2024 16:36:12 +0000 Subject: [PATCH 03/18] send CCPP ebu_smoke to UPP ebb --- io/post_fv3.F90 | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 5d222497e..21d8aa8c5 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -505,7 +505,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) ! use esmf use vrbls4d, only: dust, smoke, fv3dust, coarsepm, SALT, SUSO, SOOT, & - WASO,no3,nh4, PP25, PP10 + WASO,no3,nh4, PP25, PP10, ebb use vrbls3d, only: t, q, uh, vh, wh, alpint, dpres, zint, zmid, o3, & qqr, qqs, cwm, qqi, qqw, qqg, omga, cfr, pmid, & q2, rlwtt, rswtt, tcucn, tcucns, train, el_pbl, & @@ -546,7 +546,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) sfcvxi, t10m, t10avg, psfcavg, akhsavg, akmsavg, & albedo, tg, prate_max, pwat, snow_acm, snow_bkt, & acgraup, graup_bucket, acfrain, frzrn_bucket, & - ltg1_max, ltg2_max, ltg3_max, ebb, hwp, & + ltg1_max, ltg2_max, ltg3_max, hwp, & aod550,du_aod550,ss_aod550,su_aod550,oc_aod550, & bc_aod550,maod, & dustpm10, dustcb, bccb, occb, sulfcb, sscb, & @@ -1007,17 +1007,6 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif - ! biomass burning emissions - if(trim(fieldname)=='ebb_smoke_hr') then - !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,ebb,arrayr42d,fillValue,spval) - do j=jsta,jend - do i=ista, iend - ebb(i,j)=arrayr42d(i,j) - if(abs(arrayr42d(i,j)-fillValue) < small) ebb(i,j)=spval - enddo - enddo - endif - ! wildfire potential if(trim(fieldname)=='hwp') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,hwp,arrayr42d,fillValue,spval) @@ -3452,6 +3441,19 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif + ! biomass burning emissions + if(trim(fieldname)=='ebu_smoke') then + !$omp parallel do default(none) private(i,j,l) shared(jsta,jend,ista,iend,ebb,arrayr43d,fillValue,spval,lm) + do l=1,lm + do j=jsta,jend + do i=ista, iend + ebb(i,j,l,1)=arrayr43d(i,j,l) + if(abs(arrayr43d(i,j,l)-fillValue) < small) ebb(i,j,l,1)=spval + enddo + enddo + enddo + endif + ! model level T if(trim(fieldname)=='tmp') then !$omp parallel do default(none) private(i,j,l) shared(lm,jsta,jend,ista,iend,t,arrayr43d,fillvalue,spval) From eaef8c83c9fd5e4d723b997adf786e663a937594 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 13 Jun 2024 17:51:10 +0000 Subject: [PATCH 04/18] upp: remove GSD_NC synonyms and rename GSD_NC fields instead --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index f456428bc..018d6391f 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit f456428bce3fd3a68032dfb77bba4c5fee43f812 +Subproject commit 018d6391f85288fc34f204788b98019d83b2c7d7 From aa6ac9cb0462b043ad967ec7e6ac5db1f35ecc83 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 13 Jun 2024 21:14:49 +0000 Subject: [PATCH 05/18] update upp hash --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 018d6391f..288967cc5 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 018d6391f85288fc34f204788b98019d83b2c7d7 +Subproject commit 288967cc545fe5ec9edf034e4da86e6b5bc1b82b From 3cde3d084f77710e8c04a58b2a974aa66d92651c Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 14 Jun 2024 14:30:21 +0000 Subject: [PATCH 06/18] upp: correct pressure levels for hafs-ar postxconfig files --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 288967cc5..c6f6d7ece 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 288967cc545fe5ec9edf034e4da86e6b5bc1b82b +Subproject commit c6f6d7ece30289db92b4321d7686bf0d29232331 From ee09cbe4ed41bb80119cdb088d6a2e4748a3b799 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 17 Jun 2024 18:47:38 +0000 Subject: [PATCH 07/18] bugfix: fixed_sfc2_type defaults to fixed_sfc1_type --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index c6f6d7ece..235c63b61 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit c6f6d7ece30289db92b4321d7686bf0d29232331 +Subproject commit 235c63b618e78e62100b8dbbdb3eea5399d1b15e From 61bb95a361fb562d48a37c84b3151f5d5bb6d5d6 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 17 Jun 2024 19:15:11 +0000 Subject: [PATCH 08/18] merge upp upstream/develop to branch --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 235c63b61..e72f1353a 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 235c63b618e78e62100b8dbbdb3eea5399d1b15e +Subproject commit e72f1353ad321eb3d0cb30d280b91e99ae4fbf3b From c6f6927865712c612f97b2478bb4145e8b102870 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 19 Jun 2024 18:36:41 +0000 Subject: [PATCH 09/18] update upp hash --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index e72f1353a..ee3c64cb2 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit e72f1353ad321eb3d0cb30d280b91e99ae4fbf3b +Subproject commit ee3c64cb2a0ceb9326acd413b1e4d13a9ad6b253 From 5ec9abcfe78ba8155fc93a070231a1c884a0105a Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 20 Jun 2024 20:32:14 +0000 Subject: [PATCH 10/18] point to authoritative upp --- .gitmodules | 4 ++-- upp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f4ff8072c..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,5 +12,5 @@ branch = ufs/dev [submodule "upp"] path = upp - url = https://github.com/SamuelTrahanNOAA/UPP - branch = number-concentration + url = https://github.com/NOAA-EMC/UPP + branch = develop diff --git a/upp b/upp index ee3c64cb2..70fc7625e 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit ee3c64cb2a0ceb9326acd413b1e4d13a9ad6b253 +Subproject commit 70fc7625efef6055ca038fcfcdc648353214845b From 4a7724e0408cd456601b91076391b310f187e654 Mon Sep 17 00:00:00 2001 From: Wen Meng Date: Thu, 4 Jul 2024 19:12:28 +0000 Subject: [PATCH 11/18] Update upp to the latest harsh; Sync more changes from offline interface. --- io/post_fv3.F90 | 189 ++++++++++++++++++++++++++++++++++++++++++------ upp | 2 +- 2 files changed, 169 insertions(+), 22 deletions(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index 21d8aa8c5..d754dc45d 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -507,7 +507,7 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) use vrbls4d, only: dust, smoke, fv3dust, coarsepm, SALT, SUSO, SOOT, & WASO,no3,nh4, PP25, PP10, ebb use vrbls3d, only: t, q, uh, vh, wh, alpint, dpres, zint, zmid, o3, & - qqr, qqs, cwm, qqi, qqw, qqg, omga, cfr, pmid, & + qqr, qqs, cwm, qqi, qqw, qqg, qqh, omga, cfr, pmid, & q2, rlwtt, rswtt, tcucn, tcucns, train, el_pbl, & pint, exch_h, ref_10cm, qqni, qqnr, qqnw, qqnwfa, & qqnifa, effri, effrl, effrs, aextc55, taod5503d, & @@ -546,13 +546,15 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) sfcvxi, t10m, t10avg, psfcavg, akhsavg, akmsavg, & albedo, tg, prate_max, pwat, snow_acm, snow_bkt, & acgraup, graup_bucket, acfrain, frzrn_bucket, & - ltg1_max, ltg2_max, ltg3_max, hwp, & + ltg1_max, ltg2_max, ltg3_max, hwp, albedo, & aod550,du_aod550,ss_aod550,su_aod550,oc_aod550, & bc_aod550,maod, & dustpm10, dustcb, bccb, occb, sulfcb, sscb, & dustallcb, ssallcb, dustpm, sspm, pp25cb, pp10cb, & no3cb, nh4cb, dusmass, ducmass, dusmass25,ducmass25, & - snownc, graupelnc, qrmax, hail_maxhailcast + snownc, graupelnc, qrmax, hail_maxhailcast, & + smoke_ave,dust_ave,coarsepm_ave,swddif,swddni, & + xlaixy use soil, only: sldpth, sh2o, smc, stc, sllevel use masks, only: lmv, lmh, htm, vtm, gdlat, gdlon, dx, dy, hbm2, sm, sice use ctlblk_mod, only: im, jm, lm, lp1, jsta, jend, jsta_2l, jend_2u, jsta_m,jend_m, & @@ -608,7 +610,8 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) real,dimension(:), allocatable :: slat,qstl real,external::FPVSNEW real,dimension(:,:),allocatable :: dummy, p2d, t2d, q2d, qs2d, & - cw2d, cfr2d, snacc_land, snacc_ice + cw2d, cfr2d, snacc_land, snacc_ice, & + acsnom_land, acsnom_ice real,dimension(:,:,:),allocatable :: ext550 character(len=80) :: fieldname, wrtFBName, flatlon, & VarName @@ -691,15 +694,6 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) !Allocate for regional models only if(modelname=='FV3R') then allocate(ext550(ista:iend,jsta:jend,lm)) - allocate(snacc_ice(ista:iend,jsta:jend)) - allocate(snacc_land(ista:iend,jsta:jend)) - - do j=jsta,jend - do i=ista,iend - snacc_ice(i,j)=spval - snacc_land(i,j)=spval - end do - end do do l=1,lm do j=jsta,jend @@ -710,6 +704,20 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) end do endif + allocate(snacc_ice(ista:iend,jsta:jend)) + allocate(snacc_land(ista:iend,jsta:jend)) + allocate(acsnom_ice(ista:iend,jsta:jend)) + allocate(acsnom_land(ista:iend,jsta:jend)) + + do j=jsta,jend + do i=ista,iend + snacc_ice(i,j)=spval + snacc_land(i,j)=spval + acsnom_ice(i,j)=spval + acsnom_land(i,j)=spval + end do + end do + ! ! GFS doesn not yet output soil layer thickness, assign SLDPTH to be the same as nam sldpth(1) = 0.10 @@ -1007,8 +1015,8 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif - ! wildfire potential - if(trim(fieldname)=='hwp') then + ! hourly wildfire potential + if(trim(fieldname)=='hwp_ave') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,hwp,arrayr42d,fillValue,spval) do j=jsta,jend do i=ista, iend @@ -1018,6 +1026,39 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif + !hourly averaged smoke + if(trim(fieldname)=='smoke_ave') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,smoke_ave,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + smoke_ave(i,j)=arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillValue) < small) smoke_ave(i,j)=spval + enddo + enddo + endif + + !hourly averaged dust + if(trim(fieldname)=='dust_ave') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,dust_ave,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + dust_ave(i,j)=arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillValue) < small) dust_ave(i,j)=spval + enddo + enddo + endif + + !hourly averaged coarsepm + if(trim(fieldname)=='coarsepm_ave') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,coarsepm_ave,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + coarsepm_ave(i,j)=arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillValue) < small) coarsepm_ave(i,j)=spval + enddo + enddo + endif + ! frictional velocity if(trim(fieldname)=='fricv') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,ustar,arrayr42d,fillValue,spval) @@ -1062,6 +1103,17 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif + ! surface albedo + if(trim(fieldname)=='sfalb') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,albedo,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + albedo(i,j)=arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillValue) < small) albedo(i,j)=spval + enddo + enddo + endif + ! surface potential T if(trim(fieldname)=='tmpsfc') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,arrayr42d,ths,fillValue,spval) @@ -2009,6 +2061,50 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif + ! inst incoming clear sky sfc shortwave + if(trim(fieldname)=='dswrf_clr') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,rswinc,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + rswinc(i,j) = arrayr42d(i,j) + if( abs(arrayr42d(i,j)-fillValue) < small) rswinc(i,j) = spval + enddo + enddo + endif + + ! inst incoming direct beam sfc shortwave + if(trim(fieldname)=='visbmdi') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,swddni,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + swddni(i,j) = arrayr42d(i,j) + if( abs(arrayr42d(i,j)-fillValue) < small) swddni(i,j) = spval + enddo + enddo + endif + + ! inst incoming diffuse sfc shortwave + if(trim(fieldname)=='visdfdi') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,swddif,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + swddif(i,j) = arrayr42d(i,j) + if( abs(arrayr42d(i,j)-fillValue) < small) swddif(i,j) = spval + enddo + enddo + endif + + ! leaf area index + if(trim(fieldname)=='xlaixy') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,xlaixy,arrayr42d,fillValue,spval) + do j=jsta,jend + do i=ista, iend + xlaixy(i,j) = arrayr42d(i,j) + if( abs(arrayr42d(i,j)-fillValue) < small) xlaixy(i,j) = spval + enddo + enddo + endif + ! time averaged incoming sfc uv-b if(trim(fieldname)=='duvb_ave') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,auvbin,arrayr42d,fillValue,spval) @@ -2305,8 +2401,6 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif - if(modelname=='FV3R')then - !sndepac if(trim(fieldname)=='snacc_land') then !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,snacc_land,arrayr42d,fillvalue,spval) @@ -2327,7 +2421,25 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo endif - endif !FV3R + !snom + if(trim(fieldname)=='snom_land') then + !$omp parallel do default(none) private(i,j) shared(jsta,jend,ista,iend,acsnom_land,arrayr42d,fillvalue,spval) + do j=jsta,jend + do i=ista, iend + acsnom_land(i,j) = arrayr42d(i,j) + if(abs(arrayr42d(i,j)-fillvalue) Date: Thu, 11 Jul 2024 18:45:54 +0000 Subject: [PATCH 12/18] update upp hash --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 60752373a..f4c4e63a2 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 60752373a425ffc942eb3f13b5a07037930359e9 +Subproject commit f4c4e63a2bdefabb83f8a818be0ac482048165b4 From 2f94bf1a1781de0bfc63278ecf5ad2a4666fa51f Mon Sep 17 00:00:00 2001 From: Wen Meng Date: Fri, 19 Jul 2024 15:24:48 +0000 Subject: [PATCH 13/18] Add aerosol fix from Li Pan. --- io/post_fv3.F90 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/io/post_fv3.F90 b/io/post_fv3.F90 index d754dc45d..17b1572f1 100644 --- a/io/post_fv3.F90 +++ b/io/post_fv3.F90 @@ -4758,12 +4758,18 @@ subroutine set_postvars_fv3(wrt_int_state,grid_id,mype,mpicomp) enddo enddo ! do loop for l - l=lm - do j=jsta,jend + do l=1,lm + do j=jsta,jend do i=ista,iend - tv = t(i,j,l) * (h1+d608*MAX(q(I,J,L),qmin)) rhomid(i,j,l) = pmid(i,j,l) / (rd*tv) + enddo + enddo + enddo + + l=lm + do j=jsta,jend + do i=ista,iend dustcb(i,j) = MAX(dustcb(i,j), 0.0) dustallcb(i,j) = MAX(dustallcb(i,j), 0.0) From 29e8d774f650f41231e302687e3061712aa680c0 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 8 Aug 2024 17:48:03 +0000 Subject: [PATCH 14/18] update to head of UPP develop --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index f4c4e63a2..97ea6555f 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit f4c4e63a2bdefabb83f8a818be0ac482048165b4 +Subproject commit 97ea6555f855d136198738bd181ff52ca2ad0d31 From d1d49d829fba47f892a3486c70f0d3f8d5170f4d Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Wed, 14 Aug 2024 13:05:44 -0500 Subject: [PATCH 15/18] update to latest upp --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 97ea6555f..81b38a88d 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 97ea6555f855d136198738bd181ff52ca2ad0d31 +Subproject commit 81b38a88d860ce7e34e8507c2246151a54d96a39 From 5648c03e21e41bdc34d50fd9cf63f41c1244befa Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Thu, 15 Aug 2024 20:06:44 -0500 Subject: [PATCH 16/18] update spack package list --- ci/spack.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index 400b7e06b..d43c68d66 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -15,7 +15,16 @@ spack: - ip@develop precision=4,d,8 - sp@2.4.0 precision=4,d,8 - bacio@2.4.1 - - upp@develop + - netcdf-fortran@4.6.1 + - g2@3.5.1 + - g2tmpl@1.13.0 + - sp@2.5.0 + - ip@4.3.0 + - sigio@2.3.2 + - sfcio@1.4.1 + - nemsio@2.5.4 + - wrf-io@1.2.0 + - crtm@2.4.0.1 - esmf@8.4.2 - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 - netcdf-c@4.9.2 ~blosc From 41261b7a646529ff2a65a55686fbe67a8e9814c5 Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Thu, 15 Aug 2024 20:11:21 -0500 Subject: [PATCH 17/18] try2: update spack package list; remove duplicates and sort --- ci/spack.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index d43c68d66..d13062865 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -11,23 +11,21 @@ # Alex Richert, 6 Dec 2023 spack: specs: - - w3emc@2.10.0 precision=4,d,8 - - ip@develop precision=4,d,8 - - sp@2.4.0 precision=4,d,8 - bacio@2.4.1 - - netcdf-fortran@4.6.1 - - g2@3.5.1 - - g2tmpl@1.13.0 - - sp@2.5.0 - - ip@4.3.0 - - sigio@2.3.2 - - sfcio@1.4.1 - - nemsio@2.5.4 - - wrf-io@1.2.0 - crtm@2.4.0.1 - esmf@8.4.2 - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 + - g2@3.5.1 + - g2tmpl@1.13.0 + - ip@develop precision=4,d,8 + - nemsio@2.5.4 - netcdf-c@4.9.2 ~blosc + - netcdf-fortran@4.6.1 + - sfcio@1.4.1 + - sigio@2.3.2 + - sp@2.5.0 precision=4,d,8 + - w3emc@2.10.0 precision=4,d,8 + - wrf-io@1.2.0 view: false concretizer: unify: true From d35292607ebfb2a5a6245d2c409f84e51c0eb815 Mon Sep 17 00:00:00 2001 From: Samuel Trahan Date: Thu, 15 Aug 2024 21:00:59 -0500 Subject: [PATCH 18/18] spack.yaml: remove unneeded libraries & sync versions with ufs-weather-model hercules --- ci/spack.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index d13062865..32bb71616 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -12,20 +12,16 @@ spack: specs: - bacio@2.4.1 - - crtm@2.4.0.1 - - esmf@8.4.2 + - crtm@2.4.0 + - esmf@8.6.0 - fms@2023.04 +gfs_phys +openmp +pic +quad_precision +deprecated_io constants=GFS precision=32,64 - g2@3.5.1 - g2tmpl@1.13.0 - - ip@develop precision=4,d,8 - - nemsio@2.5.4 + - ip@4.3.0 precision=4,d,8 - netcdf-c@4.9.2 ~blosc - netcdf-fortran@4.6.1 - - sfcio@1.4.1 - - sigio@2.3.2 - sp@2.5.0 precision=4,d,8 - w3emc@2.10.0 precision=4,d,8 - - wrf-io@1.2.0 view: false concretizer: unify: true