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

hongli-wang · Oct 25, 2023 · f043c70 · f043c70
2 parents 47f57a8 + 25306a2
commit f043c70
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/gsi/control2model_ad.f90 b/src/gsi/control2model_ad.f90
@@ -212,7 +212,6 @@ subroutine control2model_ad(rval,bval,grad)
          call cw2hydro_ad(rval(jj),wbundle,clouds,nclouds)
       else
 !        Case when cloud-vars map one-to-one, take care of them together
-         print*,"control2state_ad ",nclouds,clouds
          do ic=1,nclouds
             id=getindex(cvars3d,clouds(ic))
             if (id>0) then

diff --git a/src/gsi/cplr_get_fv3_regional_ensperts.f90 b/src/gsi/cplr_get_fv3_regional_ensperts.f90
@@ -371,7 +371,7 @@ subroutine get_fv3_regional_ensperts_run(this,en_perts,nelen,ps_bar)
                     call this%general_read_fv3_regional_parallel_over_ens(iope,fv3_filename,gg_ps,gg_u,gg_v,gg_tv,gg_rh,gg_oz,&
                                  g_smoke=gg_smoke,g_dust=gg_dust,g_coarsepm=gg_coarsepm)
                  else 
-                       print*,"Run without if_model_dbz,fed,sdp.",if_model_dbz,if_model_fed,if_model_sdp
+                    write(6,*)"Read ensemble without if_model_dbz,fed,sdp.",if_model_dbz,if_model_fed,if_model_sdp
                     call this%general_read_fv3_regional_parallel_over_ens(iope,fv3_filename,gg_ps,gg_u,gg_v,gg_tv,gg_rh,gg_oz)
                  end if
               end if
@@ -842,7 +842,6 @@ subroutine get_fv3_regional_ensperts_run(this,en_perts,nelen,ps_bar)
     enddo ! it 4d loop
 
  ! CALCULATE ENSEMBLE SPREAD
-    write_ens_sprd=.false.
     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? 
@@ -1454,7 +1453,6 @@ subroutine parallel_read_fv3_step2(this,mype,iope, &
           end if
        end if
        if( present(g_smoke)) then
-           !print*,"ENS_SCATTER_SMOKE: ",gg_smoke(1,1,k), g_smoke(1,1,k)
            if (mype==iope) call this%fill_regional_2d(gg_smoke(1,1,k),wrk_send_2d)
            call mpi_scatterv(wrk_send_2d,grd_ens%ijn_s,grd_ens%displs_s,mpi_rtype,&
              g_smoke(1,1,k),grd_ens%ijn_s(mype+1),mpi_rtype,iope,mpi_comm_world,ierror)

diff --git a/src/gsi/read_obs.F90 b/src/gsi/read_obs.F90
@@ -1065,7 +1065,7 @@ subroutine read_obs(ndata,mype)
                    obstype == 'iasi'  .or. obstype == 'atms') .and. &
                   (dplat(i) == 'n17' .or. dplat(i) == 'n18' .or. & 
                    dplat(i) == 'n19' .or. dplat(i) == 'npp' .or. &
-                   dplat(i) == 'n20' .or. &
+                   dplat(i) == 'n20' .or. dplat(i) == 'n21' .or. &
                    dplat(i) == 'metop-a' .or. dplat(i) == 'metop-b' .or. &
                    dplat(i) == 'metop-c') 
 ! direct broadcast from NESDIS/UW
@@ -1076,7 +1076,7 @@ subroutine read_obs(ndata,mype)
                    obstype == 'iasi') .and. &
                   (dplat(i) == 'n17' .or. dplat(i) == 'n18' .or. & 
                    dplat(i) == 'n19' .or. dplat(i) == 'npp' .or. &
-                   dplat(i) == 'n20' .or. &
+                   dplat(i) == 'n20' .or. dplat(i) == 'n21' .or. &
                    dplat(i) == 'metop-a' .or. dplat(i) == 'metop-b' .or. &
                    dplat(i) == 'metop-c')