From ac0f75e4ded4b01c886482117d2dc76c11d4fb45 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 10 Jul 2023 13:25:16 -0600 Subject: [PATCH 1/5] Rename dimension hist_interval to nbnd. Also renamed related dimid variable. --- src/riverroute/RtmHistFile.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index cfd190e..b03ad25 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -176,7 +176,7 @@ module RtmHistFile 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 integer :: time_dimid ! time dimension id - integer :: hist_interval_dimid ! time bounds dimension id + integer :: nbnd_dimid ! time bounds dimension id integer :: strlen_dimid ! string dimension id !----------------------------------------------------------------------- @@ -748,7 +748,7 @@ subroutine htape_create (t, histrest) call ncd_defdim(lnfid, 'string_length', 8, strlen_dimid) if ( .not. lhistrest )then - call ncd_defdim(lnfid, 'hist_interval', 2, hist_interval_dimid) + call ncd_defdim(lnfid, 'nbnd', 2, nbnd_dimid) call ncd_defdim(lnfid, 'time', ncd_unlimited, time_dimid) if (masterproc)then write(iulog,*) trim(subname), & @@ -847,7 +847,7 @@ subroutine htape_timeconst(t, mode) call ncd_defvar(nfid(t) , 'nstep' , ncd_int, 1, dim1id , varid, & long_name = 'time step') - dim2id(1) = hist_interval_dimid; dim2id(2) = time_dimid + dim2id(1) = nbnd_dimid; dim2id(2) = time_dimid call ncd_defvar(nfid(t), 'time_bounds', ncd_double, 2, dim2id, varid, & long_name = 'history time interval endpoints') From 3bfc8bf0c7b49ce769c7a1893cfc3a474ea12d8f Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 10 Jul 2023 13:29:26 -0600 Subject: [PATCH 2/5] Add units to time_bounds. --- src/riverroute/RtmHistFile.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index b03ad25..45fe04e 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -849,7 +849,8 @@ subroutine htape_timeconst(t, mode) dim2id(1) = nbnd_dimid; dim2id(2) = time_dimid call ncd_defvar(nfid(t), 'time_bounds', ncd_double, 2, dim2id, varid, & - long_name = 'history time interval endpoints') + long_name = 'history time interval endpoints', & + units=str) dim2id(1) = strlen_dimid; dim2id(2) = time_dimid call ncd_defvar(nfid(t), 'date_written', ncd_char, 2, dim2id, varid) From 79f1088177e95c2d34c100afc71d2b33501ac167 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 10 Jul 2023 13:30:19 -0600 Subject: [PATCH 3/5] Standardize time_bounds long_name. --- src/riverroute/RtmHistFile.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index 45fe04e..42d7d76 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -849,7 +849,7 @@ subroutine htape_timeconst(t, mode) dim2id(1) = nbnd_dimid; dim2id(2) = time_dimid call ncd_defvar(nfid(t), 'time_bounds', ncd_double, 2, dim2id, varid, & - long_name = 'history time interval endpoints', & + long_name = 'time interval endpoints', & units=str) dim2id(1) = strlen_dimid; dim2id(2) = time_dimid From adbdcb50addcba657de6846623ca84e29c1a8e8a Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Mon, 10 Jul 2023 13:33:18 -0600 Subject: [PATCH 4/5] Add calendar to time_bounds. --- src/riverroute/RtmHistFile.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index 42d7d76..4db6545 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -851,6 +851,7 @@ subroutine htape_timeconst(t, mode) call ncd_defvar(nfid(t), 'time_bounds', ncd_double, 2, dim2id, varid, & long_name = 'time interval endpoints', & units=str) + call ncd_putatt(nfid(t), varid, 'calendar', caldesc) dim2id(1) = strlen_dimid; dim2id(2) = time_dimid call ncd_defvar(nfid(t), 'date_written', ncd_char, 2, dim2id, varid) From 87f09b6a7c508500574271f2bdb8a31bf1f148fc Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Tue, 11 Jul 2023 14:15:32 -0600 Subject: [PATCH 5/5] Add calendar attribute to mcdate, mcsec, mdcur, and mscur. --- src/riverroute/RtmHistFile.F90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index 4db6545..0b982af 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -838,12 +838,16 @@ subroutine htape_timeconst(t, mode) dim1id(1) = time_dimid call ncd_defvar(nfid(t) , 'mcdate', ncd_int, 1, dim1id , varid, & long_name = 'current date (YYYYMMDD)') + call ncd_putatt(nfid(t), varid, 'calendar', caldesc) call ncd_defvar(nfid(t) , 'mcsec' , ncd_int, 1, dim1id , varid, & long_name = 'current seconds of current date', units='s') + call ncd_putatt(nfid(t), varid, 'calendar', caldesc) call ncd_defvar(nfid(t) , 'mdcur' , ncd_int, 1, dim1id , varid, & long_name = 'current day (from base day)') + call ncd_putatt(nfid(t), varid, 'calendar', caldesc) call ncd_defvar(nfid(t) , 'mscur' , ncd_int, 1, dim1id , varid, & long_name = 'current seconds of current day') + call ncd_putatt(nfid(t), varid, 'calendar', caldesc) call ncd_defvar(nfid(t) , 'nstep' , ncd_int, 1, dim1id , varid, & long_name = 'time step')