Merge PR E3SM-Project#1428 'mark-petersen/framework/couple_fixes' int…

…o develop dt=0.0 changed to dt=0.0_RKIND. Intel 17 on theta (argonne) throws a compile error on this.
mark-petersen · Oct 10, 2017 · 263e14f · 263e14f
2 parents bcce31d + 3b5475f
commit 263e14f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/framework/mpas_stream_manager.F b/src/framework/mpas_stream_manager.F
@@ -453,7 +453,7 @@ subroutine MPAS_stream_mgr_validate_streams(manager, streamID, ierr)!{{{
         end if
 
         if (present(ierr)) ierr = MPAS_STREAM_MGR_NOERR
-        call mpas_set_timeInterval(time_interval_zero, dt = 0.0)
+        call mpas_set_timeInterval(time_interval_zero, dt = 0.0_RKIND)
 
         if (present(streamID)) then
            call MPAS_stream_mgr_begin_iteration(manager, streamID, ierr=err_local)
@@ -480,7 +480,7 @@ subroutine MPAS_stream_mgr_validate_streams(manager, streamID, ierr)!{{{
                if (trim(filename_interval) /= 'none') then
                   call mpas_set_timeInterval(time_interval_file, timeString=filename_interval)
                else
-                  call mpas_set_timeInterval(time_interval_file, dt = 0.0)
+                  call mpas_set_timeInterval(time_interval_file, dt = 0.0_RKIND)
                end if
 
                if (direction == MPAS_STREAM_INPUT .or. direction == MPAS_STREAM_INPUT_OUTPUT) then
@@ -1645,7 +1645,7 @@ function MPAS_stream_mgr_get_stream_interval(manager, streamID, direction, ierr)
 
        ierr = MPAS_STREAM_MGR_NOERR
        nullify(streamCursor)
-       call mpas_set_timeInterval(interval, dt = 0.0)
+       call mpas_set_timeInterval(interval, dt = 0.0_RKIND)
 
        if ( mpas_stream_list_query(manager % streams, streamID, streamCursor) ) then
 

diff --git a/src/framework/mpas_timekeeping.F b/src/framework/mpas_timekeeping.F
@@ -687,8 +687,8 @@ subroutine mpas_minimum_alarm_interval(clock, alarmListPtr, interval)
       type (MPAS_Alarm_type), pointer :: alarmPtr
       type (MPAS_TimeInterval_type) :: zero_interval
 
-      call mpas_set_timeInterval(zero_interval, dt = 0.0)
-      call mpas_set_timeInterval(interval, dt = 0.0)
+      call mpas_set_timeInterval(zero_interval, dt = 0.0_RKIND)
+      call mpas_set_timeInterval(interval, dt = 0.0_RKIND)
 
       do while(associated(alarmListPtr))
          alarmPtr => clock % alarmListHead