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 CORDEX facets #2220

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

adding CORDEX facets #2220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6f1123
added CORDEX-Reklies facets
larsbuntemeyer Oct 6, 2023
7524501
added adjust and ESD facets
larsbuntemeyer Oct 6, 2023
7f47e17
added integation test for CORDEX-Adjust
larsbuntemeyer Oct 28, 2023
3aae9ff
added integation test for CORDEX-ESD
larsbuntemeyer Oct 28, 2023
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
36 changes: 36 additions & 0 deletions esmvalcore/esgf/facets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,39 @@
'product': 'product',
'short_name': 'variable',
},
'CORDEX-Reklies': {
'dataset': 'rcm_name',
'driver': 'driving_model',
'domain': 'domain',
'ensemble': 'ensemble',
'exp': 'experiment',
'frequency': 'time_frequency',
'institute': 'institute',
'product': 'product',
'short_name': 'variable',
},
'CORDEX-Adjust': {
'dataset': 'rcm_name',
'driver': 'driving_model',
'domain': 'domain',
'ensemble': 'ensemble',
'exp': 'experiment',
'frequency': 'time_frequency',
'institute': 'institute',
'product': 'product',
'short_name': 'variable',
},
'CORDEX-ESD': {
'dataset': 'rcm_name',
'driver': 'driving_model',
'domain': 'domain',
'ensemble': 'ensemble',
'exp': 'experiment',
'frequency': 'time_frequency',
'institute': 'institute',
'product': 'product',
'short_name': 'variable',
},
'obs4MIPs': {
'dataset': 'source_id',
'frequency': 'time_frequency',
Expand Down Expand Up @@ -73,6 +106,9 @@
},
'CMIP6': {},
'CORDEX': {},
'CORDEX-Reklies': {},
'CORDEX-Adjust': {},
'CORDEX-ESD': {},
'obs4MIPs': {},
}
"""Cache for the mapping between recipe/filesystem and ESGF dataset names."""
Expand Down
227 changes: 134 additions & 93 deletions tests/integration/esgf/test_search_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,96 +8,133 @@

from esmvalcore.esgf import _search, download, find_files

