diff --git a/doc/quickstart/configure.rst b/doc/quickstart/configure.rst index 916c10306a..810e7484c8 100644 --- a/doc/quickstart/configure.rst +++ b/doc/quickstart/configure.rst @@ -346,7 +346,7 @@ The default settings are: .. code-block:: yaml urls: - - 'https://esgf-index1.ceda.ac.uk/esg-search' + - 'https://esgf.ceda.ac.uk/esg-search' - 'https://esgf-node.llnl.gov/esg-search' - 'https://esgf-data.dkrz.de/esg-search' - 'https://esgf-node.ipsl.upmc.fr/esg-search' diff --git a/esmvalcore/config/_esgf_pyclient.py b/esmvalcore/config/_esgf_pyclient.py index 8f0af74235..7e80cc4892 100644 --- a/esmvalcore/config/_esgf_pyclient.py +++ b/esmvalcore/config/_esgf_pyclient.py @@ -143,7 +143,7 @@ def load_esgf_pyclient_config(): # List of available index nodes: https://esgf.llnl.gov/nodes.html # Be careful about the url, not all search urls have CMIP3 data? 'urls': [ - 'https://esgf-index1.ceda.ac.uk/esg-search', + 'https://esgf.ceda.ac.uk/esg-search', 'https://esgf-node.llnl.gov/esg-search', 'https://esgf-data.dkrz.de/esg-search', 'https://esgf-node.ipsl.upmc.fr/esg-search', diff --git a/tests/integration/esgf/search_results/Amon_r1i1p1_historical,rcp85_INM-CM4_CMIP5_tas.json b/tests/integration/esgf/search_results/Amon_r1i1p1_historical,rcp85_INM-CM4_CMIP5_tas.json index 03108c4155..69081ed877 100644 --- a/tests/integration/esgf/search_results/Amon_r1i1p1_historical,rcp85_INM-CM4_CMIP5_tas.json +++ b/tests/integration/esgf/search_results/Amon_r1i1p1_historical,rcp85_INM-CM4_CMIP5_tas.json @@ -133,7 +133,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.INM.inmcm4.historical.mon.atmos.Amon.r1i1p1.v20130207.tas_Amon_inmcm4_historical_r1i1p1_185001-200512.nc", "institute": [ "INM" @@ -499,7 +499,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.INM.inmcm4.rcp85.mon.atmos.Amon.r1i1p1.v20130207.tas_Amon_inmcm4_rcp85_r1i1p1_200601-210012.nc", "institute": [ "INM" diff --git a/tests/integration/esgf/search_results/Amon_r1i1p1_historical_FIO-ESM_CMIP5_tas.json b/tests/integration/esgf/search_results/Amon_r1i1p1_historical_FIO-ESM_CMIP5_tas.json index 03649275bb..d4b1fd2667 100644 --- a/tests/integration/esgf/search_results/Amon_r1i1p1_historical_FIO-ESM_CMIP5_tas.json +++ b/tests/integration/esgf/search_results/Amon_r1i1p1_historical_FIO-ESM_CMIP5_tas.json @@ -41,7 +41,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.FIO.FIO-ESM.historical.mon.atmos.Amon.r1i1p1.v20121010.tas_Amon_FIO-ESM_historical_r1i1p1_185001-200512.nc", "institute": [ "FIO" diff --git a/tests/integration/esgf/search_results/Amon_r1i1p1_rcp85_HadGEM2-CC_CMIP5_tas.json b/tests/integration/esgf/search_results/Amon_r1i1p1_rcp85_HadGEM2-CC_CMIP5_tas.json index 88dede9c07..519b386d00 100644 --- a/tests/integration/esgf/search_results/Amon_r1i1p1_rcp85_HadGEM2-CC_CMIP5_tas.json +++ b/tests/integration/esgf/search_results/Amon_r1i1p1_rcp85_HadGEM2-CC_CMIP5_tas.json @@ -991,7 +991,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_200512-203011.nc_1", "institute": [ "MOHC" @@ -1167,7 +1167,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_203012-205511.nc_1", "institute": [ "MOHC" @@ -1343,7 +1343,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_205512-208011.nc_1", "institute": [ "MOHC" @@ -1519,7 +1519,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_208012-209912.nc_1", "institute": [ "MOHC" @@ -1695,7 +1695,7 @@ "format": [ "netCDF, CF-1.4" ], - "index_node": "esgf-index1.ceda.ac.uk", + "index_node": "esgf.ceda.ac.uk", "instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_210001-210012.nc", "institute": [ "MOHC" diff --git a/tests/unit/config/test_esgf_pyclient.py b/tests/unit/config/test_esgf_pyclient.py index 5a481da8ed..6de2f664b0 100644 --- a/tests/unit/config/test_esgf_pyclient.py +++ b/tests/unit/config/test_esgf_pyclient.py @@ -14,7 +14,7 @@ }, 'search_connection': { 'urls': [ - 'https://esgf-index1.ceda.ac.uk/esg-search', + 'https://esgf.ceda.ac.uk/esg-search', 'https://esgf-node.llnl.gov/esg-search', 'https://esgf-data.dkrz.de/esg-search', 'https://esgf-node.ipsl.upmc.fr/esg-search',