diff --git a/tsg_io/readTsgDataNetCDF.m b/tsg_io/readTsgDataNetCDF.m index 6c9930ddf1ec754eeaf7341324836b3e2fa88868..5da4b816d3dcab91ae316a21da3dc2b11d0348a8 100644 --- a/tsg_io/readTsgDataNetCDF.m +++ b/tsg_io/readTsgDataNetCDF.m @@ -107,10 +107,6 @@ automaticQC( hMainFig ) % value(value == fillval(nc{i})) = NaN; % end - % assign netcdf variables in base workspace - % ----------------------------------------- - assignin('base', variable, nv(:)); - % populate tsg structure with netcdf variables % -------------------------------------------- tsg.(variable) = nv(:); @@ -120,7 +116,12 @@ automaticQC( hMainFig ) if strmatch('DAYD', variable) tsg.(variable) = julianToDatenum(tsg.(variable)); end - end + + % assign netcdf variables in base workspace + % ----------------------------------------- + assignin('base', variable, nv(:)); + + end % end of variables loop % Keep somme information for the log file % --------------------------------------- @@ -172,6 +173,12 @@ automaticQC( hMainFig ) var = char(key); tsg.(var) = nc.VARIABLES.(var).data__; + % transforme julian days variables to Matlab datenum + % -------------------------------------------------- + if strmatch('DAYD', var) + tsg.(var) = julianToDatenum(tsg.(var)); + end + % assign variable in base workspace % ------------------------------------------- assignin('base', var , tsg.(var)); diff --git a/tsg_io/writeTSGDataNetCDF.m b/tsg_io/writeTSGDataNetCDF.m index 3617c42afdc276d49a47ea814709e10453c6e3a3..9430bc04e09c3f2aeee5600123cc0be34c666abc 100644 --- a/tsg_io/writeTSGDataNetCDF.m +++ b/tsg_io/writeTSGDataNetCDF.m @@ -360,8 +360,22 @@ end % ----------------------------------------------------------------- for key = keys(nc.VARIABLES) var = char(key); - nc.VARIABLES.(var).data__ = tsg.(var); + if strmatch('DAYD', var) + nc.VARIABLES.(var).data__ = datenumToJulian(tsg.(var)); + else + nc.VARIABLES.(var).data__ = tsg.(var); + end end + +% % Convert Matlab julian days (datenum) to 1950 reference +% % ------------------------------------------------------ +% ncv_keys = keys(nc.VARIABLES); +% d = strmatch('DAYD', ncv_keys); +% for i=1:numel(d) +% tsg.(ncv_keys{d(i)}) = datenumToJulian(tsg.(ncv_keys{d(i)})); +% end + + % loop over all global attributes and get associated value in tsg % structure