Skip to content

Commit 8a0edb2

Browse files
committed
Update to CICE 6.6.0 with access-nri branch with reading MOM supergrid
and rpointer fix
1 parent ee54cb7 commit 8a0edb2

File tree

6 files changed

+6
-119
lines changed

6 files changed

+6
-119
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "MOM6/MOM6"]
22
path = MOM6/MOM6
3-
url = https://github.com/ACCESS-NRI/mom6
3+
url = https://github.com/ACCESS-NRI/MOM6
44
[submodule "CICE6/CICE6"]
55
path = CICE/CICE
6-
url = https://github.com/ESCOMP/CICE
6+
url = https://github.com/ACCESS-NRI/CICE
77
[submodule "CMEPS/CMEPS"]
88
path = CMEPS/CMEPS
99
url = https://github.com/ESCOMP/CMEPS

CICE/CICE

Submodule CICE updated 120 files

CICE/CMakeLists.txt

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target_sources(OM3_cice PRIVATE
2626
CICE/cicecore/shared/ice_arrays_column.F90
2727
CICE/cicecore/shared/ice_calendar.F90
2828
CICE/cicecore/shared/ice_constants.F90
29+
CICE/cicecore/shared/ice_distribution.F90
2930
CICE/cicecore/shared/ice_domain_size.F90
3031
CICE/cicecore/shared/ice_fileunits.F90
3132
CICE/cicecore/shared/ice_init_column.F90
@@ -61,11 +62,13 @@ target_sources(OM3_cice PRIVATE
6162
CICE/cicecore/cicedyn/general/ice_flux_bgc.F90
6263
CICE/cicecore/cicedyn/general/ice_forcing.F90
6364
CICE/cicecore/cicedyn/general/ice_forcing_bgc.F90
65+
CICE/cicecore/cicedyn/general/ice_init.F90
6466
CICE/cicecore/cicedyn/general/ice_state.F90
6567
CICE/cicecore/cicedyn/general/ice_step_mod.F90
6668

6769
# Infrastructure
6870
CICE/cicecore/cicedyn/infrastructure/ice_blocks.F90
71+
CICE/cicecore/cicedyn/infrastructure/ice_domain.F90
6972
CICE/cicecore/cicedyn/infrastructure/ice_grid.F90
7073
CICE/cicecore/cicedyn/infrastructure/ice_memusage.F90
7174
CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c
@@ -152,10 +155,6 @@ elseif(OM3_CICE_IO MATCHES "Binary")
152155
)
153156
endif()
154157

155-
add_patched_source(OM3_cice CICE/cicecore/cicedyn/infrastructure/ice_domain.F90)
156-
add_patched_source(OM3_cice CICE/cicecore/shared/ice_distribution.F90)
157-
add_patched_source(OM3_cice CICE/cicecore/cicedyn/general/ice_init.F90)
158-
159158
### Install and Export
160159

161160
## Library

CICE/patches/ice_distribution.F90.patch

-16
This file was deleted.

CICE/patches/ice_domain.F90.patch

-83
This file was deleted.

CICE/patches/ice_init.F90.patch

-13
This file was deleted.

0 commit comments

Comments
 (0)