diff --git a/Inst_eddies/Analysis/eddy_dump.py b/Inst_eddies/Analysis/eddy_dump.py index be08fecaba12bc7cd2c17f732dbaa8b97b9ac067..825d632ac429e8414c3f1b0445ee9300533e70e9 100755 --- a/Inst_eddies/Analysis/eddy_dump.py +++ b/Inst_eddies/Analysis/eddy_dump.py @@ -28,13 +28,11 @@ for ishape, rec in enumerate(readers["extremum"].iterRecords()): if rec["days_1950"] == days_1950 and rec["eddy_index"] == eddy_index: break else: - sys.exit("Not found") -#-- + sys.exit("Eddy with this date and index not found") -for basename in ["extremum", "outermost_contour", "max_speed_contour"]: - filename = path.join(args.directory, basename) - shapeRec = readers[basename].shapeRecord(ishape) - print("\n", filename, ":") +for layer in ["extremum", "outermost_contour", "max_speed_contour"]: + shapeRec = readers[layer].shapeRecord(ishape) + print("\n", layer, ":") if shapeRec.shape.shapeType == shapefile.NULL: dct = shapeRec.record.as_dict()