diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m index a850e622a10e842ccc4161624e2f5a96002d7097..09b2693a1b298aae50eab39c2ee177b63226d656 100644 --- a/crpptbx/TCV/gdat_tcv.m +++ b/crpptbx/TCV/gdat_tcv.m @@ -1029,20 +1029,20 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') % so project psi(R,Z) on Rmesh, Zmesh of 1st time if length(time) > 1 if gdat_data.gdat_params.write==1 - gdat_data.eqdsk{itime} = write_eqdsk(fnamefull,eqdsk_cocosout,cocos_out); + gdat_data.eqdsk(itime) = write_eqdsk(fnamefull,eqdsk_cocosout,cocos_out); else - gdat_data.eqdsk{itime} = eqdsk_cocosout; + gdat_data.eqdsk(itime) = eqdsk_cocosout; end if gdat_data.gdat_params.map_eqdsk_psirz==1 if itime==1 - gdat_data.data(:,:,itime) = gdat_data.eqdsk{itime}.psi; - gdat_data.dim{1} = gdat_data.eqdsk{itime}.rmesh; - gdat_data.dim{2} = gdat_data.eqdsk{itime}.zmesh; + gdat_data.data(:,:,itime) = gdat_data.eqdsk(itime).psi; + gdat_data.dim{1} = gdat_data.eqdsk(itime).rmesh; + gdat_data.dim{2} = gdat_data.eqdsk(itime).zmesh; else - xx=repmat(reshape(gdat_data.dim{1},length(gdat_data.dim{1}),1),1,size(gdat_data.eqdsk{itime}.psi,2)); - yy=repmat(reshape(gdat_data.dim{2},1,length(gdat_data.dim{2})),size(gdat_data.eqdsk{itime}.psi,1),1); - aa = interpos2Dcartesian(gdat_data.eqdsk{itime}.rmesh,gdat_data.eqdsk{itime}.zmesh ... - ,gdat_data.eqdsk{itime}.psi,xx,yy,-1,-1); + xx=repmat(reshape(gdat_data.dim{1},length(gdat_data.dim{1}),1),1,size(gdat_data.eqdsk(itime).psi,2)); + yy=repmat(reshape(gdat_data.dim{2},1,length(gdat_data.dim{2})),size(gdat_data.eqdsk(itime).psi,1),1); + aa = interpos2Dcartesian(gdat_data.eqdsk(itime).rmesh,gdat_data.eqdsk(itime).zmesh ... + ,gdat_data.eqdsk(itime).psi,xx,yy,-1,-1); gdat_data.data(:,:,itime) = aa; end else @@ -1062,9 +1062,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') gdat_data.dim{3} = gdat_data.t; gdat_data.x = gdat_data.dim(1:2); if gdat_data.gdat_params.map_eqdsk_psirz==1 - gdat_data.data_fullpath=['psi(R,Z,t) on same R,Zmesh in .data and eqdsk{itime} from read_eqdsk from LIUQE' num2str(liuqe_version) ';zshift=' num2str(zshift)]; + gdat_data.data_fullpath=['psi(R,Z,t) on same R,Zmesh in .data and eqdsk(itime) from read_eqdsk from LIUQE' num2str(liuqe_version) ';zshift=' num2str(zshift)]; else - gdat_data.data_fullpath=['eqdsk{itime} from read_eqdsk from LIUQE' num2str(liuqe_version) ';zshift=' num2str(zshift)]; + gdat_data.data_fullpath=['eqdsk(itime) from read_eqdsk from LIUQE' num2str(liuqe_version) ';zshift=' num2str(zshift)]; end gdat_data.units = 'T m^2'; gdat_data.dimunits = {'m','m','s'};