@@ -213,21 +213,27 @@ def enrich_onesubswath_l1b(
213
213
ancillary_list [ancillary_name ], ds_intra , ds_inter
214
214
)
215
215
flag_ancillaries [ancillary_name ] = ancillary_fields_added
216
- if "ww3hindcast_spectra" in ancillary_list :
216
+ if "ww3hindcast_spectra" in ancillary_list or 'ww3CCIseastate_spectra' in ancillary_list :
217
+ idx = None
218
+ for uui ,uu in enumerate (ancillary_list ):
219
+ if 'spectra' in uu :
220
+ idx = uu
221
+ ww3spectra_matching_name = ancillary_list [idx ]['name' ]
222
+ logging .info ('the product used to add wave spectra is: %s' ,ww3spectra_matching_name )
217
223
(
218
224
ds_intra ,
219
225
flag_ww3spectra_added ,
220
226
flag_ww3spectra_found ,
221
227
) = resampleWW3spectra_on_TOPS_SAR_cartesian_grid (
222
- dsar = ds_intra , xspeckind = "intra"
228
+ dsar = ds_intra , xspeckind = "intra" , nameWW3sp_product = ww3spectra_matching_name
223
229
)
224
230
flag_ancillaries ["ww3spectra_intra" ] = flag_ww3spectra_added
225
231
(
226
232
ds_inter ,
227
233
flag_ww3spectra_added ,
228
234
flag_ww3spectra_found ,
229
235
) = resampleWW3spectra_on_TOPS_SAR_cartesian_grid (
230
- dsar = ds_inter , xspeckind = "inter"
236
+ dsar = ds_inter , xspeckind = "inter" , nameWW3sp_product = ww3spectra_matching_name
231
237
)
232
238
flag_ancillaries ["ww3spectra_inter" ] = flag_ww3spectra_added
233
239
return ds_intra , ds_inter , flag_ancillaries
@@ -271,7 +277,7 @@ def append_ancillary_field(ancillary, ds_intra, ds_inter):
271
277
raster_ds = ww3_global_yearly_3h (filename , closest_date )
272
278
elif ancillary ["name" ] == "ww3hindcast_field" :
273
279
raster_ds = ww3_IWL1Btrack_hindcasts_30min (glob (filename )[0 ], closest_date )
274
- elif ancillary ["name" ] == "ww3hindcast_spectra" :
280
+ elif ancillary ["name" ] in [ "ww3hindcast_spectra" , "ww3CCIseastate_spectra" ] :
275
281
pass # nothing to do here, there is a specific method called later in the code.
276
282
return ds_intra , ds_inter , ancillary_fields_added
277
283
else :
@@ -428,9 +434,10 @@ def main():
428
434
"ww3hindcast_field" : conf ["auxilliary_dataset" ]["ww3hindcast_field" ],
429
435
}
430
436
if args .ww3spectra :
431
- ancillary_list ["ww3hindcast_spectra" ] = conf ["auxilliary_dataset" ][
432
- "ww3hindcast_spectra"
433
- ]
437
+ #ancillary_list["ww3hindcast_spectra"] = conf["auxilliary_dataset"][
438
+ # "ww3hindcast_spectra"
439
+ #]
440
+ ancillary_list ["ww3CCIseastate_spectra" ] = conf ["auxilliary_dataset" ]["ww3CCIseastate_spectra" ]
434
441
final_L1C_path = do_L1C_SAFE_from_L1B_SAFE (
435
442
args .l1bsafe ,
436
443
version = args .version ,
0 commit comments