Skip to content

Commit

Permalink
Remove glcrun_alarm from seq_infodata
Browse files Browse the repository at this point in the history 
This used to be used by CLM, but is no longer needed.
  • Loading branch information
@billsacks
billsacks committed Apr 25, 2017
1 parent cc6d449 commit f7f0ff6
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 17 deletions.
1 change: 0 additions & 1 deletion src/components/data_comps/dice/dice_comp_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,6 @@ subroutine dice_comp_run( EClock, cdata, x2i, i2x)
integer(IN) :: nl ! ice frac index
integer(IN) :: lsize ! size of attr vect
integer(IN) :: shrlogunit, shrloglev ! original log unit and level
logical :: glcrun_alarm ! is glc going to run now
logical :: newdata ! has newdata been read
logical :: mssrmlf ! remove old data
integer(IN) :: idt ! integer timestep
Expand Down
1 change: 0 additions & 1 deletion src/components/data_comps/docn/docn_comp_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@ subroutine docn_comp_run( EClock, cdata, x2o, o2x)
integer(IN) :: nl ! ocn frac index
integer(IN) :: lsize ! size of attr vect
integer(IN) :: shrlogunit, shrloglev ! original log unit and level
logical :: glcrun_alarm ! is glc going to run now
logical :: newdata ! has newdata been read
logical :: mssrmlf ! remove old data
integer(IN) :: idt ! integer timestep
Expand Down
4 changes: 0 additions & 4 deletions src/drivers/mct/main/cesm_comp_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2190,10 +2190,6 @@ subroutine cesm_run()
if (tod == 0) t24hr_alarm = .true.
if (month==1 .and. day==1 .and. tod==0) t1yr_alarm = .true.

! TODO(wjs, 2017-04-05) I think glcrun_alarm can be removed from infodata: It used
! to be needed by CLM, but no longer is needed.
call seq_infodata_putData(infodata, glcrun_alarm=glcrun_alarm)

