minor changes

matlab/plot_gamma_vs_k.m

@@ -3,9 +3,6 @@ default_plots_options % Script to set up default plot variables
 % with a linear fit of the log evolution
 gammas = zeros(numel(kr),numel(kz));
 shifts = zeros(numel(kr),numel(kz));
-% Linear fit of log(Napj)
-x1    = timeNi;
-itmin = ceil(0.5 * numel(timeNi)); %Take the second half of the time evolution
 
 if K_RICCI
     factor = sqrt(1+MODEL.tau_i);
@@ -15,6 +12,10 @@ else
     fchar  = '$';
 end
 
+% Linear fit of log(Napj)
+x1    = timeNi;
+itmin = ceil(0.9 * numel(timeNi)); %Take a subset of the time evolution
+
 for ikz = 1:numel(kz)
     fit = polyfit(x1(itmin:end),log(abs(Nipj(itmin:end,ikr,ikz))),1);
     gammas(ikr,ikz) = fit(1);

matlab/save_figure.m

@@ -4,9 +4,11 @@ FIGDIR = ['../results/', SIMID,'/'];
 if ~exist(FIGDIR, 'dir')
    mkdir(FIGDIR)
 end
+
 FIGNAME = [FIGNAME,'_Pe_',num2str(GRID.pmaxe),'_Je_',num2str(GRID.jmaxe),...
     '_Pi_',num2str(GRID.pmaxi),'_Ji_',num2str(GRID.jmaxi),...
-    '_etan_',num2str(MODEL.eta_n),'_etaB_',num2str(MODEL.eta_B),'_etaT_',num2str(MODEL.eta_T),'_nu_',num2str(MODEL.nu)];
+    '_etan_',num2str(MODEL.eta_n),'_etaB_',num2str(MODEL.eta_B),'_etaT_',...
+    num2str(MODEL.eta_T),'_nu_',num2str(MODEL.nu),'_',CONAME];
 FIGNAME = [FIGDIR, FIGNAME,'.fig'];
 savefig(fig,FIGNAME);
 disp(['Figure saved @ : ',FIGNAME])
\ No newline at end of file

wk/fort.90

 &BASIC
   nrun=100000
-  dt=0.05
-  tmax=100    ! time normalized to 1/omega_pe
+  dt=0.01
+  tmax=5    ! time normalized to 1/omega_pe
 /
 &GRID
-  pmaxe =20    ! Electron Hermite moments 
-  jmaxe = 10     ! Electron Laguerre moments 
-  pmaxi = 20    ! Ion Hermite moments 
-  jmaxi = 10     ! Ion Laguerre moments
+  pmaxe =6    ! Electron Hermite moments 
+  jmaxe = 6     ! Electron Laguerre moments 
+  pmaxi = 6    ! Ion Hermite moments 
+  jmaxi = 6     ! Ion Laguerre moments
   nkr   = 1
   krmin = 0
   krmax = 0
@@ -19,7 +19,7 @@
   nsave_0d = 0
   nsave_1d = 0
   nsave_2d = 1
-  nsave_5d = 0
+  nsave_5d = 1
   write_Ni00    = .true.
   write_moments = .true.
   write_phi     = .true.
@@ -28,8 +28,8 @@
 /
 &MODEL_PAR
   ! Collisionality
-  CO      = -1       ! Collision operator (-1:Full Coulomb, 0: Dougherty)
-  nu      = 0       ! Normalized collision frequency normalized to plasma frequency
+  CO      = -2       ! Collision operator (-1:Full Coulomb, 0: Dougherty)
+  nu      = 1       ! Normalized collision frequency normalized to plasma frequency
   tau_e   = 1         ! T_e/T_e
   tau_i   = 1         ! T_i/T_e       temperature ratio
   sigma_e = 0.023338   ! sqrt(m_e/m_i) mass ratio
@@ -37,7 +37,7 @@
   q_e     = -1         ! Electrons charge
   q_i     = 1         ! Ions charge
   eta_n   = 0         ! L_perp / L_n Density gradient
-  eta_T   = 1         ! L_perp / L_T Temperature gradient
+  eta_T   = 0         ! L_perp / L_T Temperature gradient
   eta_B   = 0         ! L_perp / L_B Magnetic gradient and curvature
   lambdaD = 0         ! Debye length
 /
@@ -47,6 +47,9 @@
   ! Noise amplitude
   initnoise_moments=0
   iseed=42
+  selfmat_file='../iCa/self_Coll_GKE_0_GKI_0_ESELF_1_ISELF_1_Pmaxe_6_Jmaxe_6_Pmaxi_6_Jmaxi_6_pamaxx_10.h5'
+  eimat_file='../iCa/ei_Coll_GKE_0_GKI_0_ETEST_1_EBACK_1_Pmaxe_6_Jmaxe_6_Pmaxi_6_Jmaxi_6_pamaxx_10_tau_1.0000_mu_0.0233.h5'
+  iemat_file='../iCa/ie_Coll_GKE_0_GKI_0_ITEST_1_IBACK_1_Pmaxe_6_Jmaxe_6_Pmaxi_6_Jmaxi_6_pamaxx_10_tau_1.0000_mu_0.0233.h5'
 /
 &TIME_INTEGRATION_PAR
   numerical_scheme='RK4'