Skip to content
Snippets Groups Projects
Commit 27afc84e authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann
Browse files

added shear and inverse aspect ratio as input parameters

parent 3511a99a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
matlab/setup.m
+ 4
− 2
View file @ 27afc84e
...@@ -9,8 +9,10 @@ GRID.Nx = N; % x grid resolution ...@@ -9,8 +9,10 @@ GRID.Nx = N; % x grid resolution
GRID.Lx = L; % x length GRID.Lx = L; % x length
GRID.Ny = N * (1-KXEQ0) + KXEQ0; % y '' GRID.Ny = N * (1-KXEQ0) + KXEQ0; % y ''
GRID.Ly = L * (1-KXEQ0); % y '' GRID.Ly = L * (1-KXEQ0); % y ''
GRID.Nz = Nz; % z resolution GRID.Nz = Nz; % z resolution
GRID.q0 = q0; % q factor GRID.q0 = q0; % q factor
GRID.shear = shear; % shear
GRID.eps = eps; % inverse aspect ratio
% Model parameters % Model parameters
MODEL.CO = CO; % Collision operator (0 : L.Bernstein, -1 : Full Coulomb, -2 : Dougherty) MODEL.CO = CO; % Collision operator (0 : L.Bernstein, -1 : Full Coulomb, -2 : Dougherty)
......
matlab/write_fort90.m
+ 27
− 25
View file @ 27afc84e
...@@ -7,21 +7,23 @@ fprintf(fid,'&BASIC\n'); ...@@ -7,21 +7,23 @@ fprintf(fid,'&BASIC\n');
fprintf(fid,[' nrun = ', num2str(BASIC.nrun),'\n']); fprintf(fid,[' nrun = ', num2str(BASIC.nrun),'\n']);
fprintf(fid,[' dt = ', num2str(BASIC.dt),'\n']); fprintf(fid,[' dt = ', num2str(BASIC.dt),'\n']);
fprintf(fid,[' tmax = ', num2str(BASIC.tmax),'\n']); fprintf(fid,[' tmax = ', num2str(BASIC.tmax),'\n']);
fprintf(fid,[' RESTART = ', BASIC.RESTART,'\n']); fprintf(fid,[' RESTART = ', BASIC.RESTART,'\n']);
fprintf(fid,[' maxruntime = ', num2str(BASIC.maxruntime),'\n']); fprintf(fid,[' maxruntime = ', num2str(BASIC.maxruntime),'\n']);
fprintf(fid,'/\n'); fprintf(fid,'/\n');
fprintf(fid,'&GRID\n'); fprintf(fid,'&GRID\n');
fprintf(fid,[' pmaxe =', num2str(GRID.pmaxe),'\n']); fprintf(fid,[' pmaxe =', num2str(GRID.pmaxe),'\n']);
fprintf(fid,[' jmaxe = ', num2str(GRID.jmaxe),'\n']); fprintf(fid,[' jmaxe = ', num2str(GRID.jmaxe),'\n']);
fprintf(fid,[' pmaxi = ', num2str(GRID.pmaxi),'\n']); fprintf(fid,[' pmaxi = ', num2str(GRID.pmaxi),'\n']);
fprintf(fid,[' jmaxi = ', num2str(GRID.jmaxi),'\n']); fprintf(fid,[' jmaxi = ', num2str(GRID.jmaxi),'\n']);
fprintf(fid,[' Nx = ', num2str(GRID.Nx),'\n']); fprintf(fid,[' Nx = ', num2str(GRID.Nx),'\n']);
fprintf(fid,[' Lx = ', num2str(GRID.Lx),'\n']); fprintf(fid,[' Lx = ', num2str(GRID.Lx),'\n']);
fprintf(fid,[' Ny = ', num2str(GRID.Ny),'\n']); fprintf(fid,[' Ny = ', num2str(GRID.Ny),'\n']);
fprintf(fid,[' Ly = ', num2str(GRID.Ly),'\n']); fprintf(fid,[' Ly = ', num2str(GRID.Ly),'\n']);
fprintf(fid,[' Nz = ', num2str(GRID.Nz),'\n']); fprintf(fid,[' Nz = ', num2str(GRID.Nz),'\n']);
fprintf(fid,[' q0 = ', num2str(GRID.q0),'\n']); fprintf(fid,[' q0 = ', num2str(GRID.q0),'\n']);
fprintf(fid,[' shear = ', num2str(GRID.q0),'\n']);
fprintf(fid,[' eps = ', num2str(GRID.q0),'\n']);
fprintf(fid,'/\n'); fprintf(fid,'/\n');
fprintf(fid,'&OUTPUT_PAR\n'); fprintf(fid,'&OUTPUT_PAR\n');
...@@ -34,11 +36,11 @@ fprintf(fid,[' nsave_cp = ', num2str(OUTPUTS.nsave_cp),'\n']); ...@@ -34,11 +36,11 @@ fprintf(fid,[' nsave_cp = ', num2str(OUTPUTS.nsave_cp),'\n']);
fprintf(fid,[' write_doubleprecision = ', OUTPUTS.write_doubleprecision,'\n']); fprintf(fid,[' write_doubleprecision = ', OUTPUTS.write_doubleprecision,'\n']);
fprintf(fid,[' write_gamma = ', OUTPUTS.write_gamma,'\n']); fprintf(fid,[' write_gamma = ', OUTPUTS.write_gamma,'\n']);
fprintf(fid,[' write_phi = ', OUTPUTS.write_phi,'\n']); fprintf(fid,[' write_phi = ', OUTPUTS.write_phi,'\n']);
fprintf(fid,[' write_Na00 = ', OUTPUTS.write_Na00,'\n']); fprintf(fid,[' write_Na00 = ', OUTPUTS.write_Na00,'\n']);
fprintf(fid,[' write_Napj = ', OUTPUTS.write_Napj,'\n']); fprintf(fid,[' write_Napj = ', OUTPUTS.write_Napj,'\n']);
fprintf(fid,[' write_Sapj = ', OUTPUTS.write_Sapj,'\n']); fprintf(fid,[' write_Sapj = ', OUTPUTS.write_Sapj,'\n']);
fprintf(fid,[' write_dens = ', OUTPUTS.write_dens,'\n']); fprintf(fid,[' write_dens = ', OUTPUTS.write_dens,'\n']);
fprintf(fid,[' write_temp = ', OUTPUTS.write_temp,'\n']); fprintf(fid,[' write_temp = ', OUTPUTS.write_temp,'\n']);
fprintf(fid,[' resfile0 = ', OUTPUTS.resfile0,'\n']); fprintf(fid,[' resfile0 = ', OUTPUTS.resfile0,'\n']);
fprintf(fid,[' rstfile0 = ', OUTPUTS.rstfile0,'\n']); fprintf(fid,[' rstfile0 = ', OUTPUTS.rstfile0,'\n']);
fprintf(fid,[' job2load = ', num2str(OUTPUTS.job2load),'\n']); fprintf(fid,[' job2load = ', num2str(OUTPUTS.job2load),'\n']);
...@@ -67,18 +69,18 @@ fprintf(fid,[' lambdaD = ', num2str(MODEL.lambdaD),'\n']); ...@@ -67,18 +69,18 @@ fprintf(fid,[' lambdaD = ', num2str(MODEL.lambdaD),'\n']);
fprintf(fid,'/\n'); fprintf(fid,'/\n');
fprintf(fid,'&INITIAL_CON\n'); fprintf(fid,'&INITIAL_CON\n');
fprintf(fid,[' INIT_NOISY_PHI =', INITIAL.init_noisy_phi,'\n']); fprintf(fid,[' INIT_NOISY_PHI = ', INITIAL.init_noisy_phi,'\n']);
fprintf(fid,[' INIT_ZF =', num2str(INITIAL.INIT_ZF),'\n']); fprintf(fid,[' INIT_ZF = ', num2str(INITIAL.INIT_ZF),'\n']);
fprintf(fid,[' WIPE_TURB =', INITIAL.wipe_turb,'\n']); fprintf(fid,[' WIPE_TURB = ', INITIAL.wipe_turb,'\n']);
fprintf(fid,[' INIT_BLOB =', INITIAL.init_blob,'\n']); fprintf(fid,[' INIT_BLOB = ', INITIAL.init_blob,'\n']);
fprintf(fid,[' init_background =', num2str(INITIAL.init_background),'\n']); fprintf(fid,[' init_background = ', num2str(INITIAL.init_background),'\n']);
fprintf(fid,[' init_noiselvl =', num2str(INITIAL.init_noiselvl),'\n']); fprintf(fid,[' init_noiselvl = ', num2str(INITIAL.init_noiselvl),'\n']);
fprintf(fid,[' iseed =', num2str(INITIAL.iseed),'\n']); fprintf(fid,[' iseed = ', num2str(INITIAL.iseed),'\n']);
fprintf(fid,[' mat_file =', INITIAL.mat_file,'\n']); fprintf(fid,[' mat_file = ', INITIAL.mat_file,'\n']);
fprintf(fid,'/\n'); fprintf(fid,'/\n');
fprintf(fid,'&TIME_INTEGRATION_PAR\n'); fprintf(fid,'&TIME_INTEGRATION_PAR\n');
fprintf(fid,[' numerical_scheme=', TIME_INTEGRATION.numerical_scheme,'\n']); fprintf(fid,[' numerical_scheme = ', TIME_INTEGRATION.numerical_scheme,'\n']);
fprintf(fid,'/'); fprintf(fid,'/');
fclose(fid); fclose(fid);
......
src/grid_mod.F90
+ 19
− 17
View file @ 27afc84e
...@@ -82,6 +82,19 @@ MODULE grid ...@@ -82,6 +82,19 @@ MODULE grid
CONTAINS CONTAINS
SUBROUTINE grid_readinputs
! Read the input parameters
USE prec_const
IMPLICIT NONE
INTEGER :: lu_in = 90 ! File duplicated from STDIN
NAMELIST /GRID/ pmaxe, jmaxe, pmaxi, jmaxi, &
Nx, Lx, Ny, Ly, Nz, q0, shear, eps
READ(lu_in,grid)
END SUBROUTINE grid_readinputs
SUBROUTINE init_1Dgrid_distr SUBROUTINE init_1Dgrid_distr
! write(*,*) Nx ! write(*,*) Nx
...@@ -288,19 +301,6 @@ CONTAINS ...@@ -288,19 +301,6 @@ CONTAINS
if(my_id.EQ.0) write(*,*) '#parallel planes = ', Nz if(my_id.EQ.0) write(*,*) '#parallel planes = ', Nz
END SUBROUTINE set_zgrid END SUBROUTINE set_zgrid
SUBROUTINE grid_readinputs
! Read the input parameters
USE prec_const
IMPLICIT NONE
INTEGER :: lu_in = 90 ! File duplicated from STDIN
NAMELIST /GRID/ pmaxe, jmaxe, pmaxi, jmaxi, &
Nx, Lx, Ny, Ly, Nz, q0
READ(lu_in,grid)
END SUBROUTINE grid_readinputs
SUBROUTINE grid_outputinputs(fidres, str) SUBROUTINE grid_outputinputs(fidres, str)
! Write the input parameters to the results_xx.h5 file ! Write the input parameters to the results_xx.h5 file
...@@ -321,10 +321,12 @@ CONTAINS ...@@ -321,10 +321,12 @@ CONTAINS
CALL attach(fidres, TRIM(str), "Ly", Ly) CALL attach(fidres, TRIM(str), "Ly", Ly)
CALL attach(fidres, TRIM(str), "Nz", Nz) CALL attach(fidres, TRIM(str), "Nz", Nz)
CALL attach(fidres, TRIM(str), "q0", q0) CALL attach(fidres, TRIM(str), "q0", q0)
CALL attach(fidres, TRIM(str), "Nkx", Nkx) CALL attach(fidres, TRIM(str),"shear",shear)
CALL attach(fidres, TRIM(str), "Lkx", Lkx) CALL attach(fidres, TRIM(str), "eps", eps)
CALL attach(fidres, TRIM(str), "Nky", Nky) CALL attach(fidres, TRIM(str), "Nkx", Nkx)
CALL attach(fidres, TRIM(str), "Lky", Lky) CALL attach(fidres, TRIM(str), "Lkx", Lkx)
CALL attach(fidres, TRIM(str), "Nky", Nky)
CALL attach(fidres, TRIM(str), "Lky", Lky)
END SUBROUTINE grid_outputinputs END SUBROUTINE grid_outputinputs
FUNCTION bare(p_,j_) FUNCTION bare(p_,j_)
......
wk/analysis_3D.m
+ 2
− 4
View file @ 27afc84e
...@@ -7,10 +7,8 @@ outfile =''; ...@@ -7,10 +7,8 @@ outfile ='';
outfile =''; outfile ='';
outfile =''; outfile ='';
outfile =''; outfile ='';
outfile =''; outfile ='HD_study/300x150_L_100_P_2_J_1_eta_0.6_nu_5e-01_DGGK_mu_2e-03';
outfile =''; % outfile ='HD_study/150x75_L_100_P_4_J_2_eta_0.6_nu_1e-02_DGGK_mu_3e-03';
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.RESDIR = ['../results/',outfile,'/'];
BASIC.MISCDIR = ['/misc/HeLaZ_outputs/results/',outfile,'/']; BASIC.MISCDIR = ['/misc/HeLaZ_outputs/results/',outfile,'/'];
CMD = ['cp ', BASIC.RESDIR,'outputs* ',BASIC.MISCDIR]; disp(CMD); CMD = ['cp ', BASIC.RESDIR,'outputs* ',BASIC.MISCDIR]; disp(CMD);
......
wk/local_run.m
+ 14
− 11
View file @ 27afc84e
...@@ -4,18 +4,18 @@ addpath(genpath('../matlab')) % ... add ...@@ -4,18 +4,18 @@ addpath(genpath('../matlab')) % ... add
CLUSTER.TIME = '99:00:00'; % allocation time hh:mm:ss CLUSTER.TIME = '99:00:00'; % allocation time hh:mm:ss
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% PHYSICAL PARAMETERS %% PHYSICAL PARAMETERS
NU = 0.5; % Collision frequency NU = 0.1; % Collision frequency
ETAN = 1.0/0.6; % Density gradient drive (R/Ln) ETAN = 1.0/0.6; % Density gradient drive (R/Ln)
NU_HYP = 1.0; NU_HYP = 0.1;
%% GRID PARAMETERS %% GRID AND GEOMETRY PARAMETERS
N = 300; % Frequency gridpoints (Nkx = N/2) N = 100; % Frequency gridpoints (Nkx = N/2)
L = 100; % Size of the squared frequency domain L = 60; % Size of the squared frequency domain
Nz = 1; % number of perpendicular planes (parallel grid) Nz = 10; % number of perpendicular planes (parallel grid)
q0 = 1.0; % q factor () q0 = 1.0; % safety factor
shear = 0.0; % magnetic shear
eps = 0.0; % inverse aspect ratio
P = 2; P = 2;
J = 1; 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 %% TIME PARAMETERS
TMAX = 200; % Maximal time unit TMAX = 200; % Maximal time unit
DT = 1e-2; % Time step DT = 1e-2; % Time step
...@@ -32,12 +32,13 @@ JOB2LOAD= 0; ...@@ -32,12 +32,13 @@ JOB2LOAD= 0;
CO = 1; CO = 1;
CLOS = 0; % Closure model (0: =0 truncation) CLOS = 0; % Closure model (0: =0 truncation)
NL_CLOS = 0; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS) 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 = 'HD_study'; % Name of the simulation
SIMID = 'test_3D'; % Name of the simulation
% SIMID = ['v3.0_P_',num2str(P),'_J_',num2str(J)]; % 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) NON_LIN = 1; % activate non-linearity (is cancelled if KXEQ0 = 1)
% INIT options % INIT options
INIT_ZF = 0; ZF_AMP = 0.0; INIT_ZF = 0; ZF_AMP = 0.0;
INIT_BLOB = 1; WIPE_TURB = 1; INIT_BLOB = 0; WIPE_TURB = 0;
%% OUTPUTS %% OUTPUTS
W_DOUBLE = 0; W_DOUBLE = 0;
W_GAMMA = 1; W_GAMMA = 1;
...@@ -68,6 +69,8 @@ TAU = 1.0; % e/i temperature ratio ...@@ -68,6 +69,8 @@ TAU = 1.0; % e/i temperature ratio
ETAT = 0.0; % Temperature gradient ETAT = 0.0; % Temperature gradient
ETAB = 1.0; % Magnetic gradient (1.0 to set R=LB) ETAB = 1.0; % Magnetic gradient (1.0 to set R=LB)
INIT_PHI= 1; % Start simulation with a noisy phi and moments INIT_PHI= 1; % Start simulation with a noisy phi and moments
MU_P = 0.0; % Hermite hyperdiffusivity -mu_p*(d/dvpar)^4 f
MU_J = 0.0; % Laguerre hyperdiffusivity -mu_j*(d/dvperp)^4 f
%% Setup and file management %% Setup and file management
setup setup
system('rm fort.90'); system('rm fort.90');
......
wk/marconi_run.m
+ 7
− 5
View file @ 27afc84e
...@@ -2,7 +2,7 @@ clear all; ...@@ -2,7 +2,7 @@ clear all;
addpath(genpath('../matlab')) % ... add addpath(genpath('../matlab')) % ... add
SUBMIT = 1; % To submit the job automatically SUBMIT = 1; % To submit the job automatically
% EXECNAME = 'helaz_dbg'; % EXECNAME = 'helaz_dbg';
EXECNAME = 'helaz_3.0'; EXECNAME = 'helaz_3.1';
for ETAN = [1/0.6] for ETAN = [1/0.6]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Set Up parameters %% Set Up parameters
...@@ -20,16 +20,16 @@ NP_KX = 24; % MPI processes along kx ...@@ -20,16 +20,16 @@ NP_KX = 24; % MPI processes along kx
%% PHYSICAL PARAMETERS %% PHYSICAL PARAMETERS
NU = 0.05; % Collision frequency NU = 0.05; % Collision frequency
ETAN = 1.0/0.6; % Density gradient drive (R/Ln) ETAN = 1.0/0.6; % Density gradient drive (R/Ln)
NU_HYP = 1.0; NU_HYP = 10.0;
%% GRID PARAMETERS %% GRID PARAMETERS
N = 300; % Frequency gridpoints (Nkx = N/2) N = 300; % Frequency gridpoints (Nkx = N/2)
L = 100; % Size of the squared frequency domain L = 100; % Size of the squared frequency domain
Nz = 1; % number of perpendicular planes (parallel grid) Nz = 1; % number of perpendicular planes (parallel grid)
q0 = 1.0; % q factor () q0 = 1.0; % q factor ()
shear = 0.0; % magnetic shear
eps = 0.0; % inverse aspect ratio
P = 2; P = 2;
J = 1; 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 %% TIME PARAMETERS
TMAX = 200; % Maximal time unit TMAX = 200; % Maximal time unit
DT = 1e-2; % Time step DT = 1e-2; % Time step
...@@ -43,7 +43,7 @@ JOB2LOAD= 0; ...@@ -43,7 +43,7 @@ JOB2LOAD= 0;
%% OPTIONS AND NAMING %% OPTIONS AND NAMING
% Collision operator % Collision operator
% (0 : L.Bernstein, 1 : Dougherty, 2: Sugama, 3 : Pitch angle ; +/- for GK/DK) % (0 : L.Bernstein, 1 : Dougherty, 2: Sugama, 3 : Pitch angle ; +/- for GK/DK)
CO = 1; CO = 2;
CLOS = 0; % Closure model (0: =0 truncation) CLOS = 0; % Closure model (0: =0 truncation)
NL_CLOS = 0; % nonlinear closure model (-2: nmax = jmax, -1: nmax = jmax-j, >=0 : nmax = NL_CLOS) 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 = 'test_3D_marconi'; % Name of the simulation
...@@ -83,6 +83,8 @@ TAU = 1.0; % e/i temperature ratio ...@@ -83,6 +83,8 @@ TAU = 1.0; % e/i temperature ratio
ETAT = 0.0; % Temperature gradient ETAT = 0.0; % Temperature gradient
ETAB = 1.0; % Magnetic gradient (1.0 to set R=LB) ETAB = 1.0; % Magnetic gradient (1.0 to set R=LB)
INIT_PHI= 1; % Start simulation with a noisy phi and moments INIT_PHI= 1; % Start simulation with a noisy phi and moments
MU_P = 0.0; % Hermite hyperdiffusivity -mu_p*(d/dvpar)^4 f
MU_J = 0.0; % Laguerre hyperdiffusivity -mu_j*(d/dvperp)^4 f
% Compute processes distribution % Compute processes distribution
Ntot = NP_P * NP_KX; Ntot = NP_P * NP_KX;
Nnodes = ceil(Ntot/48); Nnodes = ceil(Ntot/48);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment