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

Jump to bottom

bug fix: ensure that all processes have the same npert and pert_select #642

Merged
merged 5 commits into from
Apr 20, 2023
Merged

bug fix: ensure that all processes have the same npert and pert_select #642

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f51b85
all processes have the same npert and pert_select
weiyuan-jiang Apr 13, 2023
378afde
Merge branch 'develop' into feature/wjiang/bcast_pert_select
gmao-rreichle Apr 17, 2023
84ef93e
added some check for std from files
weiyuan-jiang Apr 19, 2023
30321c4
Merge branch 'feature/wjiang/bcast_pert_select' of github.com:GEOS-ES…
weiyuan-jiang Apr 19, 2023
c99bdca
remove unnecessary check
weiyuan-jiang Apr 20, 2023
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
45 changes: 13 additions & 32 deletions src/Components/GEOSldas_GridComp/GEOSlandpert_GridComp/LDAS_PertRoutines.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module LDAS_PertRoutinesMod
nodata_generic, &
nodata_tolfrac_generic, &
nodata_tol_generic

use LDAS_ensdrv_mpi, only: mpicomm,numprocs,myid
use MAPL_ConstantsMod, ONLY: &
Tzero => MAPL_TICE, &
alhe => MAPL_ALHL, &
Expand Down Expand Up @@ -291,8 +291,6 @@ subroutine read_ens_prop_inputs( &
character(len=*), parameter :: Iam = 'read_ens_prop_inputs'

! MPI variables
type(ESMF_VM) :: vm
integer :: mpicomm
logical :: root_proc,f_exist

! -----------------------------------------------------------------
Expand Down Expand Up @@ -328,11 +326,7 @@ subroutine read_ens_prop_inputs( &
ccorr_force_pert


call ESMF_VmGetCurrent(vm, rc=status)
VERIFY_(status)
call ESMF_VmGet(vm, mpicommunicator=mpicomm, rc=status)
VERIFY_(status)
root_proc = MAPL_Am_I_Root(vm)
root_proc = (myid ==0)

! ---------------------------------------------------------------------
!
Expand Down Expand Up @@ -1005,17 +999,12 @@ subroutine get_force_pert_inputs( pert_grid_l, &
character(len=*), parameter :: Iam = 'get_force_pert_inputs'

! MPI variables
type(ESMF_VM) :: vm
integer :: mpicomm, numprocs, myid, mpierr
integer :: mpierr
logical :: root_proc

! -----------------------------------------------------------------

call ESMF_VmGetCurrent(vm, rc=status)
VERIFY_(status)
call ESMF_VMGet(VM, petCount=numprocs, localPet=myid, mpiCommunicator=mpicomm, rc=status)
VERIFY_(status)
root_proc = MAPL_Am_I_Root(vm)
root_proc = (myid==0)

! ---------
!
Expand Down Expand Up @@ -1400,17 +1389,12 @@ subroutine get_progn_pert_inputs( pert_grid_l, &
character(len=*), parameter :: Iam = 'get_progn_pert_inputs'

! MPI variables
type(ESMF_VM) :: vm
integer :: mpicomm, numprocs, myid, mpierr
integer :: mpierr
logical :: root_proc

! -----------------------------------------------------------------

call ESMF_VmGetCurrent(vm, rc=status)
VERIFY_(status)
call ESMF_VMGet(VM, petCount=numprocs, localPet=myid, mpiCommunicator=mpicomm, rc=status)
VERIFY_(status)
root_proc = MAPL_Am_I_Root(vm)
root_proc = (myid==0)

! -------
!
Expand Down Expand Up @@ -1918,7 +1902,7 @@ subroutine get_pert_select( N_pert_max, pert_grid_l, std_pert, &
!
! local variables

integer :: i,j,k
integer :: i,j,k, ierr

! ---------------------------------------------------------------
!
Expand All @@ -1927,16 +1911,13 @@ subroutine get_pert_select( N_pert_max, pert_grid_l, std_pert, &

pert_select(1:N_pert_max) = 0

do k=1,N_pert_max

do i=1,pert_grid_l%N_lon
do j=1,pert_grid_l%N_lat

if (std_pert(k,i,j)>0.) pert_select(k) = 1

end do
if (pert_grid_l%N_lon * pert_grid_l%N_lat >0) then
do k=1,N_pert_max
if (maxval(std_pert(k,:,:)) >0.) pert_select(k) = 1
end do
end do
endif

call MPI_Allreduce(MPI_IN_PLACE, pert_select, N_pert_max , MPI_INTEGER, MPI_MAX, mpicomm, ierr )

N_pert = sum( pert_select )

Expand Down