Commit 551bc5ef authored by Lore, Jeremy's avatar Lore, Jeremy
Browse files

Add AMJUEL H2 routine, fix H* evaluation for non-symmetric arrays

parent dead1242

matlab/bfield_library_jdl/ADAS_routines/get_adas_adf11_data.m

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ url_base = 'http://open.adas.ac.uk/download/adf11/'; 


types = {'acd','plt','scd','ccd','prb','prc'};

% species = {'c','h','he','li','be','ar','o','ne','n','w','fe','xe'};

species = {'ne'};

years = {'89','93','96','12'};

species = {'h'};

years = {'89','93','96','12','22'};



outname_base = 'C:\Work\ADAS\adf11_all';

matlab/bfield_library_jdl/ADAS_routines/plot_adas_data_recomb_ioniz_hydrogen.m

+2 −2
Original line number Diff line number Diff line 
clearvars;



% suffix = '96'; element='h';

suffix = '96'; element='h';

% suffix = '96'; element='c';

% suffix = '50'; element='w';

suffix = '96'; element='ne';

% suffix = '96'; element='ne';



fprintf('Reading scd\n');

fname = ['C:\Work\ADAS\adf11_all\scd',suffix,'\','scd',suffix,'_',element,'.dat'];  % Effective ionization coefficients (cm^-3/s)

matlab/bfield_library_jdl/AMJUEL_routines/eval_AMJUEL_H2_fit.m

0 → 100644
+18 −0
Original line number Diff line number Diff line 
function val = eval_AMJUEL_H2_fit(H2data,Te_eV)

% Te in eV



% e.g., H.2 2.1.5

% b0 -3.271396786375e+01 b1 1.353655609057e+01 b2 -5.739328757388e+00

% b3 1.563154982022e+00 b4 -2.877056004391e-01 b5 3.482559773737e-02

% b6 -2.631976175590e-03 b7 1.119543953861e-04 b8 -2.039149852002e-06

% H2data = [-3.271396786375e+01 1.353655609057e+01 -5.739328757388e+00 1.563154982022e+00 -2.877056004391e-01 3.482559773737e-02 -2.631976175590e-03 1.119543953861e-04 -2.039149852002e-06];



lnT = log(Te_eV);

N = length(H2data);



lnsv = zeros(size(Te_eV));

for n = 1:N

    lnsv = lnsv + H2data(n)*lnT.^(n-1);

end



val = exp(lnsv);
 
 No newline at end of file

matlab/bfield_library_jdl/AMJUEL_routines/eval_AMJUEL_H3_fit.m

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ function val = eval_AMJUEL_H3_fit(H4data,E0_eV,Ti_eV) 
lnT = log(Ti_eV);

lnE0 = log(E0_eV);  %n tilde in fits



N = size(H4data,2);

N = size(H4data,1);

M = size(H4data,2);



lnsv = zeros(size(Ti_eV));

matlab/bfield_library_jdl/AMJUEL_routines/eval_AMJUEL_H4_fit.m

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ function val = eval_AMJUEL_H4_fit(H4data,ne_cm3,Te_eV) 
lnT = log(Te_eV);

lnn = log(ne_cm3/1e8);  %n tilde in fits



N = size(H4data,2);

N = size(H4data,1);

M = size(H4data,2);



lnsv = zeros(size(Te_eV));