Skip to content
Snippets Groups Projects
Commit af7c2903 authored by Francesco Carpanese's avatar Francesco Carpanese Committed by Olivier Sauter
Browse files

Fix bugs on the compare plot

parent f6cb39bc
Branches
Tags
1 merge request!41Add corsica liuqe complete ids from meq
This commit is part of merge request !41. Comments created here will be created in the context of that merge request.
...@@ -14,7 +14,7 @@ end ...@@ -14,7 +14,7 @@ end
% Set new grid % Set new grid
L.G.rx = a.equilibrium.time_slice{1}.profiles_2d{1}.grid.dim1; L.G.rx = a.equilibrium.time_slice{1}.profiles_2d{1}.grid.dim1;
L.G.zx = a.equilibrium.time_slice{1}.profiles_2d{1}.grid.dim2; L.G.zx = a.equilibrium.time_slice{1}.profiles_2d{1}.grid.dim2;
L.P.pq = sqrt((a.equilibrium.time_slice{1}.profiles_1d.psi - a.equilibrium.time_slice{1}.global_quantities.psi_axis)/(a.equilibrium.time_slice{1}.global_quantities.psi_boundary - a.equilibrium.time_slice{1}.global_quantities.psi_axis));
% Recompute the geometrical quantities for the CORSICA grid % Recompute the geometrical quantities for the CORSICA grid
L.G = liug(L.G,L.P); L.G = liug(L.G,L.P);
...@@ -106,12 +106,16 @@ Ty = Ty.*LY.Opy(:,:,tt); ...@@ -106,12 +106,16 @@ Ty = Ty.*LY.Opy(:,:,tt);
L.rymap = repmat(L.ry',numel(L.zy),1); % Matriz map ry L.rymap = repmat(L.ry',numel(L.zy),1); % Matriz map ry
LX.Ft(tt) = sum(sum( Ty/LX.rBt(tt)*L.drx*L.dzx./L.rymap )); LX.Ft(tt) = sum(sum( Ty/LX.rBt(tt)*L.drx*L.dzx./L.rymap ));
Iy = 2*pi*(L.rymap.*pprimey+1./L.rymap.*ttprimey/mu0)*L.drx*L.dzx; Iy = 2*pi*(L.rymap.*pprimey+1./L.rymap.*ttprimey/mu0)*L.drx*L.dzx; % Recomputed plasma current
LY.Ip(tt) = sum(sum(Iy)); LY.Ip(tt) = sum(sum(Iy));
LY.FA(tt) = a.equilibrium.time_slice{tt}.global_quantities.psi_axis; LY.FA(tt) = a.equilibrium.time_slice{tt}.global_quantities.psi_axis;
LY.FB(tt) = a.equilibrium.time_slice{tt}.global_quantities.psi_boundary; LY.FB(tt) = a.equilibrium.time_slice{tt}.global_quantities.psi_boundary;
LY.Wk(tt) = a.equilibrium.time_slice{tt}.global_quantities.w_mhd; LY.Wk(tt) = a.equilibrium.time_slice{tt}.global_quantities.w_mhd;
LY.PpQ(:,tt) = pprime;
LY.TTpQ(:,tt) = ttprime;
LY.psiN(:,tt) = psiN;
LY.PQ(:,tt) = a.equilibrium.time_slice{tt}.profiles_1d.pressure;
end end
LY.t = LX.t; LY.t = LX.t;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment