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.

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

address Issue 712 : GSI built with debug mode failed in the global_4densvar #722

Merged
merged 4 commits into from
Mar 24, 2024
Merged

address Issue 712 : GSI built with debug mode failed in the global_4densvar #722

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
953d576
This PR address Issue 712 : GSI built with debug mode failed in the t…
TingLei-daprediction Mar 15, 2024
ca495b6
Merge branch 'NOAA-EMC:develop' into feature/gsi_debug_omp
TingLei-daprediction Mar 20, 2024
48e9833
added back a blank line to improve readability in read_nsstbufr.f90
TingLei-daprediction Mar 20, 2024
e050818
Merge branch 'NOAA-EMC:develop' into feature/gsi_debug_omp
TingLei-daprediction Mar 21, 2024
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
2 changes: 1 addition & 1 deletion src/gsi/cmake/gsiapp_compiler_flags_Intel_Fortran.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model strict")
# DEBUG FLAGS
####################################################################

set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fp-model source -debug -ftrapuv -warn all,nointerfaces -check all,noarg_temp_created -fp-stack-check -fstack-protector")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -init=snan,arrays -fp-model source -debug -ftrapuv -warn all,nointerfaces -check all,noarg_temp_created -fp-stack-check -fstack-protector")

####################################################################
# LINK FLAGS
Expand Down
2 changes: 1 addition & 1 deletion src/gsi/intjcmod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ subroutine intlimq(rval,sval,itbin)
call gsi_bundlegetpointer(gsi_metguess_bundle(itbin),'q',ges_q_it,ier)
if(ier/=0)return

!$omp parallel do schedule(dynamic,1) private(k,j,i,q)
!$omp parallel do schedule(dynamic,1) private(k,j,i,ii,q)
do k = 1,nsig
do j = 2,lon1+1
do i = 2,lat1+1
Expand Down
13 changes: 6 additions & 7 deletions src/gsi/read_nsstbufr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,9 @@ subroutine read_nsstbufr(nread,ndata,nodata,gstime,infile,obstype,lunout, &
kx = 197
sstoe = one
elseif ( trim(subset) == 'NC031002' ) then ! TESAC
if ( tpf(1,1) >= one .and. tpf(1,1) < 20.0_r_kind ) then
zob = tpf(1,1)
elseif ( tpf(1,1) >= zero .and. tpf(1,1) < one ) then
if ( tpf2(1,1) >= one .and. tpf2(1,1) < 20.0_r_kind ) then
zob = tpf2(1,1)
elseif ( tpf2(1,1) >= zero .and. tpf2(1,1) < one ) then
zob = one
endif
kx = 198
Expand All @@ -553,9 +553,9 @@ subroutine read_nsstbufr(nread,ndata,nodata,gstime,infile,obstype,lunout, &
kx = 199 ! classify argo & glider to be bathy type
sstoe = r0_6
elseif ( trim(subset) == 'NC031001' ) then ! BATHY
if ( tpf(1,1) >= one .and. tpf(1,1) <= 20.0_r_kind ) then
zob = tpf(1,1)
elseif ( tpf(1,1) >= zero .and. tpf(1,1) < one ) then
if ( tpf2(1,1) >= one .and. tpf2(1,1) <= 20.0_r_kind ) then
zob = tpf2(1,1)
elseif ( tpf2(1,1) >= zero .and. tpf2(1,1) < one ) then
zob = one
endif
kx = 199
Expand All @@ -566,7 +566,6 @@ subroutine read_nsstbufr(nread,ndata,nodata,gstime,infile,obstype,lunout, &
endif
!
! Determine usage
!
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deleting of this line was done "casually" though intentionally. I can add it back.
BTW: the regression tests with the updated PR is still ongoing.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The deleting of this line was done "casually" though intentionally. I can add it back. BTW: the regression tests with the updated PR is still ongoing.

I'd add the ! back but it doesn't really matter.

The branch for this PR, TingLei-daprediction:feature/gsi_debug_omp is now one commit behind develop.

@ShunLiu-NOAA merged your PR #698 into develop this morning. You can let the current regression tests run but you will need to rerun with the updated and rebuilt develop and TingLei-daprediction:feature/gsi_debug_omp.

ikx = 0
do i = 1, nconvtype
if(kx == ictype(i) .and. abs(icuse(i))== 1) ikx=i
Expand Down
Loading