diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py index bbf63ade01de033bc5d67ed1ebfc4ee914fd13bc..196c9ec64bb1b0ddf9c09b376c152529ccb10cb0 100755 --- a/Convert_Matlab/inst_eddies_v6.py +++ b/Convert_Matlab/inst_eddies_v6.py @@ -125,25 +125,26 @@ factories = [dict(writers = {}, cell_name = "Anticyclonic_Cell", dict(writers = {}, cell_name = "Cyclonic_Cell", cyclone = True, SHPC = "SHPC_cyclo")] -for f in factories: - file = path.join(f["SHPC"], "extremum") - f["writers"]["extr"] = shapefile.Writer(file, shapeType = shapefile.POINT) +for factory in factories: + fname = path.join(factory["SHPC"], "extremum") + factory["writers"]["extr"] = shapefile.Writer(fname, + shapeType = shapefile.POINT) - file = path.join(f["SHPC"], "centroid") - f["writers"]["centroid"] = shapefile.Writer(file, + fname = path.join(factory["SHPC"], "centroid") + factory["writers"]["centroid"] = shapefile.Writer(fname, shapeType = shapefile.POINT) - file = path.join(f["SHPC"], "outermost_contour") - f["writers"]["outer"] = shapefile.Writer(file, + fname = path.join(factory["SHPC"], "outermost_contour") + factory["writers"]["outer"] = shapefile.Writer(fname, shapeType = shapefile.POLYGON) - file = path.join(f["SHPC"], "max_speed_contour") - f["writers"]["max_speed"] = shapefile.Writer(file, + fname = path.join(factory["SHPC"], "max_speed_contour") + factory["writers"]["max_speed"] = shapefile.Writer(fname, shapeType = shapefile.POLYGON) - define_fields(f["writers"]) - file = path.join(f["SHPC"], "ishape_last.txt") - f["writers"]["ishape_last"] = open(file, "w") + define_fields(factory["writers"]) + fname = path.join(factory["SHPC"], "ishape_last.txt") + factory["writers"]["ishape_last"] = open(fname, "w") # Loop on dates: @@ -161,15 +162,16 @@ while True: assert datetime.date.fromordinal(matlab_data["date_num"] - 366) \ == my_date - for f in factories: - write(f["writers"], matlab_data[f["cell_name"]], f["cyclone"]) + for factory in factories: + write(factory["writers"], matlab_data[factory["cell_name"]], + factory["cyclone"]) os.remove("adt.mat") else: print("Missing file:", adt_file) - for f in factories: - write(f["writers"], [], f["cyclone"]) + for factory in factories: + write(factory["writers"], [], factory["cyclone"]) my_date += datetime.timedelta(1) if my_date > final_date: break @@ -184,7 +186,7 @@ nml["grid_nml"] = dict(corner_deg = [matlab_data["X"][0], matlab_data["Y"][0]], step_deg = [matlab_data["X"][1] - matlab_data["X"][0], matlab_data["Y"][1] - matlab_data["Y"][0]]) -for f in factories: - file = path.join(f["SHPC"], "grid_nml.txt") - nml.write(file, force = True) - for k, v in f["writers"].items(): v.close() +for factory in factories: + fname = path.join(factory["SHPC"], "grid_nml.txt") + nml.write(fname, force = True) + for k, v in factory["writers"].items(): v.close()