Skip to content

Commit

Permalink
Unify iSF_SURFACE_PHYSICS (#1080)
Browse files Browse the repository at this point in the history 
* Unify iSF_SURFACE_PHYSICS

* Remove redundant modelnames

* Tuning SURFCE.f

* add hera rt file

* add hercules rt log

* add orion rt log

---------

Co-authored-by: gspetro-NOAA <[email protected]>
  • Loading branch information
@WenMeng-NOAA @gspetro-NOAA
WenMeng-NOAA and gspetro-NOAA authored Oct 30, 2024
1 parent ce258fc commit 65a0339
Show file tree
Hide file tree
Showing 5 changed files with 179 additions and 174 deletions.
7 changes: 5 additions & 2 deletions sorc/ncep_post.fd/SURFCE.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
!> 2024-05-24 | E James | Modify the run total acc precip fields for 15-min output
!> 2024-06-11 | E James | Modifying RRFS hourly average smoke/dust fields to be PM2.5 and PM20
!> 2024-08-26 | K Asmar | Modify max winds at 10m agl for UFS time buckets
!> 2024-10-29 | W Meng | Unify iSF_SURFACE_PHYSICS as:1 for NOHA,2 for NOAH MP,3 for RUC
!>
!> @note
!> USAGE: CALL SURFCE
Expand Down Expand Up @@ -6478,7 +6479,8 @@ SUBROUTINE SURFCE
! LEAF AREA INDEX
IF (MODELNAME == 'NCAR'.OR.MODELNAME=='NMM' .OR. &
MODELNAME == 'FV3R' .OR. MODELNAME=='RAPR')THEN
IF (iSF_SURFACE_PHYSICS == 2 .OR. MODELNAME=='FV3R' .OR. MODELNAME=='RAPR') THEN
IF (iSF_SURFACE_PHYSICS == 2 .OR. iSF_SURFACE_PHYSICS == 1 .OR. &
iSF_SURFACE_PHYSICS == 3) THEN
IF (IGET(254)>0) THEN
if (me==0)print*,'starting LAI'
DO J=JSTA,JEND
Expand Down Expand Up @@ -6565,7 +6567,8 @@ SUBROUTINE SURFCE
& .OR. IGET(237)>0 .OR. IGET(238)>0 &
& .OR. IGET(239)>0 .OR. IGET(240)>0 &
& .OR. IGET(241)>0 ) THEN
IF (iSF_SURFACE_PHYSICS == 2 .OR. iSF_SURFACE_PHYSICS == 3) THEN !NSOIL == 4
IF (iSF_SURFACE_PHYSICS == 2 .OR. iSF_SURFACE_PHYSICS == 1 .OR. &
iSF_SURFACE_PHYSICS == 3) THEN !NSOIL == 4
! if(me==0)print*,'starting computing canopy conductance'
allocate(rsmin(ista:iend,jsta:jend), smcref(ista:iend,jsta:jend), gc(ista:iend,jsta:jend), &
rcq(ista:iend,jsta:jend), rct(ista:iend,jsta:jend), rcsoil(ista:iend,jsta:jend), rcs(ista:iend,jsta:jend))
Expand Down
10 changes: 6 additions & 4 deletions sorc/ncep_post.fd/WRFPOST.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
!> 2023-11-29 | Eric James | Add method_blsn logical option
!> 2024-08-19 | Jaymes Kenyon | Adding a call to INITPOST_MPAS
!> 2024-08-30 | Jaymes Kenyon | Hard coding iSF_SURFACE_PHYSICS=3 when modelname=RAPR and submodelname=MPAS
!> 2024-10-29 | Wen Meng | Set iSF_SURFACE_PHYSICS: 1 for NOAH; 2 for NOAH MP; 3 for RUC
!> @author Mike Bladwin NSSL/SPC @date 2002-06-18
!---------------------------------------------------------------------
!> @return wrfpost
Expand Down Expand Up @@ -423,11 +424,12 @@ PROGRAM WRFPOST
Status=nf90_get_att(ncid2d,nf90_global,'landsfcmdl', iSF_SURFACE_PHYSICS)
if(Status/=0)then
print*,'landsfcmdl not found; assigning to 2'
iSF_SURFACE_PHYSICS=2 !set LSM physics to 2 for NOAH
endif
if(iSF_SURFACE_PHYSICS<2)then
iSF_SURFACE_PHYSICS=2 !set LSM physics to 2 for NOAH
iSF_SURFACE_PHYSICS=2 !set LSM physics to 2 for NOAH MP
! LSM physics 1 for NOAH
endif
! if(iSF_SURFACE_PHYSICS<2)then
! iSF_SURFACE_PHYSICS=2 !set LSM physics to 2 for NOAH
! endif
Status=nf90_get_att(ncid2d,nf90_global,'nsoil', NSOIL)
if(Status/=0)then
print*,'nsoil not found; assigning to 4'
Expand Down
112 changes: 56 additions & 56 deletions tests/logs/rt.log.HERA
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
===== Start of UPP Regression Testing Log =====
UPP Hash Tested:
de558e8f18fe09c0ec47b2797358d4cb28154d8a
dbaf64515bcaf32d2f125bfaf68f9e467e365afd

