Master esm1.6 merge #68

anton-seaice · 2025-10-29T04:20:25Z

This pull request merges the access-esm1.6 branch of CICE5 into the master branch.

The access driver is used for access-esm1.6, whilst the auscom driver is used for access-om2

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@357 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

…models/cice_GC3_GA7_hxyo/ git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@358 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@359 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@360 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@366 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@367 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@368 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@372 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@393 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@394 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@395 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@396 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

… years. git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@402 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@403 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

…tion errors. git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@404 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@405 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@406 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

* Add build ci for access-esm1.6 branch

* Needed to support oneapi 2025 compiler.

CICE actually uses a proleptic gregorian calendar, see https://cfconventions.org/Data/cf-conventions/cf-conventions-1.12/cf-conventions.html#calendar

Add license file from CICE-consortium

Ported https://github.com/ACCESS-NRI/cice4/blob/694a9fbd4ac29dc841b38aff002eb36da5b650f1/source/ice_history.F90#L2184-L2198 to cice5. This avoids post-processing interpreting end of the time interval timestamps as the subsequent time interval.

Implement dump last in ESM1.6 driver

This makes the assumed salinity of sea ice configurable, so we can set it the same as the MOM value (configured in MOM [here](https://github.com/ACCESS-NRI/access-esm1.6-configs/blob/88ac5aab5d6d2500209b7d610e68e5c2928222d4/ocean/input.nml#L367)) We use 4ppt in MOM for historical reasons, and did that in [CICE4](https://github.com/ACCESS-NRI/cice4/blob/694a9fbd4ac29dc841b38aff002eb36da5b650f1/source/ice_init.F90#L243) too.

It's hard to set this in the namelist because it is used at compile time to define several parameters Set per MOM5 value: https://github.com/ACCESS-NRI/FMS/blob/bf9b80423ea4f66efa389e03d3c19b26c009e8b6/constants/constants.F90#L90

* Expose ksno (thermal conductivity of snow ) to the namelist Typical default value is 0.3, for CM2, use 0.2

Co-authored-by: Spencer Wong <88933912+blimlim@users.noreply.github.com>

anton-seaice · 2026-01-09T00:16:02Z

Compare of this morning's work:

https://github.com/ACCESS-NRI/cice5/compare/d6b35980a5f6e1281ff89de0ce6df42edf37b53c..29a9581c84537246ca142bc4ffee27bef7fd017f

anton-seaice · 2026-01-09T00:26:51Z

drivers/auscom/cpl_parameters.F90

This file is changed to catch some improvements made to drivers/access/cpl_parameters.F90

anton-seaice · 2026-01-09T00:28:01Z

drivers/auscom/ice_constants.F90

ice_ref_salinity, ksno and hs_min are moved to the namelist

anton-seaice · 2026-01-09T00:42:20Z

drivers/access/CICE_InitMod.F90

See https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge#diff-2c7dbe2cf0984fe0b1235114fb00340f8c77833dd06166b75983acc98ce26335

This file follows the access-esm1.6 branch except for minor formatting changes

anton-seaice · 2026-01-09T00:43:15Z

drivers/access/CICE_RunMod.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge shows no changes to this file

anton-seaice · 2026-01-09T00:43:42Z

drivers/access/cpl_arrays_setup.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge shows no changes to this file

anton-seaice · 2026-01-09T00:43:56Z

drivers/access/cpl_forcing_handler.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge shows no changes to this file

anton-seaice · 2026-01-09T00:44:16Z

drivers/access/cpl_interface.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge#diff-fc19414c40fff80d4d66454635b302d42cec694887445d8c275eaf2a219f9285 shows minor formatting change

anton-seaice · 2026-01-09T00:45:10Z

drivers/access/cpl_parameters.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge#diff-42d5bf23150be2eb7f74b5edb9ce795669a7a91bcb3eef33c78acc43d0a6afdb shows minor formatting change

anton-seaice · 2026-01-09T00:46:01Z

drivers/access/ice_constants.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge#diff-da3f41b82e09ada9d81d1b1e62ee31852b99a7e9bb813f6eaa861f71fd6c63ad only changed to move iceruf

anton-seaice · 2026-01-09T00:46:23Z

drivers/access/ice_coupling.F90

https://github.com/ACCESS-NRI/cice5/compare/access-esm1.6..ACCESS-NRI:cice5:master-esm1.6-merge shows no change to this file

Read grid on each processor per COSIMA/access-om2#221

…6-merge

fix line truncation build failure

anton-seaice · 2026-01-09T04:15:01Z

@dougiesquire and @blimlim

Here, I present a monster PR for your enjoyment.

This merges the access-esm1.6 branch with the master branch, all repro tests show no change in results, see:

1 and 2

There is a bit of stuffing around to make this happen:

refined CMake to work with esm1.6
some constants are configured in the namelist (this is consistent now between esm1.6 and om2, no defaults are changed).
for esm1.6 specific code, this is marked as #ifdef ACCESS. #ifdef AusCOM is used for bother esm1.6 and om2, so sometimes #if defined(AusCOM) && !defined(ACCESS) is used for OM2 only. This is used a lot for calendar code.

I snuck in changing the history output precision of the time coordinate to double, technically it's unrelated to this change.

the drivers/access folder comes from the esm1.6 branch. There are minor changes to the drivers/auscom folder to support some constants becoming configurable and improvements made in esm1.6.

pbd562 and others added 30 commits August 22, 2016 04:02

Import from /short/p66/dhb599/ACCESS-CM2/submodels/cice_GC3_GA7_hxyo/

1071b67

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@357 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Updated cpl_forcing_handler.F90 from /short/p66/dhb599/ACCESS-CM2/sub…

51af00a

…models/cice_GC3_GA7_hxyo/ git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@358 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

I2A coupling bug fix

6f30219

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@359 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

ice errmax tolorance x 10

8d76453

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@360 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

dhb599 mod driver files

4520c26

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@366 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

ukmo:changeset 145,146,163 & 134

2b434c7

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@367 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Bug fix in ice constants

2b9eba7

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@368 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

add dhb599 iceberg scheme

823a987

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_GC3_GA7@372 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

New branch for GSI 8.1

407ade8

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@393 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Remove symliink before adding back as file

a24447b

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@394 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Add code changes from Arnold's cice512_av853

6e363ca

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@395 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Add iceberg_factor (from Dave)

9953401

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@396 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Add extra call to set_calendar to fix naming of history files in leap…

8b553d9

… years. git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@402 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Write messages to stderr and call mpi_abort with correct arguments.

575c1e7

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@403 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Create netCDF files as netcdf4-classic for better detection of trunca…

d1c40ef

…tion errors. git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@404 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Only write namelist info from master PE

d49e6bc

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@405 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Add coupling timers for ACCESS

61ab72a

git-svn-id: file:///g/data/access/access-svn/cice/branches/access/cice_gsi8.1@406 f6bd92a4-46cf-401b-8a38-b7f7993d28bf

Create README.md

0a84ab1

Add build ci (#21)

8be14fe

* Add build ci for access-esm1.6 branch

bld/makdep.c: add a return type to main() (#22)

2898631

* Needed to support oneapi 2025 compiler.

Set netcdf output calendar attributes correctly (#26)

ec1e2cb

CICE actually uses a proleptic gregorian calendar, see https://cfconventions.org/Data/cf-conventions/cf-conventions-1.12/cf-conventions.html#calendar

Add license file (#29)

77baf8a

Add license file from CICE-consortium

Modify dump_last for use in esm1.6

ed83b97

Keep original implementation for non-coupled model

d87c459

Merge pull request #38 from ACCESS-NRI/esm1.6-dump-last

5471bbf

Implement dump last in ESM1.6 driver

Set cp_ocn to same value as MOM (#40)

15fa7de

It's hard to set this in the namelist because it is used at compile time to define several parameters Set per MOM5 value: https://github.com/ACCESS-NRI/FMS/blob/bf9b80423ea4f66efa389e03d3c19b26c009e8b6/constants/constants.F90#L90

Expose ksno (thermal conductivity of snow ) to the namelist (#41)

267d4be

* Expose ksno (thermal conductivity of snow ) to the namelist Typical default value is 0.3, for CM2, use 0.2

ESM1.6 Readme (#44)

58eeccf

Co-authored-by: Spencer Wong <88933912+blimlim@users.noreply.github.com>

anton-seaice force-pushed the master-esm1.6-merge branch 3 times, most recently from a8c152b to 29a9581 Compare January 9, 2026 00:15

anton-seaice commented Jan 9, 2026

View reviewed changes

drivers/auscom/ice_constants.F90

Copy link

Collaborator Author

anton-seaice Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ice_ref_salinity, ksno and hs_min are moved to the namelist

anton-seaice commented Jan 9, 2026

View reviewed changes

anton-seaice force-pushed the master-esm1.6-merge branch from 29a9581 to adef59d Compare January 9, 2026 02:09

anton-seaice added 9 commits January 9, 2026 13:52

Merge 'access-esm1.6' into master (e.g. access-om2) branch

156780b

Read grid on each processor per COSIMA/access-om2#221

Merge remote-tracking branch 'origin/master' into master-esm1.6-merge

1d35801

Merge remote-tracking branch 'origin/master' into master-esm1.6-merge

2bb20e4

Merge remote-tracking branch 'origin/access-esm1.6' into master-esm1.…

b7e4301

…6-merge

Use ACCESS instead of AusCOM for ESM1.6, some merge tidyup

3f8ba8a

Support CMake Build for esm1.6

7a40ca0

fix line truncation build failure

Remove unused files

442d45b

Sync namelist error handling between ACCESS & AUSCOM

5586d4d

Use double precision for time diagnostic

99ce18a

anton-seaice force-pushed the master-esm1.6-merge branch from adef59d to 99ce18a Compare January 9, 2026 03:04

Fix ordering of setting aicenmin

8031135

anton-seaice requested review from blimlim and dougiesquire January 9, 2026 04:15

anton-seaice marked this pull request as ready for review January 9, 2026 04:15

Master esm1.6 merge #68

Are you sure you want to change the base?

Master esm1.6 merge #68

Uh oh!

Conversation

anton-seaice commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anton-seaice commented Jan 9, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

anton-seaice commented Jan 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

anton-seaice commented Oct 29, 2025 •

edited

Loading