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

fix for appararent mis use of variable tpf vs tpf2 in read_nsstbu… #2

Draft
wants to merge 2 commits into
base: feature/fv3reg_parallel_io_upgrade
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
3 changes: 2 additions & 1 deletion src/gsi/intjcmod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ 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)
#clt !$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
15 changes: 8 additions & 7 deletions src/gsi/read_nsstbufr.f90
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,10 @@ 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
!clt
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 +554,10 @@ 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
!clt
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 +568,6 @@ subroutine read_nsstbufr(nread,ndata,nodata,gstime,infile,obstype,lunout, &
endif
!
! Determine usage
!
ikx = 0
do i = 1, nconvtype
if(kx == ictype(i) .and. abs(icuse(i))== 1) ikx=i
Expand Down
Loading