diff --git a/Inst_eddies/inst_eddies.py.in b/Inst_eddies/inst_eddies.py.in index 8f79c800e102490e5ea0fa93b247767956140de6..30b65aa42815af7567c027e420d8422741c5b53f 100644 --- a/Inst_eddies/inst_eddies.py.in +++ b/Inst_eddies/inst_eddies.py.in @@ -89,6 +89,6 @@ if __name__ == "__main__": argparser.add_argument("-b", "--bbox", nargs=4, type = float, metavar = ("xmin", "xmax", "ymin", "ymax")) args = argparser.parse_args() - d = input("Enter first date (integer value):") + d = input("Enter first date index (integer value):") d = int(d) loop_inst_eddies(args.file, args.bbox, d) diff --git a/Inst_eddies/inst_eddies_Aviso.py b/Inst_eddies/inst_eddies_Aviso.py index 33b05083a4bde8a5bd26cc98881f62c7035f34b0..9e8eac4deb5d189f36c443a1fd1018a9c1d136b4 100644 --- a/Inst_eddies/inst_eddies_Aviso.py +++ b/Inst_eddies/inst_eddies_Aviso.py @@ -34,7 +34,10 @@ argparser.add_argument("-b", "--bbox", nargs=4, type = float, metavar = ("xmin", "xmax", "ymin", "ymax")) args = argparser.parse_args() -# Get the first date from the time coordinate in the NetCDF file: +# Get the first date from the time coordinate in the NetCDF file. (In +# general, we cannot get it from the name of the first file because +# the first file may be the only file, and then there is no template +# option and the file name could not contain the date.) with netCDF4.Dataset(args.first_file) as f: d = f["time"][:].item() @@ -52,6 +55,7 @@ if args.last_date: else: last_date = first_date +# We choose to use d as the first date index. We could choose anything. inst_eddies.loop_inst_eddies(filename_generator(args.first_file, first_date, last_date, args.template, dirname), args.bbox, d) diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json index 3b5ba86a6f7eb28f74433272f77a9b9ca9a6409b..dae5256e0b6b4dff428dade6f9139956f1a66a7a 100644 --- a/Overlap/Tests/short_tests.json +++ b/Overlap/Tests/short_tests.json @@ -573,7 +573,7 @@ { "input": "&main_nml /\n", "title": "Read_snapshot_15", - "description": "Read a snapshot from an SHPC with a sufficient number of dates: 15. $tests_old_dir/Extraction_eddies_region_4/SHPC_anti used by the test Read_snapshot has only 2 dates.", + "description": "Read a snapshot from an SHPC on a very small region with a sufficient number of dates: 15. $tests_old_dir/Extraction_eddies_region_4/SHPC_anti used by the test Read_snapshot has only 2 dates.", "commands": [ [ "mkdir", diff --git a/Overlap/eddy_graph.sh.in b/Overlap/eddy_graph.sh.in index eb46ba94501e053a4fc1426d9c32f59b1028ab89..30afb733f10dc06c8648af531063bfa2bc58bf8a 100644 --- a/Overlap/eddy_graph.sh.in +++ b/Overlap/eddy_graph.sh.in @@ -5,7 +5,7 @@ if (($# != 2)) then - echo "Usage: eddy_graph.sh N_PROC INPUT_SHPC" + echo "Usage: eddy_graph.sh N_PROC SHPC-directory [SHPC-directory] ..." exit 1 fi