From e6163d711d353ecf15032279f2cf6372d63c5c67 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Tue, 8 Dec 2020 09:39:12 +0100
Subject: [PATCH] minor changes
---
wk/analysis_2D.m | 4 ++--
wk/marconi_run.m | 12 ++++++------
wk/marconi_scaling.m | 2 +-
wk/parallel_scaling.m | 23 ++++++++++++++---------
4 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/wk/analysis_2D.m b/wk/analysis_2D.m
index 080186af..b58fcb54 100644
--- a/wk/analysis_2D.m
+++ b/wk/analysis_2D.m
@@ -4,9 +4,9 @@ if LOAD_MARCONI
localfolder= [BASIC.RESDIR,'..'];
system(['scp -r ahoffman@login.marconi.cineca.it:',hostfolder,' ',localfolder])
end
-% JOBNUM = 0; load_results;
+JOBNUM = 0; load_results;
% JOBNUM = 1; load_results;
-compile_results
+% compile_results
%% Retrieving max polynomial degree and sampling info
Npe = numel(Pe); Nje = numel(Je); [JE,PE] = meshgrid(Je,Pe);
diff --git a/wk/marconi_run.m b/wk/marconi_run.m
index 1a9988ae..0c709cbe 100644
--- a/wk/marconi_run.m
+++ b/wk/marconi_run.m
@@ -21,17 +21,17 @@ NOISE0 = 1.0e-5;
%% GRID PARAMETERS
N = 512; % Frequency gridpoints (Nkr = N/2)
L = 100; % Size of the squared frequency domain
-PMAXE = 2; % Highest electron Hermite polynomial degree
-JMAXE = 1; % Highest '' Laguerre ''
-PMAXI = 2; % Highest ion Hermite polynomial degree
-JMAXI = 1; % Highest '' Laguerre ''
+PMAXE = 4; % Highest electron Hermite polynomial degree
+JMAXE = 2; % Highest '' Laguerre ''
+PMAXI = 4; % Highest ion Hermite polynomial degree
+JMAXI = 2; % Highest '' Laguerre ''
%% TIME PARAMETERS
-TMAX = 100; % Maximal time unit
+TMAX = 250; % Maximal time unit
DT = 5e-3; % Time step
SPS0D = 1/DT/4; % Sampling per time unit for profiler
SPS2D = 1; % Sampling per time unit for 2D arrays
SPS5D = 0.1; % Sampling per time unit for 5D arrays
-RESTART = 0; % To restart from last checkpoint
+RESTART = 1; % To restart from last checkpoint
JOB2LOAD= 0;
%% OPTIONS
SIMID = 'Marconi'; % Name of the simulation
diff --git a/wk/marconi_scaling.m b/wk/marconi_scaling.m
index cd75f641..624b85d0 100644
--- a/wk/marconi_scaling.m
+++ b/wk/marconi_scaling.m
@@ -7,7 +7,7 @@ addpath(genpath('../matlab')) % ... add
CLUSTER.TIME = '12:00:00'; % allocation time hh:mm:ss
CLUSTER.NODES = '1'; % MPI process
CLUSTER.CPUPT = '1'; % CPU per task
-CLUSTER.NTPN = '20'; % N tasks per node
+CLUSTER.NTPN = '32'; % N tasks per node
CLUSTER.PART = 'prod'; % dbg or prod
CLUSTER.MEM = '10GB'; % Memory
%% PHYSICAL PARAMETERS
diff --git a/wk/parallel_scaling.m b/wk/parallel_scaling.m
index 206d117e..4aa5c842 100644
--- a/wk/parallel_scaling.m
+++ b/wk/parallel_scaling.m
@@ -23,25 +23,28 @@ Results_1024_22.np = [ 1, 2, 4, 6, 8, 10, 12, 16, 20];
Results_1024_22.time = [2391, 1373, 0654, 0457, 0343, 0297, 0274, 0219, 0206];
% Handwritten results for 1024x512, P,J=6,4, Tmax = 2 dt = 0.05, mu = 0
-Results_1024_22.np = [ 1, 2, 4, 6, 8, 10, 12, 16, 20];
-Results_1024_22.time = [2391, 1373, 0654, 0457, 0343, 0297, 0274, 0219, 0206];
+Results_1024_64.np = [ 1, 2, 4, 6, 8, 10, 12, 16];
+Results_1024_64.time =[38957,22675,10886, 7424, 5768, 0000, 3904, 2947];
%
fig = figure;
-plot(1:24,1:24,'--k','DisplayName','Ideal')
+plot(1:24,1:24,'-k','DisplayName','Ideal')
hold on
-res = Results_256_21;
-plot(res.np,res.time(1)./(res.time),'o-','DisplayName','$256\times128$, $P,J=2,1$');
+% res = Results_256_21;
+% plot(res.np,res.time(1)./(res.time),'o--','DisplayName','$256\times128$, $P,J=2,1$');
res = Results_512_21;
-plot(res.np,res.time(1)./(res.time),'o-','DisplayName','$512\times256$, $P,J=2,1$');
+plot(res.np,res.time(1)./(res.time),'v-','DisplayName','$512\times256$, $P,J=2,1$');
res = Results_512_32;
-plot(res.np,res.time(1)./(res.time),'o-','DisplayName','$512\times256$, $P,J=3,2$');
+plot(res.np,res.time(1)./(res.time),'>-','DisplayName','$512\times256$, $P,J=3,2$');
res = Results_1024_11;
plot(res.np,res.time(1)./(res.time),'o-','DisplayName','$1024\times512$, $P,J=1,1$');
res = Results_1024_22;
-plot(res.np,res.time(1)./(res.time),'o-','DisplayName','$1024\times512$, $P,J=2,2$');xlim([1,max(res.np)]);
-xlabel('$N_p$'); ylabel('speedup')
+plot(res.np,res.time(1)./(res.time),'s-','DisplayName','$1024\times512$, $P,J=2,2$');xlim([1,max(res.np)]);
+res = Results_1024_64;
+plot(res.np,res.time(1)./(res.time),'d-','DisplayName','$1024\times512$, $P,J=6,4$');xlim([1,max(res.np)]);
+xlabel('$N_p$'); ylabel('speedup')
+xlim([1,24]); ylim([1,24])
legend('show')
title('Strong scaling')
grid on
@@ -51,6 +54,7 @@ FIGNAME = [SIMDIR,'strong_scaling.png'];
saveas(fig,FIGNAME);
disp(['Figure saved @ : ',FIGNAME])
+if 0
%% Weak scaling
% Handwritten results for P,J=2,1, Tmax = 5, dt = 0.01, Nz = Nr
Results_1_64.np = [ 1, 2, 4, 8];
@@ -87,3 +91,4 @@ grid on
FIGNAME = [SIMDIR,'weak_scaling.png'];
saveas(fig,FIGNAME);
disp(['Figure saved @ : ',FIGNAME])
+end
\ No newline at end of file
--
GitLab