From 21e5be7d99853cacc1f4947412ac587cee4d824d Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Thu, 16 Sep 2021 12:30:33 +0200 Subject: [PATCH] Polish --- Convert_Matlab/inst_eddies.m | 6 +++--- Convert_Matlab/inst_eddies_v6.py | 6 +++--- cmake/ConfigureCompilerFlags.cmake | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Convert_Matlab/inst_eddies.m b/Convert_Matlab/inst_eddies.m index a47d5350..0f724727 100644 --- a/Convert_Matlab/inst_eddies.m +++ b/Convert_Matlab/inst_eddies.m @@ -3,14 +3,14 @@ % inst_eddies_v6.py. clear -disp('Loading adt.mat...') +%%disp('Loading adt.mat...') %%tic load('adt.mat', 'ADT', 'Anticyclonic_Cell', 'Cyclonic_Cell', 'X', 'Y', ... 'date_num', 'id_anti_cell', 'id_cyclo_cell') %%toc -disp('Saving...') +%%disp('Saving...') %%tic save('adt_v6', '-v6') %%toc -disp('Matlab done') +%%disp('Matlab done') exit diff --git a/Convert_Matlab/inst_eddies_v6.py b/Convert_Matlab/inst_eddies_v6.py index 82c2b5ca..c1d88d70 100755 --- a/Convert_Matlab/inst_eddies_v6.py +++ b/Convert_Matlab/inst_eddies_v6.py @@ -4,9 +4,9 @@ SHPC_anti and SHPC_cyclo. The mat files are assumed to be in v7.3 (HDF5) format and will be converted to v6 format before being read in Python. The data in each input file is the set of detected -instantaneous eddies at a given date. The second, optional argument, -is the final date processed. The script inst_eddies.m must be in the -current directory at run-time. +instantaneous eddies at a given date. The second, optional, argument +of this script is the final date processed. The script inst_eddies.m +must be in the current directory at run-time. """ diff --git a/cmake/ConfigureCompilerFlags.cmake b/cmake/ConfigureCompilerFlags.cmake index 31a9a16b..232345f3 100644 --- a/cmake/ConfigureCompilerFlags.cmake +++ b/cmake/ConfigureCompilerFlags.cmake @@ -10,7 +10,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES GNU) " -Wno-conversion -Wimplicit-interface -Wimplicit-procedure" " -Wno-integer-division -Wno-maybe-uninitialized") ## -Wrealloc-lhs-all - + # Debugging options: set(CMAKE_Fortran_FLAGS_DEBUG "-fbacktrace -g -ffpe-trap=zero,overflow") # (We cannot use -ffpe-trap=invalid because of Gfortran bug with -- GitLab