Merge branch 'NOAA-EMC:develop' into dsfcalc_fix

ADCollard · Mar 25, 2024 · d399484 · d399484
2 parents 9760539 + f7e93ab
commit d399484
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/gsi/cmake/gsiapp_compiler_flags_Intel_Fortran.cmake b/src/gsi/cmake/gsiapp_compiler_flags_Intel_Fortran.cmake
@@ -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

diff --git a/src/gsi/intjcmod.f90 b/src/gsi/intjcmod.f90
@@ -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

diff --git a/src/gsi/read_nsstbufr.f90 b/src/gsi/read_nsstbufr.f90
@@ -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   
@@ -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