Add initializers in dg, dct

cp2k · Jun 24, 2023 · 6f4b133 · 6f4b133
1 parent 810d250
commit 6f4b133
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 32 deletions.
diff --git a/src/pw/cube_utils.F b/src/pw/cube_utils.F
@@ -32,20 +32,20 @@ MODULE cube_utils
              compute_cube_center
 
    TYPE :: cube_ptr
-      INTEGER, POINTER, DIMENSION(:) :: p
+      INTEGER, POINTER, DIMENSION(:) :: p => NULL()
    END TYPE cube_ptr
 
    TYPE :: cube_info_type
-      INTEGER                      :: max_radius
-      REAL(KIND=dp)              :: dr(3), drmin
-      REAL(KIND=dp)              :: dh(3, 3)
-      REAL(KIND=dp)              :: dh_inv(3, 3)
-      LOGICAL                      :: orthorhombic
-      INTEGER, POINTER             :: lb_cube(:, :)
-      INTEGER, POINTER             :: ub_cube(:, :)
-      TYPE(cube_ptr), POINTER, DIMENSION(:)  :: sphere_bounds
-      INTEGER, POINTER             :: sphere_bounds_count(:)
-      REAL(KIND=dp)              :: max_rad_ga
+      INTEGER                      :: max_radius = 0.0_dp
+      REAL(KIND=dp)              :: dr(3) = 0.0_dp, drmin = 0.0_dp
+      REAL(KIND=dp)              :: dh(3, 3) = 0.0_dp
+      REAL(KIND=dp)              :: dh_inv(3, 3) = 0.0_dp
+      LOGICAL                      :: orthorhombic = .TRUE.
+      INTEGER, POINTER             :: lb_cube(:, :) => NULL()
+      INTEGER, POINTER             :: ub_cube(:, :) => NULL()
+      TYPE(cube_ptr), POINTER, DIMENSION(:)  :: sphere_bounds => NULL()
+      INTEGER, POINTER             :: sphere_bounds_count(:) => NULL()
+      REAL(KIND=dp)              :: max_rad_ga = 0.0_dp
    END TYPE cube_info_type
 
 CONTAINS

diff --git a/src/pw/dct.F b/src/pw/dct.F
@@ -39,12 +39,12 @@ MODULE dct
       INTEGER, DIMENSION(:), POINTER     :: srcs_expand => NULL()
       INTEGER, DIMENSION(:), POINTER     :: flipg_stat => NULL()
       INTEGER, DIMENSION(:), POINTER     :: dests_shrink => NULL()
-      INTEGER                            :: srcs_shrink
+      INTEGER                            :: srcs_shrink = 0
       INTEGER, DIMENSION(:, :, :), POINTER :: recv_msgs_bnds => NULL()
-      INTEGER, DIMENSION(2, 3)            :: dct_bounds
-      INTEGER, DIMENSION(2, 3)            :: dct_bounds_local
-      INTEGER, DIMENSION(2, 3)            :: bounds_shftd
-      INTEGER, DIMENSION(2, 3)            :: bounds_local_shftd
+      INTEGER, DIMENSION(2, 3)            :: dct_bounds = 0
+      INTEGER, DIMENSION(2, 3)            :: dct_bounds_local = 0
+      INTEGER, DIMENSION(2, 3)            :: bounds_shftd = 0
+      INTEGER, DIMENSION(2, 3)            :: bounds_local_shftd = 0
    END TYPE dct_type
 
    TYPE dct_msg_type

diff --git a/src/pw/dg_rho0_types.F b/src/pw/dg_rho0_types.F
@@ -40,13 +40,13 @@ MODULE dg_rho0_types
 !>              zet = Gaussian exponent
 ! **************************************************************************************************
    TYPE dg_rho0_type
-      INTEGER :: TYPE
-      INTEGER :: grid
-      INTEGER :: kind
-      REAL(KIND=dp) :: cutoff_radius
-      REAL(KIND=dp), DIMENSION(:), POINTER :: gcc
-      REAL(KIND=dp), DIMENSION(:), POINTER :: zet
-      TYPE(pw_type), POINTER :: density
+      INTEGER :: TYPE = do_ewald_none
+      INTEGER :: grid = 0
+      INTEGER :: kind = 0
+      REAL(KIND=dp) :: cutoff_radius = 0.0_dp
+      REAL(KIND=dp), DIMENSION(:), POINTER :: gcc => NULL()
+      REAL(KIND=dp), DIMENSION(:), POINTER :: zet => NULL()
+      TYPE(pw_type), POINTER :: density => NULL()
    END TYPE dg_rho0_type
 
 CONTAINS
@@ -121,13 +121,6 @@ SUBROUTINE dg_rho0_create(dg_rho0)
       TYPE(dg_rho0_type), POINTER                        :: dg_rho0
 
       ALLOCATE (dg_rho0)
-      NULLIFY (dg_rho0%gcc)
-      NULLIFY (dg_rho0%zet)
-      dg_rho0%cutoff_radius = 0.0_dp
-      dg_rho0%grid = 0
-      dg_rho0%kind = 0
-      dg_rho0%type = do_ewald_none
-      NULLIFY (dg_rho0%density)
 
    END SUBROUTINE dg_rho0_create
 

diff --git a/src/pw/dg_types.F b/src/pw/dg_types.F
@@ -22,8 +22,8 @@ MODULE dg_types
 ! **************************************************************************************************
    TYPE dg_type
       PRIVATE
-      INTEGER :: grid_index
-      TYPE(dg_rho0_type), POINTER :: dg_rho0
+      INTEGER :: grid_index = 0
+      TYPE(dg_rho0_type), POINTER :: dg_rho0 => NULL()
    END TYPE dg_type
 
 ! **************************************************************************************************