diff --git a/wk/HD_study.m b/matlab/HD_study.m similarity index 100% rename from wk/HD_study.m rename to matlab/HD_study.m diff --git a/wk/ZF_fourier_analysis.m b/matlab/ZF_fourier_analysis.m similarity index 100% rename from wk/ZF_fourier_analysis.m rename to matlab/ZF_fourier_analysis.m diff --git a/wk/fig_post_processing.m b/matlab/fig_post_processing.m similarity index 100% rename from wk/fig_post_processing.m rename to matlab/fig_post_processing.m diff --git a/wk/flux_results.m b/matlab/flux_results.m similarity index 100% rename from wk/flux_results.m rename to matlab/flux_results.m diff --git a/wk/load_multiple_outputs_marconi.m b/matlab/load_multiple_outputs_marconi.m similarity index 100% rename from wk/load_multiple_outputs_marconi.m rename to matlab/load_multiple_outputs_marconi.m diff --git a/wk/marconi_scaling.m b/matlab/marconi_scaling.m similarity index 100% rename from wk/marconi_scaling.m rename to matlab/marconi_scaling.m diff --git a/wk/molix_plot_phi.m b/matlab/molix_plot_phi.m similarity index 100% rename from wk/molix_plot_phi.m rename to matlab/molix_plot_phi.m diff --git a/wk/new_flux_results.m b/matlab/new_flux_results.m similarity index 100% rename from wk/new_flux_results.m rename to matlab/new_flux_results.m diff --git a/wk/open_figure_script.m b/matlab/open_figure_script.m similarity index 100% rename from wk/open_figure_script.m rename to matlab/open_figure_script.m diff --git a/wk/plot_cosol_mat.m b/matlab/plot_cosol_mat.m similarity index 100% rename from wk/plot_cosol_mat.m rename to matlab/plot_cosol_mat.m diff --git a/wk/plot_phi_ballooning.m b/matlab/plot_phi_ballooning.m similarity index 100% rename from wk/plot_phi_ballooning.m rename to matlab/plot_phi_ballooning.m diff --git a/src/srcinfo.h b/src/srcinfo.h index e920419f6b3b8dfaacda6b07fb54bd74c4eacf9f..9b4b2428e4e58f77736196858f5e960af03cdd4d 100644 --- a/src/srcinfo.h +++ b/src/srcinfo.h @@ -3,8 +3,8 @@ character(len=40) BRANCH character(len=20) AUTHOR character(len=40) EXECDATE character(len=40) HOST -parameter (VERSION='662e3f7-dirty') +parameter (VERSION='95b37e1-dirty') parameter (BRANCH='master') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Mon Nov 1 11:15:33 CET 2021') +parameter (EXECDATE='Mon Nov 8 11:53:45 CET 2021') parameter (HOST ='spcpc606') diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h index e920419f6b3b8dfaacda6b07fb54bd74c4eacf9f..9b4b2428e4e58f77736196858f5e960af03cdd4d 100644 --- a/src/srcinfo/srcinfo.h +++ b/src/srcinfo/srcinfo.h @@ -3,8 +3,8 @@ character(len=40) BRANCH character(len=20) AUTHOR character(len=40) EXECDATE character(len=40) HOST -parameter (VERSION='662e3f7-dirty') +parameter (VERSION='95b37e1-dirty') parameter (BRANCH='master') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Mon Nov 1 11:15:33 CET 2021') +parameter (EXECDATE='Mon Nov 8 11:53:45 CET 2021') parameter (HOST ='spcpc606') diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m index 249c2a429cdbbbe614c276bcd33a9761114fb451..a73226576e53801425b2048d9c457dca85cb1d55 100644 --- a/wk/analysis_3D.m +++ b/wk/analysis_3D.m @@ -2,12 +2,12 @@ addpath(genpath('../matlab')) % ... add addpath(genpath('../matlab/plots')) % ... add outfile =''; %% Directory of the simulation -if 0% Local results +if 1% Local results outfile =''; outfile =''; outfile =''; -outfile =''; -outfile ='fluxtube_salphaB_s0/100x100x30_5x3_Lx_200_Ly_100_q0_2.7_e_0.18_kN_2.22_kT_8_nu_1e-01_DGGK_adiabe'; +outfile ='simulation_A/CO_damping_FCGK'; +% outfile ='fluxtube_salphaB_s0/100x100x30_5x3_Lx_200_Ly_100_q0_2.7_e_0.18_kN_2.22_kT_8_nu_1e-01_DGGK_adiabe'; % outfile ='fluxtube_salphaB_s0/50x100x20_5x3_L_300_q0_2.7_e_0.18_kN_2.22_kT_8_nu_1e-01_DGGK_adiabe'; % outfile ='fluxtube_salphaB_s0/50x100x20_5x3_L_300_q0_2.7_e_0.18_kN_2.22_kT_8_nu_1e-01_DGGK_adiabe_Sg'; LOCALDIR = ['../results/',outfile,'/']; @@ -24,7 +24,7 @@ end %% Load the results % Load outputs from jobnummin up to jobnummax -JOBNUMMIN = 00; JOBNUMMAX = 20; +JOBNUMMIN = 07; JOBNUMMAX = 07; data = compile_results(MISCDIR,JOBNUMMIN,JOBNUMMAX); %Compile the results from first output found to JOBNUMMAX if existing