From 8ad9923fda820fe65cd26dc8c55aa3d587202e9a Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 23 May 2025 16:49:06 -0600 Subject: [PATCH 01/23] Put instantaneous & non-inst hist fields in separate files (not tested) --- src/riverroute/mosart_histfile.F90 | 1205 +++++++++++++++------------- 1 file changed, 631 insertions(+), 574 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 61f96d9..84e3936 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1,6 +1,11 @@ module mosart_histfile ! Module containing methods to for MOSART history file handling. + ! TODO slevis: + ! Replaced all old f with fld? Search "do f " "(f" 'f)" ... + ! Added all the needed "do f = 1, maxsplitfiles"? Search "do t = " + ! Added new args to both sides of calls as needed? + ! Number loops as needed use shr_kind_mod, only : r8 => shr_kind_r8, CS => shr_kind_cs, CL => shr_kind_cl use shr_sys_mod, only : shr_sys_abort @@ -28,6 +33,9 @@ module mosart_histfile integer , public, parameter :: max_tapes = 3 ! max number of history tapes integer , public, parameter :: max_flds = 1500 ! max number of history fields integer , public, parameter :: max_namlen = CS ! maximum number of characters for field name + integer , private, parameter :: maxsplitfiles = 2 ! max number of files per tape + integer , private, parameter :: accumulated_file_index = 1 ! non-instantaneous file identifier + integer , private, parameter :: instantaneous_file_index = 2 ! instantaneous file identifier ! Counters integer , public :: ntapes = 0 ! index of max history file requested @@ -101,7 +109,7 @@ module mosart_histfile type master_entry type (field_info) :: field ! field information - logical :: actflag(max_tapes) ! active/inactive flag + logical :: actflag(max_tapes, maxsplitfiles) ! active/inactive flag character(len=1) :: avgflag(max_tapes) ! time averaging flag ("X","A","M" or "I",) end type master_entry @@ -113,14 +121,14 @@ module mosart_histfile end type history_entry type history_tape - integer :: nflds ! number of active fields on tape - integer :: ntimes ! current number of time samples on tape + integer :: nflds(maxsplitfiles) ! number of active fields on tape + integer :: ntimes(maxsplitfiles) ! current number of time samples on tape integer :: mfilt ! maximum number of time samples per tape integer :: nhtfrq ! number of time samples per tape integer :: ncprec ! netcdf output precision logical :: is_endhist ! true => current time step is end of history interval real(r8) :: begtime ! time at beginning of history averaging interval - type (history_entry) :: hlist(max_flds) ! array of active history tape entries + type (history_entry) :: hlist(max_flds, maxsplitfiles) ! array of active history tape entries end type history_tape type mosart_pointer ! Pointer to real scalar data (1D) @@ -143,13 +151,13 @@ module mosart_histfile integer :: nfmaster = 0 ! number of fields in master field list ! Other variables - character(len=max_length_filename) :: locfnh(max_tapes) ! local history file names - character(len=max_chars) :: locfnhr(max_tapes) ! local history restart file names + character(len=max_length_filename) :: locfnh(max_tapes, maxsplitfiles) ! local history file names + character(len=max_chars) :: locfnhr(max_tapes, maxsplitfiles) ! local history restart file names logical :: htapes_defined = .false. ! flag indicates history contents have been defined ! NetCDF Id's - type(file_desc_t), target :: nfid(max_tapes) ! file ids - type(file_desc_t), target :: ncid_hist(max_tapes) ! file ids for history restart files + type(file_desc_t), target :: nfid(max_tapes, maxsplitfiles) ! file ids + type(file_desc_t), target :: ncid_hist(max_tapes, maxsplitfiles) ! file ids for history restart files integer :: time_dimid ! time dimension id integer :: nbnd_dimid ! time bounds dimension id integer :: strlen_dimid ! string dimension id @@ -241,7 +249,7 @@ subroutine mosart_hist_HtapesBuild () ! Note - with netcdf, only 1 (ncd_double) and 2 (ncd_float) are allowed do t=1,ntapes - tape(t)%ntimes = 0 + tape(t)%ntimes(:) = 0 tape(t)%nhtfrq = nhtfrq(t) tape(t)%mfilt = mfilt(t) if (ndens(t) == 1) then @@ -275,7 +283,7 @@ subroutine htapes_fieldlist() ! Then sort the result alphanumerically. ! !LOCAL VARIABLES: - integer :: t, f ! tape, field indices + integer :: t, f, fld ! tape, file, field indices integer :: ff ! index into include, exclude and fprec list character(len=max_namlen) :: name ! field name portion of fincl (i.e. no avgflag separator) character(len=max_namlen) :: mastername ! name from masterlist field @@ -287,40 +295,39 @@ subroutine htapes_fieldlist() !--------------------------------------------------------- ! First ensure contents of fincl and fexcl are valid names - do t = 1,max_tapes - f = 1 - do while (f < max_flds .and. fincl(f,t) /= ' ') - name = getname (fincl(f,t)) !namelist + tape_loop1: do t = 1, max_tapes + fld = 1 + do while (fld < max_flds .and. fincl(fld,t) /= ' ') + name = getname (fincl(fld,t)) !namelist do ff = 1,nfmaster mastername = masterlist(ff)%field%name if (name == mastername) exit end do if (name /= mastername) then - write(iulog,*) trim(subname),' ERROR: ', trim(name), ' in fincl(', f, ') ',& + write(iulog,*) trim(subname),' ERROR: ', trim(name), ' in fincl(', fld, ') ',& 'for history tape ',t,' not found' call shr_sys_abort() end if - f = f + 1 + fld = fld + 1 end do - f = 1 - do while (f < max_flds .and. fexcl(f,t) /= ' ') + fld = 1 + do while (fld < max_flds .and. fexcl(fld,t) /= ' ') do ff = 1,nfmaster mastername = masterlist(ff)%field%name - if (fexcl(f,t) == mastername) exit + if (fexcl(fld,t) == mastername) exit end do - if (fexcl(f,t) /= mastername) then - write(iulog,*) trim(subname),' ERROR: ', fexcl(f,t), ' in fexcl(', f, ') ', & + if (fexcl(fld,t) /= mastername) then + write(iulog,*) trim(subname),' ERROR: ', fexcl(fld,t), ' in fexcl(', fld, ') ', & 'for history tape ',t,' not found' call shr_sys_abort() end if - f = f + 1 + fld = fld + 1 end do - end do - - tape(:)%nflds = 0 - do t = 1,max_tapes + end do tape_loop1 + tape(:)%nflds(:) = 0 + tape_loop2: do t = 1,max_tapes ! Loop through the masterlist set of field names and determine if any of those ! are in the FINCL or FEXCL arrays ! The call to list_index determines the index in the FINCL or FEXCL arrays @@ -328,77 +335,84 @@ subroutine htapes_fieldlist() ! Add the field to the tape if specified via namelist (FINCL[1-max_tapes]), ! or if it is on by default and was not excluded via namelist (FEXCL[1-max_tapes]). - do f = 1,nfmaster - mastername = masterlist(f)%field%name - call list_index (fincl(1,t), mastername, ff) - if (ff > 0) then - ! if field is in include list, ff > 0 and htape_addfld - ! will not be called for field - avgflag = getflag (fincl(ff,t)) - call htape_addfld (t, f, avgflag) - else - ! find index of field in exclude list - call list_index (fexcl(1,t), mastername, ff) - - ! if field is in exclude list, ff > 0 and htape_addfld - ! will not be called for field - ! if field is not in exclude list, ff =0 and htape_addfld - ! will be called for field (note that htape_addfld will be - ! called below only if field is not in exclude list OR in - ! include list - if (ff == 0 .and. masterlist(f)%actflag(t)) then - call htape_addfld (t, f, ' ') + file_loop1: do f = 1, maxsplitfiles + fld_loop1: do fld = 1, nfmaster + mastername = masterlist(fld)%field%name + call list_index (fincl(1,t), mastername, ff) + if (ff > 0) then + ! if field is in include list, ff > 0 and htape_addfld + ! will not be called for field + avgflag = getflag (fincl(ff,t)) + call htape_addfld (t, f, fld, avgflag) + else + ! find index of field in exclude list + call list_index (fexcl(1,t), mastername, ff) + + ! if field is in exclude list, ff > 0 and htape_addfld + ! will not be called for field + ! if field is not in exclude list, ff =0 and htape_addfld + ! will be called for field (note that htape_addfld will be + ! called below only if field is not in exclude list OR in + ! include list + if (ff == 0 .and. masterlist(fld)%actflag(t,f)) then + call htape_addfld (t, f, fld, ' ') + end if end if - end if - end do + end do fld_loop1 + + ! Specification of tape contents now complete. + ! Sort each list of active entries + + fld_loop2: do fld = tape(t)%nflds(f)-1,1,-1 + do ff = 1,fld + if (tape(t)%hlist(ff,f)%field%name > tape(t)%hlist(ff+1,f)%field%name) then + tmp = tape(t)%hlist(ff,f) + tape(t)%hlist(ff,f) = tape(t)%hlist(ff+1,f) + tape(t)%hlist(ff+1,f) = tmp + else if (tape(t)%hlist(ff,f)%field%name == tape(t)%hlist(ff+1,f)%field%name) then + write(iulog,*) trim(subname),' ERROR: Duplicate field ', & + tape(t)%hlist(ff,f)%field%name, & + 't,ff,name=',t,ff,tape(t)%hlist(ff+1,f)%field%name + call shr_sys_abort() + end if + end do + end do fld_loop2 - ! Specification of tape contents now complete. - ! Sort each list of active entries - - do f = tape(t)%nflds-1,1,-1 - do ff = 1,f - if (tape(t)%hlist(ff)%field%name > tape(t)%hlist(ff+1)%field%name) then - tmp = tape(t)%hlist(ff) - tape(t)%hlist(ff ) = tape(t)%hlist(ff+1) - tape(t)%hlist(ff+1) = tmp - else if (tape(t)%hlist(ff)%field%name == tape(t)%hlist(ff+1)%field%name) then - write(iulog,*) trim(subname),' ERROR: Duplicate field ', & - tape(t)%hlist(ff)%field%name, & - 't,ff,name=',t,ff,tape(t)%hlist(ff+1)%field%name - call shr_sys_abort() + if (mainproc) then + if (tape(t)%nflds(f) > 0) then + write(iulog,*) trim(subname),' : Included fields tape ',t,'=',tape(t)%nflds(f) end if - end do - end do - - if (mainproc) then - if (tape(t)%nflds > 0) then - write(iulog,*) trim(subname),' : Included fields tape ',t,'=',tape(t)%nflds + fld_loop3: do fld = 1,tape(t)%nflds(f) + write(iulog,*) fld,' ',tape(t)%hlist(fld,f)%field%name,' ',tape(t)%hlist(fld,f)%avgflag + end do fld_loop3 end if - do f = 1,tape(t)%nflds - write(iulog,*) f,' ',tape(t)%hlist(f)%field%name,' ',tape(t)%hlist(f)%avgflag - end do - end if - end do + end do file_loop1 + end do tape_loop2 ! Determine total number of active history tapes ntapes = 0 - do t = max_tapes,1,-1 - if (tape(t)%nflds > 0) then - ntapes = t - exit - end if - end do + tape_loop3: do t = max_tapes,1,-1 + file_loop2: do f = 1, maxsplitfiles + if (tape(t)%nflds(f) > 0) then + ntapes = t + exit + end if + end do file_loop2 + if (ntapes > 0) exit + end do tape_loop3 ! Ensure there are no "holes" in tape specification, i.e. empty tapes. ! Enabling holes should not be difficult if necessary. - do t = 1,ntapes - if (tape(t)%nflds == 0) then - write(iulog,*) trim(subname),' ERROR: Tape ',t,' is empty' - call shr_sys_abort() - end if - end do + tape_loop4: do t = 1,ntapes + file_loop3: do f = 1, maxsplitfiles + if (tape(t)%nflds(f) == 0) then + write(iulog,*) trim(subname),' ERROR: Tape, file ', t, f, ' is empty' + call shr_sys_abort() + end if + end do file_loop3 + end do tape_loop4 ! Check that the number of history files declared does not exceed ! the maximum allowed. @@ -431,14 +445,14 @@ end subroutine htapes_fieldlist !----------------------------------------------------------------------- - subroutine htape_addfld (t, f, avgflag) + subroutine htape_addfld (t, f, fld, avgflag) ! Add a field to the active list for a history tape. Copy the data from ! the master field list to the active list for the tape. ! !ARGUMENTS: - integer, intent(in) :: t ! history tape index - integer, intent(in) :: f ! field index from master field list + integer, intent(in) :: t, f ! history tape, file index + integer, intent(in) :: fld ! field index from master field list character(len=1), intent(in) :: avgflag ! time averaging flag ! !LOCAL VARIABLES: @@ -460,21 +474,21 @@ subroutine htape_addfld (t, f, avgflag) begr = ctl%begr endr = ctl%endr - tape(t)%nflds = tape(t)%nflds + 1 - n = tape(t)%nflds - tape(t)%hlist(n)%field = masterlist(f)%field - allocate (tape(t)%hlist(n)%hbuf(begr:endr)) - allocate (tape(t)%hlist(n)%nacs(begr:endr)) - tape(t)%hlist(n)%hbuf(:) = 0._r8 - tape(t)%hlist(n)%nacs(:) = 0 + tape(t)%nflds(f) = tape(t)%nflds(f) + 1 + n = tape(t)%nflds(f) + tape(t)%hlist(n,f)%field = masterlist(fld)%field + allocate (tape(t)%hlist(n,f)%hbuf(begr:endr)) + allocate (tape(t)%hlist(n,f)%nacs(begr:endr)) + tape(t)%hlist(n,f)%hbuf(:) = 0._r8 + tape(t)%hlist(n,f)%nacs(:) = 0 ! Set time averaging flag based on masterlist setting or ! override the default averaging flag with namelist setting select case (avgflag) case (' ') - tape(t)%hlist(n)%avgflag = masterlist(f)%avgflag(t) + tape(t)%hlist(n,f)%avgflag = masterlist(fld)%avgflag(t) case ('A','I','X','M') - tape(t)%hlist(n)%avgflag = avgflag + tape(t)%hlist(n,f)%avgflag = avgflag case default write(iulog,*) trim(subname),' ERROR: unknown avgflag=', avgflag call shr_sys_abort() @@ -488,7 +502,7 @@ subroutine htape_addfld (t, f, avgflag) ! - instantaneous avgflag_temp = avgflag_pertape(t) if (avgflag_temp == 'I') then - tape(t)%hlist(n)%avgflag = avgflag_temp + tape(t)%hlist(n,f)%avgflag = avgflag_temp end if end subroutine htape_addfld @@ -501,8 +515,8 @@ subroutine mosart_hist_UpdateHbuf() ! into its history buffer for appropriate tapes. ! !LOCAL VARIABLES: - integer :: t ! tape index - integer :: f ! field index + integer :: t, f ! tape, file index + integer :: fld ! field index integer :: k ! index integer :: hpindex ! history pointer index integer :: begr,endr ! beginning and ending indices @@ -517,60 +531,62 @@ subroutine mosart_hist_UpdateHbuf() begr = ctl%begr endr = ctl%endr - do t = 1,ntapes - do f = 1,tape(t)%nflds - avgflag = tape(t)%hlist(f)%avgflag - nacs => tape(t)%hlist(f)%nacs - hbuf => tape(t)%hlist(f)%hbuf - hpindex = tape(t)%hlist(f)%field%hpindex - field => ptr(hpindex)%ptr - - select case (avgflag) - case ('I') ! Instantaneous - do k = begr,endr - if (field(k) /= spval) then - hbuf(k) = field(k) - else - hbuf(k) = spval - end if - nacs(k) = 1 - end do - case ('A') ! Time average - do k = begr,endr - if (field(k) /= spval) then - if (nacs(k) == 0) hbuf(k) = 0._r8 - hbuf(k) = hbuf(k) + field(k) - nacs(k) = nacs(k) + 1 - else - if (nacs(k) == 0) hbuf(k) = spval - end if - end do - case ('X') ! Maximum over time - do k = begr,endr - if (field(k) /= spval) then - if (nacs(k) == 0) hbuf(k) = -1.e50_r8 - hbuf(k) = max( hbuf(k), field(k) ) - else - if (nacs(k) == 0) hbuf(k) = spval - end if - nacs(k) = 1 - end do - case ('M') ! Minimum over time - do k = begr,endr - if (field(k) /= spval) then - if (nacs(k) == 0) hbuf(k) = +1.e50_r8 - hbuf(k) = min( hbuf(k), field(k) ) - else - if (nacs(k) == 0) hbuf(k) = spval - end if - nacs(k) = 1 - end do - case default - write(iulog,*) trim(subname),' ERROR: invalid time averaging flag ', avgflag - call shr_sys_abort() - end select - end do - end do + tape_loop: do t = 1, ntapes + file_loop: do f = 1, maxsplitfiles + fld_loop: do fld = 1, tape(t)%nflds(f) + avgflag = tape(t)%hlist(fld,f)%avgflag + nacs => tape(t)%hlist(fld,f)%nacs + hbuf => tape(t)%hlist(fld,f)%hbuf + hpindex = tape(t)%hlist(fld,f)%field%hpindex + field => ptr(hpindex)%ptr + + select case (avgflag) + case ('I') ! Instantaneous + do k = begr,endr + if (field(k) /= spval) then + hbuf(k) = field(k) + else + hbuf(k) = spval + end if + nacs(k) = 1 + end do + case ('A') ! Time average + do k = begr,endr + if (field(k) /= spval) then + if (nacs(k) == 0) hbuf(k) = 0._r8 + hbuf(k) = hbuf(k) + field(k) + nacs(k) = nacs(k) + 1 + else + if (nacs(k) == 0) hbuf(k) = spval + end if + end do + case ('X') ! Maximum over time + do k = begr,endr + if (field(k) /= spval) then + if (nacs(k) == 0) hbuf(k) = -1.e50_r8 + hbuf(k) = max( hbuf(k), field(k) ) + else + if (nacs(k) == 0) hbuf(k) = spval + end if + nacs(k) = 1 + end do + case ('M') ! Minimum over time + do k = begr,endr + if (field(k) /= spval) then + if (nacs(k) == 0) hbuf(k) = +1.e50_r8 + hbuf(k) = min( hbuf(k), field(k) ) + else + if (nacs(k) == 0) hbuf(k) = spval + end if + nacs(k) = 1 + end do + case default + write(iulog,*) trim(subname),' ERROR: invalid time averaging flag ', avgflag + call shr_sys_abort() + end select + end do fld_loop + end do file_loop + end do tape_loop end subroutine mosart_hist_UpdateHbuf @@ -617,25 +633,25 @@ subroutine htape_create (t, histrest) ! Define output write precsion for tape ncprec = tape(t)%ncprec if (lhistrest) then - lnfid => ncid_hist(t) + lnfid => ncid_hist(t,f) else - lnfid => nfid(t) + lnfid => nfid(t,f) endif ! Create new netCDF file. It will be in define mode if ( .not. lhistrest )then if (mainproc) then - write(iulog,*) trim(subname),' : Opening netcdf htape ',trim(locfnh(t)) + write(iulog,*) trim(subname),' : Opening netcdf htape ',trim(locfnh(t,f)) end if - call ncd_pio_createfile(lnfid, trim(locfnh(t))) + call ncd_pio_createfile(lnfid, trim(locfnh(t,f))) call ncd_putatt(lnfid, ncd_global, 'title', 'MOSART History file information' ) call ncd_putatt(lnfid, ncd_global, 'comment', & "NOTE: None of the variables are weighted by land fraction!" ) else if (mainproc) then - write(iulog,*) trim(subname),' : Opening netcdf rhtape ',trim(locfnhr(t)) + write(iulog,*) trim(subname),' : Opening netcdf rhtape ',trim(locfnhr(t,f)) end if - call ncd_pio_createfile(lnfid, trim(locfnhr(t))) + call ncd_pio_createfile(lnfid, trim(locfnhr(t,f))) call ncd_putatt(lnfid, ncd_global, 'title', & 'MOSART Restart History information, required to continue a simulation' ) call ncd_putatt(lnfid, ncd_global, 'comment', & @@ -712,7 +728,7 @@ end subroutine htape_create !----------------------------------------------------------------------- - subroutine htape_timeconst(t, mode) + subroutine htape_timeconst(t, f, mode) ! Write time constant values to primary history tape. @@ -752,7 +768,7 @@ subroutine htape_timeconst(t, mode) !-------------------------------------------------------- ! For define mode -- only do this for first time-sample - if (mode == 'define' .and. tape(t)%ntimes == 1) then + if (mode == 'define' .and. tape(t)%ntimes(f) == 1) then call get_ref_date(yr, mon, day, nbsec) nstep = get_nstep() @@ -769,13 +785,13 @@ subroutine htape_timeconst(t, mode) if (avgflag_pertape(t) /= 'I') then ! NOT instantaneous fields tape step_or_bounds = 'time_bounds' long_name = 'time at exact middle of ' // step_or_bounds - call ncd_defvar(nfid(t), 'time', tape(t)%ncprec, 1, dim1id, varid, & + call ncd_defvar(nfid(t,f), 'time', tape(t)%ncprec, 1, dim1id, varid, & long_name=long_name, units=str) - call ncd_putatt(nfid(t), varid, 'bounds', 'time_bounds') + call ncd_putatt(nfid(t,f), varid, 'bounds', 'time_bounds') else ! instantaneous fields tape step_or_bounds = 'time step' long_name = 'time at end of ' // step_or_bounds - call ncd_defvar(nfid(t), 'time', tape(t)%ncprec, 1, dim1id, varid, & + call ncd_defvar(nfid(t,f), 'time', tape(t)%ncprec, 1, dim1id, varid, & long_name=long_name, units=str) end if cal = get_calendar() @@ -784,52 +800,52 @@ subroutine htape_timeconst(t, mode) else if ( trim(cal) == GREGORIAN_C )then caldesc = "gregorian" end if - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) dim1id(1) = time_dimid long_name = 'current date (YYYYMMDD) at end of ' // step_or_bounds - call ncd_defvar(nfid(t) , 'mcdate', ncd_int, 1, dim1id , varid, & + call ncd_defvar(nfid(t,f) , 'mcdate', ncd_int, 1, dim1id , varid, & long_name = long_name) - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) long_name = 'current seconds of current date at end of ' // step_or_bounds - call ncd_defvar(nfid(t) , 'mcsec' , ncd_int, 1, dim1id , varid, & + call ncd_defvar(nfid(t,f) , 'mcsec' , ncd_int, 1, dim1id , varid, & long_name = long_name, units='s') - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) long_name = 'current day (from base day) at end of ' // step_or_bounds - call ncd_defvar(nfid(t) , 'mdcur' , ncd_int, 1, dim1id , varid, & + call ncd_defvar(nfid(t,f) , 'mdcur' , ncd_int, 1, dim1id , varid, & long_name = long_name) - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) long_name = 'current seconds of current day at end of ' // step_or_bounds - call ncd_defvar(nfid(t) , 'mscur' , ncd_int, 1, dim1id , varid, & + call ncd_defvar(nfid(t,f) , 'mscur' , ncd_int, 1, dim1id , varid, & long_name = long_name) - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) - call ncd_defvar(nfid(t) , 'nstep' , ncd_int, 1, dim1id , varid, & + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) + call ncd_defvar(nfid(t,f) , 'nstep' , ncd_int, 1, dim1id , varid, & long_name = 'time step') dim2id(1) = nbnd_dimid; dim2id(2) = time_dimid if (avgflag_pertape(t) /= 'I') then ! NOT instantaneous fields tape - call ncd_defvar(nfid(t), 'time_bounds', ncd_double, 2, dim2id, varid, & + call ncd_defvar(nfid(t,f), 'time_bounds', ncd_double, 2, dim2id, varid, & long_name = 'time interval endpoints', & units=str) - call ncd_putatt(nfid(t), varid, 'calendar', caldesc) + call ncd_putatt(nfid(t,f), varid, 'calendar', caldesc) end if dim2id(1) = strlen_dimid; dim2id(2) = time_dimid - call ncd_defvar(nfid(t), 'date_written', ncd_char, 2, dim2id, varid) - call ncd_defvar(nfid(t), 'time_written', ncd_char, 2, dim2id, varid) + call ncd_defvar(nfid(t,f), 'date_written', ncd_char, 2, dim2id, varid) + call ncd_defvar(nfid(t,f), 'time_written', ncd_char, 2, dim2id, varid) call ncd_defvar(varname='lon', xtype=tape(t)%ncprec, dim1name='lon', & - long_name='runoff coordinate longitude', units='degrees_east', ncid=nfid(t)) + long_name='runoff coordinate longitude', units='degrees_east', ncid=nfid(t,f)) call ncd_defvar(varname='lat', xtype=tape(t)%ncprec, dim1name='lat', & - long_name='runoff coordinate latitude', units='degrees_north', ncid=nfid(t)) + long_name='runoff coordinate latitude', units='degrees_north', ncid=nfid(t,f)) call ncd_defvar(varname='mask', xtype=ncd_int, dim1name='lon', dim2name='lat', & - long_name='runoff mask', units='unitless', ncid=nfid(t), ifill_value=ispval) + long_name='runoff mask', units='unitless', ncid=nfid(t,f), ifill_value=ispval) call ncd_defvar(varname='area', xtype=tape(t)%ncprec, dim1name='lon', dim2name='lat', & - long_name='runoff grid area', units='m2', ncid=nfid(t), fill_value=spval) + long_name='runoff grid area', units='m2', ncid=nfid(t,f), fill_value=spval) call ncd_defvar(varname='areatotal', xtype=tape(t)%ncprec, dim1name='lon', dim2name='lat', & - long_name='basin upstream areatotal', units='m2', ncid=nfid(t), fill_value=spval) + long_name='basin upstream areatotal', units='m2', ncid=nfid(t,f), fill_value=spval) call ncd_defvar(varname='areatotal2', xtype=tape(t)%ncprec, dim1name='lon', dim2name='lat', & - long_name='computed basin upstream areatotal', units='m2', ncid=nfid(t), fill_value=spval) + long_name='computed basin upstream areatotal', units='m2', ncid=nfid(t,f), fill_value=spval) else if (mode == 'write') then @@ -838,37 +854,37 @@ subroutine htape_timeconst(t, mode) mcdate = yr*10000 + mon*100 + day nstep = get_nstep() - call ncd_io('mcdate', mcdate, 'write', nfid(t), nt=tape(t)%ntimes) - call ncd_io('mcsec' , mcsec , 'write', nfid(t), nt=tape(t)%ntimes) - call ncd_io('mdcur' , mdcur , 'write', nfid(t), nt=tape(t)%ntimes) - call ncd_io('mscur' , mscur , 'write', nfid(t), nt=tape(t)%ntimes) - call ncd_io('nstep' , nstep , 'write', nfid(t), nt=tape(t)%ntimes) + call ncd_io('mcdate', mcdate, 'write', nfid(t,f), nt=tape(t)%ntimes(f)) + call ncd_io('mcsec' , mcsec , 'write', nfid(t,f), nt=tape(t)%ntimes(f)) + call ncd_io('mdcur' , mdcur , 'write', nfid(t,f), nt=tape(t)%ntimes(f)) + call ncd_io('mscur' , mscur , 'write', nfid(t,f), nt=tape(t)%ntimes(f)) + call ncd_io('nstep' , nstep , 'write', nfid(t,f), nt=tape(t)%ntimes(f)) timedata(1) = tape(t)%begtime ! beginning time timedata(2) = mdcur + mscur / secspday ! end time if (avgflag_pertape(t) /= 'I') then ! NOT instantaneous fields tape time = (timedata(1) + timedata(2)) * 0.5_r8 - call ncd_io('time_bounds', timedata, 'write', nfid(t), nt=tape(t)%ntimes) + call ncd_io('time_bounds', timedata, 'write', nfid(t,f), nt=tape(t)%ntimes(f)) else time = timedata(2) end if - call ncd_io('time' , time , 'write', nfid(t), nt=tape(t)%ntimes) + call ncd_io('time' , time , 'write', nfid(t,f), nt=tape(t)%ntimes(f)) call ncd_getdatetime (cdate, ctime) - call ncd_io('date_written', cdate, 'write', nfid(t), nt=tape(t)%ntimes) + call ncd_io('date_written', cdate, 'write', nfid(t,f), nt=tape(t)%ntimes(f)) - call ncd_io('time_written', ctime, 'write', nfid(t), nt=tape(t)%ntimes) + call ncd_io('time_written', ctime, 'write', nfid(t,f), nt=tape(t)%ntimes(f)) - call ncd_io(varname='lon', data=ctl%rlon, ncid=nfid(t), flag='write') - call ncd_io(varname='lat', data=ctl%rlat, ncid=nfid(t), flag='write') + call ncd_io(varname='lon', data=ctl%rlon, ncid=nfid(t,f), flag='write') + call ncd_io(varname='lat', data=ctl%rlat, ncid=nfid(t,f), flag='write') call ncd_io(flag='write', varname='mask', dim1name='allrof', & - data=ctl%mask, ncid=nfid(t)) + data=ctl%mask, ncid=nfid(t,f)) call ncd_io(flag='write', varname='area', dim1name='allrof', & - data=ctl%area, ncid=nfid(t)) + data=ctl%area, ncid=nfid(t,f)) call ncd_io(flag='write', varname='areatotal', dim1name='allrof', & - data=Tunit%areatotal, ncid=nfid(t)) + data=Tunit%areatotal, ncid=nfid(t,f)) call ncd_io(flag='write', varname='areatotal2', dim1name='allrof', & - data=Tunit%areatotal2, ncid=nfid(t)) + data=Tunit%areatotal2, ncid=nfid(t,f)) endif @@ -944,161 +960,165 @@ subroutine mosart_hist_HtapesWrapup( rstwr, nlend ) ! Loop over active history tapes, create new history files if necessary ! and write data to history files if end of history interval. - do t = 1, ntapes - - ! Determine if end of history interval - tape(t)%is_endhist = .false. - if (tape(t)%nhtfrq==0) then !monthly average - if (mon /= monm1) then - tape(t)%is_endhist = .true. - end if - else - if (mod(nstep,tape(t)%nhtfrq) == 0) then - tape(t)%is_endhist = .true. + tape_loop1: do t = 1, ntapes + file_loop1: do f = 1, maxsplitfiles + + ! Determine if end of history interval + tape(t)%is_endhist = .false. + if (tape(t)%nhtfrq==0) then !monthly average + if (mon /= monm1) then + tape(t)%is_endhist = .true. + end if + else + if (mod(nstep,tape(t)%nhtfrq) == 0) then + tape(t)%is_endhist = .true. + end if end if - end if - ! If end of history interval - if (tape(t)%is_endhist) then - - ! Normalize by number of accumulations for time averaged case - do f = 1,tape(t)%nflds - avgflag = tape(t)%hlist(f)%avgflag - nacs => tape(t)%hlist(f)%nacs - hbuf => tape(t)%hlist(f)%hbuf - do k = begr, endr - if ((avgflag == 'A') .and. nacs(k) /= 0) then - hbuf(k) = hbuf(k) / float(nacs(k)) - end if - end do - end do - - ! Increment current time sample counter. - tape(t)%ntimes = tape(t)%ntimes + 1 + ! If end of history interval + if (tape(t)%is_endhist) then + + ! Normalize by number of accumulations for time averaged case + fld_loop1: do fld = 1, tape(t)%nflds(f) + avgflag = tape(t)%hlist(fld,f)%avgflag + nacs => tape(t)%hlist(fld,f)%nacs + hbuf => tape(t)%hlist(fld,f)%hbuf + do k = begr, endr + if ((avgflag == 'A') .and. nacs(k) /= 0) then + hbuf(k) = hbuf(k) / float(nacs(k)) + end if + end do + end do fld_loop1 + + ! Increment current time sample counter. + tape(t)%ntimes(f) = tape(t)%ntimes(f) + 1 + + ! Create history file if appropriate and build time comment + + ! If first time sample, generate unique history file name, open file, + ! define dims, vars, etc. + + if (tape(t)%ntimes(f) == 1) then + locfnh(t,f) = set_hist_filename (hist_freq=tape(t)%nhtfrq, & + mfilt=tape(t)%mfilt, hist_file=t, f_index=f) + if (mainproc) then + write(iulog,*) trim(subname),' : Creating history file ', trim(locfnh(t,f)), & + ' at nstep = ',get_nstep() + write(iulog,*)'calling htape_create for file t = ',t + endif + call htape_create(t,f) + + ! Define time-constant field variables + call htape_timeconst(t, f, mode='define') + + ! Define model field variables + + fld_loop2: do fld = 1, tape(t)%nflds(f) + varname = tape(t)%hlist(fld,f)%field%name + long_name = tape(t)%hlist(fld,f)%field%long_name + units = tape(t)%hlist(fld,f)%field%units + avgflag = tape(t)%hlist(fld,f)%avgflag + + select case (avgflag) + case ('A') + avgstr = 'mean' + case ('I') + avgstr = 'instantaneous' + case ('X') + avgstr = 'maximum' + case ('M') + avgstr = 'minimum' + case default + write(iulog,*) trim(subname),& + ' ERROR: unknown time averaging flag (avgflag)=',avgflag + call shr_sys_abort() + end select + call ncd_defvar(ncid=nfid(t,f), varname=varname, xtype=tape(t)%ncprec, & + dim1name='lon', dim2name='lat', dim3name='time', & + long_name=long_name, units=units, cell_method=avgstr, & + missing_value=spval, fill_value=spval) + end do fld_loop2 + + ! Exit define model + call ncd_enddef(nfid(t,f)) - ! Create history file if appropriate and build time comment + endif - ! If first time sample, generate unique history file name, open file, - ! define dims, vars, etc. + ! Write time constant history variables + call htape_timeconst(t, f, mode='write') - if (tape(t)%ntimes == 1) then - locfnh(t) = set_hist_filename (hist_freq=tape(t)%nhtfrq, & - mfilt=tape(t)%mfilt, hist_file=t) if (mainproc) then - write(iulog,*) trim(subname),' : Creating history file ', trim(locfnh(t)), & - ' at nstep = ',get_nstep() - write(iulog,*)'calling htape_create for file t = ',t + write(iulog,*) + write(iulog,*) trim(subname),' : Writing current time sample to local history file ', & + trim(locfnh(t,f)),' at nstep = ',get_nstep(), & + ' for history time interval beginning at ', tape(t)%begtime, & + ' and ending at ',time + write(iulog,*) endif - call htape_create (t) - - ! Define time-constant field variables - call htape_timeconst(t, mode='define') - - ! Define model field variables - - do f = 1,tape(t)%nflds - varname = tape(t)%hlist(f)%field%name - long_name = tape(t)%hlist(f)%field%long_name - units = tape(t)%hlist(f)%field%units - avgflag = tape(t)%hlist(f)%avgflag - - select case (avgflag) - case ('A') - avgstr = 'mean' - case ('I') - avgstr = 'instantaneous' - case ('X') - avgstr = 'maximum' - case ('M') - avgstr = 'minimum' - case default - write(iulog,*) trim(subname),& - ' ERROR: unknown time averaging flag (avgflag)=',avgflag - call shr_sys_abort() - end select - call ncd_defvar(ncid=nfid(t), varname=varname, xtype=tape(t)%ncprec, & - dim1name='lon', dim2name='lat', dim3name='time', & - long_name=long_name, units=units, cell_method=avgstr, & - missing_value=spval, fill_value=spval) - end do - ! Exit define model - call ncd_enddef(nfid(t)) + ! Update beginning time of next interval + tape(t)%begtime = time - endif - - ! Write time constant history variables - call htape_timeconst(t, mode='write') - - if (mainproc) then - write(iulog,*) - write(iulog,*) trim(subname),' : Writing current time sample to local history file ', & - trim(locfnh(t)),' at nstep = ',get_nstep(), & - ' for history time interval beginning at ', tape(t)%begtime, & - ' and ending at ',time - write(iulog,*) - endif - - ! Update beginning time of next interval - tape(t)%begtime = time - - ! Write history time slice - do f = 1,tape(t)%nflds - varname = tape(t)%hlist(f)%field%name - nt = tape(t)%ntimes - histo => tape(t)%hlist(f)%hbuf - call ncd_io(flag='write', varname=varname, dim1name='allrof', & - data=histo, ncid=nfid(t), nt=nt) - end do + ! Write history time slice + fld_loop3: do fld = 1, tape(t)%nflds(f) + varname = tape(t)%hlist(fld,f)%field%name + nt = tape(t)%ntimes(f) + histo => tape(t)%hlist(fld,f)%hbuf + call ncd_io(flag='write', varname=varname, dim1name='allrof', & + data=histo, ncid=nfid(t,f), nt=nt) + end do fld_loop3 - ! Zero necessary history buffers - do f = 1,tape(t)%nflds - tape(t)%hlist(f)%hbuf(:) = 0._r8 - tape(t)%hlist(f)%nacs(:) = 0 - end do + ! Zero necessary history buffers + fld_loop4: do fld = 1, tape(t)%nflds(f) + tape(t)%hlist(fld,f)%hbuf(:) = 0._r8 + tape(t)%hlist(fld,f)%nacs(:) = 0 + end do fld_loop4 - end if + end if - end do ! end loop over history tapes + end do file_loop1 + end do tape_loop1 ! Close open history files ! Auxilary files may have been closed and saved off without being full, ! must reopen the files - do t = 1, ntapes - if (nlend) then - if_close(t) = .true. - else if (rstwr) then - if_close(t) = .true. - else - if (tape(t)%ntimes == tape(t)%mfilt) then + tape_loop2: do t = 1, ntapes + file_loop2: do f = 1, maxsplitfiles + if (nlend) then + if_close(t) = .true. + else if (rstwr) then if_close(t) = .true. else - if_close(t) = .false. - end if - endif - if (if_close(t)) then - if (tape(t)%ntimes /= 0) then - if (mainproc) then - write(iulog,*) - write(iulog,*) trim(subname),' : Closing local history file ',& - trim(locfnh(t)),' at nstep = ', get_nstep() - write(iulog,*) - endif - call ncd_pio_closefile(nfid(t)) - if ((.not.nlend) .and. (tape(t)%ntimes/=tape(t)%mfilt)) then - call ncd_pio_openfile (nfid(t), trim(locfnh(t)), ncd_write) + if (tape(t)%ntimes(f) == tape(t)%mfilt) then + if_close(t) = .true. + else + if_close(t) = .false. end if - else - if (mainproc) then - write(iulog,*) trim(subname),' : history tape ',t,': no open file to close' + endif + if (if_close(t)) then + if (tape(t)%ntimes(f) /= 0) then + if (mainproc) then + write(iulog,*) + write(iulog,*) trim(subname),' : Closing local history file ',& + trim(locfnh(t,f)),' at nstep = ', get_nstep() + write(iulog,*) + endif + call ncd_pio_closefile(nfid(t,f)) + if ((.not.nlend) .and. (tape(t)%ntimes(f) /= tape(t)%mfilt)) then + call ncd_pio_openfile (nfid(t,f), trim(locfnh(t,f)), ncd_write) + end if + else + if (mainproc) then + write(iulog,*) trim(subname),' : history tape ',t,': no open file to close' + end if + endif + if (tape(t)%ntimes(f)==tape(t)%mfilt) then + tape(t)%ntimes(f) = 0 end if endif - if (tape(t)%ntimes==tape(t)%mfilt) then - tape(t)%ntimes = 0 - end if - endif - end do + end do file_loop2 + end do tape_loop2 end subroutine mosart_hist_HtapesWrapup @@ -1129,6 +1149,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) character(len=max_chars) :: fname ! full name of history file character(len=max_chars) :: locrest(max_tapes) ! local history restart file names character(len=1) :: hnum ! history file index + character(len = 1) :: file_index ! instantaneous or accumulated_file_index type(var_desc_t) :: name_desc ! variable descriptor for name type(var_desc_t) :: longname_desc ! variable descriptor for long_name type(var_desc_t) :: units_desc ! variable descriptor for units @@ -1151,7 +1172,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) if (flag == 'read') then if (nsrest == nsrBranch) then do t = 1,ntapes - tape(t)%ntimes = 0 + tape(t)%ntimes(:) = 0 end do RETURN end if @@ -1178,15 +1199,16 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! call ncd_defdim( ncid, 'ntapes' , ntapes , dimid) call ncd_defdim( ncid, 'max_chars' , max_chars , dimid) + call ncd_defdim( ncid, 'ntapes_by_maxsplitfiles', ntapes * maxsplitfiles, dimid) call ncd_defvar(ncid=ncid, varname='locfnh', xtype=ncd_char, & long_name="History filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes" ) + dim1name='max_chars', dim2name="ntapes_by_maxsplitfiles" ) call ncd_defvar(ncid=ncid, varname='locfnhr', xtype=ncd_char, & long_name="Restart history filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes" ) + dim1name='max_chars', dim2name="ntapes_by_maxsplitfiles" ) ! max_nflds is the maximum number of fields on any tape ! max_flds is the maximum number possible number of fields @@ -1195,104 +1217,111 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Loop over tapes - write out namelist information to each restart-history tape ! only read/write accumulators and counters if needed - do t = 1,ntapes - ! - ! Create the restart history filename and open it - ! - write(hnum,'(i1.1)') t-1 - locfnhr(t) = "./" // trim(caseid) //".mosart"// trim(inst_suffix) & - // ".rh" // hnum //"."// trim(rdate) //".nc" - call htape_create( t, histrest=.true. ) - ! - ! Add read/write accumultators and counters if needed - ! - if (.not. tape(t)%is_endhist) then - do f = 1,tape(t)%nflds - name = tape(t)%hlist(f)%field%name - long_name = tape(t)%hlist(f)%field%long_name - units = tape(t)%hlist(f)%field%units - name_acc = trim(name) // "_acc" - units_acc = "unitless positive integer" - long_name_acc = trim(long_name) // " accumulator number of samples" - nacs => tape(t)%hlist(f)%nacs - hbuf => tape(t)%hlist(f)%hbuf - - call ncd_defvar(ncid=ncid_hist(t), varname=trim(name), xtype=ncd_double, & - dim1name='lon', dim2name='lat', & - long_name=trim(long_name), units=trim(units)) - call ncd_defvar(ncid=ncid_hist(t), varname=trim(name_acc), xtype=ncd_int, & - dim1name='lon', dim2name='lat', & - long_name=trim(long_name_acc), units=trim(units_acc)) - end do - endif + tape_loop1: do t = 1,ntapes + file_loop1: do f = 1, maxsplitfiles + if (f == instantaneous_file_index) then + file_index = 'i' ! instantaneous file_index + else if (f == accumulated_file_index) then + file_index = 'a' ! accumulated file_index + end if + ! + ! Create the restart history filename and open it + ! + write(hnum,'(i1.1)') t-1 + locfnhr(t,f) = "./" // trim(caseid) //".mosart"// trim(inst_suffix) & + // ".rh" // hnum // file_index //"."// trim(rdate) //".nc" + call htape_create( t, histrest=.true. ) + ! + ! Add read/write accumultators and counters if needed + ! + if (.not. tape(t)%is_endhist) then + fld_loop1: do fld = 1,tape(t)%nflds(f) + name = tape(t)%hlist(fld,f)%field%name + long_name = tape(t)%hlist(fld,f)%field%long_name + units = tape(t)%hlist(fld,f)%field%units + name_acc = trim(name) // "_acc" + units_acc = "unitless positive integer" + long_name_acc = trim(long_name) // " accumulator number of samples" + nacs => tape(t)%hlist(fld,f)%nacs + hbuf => tape(t)%hlist(fld,f)%hbuf + + call ncd_defvar(ncid=ncid_hist(t,f), varname=trim(name), xtype=ncd_double, & + dim1name='lon', dim2name='lat', & + long_name=trim(long_name), units=trim(units)) + call ncd_defvar(ncid=ncid_hist(t,f), varname=trim(name_acc), xtype=ncd_int, & + dim1name='lon', dim2name='lat', & + long_name=trim(long_name_acc), units=trim(units_acc)) + end do fld_loop1 + endif - ! - ! Add namelist information to each restart history tape - ! - call ncd_defdim( ncid_hist(t), 'fname_lenp2' , max_namlen+2, dimid) - call ncd_defdim( ncid_hist(t), 'fname_len' , max_namlen , dimid) - call ncd_defdim( ncid_hist(t), 'len1' , 1 , dimid) - call ncd_defdim( ncid_hist(t), 'scalar' , 1 , dimid) - call ncd_defdim( ncid_hist(t), 'max_chars' , max_chars , dimid) - call ncd_defdim( ncid_hist(t), 'max_nflds' , max_nflds , dimid) - call ncd_defdim( ncid_hist(t), 'max_flds' , max_flds , dimid) - - call ncd_defvar(ncid=ncid_hist(t), varname='nhtfrq', xtype=ncd_int, & - long_name="Frequency of history writes", & - comment="Namelist item", & - units="absolute value of negative is in hours, 0=monthly, positive is time-steps", & - dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='mfilt', xtype=ncd_int, & - long_name="Number of history time samples on a file", units="unitless", & - comment="Namelist item", & - dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='ncprec', xtype=ncd_int, & - long_name="Flag for data precision", flag_values=(/1,2/), & - comment="Namelist item", & - nvalid_range=(/1,2/), & - flag_meanings=(/"single-precision", "double-precision"/), & - dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='fincl', xtype=ncd_char, & - comment="Namelist item", & - long_name="Fieldnames to include", & - dim1name='fname_lenp2', dim2name='max_flds' ) - call ncd_defvar(ncid=ncid_hist(t), varname='fexcl', xtype=ncd_char, & - comment="Namelist item", & - long_name="Fieldnames to exclude", & - dim1name='fname_lenp2', dim2name='max_flds' ) - - call ncd_defvar(ncid=ncid_hist(t), varname='nflds', xtype=ncd_int, & - long_name="Number of fields on file", units="unitless", & - dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='ntimes', xtype=ncd_int, & - long_name="Number of time steps on file", units="time-step", & - dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='is_endhist', xtype=ncd_log, & - long_name="End of history file", dim1name='scalar') - call ncd_defvar(ncid=ncid_hist(t), varname='begtime', xtype=ncd_double, & - long_name="Beginning time", units="time units", & - dim1name='scalar') - - call ncd_defvar(ncid=ncid_hist(t), varname='hpindex', xtype=ncd_int, & - long_name="History pointer index", units="unitless", & - dim1name='max_nflds' ) - - call ncd_defvar(ncid=ncid_hist(t), varname='avgflag', xtype=ncd_char, & - long_name="Averaging flag", & - units="A=Average, X=Maximum, M=Minimum, I=Instantaneous", & - dim1name='len1', dim2name='max_nflds' ) - call ncd_defvar(ncid=ncid_hist(t), varname='name', xtype=ncd_char, & - long_name="Fieldnames", & - dim1name='fname_len', dim2name='max_nflds' ) - call ncd_defvar(ncid=ncid_hist(t), varname='long_name', xtype=ncd_char, & - long_name="Long descriptive names for fields", & - dim1name='max_chars', dim2name='max_nflds' ) - call ncd_defvar(ncid=ncid_hist(t), varname='units', xtype=ncd_char, & - long_name="Units for each history field output", & - dim1name='max_chars', dim2name='max_nflds' ) - call ncd_enddef(ncid_hist(t)) - - end do ! end of ntapes loop + ! + ! Add namelist information to each restart history tape + ! + call ncd_defdim( ncid_hist(t,f), 'fname_lenp2' , max_namlen+2, dimid) + call ncd_defdim( ncid_hist(t,f), 'fname_len' , max_namlen , dimid) + call ncd_defdim( ncid_hist(t,f), 'len1' , 1 , dimid) + call ncd_defdim( ncid_hist(t,f), 'scalar' , 1 , dimid) + call ncd_defdim( ncid_hist(t,f), 'max_chars' , max_chars , dimid) + call ncd_defdim( ncid_hist(t,f), 'max_nflds' , max_nflds , dimid) + call ncd_defdim( ncid_hist(t,f), 'max_flds' , max_flds , dimid) + + call ncd_defvar(ncid=ncid_hist(t,f), varname='nhtfrq', xtype=ncd_int, & + long_name="Frequency of history writes", & + comment="Namelist item", & + units="absolute value of negative is in hours, 0=monthly, positive is time-steps", & + dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='mfilt', xtype=ncd_int, & + long_name="Number of history time samples on a file", units="unitless", & + comment="Namelist item", & + dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='ncprec', xtype=ncd_int, & + long_name="Flag for data precision", flag_values=(/1,2/), & + comment="Namelist item", & + nvalid_range=(/1,2/), & + flag_meanings=(/"single-precision", "double-precision"/), & + dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='fincl', xtype=ncd_char, & + comment="Namelist item", & + long_name="Fieldnames to include", & + dim1name='fname_lenp2', dim2name='max_flds' ) + call ncd_defvar(ncid=ncid_hist(t,f), varname='fexcl', xtype=ncd_char, & + comment="Namelist item", & + long_name="Fieldnames to exclude", & + dim1name='fname_lenp2', dim2name='max_flds' ) + + call ncd_defvar(ncid=ncid_hist(t,f), varname='nflds', xtype=ncd_int, & + long_name="Number of fields on file", units="unitless", & + dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='ntimes', xtype=ncd_int, & + long_name="Number of time steps on file", units="time-step", & + dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='is_endhist', xtype=ncd_log, & + long_name="End of history file", dim1name='scalar') + call ncd_defvar(ncid=ncid_hist(t,f), varname='begtime', xtype=ncd_double, & + long_name="Beginning time", units="time units", & + dim1name='scalar') + + call ncd_defvar(ncid=ncid_hist(t,f), varname='hpindex', xtype=ncd_int, & + long_name="History pointer index", units="unitless", & + dim1name='max_nflds' ) + + call ncd_defvar(ncid=ncid_hist(t,f), varname='avgflag', xtype=ncd_char, & + long_name="Averaging flag", & + units="A=Average, X=Maximum, M=Minimum, I=Instantaneous", & + dim1name='len1', dim2name='max_nflds' ) + call ncd_defvar(ncid=ncid_hist(t,f), varname='name', xtype=ncd_char, & + long_name="Fieldnames", & + dim1name='fname_len', dim2name='max_nflds' ) + call ncd_defvar(ncid=ncid_hist(t,f), varname='long_name', xtype=ncd_char, & + long_name="Long descriptive names for fields", & + dim1name='max_chars', dim2name='max_nflds' ) + call ncd_defvar(ncid=ncid_hist(t,f), varname='units', xtype=ncd_char, & + long_name="Units for each history field output", & + dim1name='max_chars', dim2name='max_nflds' ) + call ncd_enddef(ncid_hist(t,f)) + + end do file_loop1 + end do tape_loop1 RETURN @@ -1300,10 +1329,12 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) else if (flag == 'write') then !================================================ ! Add history filenames to master restart file - do t = 1,ntapes - call ncd_io('locfnh', locfnh(t), 'write', ncid, nt=t) - call ncd_io('locfnhr', locfnhr(t), 'write', ncid, nt=t) - end do + tape_loop2: do t = 1, ntapes + file_loop2: do f = 1, maxsplitfiles + call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=counter) + call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=counter) + end do file_loop2 + end do tape_loop2 fincl(:,1) = fincl1(:) fincl(:,2) = fincl2(:) @@ -1320,40 +1351,42 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Add history namelist data to each history restart tape allocate(itemp2d(max_nflds,ntapes)) - do t = 1,ntapes - call ncd_inqvid(ncid_hist(t), 'name', varid, name_desc) - call ncd_inqvid(ncid_hist(t), 'long_name', varid, longname_desc) - call ncd_inqvid(ncid_hist(t), 'units', varid, units_desc) - call ncd_inqvid(ncid_hist(t), 'avgflag', varid, avgflag_desc) - - call ncd_io(varname='fincl' , data=fincl(:,t) , ncid=ncid_hist(t), flag='write') - call ncd_io(varname='fexcl' , data=fexcl(:,t) , ncid=ncid_hist(t), flag='write') - call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t), flag='write') - - itemp2d(:,:) = 0 - do f=1,tape(t)%nflds - itemp2d(f,t) = tape(t)%hlist(f)%field%hpindex - end do - call ncd_io(varname='hpindex', data=itemp2d(:,t), ncid=ncid_hist(t), flag='write') - - call ncd_io('nflds' , tape(t)%nflds, 'write', ncid_hist(t)) - call ncd_io('ntimes', tape(t)%ntimes, 'write', ncid_hist(t)) - call ncd_io('nhtfrq', tape(t)%nhtfrq, 'write', ncid_hist(t)) - call ncd_io('mfilt' , tape(t)%mfilt, 'write', ncid_hist(t)) - call ncd_io('ncprec', tape(t)%ncprec, 'write', ncid_hist(t)) - call ncd_io('begtime', tape(t)%begtime, 'write', ncid_hist(t)) - do f=1,tape(t)%nflds - start(2) = f - call ncd_io( name_desc, tape(t)%hlist(f)%field%name, & - 'write', ncid_hist(t), start ) - call ncd_io( longname_desc, tape(t)%hlist(f)%field%long_name, & - 'write', ncid_hist(t), start ) - call ncd_io( units_desc, tape(t)%hlist(f)%field%units, & - 'write', ncid_hist(t), start ) - call ncd_io( avgflag_desc, tape(t)%hlist(f)%avgflag, & - 'write', ncid_hist(t), start ) - end do - end do + tape_loop3: do t = 1,ntapes + file_loop3: do f = 1, maxsplitfiles + call ncd_inqvid(ncid_hist(t,f), 'name', varid, name_desc) + call ncd_inqvid(ncid_hist(t,f), 'long_name', varid, longname_desc) + call ncd_inqvid(ncid_hist(t,f), 'units', varid, units_desc) + call ncd_inqvid(ncid_hist(t,f), 'avgflag', varid, avgflag_desc) + + call ncd_io(varname='fincl' , data=fincl(:,t) , ncid=ncid_hist(t,f), flag='write') + call ncd_io(varname='fexcl' , data=fexcl(:,t) , ncid=ncid_hist(t,f), flag='write') + call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t,f), flag='write') + + itemp2d(:,:) = 0 + fld_loop2: do fld = 1, tape(t)%nflds(f) + itemp2d(fld,t) = tape(t)%hlist(fld,f)%field%hpindex + end do fld_loop2 + call ncd_io(varname='hpindex', data=itemp2d(:,t), ncid=ncid_hist(t,f), flag='write') + + call ncd_io('nflds' , tape(t)%nflds(f), 'write', ncid_hist(t,f)) + call ncd_io('ntimes', tape(t)%ntimes(f), 'write', ncid_hist(t,f)) + call ncd_io('nhtfrq', tape(t)%nhtfrq, 'write', ncid_hist(t,f)) + call ncd_io('mfilt' , tape(t)%mfilt, 'write', ncid_hist(t,f)) + call ncd_io('ncprec', tape(t)%ncprec, 'write', ncid_hist(t,f)) + call ncd_io('begtime', tape(t)%begtime, 'write', ncid_hist(t,f)) + fld_loop3: do fld = 1, tape(t)%nflds(f) + start(2) = f + call ncd_io( name_desc, tape(t)%hlist(fld,f)%field%name, & + 'write', ncid_hist(t,f), start ) + call ncd_io( longname_desc, tape(t)%hlist(fld,f)%field%long_name, & + 'write', ncid_hist(t,f), start ) + call ncd_io( units_desc, tape(t)%hlist(fld,f)%field%units, & + 'write', ncid_hist(t,f), start ) + call ncd_io( avgflag_desc, tape(t)%hlist(fld,f)%avgflag, & + 'write', ncid_hist(t,f), start ) + end do fld_loop3 + end do file_loop3 + end do tape_loop3 deallocate(itemp2d) !================================================ @@ -1361,11 +1394,13 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) !================================================ call ncd_inqdlen(ncid,dimid,ntapes, name='ntapes') - call ncd_io('locfnh', locfnh(1:ntapes), 'read', ncid ) - call ncd_io('locfnhr', locrest(1:ntapes), 'read', ncid ) + call ncd_io('locfnh', locfnh, 'read', ncid ) + call ncd_io('locfnhr', locrest, 'read', ncid ) do t = 1,ntapes - call strip_null(locrest(t)) - call strip_null(locfnh(t)) + do f = 1, maxsplitfiles + call strip_null(locrest(f,t)) + call strip_null(locfnh(f,t)) + end do end do ! Determine necessary indices - the following is needed if model decomposition @@ -1374,68 +1409,70 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) endr = ctl%endr start(1)=1 - do t = 1,ntapes - call getfil( locrest(t), locfnhr(t), 0 ) - call ncd_pio_openfile (ncid_hist(t), trim(locfnhr(t)), ncd_nowrite) - - if ( t == 1 )then - call ncd_inqdlen(ncid_hist(1),dimid,max_nflds,name='max_nflds') - allocate(itemp2d(max_nflds,ntapes)) - end if - - call ncd_inqvid(ncid_hist(t), 'name', varid, name_desc) - call ncd_inqvid(ncid_hist(t), 'long_name', varid, longname_desc) - call ncd_inqvid(ncid_hist(t), 'units', varid, units_desc) - call ncd_inqvid(ncid_hist(t), 'avgflag', varid, avgflag_desc) - - call ncd_io(varname='fincl', data=fincl(:,t), ncid=ncid_hist(t), flag='read') - call ncd_io(varname='fexcl', data=fexcl(:,t), ncid=ncid_hist(t), flag='read') - - call ncd_io('nflds', tape(t)%nflds, 'read', ncid_hist(t) ) - call ncd_io('ntimes', tape(t)%ntimes, 'read', ncid_hist(t) ) - call ncd_io('nhtfrq', tape(t)%nhtfrq, 'read', ncid_hist(t) ) - call ncd_io('mfilt', tape(t)%mfilt, 'read', ncid_hist(t) ) - call ncd_io('ncprec', tape(t)%ncprec, 'read', ncid_hist(t) ) - call ncd_io('begtime', tape(t)%begtime,'read', ncid_hist(t) ) - - call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t), flag='read') - call ncd_io(varname='hpindex' , data=itemp2d(:,t) , ncid=ncid_hist(t), flag='read') - do f=1,tape(t)%nflds - tape(t)%hlist(f)%field%hpindex = itemp2d(f,t) - end do + tape_loop4: do t = 1,ntapes + file_loop4: do f = 1, maxsplitfiles + call getfil( locrest(t), locfnhr(t,f), 0 ) + call ncd_pio_openfile (ncid_hist(t,f), trim(locfnhr(t,f)), ncd_nowrite) + + if ( t == 1 )then + call ncd_inqdlen(ncid_hist(1,f),dimid,max_nflds,name='max_nflds') + allocate(itemp2d(max_nflds,ntapes)) + end if - do f=1,tape(t)%nflds - start(2) = f - call ncd_io( name_desc, tape(t)%hlist(f)%field%name, & - 'read', ncid_hist(t), start ) - call ncd_io( longname_desc, tape(t)%hlist(f)%field%long_name, & - 'read', ncid_hist(t), start ) - call ncd_io( units_desc, tape(t)%hlist(f)%field%units, & - 'read', ncid_hist(t), start ) - call ncd_io( avgflag_desc, tape(t)%hlist(f)%avgflag, & - 'read', ncid_hist(t), start ) - call strip_null(tape(t)%hlist(f)%field%name) - call strip_null(tape(t)%hlist(f)%field%long_name) - call strip_null(tape(t)%hlist(f)%field%units) - call strip_null(tape(t)%hlist(f)%avgflag) - - allocate (tape(t)%hlist(f)%hbuf(begr:endr), & - tape(t)%hlist(f)%nacs(begr:endr), stat=status) - if (status /= 0) then - write(iulog,*) trim(subname),' ERROR: allocation error for hbuf,nacs at t,f=',t,f - call shr_sys_abort() - endif - tape(t)%hlist(f)%hbuf(:) = 0._r8 - tape(t)%hlist(f)%nacs(:) = 0 - end do ! end of flds loop + call ncd_inqvid(ncid_hist(t,f), 'name', varid, name_desc) + call ncd_inqvid(ncid_hist(t,f), 'long_name', varid, longname_desc) + call ncd_inqvid(ncid_hist(t,f), 'units', varid, units_desc) + call ncd_inqvid(ncid_hist(t,f), 'avgflag', varid, avgflag_desc) + + call ncd_io(varname='fincl', data=fincl(:,t), ncid=ncid_hist(t,f), flag='read') + call ncd_io(varname='fexcl', data=fexcl(:,t), ncid=ncid_hist(t,f), flag='read') + + call ncd_io('nflds', tape(t)%nflds(f), 'read', ncid_hist(t,f) ) + call ncd_io('ntimes', tape(t)%ntimes(f), 'read', ncid_hist(t,f) ) + call ncd_io('nhtfrq', tape(t)%nhtfrq, 'read', ncid_hist(t,f) ) + call ncd_io('mfilt', tape(t)%mfilt, 'read', ncid_hist(t,f) ) + call ncd_io('ncprec', tape(t)%ncprec, 'read', ncid_hist(t,f) ) + call ncd_io('begtime', tape(t)%begtime,'read', ncid_hist(t,f) ) + + call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t,f), flag='read') + call ncd_io(varname='hpindex' , data=itemp2d(:,t) , ncid=ncid_hist(t,f), flag='read') + fld_loop4: do fld=1,tape(t)%nflds(f) + tape(t)%hlist(fld,f)%field%hpindex = itemp2d(fld,t) + end do fld_loop4 + + fld_loop5: do fld=1,tape(t)%nflds(f) + start(2) = f + call ncd_io( name_desc, tape(t)%hlist(fld,f)%field%name, & + 'read', ncid_hist(t,f), start ) + call ncd_io( longname_desc, tape(t)%hlist(fld,f)%field%long_name, & + 'read', ncid_hist(t,f), start ) + call ncd_io( units_desc, tape(t)%hlist(fld,f)%field%units, & + 'read', ncid_hist(t,f), start ) + call ncd_io( avgflag_desc, tape(t)%hlist(fld,f)%avgflag, & + 'read', ncid_hist(t,f), start ) + call strip_null(tape(t)%hlist(fld,f)%field%name) + call strip_null(tape(t)%hlist(fld,f)%field%long_name) + call strip_null(tape(t)%hlist(fld,f)%field%units) + call strip_null(tape(t)%hlist(fld,f)%avgflag) + + allocate (tape(t)%hlist(fld,f)%hbuf(begr:endr), & + tape(t)%hlist(fld,f)%nacs(begr:endr), stat=status) + if (status /= 0) then + write(iulog,*) trim(subname),' ERROR: allocation error for hbuf,nacs at t,f=',t,f + call shr_sys_abort() + endif + tape(t)%hlist(fld,f)%hbuf(:) = 0._r8 + tape(t)%hlist(fld,f)%nacs(:) = 0 + end do fld_loop5 - ! If history file is not full, open it + ! If history file is not full, open it - if (tape(t)%ntimes /= 0) then - call ncd_pio_openfile (nfid(t), trim(locfnh(t)), ncd_write) - end if + if (tape(t)%ntimes(f) /= 0) then + call ncd_pio_openfile (nfid(t,f), trim(locfnh(t,f)), ncd_write) + end if - end do ! end of tapes loop + end do file_loop4 + end do tape_loop4 fincl1(:) = fincl(:,1) fincl2(:) = fincl(:,2) @@ -1456,42 +1493,46 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) if (flag == 'write') then - do t = 1,ntapes + tape_loop5: do t = 1,ntapes if (.not. tape(t)%is_endhist) then - do f = 1,tape(t)%nflds - name = tape(t)%hlist(f)%field%name - name_acc = trim(name) // "_acc" - nacs => tape(t)%hlist(f)%nacs - hbuf => tape(t)%hlist(f)%hbuf - - call ncd_io(ncid=ncid_hist(t), flag='write', varname=trim(name), & - dim1name='allrof', data=hbuf) - call ncd_io(ncid=ncid_hist(t), flag='write', varname=trim(name_acc), & - dim1name='allrof', data=nacs) - end do + file_loop5: do f = 1, maxsplitfiles + fld_loop6: do fld = 1, tape(t)%nflds(f) + name = tape(t)%hlist(fld,f)%field%name + name_acc = trim(name) // "_acc" + nacs => tape(t)%hlist(fld,f)%nacs + hbuf => tape(t)%hlist(fld,f)%hbuf + + call ncd_io(ncid=ncid_hist(t,f), flag='write', varname=trim(name), & + dim1name='allrof', data=hbuf) + call ncd_io(ncid=ncid_hist(t,f), flag='write', varname=trim(name_acc), & + dim1name='allrof', data=nacs) + end do fld_loop6 + end do file_loop5 end if ! end of is_endhist block - call ncd_pio_closefile(ncid_hist(t)) - end do ! end of ntapes loop + call ncd_pio_closefile(ncid_hist(t,f)) + end do tape_loop5 else if (flag == 'read') then ! Read history restart information if history files are not full - do t = 1,ntapes + tape_loop6: do t = 1,ntapes if (.not. tape(t)%is_endhist) then - do f = 1,tape(t)%nflds - name = tape(t)%hlist(f)%field%name - name_acc = trim(name) // "_acc" - nacs => tape(t)%hlist(f)%nacs - hbuf => tape(t)%hlist(f)%hbuf - - call ncd_io(ncid=ncid_hist(t), flag='read', varname=trim(name), & - dim1name='allrof', data=hbuf) - call ncd_io(ncid=ncid_hist(t), flag='read', varname=trim(name_acc), & - dim1name='allrof', data=nacs) - end do + file_loop6: do f = 1, maxsplitfiles + fld_loop7: do fld = 1, tape(t)%nflds(f) + name = tape(t)%hlist(fld,f)%field%name + name_acc = trim(name) // "_acc" + nacs => tape(t)%hlist(fld,f)%nacs + hbuf => tape(t)%hlist(fld,f)%hbuf + + call ncd_io(ncid=ncid_hist(t,f), flag='read', varname=trim(name), & + dim1name='allrof', data=hbuf) + call ncd_io(ncid=ncid_hist(t,f), flag='read', varname=trim(name_acc), & + dim1name='allrof', data=nacs) + end do fld_loop7 + end do file_loop6 end if - call ncd_pio_closefile(ncid_hist(t)) - end do + call ncd_pio_closefile(ncid_hist(t,f)) + end do tape_loop6 end if @@ -1504,12 +1545,15 @@ integer function max_nFields() ! Get the maximum number of fields on all tapes. ! LOCAL VARIABLES: - integer :: t ! index + integer :: t ! tape index + integer :: f ! file index character(len=*),parameter :: subname = 'max_nFields' max_nFields = 0 do t = 1,ntapes - max_nFields = max(max_nFields, tape(t)%nflds) + do f = 1, maxsplitfiles + max_nFields = max(max_nFields, tape(t)%nflds(f)) + end do end do end function max_nFields @@ -1602,7 +1646,7 @@ end subroutine list_index !----------------------------------------------------------------------- - character(len=max_length_filename) function set_hist_filename (hist_freq, mfilt, hist_file) + character(len=max_length_filename) function set_hist_filename (hist_freq, mfilt, hist_file, f_index) ! Determine history dataset filenames. @@ -1610,10 +1654,12 @@ character(len=max_length_filename) function set_hist_filename (hist_freq, mfilt, integer, intent(in) :: hist_freq !history file frequency integer, intent(in) :: mfilt !history file number of time-samples integer, intent(in) :: hist_file !history file index + integer, intent(in) :: f_index ! instantaneous or accumulated_file_index ! !LOCAL VARIABLES: character(len=CL) :: cdate !date char string character(len= 1) :: hist_index !p,1 or 2 (currently) + character(len = 1) :: file_index ! instantaneous or accumulated_file_index integer :: day !day (1 -> 31) integer :: mon !month (1 -> 12) integer :: yr !year (0 -> ...) @@ -1628,9 +1674,16 @@ character(len=max_length_filename) function set_hist_filename (hist_freq, mfilt, call get_curr_date (yr, mon, day, sec) write(cdate,'(i4.4,"-",i2.2,"-",i2.2,"-",i5.5)') yr,mon,day,sec endif + + if (f_index == instantaneous_file_index) then + file_index = 'i' ! instantaneous file_index + else if (f_index == accumulated_file_index) then + file_index = 'a' ! accumulated file_index + end if + write(hist_index,'(i1.1)') hist_file - 1 set_hist_filename = "./"//trim(caseid)//".mosart"//trim(inst_suffix)//& - ".h"//hist_index//"."//trim(cdate)//".nc" + ".h"//hist_index//file_index//"."//trim(cdate)//".nc" ! check to see if the concatenated filename exceeded the ! length. Simplest way to do this is ensure that the file @@ -1703,15 +1756,15 @@ subroutine mosart_hist_Addfld (fname, units, avgflag, long_name, ptr_rof, defaul '-- max_flds,nfmaster=', max_flds, nfmaster call shr_sys_abort() end if - masterlist(f)%field%name = fname - masterlist(f)%field%long_name = long_name - masterlist(f)%field%units = units - masterlist(f)%field%hpindex = hpindex + masterlist(fld)%field%name = fname + masterlist(fld)%field%long_name = long_name + masterlist(fld)%field%units = units + masterlist(fld)%field%hpindex = hpindex ! The next two fields are only in master field list, NOT in runtime active field list ! ALL FIELDS IN THE MASTER LIST ARE INITIALIZED WITH THE ACTIVE FLAG SET TO FALSE - masterlist(f)%avgflag(:) = avgflag - masterlist(f)%actflag(:) = .false. + masterlist(fld)%avgflag(:) = avgflag + masterlist(fld)%actflag(:,:) = .false. if (present(default)) then if (trim(default) == 'inactive') return @@ -1720,9 +1773,13 @@ subroutine mosart_hist_Addfld (fname, units, avgflag, long_name, ptr_rof, defaul ! Look through master list for input field name. ! When found, set active flag for that tape to true. found = .false. - do f = 1,nfmaster - if (trim(fname) == trim(masterlist(f)%field%name)) then - masterlist(f)%actflag(1) = .true. + do fld = 1, nfmaster + if (trim(fname) == trim(masterlist(fld)%field%name)) then + if (avgflag == 'I') then + masterlist(fld)%actflag(1,instantaneous_file_index) = .true. + else + masterlist(fld)%actflag(1,accumulated_file_index) = .true. + end if found = .true. exit end if From ef55d37c9e5f067938543b22d371f5bd4250c16a Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 6 Jun 2025 17:45:46 -0600 Subject: [PATCH 02/23] Add some of the missing variable declarations --- src/riverroute/mosart_histfile.F90 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 84e3936..cf6ab37 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -734,6 +734,7 @@ subroutine htape_timeconst(t, f, mode) ! !ARGUMENTS: integer, intent(in) :: t ! tape index + integer, intent(in) :: f ! file index character(len=*), intent(in) :: mode ! 'define' or 'write' ! !LOCAL VARIABLES: @@ -919,7 +920,7 @@ subroutine mosart_hist_HtapesWrapup( rstwr, nlend ) ! !LOCAL VARIABLES: integer :: begr, endr ! beg and end rof indices - integer :: t,f,k,nt ! indices + integer :: fld, t, f, k, nt ! indices integer :: nstep ! current step integer :: day ! current day (1 -> 31) integer :: mon ! current month (1 -> 12) @@ -1159,7 +1160,8 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) integer :: start(2) ! Start array index integer :: k ! 1d index integer :: t ! tape index - integer :: f ! field index + integer :: f ! file index + integer :: fld ! field index integer :: varid ! variable id integer, allocatable :: itemp2d(:,:) ! 2D temporary real(r8), pointer :: hbuf(:) ! history buffer @@ -1331,8 +1333,8 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Add history filenames to master restart file tape_loop2: do t = 1, ntapes file_loop2: do f = 1, maxsplitfiles - call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=counter) - call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=counter) + call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=countr) + call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=countr) end do file_loop2 end do tape_loop2 @@ -1719,7 +1721,7 @@ subroutine mosart_hist_Addfld (fname, units, avgflag, long_name, ptr_rof, defaul ! !LOCAL VARIABLES: integer :: n ! loop index - integer :: f ! masterlist index + integer :: fld ! masterlist index integer :: hpindex ! history buffer pointer index logical :: found ! flag indicates field found in masterlist integer, save :: lastindex = 1 From d28913f99346f2422404f69361677ab851c3a9b0 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 18 Jun 2025 16:26:04 -0600 Subject: [PATCH 03/23] Various corrections for the build to finish successfully --- src/riverroute/mosart_histfile.F90 | 43 +++++++++++++++++++----------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index cf6ab37..3c4775b 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -324,9 +324,9 @@ subroutine htapes_fieldlist() end if fld = fld + 1 end do + tape(t)%nflds(:) = 0 end do tape_loop1 - tape(:)%nflds(:) = 0 tape_loop2: do t = 1,max_tapes ! Loop through the masterlist set of field names and determine if any of those ! are in the FINCL or FEXCL arrays @@ -592,17 +592,17 @@ end subroutine mosart_hist_UpdateHbuf !----------------------------------------------------------------------- - subroutine htape_create (t, histrest) + subroutine htape_create (t, f, histrest) ! Define contents of history file t. Issue the required netcdf ! wrapper calls to define the history file contents. ! !ARGUMENTS: integer, intent(in) :: t ! tape index + integer, intent(in) :: f ! file index logical, intent(in), optional :: histrest ! if creating the history restart file ! !LOCAL VARIABLES: - integer :: f ! field index integer :: p,c,l,n ! indices integer :: ier ! error code integer :: dimid ! dimension id temporary @@ -716,11 +716,11 @@ subroutine htape_create (t, histrest) call ncd_defdim(lnfid, 'nbnd', 2, nbnd_dimid) call ncd_defdim(lnfid, 'time', ncd_unlimited, time_dimid) if (mainproc)then - write(iulog,*) trim(subname),' : Successfully defined netcdf history file ',t + write(iulog,*) trim(subname),' : Successfully defined netcdf history tape, file ', t, f end if else if (mainproc)then - write(iulog,*) trim(subname),' : Successfully defined netcdf restart history file ',t + write(iulog,*) trim(subname),' : Successfully defined netcdf restart history tape, file ', t, f end if end if @@ -1141,6 +1141,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) integer :: max_nflds ! max number of fields integer :: begr ! per-proc beginning ocean runoff index integer :: endr ! per-proc ending ocean runoff index + integer :: counter ! loop counter character(len=max_namlen) :: name ! variable name character(len=max_namlen) :: name_acc ! accumulator variable name character(len=max_namlen) :: long_name ! long name of variable @@ -1148,7 +1149,11 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) character(len=max_chars) :: units ! units of variable character(len=max_chars) :: units_acc ! accumulator units character(len=max_chars) :: fname ! full name of history file - character(len=max_chars) :: locrest(max_tapes) ! local history restart file names + character(len=max_chars) :: locrest(max_tapes, maxsplitfiles) ! local history restart file names + character(len=max_chars) :: locrest_onfile(maxsplitfiles*max_tapes) ! local history restart file names, dims flipped + character(len=max_chars) :: locfnh_onfile(maxsplitfiles*max_tapes) ! local history file names, dims flipped + character(len=max_chars) :: my_locfnh ! temporary version of locfnh + character(len=max_chars) :: my_locfnhr ! temporary version of locfnhr character(len=1) :: hnum ! history file index character(len = 1) :: file_index ! instantaneous or accumulated_file_index type(var_desc_t) :: name_desc ! variable descriptor for name @@ -1232,7 +1237,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) write(hnum,'(i1.1)') t-1 locfnhr(t,f) = "./" // trim(caseid) //".mosart"// trim(inst_suffix) & // ".rh" // hnum // file_index //"."// trim(rdate) //".nc" - call htape_create( t, histrest=.true. ) + call htape_create( t, f, histrest=.true. ) ! ! Add read/write accumultators and counters if needed ! @@ -1331,10 +1336,12 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) else if (flag == 'write') then !================================================ ! Add history filenames to master restart file + counter = 0 tape_loop2: do t = 1, ntapes file_loop2: do f = 1, maxsplitfiles - call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=countr) - call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=countr) + counter = counter + 1 + call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=counter) + call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=counter) end do file_loop2 end do tape_loop2 @@ -1396,12 +1403,18 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) !================================================ call ncd_inqdlen(ncid,dimid,ntapes, name='ntapes') - call ncd_io('locfnh', locfnh, 'read', ncid ) - call ncd_io('locfnhr', locrest, 'read', ncid ) + call ncd_io('locfnh', locfnh_onfile, 'read', ncid ) + call ncd_io('locfnhr', locrest_onfile, 'read', ncid ) + counter = 0 do t = 1,ntapes do f = 1, maxsplitfiles - call strip_null(locrest(f,t)) - call strip_null(locfnh(f,t)) + counter = counter + 1 + call strip_null(locrest_onfile(counter)) + call strip_null(locfnh_onfile(counter)) + ! These character variables get read with their dimensions backwards + ! so flip them before using them + locrest(t,f) = locrest_onfile(counter) + locfnh(t,f) = locfnh_onfile(counter) end do end do @@ -1413,7 +1426,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) start(1)=1 tape_loop4: do t = 1,ntapes file_loop4: do f = 1, maxsplitfiles - call getfil( locrest(t), locfnhr(t,f), 0 ) + call getfil( locrest(t,f), locfnhr(t,f), 0 ) call ncd_pio_openfile (ncid_hist(t,f), trim(locfnhr(t,f)), ncd_nowrite) if ( t == 1 )then @@ -1752,7 +1765,7 @@ subroutine mosart_hist_Addfld (fname, units, avgflag, long_name, ptr_rof, defaul end if end do nfmaster = nfmaster + 1 - f = nfmaster + fld = nfmaster if (nfmaster > max_flds) then write(iulog,*) trim(subname),' ERROR: too many fields for primary history file ', & '-- max_flds,nfmaster=', max_flds, nfmaster From c4652a557ed254cb52f66990b69954d08e8c3e68 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 18 Jun 2025 17:52:03 -0600 Subject: [PATCH 04/23] Change an inactive 'A' history field to active 'I' for test to PASS --- src/riverroute/mosart_histflds.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/riverroute/mosart_histflds.F90 b/src/riverroute/mosart_histflds.F90 index 18534f1..b27126e 100644 --- a/src/riverroute/mosart_histflds.F90 +++ b/src/riverroute/mosart_histflds.F90 @@ -139,8 +139,8 @@ subroutine mosart_histflds_init(begr, endr, ntracers) end do call mosart_hist_addfld (fname='STORAGE_MCH', units='m3', & - avgflag='A', long_name='MOSART main channelstorage', & - ptr_rof=h_volr_mch, default='inactive') + avgflag='I', long_name='MOSART main channelstorage', & + ptr_rof=h_volr_mch, default='active') call mosart_hist_addfld (fname='QIRRIG_FROM_COUPLER', units='m3/s', & avgflag='A', long_name='Amount of water used for irrigation (total flux received from coupler)', & From 9ff10fb9b1cdd185d649c5f5944d2046996803f7 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Wed, 18 Jun 2025 19:05:41 -0600 Subject: [PATCH 05/23] Reorder a few lines as in the equivalent clm code to move past failure --- src/riverroute/mosart_histfile.F90 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 3c4775b..1ee39f3 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1509,8 +1509,9 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) if (flag == 'write') then tape_loop5: do t = 1,ntapes - if (.not. tape(t)%is_endhist) then - file_loop5: do f = 1, maxsplitfiles + file_loop5: do f = 1, maxsplitfiles + + if (.not. tape(t)%is_endhist) then fld_loop6: do fld = 1, tape(t)%nflds(f) name = tape(t)%hlist(fld,f)%field%name name_acc = trim(name) // "_acc" @@ -1522,9 +1523,11 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_io(ncid=ncid_hist(t,f), flag='write', varname=trim(name_acc), & dim1name='allrof', data=nacs) end do fld_loop6 - end do file_loop5 - end if ! end of is_endhist block - call ncd_pio_closefile(ncid_hist(t,f)) + end if ! end of is_endhist block + + call ncd_pio_closefile(ncid_hist(t,f)) + + end do file_loop5 end do tape_loop5 else if (flag == 'read') then From 22d52dfa11c75ccf55340ea671ad63bb81ccc3f6 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 24 Jun 2025 11:48:51 -0600 Subject: [PATCH 06/23] Simplify itemp2d to itemp as done in clm's histFileMod.F90 --- src/riverroute/mosart_histfile.F90 | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 1ee39f3..86fb796 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1168,7 +1168,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) integer :: f ! file index integer :: fld ! field index integer :: varid ! variable id - integer, allocatable :: itemp2d(:,:) ! 2D temporary + integer, allocatable :: itemp(:) ! 1D temporary real(r8), pointer :: hbuf(:) ! history buffer integer , pointer :: nacs(:) ! accumulation counter character(len=*),parameter :: subname = 'hist_restart_ncd' @@ -1359,7 +1359,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Add history namelist data to each history restart tape - allocate(itemp2d(max_nflds,ntapes)) + allocate(itemp(max_nflds)) tape_loop3: do t = 1,ntapes file_loop3: do f = 1, maxsplitfiles call ncd_inqvid(ncid_hist(t,f), 'name', varid, name_desc) @@ -1371,11 +1371,11 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_io(varname='fexcl' , data=fexcl(:,t) , ncid=ncid_hist(t,f), flag='write') call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t,f), flag='write') - itemp2d(:,:) = 0 + itemp(:) = 0 fld_loop2: do fld = 1, tape(t)%nflds(f) - itemp2d(fld,t) = tape(t)%hlist(fld,f)%field%hpindex + itemp(fld) = tape(t)%hlist(fld,f)%field%hpindex end do fld_loop2 - call ncd_io(varname='hpindex', data=itemp2d(:,t), ncid=ncid_hist(t,f), flag='write') + call ncd_io(varname='hpindex', data=itemp(:), ncid=ncid_hist(t,f), flag='write') call ncd_io('nflds' , tape(t)%nflds(f), 'write', ncid_hist(t,f)) call ncd_io('ntimes', tape(t)%ntimes(f), 'write', ncid_hist(t,f)) @@ -1396,7 +1396,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) end do fld_loop3 end do file_loop3 end do tape_loop3 - deallocate(itemp2d) + deallocate(itemp) !================================================ else if (flag == 'read') then @@ -1411,8 +1411,6 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) counter = counter + 1 call strip_null(locrest_onfile(counter)) call strip_null(locfnh_onfile(counter)) - ! These character variables get read with their dimensions backwards - ! so flip them before using them locrest(t,f) = locrest_onfile(counter) locfnh(t,f) = locfnh_onfile(counter) end do @@ -1431,7 +1429,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) if ( t == 1 )then call ncd_inqdlen(ncid_hist(1,f),dimid,max_nflds,name='max_nflds') - allocate(itemp2d(max_nflds,ntapes)) + allocate(itemp(max_nflds)) end if call ncd_inqvid(ncid_hist(t,f), 'name', varid, name_desc) @@ -1450,9 +1448,9 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_io('begtime', tape(t)%begtime,'read', ncid_hist(t,f) ) call ncd_io(varname='is_endhist', data=tape(t)%is_endhist, ncid=ncid_hist(t,f), flag='read') - call ncd_io(varname='hpindex' , data=itemp2d(:,t) , ncid=ncid_hist(t,f), flag='read') + call ncd_io(varname='hpindex' , data=itemp(:) , ncid=ncid_hist(t,f), flag='read') fld_loop4: do fld=1,tape(t)%nflds(f) - tape(t)%hlist(fld,f)%field%hpindex = itemp2d(fld,t) + tape(t)%hlist(fld,f)%field%hpindex = itemp(fld) end do fld_loop4 fld_loop5: do fld=1,tape(t)%nflds(f) @@ -1497,7 +1495,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) fexcl2(:) = fexcl(:,2) fexcl3(:) = fexcl(:,3) - if ( allocated(itemp2d) ) deallocate(itemp2d) + if ( allocated(itemp) ) deallocate(itemp) end if From 08bbb00aecc45ca1999c05598fe2035dbec3863c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 24 Jun 2025 11:50:35 -0600 Subject: [PATCH 07/23] Add two lines that I missed from my clm version --- src/riverroute/mosart_histfile.F90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 86fb796..b81c06d 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1340,6 +1340,8 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) tape_loop2: do t = 1, ntapes file_loop2: do f = 1, maxsplitfiles counter = counter + 1 + my_locfnh = locfnh(t,f) + my_locfnhr = locfnhr(t,f) call ncd_io('locfnh', my_locfnh, 'write', ncid, nt=counter) call ncd_io('locfnhr', my_locfnhr, 'write', ncid, nt=counter) end do file_loop2 From d453daebde59dfa659149bb376a9b54c04411aea Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 24 Jun 2025 15:21:07 -0600 Subject: [PATCH 08/23] Corrections to get past errors in ERP test --- cime_config/config_archive.xml | 12 ++++++++---- src/riverroute/mosart_histfile.F90 | 10 +++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml index ce663ae..5719cc4 100644 --- a/cime_config/config_archive.xml +++ b/cime_config/config_archive.xml @@ -2,7 +2,8 @@ r - rh\d* + rh\da + rh\di h\d*.*\.nc$ locfnh @@ -13,9 +14,12 @@ rpointer.rof rpointer.rof_9999 casename.mosart.r.1976-01-01-00000.nc - casename.mosart.rh4.1976-01-01-00000.nc - casename.mosart.h0.1976-01-01-00000.nc - casename.mosart.h0.1976-01-01-00000.nc.base + casename.mosart.rh4a.1976-01-01-00000.nc + casename.mosart.rh4i.1976-01-01-00000.nc + casename.mosart.h0a.1976-01-01-00000.nc + casename.mosart.h0i.1976-01-01-00000.nc + casename.mosart.h0a.1976-01-01-00000.nc.base + casename.mosart.h0i.1976-01-01-00000.nc.base diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index b81c06d..750bded 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1386,7 +1386,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_io('ncprec', tape(t)%ncprec, 'write', ncid_hist(t,f)) call ncd_io('begtime', tape(t)%begtime, 'write', ncid_hist(t,f)) fld_loop3: do fld = 1, tape(t)%nflds(f) - start(2) = f + start(2) = fld call ncd_io( name_desc, tape(t)%hlist(fld,f)%field%name, & 'write', ncid_hist(t,f), start ) call ncd_io( longname_desc, tape(t)%hlist(fld,f)%field%long_name, & @@ -1405,12 +1405,12 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) !================================================ call ncd_inqdlen(ncid,dimid,ntapes, name='ntapes') - call ncd_io('locfnh', locfnh_onfile, 'read', ncid ) - call ncd_io('locfnhr', locrest_onfile, 'read', ncid ) counter = 0 do t = 1,ntapes do f = 1, maxsplitfiles counter = counter + 1 + call ncd_io('locfnh', locfnh_onfile, 'read', ncid ) + call ncd_io('locfnhr', locrest_onfile, 'read', ncid ) call strip_null(locrest_onfile(counter)) call strip_null(locfnh_onfile(counter)) locrest(t,f) = locrest_onfile(counter) @@ -1429,7 +1429,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call getfil( locrest(t,f), locfnhr(t,f), 0 ) call ncd_pio_openfile (ncid_hist(t,f), trim(locfnhr(t,f)), ncd_nowrite) - if ( t == 1 )then + if ( t == 1 .and. f == 1 )then call ncd_inqdlen(ncid_hist(1,f),dimid,max_nflds,name='max_nflds') allocate(itemp(max_nflds)) end if @@ -1456,7 +1456,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) end do fld_loop4 fld_loop5: do fld=1,tape(t)%nflds(f) - start(2) = f + start(2) = fld call ncd_io( name_desc, tape(t)%hlist(fld,f)%field%name, & 'read', ncid_hist(t,f), start ) call ncd_io( longname_desc, tape(t)%hlist(fld,f)%field%long_name, & From 4626d0377ae20b55ed2cbc5b823957d85b9675ec Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 24 Jun 2025 19:28:16 -0600 Subject: [PATCH 09/23] Reorder more lines as in the equivalent clm code to move past failure --- src/riverroute/mosart_histfile.F90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 750bded..0176ff2 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1534,8 +1534,8 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Read history restart information if history files are not full tape_loop6: do t = 1,ntapes - if (.not. tape(t)%is_endhist) then - file_loop6: do f = 1, maxsplitfiles + file_loop6: do f = 1, maxsplitfiles + if (.not. tape(t)%is_endhist) then fld_loop7: do fld = 1, tape(t)%nflds(f) name = tape(t)%hlist(fld,f)%field%name name_acc = trim(name) // "_acc" @@ -1547,9 +1547,9 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_io(ncid=ncid_hist(t,f), flag='read', varname=trim(name_acc), & dim1name='allrof', data=nacs) end do fld_loop7 - end do file_loop6 - end if - call ncd_pio_closefile(ncid_hist(t,f)) + end if + call ncd_pio_closefile(ncid_hist(t,f)) + end do file_loop6 end do tape_loop6 end if From 119c0a6a3da9995c086c6980442cab410c77749f Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 26 Jun 2025 15:48:59 -0600 Subject: [PATCH 10/23] Revisions to config_archive.xml as recommended in code review --- cime_config/config_archive.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml index 5719cc4..7bddf21 100644 --- a/cime_config/config_archive.xml +++ b/cime_config/config_archive.xml @@ -12,7 +12,7 @@ rpointer.rof - rpointer.rof_9999 + rpointer.rof_9999.1976-01-01-00000 casename.mosart.r.1976-01-01-00000.nc casename.mosart.rh4a.1976-01-01-00000.nc casename.mosart.rh4i.1976-01-01-00000.nc From c98bc85b27dbb7c93833f9c88d5188f1b689d8f4 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 26 Jun 2025 15:50:20 -0600 Subject: [PATCH 11/23] Revisions to mosart_histfile.F90 as recommended in code review --- src/riverroute/mosart_histfile.F90 | 63 ++++++++++++++---------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 0176ff2..29ffde0 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1,11 +1,6 @@ module mosart_histfile ! Module containing methods to for MOSART history file handling. - ! TODO slevis: - ! Replaced all old f with fld? Search "do f " "(f" 'f)" ... - ! Added all the needed "do f = 1, maxsplitfiles"? Search "do t = " - ! Added new args to both sides of calls as needed? - ! Number loops as needed use shr_kind_mod, only : r8 => shr_kind_r8, CS => shr_kind_cs, CL => shr_kind_cl use shr_sys_mod, only : shr_sys_abort @@ -33,7 +28,7 @@ module mosart_histfile integer , public, parameter :: max_tapes = 3 ! max number of history tapes integer , public, parameter :: max_flds = 1500 ! max number of history fields integer , public, parameter :: max_namlen = CS ! maximum number of characters for field name - integer , private, parameter :: maxsplitfiles = 2 ! max number of files per tape + integer , private, parameter :: max_split_files = 2 ! max number of files per tape integer , private, parameter :: accumulated_file_index = 1 ! non-instantaneous file identifier integer , private, parameter :: instantaneous_file_index = 2 ! instantaneous file identifier @@ -109,7 +104,7 @@ module mosart_histfile type master_entry type (field_info) :: field ! field information - logical :: actflag(max_tapes, maxsplitfiles) ! active/inactive flag + logical :: actflag(max_tapes, max_split_files) ! active/inactive flag character(len=1) :: avgflag(max_tapes) ! time averaging flag ("X","A","M" or "I",) end type master_entry @@ -121,14 +116,14 @@ module mosart_histfile end type history_entry type history_tape - integer :: nflds(maxsplitfiles) ! number of active fields on tape - integer :: ntimes(maxsplitfiles) ! current number of time samples on tape + integer :: nflds(max_split_files) ! number of active fields on tape + integer :: ntimes(max_split_files) ! current number of time samples on tape integer :: mfilt ! maximum number of time samples per tape integer :: nhtfrq ! number of time samples per tape integer :: ncprec ! netcdf output precision logical :: is_endhist ! true => current time step is end of history interval real(r8) :: begtime ! time at beginning of history averaging interval - type (history_entry) :: hlist(max_flds, maxsplitfiles) ! array of active history tape entries + type (history_entry) :: hlist(max_flds, max_split_files) ! array of active history tape entries end type history_tape type mosart_pointer ! Pointer to real scalar data (1D) @@ -151,13 +146,13 @@ module mosart_histfile integer :: nfmaster = 0 ! number of fields in master field list ! Other variables - character(len=max_length_filename) :: locfnh(max_tapes, maxsplitfiles) ! local history file names - character(len=max_chars) :: locfnhr(max_tapes, maxsplitfiles) ! local history restart file names + character(len=max_length_filename) :: locfnh(max_tapes, max_split_files) ! local history file names + character(len=max_chars) :: locfnhr(max_tapes, max_split_files) ! local history restart file names logical :: htapes_defined = .false. ! flag indicates history contents have been defined ! NetCDF Id's - type(file_desc_t), target :: nfid(max_tapes, maxsplitfiles) ! file ids - type(file_desc_t), target :: ncid_hist(max_tapes, maxsplitfiles) ! file ids for history restart files + type(file_desc_t), target :: nfid(max_tapes, max_split_files) ! file ids + type(file_desc_t), target :: ncid_hist(max_tapes, max_split_files) ! file ids for history restart files integer :: time_dimid ! time dimension id integer :: nbnd_dimid ! time bounds dimension id integer :: strlen_dimid ! string dimension id @@ -335,7 +330,7 @@ subroutine htapes_fieldlist() ! Add the field to the tape if specified via namelist (FINCL[1-max_tapes]), ! or if it is on by default and was not excluded via namelist (FEXCL[1-max_tapes]). - file_loop1: do f = 1, maxsplitfiles + file_loop1: do f = 1, max_split_files fld_loop1: do fld = 1, nfmaster mastername = masterlist(fld)%field%name call list_index (fincl(1,t), mastername, ff) @@ -393,7 +388,7 @@ subroutine htapes_fieldlist() ntapes = 0 tape_loop3: do t = max_tapes,1,-1 - file_loop2: do f = 1, maxsplitfiles + file_loop2: do f = 1, max_split_files if (tape(t)%nflds(f) > 0) then ntapes = t exit @@ -406,7 +401,7 @@ subroutine htapes_fieldlist() ! Enabling holes should not be difficult if necessary. tape_loop4: do t = 1,ntapes - file_loop3: do f = 1, maxsplitfiles + file_loop3: do f = 1, max_split_files if (tape(t)%nflds(f) == 0) then write(iulog,*) trim(subname),' ERROR: Tape, file ', t, f, ' is empty' call shr_sys_abort() @@ -532,7 +527,7 @@ subroutine mosart_hist_UpdateHbuf() endr = ctl%endr tape_loop: do t = 1, ntapes - file_loop: do f = 1, maxsplitfiles + file_loop: do f = 1, max_split_files fld_loop: do fld = 1, tape(t)%nflds(f) avgflag = tape(t)%hlist(fld,f)%avgflag nacs => tape(t)%hlist(fld,f)%nacs @@ -962,7 +957,7 @@ subroutine mosart_hist_HtapesWrapup( rstwr, nlend ) ! Loop over active history tapes, create new history files if necessary ! and write data to history files if end of history interval. tape_loop1: do t = 1, ntapes - file_loop1: do f = 1, maxsplitfiles + file_loop1: do f = 1, max_split_files ! Determine if end of history interval tape(t)%is_endhist = .false. @@ -1085,7 +1080,7 @@ subroutine mosart_hist_HtapesWrapup( rstwr, nlend ) ! must reopen the files tape_loop2: do t = 1, ntapes - file_loop2: do f = 1, maxsplitfiles + file_loop2: do f = 1, max_split_files if (nlend) then if_close(t) = .true. else if (rstwr) then @@ -1149,9 +1144,9 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) character(len=max_chars) :: units ! units of variable character(len=max_chars) :: units_acc ! accumulator units character(len=max_chars) :: fname ! full name of history file - character(len=max_chars) :: locrest(max_tapes, maxsplitfiles) ! local history restart file names - character(len=max_chars) :: locrest_onfile(maxsplitfiles*max_tapes) ! local history restart file names, dims flipped - character(len=max_chars) :: locfnh_onfile(maxsplitfiles*max_tapes) ! local history file names, dims flipped + character(len=max_chars) :: locrest(max_tapes, max_split_files) ! local history restart file names + character(len=max_chars) :: locrest_onfile(max_split_files*max_tapes) ! local history restart file names, dims flipped + character(len=max_chars) :: locfnh_onfile(max_split_files*max_tapes) ! local history file names, dims flipped character(len=max_chars) :: my_locfnh ! temporary version of locfnh character(len=max_chars) :: my_locfnhr ! temporary version of locfnhr character(len=1) :: hnum ! history file index @@ -1206,16 +1201,16 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! call ncd_defdim( ncid, 'ntapes' , ntapes , dimid) call ncd_defdim( ncid, 'max_chars' , max_chars , dimid) - call ncd_defdim( ncid, 'ntapes_by_maxsplitfiles', ntapes * maxsplitfiles, dimid) + call ncd_defdim( ncid, 'ntapes_by_max_split_files', ntapes * max_split_files, dimid) call ncd_defvar(ncid=ncid, varname='locfnh', xtype=ncd_char, & long_name="History filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes_by_maxsplitfiles" ) + dim1name='max_chars', dim2name="ntapes_by_max_split_files" ) call ncd_defvar(ncid=ncid, varname='locfnhr', xtype=ncd_char, & long_name="Restart history filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes_by_maxsplitfiles" ) + dim1name='max_chars', dim2name="ntapes_by_max_split_files" ) ! max_nflds is the maximum number of fields on any tape ! max_flds is the maximum number possible number of fields @@ -1225,7 +1220,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! only read/write accumulators and counters if needed tape_loop1: do t = 1,ntapes - file_loop1: do f = 1, maxsplitfiles + file_loop1: do f = 1, max_split_files if (f == instantaneous_file_index) then file_index = 'i' ! instantaneous file_index else if (f == accumulated_file_index) then @@ -1338,7 +1333,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Add history filenames to master restart file counter = 0 tape_loop2: do t = 1, ntapes - file_loop2: do f = 1, maxsplitfiles + file_loop2: do f = 1, max_split_files counter = counter + 1 my_locfnh = locfnh(t,f) my_locfnhr = locfnhr(t,f) @@ -1363,7 +1358,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Add history namelist data to each history restart tape allocate(itemp(max_nflds)) tape_loop3: do t = 1,ntapes - file_loop3: do f = 1, maxsplitfiles + file_loop3: do f = 1, max_split_files call ncd_inqvid(ncid_hist(t,f), 'name', varid, name_desc) call ncd_inqvid(ncid_hist(t,f), 'long_name', varid, longname_desc) call ncd_inqvid(ncid_hist(t,f), 'units', varid, units_desc) @@ -1407,7 +1402,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) call ncd_inqdlen(ncid,dimid,ntapes, name='ntapes') counter = 0 do t = 1,ntapes - do f = 1, maxsplitfiles + do f = 1, max_split_files counter = counter + 1 call ncd_io('locfnh', locfnh_onfile, 'read', ncid ) call ncd_io('locfnhr', locrest_onfile, 'read', ncid ) @@ -1425,7 +1420,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) start(1)=1 tape_loop4: do t = 1,ntapes - file_loop4: do f = 1, maxsplitfiles + file_loop4: do f = 1, max_split_files call getfil( locrest(t,f), locfnhr(t,f), 0 ) call ncd_pio_openfile (ncid_hist(t,f), trim(locfnhr(t,f)), ncd_nowrite) @@ -1509,7 +1504,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) if (flag == 'write') then tape_loop5: do t = 1,ntapes - file_loop5: do f = 1, maxsplitfiles + file_loop5: do f = 1, max_split_files if (.not. tape(t)%is_endhist) then fld_loop6: do fld = 1, tape(t)%nflds(f) @@ -1534,7 +1529,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! Read history restart information if history files are not full tape_loop6: do t = 1,ntapes - file_loop6: do f = 1, maxsplitfiles + file_loop6: do f = 1, max_split_files if (.not. tape(t)%is_endhist) then fld_loop7: do fld = 1, tape(t)%nflds(f) name = tape(t)%hlist(fld,f)%field%name @@ -1569,7 +1564,7 @@ integer function max_nFields() max_nFields = 0 do t = 1,ntapes - do f = 1, maxsplitfiles + do f = 1, max_split_files max_nFields = max(max_nFields, tape(t)%nflds(f)) end do end do From 6fe0dbd7a5e22e8d4aa4d65761e3709830286b35 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 27 Jun 2025 18:33:22 -0600 Subject: [PATCH 12/23] Draft ChangeLog --- docs/ChangeLog.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index d0ff439..0966e53 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -1,3 +1,25 @@ +
+# Tag name: mosart1.1.09 +### Originator(s): slevis +### Date: Jun 30, 2025 +### One-line Summary: Separate instantaneous and non-inst. history files + +This is the mosart equivalent of ESCOMP/CTSM#2445. +Also includes the merge of #118, though this DART-related one-line update seems to have been present in master already. + +Contributors: Erik Kluzek, Kevin Raeder + +Fixes ESCOMP/MOSART#52 Separate instantaneous from non-inst. history tapes +Fixes ESCOMP/MOSART#116 Make st_archive handle output files from future MOSART+DART experiments + +Testing: standard testing + izumi ---- OK + derecho -- OK + +See https://github.com/ESCOMP/MOSART/pull/117 for more details +See https://github.com/ESCOMP/MOSART/pull/118 for more details +Contributes to https://github.com/ESCOMP/CTSM/pull/2445 +
# Tag name: mosart1.1.08 ### Originator(s): samrabin From 964ba053e895e9c6cbce4bc7a71bf4e6677e48db Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 30 Jun 2025 14:04:12 -0600 Subject: [PATCH 13/23] Minor update to comments for consistency with clm --- src/riverroute/mosart_histfile.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 29ffde0..2a56051 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -116,8 +116,8 @@ module mosart_histfile end type history_entry type history_tape - integer :: nflds(max_split_files) ! number of active fields on tape - integer :: ntimes(max_split_files) ! current number of time samples on tape + integer :: nflds(max_split_files) ! number of active fields on file + integer :: ntimes(max_split_files) ! current number of time samples on tape, same value on all max_split_files integer :: mfilt ! maximum number of time samples per tape integer :: nhtfrq ! number of time samples per tape integer :: ncprec ! netcdf output precision From 6c02c3b6b43c7974761ce8e25ad5cb5c70f272ca Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 30 Jun 2025 15:37:33 -0600 Subject: [PATCH 14/23] 2nd minor comment update for consistency with clm --- src/riverroute/mosart_histfile.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 2a56051..5121116 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1145,8 +1145,8 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) character(len=max_chars) :: units_acc ! accumulator units character(len=max_chars) :: fname ! full name of history file character(len=max_chars) :: locrest(max_tapes, max_split_files) ! local history restart file names - character(len=max_chars) :: locrest_onfile(max_split_files*max_tapes) ! local history restart file names, dims flipped - character(len=max_chars) :: locfnh_onfile(max_split_files*max_tapes) ! local history file names, dims flipped + character(len=max_chars) :: locrest_onfile(max_split_files*max_tapes) ! history restart file names on file + character(len=max_chars) :: locfnh_onfile(max_split_files*max_tapes) ! history file names on file character(len=max_chars) :: my_locfnh ! temporary version of locfnh character(len=max_chars) :: my_locfnhr ! temporary version of locfnhr character(len=1) :: hnum ! history file index From 4da916fd2453395a3f159b18ef653da8fa7da27c Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 30 Jun 2025 16:27:56 -0600 Subject: [PATCH 15/23] Improved error message to include file number --- src/riverroute/mosart_histfile.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 5121116..5f3b7e6 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1468,7 +1468,7 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) allocate (tape(t)%hlist(fld,f)%hbuf(begr:endr), & tape(t)%hlist(fld,f)%nacs(begr:endr), stat=status) if (status /= 0) then - write(iulog,*) trim(subname),' ERROR: allocation error for hbuf,nacs at t,f=',t,f + write(iulog,*) trim(subname),' ERROR: allocation error for hbuf,nacs at t,f,fld=',t,f,fld call shr_sys_abort() endif tape(t)%hlist(fld,f)%hbuf(:) = 0._r8 From a69db38b9ce8a37490ec7660df7a3b164b1110b8 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 14:41:05 -0600 Subject: [PATCH 16/23] Add test for the new "e" file type for DART --- cime_config/config_archive.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/config_archive.xml b/cime_config/config_archive.xml index 3e0e876..21fb586 100644 --- a/cime_config/config_archive.xml +++ b/cime_config/config_archive.xml @@ -19,6 +19,7 @@ casename.mosart.rh4i.1976-01-01-00000.nc casename.mosart.h0a.1976-01-01-00000.nc casename.mosart.h0i.1976-01-01-00000.nc + casename.mosart.e.1976-01-01-00000.nc casename.mosart.h0a.1976-01-01-00000.nc.base casename.mosart.h0i.1976-01-01-00000.nc.base From 55df48fbb2df872b5dcf4e975f40fb502ef13a1f Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 15:09:53 -0600 Subject: [PATCH 17/23] Remove confusing comment --- src/riverroute/mosart_histfile.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 5f3b7e6..edea761 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -117,7 +117,7 @@ module mosart_histfile type history_tape integer :: nflds(max_split_files) ! number of active fields on file - integer :: ntimes(max_split_files) ! current number of time samples on tape, same value on all max_split_files + integer :: ntimes(max_split_files) ! current number of time samples on tape integer :: mfilt ! maximum number of time samples per tape integer :: nhtfrq ! number of time samples per tape integer :: ncprec ! netcdf output precision From 9166556eca03d559ce47aa7beb9702e52ca4a162 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 15:19:18 -0600 Subject: [PATCH 18/23] Replace previously removed comment with a clearer comment --- src/riverroute/mosart_histfile.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index edea761..a9dc080 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -117,7 +117,7 @@ module mosart_histfile type history_tape integer :: nflds(max_split_files) ! number of active fields on file - integer :: ntimes(max_split_files) ! current number of time samples on tape + integer :: ntimes(max_split_files) ! current number of time samples on tape; although ntimes is an array, all its values are the same integer :: mfilt ! maximum number of time samples per tape integer :: nhtfrq ! number of time samples per tape integer :: ncprec ! netcdf output precision From e523cf878c374bfee06b27f3db2b5114a6a7fd5e Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 15:23:09 -0600 Subject: [PATCH 19/23] Change dim. ntapes_by_max_split_files to ntapes_multiply_by_max_split_files --- src/riverroute/mosart_histfile.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index a9dc080..5350ac6 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -1201,16 +1201,16 @@ subroutine mosart_hist_Restart (ncid, flag, rdate) ! call ncd_defdim( ncid, 'ntapes' , ntapes , dimid) call ncd_defdim( ncid, 'max_chars' , max_chars , dimid) - call ncd_defdim( ncid, 'ntapes_by_max_split_files', ntapes * max_split_files, dimid) + call ncd_defdim( ncid, 'ntapes_multiply_by_max_split_files', ntapes * max_split_files, dimid) call ncd_defvar(ncid=ncid, varname='locfnh', xtype=ncd_char, & long_name="History filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes_by_max_split_files" ) + dim1name='max_chars', dim2name="ntapes_multiply_by_max_split_files" ) call ncd_defvar(ncid=ncid, varname='locfnhr', xtype=ncd_char, & long_name="Restart history filename", & comment="This variable NOT needed for startup or branch simulations", & - dim1name='max_chars', dim2name="ntapes_by_max_split_files" ) + dim1name='max_chars', dim2name="ntapes_multiply_by_max_split_files" ) ! max_nflds is the maximum number of fields on any tape ! max_flds is the maximum number possible number of fields From 755bb99806bfc738d6a5addf95e86782ff99e71b Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 16:06:23 -0600 Subject: [PATCH 20/23] Correction motivated by corresponding clm commit a7fd23ca20e17a6abfc4b05d86a42bbe4adc9dd7 --- src/riverroute/mosart_histfile.F90 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 5350ac6..0ec9a87 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -338,7 +338,21 @@ subroutine htapes_fieldlist() ! if field is in include list, ff > 0 and htape_addfld ! will not be called for field avgflag = getflag (fincl(ff,t)) - call htape_addfld (t, f, fld, avgflag) + if (avgflag == ' ') then + avgflag = masterlist(fld)%avgflag(t) + end if + ! This if-statement is in a loop of f (instantaneous_ or + ! accumulated_file_index) so it matters whether f is one + ! or the other when going through here. Otherwise all fields + ! would end up on all files, which is not the intent. + if (f == instantaneous_file_index .and. avgflag == 'I') then + call htape_addfld (t, f, fld, avgflag) + else if (f == accumulated_file_index .and. avgflag /= 'I') then + call htape_addfld (t, f, fld, avgflag) + else if (f /= instantaneous_file_index .and. f /= accumulated_file_index) then + write(iulog,*) trim(subname),' ERROR: invalid f =', f, ' should be one of these values:', accumulated_file_index, instantaneous_file_index + call endrun(msg=errMsg(sourcefile, __LINE__)) + end if else ! find index of field in exclude list call list_index (fexcl(1,t), mastername, ff) From 7f6c882b3c6ec2e1e13f6f39706970afa956ec06 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 16:32:38 -0600 Subject: [PATCH 21/23] Add comment explaining the need for at least one 'I' field in MOSART --- src/riverroute/mosart_histflds.F90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/riverroute/mosart_histflds.F90 b/src/riverroute/mosart_histflds.F90 index b27126e..b1a9f54 100644 --- a/src/riverroute/mosart_histflds.F90 +++ b/src/riverroute/mosart_histflds.F90 @@ -138,6 +138,10 @@ subroutine mosart_histflds_init(begr, endr, ntracers) ptr_rof=h_qgwl(nt)%data, default='inactive') end do + ! RTM and MOSART (unlike the CLM) do not have the history_tape_in_use + ! capability, so both models throw an error when h0i is empty. For this + ! reason RTM and MOSART always need at least one instantaneous field so + ! that h0i will not be empty. call mosart_hist_addfld (fname='STORAGE_MCH', units='m3', & avgflag='I', long_name='MOSART main channelstorage', & ptr_rof=h_volr_mch, default='active') From b66043d2c99f086d5625371cd07716c30ac44922 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 17:11:35 -0600 Subject: [PATCH 22/23] Replace call endrun with call shr_sys_abort for code to work --- src/riverroute/mosart_histfile.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riverroute/mosart_histfile.F90 b/src/riverroute/mosart_histfile.F90 index 0ec9a87..8279e02 100644 --- a/src/riverroute/mosart_histfile.F90 +++ b/src/riverroute/mosart_histfile.F90 @@ -351,7 +351,7 @@ subroutine htapes_fieldlist() call htape_addfld (t, f, fld, avgflag) else if (f /= instantaneous_file_index .and. f /= accumulated_file_index) then write(iulog,*) trim(subname),' ERROR: invalid f =', f, ' should be one of these values:', accumulated_file_index, instantaneous_file_index - call endrun(msg=errMsg(sourcefile, __LINE__)) + call shr_sys_abort() end if else ! find index of field in exclude list From d9b2f9d4649c33e6c12b39a9db4b762a79e40c18 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Thu, 3 Jul 2025 18:17:05 -0600 Subject: [PATCH 23/23] Update ChangeLog --- docs/ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index 0966e53..5e5c036 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -1,7 +1,7 @@
# Tag name: mosart1.1.09 ### Originator(s): slevis -### Date: Jun 30, 2025 +### Date: Jul 03, 2025 ### One-line Summary: Separate instantaneous and non-inst. history files This is the mosart equivalent of ESCOMP/CTSM#2445.