diff --git a/cicecore/cicedyn/general/ice_init.F90 b/cicecore/cicedyn/general/ice_init.F90 index f74edc88b..5cbaedcb6 100644 --- a/cicecore/cicedyn/general/ice_init.F90 +++ b/cicecore/cicedyn/general/ice_init.F90 @@ -1267,6 +1267,7 @@ subroutine input_data endif abort_list = trim(abort_list)//":1" endif + if (history_format /= 'cdf1' .and. & history_format /= 'cdf2' .and. & history_format /= 'cdf5' .and. & diff --git a/icepack b/icepack index 05ac0ec3e..286630fde 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 05ac0ec3ea666080eed36e67f6cf8ce1255b243f +Subproject commit 286630fdecc8efc4dcf4bd7ecf2315101c69c391