diff --git a/matlab/plot_Ni00_t_evolution.m b/matlab/plot_Ni00_t_evolution.m index a90162f227845f2181f8b354c5254c363e449641..d5aa35dcc29fb37919669b6265675e2f8b1eaa7d 100644 --- a/matlab/plot_Ni00_t_evolution.m +++ b/matlab/plot_Ni00_t_evolution.m @@ -28,7 +28,7 @@ end LEGEND = [LEGEND, 'fits']; TITLE = []; -TITLE = [TITLE,'$\eta_n=',num2str(1.0/MODEL.eta_n),'$, ']; +TITLE = [TITLE,'$\eta_n=',num2str(MODEL.eta_n),'$, ']; TITLE = [TITLE,'$\eta_B=',num2str(MODEL.eta_B),'$, ']; TITLE = [TITLE, '$\nu=',num2str(MODEL.nu),'$, ']; TITLE = [TITLE, '$(P,J)=(',num2str(GRID.pmaxe),',',num2str(GRID.jmaxe),')$']; diff --git a/matlab/save_figure.m b/matlab/save_figure.m index 5611cb9ed5fedc76556aae7e7fa7368d1e17aaff..80f38ea003c8a4702a72fd151bb1d5273e1357c0 100644 --- a/matlab/save_figure.m +++ b/matlab/save_figure.m @@ -6,7 +6,7 @@ if ~exist(FIGDIR, 'dir') 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),'_nu_',num2str(MODEL.nu)]; + '_etan_',num2str(MODEL.eta_n),'_etaB_',num2str(MODEL.eta_B),'_etaT_',num2str(MODEL.eta_T),'_nu_',num2str(MODEL.nu)]; FIGNAME = [FIGDIR, FIGNAME,'.fig']; savefig(fig,FIGNAME); disp(['Figure saved @ : ',FIGNAME]) \ No newline at end of file diff --git a/matlab/write_fort90.m b/matlab/write_fort90.m index 308f58d6b8f73ad4ced95301d059704904e9ec62..e7b820ef3f31d4f5caedfc3e263560ccd31b0d6c 100644 --- a/matlab/write_fort90.m +++ b/matlab/write_fort90.m @@ -8,16 +8,16 @@ fprintf(fid,[' dt=', num2str(BASIC.dt),'\n']); fprintf(fid,[' tmax=', num2str(BASIC.tmax),' ! time normalized to 1/omega_pe\n']); fprintf(fid,'/\n'); fprintf(fid,'&GRID\n'); -fprintf(fid,[' pmaxe =', num2str(GRID.pmaxe),' ! number of Hermite moments \n']); -fprintf(fid,[' jmaxe = ', num2str(GRID.jmaxe),' ! number of Hermite moments \n']); -fprintf(fid,[' pmaxi = ', num2str(GRID.pmaxi),' ! number of Hermite moments \n']); -fprintf(fid,[' jmaxi = ', num2str(GRID.jmaxi),' ! number of Hermite moments\n']); +fprintf(fid,[' pmaxe =', num2str(GRID.pmaxe),' ! Electron Hermite moments \n']); +fprintf(fid,[' jmaxe = ', num2str(GRID.jmaxe),' ! Electron Laguerre moments \n']); +fprintf(fid,[' pmaxi = ', num2str(GRID.pmaxi),' ! Ion Hermite moments \n']); +fprintf(fid,[' jmaxi = ', num2str(GRID.jmaxi),' ! Ion Laguerre moments\n']); fprintf(fid,[' nkr = ', num2str(GRID.nkr),'\n']); fprintf(fid,[' krmin = ', num2str(GRID.krmin),'\n']); -fprintf(fid,[' krmax = ', num2str(GRID.krmax),' ! Normalized to cs0/Omega_i\n']); +fprintf(fid,[' krmax = ', num2str(GRID.krmax),'\n']); fprintf(fid,[' nkz = ', num2str(GRID.nkz),'\n']); fprintf(fid,[' kzmin = ', num2str(GRID.kzmin),'\n']); -fprintf(fid,[' kzmax = ', num2str(GRID.kzmax),' ! Normalized to cs0/Omega_i\n']); +fprintf(fid,[' kzmax = ', num2str(GRID.kzmax),'\n']); fprintf(fid,'/\n'); fprintf(fid,'&OUTPUT_PAR\n'); fprintf(fid,[' nsave_0d = ', num2str(OUTPUTS.nsave_0d),'\n']); @@ -32,6 +32,7 @@ fprintf(fid,[' resfile0 = ', OUTPUTS.resfile0,'\n']); fprintf(fid,'/\n'); fprintf(fid,'&MODEL_PAR\n'); fprintf(fid,' ! Collisionality\n'); +fprintf(fid,[' CO = ', num2str(MODEL.CO),' ! Collision operator (-1:Full Coulomb, 0: Dougherty)\n']); fprintf(fid,[' nu = ', num2str(MODEL.nu),' ! Normalized collision frequency normalized to plasma frequency\n']); fprintf(fid,[' tau_e = ', num2str(MODEL.tau_e),' ! T_e/T_e\n']); fprintf(fid,[' tau_i = ', num2str(MODEL.tau_i),' ! T_i/T_e temperature ratio\n']);