diff --git a/matlab/setup.m b/matlab/setup.m index 4847ed64b644d8bb0a08a886b556a07f0497d994..92352d9d51a6f090631d3ae3c5819d0460c60c75 100644 --- a/matlab/setup.m +++ b/matlab/setup.m @@ -58,7 +58,7 @@ end if (CO == -3); CONAME = 'PADK'; elseif(CO == -2); CONAME = 'SGDK'; elseif(CO == -1); CONAME = 'DGDK'; -elseif(CO == 0); CONAME = 'LB'; +elseif(CO == 0); CONAME = 'LBDK'; elseif(CO == 1); CONAME = 'DGGK'; elseif(CO == 2); CONAME = 'SGGK'; elseif(CO == 3); CONAME = 'PAGK'; diff --git a/wk/analysis_2D.m b/wk/analysis_2D.m index 00899c33c5702740c88b6fc9611cd49c6d523d8c..17d7c235e0bddbcc93b4988ff647b93488a470cd 100644 --- a/wk/analysis_2D.m +++ b/wk/analysis_2D.m @@ -7,8 +7,8 @@ outfile =''; outfile =''; outfile =''; outfile =''; -outfile ='HD_study/300x150_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_1e-03'; -% outfile ='test_3D/50x25_L_50_lin_P_2_J_1_eta_0.5_nu_1e-01_DGGK_CLOS_0_mu_0e+00'; +% outfile ='HD_study/300x150_L_100_P_2_J_1_eta_0.6_nu_1e-01_DGGK_CLOS_0_mu_1e-03'; +outfile ='test_3D/50x25_L_50_lin_P_2_J_1_eta_0.5_nu_1e-01_LBDK_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); diff --git a/wk/local_run.m b/wk/local_run.m index e86aed4be05de297086df1dd5a1242d83ac5fb2f..77030a96b600d37218b0d1df06702366526f9219 100644 --- a/wk/local_run.m +++ b/wk/local_run.m @@ -4,9 +4,9 @@ addpath(genpath('../matlab')) % ... add CLUSTER.TIME = '99:00:00'; % allocation time hh:mm:ss %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% PHYSICAL PARAMETERS -NU = 0.0; % Collision frequency +NU = 0.1; % Collision frequency ETAB = 1.0; % Magnetic gradient -ETAN = 0.0; % Density gradient +ETAN = 2.0; % Density gradient NU_HYP = 0.0; %% GRID PARAMETERS N = 50; % Frequency gridpoints (Nkr = N/2) @@ -16,7 +16,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 = 50; % Maximal time unit +TMAX = 100; % 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 @@ -27,7 +27,7 @@ JOB2LOAD= 0; %% OPTIONS AND NAMING % Collision operator % (0 : L.Bernstein, 1 : Dougherty, 2: Sugama, 3 : Pitch angle ; +/- for GK/DK) -CO = 1; +CO = 0; 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 = 'HD_study'; % Name of the simulation