make rhopol x-coordinate of all radial dependecies

git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@11877 d63d8f72-b253-0410-a779-e742ad2e26cf

crpptbx/AUG/torbeam_plot_output_singlerun.m

@@ -118,6 +118,7 @@ ylabel('Te')
 subplot(2,1,2)
 plot(zzz.ne(:,1),zzz.ne(:,2))
 ylabel('ne')
+xlabel('rhopol')
 
 figure;
 subplot(2,1,1)
@@ -126,6 +127,7 @@ ylabel('Pdens')
 subplot(2,1,2)
 plot(zzz.t2_new_LIB(:,1),zzz.t2_new_LIB(:,3))
 ylabel('jcd')
+xlabel('rhopol')
 
 figure
 theta=linspace(0,2.*pi,300);

crpptbx/AUG/torbeam_prepare_inputs_and_run.m

@@ -163,7 +163,7 @@ end
 % run TORBEAM
 current_dir = pwd;
 eval(['cd ' torbeam_in.dir_torbeam])
-%                   namelist,  ol proj 3 rays(R,z)*100, not used now,  tor proj 3 rays(R,Y),  vol()   dP/dV(r/a) j(r/a)
+%                   namelist,  ol proj 3 rays(R,z)*100, not used now,  tor proj 3 rays(R,Y),  vol()   dP/dV(rhopol) j(rhopol)
 %tb_out_files_to_cp = {'echo.dat', 't1_LIB.dat', 't2_LIB.dat', 't1tor_LIB.dat', 'volumes.dat', 't2_new_LIB.dat', 'cntpr.dat'};
 tb_out_files_to_cp = {'t1_LIB.dat', 't1tor_LIB.dat', 'volumes.dat', 't2_new_LIB.dat'};
 tb_out_files_to_cp_varname = strrep(tb_out_files_to_cp,'.dat','');
@@ -190,8 +190,8 @@ for it_eff=1:length(times_for_torbeam_eff)
       ima = findstr('(MA)',b);
       torbeam_out.icd(ibeam,it_eff) = 1e6 * sscanf(b(ima+4:end),'%f',1);
       imaxat = findstr('max. at',b);
-      torbeam_out.pabs_roamax(ibeam,it_eff) = sscanf(b(imaxat(1)+7:end),'%f',1);
-      torbeam_out.icd_roamax(ibeam,it_eff) = sscanf(b(imaxat(2)+7:end),'%f',1);
+      torbeam_out.pabs_rhopolmax(ibeam,it_eff) = sscanf(b(imaxat(1)+7:end),'%f',1);
+      torbeam_out.icd_rhopolmax(ibeam,it_eff) = sscanf(b(imaxat(2)+7:end),'%f',1);
       for j=1:length(tb_out_files_to_cp)
         torbeam_out.(tb_out_files_to_cp_varname{j}){ibeam,it_eff} = load(fullfile(torbeam_in.dir_torbeam,[tb_out_files_to_cp{j}]));
       end
@@ -214,11 +214,11 @@ for ibeam=find(any(torbeam_out.run_torbeam,2))'
   plot(squeeze(torbeam_out.pdens_jcd_rho(:,ibeam,:)),squeeze(torbeam_out.pdens(:,ibeam,:)))
   title(['AUG shot #' num2str(shot) ': for beam = ' num2str(ibeam)])
   ylabel('Pdens')
-  xlabel('r/a')
+  xlabel('rhopol')
   subplot(2,1,2)
   plot(squeeze(torbeam_out.pdens_jcd_rho(:,ibeam,:)),squeeze(torbeam_out.jcd(:,ibeam,:)))
   ylabel('jcd')
-  xlabel('r/a')
+  xlabel('rhopol')
 end
 
 figure
@@ -233,8 +233,8 @@ plot(torbeam_out.t,torbeam_out.icd/1e6,'*-')
 ylabel('Icd [MA]')
 
 subplot(3,1,3)
-plot(torbeam_out.t,torbeam_out.pabs_roamax,'*-')
-ylabel('r(max Pdens) / a')
+plot(torbeam_out.t,torbeam_out.pabs_rhopolmax,'*-')
+ylabel('rhopol(max Pdens)')
 xlabel('t [s]')