Skip to content
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.

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

Bug fix for HRRR IFI: Use ifi_apcp if it is 0 #1127

Open
wants to merge 60 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
4fdd95d
ifi-only post control file
SamuelTrahanNOAA Jan 22, 2025
097480c
dev jobs for ci tests, including new ifi jobs
SamuelTrahanNOAA Jan 22, 2025
c99f93c
rt.sh gets scripts from svndir and runs ifi tests
SamuelTrahanNOAA Jan 23, 2025
a947351
copy orion tests to jobs-dev; hercules tests are only accessible to epic
SamuelTrahanNOAA Jan 23, 2025
48255ab
tell git to ignore emacs autosave files
SamuelTrahanNOAA Jan 23, 2025
1168782
more hercules jobs-dev scripts
SamuelTrahanNOAA Jan 23, 2025
a7511fb
new scripts for IFI tests on Hera
SamuelTrahanNOAA Jan 23, 2025
42fc921
add IFI to raphrrr available fields
SamuelTrahanNOAA Jan 23, 2025
2ccceee
RRFS ifi test
SamuelTrahanNOAA Jan 23, 2025
6fbcfe0
add ifi regtests to rt.sh
SamuelTrahanNOAA Jan 23, 2025
5e34264
remove unneeded file
SamuelTrahanNOAA Jan 23, 2025
79cd04f
Merge branch 'ifi-regtest' of ssh://github.com/SamuelTrahanNOAA/UPP i…
SamuelTrahanNOAA Jan 23, 2025
a8aa0c1
hera test results
SamuelTrahanNOAA Jan 23, 2025
7a5b1f9
separate baseline for fv3r_ifi
SamuelTrahanNOAA Jan 25, 2025
3c7e568
messages for BUILD_IFI_EXECUTABLES option
SamuelTrahanNOAA Jan 25, 2025
dd80507
fv3r_ifi_missing regtest checks if ifi has "missing" data when libifi…
SamuelTrahanNOAA Jan 25, 2025
66f2de6
script and resource corrections in ci/jobs-dev/run_ifi_standalone_hrr…
SamuelTrahanNOAA Jan 29, 2025
b8df717
use the ifi-only NT file for hrrr_ifi test
SamuelTrahanNOAA Jan 29, 2025
edc4dd1
Bug fix for HRRR IFI: Use ifi_apcp if it is 0; does not change FV3R r…
SamuelTrahanNOAA Jan 29, 2025
63980e6
mkdir should be mkdir -p
SamuelTrahanNOAA Feb 5, 2025
ed473bc
revert accidental change
SamuelTrahanNOAA Feb 5, 2025
0a6fb78
avoid syntax error on non-ifi platforms
SamuelTrahanNOAA Feb 10, 2025
c8c6ccc
merge remote
SamuelTrahanNOAA Feb 10, 2025
47eb94c
merge upstream develop
SamuelTrahanNOAA Feb 10, 2025
20cf287
Add the "ifi_missing" tests for hercules and orion
SamuelTrahanNOAA Feb 10, 2025
cd16202
move hera rundir and homedir to sensible locations
SamuelTrahanNOAA Feb 10, 2025
c7aa086
Merge branch 'ifi-regtest' of ssh://github.com/SamuelTrahanNOAA/UPP i…
SamuelTrahanNOAA Feb 10, 2025
137926f
revert post_avblflds_raphrrr.xml changes
SamuelTrahanNOAA Feb 10, 2025
f1ec407
rt.sh detects when a test could not run
SamuelTrahanNOAA Feb 10, 2025
7e9bdea
Merge branch 'ifi-regtest' of ssh://github.com/SamuelTrahanNOAA/UPP i…
SamuelTrahanNOAA Feb 10, 2025
b9d073f
update ci scripts for ifi_missing on orion and hercules
SamuelTrahanNOAA Feb 10, 2025
3bb9c19
copy regtest data on msstate to test area
SamuelTrahanNOAA Feb 10, 2025
d425f5b
hera test logs
SamuelTrahanNOAA Feb 10, 2025
8021c1e
hercules logs
SamuelTrahanNOAA Feb 10, 2025
36340fa
Merge branch 'ifi-regtest' of ssh://github.com/SamuelTrahanNOAA/UPP i…
SamuelTrahanNOAA Feb 10, 2025
c3415e9
orion test log
SamuelTrahanNOAA Feb 10, 2025
6b1d1be
add hercules rt log
gspetro-NOAA Feb 11, 2025
4a660af
add orion rt log
gspetro-NOAA Feb 11, 2025
5537fc4
bug fix to runtime detection
SamuelTrahanNOAA Feb 13, 2025
fdcd7fa
typo fix: rtma_test_pe_test -> rtma_pe_test
SamuelTrahanNOAA Feb 13, 2025
49b08fb
rt.sh: move test_suite, and detect failures better
SamuelTrahanNOAA Feb 18, 2025
f805a72
add hera rt log
gspetro-NOAA Feb 18, 2025
7b8539f
ifi jobs should not link crtm fix files
SamuelTrahanNOAA Feb 19, 2025
f7fc31c
Merge branch 'ifi-regtest' of ssh://github.com/SamuelTrahanNOAA/UPP i…
SamuelTrahanNOAA Feb 19, 2025
d29c6ca
update orion rt log
gspetro-NOAA Feb 20, 2025
e602ab4
update orion rt log
gspetro-NOAA Feb 20, 2025
3a237c5
update hera rt log
gspetro-NOAA Feb 20, 2025
37bb378
Update ci/rt.sh
SamuelTrahanNOAA Feb 20, 2025
c3fdff5
Update ci/rt.sh
SamuelTrahanNOAA Feb 20, 2025
d919e58
Update ci/rt.sh
SamuelTrahanNOAA Feb 20, 2025
0675c3d
update hercules rt log
gspetro-NOAA Feb 20, 2025
ad332d5
update orion rt
gspetro-NOAA Feb 21, 2025
e235a92
update hera rt log
gspetro-NOAA Feb 21, 2025
2584d4b
Merge branch 'develop' into bugfix/ifi-apcp-hrrr
WenMeng-NOAA Feb 24, 2025
f646af2
Merge branch 'develop' into bugfix/ifi-apcp-hrrr
WenMeng-NOAA Feb 27, 2025
c4b55ef
enable ifi_standalone_hrrr test
SamuelTrahanNOAA Feb 27, 2025
ce7fd9c
address reviewer comments
SamuelTrahanNOAA Feb 27, 2025
aee55a3
Merge branch 'develop' into bugfix/ifi-apcp-hrrr
WenMeng-NOAA Feb 28, 2025
200d825
remove unneeded fix file copy
SamuelTrahanNOAA Feb 28, 2025
9644438
Merge branch 'bugfix/ifi-apcp-hrrr' of ssh://github.com/SamuelTrahanN…
SamuelTrahanNOAA Feb 28, 2025
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
3 changes: 0 additions & 3 deletions ci/jobs-dev/run_post_hrrr_ifi_HERA.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ write_ifi_debug_files=.true.
EOF
#FMIN

