diff --git a/cime_config/tests.py b/cime_config/tests.py index 1cbf28b83974..d967ce311ef3 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -207,6 +207,7 @@ "REP_Ln5.ne4pg2_oQU480.F2010", "SMS_Ld3.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass", "ERP_Ld3.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1", + "ERS_Ld5.ne4pg2_oQU480.F2010.eam-sathist_F2010", ) }, diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands index 0dc0f9cc72c6..92cb057059a4 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands @@ -1,3 +1,3 @@ #!/bin/bash -./xmlchange RUN_STARTDATE=2015-01-01 +./xmlchange RUN_STARTDATE=2018-01-01 diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam index bab3fc6f6192..e9b723f13b88 100644 --- a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam +++ b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam @@ -1,6 +1,6 @@ &satellite_options_nl sathist_mfilt = 10000, - sathist_track_infile = '$DIN_LOC_ROOT/atm/waccm/sat/sathist_master_19700410-20150419_c20150616.nc' + sathist_track_infile = '$DIN_LOC_ROOT/atm/waccm/sat/satellite_profilelist_orcas_to_socrates_c190208.nc' sathist_hfilename_spec = '%c.eam.h9.sathist.%y-%m-%d-%s.nc' sathist_nclosest = 1 sathist_ntimestep = 1 diff --git a/components/eam/src/control/sat_hist.F90 b/components/eam/src/control/sat_hist.F90 index 77b902babdfb..17d2a92bc7bd 100644 --- a/components/eam/src/control/sat_hist.F90 +++ b/components/eam/src/control/sat_hist.F90 @@ -722,8 +722,14 @@ subroutine read_next_position( ncols ) call read_buffered_datetime( datetime, i ) - if ( datetime>begdatetime .and. beg_ndx<0 ) beg_ndx = i - if ( datetime>enddatetime ) exit bnds_loop + if (datetime > begdatetime .and. beg_ndx < 0) then + beg_ndx = i + end if + + if (datetime > enddatetime) then + exit bnds_loop + end if + end_ndx = i enddo bnds_loop