remove co2 from datm stream, use WOMBAT v3 co2

ACCESS-NRI · May 21, 2024 · 69d235c · 69d235c
1 parent a890f63
commit 69d235c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 36 deletions.
diff --git a/config.yaml b/config.yaml
@@ -42,8 +42,6 @@ input:
     - /g/data/vk83/experiments/inputs/access-om3/wombat/initial_conditions/global.1deg/2024.04.02/GLODAPv2.2016b.TCO2_fillmiss.nc
     - /g/data/vk83/experiments/inputs/access-om3/wombat/initial_conditions/global.1deg/2024.04.02/init_ocean_wombatlite.res.nc
     - /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data
-    - /g/data/tm70/ds0092/model/inputs/access-om3/RYF.co2.test.1990_1991.nc
-    - /g/data/tm70/ds0092/model/inputs/access-om3/RYF.o2.test.1990_1991.nc
 
 collate: false
 runlog: false

diff --git a/data_table b/data_table
@@ -2,7 +2,7 @@
 #
 # gridname | fieldname_code            | fieldname_file | file_name                                      | ongrid    | factor
 # ---------------------------------------------------------------------------------------------------------------------------------
-"OCN"      , "co2_flux_pcair_atm"      , ""             , ""                                             , "none"    , 284.262e-06
+"OCN"      , "co2_flux_pcair_atm"      , ""             , ""                                             , "none"    , 315.165e-06
 "OCN"      , "co2_nat_flux_pcair_atm"  , ""             , ""                                             , "none"    , 284.262e-06
 "OCN"      , "o2_flux_pcair_atm"       , ""             , ""                                             , "none"    , 0.21
 "OCN"      , "dry_dep_fe_flux_ice_ocn" , "dust"         , "./INPUT/dust.nc"                              , "none"    , -1.0e-06

diff --git a/datm.streams.xml b/datm.streams.xml
@@ -195,25 +195,4 @@
    </datavars>
    <offset>0</offset>
   </stream_info>
-
-  <stream_info name="co2.test">
-   <taxmode>cycle</taxmode>
-   <tintalgo>linear</tintalgo>
-   <readmode>single</readmode>
-   <mapalgo>bilinear</mapalgo>
-   <dtlimit>1.5</dtlimit>
-   <year_first>1900</year_first>
-   <year_last>1900</year_last>
-   <year_align>1</year_align>
-   <vectors>null</vectors>
-   <meshfile>./INPUT/JRA55do-ESMFmesh.nc</meshfile>
-   <lev_dimname>null</lev_dimname>
-   <datafiles>
-      <file>./INPUT/RYF.co2.test.1990_1991.nc</file>
-   </datafiles>
-   <datavars>
-      <var>co2 Sa_co2prog</var>
-   </datavars>
-   <offset>0</offset>
-  </stream_info>
 </file>
diff --git a/datm_in b/datm_in
@@ -2,7 +2,7 @@
   datamode = "CORE_IAF_JRA55do"
   factorfn_data = "null"
   factorfn_mesh = "null"
-  flds_co2 = .true.
+  flds_co2 = .false.
   flds_presaero = .false.
   flds_presndep = .false.
   flds_preso3 = .false.

diff --git a/diag_table b/diag_table
@@ -238,6 +238,9 @@
 "ocean_sfc",  "co2_flux_alpha_ocn",       "co2_flux_alpha_ocn",       "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
 "ocean_sfc",  "co2_flux_csurf_ocn",       "co2_flux_csurf_ocn",       "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
 "ocean_sfc",  "co2_flux_sc_no_ocn",       "co2_flux_sc_no_ocn",       "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
+"ocean_sfc",  "co2_nat_flux_alpha_ocn",   "co2_nat_flux_alpha_ocn",   "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
+"ocean_sfc",  "co2_nat_flux_csurf_ocn",   "co2_nat_flux_csurf_ocn",   "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
+"ocean_sfc",  "co2_nat_flux_sc_no_ocn",   "co2_nat_flux_sc_no_ocn",   "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
 "ocean_sfc",  "o2_flux_alpha_ocn",        "o2_flux_alpha_ocn",        "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
 "ocean_sfc",  "o2_flux_csurf_ocn",        "o2_flux_csurf_ocn",        "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
 "ocean_sfc",  "o2_flux_sc_no_ocn",        "o2_flux_sc_no_ocn",        "access-om3.mom6.h.ocean_sfc%4yr-%2mo", "all", "none", "none", 2
@@ -246,6 +249,9 @@
 "atmos_sfc",  "co2_flux_pcair_atm",       "co2_flux_pcair_atm",       "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
 "atmos_sfc",  "co2_flux_u10_atm",         "co2_flux_u10_atm",         "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
 "atmos_sfc",  "co2_flux_psurf_atm",       "co2_flux_psurf_atm",       "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
+"atmos_sfc",  "co2_nat_flux_pcair_atm",   "co2_nat_flux_pcair_atm",   "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
+"atmos_sfc",  "co2_nat_flux_u10_atm",     "co2_nat_flux_u10_atm",     "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
+"atmos_sfc",  "co2_nat_flux_psurf_atm",   "co2_nat_flux_psurf_atm",   "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
 "atmos_sfc",  "o2_flux_pcair_atm",        "o2_flux_pcair_atm",        "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
 "atmos_sfc",  "o2_flux_u10_atm",          "o2_flux_u10_atm",          "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
 "atmos_sfc",  "o2_flux_psurf_atm",        "o2_flux_psurf_atm",        "access-om3.mom6.h.atmos_sfc%4yr-%2mo", "all", "none", "none", 2
diff --git a/manifests/input.yaml b/manifests/input.yaml
@@ -36,11 +36,6 @@ work/INPUT/JRA55do-ESMFmesh.nc:
   hashes:
     binhash: 100055c7cbb1d91ae5036ce7ba102fe0
     md5: 1c8481b8c85f59b6cbfc2ed5bc24c77d
-work/INPUT/RYF.co2.test.1990_1991.nc:
-  fullpath: /g/data/tm70/ds0092/model/inputs/access-om3/RYF.co2.test.1990_1991.nc
-  hashes:
-    binhash: 556d0de3f999c712e1ad4b3e4a84eab9
-    md5: abf36670ad8117284ff49ac1341359e4
 work/INPUT/RYF.friver.1990_1991.nc:
   fullpath: /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data/RYF.friver.1990_1991.nc
   hashes:
@@ -56,11 +51,6 @@ work/INPUT/RYF.licalvf.1990_1991.nc:
   hashes:
     binhash: f219ce98f3fcbe6f8ec517740f01aee1
     md5: 6f927702cbc023cc20d3ddd69695f0a0
-work/INPUT/RYF.o2.test.1990_1991.nc:
-  fullpath: /g/data/tm70/ds0092/model/inputs/access-om3/RYF.o2.test.1990_1991.nc
-  hashes:
-    binhash: 24b4b77a601830270a65ccf14147ba3b
-    md5: 46158680d7170afc7718ca1a295f7e68
 work/INPUT/RYF.prra.1990_1991.nc:
   fullpath: /g/data/vk83/experiments/inputs/JRA-55/RYF/v1-4/data/RYF.prra.1990_1991.nc
   hashes:

diff --git a/nuopc.runconfig b/nuopc.runconfig
@@ -101,7 +101,7 @@ ALLCOMP_attributes::
      data_assimilation_rof = .false.
      data_assimilation_wav = .false.
      flds_bgc_oi = .false.
-     flds_co2a = .true.
+     flds_co2a = .false.
      flds_co2b = .false.
      flds_co2c = .false.
      flds_i2o_per_cat = .false.