#copy fix data
cp $homedir/fix/fix_2.3.0/*bin .

#copy xml
cp ${svndir}/parm/params_grib2_tbl_new params_grib2_tbl_new
cp ${svndir}/parm/postxconfig-NT-ifi.txt postxconfig-NT.txt
Expand Down
2 changes: 1 addition & 1 deletion ci/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ run_rtma=yes
# Tests with IFI enabled only work if libIFI is present.
if [[ "$have_ifi" == yes && "$disable_ifi" == no ]] ; then
run_hrrr_ifi=yes
run_ifi_standalone_hrrr=no # turned off by default because it doesn't match UPP output yet
run_ifi_standalone_hrrr=yes
run_fv3r_ifi=yes
run_ifi_standalone_fv3r=yes
else
Expand Down
9 changes: 8 additions & 1 deletion sorc/ncep_post.fd/IFI.F
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
!> @file
!> @brief upp_ifi_mod declares variables used in the in-flight icing (IFI) routines.
!>
!> ### Program history log:
!> Date | Programmer | Comments
!> -----|------------|---------
!> ca 2023-2025 | Sam Trahan and UCAR collaborators | Initial
!> 2025-02-27 | Sam Trahan | Bugfix: Reject IFI_APCP only where it is spval

module upp_ifi_mod

#ifdef USE_IFI
Expand Down Expand Up @@ -792,7 +799,7 @@ END SUBROUTINE EXCH_c_float
!$OMP PARALLEL DO COLLAPSE(2)
do j=jsta,jend
do i=ista,iend
if(ifi_apcp(i,j)>9e9 .or. ifi_apcp(i,j)<-9e9 .or. ifi_apcp(i,j)==0) then
if(ifi_apcp(i,j) == spval) then
ifi_apcp(i,j) = avgprec_cont(i,j)*to_hourly
else if(ITPREC>1e-5) then
ifi_apcp(i,j) = ifi_apcp(i,j)/itprec
Expand Down
3 changes: 2 additions & 1 deletion sorc/ncep_post.fd/SURFCE.f
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
!> 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
!> 2025-02-27 | S Trahan | Update comment to match new use of IFI_APCP in IFI.F
!>
!> @note
!> USAGE: CALL SURFCE
Expand Down Expand Up @@ -4048,7 +4049,7 @@ SUBROUTINE SURFCE
ENDIF
ENDDO
ENDDO
! Note: IFI.F may replace IFI_APCP with other values where it is spval or 0
! Note: IFI.F may replace IFI_APCP=spval with other values
ENDIF

IF (IGET(434)>0.) THEN
Expand Down