Skip to content

Commit c7c9e02

Browse files
aperrin66aperrin66
authored
Merge pull request #111 from nansencenter/issue109_update_cmems_006_013
Update MEDSEA_ANALYSISFORECAST_PHY_006_013 in URL normalizer
2 parents 555dd1d + 768ee9d commit c7c9e02

File tree

2 files changed

+107
-68
lines changed

2 files changed

+107
-68
lines changed

‎metanorm/normalizers/url.py‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class URLMetadataNormalizer(BaseMetadataNormalizer):
2424
'Earth Observation satellites',
2525
"ftp://nrt.cmems-du.eu/Core/MULTIOBS_GLO_PHY_NRT_015_003": 'Earth Observation satellites',
2626
"ftp://nrt.cmems-du.eu/Core/GLOBAL_ANALYSIS_FORECAST_PHY_001_024": 'OPERATIONAL MODELS',
27-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013": 'OPERATIONAL MODELS',
27+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013": 'OPERATIONAL MODELS',
2828
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001": 'OPERATIONAL MODELS',
2929
"ftp://ftp.opc.ncep.noaa.gov/grids/operational/GLOBALHYCOM/Navy/": 'OPERATIONAL MODELS',
3030
"ftp://ftpprd.ncep.noaa.gov/pub/data/nccf/com/rtofs/prod": 'OPERATIONAL MODELS',
@@ -38,7 +38,7 @@ class URLMetadataNormalizer(BaseMetadataNormalizer):
3838
"ftp://nrt.cmems-du.eu/Core/SEALEVEL_GLO_PHY_L4_NRT_OBSERVATIONS_008_046": 'altimeters',
3939
"ftp://nrt.cmems-du.eu/Core/MULTIOBS_GLO_PHY_NRT_015_003": 'altimeters',
4040
"ftp://nrt.cmems-du.eu/Core/GLOBAL_ANALYSIS_FORECAST_PHY_001_024": 'computer',
41-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013": 'computer',
41+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013": 'computer',
4242
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001": 'computer',
4343
"ftp://ftp.opc.ncep.noaa.gov/grids/operational/GLOBALHYCOM/Navy/": 'computer',
4444
"ftp://ftpprd.ncep.noaa.gov/pub/data/nccf/com/rtofs/prod": 'computer',
@@ -51,7 +51,7 @@ class URLMetadataNormalizer(BaseMetadataNormalizer):
5151
"ftp://nrt.cmems-du.eu/Core/SEALEVEL_GLO_PHY_L4_NRT_OBSERVATIONS_008_046": 'cmems',
5252
"ftp://nrt.cmems-du.eu/Core/MULTIOBS_GLO_PHY_NRT_015_003": 'cmems',
5353
"ftp://nrt.cmems-du.eu/Core/GLOBAL_ANALYSIS_FORECAST_PHY_001_024": 'cmems',
54-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013": 'cmems',
54+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013": 'cmems',
5555
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001": 'cmems',
5656
"ftp://ftp.opc.ncep.noaa.gov/grids/operational/GLOBALHYCOM/Navy/": 'DOC/NOAA/NWS/NCEP',
5757
"ftp://ftpprd.ncep.noaa.gov/pub/data/nccf/com/rtofs/prod": 'DOC/NOAA/NWS/NCEP',
@@ -93,7 +93,7 @@ def get_rtofs_geometry(self, url):
9393
WORLD_WIDE_COVERAGE_WKT,
9494
"ftp://nrt.cmems-du.eu/Core/MULTIOBS_GLO_PHY_NRT_015_003": WORLD_WIDE_COVERAGE_WKT,
9595
"ftp://nrt.cmems-du.eu/Core/GLOBAL_ANALYSIS_FORECAST_PHY_001_024": WORLD_WIDE_COVERAGE_WKT,
96-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013":
96+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013":
9797
'POLYGON((-17.29 45.98, -17.29 30.18, 36.30 30.18, 36.30 45.98, -17.29 45.98))',
9898
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001":
9999
'POLYGON((-19 56, 5 56, 5 26, -19 26, -19 56))',
@@ -128,7 +128,7 @@ def get_rtofs_geometry(self, url):
128128
'GEOSTROPHIC CURRENT AND MODELED EKMAN CURRENT PROCESSING',
129129
"ftp://nrt.cmems-du.eu/Core/GLOBAL_ANALYSIS_FORECAST_PHY_001_024":
130130
'GLOBAL OCEAN 1_12 PHYSICS ANALYSIS AND FORECAST UPDATED DAILY',
131-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013":
131+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013":
132132
'Mediterranean Forecasting System (hydrodynamic-wave model)',
133133
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001":
134134
'Atlantic-Iberian Biscay Irish-Ocean Physics Analysis and Forecast',
@@ -201,14 +201,14 @@ def get_rtofs_geometry(self, url):
201201
utils.SUMMARY_FIELDS['processing_level']: '4',
202202
utils.SUMMARY_FIELDS['product']: 'GLOBAL_ANALYSIS_FORECAST_PHY_001_024'
203203
}),
204-
'ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013':
204+
'ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013':
205205
utils.dict_to_string({
206206
utils.SUMMARY_FIELDS['description']:
207207
'The physical component of the Mediterranean Forecasting System '
208208
'(Med-Currents) is a coupled hydrodynamic-wave model implemented over the whole '
209209
'Mediterranean Basin.',
210210
utils.SUMMARY_FIELDS['processing_level']: '4',
211-
utils.SUMMARY_FIELDS['product']: 'MEDSEA_ANALYSIS_FORECAST_PHY_006_013'
211+
utils.SUMMARY_FIELDS['product']: 'MEDSEA_ANALYSISFORECAST_PHY_006_013'
212212
}),
213213
'ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001':
214214
utils.dict_to_string({
@@ -324,32 +324,37 @@ def get_rtofs_parameters(self, url):
324324
'northward_sea_ice_velocity',
325325
'sea_surface_height_above_geoid'
326326
],
327-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/med00-cmcc-cur": [
327+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/med-cmcc-cur": [
328328
'eastward_sea_water_velocity',
329329
'northward_sea_water_velocity',
330330
],
331-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/med00-cmcc-mld": [
331+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/med-cmcc-mld": [
332332
'ocean_mixed_layer_thickness_defined_by_sigma_theta'
333333
],
334-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/med00-cmcc-sal": [
334+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/med-cmcc-sal": [
335335
'sea_water_salinity'
336336
],
337-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/med00-cmcc-ssh": [
337+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/med-cmcc-ssh": [
338338
'sea_surface_height_above_geoid'
339339
],
340-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/med00-cmcc-tem": [
340+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/med-cmcc-tem": [
341341
'sea_water_potential_temperature_at_sea_floor',
342342
'sea_water_potential_temperature'
343343
],
344-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/" +
345-
"MEDSEA_ANALYSIS_FORECAST_PHY_006_013-statics/MED-MFC_006_013_mask_bathy.nc": [
344+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/" +
345+
"MEDSEA_ANALYSISFORECAST_PHY_006_013-statics/MED-MFC_006_013_mask_bathy.nc": [
346346
'model_level_number_at_sea_floor',
347+
'sea_binary_mask',
347348
'sea_floor_depth_below_geoid'
348349
],
349-
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013/" +
350-
"MEDSEA_ANALYSIS_FORECAST_PHY_006_013-statics/MED-MFC_006_013_coordinates.nc": [
350+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/" +
351+
"MEDSEA_ANALYSISFORECAST_PHY_006_013-statics/MED-MFC_006_013_coordinates.nc": [
351352
'cell_thickness'
352353
],
354+
"ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013/" +
355+
"MEDSEA_ANALYSISFORECAST_PHY_006_013-statics/MED-MFC_006_013_mdt.nc": [
356+
'sea_surface_height_above_geoid'
357+
],
353358
"ftp://nrt.cmems-du.eu/Core/IBI_ANALYSISFORECAST_PHY_005_001/" +
354359
"cmems_mod_ibi_phy_anfc_0.027deg-2D_PT15M-m/": [
355360
'sea_surface_height_above_geoid',
@@ -493,9 +498,9 @@ def get_rtofs_parameters(self, url):
493498
lambda time: (time, time)
494499
),
495500
],
496-
'ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSIS_FORECAST_PHY_006_013': [
501+
'ftp://nrt.cmems-du.eu/Core/MEDSEA_ANALYSISFORECAST_PHY_006_013': [
497502
(
498-
re.compile(utils.YEARMONTHDAY_REGEX + r'_(d|h|hts)-.*\.nc$'),
503+
re.compile(utils.YEARMONTHDAY_REGEX + r'_(d|h|hts|qm)-.*\.nc$'),
499504
utils.create_datetime,
500505
lambda time: (time, time + relativedelta(days=1))
501506
),

0 commit comments

Comments
 (0)