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

Feature/bmauer/restart for jedi #529

Merged
merged 5 commits into from
Aug 28, 2020
Merged

Feature/bmauer/restart for jedi #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c233c6
options to rewind and retart jedi, initial attempt
bena-nasa Aug 27, 2020
9127e3c
rename some things
bena-nasa Aug 27, 2020
9803bc3
indent
bena-nasa Aug 27, 2020
f9fa25f
make write2ram default
bena-nasa Aug 27, 2020
6d6fbb8
Merge branch 'develop' into feature/bmauer/restart-for_jedi
bena-nasa Aug 27, 2020
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
10 changes: 9 additions & 1 deletion base/MAPL_Cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ module MAPL_CapMod
procedure :: run_member
procedure :: run_model
procedure :: step_model
procedure :: rewind_model

procedure :: create_member_subcommunicator
procedure :: initialize_io_clients_servers
Expand Down Expand Up @@ -416,7 +417,14 @@ subroutine step_model(this, rc)
integer :: status
call this%cap_gc%step(rc = status); _VERIFY(status)
end subroutine step_model


subroutine rewind_model(this, time, rc)
class(MAPL_Cap), intent(inout) :: this
type(ESMF_Time), intent(inout) :: time
integer, intent(out) :: rc
integer :: status
call this%cap_gc%rewind_clock(time,rc = status); _VERIFY(status)
end subroutine rewind_model

integer function create_member_subcommunicator(this, comm, unusable, rc) result(subcommunicator)
class (MAPL_Cap), intent(in) :: this
Expand Down
112 changes: 110 additions & 2 deletions base/MAPL_CapGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ module MAPL_CapGridCompMod
type(ESMF_VM) :: vm
real(kind=real64) :: loop_start_timer
type(ESMF_Time) :: cap_restart_time
type(ESMF_Alarm), allocatable :: alarm_list(:)
type(ESMF_Time), allocatable :: AlarmRingTime(:)
logical, allocatable :: ringingState(:)
contains
procedure :: set_services
procedure :: initialize
Expand All @@ -64,6 +67,10 @@ module MAPL_CapGridCompMod
procedure :: get_model_duration
procedure :: get_am_i_root
procedure :: get_heartbeat_dt
procedure :: get_current_time
procedure :: rewind_clock
procedure :: record_state
procedure :: refresh_state
end type MAPL_CapGridComp

type :: MAPL_CapGridComp_Wrapper
Expand Down Expand Up @@ -915,6 +922,18 @@ function get_heartbeat_dt(this, rc) result (heartbeatdt)

end function get_heartbeat_dt

function get_current_time(this, rc) result (current_time)
class (MAPL_CapGridComp) :: this
type(ESMF_Time) :: current_time
integer, optional, intent(out) :: rc
integer :: status
call ESMF_ClockGet(this%clock,currTime=current_time,rc=status)
_VERIFY(status)

_RETURN(ESMF_SUCCESS)

end function get_current_time


function get_CapGridComp_from_gc(gc) result(cap)
type(ESMF_GridComp), intent(inout) :: gc
Expand Down Expand Up @@ -1097,7 +1116,6 @@ subroutine step(this, rc)

! Advance the Clock before running History and Record
! ---------------------------------------------------

call ESMF_ClockAdvance(this%clock, rc = status)
_VERIFY(STATUS)
call ESMF_ClockAdvance(this%clock_hist, rc = status)
Expand Down Expand Up @@ -1163,10 +1181,100 @@ subroutine step(this, rc)
1000 format(1x,'AGCM Date: ',i4.4,'/',i2.2,'/',i2.2,2x,'Time: ',i2.2,':',i2.2,':',i2.2, &
2x,'Throughput(days/day)[Avg Tot Run]: ',f6.1,1x,f6.1,1x,f6.1,2x,'TimeRemaining(Est) ',i3.3,':'i2.2,':',i2.2,2x, &
f5.1,'% : ',f5.1,'% Mem Comm:Used')

_RETURN(ESMF_SUCCESS)
end subroutine step

subroutine record_state(this, rc)
class(MAPL_CapGridComp), intent(inout) :: this
integer, intent(out) :: rc
integer :: status
type(MAPL_MetaComp), pointer :: maplobj

integer :: nalarms,i

call MAPL_GetObjectFromGC(this%gcs(this%root_id),maplobj,rc=status)
_VERIFY(status)
call MAPL_GenericStateSave(this%gcs(this%root_id),this%child_imports(this%root_id), &
this%child_exports(this%root_id),this%clock,rc=status)

