Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update CICE with latest consortium/main #1562

Merged
merged 18 commits into from
Jan 23, 2023
Merged

update CICE with latest consortium/main #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8c0b608
hera.intel testing shows
DeniseWorthen Jan 6, 2023
3619de3
confirm cice testb16d7fd is b4b for all datm/cpld tests
DeniseWorthen Jan 9, 2023
11016e4
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 9, 2023
a8cacb3
update CICE
DeniseWorthen Jan 9, 2023
4eaf074
fix alignments in rt.conf, rt_gnu.conf
DeniseWorthen Jan 10, 2023
32d5ff2
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 12, 2023
adc486b
update CICE (no code changes)
DeniseWorthen Jan 17, 2023
d3b2469
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 17, 2023
45c851b
Merge branch 'ufs-community:develop' into feature/updcice
DeniseWorthen Jan 20, 2023
742f77c
add new BL_DATE
jkbk2004 Jan 20, 2023
c867e50
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Jan 20, 2023
45130a8
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Jan 20, 2023
0e5d6a0
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Jan 20, 2023
5e3fefb
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Jan 21, 2023
9fbf65a
Acorn Intel RT Log
BrianCurtis-NOAA Jan 21, 2023
eba063d
add cheyenne intel.gnu RT logs: passed
jkbk2004 Jan 22, 2023
e8227ed
add gaea.intel RT log: passed
jkbk2004 Jan 22, 2023
e5c62f7
update CICE and revert gitmodules
DeniseWorthen Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 93 files
+14 −0 .github/workflows/test-cice.yml
+16 −1 cice.setup
+37 −8 cicecore/cicedyn/analysis/ice_diagnostics.F90
+0 −0 cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+48 −17 cicecore/cicedyn/analysis/ice_history.F90
+25 −6 cicecore/cicedyn/analysis/ice_history_bgc.F90
+24 −6 cicecore/cicedyn/analysis/ice_history_drag.F90
+24 −6 cicecore/cicedyn/analysis/ice_history_fsd.F90
+24 −6 cicecore/cicedyn/analysis/ice_history_mechred.F90
+27 −9 cicecore/cicedyn/analysis/ice_history_pond.F90
+1 −1 cicecore/cicedyn/analysis/ice_history_shared.F90
+27 −7 cicecore/cicedyn/analysis/ice_history_snow.F90
+51 −78 cicecore/cicedyn/dynamics/ice_dyn_eap.F90
+347 −270 cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+1 −1 cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
+24 −21 cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+8 −12 cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+0 −0 cicecore/cicedyn/dynamics/ice_transport_driver.F90
+0 −0 cicecore/cicedyn/dynamics/ice_transport_remap.F90
+0 −0 cicecore/cicedyn/general/ice_flux.F90
+0 −0 cicecore/cicedyn/general/ice_flux_bgc.F90
+8 −8 cicecore/cicedyn/general/ice_forcing.F90
+0 −0 cicecore/cicedyn/general/ice_forcing_bgc.F90
+193 −78 cicecore/cicedyn/general/ice_init.F90
+0 −0 cicecore/cicedyn/general/ice_state.F90
+0 −0 cicecore/cicedyn/general/ice_step_mod.F90
+0 −3 cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90
+0 −3 cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_broadcast.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_communicate.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_reprosum.F90
+0 −0 cicecore/cicedyn/infrastructure/comm/serial/ice_timers.F90
+0 −0 cicecore/cicedyn/infrastructure/ice_blocks.F90
+25 −9 cicecore/cicedyn/infrastructure/ice_domain.F90
+55 −54 cicecore/cicedyn/infrastructure/ice_grid.F90
+0 −0 cicecore/cicedyn/infrastructure/ice_memusage.F90
+1 −1 cicecore/cicedyn/infrastructure/ice_memusage_gptl.c
+0 −0 cicecore/cicedyn/infrastructure/ice_read_write.F90
+91 −65 cicecore/cicedyn/infrastructure/ice_restart_driver.F90
+0 −0 cicecore/cicedyn/infrastructure/ice_restoring.F90
+0 −0 cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c
+0 −0 cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+0 −0 cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+0 −0 cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+0 −0 cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+0 −0 cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+0 −0 cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+2 −13 cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+1 −0 cicecore/cicedynB
+7 −7 cicecore/drivers/direct/hadgem3/CICE_InitMod.F90
+7 −7 cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90
+6 −6 cicecore/drivers/mct/cesm1/CICE_InitMod.F90
+6 −7 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+3 −3 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+2 −2 cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+21 −10 cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+6 −6 cicecore/drivers/standalone/cice/CICE_InitMod.F90
+6 −6 cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+7 −6 cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+62 −2 cicecore/shared/ice_fileunits.F90
+9 −0 cicecore/shared/ice_init_column.F90
+1 −1 cicecore/version.txt
+6 −6 configuration/scripts/cice.build
+2 −0 configuration/scripts/ice_in
+1 −0 configuration/scripts/options/set_nml.dyneap
+2 −0 configuration/scripts/options/set_nml.saltflux
+1 −2 configuration/scripts/tests/base_suite.ts
+2 −0 configuration/scripts/tests/decomp_suite.ts
+14 −1 configuration/scripts/tests/first_suite.ts
+7 −6 configuration/scripts/tests/gridsys_suite.ts
+58 −54 configuration/scripts/tests/omp_suite.ts
+16 −17 configuration/scripts/tests/perf_suite.ts
+2 −1 doc/source/cice_index.rst
+2 −2 doc/source/conf.py
+11 −11 doc/source/developer_guide/dg_dynamics.rst
+1 −1 doc/source/developer_guide/dg_forcing.rst
+6 −3 doc/source/science_guide/sg_horiztrans.rst
+1 −1 doc/source/science_guide/sg_tracers.rst
+12 −9 doc/source/user_guide/ug_case_settings.rst
+1 −1 doc/source/user_guide/ug_implementation.rst
+63 −20 doc/source/user_guide/ug_testing.rst
+20 −0 doc/source/user_guide/ug_troubleshooting.rst
+1 −1 icepack
112 changes: 56 additions & 56 deletions CICE-interface/cice_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,44 @@ list(APPEND cice_shared_files
CICE/cicecore/shared/ice_spacecurve.F90

#Analysis List:
CICE/cicecore/cicedynB/analysis/ice_diagnostics.F90
CICE/cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
CICE/cicecore/cicedynB/analysis/ice_history.F90
CICE/cicecore/cicedynB/analysis/ice_history_bgc.F90
CICE/cicecore/cicedynB/analysis/ice_history_drag.F90
CICE/cicecore/cicedynB/analysis/ice_history_fsd.F90
CICE/cicecore/cicedynB/analysis/ice_history_mechred.F90
CICE/cicecore/cicedynB/analysis/ice_history_pond.F90
CICE/cicecore/cicedynB/analysis/ice_history_shared.F90
CICE/cicecore/cicedynB/analysis/ice_history_snow.F90
CICE/cicecore/cicedyn/analysis/ice_diagnostics.F90
CICE/cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
CICE/cicecore/cicedyn/analysis/ice_history.F90
CICE/cicecore/cicedyn/analysis/ice_history_bgc.F90
CICE/cicecore/cicedyn/analysis/ice_history_drag.F90
CICE/cicecore/cicedyn/analysis/ice_history_fsd.F90
CICE/cicecore/cicedyn/analysis/ice_history_mechred.F90
CICE/cicecore/cicedyn/analysis/ice_history_pond.F90
CICE/cicecore/cicedyn/analysis/ice_history_shared.F90
CICE/cicecore/cicedyn/analysis/ice_history_snow.F90

#Dynamics List:
CICE/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedynB/dynamics/ice_transport_driver.F90
CICE/cicecore/cicedynB/dynamics/ice_transport_remap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_remap.F90

#General List:
CICE/cicecore/cicedynB/general/ice_flux.F90
CICE/cicecore/cicedynB/general/ice_flux_bgc.F90
CICE/cicecore/cicedynB/general/ice_forcing.F90
CICE/cicecore/cicedynB/general/ice_forcing_bgc.F90
CICE/cicecore/cicedynB/general/ice_init.F90
CICE/cicecore/cicedynB/general/ice_state.F90
CICE/cicecore/cicedynB/general/ice_step_mod.F90
CICE/cicecore/cicedyn/general/ice_flux.F90
CICE/cicecore/cicedyn/general/ice_flux_bgc.F90
CICE/cicecore/cicedyn/general/ice_forcing.F90
CICE/cicecore/cicedyn/general/ice_forcing_bgc.F90
CICE/cicecore/cicedyn/general/ice_init.F90
CICE/cicecore/cicedyn/general/ice_state.F90
CICE/cicecore/cicedyn/general/ice_step_mod.F90

#Infrastructure List
CICE/cicecore/cicedynB/infrastructure/ice_blocks.F90
CICE/cicecore/cicedynB/infrastructure/ice_domain.F90
CICE/cicecore/cicedynB/infrastructure/ice_grid.F90
CICE/cicecore/cicedynB/infrastructure/ice_read_write.F90
CICE/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
CICE/cicecore/cicedynB/infrastructure/ice_restoring.F90
CICE/cicecore/cicedynB/infrastructure/ice_memusage.F90
CICE/cicecore/cicedynB/infrastructure/ice_memusage_gptl.c)
CICE/cicecore/cicedyn/infrastructure/ice_blocks.F90
CICE/cicecore/cicedyn/infrastructure/ice_domain.F90
CICE/cicecore/cicedyn/infrastructure/ice_grid.F90
CICE/cicecore/cicedyn/infrastructure/ice_read_write.F90
CICE/cicecore/cicedyn/infrastructure/ice_restart_driver.F90
CICE/cicecore/cicedyn/infrastructure/ice_restoring.F90
CICE/cicecore/cicedyn/infrastructure/ice_memusage.F90
CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c)


#Icepack List:
Expand Down Expand Up @@ -90,50 +90,50 @@ list(APPEND icepack_files
)

list(APPEND cice_shared_files_c
CICE/cicecore/cicedynB/infrastructure/ice_shr_reprosum86.c
CICE/cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c
)

#-- Using MPI
list(APPEND cice_mpi_comm_files
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_boundary.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_broadcast.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_communicate.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_exit.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_gather_scatter.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_global_reductions.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_reprosum.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_timers.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90
)

#-- Using Serial
list(APPEND cice_serial_comm_files
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_boundary.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_broadcast.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_communicate.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_exit.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_gather_scatter.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_global_reductions.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_reprosum.F90
CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_timers.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_broadcast.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_communicate.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_reprosum.F90
CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_timers.F90
)

#-- Using binary IO
list(APPEND cice_binary_io_files
CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
)

#-- Using NetCDF IO
list(APPEND cice_netcdf_io_files
CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
)

#PIO2 I/O List:
list(APPEND cice_pio2_io_files
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_pio.F90
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
)

#-- Using NUOPC CMEPS driver
Expand Down
Loading