Skip to content

Commit

Permalink
Merge branch 'mark-petersen/update_mpas_171006' (PR #1823)
Browse files Browse the repository at this point in the history
Correct ocean/ice output settings and surface forcing

This PR updates the MPAS framework and corrects the use of mpas_forcing in
all components. It also updates output settings for all MPAS components.

* Changes in MPAS and ACME for G case salinity restoring which is now
  bit-restartable and bfb across different partitions. It is set on
  by default for G-cases with resolutions that have the required restoring data
  files.
* Stop writing sea ice time series stats restart files (see 1777)
* Change high frequency streams variables (for movies). We currently record many
  unneeded variables for debugging that are also recorded in the monthly history
  files.
* White space clean up in buildnml
* MPAS timer integer division was changed from I4 to I8 so that clock can run
  past 34 years (counted in seconds).

Tested with:
* PET_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu
* PEM_Ln9.ne30_oECv3_ICG.A_WCYCL1850S.cori-knl_gnu
* PET_Ln9.T62_oQU240.GMPAS-IAF.cori-knl_intel
* PET_Ln9.T62_oQU240.GMPAS-IAF.cori-knl_gnu
* ERS_P480.T62_oEC60to30v3.GMPAS-NYF.edison_gnu (with restoring on)
* PET_Ln9_P240.T62_oEC60to30v3.GMPAS-NYF.edison_intel (with restoring on)
* PEM_Ln9_P480.T62_oEC60to30v3.GMPAS-NYF.edison_intel (with restoring on)

[NML]
[BFB]
  • Loading branch information
jonbob committed Oct 20, 2017
2 parents d36367c + ff3ddf5 commit c117132
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit c117132

Please sign in to comment.