call ESMF_ClockGet(this%clock,alarmCount=nalarms,rc=status)
_VERIFY(status)

allocate(this%alarm_list(nalarms),this%ringingState(nalarms),this%alarmRingTime(nalarms),stat=status)
_VERIFY(status)
call ESMF_ClockGetAlarmList(this%clock, alarmListFlag=ESMF_ALARMLIST_ALL, &
alarmList=this%alarm_list, rc=status)
_VERIFY(status)
do i = 1, nalarms
call ESMF_AlarmGet(this%alarm_list(I), ringTime=this%alarmRingTime(I), ringing=this%ringingState(I), rc=status)
VERIFY_(STATUS)
end do

_RETURN(_SUCCESS)

end subroutine record_state

subroutine refresh_state(this, rc)
class(MAPL_CapGridComp), intent(inout) :: this
integer, intent(out) :: rc
integer :: status

integer :: i
call MAPL_GenericStateRestore(this%gcs(this%root_id),this%child_imports(this%root_id), &
this%child_exports(this%root_id),this%clock,rc=status)
_VERIFY(status)
DO I = 1, size(this%alarm_list)
call ESMF_AlarmSet(this%alarm_list(I), ringTime=this%alarmRingTime(I), ringing=this%ringingState(I), rc=status)
_VERIFY(STATUS)
END DO

_RETURN(_SUCCESS)

end subroutine refresh_state

subroutine rewind_clock(this, time, rc)
class(MAPL_CapGridComp), intent(inout) :: this
type(ESMF_Time), intent(inout) :: time
integer, intent(out) :: rc
integer :: status
type(ESMF_Time) :: current_time,ct

call ESMF_ClockGet(this%clock,currTime=current_time,rc=status)
_VERIFY(status)
if (current_time > time) then
call ESMF_ClockSet(this%clock,direction=ESMF_DIRECTION_REVERSE,rc=status)
_VERIFY(status)
do
call ESMF_ClockAdvance(this%clock,rc=status)
_VERIFY(status)
call ESMF_ClockGet(this%clock,currTime=ct,rc=status)
_VERIFY(status)
if (ct==time) exit
enddo
call ESMF_ClockSet(this%clock,direction=ESMF_DIRECTION_FORWARD,rc=status)
_VERIFY(status)
end if

call ESMF_ClockGet(this%clock_hist,currTime=current_time,rc=status)
_VERIFY(status)
if (current_time > time) then
call ESMF_ClockSet(this%clock_hist,direction=ESMF_DIRECTION_REVERSE,rc=status)
_VERIFY(status)
do
call ESMF_ClockAdvance(this%clock_hist,rc=status)
_VERIFY(status)
call ESMF_ClockGet(this%clock_hist,currTime=ct,rc=status)
_VERIFY(status)
if (ct==time) exit
enddo
call ESMF_ClockSet(this%clock_hist,direction=ESMF_DIRECTION_FORWARD,rc=status)
_VERIFY(status)
end if


_RETURN(_SUCCESS)
end subroutine rewind_clock


! !IROUTINE: MAPL_ClockInit -- Sets the clock

Expand Down
4 changes: 3 additions & 1 deletion base/MAPL_CapOptions.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ module MAPL_CapOptionsMod

contains

function new_CapOptions(unusable, cap_rc_file, egress_file, ensemble_subdir_prefix, rc) result (cap_options)
function new_CapOptions(unusable, cap_rc_file, egress_file, ensemble_subdir_prefix, esmf_logging_mode, rc) result (cap_options)
type (MAPL_CapOptions) :: cap_options
class (KeywordEnforcer), optional, intent(in) :: unusable
character(*), optional, intent(in) :: cap_rc_file
character(*), optional, intent(in) :: egress_file
character(*), optional, intent(in) :: ensemble_subdir_prefix
type(ESMF_LogKind_Flag), optional, intent(in) :: esmf_logging_mode

integer, optional, intent(out) :: rc

Expand All @@ -64,6 +65,7 @@ function new_CapOptions(unusable, cap_rc_file, egress_file, ensemble_subdir_pref
if (present(cap_rc_file)) cap_options%cap_rc_file = cap_rc_file
if (present(egress_file)) cap_options%egress_file = egress_file
if (present(ensemble_subdir_prefix)) cap_options%ensemble_subdir_prefix = ensemble_subdir_prefix
if (present(esmf_logging_mode)) cap_options%esmf_logging_mode = esmf_logging_mode

_RETURN(_SUCCESS)

Expand Down
Loading