From db9967c54b202c5c5bd5cf485484bffe681366b2 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Tue, 3 May 2022 12:00:12 +0200
Subject: [PATCH] debugged
---
src/fourier_mod.F90 | 11 +++++------
src/srcinfo.h | 4 ++--
src/srcinfo/srcinfo.h | 4 ++--
wk/analysis_3D.m | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index a08fcb6c..cdc2fefa 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -42,26 +42,25 @@ MODULE fourier
!! Complex arrays F, G
! Compute the room to allocate
alloc_local_1 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
-
! Initalize pointers to this room
cdatac_f = fftw_alloc_complex(alloc_local_1)
cdatac_g = fftw_alloc_complex(alloc_local_1)
cdatac_c = fftw_alloc_complex(alloc_local_1)
! Initalize the arrays with the rooms pointed
- call c_f_pointer(cdatac_f, cmpx_data_f, [NX_ ,local_nky])
- call c_f_pointer(cdatac_g, cmpx_data_g, [NX_ ,local_nky])
+ call c_f_pointer(cdatac_f, cmpx_data_f, [NX_ ,local_nky])
+ call c_f_pointer(cdatac_g, cmpx_data_g, [NX_ ,local_nky])
call c_f_pointer(cdatac_c, bracket_sum_c, [NX_ ,local_nky])
!! Real arrays iFFT(F), iFFT(G)
! Compute the room to allocate
- alloc_local_2 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
+ alloc_local_2 = fftw_mpi_local_size_2d(NX_, NY_halved, communicator, local_nkx, local_nkx_offset)
! Initalize pointers to this room
cdatar_f = fftw_alloc_real(2*alloc_local_2)
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/srcinfo.h b/src/srcinfo.h
index a9af728e..1521a896 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='507e9cf-dirty')
+parameter (VERSION='6458026-dirty')
parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Mon May 2 18:13:49 CEST 2022')
+parameter (EXECDATE='Tue May 3 10:57:28 CEST 2022')
parameter (HOST ='spcpc606')
diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h
index a9af728e..1521a896 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='507e9cf-dirty')
+parameter (VERSION='6458026-dirty')
parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Mon May 2 18:13:49 CEST 2022')
+parameter (EXECDATE='Tue May 3 10:57:28 CEST 2022')
parameter (HOST ='spcpc606')
diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m
index 570bbed5..2d8c8e2a 100644
--- a/wk/analysis_3D.m
+++ b/wk/analysis_3D.m
@@ -39,8 +39,8 @@ if 0
% Options
options.INTERP = 1;
options.POLARPLOT = 0;
-% options.NAME = '\phi';
-options.NAME = 'N_i^{00}';
+options.NAME = '\phi';
+% options.NAME = 'N_i^{00}';
% options.NAME = 'v_y';
% options.NAME = 'n_i^{NZ}';
% options.NAME = '\Gamma_x';
@@ -50,7 +50,7 @@ options.PLAN = 'xy';
% options.PLAN = 'sx';
options.COMP = 'avg';
% options.TIME = dat.Ts5D;
-options.TIME = 0:1:100;
+options.TIME = 100:1:200;
data.EPS = 0.1;
data.a = data.EPS * 2000;
create_film(data,options,'.gif')
--
GitLab