Skip to content

Commit

Permalink
Update to CICE 6.6.0 with access-nri branch with reading MOM supergrid
Browse files Browse the repository at this point in the history
  • Loading branch information
anton-seaice committed Dec 13, 2024
1 parent 1483d7e commit f66f2c2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 119 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "MOM6/MOM6"]
path = MOM6/MOM6
url = https://github.com/ACCESS-NRI/mom6
url = https://github.com/ACCESS-NRI/MOM6
[submodule "CICE6/CICE6"]
path = CICE/CICE
url = https://github.com/ESCOMP/CICE
url = https://github.com/ACCESS-NRI/CICE
[submodule "CMEPS/CMEPS"]
path = CMEPS/CMEPS
url = https://github.com/ESCOMP/CMEPS
Expand Down
2 changes: 1 addition & 1 deletion CICE/CICE
Submodule CICE updated 116 files
7 changes: 3 additions & 4 deletions CICE/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ target_sources(OM3_cice PRIVATE
CICE/cicecore/shared/ice_arrays_column.F90
CICE/cicecore/shared/ice_calendar.F90
CICE/cicecore/shared/ice_constants.F90
CICE/cicecore/shared/ice_distribution.F90
CICE/cicecore/shared/ice_domain_size.F90
CICE/cicecore/shared/ice_fileunits.F90
CICE/cicecore/shared/ice_init_column.F90
Expand Down Expand Up @@ -61,11 +62,13 @@ target_sources(OM3_cice PRIVATE
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
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_memusage.F90
CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c
Expand Down Expand Up @@ -152,10 +155,6 @@ elseif(OM3_CICE_IO MATCHES "Binary")
)
endif()

add_patched_source(OM3_cice CICE/cicecore/cicedyn/infrastructure/ice_domain.F90)
add_patched_source(OM3_cice CICE/cicecore/shared/ice_distribution.F90)
add_patched_source(OM3_cice CICE/cicecore/cicedyn/general/ice_init.F90)

### Install and Export

## Library
Expand Down
16 changes: 0 additions & 16 deletions CICE/patches/ice_distribution.F90.patch

This file was deleted.

83 changes: 0 additions & 83 deletions CICE/patches/ice_domain.F90.patch

This file was deleted.

13 changes: 0 additions & 13 deletions CICE/patches/ice_init.F90.patch

This file was deleted.

0 comments on commit f66f2c2

Please sign in to comment.