merge latest master#3

Merged

DeniseWorthen merged 6 commits intoNOAA-EMC:masterfrom CICE-Consortium:master

Apr 2, 2020

+44-39

Commits on Mar 10, 2020

update cori port and update icepack (#416 )
apcraig
authored

Commits on Mar 13, 2020

update wave_spec_frac filename implementation and update icepack (#417 )
apcraig
authored

Commits on Mar 18, 2020

Commits on Mar 26, 2020

conda: Macros: add '-L' argument to the linker command (#418 )
phil-blain
authored

Commits on Mar 30, 2020

Update travis data download to zenodo, update conda macos Macros file CFLAGS_HOST (#424 )
apcraig
authored