Skip to content
Snippets Groups Projects

fix units

Merged Olivier Sauter requested to merge fix_units into master
2 files
+ 19
14
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 3
3
@@ -2139,7 +2139,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
@@ -2139,7 +2139,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
rho=[];
rho=[];
end
end
gdat_data.dim{1}=rho;
gdat_data.dim{1}=rho;
gdat_data.dimunits=[{'sqrt(psi_norm)'} ; {'time [s]'}];
gdat_data.dimunits=[{'sqrt(psi_norm)'} ; {'s'}];
gdat_data.x=rho;
gdat_data.x=rho;
% add grids_1d to have rhotor, etc
% add grids_1d to have rhotor, etc
gdat_data = get_grids_1d(gdat_data,2,1,gdat_params.nverbose);
gdat_data = get_grids_1d(gdat_data,2,1,gdat_params.nverbose);
@@ -3441,7 +3441,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
@@ -3441,7 +3441,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
gdat_data.t=[];
gdat_data.t=[];
end
end
gdat_data.dim=[{gdat_data.x};{gdat_data.t}];
gdat_data.dim=[{gdat_data.x};{gdat_data.t}];
gdat_data.dimunits=[{'sqrt(psi\_norm)'} ; {'time [s]'}];
gdat_data.dimunits=[{'sqrt(psi\_norm)'} ; {'s'}];
if ~isempty(gdat_data.t) && any(strcmp(fieldnames(tracetdi),'units'))
if ~isempty(gdat_data.t) && any(strcmp(fieldnames(tracetdi),'units'))
gdat_data.units=tracetdi.units;
gdat_data.units=tracetdi.units;
end
end
@@ -3629,7 +3629,7 @@ gdat_data.error_bar = vertcat(data_tmp.error_bar);
@@ -3629,7 +3629,7 @@ gdat_data.error_bar = vertcat(data_tmp.error_bar);
if status_any,gdat_data.data_fullpath = [strjoin({data_tmp(status).data_fullpath},'; '),'; error_bar'];end
if status_any,gdat_data.data_fullpath = [strjoin({data_tmp(status).data_fullpath},'; '),'; error_bar'];end
z = arrayfun(@(x) x.dim{1}, data_tmp, 'UniformOutput', false);
z = arrayfun(@(x) x.dim{1}, data_tmp, 'UniformOutput', false);
gdat_data.dim = {vertcat(z{:}),time};
gdat_data.dim = {vertcat(z{:}),time};
gdat_data.dimunits = {'Z [m]' ; 'time [s]'};
gdat_data.dimunits = {'Z [m]' ; 's'};
gdat_data.x = gdat_data.dim{1};
gdat_data.x = gdat_data.dim{1};
gdat_data.t = time;
gdat_data.t = time;
gdat_data.system=vertcat(data_tmp.system);
gdat_data.system=vertcat(data_tmp.system);
Loading