From 9d4534dd51dc0a8cd1b644b2f7a474f72a22a05e Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Mon, 18 Nov 2024 12:55:02 +1100 Subject: [PATCH 1/3] Add basin mask for basin specific diags --- config.yaml | 2 ++ ocean/input.nml | 1 + 2 files changed, 3 insertions(+) diff --git a/config.yaml b/config.yaml index 313f65f..06c91c6 100644 --- a/config.yaml +++ b/config.yaml @@ -81,6 +81,8 @@ submodels: - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/shortwave_penetration/global.1deg/2020.05.19/ssw_atten_depth.nc # Grids - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/grids/mosaic/global.1deg/2020.05.19/grid_spec.nc + # Basin mask + - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/basins/global.1deg/2020.05.19/basin_mask.nc - name: ice model: cice diff --git a/ocean/input.nml b/ocean/input.nml index 93fc0ef..cf8c8d2 100644 --- a/ocean/input.nml +++ b/ocean/input.nml @@ -486,6 +486,7 @@ &ocean_tracer_advect_nml debug_this_module=.false. advect_sweby_all=.true. + read_basin_mask=.true. / &ocean_tracer_diag_nml From 87ab7d948b27379c1cbebfeb7e9525eee2ae4429 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Mon, 18 Nov 2024 13:37:45 +1100 Subject: [PATCH 2/3] Update input manifest --- manifests/input.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/manifests/input.yaml b/manifests/input.yaml index 777c88a..2a57730 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -56,6 +56,11 @@ work/atmosphere/INPUT/STASHmaster/STASHsections_A: hashes: binhash: 9401083e4199439b77254fc490b6597d md5: 8525fd107dbea6184db74089f1d55fd9 +work/atmosphere/INPUT/STASHmaster/manifest.yaml: + fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2020.05.19/STASHmaster/manifest.yaml + hashes: + binhash: 0c5b7b98f44c8244eb5e3546ddd14ffc + md5: a0ed46f7a89e54ec91453533d4b3552e work/atmosphere/INPUT/biogenic_351sm.N96L38: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/aerosol/global.N96/2020.05.19/biogenic_351sm.N96L38 hashes: @@ -216,6 +221,11 @@ work/atmosphere/INPUT/stasets/X01010206: hashes: binhash: a7c6cf46b049f520547eab48654687ad md5: 7d5e82e70a2f3936743eb957462d41aa +work/atmosphere/INPUT/stasets/manifest.yaml: + fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2020.05.19/stasets/manifest.yaml + hashes: + binhash: cf50bcba87ce5beea01a939180dc71f2 + md5: e179226d2f2de9a224051d04ffa5ed84 work/atmosphere/INPUT/sulpc_oxidants_N96_L38: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/aerosol/global.N96/2020.05.19/sulpc_oxidants_N96_L38 hashes: @@ -296,6 +306,11 @@ work/ice/INPUT/monthly_sstsss.nc: hashes: binhash: 49aab10f25c58a9a0ffa5617847050ff md5: 323d4c605f83f4d7d3126da70153c2ed +work/ocean/INPUT/basin_mask.nc: + fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ocean/basins/global.1deg/2020.05.19/basin_mask.nc + hashes: + binhash: 98462c5ebc1edda0f42ca61be74801e6 + md5: 20fd8740f24ca95c7c086343077e9c0d work/ocean/INPUT/bgc_param.nc: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/ocean/biogeochemistry/global.1deg/2024.07.12/bgc_param.nc hashes: From ca3e2cf90de3f1485e771b79b465e347ea7deec8 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 20 Nov 2024 15:50:58 +1100 Subject: [PATCH 3/3] Regenerate manifests to remove manifest.yaml files --- manifests/input.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/manifests/input.yaml b/manifests/input.yaml index 2a57730..27f1a96 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -56,11 +56,6 @@ work/atmosphere/INPUT/STASHmaster/STASHsections_A: hashes: binhash: 9401083e4199439b77254fc490b6597d md5: 8525fd107dbea6184db74089f1d55fd9 -work/atmosphere/INPUT/STASHmaster/manifest.yaml: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2020.05.19/STASHmaster/manifest.yaml - hashes: - binhash: 0c5b7b98f44c8244eb5e3546ddd14ffc - md5: a0ed46f7a89e54ec91453533d4b3552e work/atmosphere/INPUT/biogenic_351sm.N96L38: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/aerosol/global.N96/2020.05.19/biogenic_351sm.N96L38 hashes: @@ -221,11 +216,6 @@ work/atmosphere/INPUT/stasets/X01010206: hashes: binhash: a7c6cf46b049f520547eab48654687ad md5: 7d5e82e70a2f3936743eb957462d41aa -work/atmosphere/INPUT/stasets/manifest.yaml: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/stash/2020.05.19/stasets/manifest.yaml - hashes: - binhash: cf50bcba87ce5beea01a939180dc71f2 - md5: e179226d2f2de9a224051d04ffa5ed84 work/atmosphere/INPUT/sulpc_oxidants_N96_L38: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/aerosol/global.N96/2020.05.19/sulpc_oxidants_N96_L38 hashes: