Skip to content
Snippets Groups Projects
Commit fdd1d5f7 authored by Olivier Sauter's avatar Olivier Sauter
Browse files

fix cases 3D

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@4396 d63d8f72-b253-0410-a779-e742ad2e26cf
parent 2b2a6259
No related branches found
No related tags found
No related merge requests found
...@@ -441,10 +441,21 @@ switch AUGkeywrdcase{index} ...@@ -441,10 +441,21 @@ switch AUGkeywrdcase{index}
trace.dim=[{trace.x} ; {trace.t}]; trace.dim=[{trace.x} ; {trace.t}];
trace.dimunits=[{'R [m] or rho=sqrt(psi_norm)'} ; {'time [s]'}]; trace.dimunits=[{'R [m] or rho=sqrt(psi_norm)'} ; {'time [s]'}];
else else
disp('how to deal with 3D arrays?') % disp('how to deal with 3D arrays?')
trace.dim=[{trace.x} ; {trace.t} ; {d}]; % find time dimension
trace.dimunits=[{'R [m] or rho=sqrt(psi_norm)'} ; {'time [s]'} ; {'d'}]; ilentime=length(trace.t);
trace.d=d; ij=find(size(trace.value)==ilentime);
if ij==1;
% as expected
trace.x = [1:size(trace.value,2)];
trace.dim=[{trace.t} ; {trace.x} ; {[1:size(trace.value,3)]}];
trace.dimunits=[{'time [s]'} ; {''} ; {''}];
else
trace.dim=[{[]} ; {[]} ; {[]}];
trace.dim{ij} = trace.t;
trace.dimunits=[{[]} ; {[]} ; {[]}];
trace.dimunits{ij}='time [s]';
end
end end
trace.name=[num2str(shot) '/' ppftype '/' tracename]; trace.name=[num2str(shot) '/' ppftype '/' tracename];
......
...@@ -127,7 +127,6 @@ else ...@@ -127,7 +127,6 @@ else
adata.area = adata_area; adata.area = adata_area;
adata.exp = shotfile_exp; adata.exp = shotfile_exp;
if (prod(size(adata.value))==length(adata.value)) if (prod(size(adata.value))==length(adata.value))
% only time signal % only time signal
adata.x = []; adata.x = [];
...@@ -140,7 +139,11 @@ else ...@@ -140,7 +139,11 @@ else
else else
if length(size(adata.value))<=2; adata.value = adata.value'; end % cannot transpose Nd>2 matrix if length(size(adata.value))<=2; adata.value = adata.value'; end % cannot transpose Nd>2 matrix
if ~isempty(adata.time_aug) if ~isempty(adata.time_aug)
adata.x=[1:prod(size(adata.value))/length(adata_time.value)]; if length(size(adata.value))<=2;
adata.x=[1:prod(size(adata.value))/length(adata_time.value)];
else
adata.x = [];
end
adata.t=adata.time_aug.value; adata.t=adata.time_aug.value;
else else
adata.x=[1:size(adata.value,1)]; adata.x=[1:size(adata.value,1)];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment