Skip to content

bug fixes needed for running with libIFI #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
WenMeng-NOAA merged 11 commits into from
Mar 2, 2023
Merged

bug fixes needed for running with libIFI #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86858df
bug fix to SURFCE.f to prevent crash of inline post
SamuelTrahanNOAA Feb 28, 2023
0494948
fix bug in compile_upp.sh
SamuelTrahanNOAA Feb 28, 2023
fd03737
Merge remote-tracking branch 'upstream/develop' into ifi-inline-post
SamuelTrahanNOAA Feb 28, 2023
4cebd42
From @WenMeng-NOAA to fix #641
SamuelTrahanNOAA Feb 28, 2023
aeda040
`@v2` => `@V3`
SamuelTrahanNOAA Feb 28, 2023
b52ac03
`@V3` => `@v3`
SamuelTrahanNOAA Feb 28, 2023
0965e50
mv some stuff
SamuelTrahanNOAA Feb 28, 2023
efecebf
move the mv
SamuelTrahanNOAA Feb 28, 2023
279d788
remove the mv
SamuelTrahanNOAA Feb 28, 2023
47d4aad
`@v3` => `@v2`
SamuelTrahanNOAA Feb 28, 2023
14ea929
remove the mv
SamuelTrahanNOAA Feb 28, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:

jobs:
setup:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: checkout-upp # This is for getting spack.yaml
Expand Down Expand Up @@ -66,7 +66,6 @@ jobs:
- name: install-dependencies-with-spack
if: steps.cache-env.outputs.cache-hit != 'true'
run: |
sudo mv /usr/local/ /usr_local_mv
git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git
source spack/share/spack/setup-env.sh
spack env create upp-env UPP/ci/spack.yaml
Expand All @@ -81,7 +80,7 @@ jobs:

build:
needs: setup
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- name: checkout-upp
Expand Down
8 changes: 3 additions & 5 deletions sorc/ncep_post.fd/SURFCE.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6687,7 +6687,7 @@ subroutine qpf_comp(igetfld,compfile,fcst)
character(len=256), intent(in) :: compfile
integer, intent(in) :: igetfld,fcst
integer :: trange,invstat
real, dimension(IM,JM) :: outgrid
real, dimension(ista:iend,jsta:jend) :: outgrid

real, allocatable, dimension(:,:) :: mscValue

Expand All @@ -6700,6 +6700,8 @@ subroutine qpf_comp(igetfld,compfile,fcst)

integer :: i, j, k, ii, jj

outgrid = 0

! Read in reference grid.
INQUIRE(FILE=compfile, EXIST=file_exists)
if (file_exists) then
Expand Down Expand Up @@ -6750,13 +6752,9 @@ subroutine qpf_comp(igetfld,compfile,fcst)
outgrid(I,J) = 1.0
ELSE IF (fcst .GT. 1 .AND. AVGPREC_CONT(I,J)*FLOAT(IFHR)*3600.*1000./DTQ2 .GT. mscValue(I,J)) THEN
outgrid(I,J) = 1.0
ELSE
outgrid(I,J) = 0.0
ENDIF
ENDDO
ENDDO
ELSE
outgrid = 0.0*AVGPREC
ENDIF
ENDIF
! write(*,*) 'FFG MAX, MIN:', &
Expand Down
2 changes: 1 addition & 1 deletion tests/compile_upp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ wrfio_opt=" -DBUILD_WITH_WRFIO=ON"
compiler="intel"
verbose_opt=""
debug_opt=""
while getopts ":p:gwc:vhiI:d" opt; do
while getopts ":p:gwc:vhiId" opt; do
case $opt in
p)
prefix=$OPTARG
Expand Down