Skip to content

Commit

Permalink
Merge pull request ESCOMP#17 from ekluzek/py3floorfix
Browse files Browse the repository at this point in the history
Changes to fix #10, where an integer divide needs the floor operator
  • Loading branch information
ekluzek authored Oct 16, 2018
2 parents 5557d66 + 85b4540 commit d65c426
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
expect(False, "mosart_ncpl %s doesn't divide evenly into basedt %s\n"
%(mosart_ncpl, basedt))
else:
coupling_period = basedt / mosart_ncpl
coupling_period = basedt // mosart_ncpl
nmlgen.set_value("coupling_period", value=coupling_period)

#----------------------------------------------------
Expand Down
25 changes: 24 additions & 1 deletion docs/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
===============================================================
Tag name: release-cesm2.0.02
Originator(s): erik/billsacks
Date: Oct 12, 2018
One-line Summary: Fix for py3

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

Issues Fixed: #10
#10 -- With python3, coupling_period is real rather than int

Science changes since: release-cesm2.0.01
* None
Software changes since: release-cesm2.0.01
* None

Pull Requests that document the changes (include PR ids):

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

Testing:

===============================================================
Tag name: release-cesm2.0.01
Originator(s): erik/jedwards4b
Expand All @@ -10,7 +32,7 @@ kind rather than real(4), which is a better mechanism. Also ncd_getiodesc
will read in PIO_DOUBLE for input xtype= PIO_DOUBLE or PIO_REAL. Most of this
is direct from jedwards4b (other than r8th addition).

MOSART Master Tag This Corresponds To: Identical to mosart1_0_31
MOSART Master Tag This Corresponds To: mosart1_0_31 (with changes)

Science changes since: release-cesm2.0.00
Added in 8th degree routing file (r8th)
Expand All @@ -19,6 +41,7 @@ Software changes since: release-cesm2.0.00
Corrects the integer fill value. Needed for pio2.

Pull Requests that document the changes (include PR ids):
Testing:

#15 -- Bring in changes for xlf compiler, pio, and python3 update
(#13 and #6 moved to release-cesm2.0)
Expand Down

0 comments on commit d65c426

Please sign in to comment.