Submodule hashes:
-179cae1dd84401cf25d250bd9102e66560a9d328 sorc/libIFI.fd
-529f870d33b65c3b6c1aa3c3236b94efc3bd336d sorc/ncep_post.fd/post_gtg.fd

Run directory: /scratch2/NAGAPE/epic/Gillian.Petro/RTs/upp-rts/1076/ci/rundir/upp-HERA
Run directory: /scratch2/NAGAPE/epic/Gillian.Petro/RTs/upp-rts/1080/ci/rundir/upp-HERA
Baseline directory: /scratch2/NAGAPE/epic/UPP/test_suite

Total runtime: 00h:10m:40s
Test Date: 20241028 13:20:53
Total runtime: 00h:10m:48s
Test Date: 20241029 20:21:31
Summary Results:

10/28 13:13:15Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
10/28 13:13:16Z -fv3gefs pe test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
10/28 13:13:23Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
10/28 13:13:24Z -fv3hafs pe test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
10/28 13:13:49Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the trunk
10/28 13:13:50Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
10/28 13:14:02Z -nmmb pe test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
10/28 13:14:04Z -nmmb pe test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
10/28 13:14:04Z -nmmb pe test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
10/28 13:14:05Z -rap pe test: your new post executable did generate changed results in WRFPRS.GrbF16
10/28 13:14:06Z -rap pe test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
10/28 13:14:06Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
10/28 13:14:08Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
10/28 13:14:08Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
10/28 13:14:19Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
10/28 13:14:23Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
10/28 13:14:24Z -fv3r pe test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
10/28 13:14:24Z -rtma pe test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
10/28 13:14:27Z -rtma pe test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
10/28 13:14:28Z -rtma pe test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
10/28 13:14:28Z -fv3r pe test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
10/28 13:14:30Z -rtma test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
10/28 13:14:34Z -rtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
10/28 13:14:34Z -rtma test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
10/28 13:14:44Z -hrrr pe test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
10/28 13:14:46Z -hrrr pe test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
10/28 13:14:47Z -hrrr pe test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
10/28 13:15:07Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
10/28 13:15:08Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
10/28 13:15:09Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
10/28 13:20:03Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
10/28 13:20:06Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
10/28 13:20:06Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
10/28 13:20:45Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
10/28 13:20:49Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
10/28 13:20:49Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
10/28 13:14:15Z -Runtime: nmmb_test 00:01:23 -- baseline 00:01:00
10/28 13:14:15Z -Runtime: nmmb_pe_test 00:01:19 -- baseline 00:01:00
10/28 13:14:15Z -Runtime: fv3gefs_test 00:00:30 -- baseline 00:40:00
10/28 13:14:16Z -Runtime: fv3gefs_pe_test 00:00:31 -- baseline 00:40:00
10/28 13:14:16Z -Runtime: rap_test 00:01:05 -- baseline 00:02:00
10/28 13:14:16Z -Runtime: rap_pe_test 00:01:21 -- baseline 00:02:00
10/28 13:15:17Z -Runtime: hrrr_test 00:02:24 -- baseline 00:02:00
10/28 13:15:17Z -Runtime: hrrr_pe_test 00:02:02 -- baseline 00:02:00
10/28 13:20:20Z -Runtime: fv3gfs_test 00:07:21 -- baseline 00:15:00
10/28 13:20:51Z -Runtime: fv3gfs_pe_test 00:08:04 -- baseline 00:15:00
10/28 13:20:51Z -Runtime: fv3r_test 00:01:38 -- baseline 00:03:00
10/28 13:20:51Z -Runtime: fv3r_pe_test 00:01:43 -- baseline 00:03:00
10/28 13:20:52Z -Runtime: fv3hafs_test 00:00:38 -- baseline 00:03:00
10/28 13:20:52Z -Runtime: fv3hafs_pe_test 00:00:39 -- baseline 00:03:00
10/28 13:20:52Z -Runtime: rtma_test 00:01:49 -- baseline 00:03:00
10/28 13:20:53Z -Runtime: rtma_test_pe_test 00:01:43 -- baseline
10/29 20:13:41Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
10/29 20:13:42Z -fv3gefs pe test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the trunk
10/29 20:13:51Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
10/29 20:13:51Z -fv3hafs pe test: your new post executable generates bit-identical HURPRS09.tm00 as the trunk
10/29 20:14:18Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the trunk
10/29 20:14:19Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
10/29 20:14:35Z -rap pe test: your new post executable did generate changed results in WRFPRS.GrbF16
10/29 20:14:36Z -rap pe test: your new post executable generates bit-identical WRFNAT.GrbF16 as the trunk
10/29 20:14:41Z -nmmb pe test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
10/29 20:14:43Z -nmmb pe test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
10/29 20:14:44Z -nmmb pe test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
10/29 20:14:45Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the trunk
10/29 20:14:47Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the trunk
10/29 20:14:47Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the trunk
10/29 20:14:52Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
10/29 20:14:57Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
10/29 20:14:57Z -fv3r pe test: your new post executable generates bit-identical PRSLEV10.tm00 as the trunk
10/29 20:14:59Z -rtma pe test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
10/29 20:15:01Z -fv3r pe test: your new post executable generates bit-identical NATLEV10.tm00 as the trunk
10/29 20:15:01Z -rtma pe test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
10/29 20:15:01Z -rtma pe test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
10/29 20:15:06Z -rtma test: your new post executable generates bit-identical NATLEV00.tm00 as the trunk
10/29 20:15:08Z -rtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the trunk
10/29 20:15:09Z -rtma test: your new post executable generates bit-identical IFIFIP00.tm00 as the trunk
10/29 20:15:17Z -hrrr pe test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
10/29 20:15:18Z -hrrr pe test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
10/29 20:15:20Z -hrrr pe test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
10/29 20:15:43Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the trunk
10/29 20:15:44Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the trunk
10/29 20:15:46Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the trunk
10/29 20:20:34Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
10/29 20:20:36Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
10/29 20:20:36Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
10/29 20:21:23Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the trunk
10/29 20:21:26Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the trunk
10/29 20:21:26Z -fv3gfs pe test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the trunk
10/29 20:14:53Z -Runtime: nmmb_test 00:01:18 -- baseline 00:01:00
10/29 20:14:54Z -Runtime: nmmb_pe_test 00:01:28 -- baseline 00:01:00
10/29 20:14:54Z -Runtime: fv3gefs_test 00:00:33 -- baseline 00:40:00
10/29 20:14:54Z -Runtime: fv3gefs_pe_test 00:00:34 -- baseline 00:40:00
10/29 20:14:54Z -Runtime: rap_test 00:01:11 -- baseline 00:02:00
10/29 20:14:55Z -Runtime: rap_pe_test 00:01:28 -- baseline 00:02:00
10/29 20:15:56Z -Runtime: hrrr_test 00:02:38 -- baseline 00:02:00
10/29 20:15:56Z -Runtime: hrrr_pe_test 00:02:12 -- baseline 00:02:00
10/29 20:20:43Z -Runtime: fv3gfs_test 00:07:28 -- baseline 00:15:00
10/29 20:21:29Z -Runtime: fv3gfs_pe_test 00:08:18 -- baseline 00:15:00
10/29 20:21:29Z -Runtime: fv3r_test 00:01:49 -- baseline 00:03:00
10/29 20:21:29Z -Runtime: fv3r_pe_test 00:01:53 -- baseline 00:03:00
10/29 20:21:30Z -Runtime: fv3hafs_test 00:00:43 -- baseline 00:03:00
10/29 20:21:30Z -Runtime: fv3hafs_pe_test 00:00:43 -- baseline 00:03:00
10/29 20:21:30Z -Runtime: rtma_test 00:02:01 -- baseline 00:03:00
10/29 20:21:31Z -Runtime: rtma_test_pe_test 00:01:53 -- baseline
No changes in test results detected.
===== End of UPP Regression Testing Log =====
Loading

0 comments on commit 65a0339

Please sign in to comment.