Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 11 commits into from
Oct 21, 2024
Merged

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

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c916cb8
fix 190: adding PR, tauu, tauv to support ENSO evaluation
Oct 4, 2024
d6020f2
adding documentation for 190
Oct 4, 2024
bb53906
Update NOAA-CIRES-20CR-V2.yml
rbeucher Oct 4, 2024
8e9bc48
Table must have constant width
max-anu Oct 8, 2024
2bada4d
new line required at end of file
Oct 8, 2024
9a43e1f
Merge branch 'main' into fix_190
max-anu Oct 8, 2024
5ef20cf
Merge branch 'main' into fix_190
rbeucher Oct 9, 2024
a8d65c7
adding option to make parameter its negative so tauu can be flipped
Oct 14, 2024
156bf7d
tauv was upside down
Oct 14, 2024
e55487b
fixing lost attributes
Oct 15, 2024
f9f8061
Merge branch 'main' into fix_190
flicj191 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/sphinx/source/input.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
+------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+
Expand Down
18 changes: 18 additions & 0 deletions esmvaltool/cmorizers/data/cmor_config/NOAA-CIRES-20CR-V2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 3 additions & 1 deletion esmvaltool/cmorizers/data/datasets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 7 additions & 1 deletion esmvaltool/cmorizers/data/downloaders/datasets/noaa_cires_20cr_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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')
3 changes: 3 additions & 0 deletions esmvaltool/cmorizers/data/formatters/datasets/ncep_ncar_r1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = -1 * cube
max-anu marked this conversation as resolved.
Show resolved Hide resolved

utils.save_variable(
cube,
short_name,
Expand Down
3 changes: 3 additions & 0 deletions esmvaltool/recipes/examples/recipe_check_obs.yml
View file
Open in desktop
Original file line number Diff 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