NOAA-GFDL / icebergs

GFDL Climate Model Icebergs
Other
5 stars 19 forks source link

Dev master plus ice shelf changes #35

Closed sternalon closed 8 years ago

sternalon commented 8 years ago

The branch grid_plus_ice_shelf has been merged with the latest dev/master. There were a number of conflicts, which have been resolved. The code was quite messy after the conflicts, and it took some time to put it back together again, but hopefully it was all done properly.