@@ -16,8 +16,12 @@ def __init__(self) -> None:
1616 self .data_requirements = (
1717 DataRequirement (
1818 source_type = SourceDatasetType .obs4MIPs ,
19- filters = (FacetFilter (facets = {"source_id" : ("GPCP-2-3" ), "variable_id" : ("pr" )}),),
20- group_by = ("source_id" , "variable_id" ),
19+ filters = (
20+ FacetFilter (
21+ facets = {"source_id" : ("GPCP-2-3" , "HadISST-1-1" ), "variable_id" : ("pr" , "ts" )}
22+ ),
23+ ),
24+ group_by = ("variable_id" , "source_id" ),
2125 ),
2226 DataRequirement (
2327 source_type = SourceDatasetType .CMIP6 ,
@@ -26,11 +30,11 @@ def __init__(self) -> None:
2630 facets = {
2731 "frequency" : "mon" ,
2832 "experiment_id" : ("amip" , "historical" , "hist-GHG" , "piControl" ),
29- "variable_id" : ("pr" ),
33+ "variable_id" : ("pr" , "ts" ),
3034 }
3135 ),
3236 ),
33- group_by = ("source_id " , "experiment_id " , "variant_label " , "member_id " , "variable_id " ),
37+ group_by = ("variable_id " , "source_id " , "experiment_id " , "variant_label " , "member_id " ),
3438 ),
3539 )
3640
@@ -75,6 +79,10 @@ def build_cmds(self, definition: MetricExecutionDefinition) -> list[Iterable[str
7579
7680 print ("build_cmd start" )
7781
82+ print ("input_datasets:" , input_datasets )
83+ print ("input_datasets.keys():" , input_datasets .keys ())
84+ print ("input_datasets['variable_id']:" , input_datasets ["variable_id" ])
85+
7886 print ("source_id:" , source_id )
7987 print ("experiment_id:" , experiment_id )
8088 print ("member_id:" , member_id )
@@ -84,6 +92,10 @@ def build_cmds(self, definition: MetricExecutionDefinition) -> list[Iterable[str
8492 reference_dataset_name = reference_dataset ["source_id" ].unique ()[0 ]
8593 reference_dataset_path = reference_dataset .datasets .iloc [0 ]["path" ]
8694
95+ print ("reference_dataset.datasets:" , reference_dataset .datasets )
96+ print ("reference_dataset['source_id']:" , reference_dataset ["source_id" ])
97+ print ("reference_dataset.datasets.iloc[0]:" , reference_dataset .datasets .iloc [0 ])
98+
8799 print ("reference_dataset_name:" , reference_dataset_name )
88100 print ("reference_dataset_path:" , reference_dataset_path )
89101
0 commit comments