diff --git a/matlab/plot/create_film.m b/matlab/plot/create_film.m
index 031ff2c5cb52bfc64fc10922f3461d6768c7ba64..6becccec8c45ab7c06a95c19e033bbf3d28363c9 100644
--- a/matlab/plot/create_film.m
+++ b/matlab/plot/create_film.m
@@ -1,7 +1,7 @@
function create_film(DATA,OPTIONS,format)
%% Plot options
FPS = 16; DELAY = 1/FPS;
-BWR = 1; NORMALIZED = 1;
+BWR = OPTIONS.BWR; NORMALIZED = 1;
if ~strcmp(OPTIONS.PLAN,'sx')
T = DATA.Ts3D;
else
@@ -40,7 +40,12 @@ fig = figure('Color','white');%,'Position', toplot.DIMENSIONS.*[0.5 0.5 1.0 1])
if ~strcmp(OPTIONS.PLAN,'sx')
pcolor(X,Y,FIELD(:,:,1)); % to set up
if BWR
- colormap(bluewhitered)
+ colormap(bluewhitered)
+ else
+ colormap(gray)
+ end
+ if OPTIONS.CLIMAUTO
+ clim('auto')
end
axis tight manual % this ensures that getframe() returns a consistent size
if toplot.INTERP
@@ -72,7 +77,12 @@ fig = figure('Color','white');%,'Position', toplot.DIMENSIONS.*[0.5 0.5 1.0 1])
end
set(pclr, 'edgecolor','none'); %pbaspect(toplot.ASPECT);
if BWR
- colormap(bluewhitered)
+ colormap(bluewhitered)
+ else
+ colormap(gray)
+ end
+ if OPTIONS.CLIMAUTO
+ clim('auto')
end
else % show velocity distr.
contour(toplot.X,toplot.Y,FIELD(:,:,n)/scale,128);
diff --git a/matlab/plot/photomaton.m b/matlab/plot/photomaton.m
index fdcad8f2065ddc7bf6f0c381cee1de77d5584394..dc3dfc5b8ff76c4a9693ba26089d3e576f533ed0 100644
--- a/matlab/plot/photomaton.m
+++ b/matlab/plot/photomaton.m
@@ -30,7 +30,7 @@ FIGURE.fig = figure; %set(gcf, 'Position', toplot.DIMENSIONS.*[1 1 Ncols Nrows]
pbaspect(toplot.ASPECT)
end
if ~strcmp(OPTIONS.PLAN,'kxky')
- caxis([-1,1]*frame_max/scale);
+ clim([-1,1]*frame_max/scale);
colormap(bluewhitered);
if OPTIONS.INTERP
shading interp;
diff --git a/matlab/process_field.m b/matlab/process_field.m
index 5b2d103e3e38e158a342115b942ac53e546671ee..651998af5961619fb29f57c5a4769103b56ff72b 100644
--- a/matlab/process_field.m
+++ b/matlab/process_field.m
@@ -138,6 +138,7 @@ switch REALP
case 1 % Real space plot
INTERP = OPTIONS.INTERP;
process = @(x) real(fftshift(ifourier_GENE(x)));
+ % process = @(x) real(fftshift(ifft2(x,sz(1),sz(2))));
shift_x = @(x) x;
shift_y = @(x) x;
case 0 % Frequencies plot
diff --git a/wk/fast_analysis.m b/wk/fast_analysis.m
index e7c14fd1e1bd85c049d1d305e97fc81568f5b002..1e5957cc5a2403e8387ea454b47b7b3e49fd8a29 100644
--- a/wk/fast_analysis.m
+++ b/wk/fast_analysis.m
@@ -6,14 +6,16 @@ addpath(genpath([gyacomodir,'matlab/load'])) % ... add
default_plots_options
% Partition of the computer where the data have to be searched
% PARTITION='/Users/ahoffmann/gyacomo/results/paper_3/';
-PARTITION='/misc/gyacomo23_outputs/paper_3/';
+% PARTITION='/misc/gyacomo23_outputs/paper_3/';
+PARITION = '';
%% Paper 3
% resdir = 'DTT_rho85/3x2x192x48x32';
% resdir = 'DTT_rho85/3x2x192x48x32_NT';
% resdir = 'DTT_rho98/3x2x192x48x32';
% resdir = 'DTT_rho98/3x2x192x48x32_0.25grad';
% resdir = 'LM_DIIID_rho95/5x3x512x92x32';
-resdir = 'LM_DIIID_rho95/3x2x512x92x32';
+% resdir = 'LM_DIIID_rho95/3x2x512x92x32';
+resdir = '../results/dev/ExB_SF';
%%
J0 = 00; J1 = 02;
@@ -22,10 +24,10 @@ DATADIR = [PARTITION,resdir,'/'];
data = {};
data = compile_results_low_mem(data,DATADIR,J0,J1);
-if 1
+if 0
%% Plot transport and phi radial profile
[data.PHI, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'phi');
-[data.PSI, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'psi');
+% [data.PSI, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'psi');
options.TAVG_0 = 100;
options.TAVG_1 = 1000;
options.NCUT = 5; % Number of cuts for averaging and error estimation
@@ -37,7 +39,7 @@ options.RESOLUTION = 256;
plot_radial_transport_and_spacetime(data,options);
end
-if 0
+if 1
%% MOVIES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Options
% [data.PHI, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'phi');
@@ -45,6 +47,8 @@ if 0
data.Ni00 = reshape(data.Na00(1,:,:,:,:),data.grids.Nky,data.grids.Nkx,data.grids.Nz,numel(data.Ts3D));
options.INTERP = 1;
options.POLARPLOT = 0;
+options.BWR = 0; % bluewhitered plot or gray
+options.CLIMAUTO = 1; % adjust the colormap auto
% options.NAME = '\phi';
% options.NAME = '\phi^{NZ}';
% options.NAME = '\omega_z';
@@ -54,7 +58,7 @@ options.NAME = 'N_i^{00}';
% options.NAME = 'Q_x';
% options.NAME = 'n_i';
% options.NAME = 'n_i-n_e';
-options.PLAN = 'kxky';
+options.PLAN = 'xy';
% options.NAME = 'f_i';
% options.PLAN = 'sx';
options.COMP = 1;
@@ -74,18 +78,20 @@ if 0
[data.PHI, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'phi');
data.Ni00 = reshape(data.Na00(1,:,:,:,:),data.grids.Nky,data.grids.Nkx,data.grids.Nz,numel(data.Ts3D));
-options.INTERP = 0;
+options.INTERP = 1;
options.POLARPLOT = 0;
-options.AXISEQUAL = 0;
+options.AXISEQUAL = 1;
options.NORMALIZE = 0;
-% options.NAME = 'N_i^{00}';
-options.NAME = '\phi';
+options.NAME = 'N_i^{00}';
+% options.NAME = '\phi';
options.PLAN = 'kxky';
options.COMP = 'avg';
-options.TIME = [0 10 20 50];
+options.TIME = [0];
% options.TIME = data.Ts3D(1:2:end);
options.RESOLUTION = 256;
fig = photomaton(data,options);
+colormap(gray)
+clim('auto')
% save_figure(data,fig)
end
if 0
@@ -93,7 +99,7 @@ if 0
profiler(data)
end
-if 1
+if 0
%% Hermite-Laguerre spectrum
[data.Napjz, data.Ts3D] = compile_results_3Da(DATADIR,J0,J1,'Napjz');
% [data.Napjz, data.Ts3D] = compile_results_3D(DATADIR,J0,J1,'Nipjz');