diff --git a/crpptbx/AUG/geteqdskAUG.m b/crpptbx/AUG/geteqdskAUG.m index c9b6eefc43d28b253fb0805e8f65d29f55b755e8..ce5f7d58b0088c90bae481bc625911f6cd59b7d7 100644 --- a/crpptbx/AUG/geteqdskAUG.m +++ b/crpptbx/AUG/geteqdskAUG.m @@ -3,7 +3,7 @@ function [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,NR,NZ,save % [eqdskAUG, equil_all_t, equil_t_index]=geteqdskAUG(shot,time,NR,NZ,savedir,deltaz,varargin); % % you can then do: -% writeeqdsk('fname',eqdskAUG,13); +% write_eqdsk('fname',eqdskAUG,13); % diff --git a/crpptbx/AUG/loadAUGdata.m b/crpptbx/AUG/loadAUGdata.m index 36a06ef077aaf47e67c593103b5af394b09cdf84..d7a4d91d71c0be7508e7bc82c0e36ea92e131383 100644 --- a/crpptbx/AUG/loadAUGdata.m +++ b/crpptbx/AUG/loadAUGdata.m @@ -100,8 +100,8 @@ if size(data_type_eff,1)==1 if ~isempty(strmatch(lower(data_type_eff_noext),[{'cxrs'} {'vrot'} {'ti'}],'exact')) data_type_eff_noext='cxrs'; % load full CEZ structure end - if ~isempty(strmatch(lower(data_type_eff_noext),[{'cxrs_rhos'} {'cxrsrho'} {'cxrsrhos'}],'exact')) - data_type_eff_noext='cxrs_rhos'; % load full CEZ structure + if ~isempty(strmatch(lower(data_type_eff_noext),[{'cxrs_rhos'} {'cxrs_rho'} {'cxrsrho'} {'cxrsrhos'}],'exact')) + data_type_eff_noext='cxrs_rho'; % load full CEZ structure end if ~isempty(strmatch(data_type_eff_noext,[{'SXR'}],'exact')) data_type_eff_noext='sxr'; @@ -172,7 +172,7 @@ end % all keywords and corresponding case to run below AUGkeywrdall=[{'Ip'} {'b0'} {'zmag'} {'rmag'} {'rgeo'} {'zgeo'} {'rcont'} {'zcont'} {'vol'} {'qrho'} {'qrho_fpp'} {'q0'} {'q95'} {'kappa'} ... {'delta'} {'deltatop'} {'deltabot'} {'neint'} ... - {'ne'} {'te'} {'nerho'} {'neterho'} {'terho'} {'cxrs'} {'cxrs_rhos'} {'equil'} {'equil_fpp'} ... + {'ne'} {'te'} {'nerho'} {'neterho'} {'terho'} {'cxrs'} {'cxrs_rho'} {'equil'} {'equil_fpp'} ... {'sxr'} {'sxR'} {'sxb'} {'ece'} {'eced'} {'Halpha'}]; AUGsig.iip=strmatch('Ip',AUGkeywrdall,'exact'); AUGsig.ib0=strmatch('b0',AUGkeywrdall,'exact'); @@ -200,7 +200,7 @@ AUGsig.inerho=strmatch('nerho',AUGkeywrdall,'exact'); AUGsig.iterho=strmatch('terho',AUGkeywrdall,'exact'); AUGsig.ineterho=strmatch('neterho',AUGkeywrdall,'exact'); AUGsig.icxrs=strmatch('cxrs',AUGkeywrdall,'exact'); -AUGsig.icxrs_rhos=strmatch('cxrs_rhos',AUGkeywrdall,'exact'); +AUGsig.icxrs_rho=strmatch('cxrs_rho',AUGkeywrdall,'exact'); AUGsig.isxr=strmatch('sxr',AUGkeywrdall,'exact'); AUGsig.isxR=strmatch('sxR',AUGkeywrdall,'exact'); AUGsig.isxb=strmatch('sxb',AUGkeywrdall,'exact'); @@ -227,7 +227,7 @@ AUGkeywrdcase(AUGsig.isxR)=AUGkeywrdall(AUGsig.isxR); AUGkeywrdcase(AUGsig.isxb)=AUGkeywrdall(AUGsig.isxb); %AUGkeywrdcase(AUGsig.iece)=AUGkeywrdall(AUGsig.iece); AUGkeywrdcase(AUGsig.icxrs)=AUGkeywrdall(AUGsig.icxrs); -AUGkeywrdcase(AUGsig.icxrs_rhos)=AUGkeywrdall(AUGsig.icxrs_rhos); +AUGkeywrdcase(AUGsig.icxrs_rho)=AUGkeywrdall(AUGsig.icxrs_rho); % Information about which dimension has time, always return 2D data as (x,t) array % as most are 1D arrays with time as first index, fill in with ones and change only those needed @@ -514,7 +514,7 @@ switch AUGkeywrdcase{index} end %&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& - case {'cxrs', 'cxrs_rhos'} + case {'cxrs', 'cxrs_rho'} % LOAD CEZ data % @@ -553,7 +553,7 @@ switch AUGkeywrdcase{index} cxrs.ti_c = a; cxrs.ti_c.error = aerr.value; % - if strcmp(AUGkeywrdcase{index},'cxrs_rhos') + if strcmp(AUGkeywrdcase{index},'cxrs_rho') equil=gdat(shot,'equil',0); inb_chord_cxrs=size(cxrs.r_time,1); inb_time_cxrs=size(cxrs.r_time,2);