if (seq_timemgr_alarmIsOn(EClock_d,seq_timemgr_alarm_datestop)) then
if (iamroot_CPLID) then
write(logunit,*) ' '
Expand Down
13 changes: 2 additions & 11 deletions src/drivers/mct/shr/seq_infodata_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ MODULE seq_infodata_mod
integer(SHR_KIND_IN) :: wav_phase ! wav phase
integer(SHR_KIND_IN) :: esp_phase ! esp phase
logical :: atm_aero ! atmosphere aerosols
logical :: glcrun_alarm ! glc run alarm
logical :: glc_g2lupdate ! update glc2lnd fields in lnd model
type(seq_pause_resume_type), pointer :: pause_resume => NULL()
real(shr_kind_r8) :: max_cplstep_time ! abort if cplstep time exceeds this value
Expand Down Expand Up @@ -711,7 +710,6 @@ SUBROUTINE seq_infodata_Init( infodata, nmlfile, ID, pioid)
infodata%rof_phase = 1
infodata%wav_phase = 1
infodata%atm_aero = .false.
infodata%glcrun_alarm = .false.
infodata%glc_g2lupdate = .false.
infodata%glc_valid_input = .true.
if (associated(infodata%pause_resume)) then
Expand Down Expand Up @@ -916,7 +914,7 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
ice_gnam, rof_gnam, glc_gnam, wav_gnam, &
atm_gnam, ocn_gnam, info_debug, dead_comps, read_restart, &
shr_map_dopole, vect_map, aoflux_grid, flux_epbalfact, &
nextsw_cday, precip_fact, flux_epbal, flux_albav, glcrun_alarm, &
nextsw_cday, precip_fact, flux_epbal, flux_albav, &
glc_g2lupdate, atm_aero, run_barriers, esmf_map_flag, &
do_budgets, do_histinit, drv_threading, flux_diurnal, gust_fac, &
budget_inst, budget_daily, budget_month, wall_time_limit, &
Expand Down Expand Up @@ -1097,7 +1095,6 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
integer(SHR_KIND_IN), optional, intent(OUT) :: wav_phase ! wav phase
integer(SHR_KIND_IN), optional, intent(OUT) :: esp_phase ! wav phase
logical, optional, intent(OUT) :: atm_aero ! atmosphere aerosols
logical, optional, intent(OUT) :: glcrun_alarm ! glc run alarm
logical, optional, intent(OUT) :: glc_g2lupdate ! update glc2lnd fields in lnd model
real(shr_kind_r8), optional, intent(out) :: max_cplstep_time
logical, optional, intent(OUT) :: glc_valid_input
Expand Down Expand Up @@ -1280,7 +1277,6 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
if ( present(wav_phase) ) wav_phase = infodata%wav_phase
if ( present(esp_phase) ) esp_phase = infodata%esp_phase
if ( present(atm_aero) ) atm_aero = infodata%atm_aero
if ( present(glcrun_alarm) ) glcrun_alarm = infodata%glcrun_alarm
if ( present(glc_g2lupdate) ) glc_g2lupdate = infodata%glc_g2lupdate
if ( present(atm_resume) ) then
if (associated(infodata%pause_resume)) then
Expand Down Expand Up @@ -1478,7 +1474,7 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
ice_gnam, rof_gnam, glc_gnam, wav_gnam, &
atm_gnam, ocn_gnam, info_debug, dead_comps, read_restart, &
shr_map_dopole, vect_map, aoflux_grid, run_barriers, &
nextsw_cday, precip_fact, flux_epbal, flux_albav, glcrun_alarm, &
nextsw_cday, precip_fact, flux_epbal, flux_albav, &
glc_g2lupdate, atm_aero, esmf_map_flag, wall_time_limit, &
do_budgets, do_histinit, drv_threading, flux_diurnal, gust_fac, &
budget_inst, budget_daily, budget_month, force_stop_at, &
Expand Down Expand Up @@ -1658,7 +1654,6 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
integer(SHR_KIND_IN), optional, intent(IN) :: wav_phase ! wav phase
integer(SHR_KIND_IN), optional, intent(IN) :: esp_phase ! esp phase
logical, optional, intent(IN) :: atm_aero ! atm aerosols
logical, optional, intent(IN) :: glcrun_alarm ! glc run alarm
logical, optional, intent(IN) :: glc_g2lupdate ! update glc2lnd fields in lnd model
logical, optional, intent(IN) :: glc_valid_input
character(SHR_KIND_CL), optional, intent(IN) :: atm_resume(:) ! atm resume
Expand Down Expand Up @@ -1828,7 +1823,6 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
if ( present(wav_phase) ) infodata%wav_phase = wav_phase
if ( present(esp_phase) ) infodata%esp_phase = esp_phase
if ( present(atm_aero) ) infodata%atm_aero = atm_aero
if ( present(glcrun_alarm) ) infodata%glcrun_alarm = glcrun_alarm
if ( present(glc_g2lupdate) ) infodata%glc_g2lupdate = glc_g2lupdate
if ( present(glc_valid_input) ) infodata%glc_valid_input = glc_valid_input
if ( present(atm_resume) ) then
Expand Down Expand Up @@ -2247,7 +2241,6 @@ subroutine seq_infodata_bcast(infodata,mpicom)
call shr_mpi_bcast(infodata%rof_phase, mpicom)
call shr_mpi_bcast(infodata%wav_phase, mpicom)
call shr_mpi_bcast(infodata%atm_aero, mpicom)
call shr_mpi_bcast(infodata%glcrun_alarm, mpicom)
call shr_mpi_bcast(infodata%glc_g2lupdate, mpicom)
call shr_mpi_bcast(infodata%glc_valid_input, mpicom)

Expand Down Expand Up @@ -2574,7 +2567,6 @@ subroutine seq_infodata_Exchange(infodata,ID,type)
if (cpl2r) then
call shr_mpi_bcast(infodata%nextsw_cday, mpicom, pebcast=cplpe)
call shr_mpi_bcast(infodata%precip_fact, mpicom, pebcast=cplpe)
call shr_mpi_bcast(infodata%glcrun_alarm, mpicom, pebcast=cplpe)
call shr_mpi_bcast(infodata%glc_g2lupdate, mpicom, pebcast=cplpe)
call shr_mpi_bcast(infodata%glc_valid_input, mpicom, pebcast=cplpe)
call seq_infodata_pauseresume_bcast(infodata, mpicom, pebcast=cplpe)
Expand Down Expand Up @@ -2919,7 +2911,6 @@ SUBROUTINE seq_infodata_print( infodata )
write(logunit,F0S) subname,'rof_phase = ', infodata%rof_phase
write(logunit,F0S) subname,'wav_phase = ', infodata%wav_phase

write(logunit,F0L) subname,'glcrun_alarm = ', infodata%glcrun_alarm
write(logunit,F0L) subname,'glc_g2lupdate = ', infodata%glc_g2lupdate
if (associated(infodata%pause_resume)) then
do ind = 1, num_inst_atm
Expand Down

0 comments on commit f7f0ff6

Please sign in to comment.