modify message written for log.ice.fXXX

cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90

@@ -111,8 +111,8 @@ subroutine ice_step
       use ice_constants, only: c3600
       use ice_boundary, only: ice_HaloUpdate
       use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
-      use ice_calendar, only: idate, msec, timesecs
-      use ice_calendar, only: write_history, nstreams, histfreq
+      use ice_calendar, only: idate, myear, mmonth, mday, msec, timesecs
+      use ice_calendar, only: calendar_sec2hms, write_history, nstreams, histfreq
       use ice_diagnostics, only: init_mass_diags, runtime_diags, debug_model, debug_ice
       use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
       use ice_domain, only: halo_info, nblocks
@@ -155,7 +155,8 @@ subroutine ice_step
       character(len=*), parameter :: subname = '(ice_step)'
 
       character (len=char_len) :: plabeld
-      integer (kind=int_kind)  :: ns
+      integer (kind=int_kind)  :: hh,mm,ss,ns
+      character (len=char_len) :: logmsg
 
       if (debug_model) then
          plabeld = 'beginning time step'
@@ -391,7 +392,9 @@ subroutine ice_step
          if (my_task == master_task) then
             do ns = 1,nstreams
                if (write_history(ns) .and. histfreq(ns) .eq. 'h') then
-                  call ufs_logfhour(idate,msec,timesecs/c3600)
+                  call calendar_sec2hms(msec,hh,mm,ss)
+                  write(logmsg,'(6(i4,2x))')myear,mmonth,mday,hh,mm,ss
+                  call ufs_logfhour(trim(logmsg),timesecs/c3600)
                end if
             end do
          end if

cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90

@@ -10,23 +10,22 @@ module cice_wrapper_mod
 contains
   ! Define stub routines that do nothing - they are just here to avoid
   ! having cppdefs in the main program
-  subroutine ufs_file_setLogUnit(filename,nunit)
-    character(len=*), intent(in)  :: filename
-    integer,          intent(out) :: nunit
-  end subroutine ufs_file_setLogUnit
   subroutine ufs_settimer(timevalue)
-    real(dbl_kind),    intent(out)   :: timevalue
+    real(dbl_kind),    intent(out) :: timevalue
   end subroutine ufs_settimer
-  subroutine ufs_logtimer(nunit,esecs,string,time0)
-    integer,           intent(in)    :: nunit
-    integer(int_kind), intent(in)    :: esecs
-    character(len=*),  intent(in)    :: string
-    real(dbl_kind),    intent(in)    :: time0
+  subroutine ufs_logtimer(nunit,elapsedsecs,string,time0)
+    integer,           intent(in)  :: nunit
+    integer(int_kind), intent(in)  :: elapsedsecs
+    character(len=*),  intent(in)  :: string
+    real(dbl_kind),    intent(in)  :: time0
   end subroutine ufs_logtimer
-  subroutine ufs_logfhour(date,esecs,hour)
-    integer(int_kind), intent(in)    :: date
-    integer(int_kind), intent(in)    :: esecs
-    real(dbl_kind),    intent(in)    :: hour
+  subroutine ufs_file_setLogUnit(filename,nunit)
+    character(len=*),  intent(in)  :: filename
+    integer,           intent(out) :: nunit
+  end subroutine ufs_file_setLogUnit
+  subroutine ufs_logfhour(msg,hour)
+    character(len=*),  intent(in)  :: msg
+    real(dbl_kind),    intent(in)  :: hour
   end subroutine ufs_logfhour
 #else
 
@@ -42,33 +41,32 @@ subroutine ufs_settimer(timevalue)
     timevalue = MPI_Wtime()
   end subroutine ufs_settimer
 
-  subroutine ufs_logtimer(nunit,esecs,string,time0)
+  subroutine ufs_logtimer(nunit,elapsedsecs,string,time0)
     integer,           intent(in)    :: nunit
-    integer(int_kind), intent(in)    :: esecs
+    integer(int_kind), intent(in)    :: elapsedsecs
     character(len=*),  intent(in)    :: string
     real(dbl_kind),    intent(in)    :: time0
     real(dbl_kind)                   :: MPI_Wtime, timevalue
     if (time0 > 0.) then
        timevalue = MPI_Wtime()-time0
-       write(nunit,*)esecs,' CICE '//trim(string),timevalue
+       write(nunit,*)elapsedsecs,' CICE '//trim(string),timevalue
     end if
   end subroutine ufs_logtimer
 
   subroutine ufs_file_setLogUnit(filename,nunit)
-    character(len=*), intent(in)  :: filename
-    integer,          intent(out) :: nunit
+    character(len=*),  intent(in)    :: filename
+    integer,           intent(out)   :: nunit
     open (newunit=nunit, file=trim(filename))
   end subroutine ufs_file_setLogUnit
 
-  subroutine ufs_logfhour(date,esecs,hour)
-    integer(int_kind), intent(in)    :: date
-    integer(int_kind), intent(in)    :: esecs
+  subroutine ufs_logfhour(msg,hour)
+    character(len=*),  intent(in)    :: msg
     real(dbl_kind),    intent(in)    :: hour
     character(len=char_len)          :: filename
     integer(int_kind)                :: nunit
     write(filename,'(a,i3.3)')'log.ice.f',int(hour)
     open(newunit=nunit,file=trim(filename))
-    write(nunit,'(a,f8.2,a,2i10)')'completed CICE fhour = ',hour,' complete ',date,esecs
+    write(nunit,'(a,f10.3,a)')'completed CICE fhour = ',hour,' validation time: '//trim(msg)
     close(nunit)
   end subroutine ufs_logfhour