search

CESM-Development / cime

Common Infrastructure for Modeling the Earth
Other
16 stars 13 forks source link

Jet/ebm liqice maps #477

Closed jtruesdal closed 7 years ago

jtruesdal commented 7 years ago

Allow separate mapping files for ice and liquid runoff to ocean. The code is set up to be backward compatible and uses the same default mapping file for both. A different mapping file for liquid is used by the Estuary Box Model.

Test suite: cime pre-alpha Test baseline: cecm1_5_beta07 Test namelist changes: rof2ocn_rmapname and rof2ocn_rmaptype have been split into

rof2ocn_ice_rmapname rof2ocn_ice_rmaptype rof2ocn_liq_rmapname rof2ocn_liq_rmaptype

Test status: [bit for bit, roundoff, climate changing] BFB but namelist comparision tests will fail

Fixes [CIME Github issue #]

User interface changes?:

Code review: Jim please.

jtruesdal commented 7 years ago

Sorry. Just noticed that there are conflicts. I will hand merge the mods. Next time I'll do that first before the PR.

gold2718 commented 7 years ago

You can fix the conflicts (perhaps by rebasing your branch) and push the changes back to your branch. That will automatically update this pull request.

jtruesdal commented 7 years ago

Thanks Steve. I followed the command line options

git checkout -b jtruesdal-jet/ebm_liqice_maps master git pull git://github.com/jtruesdal/cime.git jet/ebm_liqice_maps git checkout master git merge --no-ff jtruesdal-jet/ebm_liqice_maps

and it seemed to merge OK without any conflicts in the files it mentioned before. Is that normal. I assumed it would give me the same conflicts it listed originally.

jt