VARIABLES = [{
'dataset': 'cccma_cgcm3_1',
'ensemble': 'run1',
'exp': 'historical',
'frequency': 'mon',
'project': 'CMIP3',
'short_name': 'tas',
'version': 'v1',
}, {
'dataset': 'inmcm4',
'ensemble': 'r1i1p1',
'exp': ['historical', 'rcp85'],
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'version': 'v20130207',
}, {
'dataset': 'FIO-ESM',
'ensemble': 'r1i1p1',
'exp': 'historical',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
}, {
'dataset': 'HadGEM2-CC',
'ensemble': 'r1i1p1',
'exp': 'rcp85',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'timerange': '2080/2100',
}, {
'dataset': 'EC-EARTH',
'ensemble': 'r1i1p1',
'exp': 'historical',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'start_year': 1990, # test legacy way of specifying timerange
'end_year': 1999,
}, {
'dataset': 'AWI-ESM-1-1-LR',
'ensemble': 'r1i1p1f1',
'exp': 'historical',
'grid': 'gn',
'mip': 'Amon',
'project': 'CMIP6',
'short_name': 'tas',
'timerange': '2000/2001',
'version': 'v20200212',
}, {
'dataset': 'CESM2',
'ensemble': 'r4i1p1f1',
'exp': 'historical',
'grid': 'gn',
'mip': 'Amon',
'project': 'CMIP6',
'short_name': 'tas',
'timerange': '2000/2001',
}, {
'dataset': 'RACMO22E',
'driver': 'MOHC-HadGEM2-ES',
'domain': 'EUR-11',
'ensemble': 'r1i1p1',
'exp': 'historical',
'frequency': 'mon',
'project': 'CORDEX',
'short_name': 'tas',
'timerange': '1950/1952',
'version': 'v20160620',
}, {
'dataset': 'CERES-EBAF',
'frequency': 'mon',
'project': 'obs4MIPs',
'short_name': 'rsutcs',
'version': 'v20160610',
}, {
'dataset': 'GPCP-V2.3',
'project': 'obs4MIPs',
'short_name': 'pr',
}]
VARIABLES = [
{
'dataset': 'cccma_cgcm3_1',
'ensemble': 'run1',
'exp': 'historical',
'frequency': 'mon',
'project': 'CMIP3',
'short_name': 'tas',
'version': 'v1',
},
{
'dataset': 'inmcm4',
'ensemble': 'r1i1p1',
'exp': ['historical', 'rcp85'],
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'version': 'v20130207',
},
{
'dataset': 'FIO-ESM',
'ensemble': 'r1i1p1',
'exp': 'historical',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
},
{
'dataset': 'HadGEM2-CC',
'ensemble': 'r1i1p1',
'exp': 'rcp85',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'timerange': '2080/2100',
},
{
'dataset': 'EC-EARTH',
'ensemble': 'r1i1p1',
'exp': 'historical',
'mip': 'Amon',
'project': 'CMIP5',
'short_name': 'tas',
'start_year': 1990, # test legacy way of specifying timerange
'end_year': 1999,
},
{
'dataset': 'AWI-ESM-1-1-LR',
'ensemble': 'r1i1p1f1',
'exp': 'historical',
'grid': 'gn',
'mip': 'Amon',
'project': 'CMIP6',
'short_name': 'tas',
'timerange': '2000/2001',
'version': 'v20200212',
},
{
'dataset': 'CESM2',
'ensemble': 'r4i1p1f1',
'exp': 'historical',
'grid': 'gn',
'mip': 'Amon',
'project': 'CMIP6',
'short_name': 'tas',
'timerange': '2000/2001',
},
{
'dataset': 'RACMO22E',
'driver': 'MOHC-HadGEM2-ES',
'domain': 'EUR-11',
'ensemble': 'r1i1p1',
'exp': 'historical',
'frequency': 'mon',
'project': 'CORDEX',
'short_name': 'tas',
'timerange': '1950/1952',
'version': 'v20160620',
},
{
'dataset': 'REMO2009',
'driver': 'MPI-M-MPI-ESM-LR',
'domain': 'EUR-11',
'ensemble': 'r1i1p1',
'exp': 'rcp26',
'frequency': 'mon',
'project': 'CORDEX-Adjust',
'short_name': 'tasAdjust',
'timerange': '2005/2010',
'version': 'v20160919',
},
{
'dataset': 'EPISODES2018',
'driver': 'MPI-M-MPI-ESM-LR',
'domain': 'EUR-11',
'ensemble': 'r1i1p1',
'exp': 'rcp26',
'frequency': 'mon',
'project': 'CORDEX-ESD',
'short_name': 'tas',
'version': 'v20180409',
},
{
'dataset': 'CERES-EBAF',
'frequency': 'mon',
'project': 'obs4MIPs',
'short_name': 'rsutcs',
'version': 'v20160610',
},
{
'dataset': 'GPCP-V2.3',
'project': 'obs4MIPs',
'short_name': 'pr',
}
]


def get_mock_connection(facets, results):
"""Create a mock pyesgf.search.SearchConnection instance."""

class MockFileSearchContext:

def search(self, **kwargs):
return results

class MockConnection:

def new_context(self, *args, **kwargs):
assert kwargs == facets
return MockFileSearchContext()
Expand Down Expand Up @@ -138,18 +175,22 @@ def test_mock_search(variable, mocker):
if json_file in expected_results:
expected_files = expected_results[json_file]
else:
expected_results[json_file] = [
{
'checksums': file._checksums,
'dataset': file.dataset,
'facets': file.facets,
'local_file': str(file.local_file(Path())),
'name': file.name,
'size': file.size,
'urls': file.urls,
}
for file in files
]
expected_results[json_file] = [{
'checksums':
file._checksums,
'dataset':
file.dataset,
'facets':
file.facets,
'local_file':
str(file.local_file(Path())),
'name':
file.name,
'size':
file.size,
'urls':
file.urls,
} for file in files]
with expected_results_file.open('w', encoding='utf-8') as file:
yaml.safe_dump(expected_results, file)

Expand Down