diff --git a/CHANGELOG.md b/CHANGELOG.md index 70015d9f25df8fedc1f239e830e7474b0d8eaff2..cda1eb226dc2a13a62b94f875aac9ef0ef1a4d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Release changelog are available here : https://gitlab.inria.fr/croco-ocean/croco ## Fixed +- Preprocessing_tools : fix in mexcdf functionality for matlab 20xx versions (in particular matlab 2024), see issue [#50](https://gitlab.inria.fr/croco-ocean/croco_tools/-/issues/50) + ## Changed ## Removed diff --git a/UTILITIES/mexcdf/mexnc/mexcdf.m b/UTILITIES/mexcdf/mexnc/mexcdf.m index 399405a743d9dd272b46abd32e0bf24db5224d7e..0c21295a6a62eac26dd8972e0db32c98a44e3725 100644 --- a/UTILITIES/mexcdf/mexnc/mexcdf.m +++ b/UTILITIES/mexcdf/mexnc/mexcdf.m @@ -95,7 +95,9 @@ if nargin < 1, help(mfilename), return, end % Mex-file gateway. v = version; -if eval(v(1)) > 4 +matversion=version('-release'); +myversion=str2num(matversion(1:2)); +if eval(v(1)) > 4 || myversion >= 20 fcn = 'mexcdf53'; % Matlab-5 or 6. elseif eval(v(1)) == 4 fcn = 'mexcdf4'; % Matlab-4 only. diff --git a/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/mexcdf.m b/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/mexcdf.m index 399405a743d9dd272b46abd32e0bf24db5224d7e..0c21295a6a62eac26dd8972e0db32c98a44e3725 100644 --- a/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/mexcdf.m +++ b/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/mexcdf.m @@ -95,7 +95,9 @@ if nargin < 1, help(mfilename), return, end % Mex-file gateway. v = version; -if eval(v(1)) > 4 +matversion=version('-release'); +myversion=str2num(matversion(1:2)); +if eval(v(1)) > 4 || myversion >= 20 fcn = 'mexcdf53'; % Matlab-5 or 6. elseif eval(v(1)) == 4 fcn = 'mexcdf4'; % Matlab-4 only. diff --git a/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/ncmex.m b/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/ncmex.m index 5bd46cf7ecba62faed1fb6c88bea23c0070ffbc5..82d8ffe52cfc182af2f7c33588dc6e46ff3034b7 100644 --- a/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/ncmex.m +++ b/UTILITIES/mexcdf/netcdf_toolbox/netcdf/ncutility/ncmex.m @@ -113,7 +113,9 @@ end % Mex-file gateway. v = version; -if eval(v(1)) > 4 +matversion=version('-release'); +myversion=str2num(matversion(1:2)); +if eval(v(1)) > 4 || myversion >= 20 fcn = 'mexcdf53'; % Matlab-5 or 6. elseif eval(v(1)) == 4 fcn = 'mexcdf4'; % Matlab-4 only. diff --git a/UTILITIES/netcdf_matlab_60/ncutility/ncclose.m b/UTILITIES/netcdf_matlab_60/ncutility/ncclose.m index 65d86d562a6dd73cd2e88926be31745fd4abe68c..247893f8af3a81b5ce9fcd0da9e086300d00e270 100644 --- a/UTILITIES/netcdf_matlab_60/ncutility/ncclose.m +++ b/UTILITIES/netcdf_matlab_60/ncutility/ncclose.m @@ -18,7 +18,9 @@ end theNCid = -sort(-theNCid); v = version; -if v(1) == '6' +matversion=version('-release'); +myversion=str2num(matversion(1:2)); +if v(1) == '6' || myversion >= 20 fcn = 'mexcdf60'; % Matlab-6 only. elseif v(1) == '5' fcn = 'mexcdf53'; % Matlab-5 only. diff --git a/UTILITIES/netcdf_matlab_60/ncutility/tnc4ml5.m b/UTILITIES/netcdf_matlab_60/ncutility/tnc4ml5.m index 2234cfb63e8937407512c324462ac755137c258a..8608a0d4963c0e84f2243b577e22d1ae8a0f2714 100644 --- a/UTILITIES/netcdf_matlab_60/ncutility/tnc4ml5.m +++ b/UTILITIES/netcdf_matlab_60/ncutility/tnc4ml5.m @@ -12,7 +12,9 @@ function tnc4ml5 % Version of 15-Apr-1997 09:50:05. v = version; -if v(1) == '6' +matversion=version('-release'); +myversion=str2num(matversion(1:2)); +if v(1) == '6' || myversion >= 20 fcn = 'mexcdf60'; % Matlab-6 only. elseif v(1) == '5' fcn = 'mexcdf53'; % Matlab-5 only.