From 38a4f6e3a7589c163d8f49dc1fc4a8dd483e49c4 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Mon, 2 May 2022 09:31:08 +0200
Subject: [PATCH] dbg
---
src/auxval.F90 | 2 ++
src/fourier_mod.F90 | 7 ++++---
src/srcinfo.h | 4 ++--
src/srcinfo/srcinfo.h | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/auxval.F90 b/src/auxval.F90
index 3718c678..7d6fd969 100644
--- a/src/auxval.F90
+++ b/src/auxval.F90
@@ -15,9 +15,11 @@ subroutine auxval
IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
IF (LINEARITY .NE. 'linear') THEN
+ write(*,*) 'FFTW3 y-grid distribution'
CALL init_grid_distr_and_plans(Nx,Ny)
ELSE
CALL init_1Dgrid_distr
+ write(*,*) 'Manual y-grid distribution'
ENDIF
! Init the grids
CALL set_pgrid ! parallel kin (MPI distributed)
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index a64aa501..626ae052 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -42,6 +42,7 @@ 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)
@@ -53,7 +54,7 @@ MODULE fourier
!! Real arrays iFFT(F), iFFT(G)
! Compute the room to allocate
- alloc_local_2 = fftw_mpi_local_size_2d(NX_, NY_halved, communicator, local_nky, local_nky_offset)
+ alloc_local_2 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
! Initalize pointers to this room
cdatar_f = fftw_alloc_real(2*alloc_local_2)
cdatar_g = fftw_alloc_real(2*alloc_local_2)
@@ -84,9 +85,9 @@ MODULE fourier
! First term df/dx x dg/dy
DO ikx = ikxs, ikxe
DO iky = ikys, ikye
- cmpx_data_f(iky-local_nky_offset,ikx) = &
+ cmpx_data_f(ikx,iky-local_nky_offset) = &
imagu*kxarray(ikx)*F_(iky,ikx)*AA_x(ikx)*AA_y(iky) !Anti aliasing filter
- cmpx_data_g(iky-local_nky_offset,ikx) = &
+ cmpx_data_g(ikx,iky-local_nky_offset) = &
imagu*kyarray(iky)*G_(iky,ikx)*AA_x(ikx)*AA_y(iky) !Anti aliasing filter
ENDDO
ENDDO
diff --git a/src/srcinfo.h b/src/srcinfo.h
index f4318715..690578d0 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='b4318b5-dirty')
+parameter (VERSION='e4c9228-dirty')
parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Fri Apr 29 18:36:06 CEST 2022')
+parameter (EXECDATE='Mon May 2 09:30:54 CEST 2022')
parameter (HOST ='spcpc606')
diff --git a/src/srcinfo/srcinfo.h b/src/srcinfo/srcinfo.h
index f4318715..690578d0 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='b4318b5-dirty')
+parameter (VERSION='e4c9228-dirty')
parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman')
-parameter (EXECDATE='Fri Apr 29 18:36:06 CEST 2022')
+parameter (EXECDATE='Mon May 2 09:30:54 CEST 2022')
parameter (HOST ='spcpc606')
--
GitLab