From af7c29038ccef262795d1286cf81be201ccc983c Mon Sep 17 00:00:00 2001
From: Francesco Carpanese <francesco.carpanese@epfl.ch>
Date: Mon, 16 Dec 2019 13:01:16 +0100
Subject: [PATCH] Fix bugs on the compare plot
---
IDS/LLXLY_IDS_corsica.m | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/IDS/LLXLY_IDS_corsica.m b/IDS/LLXLY_IDS_corsica.m
index 239ee2ae..274c143b 100644
--- a/IDS/LLXLY_IDS_corsica.m
+++ b/IDS/LLXLY_IDS_corsica.m
@@ -14,7 +14,7 @@ end
% Set new grid
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.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
L.G = liug(L.G,L.P);
@@ -106,12 +106,16 @@ Ty = Ty.*LY.Opy(:,:,tt);
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 ));
-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.FA(tt) = a.equilibrium.time_slice{tt}.global_quantities.psi_axis;
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.PpQ(:,tt) = pprime;
+LY.TTpQ(:,tt) = ttprime;
+LY.psiN(:,tt) = psiN;
+LY.PQ(:,tt) = a.equilibrium.time_slice{tt}.profiles_1d.pressure;
end
LY.t = LX.t;
--
GitLab