From 18e1dcc43945c7ece593e40e812857a749a46c16 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 18 Dec 2024 09:35:58 +1100 Subject: [PATCH 1/6] Add changes for iceberg melt scheme --- config.yaml | 6 ++++-- coupler/namcouple | 20 +++++++++++++++++-- ice/input_ice.nml | 5 +++++ ocean/diagnostic_profiles/diag_table_detailed | 6 ++++++ ocean/diagnostic_profiles/diag_table_standard | 6 ++++++ .../diagnostic_profiles/diag_table_wombatlite | 6 ++++++ .../diag_table_detailed_source.yaml | 2 ++ .../diag_table_standard_source.yaml | 3 +++ .../diag_table_wombatlite_source.yaml | 2 ++ ocean/input.nml | 7 +++++-- 10 files changed, 57 insertions(+), 6 deletions(-) mode change 100755 => 100644 ocean/diagnostic_profiles/diag_table_wombatlite diff --git a/config.yaml b/config.yaml index 87daa5d..6d0979b 100644 --- a/config.yaml +++ b/config.yaml @@ -26,7 +26,7 @@ modules: use: - /g/data/vk83/prerelease/modules load: - - access-esm1p6/pr26-4 + - access-esm1p6/pr27-5 # Model configuration model: access @@ -88,7 +88,9 @@ submodels: input: # Grids - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/grids/global.1deg/2020.05.19/kmt.nc - - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/grids/global.1deg/2020.05.19/grid.nc + - /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/share/ice/grids/global.1deg/2024.11.01/grid.nc + # Iceberg flux + - /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/share/ice/iceberg/global.1deg/2024.11.08/lice_discharge_iceberg.nc # Climatology - /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/climatology/global.1deg/2020.05.19/monthly_sstsss.nc diff --git a/coupler/namcouple b/coupler/namcouple index f5d24f2..573bbbd 100644 --- a/coupler/namcouple +++ b/coupler/namcouple @@ -27,11 +27,11 @@ ######################################################################### $NFIELDS # This is the total number of fields being exchanged. -### 24 fields atm -> ice +### 26 fields atm -> ice ### 15 fields ice -> ocn ### 7 fields ocn -> ice ### 18 fields ice -> atm - 72 + 74 $END ######################################################################### # unused in mct $JOBNAME @@ -502,6 +502,22 @@ cice cice LAG=0 SEQ=+1 # LOCTRANS INSTANT +########## +# Field 18 : land ice discharge waterflux +########## +lice_fw licefw 44 3600 1 i2o.nc IGNORED +cice cice LAG=0 SEQ=+1 +# +LOCTRANS +INSTANT +########## +# Field 19 : land ice discharge heatflux +########## +lice_ht liceht 44 3600 1 i2o.nc IGNORED +cice cice LAG=0 SEQ=+1 +# +LOCTRANS +INSTANT ############################################################################ # # OCEAN --->>> ICE diff --git a/ice/input_ice.nml b/ice/input_ice.nml index 8411c26..b6ee0fe 100644 --- a/ice/input_ice.nml +++ b/ice/input_ice.nml @@ -1,3 +1,8 @@ +#202407: input_ice.nml now includes N/S iceberg and runoff domain control etc. +# note iceberg_rate_s/n are "tunable", i.e., +# iceberg_rate_s => 0 ~ 1 +# iceberg_rate_n => 0 ~ 1 +# water mass budget wouldn't be changed by such tuning! &coupling caltype=1 jobnum=2 diff --git a/ocean/diagnostic_profiles/diag_table_detailed b/ocean/diagnostic_profiles/diag_table_detailed index d17d695..3bb7e1f 100644 --- a/ocean/diagnostic_profiles/diag_table_detailed +++ b/ocean/diagnostic_profiles/diag_table_detailed @@ -535,6 +535,12 @@ ACCESS-ESM_CMIP6 "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "hblt", "hblt", "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", "all", "max", "none", 2 +"ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "licefw", "licefw", "ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "liceht", "liceht", "ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + # monthly 2d BGC fields diff --git a/ocean/diagnostic_profiles/diag_table_standard b/ocean/diagnostic_profiles/diag_table_standard index 8e29572..bf27538 100644 --- a/ocean/diagnostic_profiles/diag_table_standard +++ b/ocean/diagnostic_profiles/diag_table_standard @@ -538,6 +538,12 @@ ACCESS-ESM_CMIP6 "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "hblt", "hblt", "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", "all", "max", "none", 2 +"ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "licefw", "licefw", "ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "liceht", "liceht", "ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + # monthly 2d BGC fields diff --git a/ocean/diagnostic_profiles/diag_table_wombatlite b/ocean/diagnostic_profiles/diag_table_wombatlite old mode 100755 new mode 100644 index c08f010..221d584 --- a/ocean/diagnostic_profiles/diag_table_wombatlite +++ b/ocean/diagnostic_profiles/diag_table_wombatlite @@ -700,6 +700,12 @@ ACCESS-ESM_CMIP6 "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "hblt", "hblt", "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", "all", "max", "none", 2 +"ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "licefw", "licefw", "ocean-2d-licefw-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "liceht", "liceht", "ocean-2d-liceht-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + # monthly 2d BGC fields diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml index 70497c5..71b92ba 100644 --- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml +++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml @@ -326,6 +326,8 @@ diag_table: wind_power_u: wind_power_v: hblt: {reduction_method: 'max'} + licefw: + liceht: 'monthly 2d BGC fields': defaults: # these can be overridden for individual fields below diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml index 0b96b4a..b140460 100644 --- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml +++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml @@ -333,6 +333,9 @@ diag_table: wind_power_u: wind_power_v: hblt: {reduction_method: 'max'} + licefw: + liceht: + 'monthly 2d BGC fields': defaults: # these can be overridden for individual fields below diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml index 49d9b49..dd8ec05 100755 --- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml +++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml @@ -390,6 +390,8 @@ diag_table: wind_power_u: wind_power_v: hblt: {reduction_method: 'max'} + licefw: + liceht: 'monthly 2d BGC fields': defaults: # these can be overridden for individual fields below diff --git a/ocean/input.nml b/ocean/input.nml index d4c8253..495f35f 100644 --- a/ocean/input.nml +++ b/ocean/input.nml @@ -6,6 +6,7 @@ threading_read='multi' threading_write='single' fileset_write='single' + checksum_required=.false. / &fms_nml @@ -618,9 +619,9 @@ / &mom_oasis3_interface_nml - num_fields_in=17 + num_fields_in=19 num_fields_out=9 - fields_in= 'u_flux' ,'v_flux' ,'lprec','fprec','salt_flx','mh_flux','sw_flux','q_flux','t_flux','lw_flux','runof' ,'p' ,'aice', 'wfimelt', 'wfiform','co2_io', 'wnd_io' + fields_in= 'u_flux' ,'v_flux' ,'lprec','fprec','salt_flx','mh_flux','sw_flux','q_flux','t_flux','lw_flux','runof' ,'p' ,'aice', 'wfimelt', 'wfiform','co2_io', 'wnd_io', 'licefw', 'liceht' fields_out='t_surf','s_surf','u_surf','v_surf','dssldx','dssldy','frazil', 'co2_o', 'co2fx_o' send_before_ocean_update=.false. send_after_ocean_update=.true. @@ -641,6 +642,8 @@ sign_stflx=1.0 redsea_gulfbay_sfix=.true. sfix_hours=24 + chk_i2o_fields=.false. + chk_o2i_fields=.false. / &ocean_solo_nml From 7e7c7ee43fff434a58b67ab89bda7c5c76d4e8c5 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 18 Dec 2024 09:47:23 +1100 Subject: [PATCH 2/6] Update exe, input, restart manifests --- manifests/exe.yaml | 18 +-- manifests/input.yaml | 11 +- manifests/restart.yaml | 247 +++++++++++++---------------------------- 3 files changed, 93 insertions(+), 183 deletions(-) diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 0d6e382..e23a661 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -2,17 +2,17 @@ format: yamanifest version: 1.0 --- work/atmosphere/um_hg3.exe: - fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/um7-git.2024.07.03_access-esm1.5-kgxooyp2s476dd4zc5mgtwhxfknkhnoe/bin/um_hg3.exe + fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/um7-git.dev-access-esm1.6_access-esm1.6-zpehauutrxs7mi2plup4zmj33kh3ofoi/bin/um_hg3.exe hashes: - binhash: cc7e4e1ad8f67c4594e62769fc48a917 - md5: 37e5f7c1ce39d40011ca7eae556fcd17 + binhash: f7cac9ac22f6e5a0bd6b0c8c1526b58d + md5: a11697c817daa16c3659db8e7b75136c work/ice/cice_access_360x300_12x1_12p.exe: - fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/cice4-git.2024.05.21_access-esm1.5-hhtnigwxdyz7ta4dv3gvhwulze6hxqra/bin/cice_access_360x300_12x1_12p.exe + fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/cice4-git.update_DaveBi_access-esm1.5-o7ocdg6t5q7h6up75cvygv6v537xgh47/bin/cice_access_360x300_12x1_12p.exe hashes: - binhash: 224441384273cfc7bd37b859acccb5cd - md5: b50c8f77304eea6548f571fa6ca9ba8c + binhash: de6eefc02ba1c946bb74dabdc007b17b + md5: 79688dfffdc71c36d10a7989f851ee7d work/ocean/fms_ACCESS-ESM.x: - fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/mom5-git.2024.08.23_access-esm1.6-oycrxfrimqhonk4i6iowchxru4hzfvm5/bin/fms_ACCESS-ESM.x + fullpath: /g/data/vk83/prerelease/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/intel-19.0.3.199/mom5-git.dev_2024.08.14_access-esm1.6-l7szzwxnyjr5sq3cdo2jl7kainbhqag7/bin/fms_ACCESS-ESM.x hashes: - binhash: 70d3e4603aa6cfa5b55b3cb4c726cc77 - md5: 1165f3f6312a2107086d155926240438 + binhash: 4d721fefe4f200afe28b6ae8d2dc038a + md5: 815c5d915e1ae991795154b029c8cf0a diff --git a/manifests/input.yaml b/manifests/input.yaml index 9f12b39..c8d1a83 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -282,15 +282,20 @@ work/coupler/rmp_um1v_to_cice_CONSERV_FRACNNEI.nc: binhash: 89de238897ba6f06a4c9a1bcefe4ebc8 md5: 3bf9569f34b657f2ecab8ef5c93e7659 work/ice/INPUT/grid.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/grids/global.1deg/2020.05.19/grid.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/share/ice/grids/global.1deg/2024.11.01/grid.nc hashes: - binhash: e27f1045f956550305426c6abb36c868 - md5: 1213e346055ee073fe33dc12578d99c6 + binhash: 9566a89e6c51961869a81fc1751bbf85 + md5: a50e35486edd4f43e208b254ecb64582 work/ice/INPUT/kmt.nc: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/grids/global.1deg/2020.05.19/kmt.nc hashes: binhash: 0ed504b151b168eebdee3aa13edd8c37 md5: 2bde88b9e44c46aecf2ba2dff188d1ac +work/ice/INPUT/lice_discharge_iceberg.nc: + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/share/ice/iceberg/global.1deg/2024.11.08/lice_discharge_iceberg.nc + hashes: + binhash: 12d1d12f6460932f097acbb6000f52fe + md5: b1d6dabd4f3641865dd2d58f12db010e work/ice/INPUT/monthly_sstsss.nc: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/ice/climatology/global.1deg/2020.05.19/monthly_sstsss.nc hashes: diff --git a/manifests/restart.yaml b/manifests/restart.yaml index 15d79d2..8812927 100644 --- a/manifests/restart.yaml +++ b/manifests/restart.yaml @@ -2,286 +2,191 @@ format: yamanifest version: 1.0 --- work/atmosphere/PI-02.astart-01010101: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/atmosphere/PI-02.astart-01010101 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/atmosphere/PI-02.astart-01010101 hashes: - binhash: a96de0b5ca30fbb4209ab48f29e8a65c + binhash: d329a23a6d7563038e2165a4e17c7907 md5: bfc4e6d8dfdb52d75e870adf62f2fb54 work/atmosphere/restart_dump.astart: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/atmosphere/restart_dump.astart + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/atmosphere/restart_dump.astart hashes: - binhash: b56ef5b5ae5627d271837c0aa7b1fa24 + binhash: 5f4953143e0976cade7ee5a907e2e545 md5: bfc4e6d8dfdb52d75e870adf62f2fb54 work/coupler/a2i.nc: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/a2i.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/a2i.nc hashes: - binhash: e02e2a0f5a60554f982f93ab5d424761 + binhash: c26f2d428ef4c2abbae0d9761ee66b29 md5: c8f135384aaf0b9a9119a441f76d3f32 work/coupler/a2i.nc-01001231: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/a2i.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/a2i.nc-01001231 hashes: - binhash: 09dc9a5c184985d4ab39ea497840094d + binhash: 6f3ad48a2fa712bb76e3ac102ae4898f md5: c8f135384aaf0b9a9119a441f76d3f32 work/coupler/i2a.nc: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/i2a.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/i2a.nc hashes: - binhash: 585f9582bced98eef49f4193e2e0d0c2 + binhash: 61a9e993e69761224538b39acc128fae md5: 87e48c0403e304fe20d21cb277dcc07a work/coupler/i2a.nc-01001231: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/i2a.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/i2a.nc-01001231 hashes: - binhash: 5cd86d9c3715498d7a16d8c2bc0ce39c + binhash: 7a3fba386f1f8738ddd4d59c41d9105c md5: 87e48c0403e304fe20d21cb277dcc07a work/coupler/o2i.nc: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/o2i.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/o2i.nc hashes: - binhash: 8a09e01ddda1d1fc14788f9f57361c3c + binhash: 53f914415f3f0c1ca4d7d64ce40b3ad1 md5: b724ded00ce0f5ad5984b61bee1ad43e work/coupler/o2i.nc-01001231: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/coupler/o2i.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/coupler/o2i.nc-01001231 hashes: - binhash: 7c90ebeda8e9ab512143ec1c361ec83f + binhash: b54510d75d48b84bf1b1699e009356d2 md5: b724ded00ce0f5ad5984b61bee1ad43e work/ice/RESTART/cice_in.nml: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/cice_in.nml + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/cice_in.nml hashes: - binhash: e0ee4468d93664efed262ed34f49db46 + binhash: 065438e6ec01b615b9a50e9e8ee03eb6 md5: 1576287c82da88ffc4752430100f848e work/ice/RESTART/ice.restart_file: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/ice.restart_file + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/ice.restart_file hashes: - binhash: 098448ec0936e7fe13a41054b3765d08 + binhash: eb5295bbdde3f7455efdba11ad144b80 md5: 2b181afa9524673b64612f3094427fbe work/ice/RESTART/ice.restart_file-01001231: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/ice.restart_file-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/ice.restart_file-01001231 hashes: - binhash: 32ac4397cdb2a37b5549b038094cefad + binhash: 9b3ac58940a4f2a4c1ca3293fb6c9273 md5: 2b181afa9524673b64612f3094427fbe work/ice/RESTART/iced.01010101: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/iced.01010101 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/iced.01010101 hashes: - binhash: 4a29c1db0321bff07bec61e09f1e170b + binhash: adcef41f7c92083c581de75e620365ba md5: d9d2e6e475ab3f94518e170a64c8d43e work/ice/RESTART/input_ice.nml: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/input_ice.nml + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/input_ice.nml hashes: - binhash: 16368ceef01af8c2f44ee3c73ae054cb + binhash: 7b2d9db31d115b61876a592a5cd34cb6 md5: e2d6d0541795dd3eeae54cda28ecba96 work/ice/RESTART/mice.nc: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/mice.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/mice.nc hashes: - binhash: 5f16bb97268348b110a9152e36036847 + binhash: ad3fafbc52aee03ccac6970a239766e7 md5: 380a7008500f58eb5e8006b1eac18527 work/ice/RESTART/mice.nc-01001231: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/mice.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/mice.nc-01001231 hashes: - binhash: a2780764bee4a6f557f398a0efcbce57 + binhash: 86630cac8e3acfb2d69f60a6d0e1e40b md5: 380a7008500f58eb5e8006b1eac18527 work/ice/RESTART/restart_date.nml: copy: true - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ice/restart_date.nml + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ice/restart_date.nml hashes: - binhash: 6761e1be260c59977f20b1c347d9b5a9 + binhash: 17fac552938796d021d131b8b5c0f191 md5: da5f6db5c1b2dac11f27446f21db08cb -work/ocean/INPUT/csiro_bgc.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/csiro_bgc.res.nc - hashes: - binhash: f2eefa9f2baa34e2d86991f5e0da7cf8 - md5: 36eddc51730941934ad070439525719f -work/ocean/INPUT/csiro_bgc.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/csiro_bgc.res.nc-01001231 - hashes: - binhash: c7b0e4c9f96bc3708a0ec53c7afc141a - md5: 36eddc51730941934ad070439525719f -work/ocean/INPUT/csiro_bgc_sediment.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/csiro_bgc_sediment.res.nc - hashes: - binhash: c1b228ca30f4a511a222df231dc1c177 - md5: c19814b8cd24d34c1d0f6ede4b94426c -work/ocean/INPUT/csiro_bgc_sediment.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/csiro_bgc_sediment.res.nc-01001231 - hashes: - binhash: 2e4a43505ac11d1103c81b8a0896df5e - md5: c19814b8cd24d34c1d0f6ede4b94426c work/ocean/INPUT/ocean_age.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_age.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_age.res.nc hashes: - binhash: 9c8cd666f2ceffda3e3afd8bac85f9bc - md5: 5ad601c0eaad3cfc3baa47aed91d1af9 -work/ocean/INPUT/ocean_age.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_age.res.nc-01001231 - hashes: - binhash: d6d4e92ff0838f2c75448adf194da2ab + binhash: 73b781f7e79c5382d43c69513e567cb7 md5: 5ad601c0eaad3cfc3baa47aed91d1af9 work/ocean/INPUT/ocean_barotropic.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_barotropic.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_barotropic.res.nc hashes: - binhash: 195c18802c5b0e631228ab803c001cf9 - md5: 97a5f4dc4a379ea4cad9f5d342ed6c51 -work/ocean/INPUT/ocean_barotropic.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_barotropic.res.nc-01001231 - hashes: - binhash: 8d281d475d2c7f403cc57ec4f51c620f + binhash: a28a0924b37c8b22d11fdbffe5afc105 md5: 97a5f4dc4a379ea4cad9f5d342ed6c51 work/ocean/INPUT/ocean_bih_friction.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_bih_friction.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_bih_friction.res.nc hashes: - binhash: d4d546d23977e18b7b67c5a4c555825b - md5: 78ebb71bbf0e28e14d72243cf48a483c -work/ocean/INPUT/ocean_bih_friction.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_bih_friction.res.nc-01001231 - hashes: - binhash: 00c96ce040e15839ee356d4f17b93f9a + binhash: 57f14885eabee760edbcd5dc03df110c md5: 78ebb71bbf0e28e14d72243cf48a483c work/ocean/INPUT/ocean_density.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_density.res.nc - hashes: - binhash: 8e2e486ef945adfc809813d389470490 - md5: 2ea72f188feac5017d4c7456f514e1e6 -work/ocean/INPUT/ocean_density.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_density.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_density.res.nc hashes: - binhash: 713054c2698c9b726e6919294d0cd77f + binhash: 1683d1032fb56b5f0cf63a890db0e0f4 md5: 2ea72f188feac5017d4c7456f514e1e6 work/ocean/INPUT/ocean_frazil.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_frazil.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_frazil.res.nc hashes: - binhash: 22ab41a2f0a889e792c8125f52cf4e72 - md5: dfd57082dc58081e9ed6b515f2d8a4c1 -work/ocean/INPUT/ocean_frazil.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_frazil.res.nc-01001231 - hashes: - binhash: 6345cfd669aecacfd0d8339c10cb17e0 + binhash: 59f983ebd48d8bb4b85e9a12671917bb md5: dfd57082dc58081e9ed6b515f2d8a4c1 work/ocean/INPUT/ocean_lap_friction.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_lap_friction.res.nc - hashes: - binhash: 11eb37e30be8cce78657bded1bd8a65f - md5: 2c1dbc74450e72925f9dbe7486689675 -work/ocean/INPUT/ocean_lap_friction.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_lap_friction.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_lap_friction.res.nc hashes: - binhash: b96b1672db12c8087b601472416cecc2 + binhash: 98f2376bee37c48160d09d8d090867b9 md5: 2c1dbc74450e72925f9dbe7486689675 work/ocean/INPUT/ocean_neutral.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_neutral.res.nc - hashes: - binhash: d8954d988e70888ba79ce523ef117af7 - md5: fab54ae81945add9ae5e850a4569ec34 -work/ocean/INPUT/ocean_neutral.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_neutral.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_neutral.res.nc hashes: - binhash: de88aa8e58c5d764651920e6383213d8 + binhash: b619d96024d81f27c146d5f1aee761a4 md5: fab54ae81945add9ae5e850a4569ec34 work/ocean/INPUT/ocean_pot_temp.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_pot_temp.res.nc - hashes: - binhash: 793efd9e219ad1d66a286f0b765fe0ac - md5: dd179d49d13b0b11d524df725b6eec05 -work/ocean/INPUT/ocean_pot_temp.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_pot_temp.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_pot_temp.res.nc hashes: - binhash: ffd56c4d215d1d18aefca6785a3fc09f + binhash: a5728081144e58008d000ee065410e00 md5: dd179d49d13b0b11d524df725b6eec05 work/ocean/INPUT/ocean_sbc.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_sbc.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_sbc.res.nc hashes: - binhash: 6a645a76335222699625a8063e5335fa - md5: 655ee14d694588f2cdb870535df0b042 -work/ocean/INPUT/ocean_sbc.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_sbc.res.nc-01001231 - hashes: - binhash: 329dd63b409dc0734e47fcbb7e8c3641 + binhash: fa7eb79171d6283309af858214d8a6d8 md5: 655ee14d694588f2cdb870535df0b042 work/ocean/INPUT/ocean_sigma_transport.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_sigma_transport.res.nc - hashes: - binhash: 792e0c6ba9ece8b9987f932b21ae218d - md5: fe527a9917d30955d0dc082271c1392f -work/ocean/INPUT/ocean_sigma_transport.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_sigma_transport.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_sigma_transport.res.nc hashes: - binhash: e008f1c286681579a71ec1e80dadfa79 + binhash: 1eb6035036f07358de1f9a03908d94f6 md5: fe527a9917d30955d0dc082271c1392f work/ocean/INPUT/ocean_solo.res: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_solo.res - hashes: - binhash: c4af5e4ea26c5eee6c91c2b0d08b42d4 - md5: 354221e55782d6c1ffff3f9c3df24ffd -work/ocean/INPUT/ocean_solo.res-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_solo.res-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_solo.res hashes: - binhash: 9313f2c7d7d46a1feb8bb60e8b28adfa + binhash: 612a0d10f3acfcf78d4a5fa9473eb369 md5: 354221e55782d6c1ffff3f9c3df24ffd work/ocean/INPUT/ocean_temp_salt.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_temp_salt.res.nc - hashes: - binhash: b413a820af0ba7d06d50cae45e80c29c - md5: cd1b95ef3ac60f9e1f5af29d6bb2d4d5 -work/ocean/INPUT/ocean_temp_salt.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_temp_salt.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_temp_salt.res.nc hashes: - binhash: a0ac8e3b42b305b2ac1c857722fb9a51 + binhash: 9f79790fcff30cd2284562045ee319d0 md5: cd1b95ef3ac60f9e1f5af29d6bb2d4d5 work/ocean/INPUT/ocean_thickness.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_thickness.res.nc - hashes: - binhash: 5b211a902a52ceefd178004a3caf96c1 - md5: 5a9bbbca1e6fd2c963db84dda5a84acf -work/ocean/INPUT/ocean_thickness.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_thickness.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_thickness.res.nc hashes: - binhash: 2af79712c147f1ac02c5bc3e1521c891 + binhash: 5d4f9bde26e4554fb34c5b9ea7dac325 md5: 5a9bbbca1e6fd2c963db84dda5a84acf work/ocean/INPUT/ocean_tracer.res: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_tracer.res - hashes: - binhash: 9c1f4deda56a2d4d24be1f6cce3a6624 - md5: 5e5db59b3963b8130ccc76557ed2badc -work/ocean/INPUT/ocean_tracer.res-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_tracer.res-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_tracer.res hashes: - binhash: 55a9b5afcabc6ebef42b27568bd387ff + binhash: 4219ff58220b565482be8527fba50863 md5: 5e5db59b3963b8130ccc76557ed2badc work/ocean/INPUT/ocean_velocity.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_velocity.res.nc - hashes: - binhash: 17c775a4c6960f6a240aa95e2050fa9e - md5: 287edec7690400b797b1cbf6e1ea60f0 -work/ocean/INPUT/ocean_velocity.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_velocity.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_velocity.res.nc hashes: - binhash: 3cd4f20e7feb83649fa55fbc8f654a42 + binhash: f63778183617313c83dbecc57619837c md5: 287edec7690400b797b1cbf6e1ea60f0 work/ocean/INPUT/ocean_velocity_advection.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_velocity_advection.res.nc - hashes: - binhash: 28a049ba6b9ccad44de45081e00fa675 - md5: 653ffae21c9f0a18718d441d591798a1 -work/ocean/INPUT/ocean_velocity_advection.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_velocity_advection.res.nc-01001231 + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_velocity_advection.res.nc hashes: - binhash: 2bf1b10a6ceff46f4d4aec58e44bb59a + binhash: 99a342d73a013f4caf0c5e2d11a90a40 md5: 653ffae21c9f0a18718d441d591798a1 work/ocean/INPUT/ocean_wombatlite.res.nc: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_wombatlite.res.nc + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_wombatlite.res.nc + hashes: + binhash: 314b4f06c270dd097fd57d0cfedee5c1 + md5: 951d801f3cc201f0c71aa88c367bed24 +work/ocean/INPUT/ocean_wombatlite.res.nc-01001231-v20241210: + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_wombatlite.res.nc-01001231-v20241210 hashes: - binhash: 4641dfbe6786dc415c13a3d3545d42f1 - md5: f5e0ab0b795358720dbd8a6c81141a52 -work/ocean/INPUT/ocean_wombatlite.res.nc-01001231: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/ocean/ocean_wombatlite.res.nc-01001231 + binhash: 45a1b096c145110b1b177e667e51c568 + md5: b1c0623cab6acda07cf0b629110b52c5 +work/ocean/INPUT/ocean_wombatlite.res.nc-01001231-v20241211: + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2024.12.10/ocean/ocean_wombatlite.res.nc-01001231-v20241211 hashes: - binhash: a1009e68225361bf5adcf96694f62a48 - md5: f5e0ab0b795358720dbd8a6c81141a52 + binhash: ecf161044653c537ac13002ef5d188b0 + md5: 951d801f3cc201f0c71aa88c367bed24 From ccee1cfbb7747c9200c7106cb8bb3fb79ce6a031 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 18 Dec 2024 12:18:12 +1100 Subject: [PATCH 3/6] Updated input_ice.nml --- ice/input_ice.nml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ice/input_ice.nml b/ice/input_ice.nml index b6ee0fe..d3ddebf 100644 --- a/ice/input_ice.nml +++ b/ice/input_ice.nml @@ -17,6 +17,18 @@ ice_pressure_on=.true. air_pressure_on=.false. ice_fwflux=.true. + iceberg=2 + iceberg_rate_s=0.5 + iceberg_rate_n=0.5 + iceberg_je_s=70 + runoff_je_s=45 + iceberg_js_n=201 + runoff_is_n=222 + runoff_ie_n=270 + runoff_js_n=230 + runoff_je_n=300 + runoff_lh=.true. + add_lprec=0.256E-07 use_ocnslope=.false. use_umask=.false. rotate_winds=.true. From 972fc7ea2f07d62a369ce25d8d403464a2488c68 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 18 Dec 2024 12:27:03 +1100 Subject: [PATCH 4/6] Manifest update --- manifests/input.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/input.yaml b/manifests/input.yaml index c8d1a83..5451daa 100644 --- a/manifests/input.yaml +++ b/manifests/input.yaml @@ -86,11 +86,11 @@ work/atmosphere/INPUT/ozone_1850_ESM1.anc: hashes: binhash: 7e82d4a83bf18e59277f026cbbee4c74 md5: a64a01e3b092085fca308524a75a1cee -work/atmosphere/INPUT/pftlookup_csiro_v16_17tiles_wtlnds.csv: - fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/share/atmosphere/land/biogeochemistry/resolution_independent/2020.05.19/pftlookup_csiro_v16_17tiles_wtlnds.csv +work/atmosphere/INPUT/pftlookup_cable3.csv: + fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/share/atmosphere/land/biogeochemistry/resolution_independent/2024.12.18/pftlookup_cable3.csv hashes: - binhash: 7b29e253f569372abb0a5f2769b58a3d - md5: 109d0702afd2cb0a66bf141faccaee30 + binhash: 004f14bafcd8b80befb28e93b28c537c + md5: 815c9662b2f6a09c820c2b47caaab678 work/atmosphere/INPUT/qrparm.mask: fullpath: /g/data/vk83/configurations/inputs/access-esm1p5/modern/share/atmosphere/grids/global.N96/2020.05.19/qrparm.mask hashes: From a4509f57fe2643cc12bad1f280e7085ffa9e8102 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Wed, 18 Dec 2024 17:14:34 +1100 Subject: [PATCH 5/6] Changes for qa checks and retest --- config.yaml | 4 +-- make_wombatlite_restart.py | 63 -------------------------------------- 2 files changed, 2 insertions(+), 65 deletions(-) delete mode 100755 make_wombatlite_restart.py diff --git a/config.yaml b/config.yaml index 6d0979b..74a02c2 100644 --- a/config.yaml +++ b/config.yaml @@ -138,10 +138,10 @@ runspersub: 1 # Misc restart_freq: 10YS -runlog: false +runlog: true manifest: reproduce: - exe: False + exe: true stacksize: unlimited diff --git a/make_wombatlite_restart.py b/make_wombatlite_restart.py deleted file mode 100755 index 5f97487..0000000 --- a/make_wombatlite_restart.py +++ /dev/null @@ -1,63 +0,0 @@ -import xarray as xr -import numpy as np -import matplotlib.pyplot as plt - -_ = xr.set_options(keep_attrs=True) - -restart_path = "/g/data/tm70/ds0092/model/inputs/access-esm1.5/modern/pre-industrial/restart/ocean/" - -rho = 1035 -mmol_to_mol = 1e-3 -mmol_m3_to_mol_kg = mmol_to_mol / rho -umol_m3_to_mol_kg = mmol_to_mol * mmol_m3_to_mol_kg - -unit_convert = { - "adic": mmol_m3_to_mol_kg, - "caco3": mmol_m3_to_mol_kg, - "alk": mmol_m3_to_mol_kg, - "dic": mmol_m3_to_mol_kg, - "no3": mmol_m3_to_mol_kg, - "phy": mmol_m3_to_mol_kg, - "o2": mmol_m3_to_mol_kg, - "fe": umol_m3_to_mol_kg, - "zoo": mmol_m3_to_mol_kg, - "det": mmol_m3_to_mol_kg, - "caco3_sediment": mmol_to_mol, - "det_sediment": mmol_to_mol -} - -old_res = xr.open_mfdataset( - f"{restart_path}/csiro_bgc*.nc", - decode_cf=False, - decode_times=False, - decode_timedelta=False, - decode_coords=False -) - -zero_array = 0 * old_res["adic"] - -wombatlite_res = [] -for var in old_res: - da_old = old_res[var] - da_new = da_old * unit_convert[var] - da_new.encoding = da_old.encoding - del da_new.attrs["checksum"] - if var in ["caco3_sediment", "det_sediment"]: - # Make 3D - da_new = da_new + zero_array.rename(var) - da_new = da_new.transpose(*list(zero_array.dims)) - da_new = da_new.where(da_new.zaxis_1 < 1.5, 0) - da_new.encoding['_FillValue'] = None - wombatlite_res.append(da_new) - -wombatlite_res = xr.merge(wombatlite_res) -wombatlite_res.attrs = old_res.attrs - -for coord in wombatlite_res.coords: - wombatlite_res[coord].encoding['_FillValue'] = None - -wombatlite_res.to_netcdf( - f"{restart_path}/ocean_wombatlite.res.nc", - format="NETCDF3_CLASSIC", - unlimited_dims=["Time"], -) From 03b2e7aa6bdfc4e98f4c72d35cbcda557856a789 Mon Sep 17 00:00:00 2001 From: Spencer Wong Date: Thu, 19 Dec 2024 13:38:56 +1100 Subject: [PATCH 6/6] Update metadata.yaml --- metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.yaml b/metadata.yaml index 973ba04..2ebc523 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -13,7 +13,7 @@ notes: |- "This research used the ACCESS-ESM1.5 model infrastructure provided by ACCESS-NRI, which is enabled by the Australian Government's National Collaborative Research Infrastructure Strategy (NCRIS)." keywords: - global - - access-esm1.5 + - access-esm1.6 realm: - atmos - land @@ -23,6 +23,6 @@ realm: nominal_resolution: 100 km reference: https://doi.org/10.1071/ES19035 license: CC-BY-4.0 -model: ACCESS-ESM1.5 +model: ACCESS-ESM1.6 version: '1.1' url: https://github.com/ACCESS-NRI/access-esm1.5-configs.git