diff --git a/Convert_Matlab/Eurec4A_OA/Nanti.mat b/Convert_Matlab/Eurec4A_OA/Nanti.mat index 6322593a38a5328f73516a6f5d0797e2a9a0fe5c..d7f83b8bb120bff65447025af43c47a0b3653fb1 100644 Binary files a/Convert_Matlab/Eurec4A_OA/Nanti.mat and b/Convert_Matlab/Eurec4A_OA/Nanti.mat differ diff --git a/Convert_Matlab/Eurec4A_OA/Ncyclo.mat b/Convert_Matlab/Eurec4A_OA/Ncyclo.mat index 817861b904a56d5680685cd27e0c5b2e23551c7f..7501068d13b84a9354abf469cb2d106ab8a2a0e2 100644 Binary files a/Convert_Matlab/Eurec4A_OA/Ncyclo.mat and b/Convert_Matlab/Eurec4A_OA/Ncyclo.mat differ diff --git a/Convert_Matlab/overlap.m b/Convert_Matlab/overlap.m index a6390f847b10ba958f39ca80e455d6de462c11be..adf026debba1305342faa29c4f4ca3fe3d92efa9 100644 --- a/Convert_Matlab/overlap.m +++ b/Convert_Matlab/overlap.m @@ -25,12 +25,14 @@ toc clear disp('Processing Parameters_Anticyclonic_Eddies...') load('Parameters_Anticyclonic_Eddies.mat', 'Nanti', 'date_num') -save('Nanti', 'Nanti', '-v6') +N_eddies = Nanti; +save('Nanti', 'N_eddies', '-v6') save('date_num', 'date_num', '-v6') clear disp('Processing Parameters_Cyclonic_Eddies...') load('Parameters_Cyclonic_Eddies.mat', 'Ncyclo') -save('Ncyclo', 'Ncyclo', '-v6') +N_eddies = Ncyclo; +save('Ncyclo', 'N_eddies', '-v6') exit diff --git a/Convert_Matlab/overlap_v6.py b/Convert_Matlab/overlap_v6.py index 700219119625173b213f0e065be15dfddae23a66..2da4352aee4f87a46cebfb4b75b61cda34444fe0 100755 --- a/Convert_Matlab/overlap_v6.py +++ b/Convert_Matlab/overlap_v6.py @@ -28,8 +28,8 @@ def adjust_n(n_Matlab): orientation = sys.argv[1] # "cyclo" or "anti" id_child = sio.loadmat(f"id_child_{orientation}.mat", squeeze_me=True)\ ["id_child"] -n_eddies = sio.loadmat(f"N{orientation}.mat", squeeze_me = True)\ - [f"N{orientation}"].astype(int, casting = "safe", copy = False) +n_eddies = sio.loadmat(f"N{orientation}.mat", squeeze_me = True)["N_eddies"]\ + .astype(int, casting = "safe", copy = False) date_num = sio.loadmat("date_num.mat", squeeze_me = True)["date_num"] n_dates = n_eddies.size print("n_dates =", n_dates)