correct j_tor and j_parallel for cocos 17

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

crpptbx/TCV_IMAS/tcv_get_ids_equilibrium.m

@@ -256,16 +256,18 @@ for it=1:numel(ids_equilibrium.time)
       (ids_equilibrium.time_slice{it}.global_quantities.psi_boundary-ids_equilibrium.time_slice{it}.global_quantities.psi_axis).^2;
 end
 mu0 = 4.e-7 * pi;
-j_tor = -profiles_1d.dpressure_dpsi.data ./ profiles_1d.gm9.data ...
-        - profiles_1d.gm1.data ./ profiles_1d.gm9.data .* profiles_1d.f_df_dpsi.data ./ mu0;
-profiles_1d.j_tor.data = - 2.*pi.* j_tor; % 2pi sigma_bp * jtor above (Eq. (30) cocos paper cocos=17)
-% $$$ j_par = - ids_equilibrium.vacuum_toroidal_field.r0.^2 .* profiles_1d.f.data ...
-% $$$        ./repmat(profiles_1d.f.data(end,:),size(profiles_1d.f.data,1),1) ...
-% $$$        .* (profiles_1d.dpressure_dpsi.data ...
-% $$$           + profiles_1d.f_df_dpsi.data/mu0 .* (profiles_1d.gm1.data + gradpsi_sq ./ profiles_1d.f.data.^2);
-j_par = - profiles_1d.f_df_dpsi.data./profiles_1d.f.data./mu0.*gradpsi_over_R_sq./2./pi ...
-        - profiles_1d.f.data .*2*pi .*profiles_1d.dpressure_dpsi.data ...
-        - profiles_1d.f.data .*2*pi /mu0.*profiles_1d.f_df_dpsi.data.*profiles_1d.gm1.data;
+% Eq. (30) cocos paper cocos=17
+% j_tor=<jphi/R>/<1/R>=-sigma_Bp (2pi)^e_Bp dp/dpsi / <1/R> - sigma_Bp (2pi)^e_Bp F dF/dpsi / mu0 <1/R^2> / <1/R>
+% simaBp=-1 and eBp=1 for cocos=17 from TCV LIUQE
+profiles_1d.j_tor.data = - (-1.) .* 2.*pi .* profiles_1d.dpressure_dpsi.data ./ profiles_1d.gm9.data ...
+    - (-1.) .* 2.*pi .* profiles_1d.gm1.data ./ profiles_1d.gm9.data .* profiles_1d.f_df_dpsi.data ./ mu0;
+%
+% <j.B> = - sigma_Bp (2pi)^e_Bp dp/dpsi F - sigma_Bp F dF/dpsi / mu0 [ (2pi)^e_Bp F <1/R^2> + 1/(2pi)^e_Bp * <|grad psi|^2/R^2> / F ]
+% simaBp=-1 and eBp=1 for cocos=17 from TCV LIUQE
+%
+j_par = - (-1.) .* 2*pi .* profiles_1d.dpressure_dpsi.data .* profiles_1d.f.data ...
+        - (-1.) .* profiles_1d.f_df_dpsi.data ./ mu0 .* ...
+        ( (2.*pi) .* profiles_1d.f.data .* profiles_1d.gm1.data + 1./(2.*pi) .* gradpsi_over_R_sq ./ profiles_1d.f.data);
 profiles_1d.j_parallel.data = j_par./repmat(ids_equilibrium.vacuum_toroidal_field.b0',size(profiles_1d.f.data,1),1);
 
 profiles_1d_fieldnames = fieldnames(profiles_1d);