diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py index 4db61cae9a572e8760d0c11ef937991e8db81df5..34c1b4e287d2a4173c67dc88b6616f02598d9c19 100755 --- a/Convert_Matlab/inst_eddies_v6.py +++ b/Convert_Matlab/inst_eddies_v6.py @@ -96,8 +96,14 @@ def write(writers, cell, cyclone): if len(sys.argv) == 1: sys.exit("Required argument: first input .mat file") adt_file = sys.argv[1] dirname, basename = path.split(adt_file) -my_date = parser.parse(basename, yearfirst=True, dayfirst = False, - fuzzy = True).date() +valid_date_formats = ["adt_%Y-%m-%d.mat", "adt_%Y%m%d.mat"] + +for date_format in valid_date_formats: + try: + my_date = datetime.datetime.strptime(basename, date_format).date() + except ValueError: + pass + d = my_date - datetime.date(1950, 1, 1) d = d.days @@ -160,7 +166,7 @@ while True: my_date += datetime.timedelta(1) if my_date > final_date: break d += 1 - basename = my_date.strftime("adt_%Y-%m-%d.mat") + basename = my_date.strftime(date_format) adt_file = path.join(dirname, basename) nml = f90nml.Namelist()