Skip to content
Snippets Groups Projects
Commit 38a4f6e3 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann
Browse files

dbg

parent e4c9228f
No related branches found
No related tags found
No related merge requests found
...@@ -15,9 +15,11 @@ subroutine auxval ...@@ -15,9 +15,11 @@ subroutine auxval
IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ===' IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
IF (LINEARITY .NE. 'linear') THEN IF (LINEARITY .NE. 'linear') THEN
write(*,*) 'FFTW3 y-grid distribution'
CALL init_grid_distr_and_plans(Nx,Ny) CALL init_grid_distr_and_plans(Nx,Ny)
ELSE ELSE
CALL init_1Dgrid_distr CALL init_1Dgrid_distr
write(*,*) 'Manual y-grid distribution'
ENDIF ENDIF
! Init the grids ! Init the grids
CALL set_pgrid ! parallel kin (MPI distributed) CALL set_pgrid ! parallel kin (MPI distributed)
......
...@@ -42,6 +42,7 @@ MODULE fourier ...@@ -42,6 +42,7 @@ MODULE fourier
!! Complex arrays F, G !! Complex arrays F, G
! Compute the room to allocate ! Compute the room to allocate
alloc_local_1 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset) alloc_local_1 = fftw_mpi_local_size_2d(NY_halved, NX_, communicator, local_nky, local_nky_offset)
! Initalize pointers to this room ! Initalize pointers to this room
cdatac_f = fftw_alloc_complex(alloc_local_1) cdatac_f = fftw_alloc_complex(alloc_local_1)
cdatac_g = fftw_alloc_complex(alloc_local_1) cdatac_g = fftw_alloc_complex(alloc_local_1)
...@@ -53,7 +54,7 @@ MODULE fourier ...@@ -53,7 +54,7 @@ MODULE fourier
!! Real arrays iFFT(F), iFFT(G) !! Real arrays iFFT(F), iFFT(G)
! Compute the room to allocate ! 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 ! Initalize pointers to this room
cdatar_f = fftw_alloc_real(2*alloc_local_2) cdatar_f = fftw_alloc_real(2*alloc_local_2)
cdatar_g = fftw_alloc_real(2*alloc_local_2) cdatar_g = fftw_alloc_real(2*alloc_local_2)
...@@ -84,9 +85,9 @@ MODULE fourier ...@@ -84,9 +85,9 @@ MODULE fourier
! First term df/dx x dg/dy ! First term df/dx x dg/dy
DO ikx = ikxs, ikxe DO ikx = ikxs, ikxe
DO iky = ikys, ikye 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 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 imagu*kyarray(iky)*G_(iky,ikx)*AA_x(ikx)*AA_y(iky) !Anti aliasing filter
ENDDO ENDDO
ENDDO ENDDO
......
...@@ -3,8 +3,8 @@ character(len=40) BRANCH ...@@ -3,8 +3,8 @@ character(len=40) BRANCH
character(len=20) AUTHOR character(len=20) AUTHOR
character(len=40) EXECDATE character(len=40) EXECDATE
character(len=40) HOST character(len=40) HOST
parameter (VERSION='b4318b5-dirty') parameter (VERSION='e4c9228-dirty')
parameter (BRANCH='kx_pos_plane') parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman') 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') parameter (HOST ='spcpc606')
...@@ -3,8 +3,8 @@ character(len=40) BRANCH ...@@ -3,8 +3,8 @@ character(len=40) BRANCH
character(len=20) AUTHOR character(len=20) AUTHOR
character(len=40) EXECDATE character(len=40) EXECDATE
character(len=40) HOST character(len=40) HOST
parameter (VERSION='b4318b5-dirty') parameter (VERSION='e4c9228-dirty')
parameter (BRANCH='kx_pos_plane') parameter (BRANCH='kx_pos_plane')
parameter (AUTHOR='ahoffman') 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') parameter (HOST ='spcpc606')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment