Merge remote-tracking branch 'upstream/develop' into develop

jderber-NOAA · Oct 16, 2023 · 64b91b6 · 64b91b6
2 parents 5ccfb02 + 978b7e7
commit 64b91b6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/src/gsi/cplr_get_fv3_regional_ensperts.f90 b/src/gsi/cplr_get_fv3_regional_ensperts.f90
@@ -684,7 +684,6 @@ subroutine get_fv3_regional_ensperts_run(this,en_perts,nelen,ps_bar)
 
     enddo ! it 4d loop
  ! CALCULATE ENSEMBLE SPREAD
-    write_ens_sprd=.true.
     if(write_ens_sprd ) then
         call this%ens_spread_dualres_regional(mype,en_perts,nelen)
         call mpi_barrier(mpi_comm_world,ierror) ! do we need this mpi_barrier here? 

diff --git a/src/gsi/gsi_rfv3io_mod.f90 b/src/gsi/gsi_rfv3io_mod.f90
@@ -2610,9 +2610,6 @@ subroutine gsi_fv3ncdf_readuv(grd_uv,ges_u,ges_v,fv3filenamegin)
        members(mm1) = mype
     endif
 
-    write(6,115)mype,kbgn,kend,procuse
-115 format('gsi_fv3ncdf_readuv: mype ',i6,' has kbgn,kend= ',2(i6,1x),' set procuse ',l7)
-
     call mpi_allreduce(members,members_read,npe,mpi_integer,mpi_max,mpi_comm_world,ierror)
 
     nread=0

diff --git a/src/gsi/setupps.f90 b/src/gsi/setupps.f90
@@ -904,7 +904,7 @@ subroutine contents_netcdf_diag_(odiag)
            if(muse(i)) then
               call nc_diag_metadata("Analysis_Use_Flag",    1.0_r_single           )
            else
-              call nc_diag_metadata("Analysis_Use_Flag",    1.0_r_single           )
+              call nc_diag_metadata("Analysis_Use_Flag",   -1.0_r_single           )
            endif
 
            call nc_diag_metadata_to_single("Errinv_Input",  errinv_input           )

diff --git a/src/gsi/setupspd.f90 b/src/gsi/setupspd.f90
@@ -962,7 +962,7 @@ subroutine contents_netcdf_diag_(odiag)
            if(muse(i)) then
               call nc_diag_metadata("Analysis_Use_Flag",    1.0_r_single           )
            else
-              call nc_diag_metadata("Analysis_Use_Flag",    1.0_r_single           )
+              call nc_diag_metadata("Analysis_Use_Flag",   -1.0_r_single           )
            endif
 
            call nc_diag_metadata_to_single("Errinv_Input",errinv_input       )