Merge changes from main#6

Merged

TillRasmussen merged 33 commits intoTillRasmussen:masterfrom CICE-Consortium:master

Apr 10, 2020

+2,035-1,894

Commits on Jan 1, 2020

fixing bulletin board link (#391 )

duvivier
authored and
apcraig
committed

Commits on Jan 17, 2020

Macros fixes and diag_type fix (#396 )
apcraig
authored

Commits on Jan 24, 2020

fsd2 (#394 )

authored and
apcraig
committed
Add conda environment to run on personal computers (#393 )

phil-blain
authored and
apcraig
committed

Commits on Jan 30, 2020

cleaning up minor documentation (#397 )
duvivier
authored

Commits on Feb 5, 2020

machines: conda: fix linux env to be in line with the doc (#400 )
phil-blain
authored

Commits on Feb 7, 2020

Commits on Feb 14, 2020

update suite.submit script and add new controls and cice.setup option… (#395 )
apcraig
authored

Commits on Feb 18, 2020

Fix errors in cice.setup script and add travis tests to catch this sooner (#406 )
apcraig
authored

Commits on Feb 21, 2020

update copyright year, update internal version number in preparation for minor release, update icepack (#409 )
apcraig
authored

Commits on Feb 26, 2020

Add additional basal stress parameters to the dynamics namelist (#404 )
daveh150
authored

Commits on Feb 28, 2020

Commits on Mar 6, 2020

fix albedo initialization order of operations and update icepack (#414 )
apcraig
authored

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

Commits on Apr 8, 2020

Isotopes for CICE (#423 )

authored