fix merge

CICE-Consortium · Nov 5, 2024 · bdce487 · bdce487
1 parent 1ad0c4c
commit bdce487
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
+82 −58		columnphysics/icepack_fsd.F90
+5 −2		columnphysics/icepack_intfc.F90
+24 −15		columnphysics/icepack_itd.F90
+29 −5		columnphysics/icepack_mechred.F90
+4 −4		columnphysics/icepack_parameters.F90
+172 −262		columnphysics/icepack_therm_itd.F90
+25 −17		columnphysics/icepack_therm_shared.F90
+97 −25		columnphysics/icepack_therm_vertical.F90
+6 −13		columnphysics/icepack_wavefracspec.F90
+24 −28		configuration/driver/icedrv_InitMod.F90
+5 −12		configuration/driver/icedrv_arrays_column.F90
+1 −2		configuration/driver/icedrv_flux.F90
+1 −0		configuration/driver/icedrv_forcing.F90
+8 −16		configuration/driver/icedrv_init.F90
+2 −2		configuration/driver/icedrv_init_column.F90
+19 −17		configuration/driver/icedrv_restart.F90
+5 −10		configuration/driver/icedrv_state.F90
+30 −32		configuration/driver/icedrv_step.F90
+1 −1		configuration/scripts/icepack.batch.csh
+2 −1		configuration/scripts/machines/Macros.derecho_cray
+3 −2		configuration/scripts/machines/Macros.derecho_inteloneapi
+5 −5		configuration/scripts/machines/env.derecho_cray
+1 −1		configuration/scripts/machines/env.derecho_gnu
+5 −5		configuration/scripts/machines/env.derecho_intel
+1 −1		configuration/scripts/machines/env.derecho_intelclassic
+5 −5		configuration/scripts/machines/env.derecho_inteloneapi
+5 −5		configuration/scripts/machines/env.derecho_nvhpc
+1 −0		configuration/scripts/options/set_nml.swccsm3
+1 −1		doc/source/icepack_index.rst
+446 −369		doc/source/user_guide/interfaces.include