diff --git a/wk/HD_study.m b/wk/HD_study.m
index 14951e8d5d4f5e060ba5599e6179a56a307e3c29..dbf3f4e2ee763137a595ac01acb882fa2148197f 100644
--- a/wk/HD_study.m
+++ b/wk/HD_study.m
@@ -10,15 +10,16 @@ b_=[...
1e-2, 3e-3;...
1e-3, 2e-2;...
];
-% converged plateau simulations
+% converged turb plateau simulations
cp_=[...
1e+0, 1e-2;...
1e+0, 3e-3;...
1e+0, 2e-3;...
+ 5e-1, 2e-3;...
1e-1, 2e-3;...
1e-1, 1e-3;...
];
-% moving plateau
+% moving/no turb plateau
dp_=[...
1e+0, 5e+0;...
1e+0, 2e+0;...
@@ -51,7 +52,11 @@ mu_ = [1e-2 1e-3];
nu_ = [1e-1 1e-1];
plot(nu_,mu_,'x--','DisplayName','N=300, L=100, P,J=2,1');
-% Trajectory of simulations
+% HD_study/300x150_L_200_P_2_J_1_eta_0.6_nu_5e-01_DGGK_CLOS_0_mu_1e-02/
+% mu_ = [2e-3];
+% nu_ = [5e-1];
+% plot(nu_,mu_,'x--','DisplayName','N=300, L=100, P,J=2,1');
+
% 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];
diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m
index 397c03bcd7938f51591738e904a5e51759afb3b0..e146bc66b3c51de41fc3d28bf03a1b66eb046a32 100644
--- a/wk/analysis_3D.m
+++ b/wk/analysis_3D.m
@@ -2,19 +2,26 @@ addpath(genpath('../matlab')) % ... add
addpath(genpath('../matlab/plots')) % ... add
%% Directory of the simulation
if 1% Local results
+outfile ='';
+outfile ='';
+outfile ='';
+outfile ='';
+outfile ='';
+outfile ='';
+outfile ='';
outfile ='HD_study/150x75_L_100_P_4_J_2_eta_0.6_nu_1e-02_DGGK_mu_3e-03';
+% outfile ='HD_study/300x150_L_100_P_2_J_1_eta_0.6_nu_5e-01_DGGK_mu_2e-03';
BASIC.RESDIR = ['../results/',outfile,'/'];
BASIC.MISCDIR = ['/misc/HeLaZ_outputs/results/',outfile,'/'];
CMD = ['cp ', BASIC.RESDIR,'outputs* ',BASIC.MISCDIR]; disp(CMD);
system(CMD);
-end
-if 0% Marconi results
-outfile ='';
+else% Marconi results
outfile ='';
outfile ='';
outfile ='';
outfile ='';
outfile ='';
+outfile ='/marconi_scratch/userexternal/ahoffman/HeLaZ/results/test_3D_marconi/100x50_L_60_P_2_J_1_eta_Inf_nu_1e-01_DGGK_mu_0e+00/out.txt';
BASIC.RESDIR = ['../',outfile(46:end-8),'/'];
BASIC.MISCDIR = ['/misc/HeLaZ_outputs/',outfile(46:end-8),'/'];
end
@@ -71,12 +78,12 @@ skip_ = 1; DELAY = 1e-2*skip_;
[~, it05D] = min(abs(Ts5D-t0)); FRAMES_5D = it05D:skip_:numel(Ts5D);
INTERP = 0; T = Ts3D; FRAMES = FRAMES_3D;
% Field to plot
-FIELD = dens_e; NAME = 'ne'; FIELDNAME = 'n_e';
+% FIELD = dens_e; NAME = 'ne'; FIELDNAME = 'n_e';
% FIELD = dens_i; NAME = 'ni'; FIELDNAME = 'n_i';
% FIELD = temp_e; NAME = 'Te'; FIELDNAME = 'n_i';
% FIELD = temp_i; NAME = 'Ti'; FIELDNAME = 'n_i';
% FIELD = ne00; NAME = 'ne00'; FIELDNAME = 'n_e^{00}';
-% FIELD = ni00; NAME = 'ni00'; FIELDNAME = 'n_i^{00}';
+FIELD = ni00; NAME = 'ni00'; FIELDNAME = 'n_i^{00}';
% Slice
% plt = @(x) real(x(ix, :, :,:)); X = Y_YZ; Y = Z_YZ; XNAME = 'y'; YNAME = 'z';
% plt = @(x) real(x( :,iy, :,:)); X = X_XZ; Y = Z_XZ; XNAME = 'x'; YNAME = 'z';
@@ -101,13 +108,13 @@ if 0
%% Photomaton : real space
% Chose the field to plot
-% FIELD = ni00; FNAME = 'ni00'; FIELDLTX = 'n_i^{00}';
+FIELD = ni00; FNAME = 'ni00'; FIELDLTX = 'n_i^{00}';
% FIELD = ne00; FNAME = 'ne00'; FIELDLTX = 'n_e^{00}'
% FIELD = dens_i; FNAME = 'ni'; FIELDLTX = 'n_i';
% FIELD = dens_e; FNAME = 'ne'; FIELDLTX = 'n_e';
% FIELD = temp_i; FNAME = 'Ti'; FIELDLTX = 'T_i';
% FIELD = temp_e; FNAME = 'Te'; FIELDLTX = 'T_e';
-FIELD = phi; FNAME = 'phi'; FIELDLTX = '\phi';
+% FIELD = phi; FNAME = 'phi'; FIELDLTX = '\phi';
% Chose when to plot it
tf = [0 1 2 3];
diff --git a/wk/load_multiple_outputs_marconi.m b/wk/load_multiple_outputs_marconi.m
index a1bb19572a4029a2c5792038ba9dd6732b4744f8..85f7688111e209d863737c8be5d1cfdbd759c37e 100644
--- a/wk/load_multiple_outputs_marconi.m
+++ b/wk/load_multiple_outputs_marconi.m
@@ -1,11 +1,3 @@
addpath(genpath('../matlab')) % ... add
%% Paste the list of simulation results to load
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/kobayashi/100x50_L_50_P_6_J_3_eta_0.71429_nu_1e-02_PAGK_CLOS_0_mu_0e+00/out.txt')
-load_marconi('/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')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.7_P_10_J_5/200x100_L_120_P_10_J_5_eta_0.6_nu_1e-02_DGGK_CLOS_0_mu_1e-02/out.txt')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/kobayashi/300x150_L_100_P_6_J_3_eta_0.71429_nu_1e-02_PAGK_CLOS_0_mu_0e+00/out.txt')
-load_marconi('/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')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.7_P_6_J_3/200x100_L_120_P_6_J_3_eta_0.6_nu_1e-02_DGGK_CLOS_0_mu_1e-02/out.txt')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.7_P_6_J_3/200x100_L_120_P_6_J_3_eta_0.6_nu_1e-02_SGGK_CLOS_0_mu_1e-02/out.txt')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.7_P_6_J_3/200x100_L_120_P_6_J_3_eta_0.6_nu_1e+00_SGGK_CLOS_0_mu_1e-02/out.txt')
-load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/v2.7_P_10_J_5/200x100_L_120_P_10_J_5_eta_0.6_nu_1e-02_SGGK_CLOS_0_mu_1e-02/out.txt')
+load_marconi('/marconi_scratch/userexternal/ahoffman/HeLaZ/results/test_3D_marconi/100x50_L_60_P_2_J_1_eta_Inf_nu_1e-01_DGGK_mu_0e+00/out.txt');
\ No newline at end of file
diff --git a/wk/local_run.m b/wk/local_run.m
index c3a7bb8e444ba2d109b1a414902050dcdbdefdeb..1574521b8bcea6a399b6569be92f7e86f8cbf0c8 100644
--- a/wk/local_run.m
+++ b/wk/local_run.m
@@ -4,12 +4,12 @@ addpath(genpath('../matlab')) % ... add
CLUSTER.TIME = '99:00:00'; % allocation time hh:mm:ss
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% PHYSICAL PARAMETERS
-NU = 0.1; % Collision frequency
-ETAN = 0/0.6; % Density gradient drive (R/Ln)
-NU_HYP = 0.0;
+NU = 0.5; % Collision frequency
+ETAN = 1.0/0.6; % Density gradient drive (R/Ln)
+NU_HYP = 1.0;
%% GRID PARAMETERS
-N = 100; % Frequency gridpoints (Nkx = N/2)
-L = 60; % Size of the squared frequency domain
+N = 300; % Frequency gridpoints (Nkx = N/2)
+L = 100; % Size of the squared frequency domain
Nz = 1; % number of perpendicular planes (parallel grid)
q0 = 1.0; % q factor ()
P = 2;
@@ -17,7 +17,7 @@ J = 1;
MU_P = 0.0; % Hermite hyperdiffusivity -mu_p*(d/dvpar)^4 f
MU_J = 0.0; % Laguerre hyperdiffusivity -mu_j*(d/dvperp)^4 f
%% TIME PARAMETERS
-TMAX = 10; % Maximal time unit
+TMAX = 200; % Maximal time unit
DT = 1e-2; % Time step
SPS0D = 1; % Sampling per time unit for profiler
SPS2D = 1; % Sampling per time unit for 2D arrays
@@ -31,10 +31,8 @@ JOB2LOAD= 0;
% (0 : L.Bernstein, 1 : Dougherty, 2: Sugama, 3 : Pitch angle ; +/- for GK/DK)
CO = 1;
CLOS = 0; % Closure model (0: =0 truncation)
-NL_CLOS = -1; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS)
-% SIMID = 'test_3D'; % Name of the simulation
-% SIMID = 'HD_study'; % Name of the simulation
-SIMID = 'Blob_diffusion'; % Name of the simulation
+NL_CLOS = 0; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS)
+SIMID = 'HD_study'; % Name of the simulation
% SIMID = ['v3.0_P_',num2str(P),'_J_',num2str(J)]; % Name of the simulation
NON_LIN = 1; % activate non-linearity (is cancelled if KXEQ0 = 1)
% INIT options
diff --git a/wk/marconi_run.m b/wk/marconi_run.m
index 8d3331208326c03451a5b4715cc6186502019435..3b8f42ed093afbc6155084fce16b3a3b73dd4172 100644
--- a/wk/marconi_run.m
+++ b/wk/marconi_run.m
@@ -8,8 +8,8 @@ for ETAN = [1/0.6]
%% Set Up parameters
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% CLUSTER PARAMETERS
-% CLUSTER.PART = 'prod'; % dbg or prod
-CLUSTER.PART = 'dbg';
+CLUSTER.PART = 'prod'; % dbg or prod
+% CLUSTER.PART = 'dbg';
CLUSTER.TIME = '24:00:00'; % allocation time hh:mm:ss
if(strcmp(CLUSTER.PART,'dbg')); CLUSTER.TIME = '00:30:00'; end;
CLUSTER.MEM = '128GB'; % Memory
@@ -18,12 +18,12 @@ NP_P = 2; % MPI processes along p
NP_KX = 24; % MPI processes along kx
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% PHYSICAL PARAMETERS
-NU = 0.1; % Collision frequency
-ETAN = 0/0.6; % Density gradient drive (R/Ln)
-NU_HYP = 0.0;
+NU = 0.05; % Collision frequency
+ETAN = 1.0/0.6; % Density gradient drive (R/Ln)
+NU_HYP = 1.0;
%% GRID PARAMETERS
-N = 100; % Frequency gridpoints (Nkx = N/2)
-L = 60; % Size of the squared frequency domain
+N = 300; % Frequency gridpoints (Nkx = N/2)
+L = 100; % Size of the squared frequency domain
Nz = 1; % number of perpendicular planes (parallel grid)
q0 = 1.0; % q factor ()
P = 2;
@@ -31,12 +31,12 @@ J = 1;
MU_P = 0.0; % Hermite hyperdiffusivity -mu_p*(d/dvpar)^4 f
MU_J = 0.0; % Laguerre hyperdiffusivity -mu_j*(d/dvperp)^4 f
%% TIME PARAMETERS
-TMAX = 10; % Maximal time unit
+TMAX = 200; % Maximal time unit
DT = 1e-2; % Time step
SPS0D = 1; % Sampling per time unit for profiler
SPS2D = 1; % Sampling per time unit for 2D arrays
-SPS3D = 2; % Sampling per time unit for 3D arrays
-SPS5D = 1; % Sampling per time unit for 5D arrays
+SPS3D = 1/2; % Sampling per time unit for 3D arrays
+SPS5D = 1/100; % Sampling per time unit for 5D arrays
SPSCP = 0; % Sampling per time unit for checkpoints/10
RESTART = 0; % To restart from last checkpoint
JOB2LOAD= 0;
@@ -45,9 +45,9 @@ JOB2LOAD= 0;
% (0 : L.Bernstein, 1 : Dougherty, 2: Sugama, 3 : Pitch angle ; +/- for GK/DK)
CO = 1;
CLOS = 0; % Closure model (0: =0 truncation)
-NL_CLOS = -1; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS)
-SIMID = 'test_3D_marconi'; % Name of the simulation
-% SIMID = 'HD_study'; % Name of the simulation
+NL_CLOS = 0; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS)
+% SIMID = 'test_3D_marconi'; % Name of the simulation
+SIMID = 'HD_study'; % Name of the simulation
% SIMID = ['v3.0_P_',num2str(P),'_J_',num2str(J)]; % Name of the simulation
NON_LIN = 1; % activate non-linearity (is cancelled if KXEQ0 = 1)
% INIT options