Skip to content

Load bundled areacello in ACCESS-ESM1-6 ocean and sea-ice mappings #489

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

Merged
rbeucher merged 3 commits into from
Jul 8, 2026
Merged

Load bundled areacello in ACCESS-ESM1-6 ocean and sea-ice mappings #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2b2830
Use areacello resource for ocean areas
rbeucher Jul 8, 2026
f942c66
Treat bundled areacello as resource input
rbeucher Jul 8, 2026
f2e7928
Use areacello resource for sea-ice areas
rbeucher Jul 8, 2026
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
168 changes: 126 additions & 42 deletions src/access_moppy/mappings/ACCESS-ESM1-6_mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4308,8 +4308,7 @@
"positive": null,
"model_variables": [
"temp",
"rho_dzt",
"area_t"
"rho_dzt"
],
"calculation": {
"type": "formula",
Expand All @@ -4322,14 +4321,23 @@
]
},
"rho_dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "sea_water_conservative_temperature",
"model_variable_units": {
"temp": "K",
"rho_dzt": "kg m-2",
"area_t": "m2"
"rho_dzt": "kg m-2"
}
},
"deptho": {
Expand Down Expand Up @@ -5195,23 +5203,31 @@
"positive": null,
"model_variables": [
"salt",
"rho_dzt",
"area_t"
"rho_dzt"
],
"calculation": {
"type": "formula",
"operation": "calc_global_ave_ocean",
"args": [
"salt",
"rho_dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "sea_water_salinity",
"model_variable_units": {
"salt": "psu",
"rho_dzt": "kg m-2",
"area_t": "m2"
"rho_dzt": "kg m-2"
}
},
"somint": {
Expand Down Expand Up @@ -5281,23 +5297,31 @@
"positive": null,
"model_variables": [
"surface_salt",
"rho_dzt",
"area_t"
"rho_dzt"
],
"calculation": {
"type": "formula",
"operation": "calc_global_ave_ocean",
"args": [
"surface_salt",
"rho_dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "sea_surface_salinity",
"model_variable_units": {
"surface_salt": "psu",
"rho_dzt": "kg m-2",
"area_t": "m2"
"rho_dzt": "kg m-2"
}
},
"sftof": {
Expand Down Expand Up @@ -5404,8 +5428,7 @@
"positive": null,
"model_variables": [
"pot_temp",
"rho_dzt",
"area_t"
"rho_dzt"
],
"calculation": {
"type": "formula",
Expand All @@ -5418,14 +5441,23 @@
]
},
"rho_dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "sea_water_potential_temperature",
"model_variable_units": {
"pot_temp": "K",
"rho_dzt": "kg m-2",
"area_t": "m2"
"rho_dzt": "kg m-2"
}
},
"thkcello": {
Expand Down Expand Up @@ -5510,8 +5542,7 @@
"positive": null,
"model_variables": [
"surface_temp",
"rho_dzt",
"area_t"
"rho_dzt"
],
"calculation": {
"type": "formula",
Expand All @@ -5524,14 +5555,23 @@
]
},
"rho_dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "sea_surface_temperature",
"model_variable_units": {
"surface_temp": "K",
"rho_dzt": "kg m-2",
"area_t": "m2"
"rho_dzt": "kg m-2"
}
},
"tossq": {
Expand Down Expand Up @@ -5624,21 +5664,29 @@
"units": "m3",
"positive": null,
"model_variables": [
"dzt",
"area_t"
"dzt"
],
"calculation": {
"type": "formula",
"operation": "multiply",
"args": [
"dzt",
"area_t"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"CF standard Name": "",
"model_variable_units": {
"dzt": "m",
"area_t": "m2"
"dzt": "m"
}
},
"vmo": {
Expand Down Expand Up @@ -7009,15 +7057,24 @@
"units": "1e6 km2",
"positive": null,
"model_variables": [
"aice",
"t_area"
"aice"
],
"calculation": {
"type": "formula",
"operation": "calc_siarean",
"args": [
"aice",
"t_area"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"model_variable_units": {
Expand All @@ -7034,15 +7091,24 @@
"units": "1e6 km2",
"positive": null,
"model_variables": [
"aice",
"t_area"
"aice"
],
"calculation": {
"type": "formula",
"operation": "calc_siareas",
"args": [
"aice",
"t_area"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"model_variable_units": {
Expand Down Expand Up @@ -7367,15 +7433,24 @@
"units": "1e6 km2",
"positive": null,
"model_variables": [
"aice",
"t_area"
"aice"
],
"calculation": {
"type": "formula",
"operation": "calc_siextentn",
"args": [
"aice",
"t_area"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"model_variable_units": {
Expand All @@ -7392,15 +7467,24 @@
"units": "1e6 km2",
"positive": null,
"model_variables": [
"aice",
"t_area"
"aice"
],
"calculation": {
"type": "formula",
"operation": "calc_siextents",
"args": [
"aice",
"t_area"
{
"operation": "load_ressource_data",
"args": [
{
"literal": "fx.areacello_ACCESS-ESM.nc"
},
{
"literal": "areacello"
}
]
}
]
},
"model_variable_units": {
Expand Down
5 changes: 5 additions & 0 deletions tests/integration/test_full_cmorisation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@ def _get_input_files_for_compound(
# input — returning None signals the CMORiser to use its resource file.
return None

if compound_name == "Omon.areacello":
# areacello is also bundled for ocean tests, even though it is
# exposed through the Omon table in CMIP7 mappings.
return None

if table_name == "Omon":
# For ocean variables, use only configured external ocean files.
data_root = self._configured_data_root()
Expand Down