Skip to content

Commit f246b44

Browse files
authored
Merge pull request #19 from ekluzek/nosinglprechist
Don't allow single precision history output
2 parents d65c426 + f762f22 commit f246b44

File tree

4 files changed

+42
-7
lines changed

4 files changed

+42
-7
lines changed

cime_config/namelist_definition_mosart.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,13 @@
261261
<type>integer(6)</type>
262262
<category>history</category>
263263
<group>mosart_inparm</group>
264-
<valid_values>1,2</valid_values>
264+
<valid_values>1</valid_values>
265265
<values>
266-
<value>2</value>
266+
<value>1</value>
267267
</values>
268268
<desc>
269269
Per tape series history file density (i.e. output precision)
270-
1=double precision, 2=single precision
270+
1=double precision, 2=single precision (NOT working)
271271
</desc>
272272
</entry>
273273

docs/ChangeLog

+37-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,39 @@
1+
===============================================================
2+
Tag name: release-cesm2.0.03
3+
Originator(s): erik
4+
Date: Oct 19, 2018
5+
One-line Summary: Remove ability to write out single-precision history because of issues
6+
7+
Don't allow the namelist option rtmhist_ndens to be set to 2, because this
8+
option doesn't currently function. The simple fix we put into place for it
9+
is not robust.
10+
11+
MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes)
12+
13+
Issues Fixed: #10
14+
#18 -- rtmhist_ndens=2 does NOT work (so don't allow it as an option)
15+
16+
Science changes since: release-cesm2.0.01
17+
* None
18+
Software changes since: release-cesm2.0.01
19+
* None
20+
21+
Testing: Run mosart test suite
22+
hobart ---- PASS
23+
cheyenne -- PASS
24+
25+
Pull Requests that document the changes (include PR ids):
26+
27+
#19 -- Don't allow single precision history output
28+
129
===============================================================
230
Tag name: release-cesm2.0.02
331
Originator(s): erik/billsacks
4-
Date: Oct 12, 2018
32+
Date: Oct 16, 2018
533
One-line Summary: Fix for py3
634

35+
Fix for python3, using the floor operator for integer division.
36+
737
MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes)
838

939
Issues Fixed: #10
@@ -18,7 +48,9 @@ Pull Requests that document the changes (include PR ids):
1848

1949
#17 -- Changes to fix #10, where an integer divide needs the floor operator
2050

21-
Testing:
51+
Testing: Run mosart test suite
52+
hobart ---- PASS
53+
cheyenne -- PASS
2254

2355
===============================================================
2456
Tag name: release-cesm2.0.01
@@ -34,6 +66,9 @@ is direct from jedwards4b (other than r8th addition).
3466

3567
MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes)
3668

69+
Issues Fixed: #18
70+
#18 -- rtmhist_ndens=2 does NOT work (simplest fix that converts to single on output)
71+
3772
Science changes since: release-cesm2.0.00
3873
Added in 8th degree routing file (r8th)
3974
Software changes since: release-cesm2.0.00

src/riverroute/RtmHistFile.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module RtmHistFile
4242
!
4343
integer :: ni
4444
integer, public :: &
45-
rtmhist_ndens(max_tapes) = 2 ! namelist: output density of netcdf history files
45+
rtmhist_ndens(max_tapes) = 1 ! namelist: output density of netcdf history files
4646
integer, public :: &
4747
rtmhist_mfilt(max_tapes) = 30 ! namelist: number of time samples per tape
4848
integer, public :: &

src/riverroute/RtmIO.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,7 @@ subroutine ncd_io_real_var1(varname, data, dim1name, &
18271827
call pio_setframe(ncid,vardesc, int(nt,kind=PIO_Offset_kind))
18281828
end if
18291829
if(xtype == ncd_float) then
1830-
call pio_write_darray(ncid, vardesc, iodesc_plus%iodesc, real(data, kind=r4), status, fillval=real(spval,kind=r4))
1830+
call shr_sys_abort( subname//' error: Attempt to write out single-precision data which is current NOT implemented (see issue #18)' )
18311831
else
18321832
call pio_write_darray(ncid, vardesc, iodesc_plus%iodesc, data, status, fillval=spval)
18331833
endif

0 commit comments

Comments
 (0)