Skip to content

Commit 2aa691e

Browse files
committed
Change how mb_scm_land is set
Use single_column and scm_multcol to determine if mb_scm_land should be set. DP case will not have land_nx=land_ny=1
1 parent c07c3ae commit 2aa691e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

driver-moab/main/cplcomp_exchange_mod.F90

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,8 +1066,7 @@ subroutine cplcomp_moab_Init(infodata,comp)
10661066
character(CXX) :: tagname
10671067
character(CXX) :: newlist
10681068
integer nvert(3), nvise(3), nbl(3), nsurf(3), nvisBC(3)
1069-
logical :: rof_present, lnd_prognostic
1070-
integer :: land_nx, land_ny ! try to identify if scm case; then land mesh will be migrated, not read
1069+
logical :: rof_present, lnd_prognostic, single_column, scm_multcols
10711070
real(r8), allocatable :: tagValues(:) ! used for setting aream tags for atm domain read case
10721071
integer :: arrsize ! for the size of tagValues
10731072
type(mct_list) :: temp_list
@@ -1559,9 +1558,9 @@ subroutine cplcomp_moab_Init(infodata,comp)
15591558
call seq_comm_getinfo(cplid ,mpigrp=mpigrp_cplid) ! receiver group
15601559
call seq_comm_getinfo(id_old,mpigrp=mpigrp_old) ! component group pes
15611560
call seq_infodata_GetData(infodata,rof_present=rof_present, lnd_prognostic=lnd_prognostic)
1562-
call seq_infodata_GetData(infodata,lnd_nx=land_nx, lnd_ny=land_ny)
1563-
1564-
if (land_nx .eq. 1 .and. land_ny .eq.1 ) then
1561+
call seq_infodata_GetData(infodata,single_column=single_column, &
1562+
scm_multcols=scm_multcols)
1563+
if (single_column .or. scm_multcols) then
15651564
! turn on mb_scm_land
15661565
mb_scm_land = .true. ! we identified a scm case for land, we will migrate mesh, not read
15671566
! the domain file anymore

0 commit comments

Comments
 (0)