diff --git a/config.yaml b/config.yaml index 269cb861..9044b369 100644 --- a/config.yaml +++ b/config.yaml @@ -16,7 +16,7 @@ # Note: if laboratory is relative path, it is relative to shortpath/$USER laboratory: access-esm -jobname: pre-industrial +jobname: Nov25-NewNitrogen queue: normalsr walltime: 2:30:00 jobfs: 1500MB @@ -30,7 +30,7 @@ modules: use: - /g/data/vk83/modules load: - - access-esm1p6/2025.11.001 + - access-esm1p6/2025.11.002 # Model configuration model: access-esm1.6 diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 7584da5e..49067fc7 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -7,10 +7,10 @@ work/atmosphere/um_hg3.exe: binhash: 4f43750a722b4be2d3c4a9ca650e1f7d md5: 38bbaca9e1b13b55d59f0aed5263ffff work/ice/cice_access-esm1.6_360x300_12x1_12p.exe: - fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/oneapi-2025.2.0/cice5-git.access-esm1.6-2025.11.000_access-esm1.6-c6osiyxy5znfhfg4ygg5of74omdzd6wh/bin/cice_access-esm1.6_360x300_12x1_12p.exe + fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/oneapi-2025.2.0/cice5-git.access-esm1.6-2025.11.001_access-esm1.6-6umbsy5dlepupzm7lxm2ubyb4rsxwetj/bin/cice_access-esm1.6_360x300_12x1_12p.exe hashes: - binhash: 48540f5cfa500592d394363d74274e3d - md5: 41f61ad8db6ed4c43d9477de54ab5877 + binhash: 7c99150ca50ce68b1e59d11ca869660e + md5: 1b2bdff3029668fa3249f69207e2d690 work/ocean/mom5_access_cm: fullpath: /g/data/vk83/apps/spack/0.22/restricted/ukmo/release/linux-rocky8-x86_64_v4/oneapi-2025.2.0/mom5-git.2025.05.000_access-esm1.6-tzlv4hwxcbh4u2alvbiwnpnxjg67crnu/bin/mom5_access_cm hashes: diff --git a/manifests/restart.yaml b/manifests/restart.yaml index 55aa378f..dc4efa67 100644 --- a/manifests/restart.yaml +++ b/manifests/restart.yaml @@ -47,18 +47,6 @@ work/ice/RESTART/iced.2145-01-01-00000.nc: hashes: binhash: b140c0f370cbd11cba55581268e644c1 md5: 9b38a443da662dfef1ce950042dd98ed -work/ice/RESTART/iced.2145-01-01-00000.nc.back: - copy: true - fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2025.11.20/ice/iced.2145-01-01-00000.nc.back - hashes: - binhash: 12424ed20a20bff5ef67fbfc2e03fa76 - md5: b9b59b71f031ac1538ab5a763c5c7589 -work/ice/RESTART/iced.2145-01-01-00000.nc.back2: - copy: true - fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2025.11.20/ice/iced.2145-01-01-00000.nc.back2 - hashes: - binhash: 577817aed7ab28464634feabbb690c63 - md5: 30aa4c9195a2354304eff8409933902a work/ice/RESTART/mice.nc: copy: true fullpath: /g/data/vk83/prerelease/configurations/inputs/access-esm1p6/modern/pre-industrial/restart/2025.11.20/ice/mice.nc diff --git a/ocean/diagnostic_profiles/diag_table_wombatlite b/ocean/diagnostic_profiles/diag_table_wombatlite index abb41ecc..fade1d9b 100644 --- a/ocean/diagnostic_profiles/diag_table_wombatlite +++ b/ocean/diagnostic_profiles/diag_table_wombatlite @@ -70,21 +70,6 @@ ACCESS-ESM_1p6 "ocean-3d-tx_trans_rho_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" "ocean_model", "tx_trans_rho_gm", "tx_trans_rho_gm", "ocean-3d-tx_trans_rho_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"ocean-3d-tx_trans_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "tx_trans_gm", "tx_trans_gm", "ocean-3d-tx_trans_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"ocean-3d-tx_trans-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "tx_trans", "tx_trans", "ocean-3d-tx_trans-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"ocean-3d-tz_trans-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "tz_trans", "tz_trans", "ocean-3d-tz_trans-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"ocean-3d-tx_trans_submeso-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "tx_trans_submeso", "tx_trans_submeso", "ocean-3d-tx_trans_submeso-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"ocean-3d-ty_trans_submeso-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "ty_trans_submeso", "ty_trans_submeso", "ocean-3d-ty_trans_submeso-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "ocean-3d-tz_trans_sq-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" "ocean_model", "tz_trans_sq", "tz_trans_sq", "ocean-3d-tz_trans_sq-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -187,9 +172,6 @@ ACCESS-ESM_1p6 "ocean-3d-lap_fric_v-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" "ocean_model", "lap_fric_v", "lap_fric_v", "ocean-3d-lap_fric_v-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"ocean-3d-wt-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" -"ocean_model", "wt", "wt", "ocean-3d-wt-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "ocean-3d-wrhot-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years" "ocean_model", "wrhot", "wrhot", "ocean-3d-wrhot-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -217,24 +199,42 @@ ACCESS-ESM_1p6 "ocean-3d-bv_freq-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "bv_freq", "bv_freq", "ocean-3d-bv_freq-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"ocean-3d-tx_trans-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "tx_trans", "tx_trans", "ocean-3d-tx_trans-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-3d-tx_trans_gm-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "tx_trans_gm", "tx_trans_gm", "ocean-3d-tx_trans_gm-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-3d-tx_trans_submeso-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "tx_trans_submeso", "tx_trans_submeso", "ocean-3d-tx_trans_submeso-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + "ocean-3d-ty_trans-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "ty_trans", "ty_trans", "ocean-3d-ty_trans-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "ocean-3d-ty_trans_gm-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "ty_trans_gm", "ty_trans_gm", "ocean-3d-ty_trans_gm-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"ocean-3d-ty_trans_submeso-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "ty_trans_submeso", "ty_trans_submeso", "ocean-3d-ty_trans_submeso-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + "ocean-3d-ty_trans_rho-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "ty_trans_rho", "ty_trans_rho", "ocean-3d-ty_trans_rho-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "ocean-3d-ty_trans_rho_gm-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "ty_trans_rho_gm", "ty_trans_rho_gm", "ocean-3d-ty_trans_rho_gm-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"ocean-3d-tz_trans-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "tz_trans", "tz_trans", "ocean-3d-tz_trans-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + "ocean-3d-u-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "u", "u", "ocean-3d-u-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "ocean-3d-v-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "v", "v", "ocean-3d-v-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"ocean-3d-wt-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "wt", "wt", "ocean-3d-wt-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + "ocean-3d-temp_tendency-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "temp_tendency", "temp_tendency", "ocean-3d-temp_tendency-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -292,9 +292,6 @@ ACCESS-ESM_1p6 "oceanbgc-3d-dicr-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "dicr", "dicr", "oceanbgc-3d-dicr-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-dicp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "dicp", "dicp", "oceanbgc-3d-dicp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-fe-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "fe", "fe", "oceanbgc-3d-fe-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -307,30 +304,12 @@ ACCESS-ESM_1p6 "oceanbgc-3d-radbio-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "radbio", "radbio", "oceanbgc-3d-radbio-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-radmid-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "radmid", "radmid", "oceanbgc-3d-radmid-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-radmld-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "radmld", "radmld", "oceanbgc-3d-radmld-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-phy_mu-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "phy_mu", "phy_mu", "oceanbgc-3d-phy_mu-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "oceanbgc-3d-phy_mumax-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "phy_mumax", "phy_mumax", "oceanbgc-3d-phy_mumax-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-pchl_mu-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "pchl_mu", "pchl_mu", "oceanbgc-3d-pchl_mu-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-pchl_lpar-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "pchl_lpar", "pchl_lpar", "oceanbgc-3d-pchl_lpar-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phy_kni-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phy_kni", "phy_kni", "oceanbgc-3d-phy_kni-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phy_kfe-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phy_kfe", "phy_kfe", "oceanbgc-3d-phy_kfe-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-phy_lpar-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "phy_lpar", "phy_lpar", "oceanbgc-3d-phy_lpar-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -340,60 +319,15 @@ ACCESS-ESM_1p6 "oceanbgc-3d-phy_lfer-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "phy_lfer", "phy_lfer", "oceanbgc-3d-phy_lfer-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-phy_dfeupt-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phy_dfeupt", "phy_dfeupt", "oceanbgc-3d-phy_dfeupt-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phy_feupreg-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phy_feupreg", "phy_feupreg", "oceanbgc-3d-phy_feupreg-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phy_fedoreg-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phy_fedoreg", "phy_fedoreg", "oceanbgc-3d-phy_fedoreg-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-feIII-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "feIII", "feIII", "oceanbgc-3d-feIII-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-felig-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "felig", "felig", "oceanbgc-3d-felig-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-fecol-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "fecol", "fecol", "oceanbgc-3d-fecol-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-fesources-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "fesources", "fesources", "oceanbgc-3d-fesources-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "oceanbgc-3d-fesinks-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "fesinks", "fesinks", "oceanbgc-3d-fesinks-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-feprecip-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "feprecip", "feprecip", "oceanbgc-3d-feprecip-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-fescaven-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "fescaven", "fescaven", "oceanbgc-3d-fescaven-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-fescadet-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "fescadet", "fescadet", "oceanbgc-3d-fescadet-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-feloss-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "feloss", "feloss", "oceanbgc-3d-feloss-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-fecoag2det-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "fecoag2det", "fecoag2det", "oceanbgc-3d-fecoag2det-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-htotal-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "htotal", "htotal", "oceanbgc-3d-htotal-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-ahtotal-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "ahtotal", "ahtotal", "oceanbgc-3d-ahtotal-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phygrow-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phygrow", "phygrow", "oceanbgc-3d-phygrow-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phyresp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phyresp", "phyresp", "oceanbgc-3d-phyresp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-phymort-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "phymort", "phymort", "oceanbgc-3d-phymort-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-zooeps-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "zooeps", "zooeps", "oceanbgc-3d-zooeps-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -403,30 +337,6 @@ ACCESS-ESM_1p6 "oceanbgc-3d-zoograzdet-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "zoograzdet", "zoograzdet", "oceanbgc-3d-zoograzdet-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-zooresp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zooresp", "zooresp", "oceanbgc-3d-zooresp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-zoomort-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zoomort", "zoomort", "oceanbgc-3d-zoomort-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-zooslopphy-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zooslopphy", "zooslopphy", "oceanbgc-3d-zooslopphy-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-zooslopdet-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zooslopdet", "zooslopdet", "oceanbgc-3d-zooslopdet-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-zooexcrphy-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zooexcrphy", "zooexcrphy", "oceanbgc-3d-zooexcrphy-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-zooexcrdet-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "zooexcrdet", "zooexcrdet", "oceanbgc-3d-zooexcrdet-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-reminr-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "reminr", "reminr", "oceanbgc-3d-reminr-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-detremi-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "detremi", "detremi", "oceanbgc-3d-detremi-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-caldiss-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "caldiss", "caldiss", "oceanbgc-3d-caldiss-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -439,15 +349,12 @@ ACCESS-ESM_1p6 "oceanbgc-3d-omega_cal-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "omega_cal", "omega_cal", "oceanbgc-3d-omega_cal-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-3d-co3-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "co3", "co3", "oceanbgc-3d-co3-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - -"oceanbgc-3d-co2_star-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "co2_star", "co2_star", "oceanbgc-3d-co2_star-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-3d-det_vmove-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "det_vmove", "det_vmove", "oceanbgc-3d-det_vmove-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"oceanbgc-3d-caco3_vmove-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"generic_wombatlite", "caco3_vmove", "caco3_vmove", "oceanbgc-3d-caco3_vmove-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 + "oceanbgc-3d-alk_correct-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "alk_correct", "alk_correct", "oceanbgc-3d-alk_correct-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -724,8 +631,8 @@ ACCESS-ESM_1p6 "oceanbgc-2d-dic_stf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "dic_stf", "dic_stf", "oceanbgc-2d-dic_stf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-2d-dicp_stf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "dicp_stf", "dicp_stf", "oceanbgc-2d-dicp_stf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"oceanbgc-2d-no3_stf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"generic_wombatlite", "no3_stf", "no3_stf", "oceanbgc-2d-no3_stf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "oceanbgc-2d-fe_stf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "fe_stf", "fe_stf", "oceanbgc-2d-fe_stf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -733,9 +640,6 @@ ACCESS-ESM_1p6 "oceanbgc-2d-pco2-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "pco2", "pco2", "oceanbgc-2d-pco2-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-2d-paco2-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"generic_wombatlite", "paco2", "paco2", "oceanbgc-2d-paco2-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 - "oceanbgc-2d-pprod_gross_2d-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "generic_wombatlite", "pprod_gross_2d", "pprod_gross_2d", "oceanbgc-2d-pprod_gross_2d-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -790,8 +694,8 @@ ACCESS-ESM_1p6 "oceanbgc-2d-surface_dic-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "surface_dic", "surface_dic", "oceanbgc-2d-surface_dic-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 -"oceanbgc-2d-surface_dicp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" -"ocean_model", "surface_dicp", "surface_dicp", "oceanbgc-2d-surface_dicp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 +"oceanbgc-2d-surface_pchl-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" +"ocean_model", "surface_pchl", "surface_pchl", "oceanbgc-2d-surface_pchl-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 "oceanbgc-2d-surface_dicr-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years" "ocean_model", "surface_dicr", "surface_dicr", "oceanbgc-2d-surface_dicr-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2 @@ -816,7 +720,6 @@ ACCESS-ESM_1p6 "ocean_model", "dic_global_ave", "dic_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "alk_global_ave", "alk_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "dicr_global_ave", "dicr_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 -"ocean_model", "dicp_global_ave", "dicp_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "caco3_global_ave", "caco3_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "det_global_ave", "det_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "phy_global_ave", "phy_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 @@ -849,9 +752,17 @@ ACCESS-ESM_1p6 "ocean_model", "dic_surface_ave", "dic_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "alk_surface_ave", "alk_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "dicr_surface_ave", "dicr_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 -"ocean_model", "dicp_surface_ave", "dicp_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "caco3_surface_ave", "caco3_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "det_surface_ave", "det_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "phy_surface_ave", "phy_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "pchl_surface_ave", "pchl_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 "ocean_model", "zoo_surface_ave", "zoo_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2 + + +# daily 2d ocean fields + +"ocean-2d-surface_temp-1daily-mean-ym%4yr%2mo", 1, "days", 1, "days", "time", 1, "years" +"ocean_model", "surface_temp", "surface_temp", "ocean-2d-surface_temp-1daily-mean-ym%4yr%2mo", "all", "average", "none", 2 + +"ocean-2d-squared_surface_temp-1daily-mean-ym%4yr%2mo", 1, "days", 1, "days", "time", 1, "years" +"ocean_model", "squared_surface_temp", "squared_surface_temp", "ocean-2d-squared_surface_temp-1daily-mean-ym%4yr%2mo", "all", "average", "none", 2 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 old mode 100644 new mode 100755 index 7212bdd3..c22a9c9b --- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml +++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_wombatlite_source.yaml @@ -158,11 +158,6 @@ diag_table: fields: tx_trans_rho: tx_trans_rho_gm: - tx_trans_gm: - tx_trans: - tz_trans: - tx_trans_submeso: - ty_trans_submeso: tz_trans_sq: rho_dzt: pot_rho_0: @@ -197,7 +192,6 @@ diag_table: salt_zflux_adv: lap_fric_u: lap_fric_v: - wt: wrhot: @@ -214,12 +208,18 @@ diag_table: press: rho: bv_freq: + tx_trans: + tx_trans_gm: + tx_trans_submeso: ty_trans: ty_trans_gm: + ty_trans_submeso: ty_trans_rho: ty_trans_rho_gm: + tz_trans: u: v: + wt: temp_tendency: salt_tendency: dzt: @@ -248,59 +248,27 @@ diag_table: dic: alk: dicr: - dicp: fe: pprod_gross: zprod_gross: radbio: - radmid: - radmld: phy_mu: phy_mumax: - pchl_mu: - pchl_lpar: - phy_kni: - phy_kfe: phy_lpar: phy_lnit: phy_lfer: - phy_dfeupt: - phy_feupreg: - phy_fedoreg: - feIII: - felig: - fecol: fesources: fesinks: - feprecip: - fescaven: - fescadet: - feloss: - fecoag2det: htotal: - ahtotal: - phygrow: - phyresp: - phymort: zooeps: zoograzphy: zoograzdet: - zooresp: - zoomort: - zooslopphy: - zooslopdet: - zooexcrphy: - zooexcrdet: - reminr: - detremi: caldiss: pic2poc: omega_ara: omega_cal: - co3: - co2_star: - htotal: det_vmove: + caco3_vmove: alk_correct: dic_correct: @@ -407,10 +375,9 @@ diag_table: fields: o2_stf: dic_stf: - dicp_stf: + no3_stf: fe_stf: pco2: - paco2: pprod_gross_2d: export_prod: export_inorg: @@ -436,7 +403,7 @@ diag_table: surface_phy: surface_alk: surface_dic: - surface_dicp: + surface_pchl: surface_dicr: surface_o2: @@ -466,7 +433,6 @@ diag_table: dic_global_ave: alk_global_ave: dicr_global_ave: - dicp_global_ave: caco3_global_ave: det_global_ave: phy_global_ave: @@ -499,10 +465,17 @@ diag_table: dic_surface_ave: alk_surface_ave: dicr_surface_ave: - dicp_surface_ave: caco3_surface_ave: det_surface_ave: phy_surface_ave: pchl_surface_ave: zoo_surface_ave: + 'daily 2d ocean fields': + defaults: # these can be overridden for individual fields below + file_name_dimension: 2d # descriptor for filename, e.g. 3d, 2d, scalar + output_freq: 1 # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run) + output_freq_units: days # time units for output: years, months, days, hours, minutes, or seconds + fields: + surface_temp: + squared_surface_temp: