Skip to content

Commit 1b7251f

Browse files
committed
changed "stop" to "_ASSERT"
1 parent e25ef48 commit 1b7251f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

GEOS_LdasGridComp.F90

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ subroutine SetServices(gc, rc)
146146
!create ensemble children
147147
call MAPL_GetObjectFromGC(gc, MAPL, rc=status)
148148
VERIFY_(status)
149-
call MAPL_GetResource ( MAPL, NUM_ENSEMBLE, Label="NUM_LDAS_ENSEMBLE:", DEFAULT=1, RC=STATUS)
149+
call MAPL_GetResource ( MAPL, NUM_ENSEMBLE, Label="NUM_LDAS_ENSEMBLE:", DEFAULT=1, RC=STATUS)
150150
VERIFY_(STATUS)
151-
call MAPL_GetResource ( MAPL, ens_id_width, Label="ENS_ID_WIDTH:", DEFAULT=0, RC=STATUS)
151+
call MAPL_GetResource ( MAPL, ens_id_width, Label="ENS_ID_WIDTH:", DEFAULT=0, RC=STATUS)
152152
VERIFY_(STATUS)
153-
call MAPL_GetResource ( MAPL, RUN_ROUTE, Label="RUN_ROUTE:", DEFAULT=0, RC=STATUS)
153+
call MAPL_GetResource ( MAPL, RUN_ROUTE, Label="RUN_ROUTE:", DEFAULT=0, RC=STATUS)
154154
VERIFY_(STATUS)
155-
call MAPL_GetResource ( MAPL, FIRST_ENS_ID, Label="FIRST_ENS_ID:", DEFAULT=0, RC=STATUS)
155+
call MAPL_GetResource ( MAPL, FIRST_ENS_ID, Label="FIRST_ENS_ID:", DEFAULT=0, RC=STATUS)
156156
VERIFY_(STATUS)
157-
call MAPL_GetResource ( MAPL, ENS_FORCING_STR, Label="ENSEMBLE_FORCING:", DEFAULT="NO", RC=STATUS)
157+
call MAPL_GetResource ( MAPL, ENS_FORCING_STR, Label="ENSEMBLE_FORCING:", DEFAULT="NO", RC=STATUS)
158158
VERIFY_(STATUS)
159159
ENS_FORCING_STR = ESMF_UtilStringUpperCase(ENS_FORCING_STR, rc=STATUS)
160160
VERIFY_(STATUS)
@@ -179,8 +179,8 @@ subroutine SetServices(gc, rc)
179179
if (any(tile_types == MAPL_LAND )) with_land = .true.
180180
! if (any(tile_types == MAPL_LAKE )) with_lake = .true.
181181

182-
if (NUM_ENSEMBLE>1 .and. (with_landice .or. RUN_ROUTE>0))then
183-
stop "The landice and route modules are not supported in ensemble mode"
182+
if (NUM_ENSEMBLE>1) then
183+
_ASSERT( .not. (with_landice .or. RUN_ROUTE>0), "Landice and route not supported in ensemble mode.")
184184
endif
185185

186186
call MAPL_GetResource ( MAPL, LAND_ASSIM_STR, Label="LAND_ASSIM:", DEFAULT="NO", RC=STATUS)

0 commit comments

Comments
 (0)