From 21cd05d5091ca373510d99c943aa2ea950c68136 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 18 Oct 2018 16:34:09 -0600 Subject: [PATCH 1/4] Start ChangeLog documentation --- docs/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/ChangeLog b/docs/ChangeLog index 240dbce..4313d06 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,4 +1,35 @@ =============================================================== +Tag name: release-cesm2.0.03 +Originator(s): erik +Date: Oct 18, 2018 +One-line Summary: Remove ability to write out single-precision history because of issues + +Don't allow the namelist option rtmhist_ndens to be set to 2, because this +option doesn't currently function. The simple fix we put into place for it +is not robust, and doesn't show conversion issues as soon as possible. We +need to implement a solution that keeps history buffers at single precision +and converts the instantaneous double precision data as it goes. + +MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes) + +Issues Fixed: #10 + #18 -- rtmhist_ndens=2 does NOT work (so don't allow it as an option) + +Science changes since: release-cesm2.0.01 + * None +Software changes since: release-cesm2.0.01 + * None + +Testing: Run mosart test suite + hobart ---- PASS + cheyenne -- PASS + +Pull Requests that document the changes (include PR ids): + + #19 -- Don't allow single precision history output + +Testing: +=============================================================== Tag name: release-cesm2.0.02 Originator(s): erik/billsacks Date: Oct 12, 2018 @@ -34,6 +65,9 @@ is direct from jedwards4b (other than r8th addition). MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes) +Issues Fixed: #18 + #18 -- rtmhist_ndens=2 does NOT work (simplest fix that converts to single on output) + Science changes since: release-cesm2.0.00 Added in 8th degree routing file (r8th) Software changes since: release-cesm2.0.00 From b08f5482cfd6b257ea73eb452bcad5eaa7e99e59 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 18 Oct 2018 16:51:49 -0600 Subject: [PATCH 2/4] Add changes so that single precision history output is not an option --- cime_config/namelist_definition_mosart.xml | 6 +++--- src/riverroute/RtmHistFile.F90 | 2 +- src/riverroute/RtmIO.F90 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cime_config/namelist_definition_mosart.xml b/cime_config/namelist_definition_mosart.xml index d10f7d1..00b3deb 100644 --- a/cime_config/namelist_definition_mosart.xml +++ b/cime_config/namelist_definition_mosart.xml @@ -261,13 +261,13 @@ integer(6) history mosart_inparm - 1,2 + 1 - 2 + 1 Per tape series history file density (i.e. output precision) - 1=double precision, 2=single precision + 1=double precision, 2=single precision (NOT working) diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90 index 9f0ad69..7a3ba55 100644 --- a/src/riverroute/RtmHistFile.F90 +++ b/src/riverroute/RtmHistFile.F90 @@ -42,7 +42,7 @@ module RtmHistFile ! integer :: ni integer, public :: & - rtmhist_ndens(max_tapes) = 2 ! namelist: output density of netcdf history files + rtmhist_ndens(max_tapes) = 1 ! namelist: output density of netcdf history files integer, public :: & rtmhist_mfilt(max_tapes) = 30 ! namelist: number of time samples per tape integer, public :: & diff --git a/src/riverroute/RtmIO.F90 b/src/riverroute/RtmIO.F90 index 6bfae8c..18be51b 100644 --- a/src/riverroute/RtmIO.F90 +++ b/src/riverroute/RtmIO.F90 @@ -1827,7 +1827,7 @@ subroutine ncd_io_real_var1(varname, data, dim1name, & call pio_setframe(ncid,vardesc, int(nt,kind=PIO_Offset_kind)) end if if(xtype == ncd_float) then - call pio_write_darray(ncid, vardesc, iodesc_plus%iodesc, real(data, kind=r4), status, fillval=real(spval,kind=r4)) + call shr_sys_abort( subname//' error: Attempt to write out single-precision data which is current NOT implemented (see issue #18)' ) else call pio_write_darray(ncid, vardesc, iodesc_plus%iodesc, data, status, fillval=spval) endif From fd7e0817707e02835b8652cae69d6baafdcb857a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 19 Oct 2018 13:47:44 -0600 Subject: [PATCH 3/4] Update ChangeLog --- docs/ChangeLog | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/ChangeLog b/docs/ChangeLog index 4313d06..13a9b71 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,14 +1,12 @@ =============================================================== Tag name: release-cesm2.0.03 Originator(s): erik -Date: Oct 18, 2018 +Date: Oct 19, 2018 One-line Summary: Remove ability to write out single-precision history because of issues Don't allow the namelist option rtmhist_ndens to be set to 2, because this option doesn't currently function. The simple fix we put into place for it -is not robust, and doesn't show conversion issues as soon as possible. We -need to implement a solution that keeps history buffers at single precision -and converts the instantaneous double precision data as it goes. +is not robust. MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes) @@ -28,11 +26,10 @@ Pull Requests that document the changes (include PR ids): #19 -- Don't allow single precision history output -Testing: =============================================================== Tag name: release-cesm2.0.02 Originator(s): erik/billsacks -Date: Oct 12, 2018 +Date: Oct 16, 2018 One-line Summary: Fix for py3 MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes) @@ -49,7 +46,9 @@ Pull Requests that document the changes (include PR ids): #17 -- Changes to fix #10, where an integer divide needs the floor operator -Testing: +Testing: Run mosart test suite + hobart ---- PASS + cheyenne -- PASS =============================================================== Tag name: release-cesm2.0.01 From f762f221a5aa98d7ca460c50616d98f6f89f266f Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 19 Oct 2018 13:50:59 -0600 Subject: [PATCH 4/4] Update changelog --- docs/ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/ChangeLog b/docs/ChangeLog index 13a9b71..d80f761 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -32,6 +32,8 @@ Originator(s): erik/billsacks Date: Oct 16, 2018 One-line Summary: Fix for py3 +Fix for python3, using the floor operator for integer division. + MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes) Issues Fixed: #10