Merge branch 'matthewhoffman/mpas/cice_restart_and_timekeeping_bugfix…

…es' into next (PR #1074) This merge fixes two MPAS component bugs: Fixes #1070 : MPAS timekeeping bug causes fatal errors Fixes #1071 : MPAS-CICE fails to restart using compset A_WCYCL2000S All three MPAS components have been updated because changes to MPAS framework were required. [BFB] * matthewhoffman/mpas/cice_restart_and_timekeeping_bugfixes: Fix MPAS timekeeping bug in all 3 MPAS components Bugfix for MPAS-CICE restarts
E3SM-Project · Sep 22, 2016 · fe29e0a · fe29e0a
2 parents d7f9a2b + f7607f5
commit fe29e0a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/mpas-cice/model b/components/mpas-cice/model
diff --git a/components/mpas-o/model b/components/mpas-o/model
diff --git a/components/mpasli/model b/components/mpasli/model