diff --git a/matlab/create_gif.m b/matlab/create_gif.m
index f2445a7f9af68af4b4ce9442aa16ade29d80869a..0c55f019b76da0634270a11be5ea53ddef91cf18 100644
--- a/matlab/create_gif.m
+++ b/matlab/create_gif.m
@@ -13,7 +13,7 @@ else
% Setup figure frame
fig = figure('Color','white','Position', [100, 100, 400, 400]);
pcolor(X,Y,FIELD(:,:,1)); % to set up
- colormap gray
+% colormap gray
axis tight manual % this ensures that getframe() returns a consistent size
if INTERP
shading interp;
@@ -27,7 +27,7 @@ fig = figure('Color','white','Position', [100, 100, 400, 400]);
shading interp;
end
set(pclr, 'edgecolor','none'); axis square;
-% caxis([min(min(FIELD(:,:,n))),max(max(FIELD(:,:,n)))]);
+% caxis([-max(max(abs(FIELD(:,:,n)))),max(max(abs(FIELD(:,:,n))))]);
xlabel(XNAME); ylabel(YNAME); %colorbar;
title([FIELDNAME,', $t \approx$', sprintf('%.3d',ceil(T(n)))...
,', scaling = ',sprintf('%.1e',scale)]);
diff --git a/matlab/load_daint.m b/matlab/load_daint.m
index 946051bc2e1b37cd3cac376289680bc03e00cbc8..79a9e0b13ace435c287186a3486edd59be808f5b 100644
--- a/matlab/load_daint.m
+++ b/matlab/load_daint.m
@@ -5,21 +5,9 @@ function [ RESDIR ] = load_daint( outfilename )
hostfile = [hostfolder,'/out*'];
RESDIR = ['../',outfilename(33:end-8),'/'];
localfolder = [RESDIR,'.'];
- elafolder = ['HeLaZ/',outfilename(33:end-8)];
- % Create directory to move the results
- CMD = ['ssh ahoffman@ela.cscs.ch ',...
- 'mkdir -p ',elafolder];
- disp(CMD);
- system(CMD);
-
- % Move results file from daint to ela3
- CMD = ['ssh ahoffman@ela.cscs.ch ssh ahoffman@daint.cscs.ch ',...
- 'mv ', hostfolder,'/* ',elafolder];
- disp(CMD);
- system(CMD);
% Download results from ela3
- CMD = ['scp -r ahoffman@ela.cscs.ch:',hostfile,' ',localfolder];
+ CMD = ['scp -r ahoffman@daint:',hostfile,' ',localfolder];
disp(CMD);
system(CMD);
end
diff --git a/matlab/load_params.m b/matlab/load_params.m
index 1c998985db20bbcef370f8cf33dde3ac4a95cea3..43bd72ad451ca335c7bcb62e0a2ea8ff3ad7e194 100644
--- a/matlab/load_params.m
+++ b/matlab/load_params.m
@@ -1,13 +1,16 @@
-CONAME = h5readatt(filename,'/data/input','CO');
-ETAB = h5readatt(filename,'/data/input','eta_B');
-ETAN = h5readatt(filename,'/data/input','eta_n');
-ETAT = h5readatt(filename,'/data/input','eta_T');
-PMAXI = h5readatt(filename,'/data/input','pmaxi');
-JMAXI = h5readatt(filename,'/data/input','jmaxi');
-PMAXE = h5readatt(filename,'/data/input','pmaxe');
-JMAXE = h5readatt(filename,'/data/input','jmaxe');
+CO = h5readatt(filename,'/data/input','CO');
+ETAB = h5readatt(filename,'/data/input','eta_B');
+ETAN = h5readatt(filename,'/data/input','eta_n');
+ETAT = h5readatt(filename,'/data/input','eta_T');
+PMAXI = h5readatt(filename,'/data/input','pmaxi');
+JMAXI = h5readatt(filename,'/data/input','jmaxi');
+PMAXE = h5readatt(filename,'/data/input','pmaxe');
+JMAXE = h5readatt(filename,'/data/input','jmaxe');
NON_LIN = h5readatt(filename,'/data/input','NON_LIN');
-NU = h5readatt(filename,'/data/input','nu')/0.532;
+NU = h5readatt(filename,'/data/input','nu')/0.532;
+NR = h5readatt(filename,'/data/input','nr');
+NZ = h5readatt(filename,'/data/input','nz');
+L = h5readatt(filename,'/data/input','Lr');
if NON_LIN == 'y'
NON_LIN = 1;
else
@@ -19,6 +22,7 @@ elseif(CO == -1); CONAME = 'FC';
elseif(CO == -2); CONAME = 'DG';
elseif(CO == -3); CONAME = 'DGGK';
end
+
if (CLOS == 0); CLOSNAME = 'Trunc.';
elseif(CLOS == 1); CLOSNAME = 'Clos. 1';
elseif(CLOS == 2); CLOSNAME = 'Clos. 2';
@@ -33,7 +37,7 @@ degngrad = [degngrad,'_eta_',num2str(ETAB/ETAN),'_nu_%0.0e_',...
CONAME,'_CLOS_',num2str(CLOS),'_mu_%0.0e'];
degngrad = sprintf(degngrad,[NU,MU]);
if ~NON_LIN; degngrad = ['lin_',degngrad]; end
-resolution = [num2str(GRID.Nr),'x',num2str(GRID.Nz/2),'_'];
+resolution = [num2str(NR),'x',num2str(NZ/2),'_'];
gridname = ['L_',num2str(L),'_'];
PARAMS = [resolution,gridname,degngrad];
% BASIC.RESDIR = [SIMDIR,PARAMS,'/'];
diff --git a/matlab/load_results.m b/matlab/load_results.m
index db7c69dc3571dc64f0bd6e82836f209510d61573..c876e5219c1aa68b1ff319353b274daabf159b57 100644
--- a/matlab/load_results.m
+++ b/matlab/load_results.m
@@ -6,12 +6,9 @@ CPUTIME = h5readatt(filename,'/data/input','cpu_time');
DT_SIM = h5readatt(filename,'/data/input','dt');
[Nipj, Pi, Ji, kr, kz, Ts5D, dt5D] = load_5D_data(filename, 'moments_i');
[Nepj, Pe, Je ] = load_5D_data(filename, 'moments_e');
-[Ni00, kr, kz, Ts2D, dt2D] = load_2D_data(filename, 'Ni00');
- Ne00 = load_2D_data(filename, 'Ne00');
-%Pi = [0]; Ji = Pi; Pe = Pi; Je = Pi;
-% Nipj = zeros(1,1,numel(kr),numel(kz),numel(Ts5D));
-% Nepj = Nipj;
-% Nipj(1,1,:,:,:) = Ni00; Nepj(1,1,:,:,:) = Ne00;
+[Ni00, kr, kz, Ts2D, dt2D] = load_2D_data(filename, 'Ni00');
+ Ne00 = load_2D_data(filename, 'Ne00');
+
PHI = load_2D_data(filename, 'phi');
Sipj = load_5D_data(filename, 'Sipj');
diff --git a/matlab/write_sbash_daint.m b/matlab/write_sbash_daint.m
index 399f87146c83bca9df6f3a65a00b75adc903c39b..0425cf4c188329196857bd22ca99cb0f2ed52847 100644
--- a/matlab/write_sbash_daint.m
+++ b/matlab/write_sbash_daint.m
@@ -32,6 +32,7 @@ fprintf(fid,[...
'#SBATCH --nodes=', CLUSTER.NODES,'\n',...
'#SBATCH --cpus-per-task=', CLUSTER.CPUPT,'\n',...
'#SBATCH --ntasks-per-node=', CLUSTER.NTPN,'\n',...
+'#SBATCH --ntasks-per-core=', CLUSTER.NTPC,'\n',...
'#SBATCH --mem=', CLUSTER.MEM,'\n',...
'#SBATCH --error=err.txt\n',...
'#SBATCH --output=out.txt\n',...