From 83e46ab42787042fbc6dd361aae367ec69398b76 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Thu, 15 Jul 2021 17:17:41 +0200
Subject: [PATCH] up
---
wk/HD_study.m | 25 ++++++++++++++++++++++++-
wk/analysis_2D.m | 18 ++++++++----------
wk/continue_multiple_runs_marconi.m | 6 +++---
3 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/wk/HD_study.m b/wk/HD_study.m
index d40d5d4a..baa0b2b0 100644
--- a/wk/HD_study.m
+++ b/wk/HD_study.m
@@ -3,6 +3,7 @@ b_=[...
1e-1, 1e-1;...
1e-1, 3e-2;...
1e-1, 2e-2;...
+ 1e-1, 1e-2;...
1e-2, 3e-3;...
5e-2, 3e-3;...
1e-3, 2e-2;...
@@ -17,6 +18,7 @@ cp_=[...
];
% moving plateau
dp_=[...
+ 1e+0, 5e+0;...
1e+0, 2e+0;...
1e+0, 1e+0;...
1e-3, 2e-2;...
@@ -46,4 +48,25 @@ scatter(dp_(:,1),dp_(:,2),'v',...
scatter(rp_(:,1),rp_(:,2),'h',...
'MarkerFaceColor',[0.9290 0.6940 0.1250],'MarkerEdgeColor',[0 0 0],'SizeData',50,...
'DisplayName','Moving Plateau');
-plot([1 1],[5e-5 5e-1],'--','Color',[0.4660 0.6740 0.1880]);
+% plot([1 1],[5e-5 5e-1],'--','Color',[0.4660 0.6740 0.1880]);
+
+% Trajectory of simulations
+% HD_study/100x50_L_50_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_1e-02/
+mu_ = [1e-2 5e-3 2e-3];
+nu_ = [1e-1 1e-1 1e-1];
+plot(nu_,mu_,'x-','DisplayName','100x50, L=050, P,J=2,1,');
+
+% HD_study/150x75_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_3e-02/
+mu_ = [3e-2 1e-3 0];
+nu_ = [1e-1 1e-1 1e-1];
+plot(nu_,mu_,'x-','DisplayName','150x75, L=100, P,J=2,1,');
+
+% HD_study/150x75_L_100_P_2_J_1_eta_0.6_nu_1e-02_DGGK_CLOS_0_mu_3e-02/
+mu_ = [3e-3 1e-3 1e-4];
+nu_ = [1e-2 1e-2 1e-2];
+plot(nu_,mu_,'x-','DisplayName','150x75, L=100, P,J=2,1,');
+
+% HD_study/150x75_L_100_P_2_J_1_eta_0.6_nu_5e-02_DGGK_CLOS_0_mu_3e-02/
+mu_ = [3e-3 1e-3];
+nu_ = [5e-2 5e-2];
+plot(nu_,mu_,'x-','DisplayName','150x75, L=100, P,J=2,1,');
\ No newline at end of file
diff --git a/wk/analysis_2D.m b/wk/analysis_2D.m
index 8e101e87..6626eaa0 100644
--- a/wk/analysis_2D.m
+++ b/wk/analysis_2D.m
@@ -2,14 +2,13 @@ addpath(genpath('../matlab')) % ... add
for i_ = 1
% for ETA_ =[0.6:0.1:0.9]
%% Load results
-if 1% Local results
-outfile ='';
-outfile ='';
-outfile ='';
-outfile ='HD_study/200x100_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_3e-02';
+if 0% Local results
+% outfile ='HD_study/100x50_L_50_P_2qe_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_1e-02';
+% outfile ='HD_study/150x75_L_100_P_2_J_1_eta_0.6_nu_5e-02_DGGK_CLOS_0_mu_3e-03';
+% outfile ='HD_study/200x100_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_3e-02';
% outfile ='HD_study/300x150_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_1e-03';
% outfile ='HD_study/150x75_L_100_P_2_J_1_eta_0.6_nu_1e-02_DGGK_CLOS_0_mu_3e-03';
-% outfile ='HD_study/200x100_L_200_P_2_J_1_eta_0.6_nu_1e+00_DGGK_CLOS_0_mu_0e+00';
+outfile ='HD_study/200x100_L_200_P_2_J_1_eta_0.6_nu_1e+00_DGGK_CLOS_0_mu_0e+00';
BASIC.RESDIR = ['../results/',outfile,'/'];
BASIC.MISCDIR = ['/misc/HeLaZ_outputs/results/',outfile,'/'];
CMD = ['cp ', BASIC.RESDIR,'outputs* ',BASIC.MISCDIR]; disp(CMD);
@@ -20,8 +19,7 @@ outfile ='';
outfile ='';
outfile ='';
outfile ='';
-outfile ='';
-outfile ='/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.8_P_10_J_5/200x100_L_120_P_10_J_5_eta_0.6_nu_1e-03_SGGK_CLOS_0_mu_2e-02/out.txt';
+outfile ='/marconi_scratch/userexternal/ahoffman/HeLaZ/results/kobayashi/300x150_L_100_P_10_J_5_eta_0.71429_nu_1e-02_PAGK_CLOS_0_mu_0e+00/out.txt';
% outfile = outcl{i_};
% load_marconi(outfile);
BASIC.RESDIR = ['../',outfile(46:end-8),'/'];
@@ -447,10 +445,10 @@ clear Z_rth phi_kp ni_kp Ti_kp
end
%%
-t0 =2900;
+t0 =2250;
[~, it02D] = min(abs(Ts2D-t0));
[~, it05D] = min(abs(Ts5D-t0));
-skip_ = 1;
+skip_ = 5;
DELAY = 1e-3*skip_;
FRAMES_2D = it02D:skip_:numel(Ts2D);
FRAMES_5D = it05D:skip_:numel(Ts5D);
diff --git a/wk/continue_multiple_runs_marconi.m b/wk/continue_multiple_runs_marconi.m
index f6f8a272..50852ff3 100644
--- a/wk/continue_multiple_runs_marconi.m
+++ b/wk/continue_multiple_runs_marconi.m
@@ -1,5 +1,5 @@
%% Paste the list of continue_run calls
-continue_run('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.8_P_10_J_5/200x100_L_120_P_10_J_5_eta_0.6_nu_1e-03_SGGK_CLOS_0_mu_2e-02/out.txt')
+continue_run('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/kobayashi/300x150_L_100_P_10_J_5_eta_0.71429_nu_1e-02_PAGK_CLOS_0_mu_0e+00/out.txt')
%% Functions to modify preexisting fort.90 input file and launch on marconi
function [] = continue_run(outfilename)
@@ -10,8 +10,8 @@ function [] = continue_run(outfilename)
if(strcmp(CLUSTER.PART,'dbg')); CLUSTER.TIME = '00:30:00'; end;
CLUSTER.MEM = '64GB'; % Memory
CLUSTER.JNAME = 'HeLaZ';% Job name
- NP_P = 2; % MPI processes along p
- NP_KX = 24; % MPI processes along kx
+ NP_P = 3; % MPI processes along p
+ NP_KX = 32; % MPI processes along kx
% Compute processes distribution
Ntot = NP_P * NP_KX;
Nnodes = ceil(Ntot/48);
--
GitLab