Adding pr, tauu, tauv NOAA-CIRES-20CR-V2 CMORISER (#3763)

Co-authored-by: Max Proft <[email protected]> Co-authored-by: Felicity Chun <[email protected]>
ESMValGroup · Oct 21, 2024 · 5009b47 · 5009b47
1 parent 8d6cf2b
commit 5009b47
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 3 deletions.
diff --git a/doc/sphinx/source/input.rst b/doc/sphinx/source/input.rst
@@ -410,7 +410,7 @@ A list of the datasets for which a CMORizers is available is provided in the fol
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
 | NIWA-BS                      | toz, tozStderr (Amon)                                                                                |   3  | NCL             |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
-| NOAA-CIRES-20CR-V2           | clt, clwvi, hus, prw, rlut, rsut (Amon)                                                              |   2  | Python          |
+| NOAA-CIRES-20CR-V2           | clt, clwvi, hus, prw, rlut, rsut, pr, tauu, tauv (Amon)                                              |   2  | Python          |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
 | NOAA-CIRES-20CR-V3           | clt, clwvi, hus, prw, rlut, rlutcs, rsut, rsutcs (Amon)                                              |   2  | Python          |
 +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+

diff --git a/esmvaltool/cmorizers/data/cmor_config/NOAA-CIRES-20CR-V2.yml b/esmvaltool/cmorizers/data/cmor_config/NOAA-CIRES-20CR-V2.yml
@@ -44,3 +44,21 @@ variables:
     mip: Amon
     raw: uswrf
     file: 'uswrf.ntat.mon.mean.nc'
+  pr_month:
+    short_name: pr
+    mip: Amon
+    raw: prate
+    file: 'prate.mon.mean.nc'
+  tauu_month:
+    short_name: tauu
+    mip: Amon
+    raw: uflx
+    file: 'uflx.mon.mean.nc'
+    make_negative: true
+  tauv_month:
+    short_name: tauv
+    mip: Amon
+    raw: vflx
+    file: 'vflx.mon.mean.nc'
+    make_negative: true
+
diff --git a/esmvaltool/cmorizers/data/datasets.yml b/esmvaltool/cmorizers/data/datasets.yml
@@ -1054,7 +1054,9 @@ datasets:
         gaussian/monolevel/tcdc.eatm.mon.mean.nc
         gaussian/monolevel/ulwrf.ntat.mon.mean.nc
         gaussian/monolevel/uswrf.ntat.mon.mean.nc
-
+        gaussian/monolevel/prate.mon.mean.nc
+        gaussian/monolevel/uflx.mon.mean.nc
+        gaussian/monolevel/vflx.mon.mean.nc
   NOAA-CIRES-20CR-V3:
     tier: 2
     source: ftp.cdc.noaa.gov/Projects/20thC_ReanV3/Monthlies/

diff --git a/esmvaltool/cmorizers/data/downloaders/datasets/noaa_cires_20cr_v2.py b/esmvaltool/cmorizers/data/downloaders/datasets/noaa_cires_20cr_v2.py
@@ -34,7 +34,7 @@ def download_dataset(config, dataset, dataset_info, start_date, end_date,
     )
     downloader.connect()
 
-    downloader.set_cwd("Projects/20thC_ReanV2/Monthlies/")
+    downloader.set_cwd("/Projects/20thC_ReanV2/Monthlies/")
     downloader.download_file("monolevel/cldwtr.eatm.mon.mean.nc",
                              sub_folder='surface')
     downloader.download_file("monolevel/pr_wtr.eatm.mon.mean.nc",
@@ -47,3 +47,9 @@ def download_dataset(config, dataset, dataset_info, start_date, end_date,
                              sub_folder='surface_gauss')
     downloader.download_file("gaussian/monolevel/uswrf.ntat.mon.mean.nc",
                              sub_folder='surface_gauss')
+    downloader.download_file("gaussian/monolevel/prate.mon.mean.nc",
+                             sub_folder='surface_gauss')
+    downloader.download_file("gaussian/monolevel/uflx.mon.mean.nc",
+                             sub_folder='surface_gauss')
+    downloader.download_file("gaussian/monolevel/vflx.mon.mean.nc",
+                             sub_folder='surface_gauss')
diff --git a/esmvaltool/cmorizers/data/formatters/datasets/ncep_ncar_r1.py b/esmvaltool/cmorizers/data/formatters/datasets/ncep_ncar_r1.py
@@ -143,6 +143,9 @@ def _extract_variable(short_name, var, cfg, raw_filepath, out_dir):
 
     cube = _fix_coordinates(cube, definition, cmor_info)
 
+    if var.get("make_negative"):
+        cube.data = -1 * cube.data
+
     utils.save_variable(
         cube,
         short_name,

diff --git a/esmvaltool/recipes/examples/recipe_check_obs.yml b/esmvaltool/recipes/examples/recipe_check_obs.yml
@@ -714,6 +714,9 @@ diagnostics:
       prw:
       rlut:
       rsut:
+      pr:
+      tauu:
+      tauv:
     additional_datasets:
       - {dataset: NOAA-CIRES-20CR-V2, project: OBS6, mip: Amon, tier: 2,
          type: reanaly, version: v2, start_year: 1871, end_year: 2012}
-Original file line number
+Diff line change
@@ Expand Up / @@ -714,6 +714,9 @@ diagnostics: @@
           prw:
           rlut:
           rsut:
+          pr:
+          tauu:
+          tauv:
         additional_datasets:
           - {dataset: NOAA-CIRES-20CR-V2, project: OBS6, mip: Amon, tier: 2,
              type: reanaly, version: v2, start_year: 1871, end_year: 2012}
@@ Expand Down @@