Skip to content

Commit bff41c1

Browse files
yyplantonyyplanton
committed
possibility to interpret observational variables as CMIP
1 parent 903f12a commit bff41c1

File tree

4 files changed

+198
-54
lines changed

4 files changed

+198
-54
lines changed

‎lib/EnsoCollectionsLib.py‎

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ def defCollection(mc=True):
255255
'min_time_steps': 12,
256256
'normalization': False,
257257
'project_interpreter': 'CMIP',
258-
'observed_period': None,
259-
'modeled_period': None,
258+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
259+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
260260
},
261261
'plot_order': ['BiasPrLatRmse', 'BiasPrLonRmse', 'BiasSstLonRmse', 'BiasTauxLonRmse',
262262
'SeasonalPrLatRmse', 'SeasonalPrLonRmse', 'SeasonalSstLonRmse', 'SeasonalTauxLonRmse',
@@ -358,8 +358,8 @@ def defCollection(mc=True):
358358
'min_time_steps': 12,
359359
'normalization': False,
360360
'project_interpreter': 'CMIP',
361-
'observed_period': None,
362-
'modeled_period': None,
361+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
362+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
363363
},
364364
'plot_order': ['EnsoSstLonRmse', 'EnsoAmpl', 'EnsoSeasonality', 'EnsoPrMapDjfRmse', 'EnsoPrMapJjaRmse',
365365
'EnsoSstMapDjfRmse', 'EnsoSstMapJjaRmse'],
@@ -507,8 +507,8 @@ def defCollection(mc=True):
507507
'min_time_steps': 12,
508508
'normalization': False,
509509
'project_interpreter': 'CMIP',
510-
'observed_period': None,
511-
'modeled_period': None,
510+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
511+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
512512
},
513513
'plot_order': ['BiasSstLonRmse', 'BiasTauxLonRmse', 'EnsoSstLonRmse', 'EnsoAmpl', 'EnsoSeasonality',
514514
'EnsoSstSkew', 'EnsodSstOce_2', 'EnsoFbSstThf', 'EnsoFbSstTaux', 'EnsoFbTauxSsh',
@@ -862,15 +862,72 @@ def defCollection(mc=True):
862862
'min_time_steps': 12,
863863
'normalization': False,
864864
'project_interpreter': 'CMIP',
865-
'observed_period': None,
866-
'modeled_period': None,
865+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
866+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
867867
},
868868
'plot_order': ['BiasPrLatRmse', 'BiasPrLonRmse', 'BiasSstLonRmse', 'BiasTauxLonRmse',
869869
'SeasonalPrLatRmse', 'SeasonalPrLonRmse', 'SeasonalSstLonRmse', 'SeasonalTauxLonRmse',
870870
'EnsoSstLonRmse', 'EnsoSstTsRmse', 'EnsoAmpl', 'EnsoSeasonality', 'EnsoSstSkew',
871871
'EnsodDuration', 'EnsoSstDiversity_2'],
872872
'description': 'Describe which science question this collection is about',
873873
},
874+
'ENSO_THF': {
875+
'long_name': 'Metrics Collection for ENSO performance',
876+
'metrics_list': {
877+
'EnsoFbSstLhf': {
878+
'variables': ['sst', 'lhf'],
879+
'regions': {'sst': 'nino3', 'lhf': 'nino3'},
880+
'obs_name': {'sst': ['ERA-Interim', 'HadISST', 'Tropflux'], 'lhf': ['ERA-Interim', 'Tropflux']},
881+
'regridding': {'regridder': 'cdms', 'regridTool': 'esmf', 'regridMethod': 'linear',
882+
'newgrid_name': 'generic_1x1deg'},
883+
'metric_computation': 'abs_relative_difference',
884+
},
885+
'EnsoFbSstLwr': {
886+
'variables': ['sst', 'lwr'],
887+
'regions': {'sst': 'nino3', 'lwr': 'nino3'},
888+
'obs_name': {'sst': ['ERA-Interim', 'HadISST', 'Tropflux'], 'lwr': ['ERA-Interim', 'Tropflux']},
889+
'regridding': {'regridder': 'cdms', 'regridTool': 'esmf', 'regridMethod': 'linear',
890+
'newgrid_name': 'generic_1x1deg'},
891+
'metric_computation': 'abs_relative_difference',
892+
},
893+
'EnsoFbSstShf': {
894+
'variables': ['sst', 'shf'],
895+
'regions': {'sst': 'nino3', 'shf': 'nino3'},
896+
'obs_name': {'sst': ['ERA-Interim', 'HadISST', 'Tropflux'], 'shf': ['ERA-Interim', 'Tropflux']},
897+
'regridding': {'regridder': 'cdms', 'regridTool': 'esmf', 'regridMethod': 'linear',
898+
'newgrid_name': 'generic_1x1deg'},
899+
'metric_computation': 'abs_relative_difference',
900+
},
901+
'EnsoFbSstSwr': {
902+
'variables': ['sst', 'swr'],
903+
'regions': {'sst': 'nino3', 'swr': 'nino3'},
904+
'obs_name': {'sst': ['ERA-Interim', 'HadISST', 'Tropflux'], 'swr': ['ERA-Interim', 'Tropflux']},
905+
'regridding': {'regridder': 'cdms', 'regridTool': 'esmf', 'regridMethod': 'linear',
906+
'newgrid_name': 'generic_1x1deg'},
907+
'metric_computation': 'abs_relative_difference',
908+
},
909+
'EnsoFbSstThf': {
910+
'variables': ['sst', 'thf'],
911+
'regions': {'sst': 'nino3', 'thf': 'nino3'},
912+
'obs_name': {'sst': ['ERA-Interim', 'HadISST', 'Tropflux'],
913+
'thf': ['ERA-Interim', 'Tropflux']},
914+
'regridding': {'regridder': 'cdms', 'regridTool': 'esmf', 'regridMethod': 'linear',
915+
'newgrid_name': 'generic_1x1deg'},
916+
'metric_computation': 'abs_relative_difference',
917+
},
918+
},
919+
'common_collection_parameters': {
920+
'detrending': {'method': 'linear'},
921+
'frequency': 'monthly',
922+
'min_time_steps': 12,
923+
'normalization': False,
924+
'project_interpreter': 'CMIP',
925+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
926+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
927+
},
928+
'plot_order': ['EnsoFbSstThf'],
929+
'description': 'Describe which science question this collection is about',
930+
},
874931
'ENSO_tau': {
875932
'long_name': 'Metrics Collection for ENSO performance',
876933
'metrics_list': {
@@ -965,8 +1022,8 @@ def defCollection(mc=True):
9651022
'min_time_steps': 12,
9661023
'normalization': False,
9671024
'project_interpreter': 'CMIP',
968-
'observed_period': None,
969-
'modeled_period': None,
1025+
'observed_period': ("1850-01-01 00:00:00", "2018-12-31 23:59:60.0"),
1026+
'modeled_period': ("1850-01-01 00:00:00", "2015-12-31 23:59:60.0"),
9701027
},
9711028
'plot_order': ['BiasMldLonRmse', 'BiasTauxLonRmse', 'BiasTauyLonRmse',
9721029
'EnsoMldLonRmse', 'EnsoMldTsRmse',

0 commit comments

Comments
 (0)