diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90 index 626ae05248db3c3574e3d9afb3ba26fa77e10440..a08fcb6ce15291b28ee120efd6774fd3af8a7f79 100644 --- a/src/fourier_mod.F90 +++ b/src/fourier_mod.F90 @@ -60,8 +60,8 @@ MODULE fourier cdatar_g = fftw_alloc_real(2*alloc_local_2) cdatar_c = fftw_alloc_real(2*alloc_local_2) ! Initalize the arrays with the rooms pointed - call c_f_pointer(cdatar_f, real_data_f, [2*(NY_/2 + 1),local_nkx]) - call c_f_pointer(cdatar_g, real_data_g, [2*(NY_/2 + 1),local_nkx]) + call c_f_pointer(cdatar_f, real_data_f, [2*(NY_/2 + 1),local_nkx]) + call c_f_pointer(cdatar_g, real_data_g, [2*(NY_/2 + 1),local_nkx]) call c_f_pointer(cdatar_c, bracket_sum_r, [2*(NY_/2 + 1),local_nkx]) ! Plan Creation (out-of-place forward and backward FFT) diff --git a/src/numerics_mod.F90 b/src/numerics_mod.F90 index 2380adbd352d51e2d2bd36a561787659eb0a41c5..77d0d35749e853075968b23cdf9ac5d5f74ff357 100644 --- a/src/numerics_mod.F90 +++ b/src/numerics_mod.F90 @@ -281,10 +281,17 @@ SUBROUTINE save_EM_ZF_modes USE model, ONLY: KIN_E IMPLICIT NONE ! Store Zonal and entropy modes + IF(contains_ky0) THEN IF(KIN_E) & - moments_e_ZF(ips_e:ipe_e,ijs_e:ije_e,ikxs:ikxe,izs:ize) = moments_e(ips_e:ipe_e,ijs_e:ije_e,iky_0,ikxs:ikxe,izs:ize,updatetlevel) - moments_i_ZF(ips_i:ipe_i,ijs_i:ije_i,ikxs:ikxe,izs:ize) = moments_i(ips_i:ipe_i,ijs_i:ije_i,iky_0,ikxs:ikxe,izs:ize,updatetlevel) - phi_ZF(ikxs:ikxe,izs:ize) = phi(iky_0,ikxs:ikxe,izs:ize) + moments_e_ZF(ips_e:ipe_e,ijs_e:ije_e,ikxs:ikxe,izs:ize) = moments_e(ips_e:ipe_e,ijs_e:ije_e,iky_0,ikxs:ikxe,izs:ize,updatetlevel) + moments_i_ZF(ips_i:ipe_i,ijs_i:ije_i,ikxs:ikxe,izs:ize) = moments_i(ips_i:ipe_i,ijs_i:ije_i,iky_0,ikxs:ikxe,izs:ize,updatetlevel) + phi_ZF(ikxs:ikxe,izs:ize) = phi(iky_0,ikxs:ikxe,izs:ize) + ELSE + IF(KIN_E) & + moments_e_ZF(ips_e:ipe_e,ijs_e:ije_e,ikxs:ikxe,izs:ize) = 0._dp + moments_i_ZF(ips_i:ipe_i,ijs_i:ije_i,ikxs:ikxe,izs:ize) = 0._dp + phi_ZF(ikxs:ikxe,izs:ize) = 0._dp + ENDIF IF(contains_kx0) THEN IF(KIN_E) & moments_e_EM(ips_e:ipe_e,ijs_e:ije_e,ikys:ikye,izs:ize) = moments_e(ips_e:ipe_e,ijs_e:ije_e,ikys:ikye,ikx_0,izs:ize,updatetlevel) diff --git a/src/ppinit.F90 b/src/ppinit.F90 index ede0fe8a9cdef332f34f79154fbe1336e39a49d1..1a662babc6bc41ab9188b17ded43759e49d0bffc 100644 --- a/src/ppinit.F90 +++ b/src/ppinit.F90 @@ -43,7 +43,7 @@ SUBROUTINE ppinit ! !periodicity in p periods(1)=.FALSE. - !periodicity in kx + !periodicity in ky periods(2)=.FALSE. !periodicity in z periods(3)=.TRUE. diff --git a/src/srcinfo.h b/src/srcinfo.h index b83013358773aa2ce9b86a1293b2fef8beedfeda..a9af728e038cf4b916e97e88290392274ca76065 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='38a4f6e-dirty') +parameter (VERSION='507e9cf-dirty') parameter (BRANCH='kx_pos_plane') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Mon May 2 14:23:17 CEST 2022') +parameter (EXECDATE='Mon May 2 18:13:49 CEST 2022') parameter (HOST ='spcpc606') diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h index b83013358773aa2ce9b86a1293b2fef8beedfeda..a9af728e038cf4b916e97e88290392274ca76065 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='38a4f6e-dirty') +parameter (VERSION='507e9cf-dirty') parameter (BRANCH='kx_pos_plane') parameter (AUTHOR='ahoffman') -parameter (EXECDATE='Mon May 2 14:23:17 CEST 2022') +parameter (EXECDATE='Mon May 2 18:13:49 CEST 2022') parameter (HOST ='spcpc606') diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m index a96dc88198026b2ff5e33b8e8281dfbfbf3837e6..570bbed5a17f79e45b6d56bc0306dd00353952a1 100644 --- a/wk/analysis_3D.m +++ b/wk/analysis_3D.m @@ -21,7 +21,7 @@ FMT = '.fig'; if 1 %% Space time diagramm (fig 11 Ivanov 2020) -TAVG_0 = 600; TAVG_1 = 700; % Averaging times duration +TAVG_0 = 0.8*data.Ts3D(end); TAVG_1 = data.Ts3D(end); % Averaging times duration compz = 'avg'; % chose your field to plot in spacetime diag (uzf,szf,Gx) fig = plot_radial_transport_and_spacetime(data,TAVG_0,TAVG_1,'phi',1,compz); @@ -62,17 +62,17 @@ if 0 options.INTERP = 0; options.POLARPLOT = 0; options.AXISEQUAL = 1; -% options.NAME = '\phi'; -options.NAME = 'n_i'; +options.NAME = '\phi'; +% options.NAME = 'n_i'; % options.NAME = 'N_i^{00}'; % options.NAME = 'T_i'; % options.NAME = '\Gamma_x'; % options.NAME = 'k^2n_e'; -options.PLAN = 'xy'; +options.PLAN = 'kxky'; % options.NAME = 'f_e'; % options.PLAN = 'sx'; -options.COMP = 8; -options.TIME = [1 4 10]; +options.COMP = 1; +options.TIME = [1]; data.a = data.EPS * 1000; fig = photomaton(data,options); save_figure(data,fig)