mirror of
https://github.com/cp2k/cp2k.git
synced 2026-07-29 06:35:28 -04:00
Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b3fd3beb9 | ||
|
|
67126483bc | ||
|
|
6608d10a9a |
5 changed files with 12 additions and 2 deletions
|
|
@ -37,7 +37,7 @@ project(
|
||||||
cp2k
|
cp2k
|
||||||
DESCRIPTION "CP2K"
|
DESCRIPTION "CP2K"
|
||||||
HOMEPAGE_URL "https://www.cp2k.org"
|
HOMEPAGE_URL "https://www.cp2k.org"
|
||||||
VERSION "2024.1"
|
VERSION "2024.3"
|
||||||
LANGUAGES Fortran C CXX)
|
LANGUAGES Fortran C CXX)
|
||||||
|
|
||||||
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
|
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
|
||||||
|
|
|
||||||
1
REVISION
Normal file
1
REVISION
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
git:6712648
|
||||||
|
|
@ -38,7 +38,7 @@ MODULE cp2k_info
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
!!! Keep version in sync with CMakeLists.txt !!!
|
!!! Keep version in sync with CMakeLists.txt !!!
|
||||||
CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K version 2024.1 (Development Version)"
|
CHARACTER(LEN=*), PARAMETER :: cp2k_version = "CP2K version 2024.3"
|
||||||
CHARACTER(LEN=*), PARAMETER :: cp2k_year = "2024"
|
CHARACTER(LEN=*), PARAMETER :: cp2k_year = "2024"
|
||||||
CHARACTER(LEN=*), PARAMETER :: cp2k_home = "https://www.cp2k.org/"
|
CHARACTER(LEN=*), PARAMETER :: cp2k_home = "https://www.cp2k.org/"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,7 @@ MODULE fft_tools
|
||||||
PRIVATE
|
PRIVATE
|
||||||
PUBLIC :: init_fft, fft3d, finalize_fft
|
PUBLIC :: init_fft, fft3d, finalize_fft
|
||||||
PUBLIC :: fft_alloc, fft_dealloc
|
PUBLIC :: fft_alloc, fft_dealloc
|
||||||
|
PUBLIC :: init_fft_scratch_pool
|
||||||
PUBLIC :: fft_radix_operations, fft_fw1d
|
PUBLIC :: fft_radix_operations, fft_fw1d
|
||||||
PUBLIC :: FWFFT, BWFFT
|
PUBLIC :: FWFFT, BWFFT
|
||||||
PUBLIC :: FFT_RADIX_CLOSEST, FFT_RADIX_NEXT
|
PUBLIC :: FFT_RADIX_CLOSEST, FFT_RADIX_NEXT
|
||||||
|
|
@ -2948,6 +2949,7 @@ CONTAINS
|
||||||
CASE DEFAULT
|
CASE DEFAULT
|
||||||
CPABORT("")
|
CPABORT("")
|
||||||
CASE (100) ! fft3d_pb: full cube distribution
|
CASE (100) ! fft3d_pb: full cube distribution
|
||||||
|
CPASSERT(PRESENT(fft_sizes))
|
||||||
mx1 = fft_sizes%mx1
|
mx1 = fft_sizes%mx1
|
||||||
my1 = fft_sizes%my1
|
my1 = fft_sizes%my1
|
||||||
mx2 = fft_sizes%mx2
|
mx2 = fft_sizes%mx2
|
||||||
|
|
@ -3006,6 +3008,7 @@ CONTAINS
|
||||||
fft_scratch_new%fft_scratch%a2buf, fft_scratch_new%fft_scratch%a1buf, fft_plan_style)
|
fft_scratch_new%fft_scratch%a2buf, fft_scratch_new%fft_scratch%a1buf, fft_plan_style)
|
||||||
|
|
||||||
CASE (101) ! fft3d_pb: full cube distribution (dim 1)
|
CASE (101) ! fft3d_pb: full cube distribution (dim 1)
|
||||||
|
CPASSERT(PRESENT(fft_sizes))
|
||||||
mx1 = fft_sizes%mx1
|
mx1 = fft_sizes%mx1
|
||||||
my1 = fft_sizes%my1
|
my1 = fft_sizes%my1
|
||||||
mz1 = fft_sizes%mz1
|
mz1 = fft_sizes%mz1
|
||||||
|
|
@ -3043,6 +3046,7 @@ CONTAINS
|
||||||
fft_scratch_new%fft_scratch%a3buf, fft_scratch_new%fft_scratch%a1buf, fft_plan_style)
|
fft_scratch_new%fft_scratch%a3buf, fft_scratch_new%fft_scratch%a1buf, fft_plan_style)
|
||||||
|
|
||||||
CASE (200) ! fft3d_ps: plane distribution
|
CASE (200) ! fft3d_ps: plane distribution
|
||||||
|
CPASSERT(PRESENT(fft_sizes))
|
||||||
nx = fft_sizes%nx
|
nx = fft_sizes%nx
|
||||||
ny = fft_sizes%ny
|
ny = fft_sizes%ny
|
||||||
nz = fft_sizes%nz
|
nz = fft_sizes%nz
|
||||||
|
|
@ -3092,6 +3096,7 @@ CONTAINS
|
||||||
fft_scratch_new%fft_scratch%r1buf, fft_scratch_new%fft_scratch%tbuf, fft_plan_style)
|
fft_scratch_new%fft_scratch%r1buf, fft_scratch_new%fft_scratch%tbuf, fft_plan_style)
|
||||||
|
|
||||||
CASE (300) ! fft3d_ps: block distribution
|
CASE (300) ! fft3d_ps: block distribution
|
||||||
|
CPASSERT(PRESENT(fft_sizes))
|
||||||
mx1 = fft_sizes%mx1
|
mx1 = fft_sizes%mx1
|
||||||
mx2 = fft_sizes%mx2
|
mx2 = fft_sizes%mx2
|
||||||
my1 = fft_sizes%my1
|
my1 = fft_sizes%my1
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ MODULE pw_env_methods
|
||||||
derivative_cd5,&
|
derivative_cd5,&
|
||||||
derivative_cd7,&
|
derivative_cd7,&
|
||||||
rho_dependent
|
rho_dependent
|
||||||
|
USE fft_tools, ONLY: init_fft_scratch_pool
|
||||||
USE gaussian_gridlevels, ONLY: destroy_gaussian_gridlevel,&
|
USE gaussian_gridlevels, ONLY: destroy_gaussian_gridlevel,&
|
||||||
gaussian_gridlevel,&
|
gaussian_gridlevel,&
|
||||||
init_gaussian_gridlevel
|
init_gaussian_gridlevel
|
||||||
|
|
@ -249,6 +250,9 @@ CONTAINS
|
||||||
END IF
|
END IF
|
||||||
NULLIFY (pw_env%pw_pools, pw_env%cube_info)
|
NULLIFY (pw_env%pw_pools, pw_env%cube_info)
|
||||||
|
|
||||||
|
! remove fft scratch pool, as it depends on pw_env mpi group handles
|
||||||
|
CALL init_fft_scratch_pool()
|
||||||
|
|
||||||
!
|
!
|
||||||
!
|
!
|
||||||
! Part two, setup the pw_grids
|
! Part two, setup the pw_grids
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue