remove useless dtB_arrays module

Rather use local private arrays in dtB directly
magic-sph · Sep 9, 2024 · 3ba7b78 · 3ba7b78
1 parent b640b20
commit 3ba7b78
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 238 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -343,8 +343,6 @@ mem_alloc.o           : parallel.o precision_mod.o output_data.o
 out_TO.o              : truncation.o horizontal.o num_param.o logic.o\
                         phys_param.o radial.o parallel.o integration.o\
                         constants.o output_data.o TO.o useful.o mem_alloc.o
-dtB_arrays.o          : truncation.o precision_mod.o constants.o\
-                        mem_alloc.o
 courant.o             : truncation.o blocking.o num_param.o\
                         phys_param.o radial.o horizontal.o logic.o\
                         useful.o radial_data.o parallel.o
@@ -417,10 +415,9 @@ LMLoop.o              : truncation.o blocking.o parallel.o time_array.o\
                         logic.o radial_data.o updateWPS.o\
                         output_data.o fields.o dt_fieldsLast.o\
                         updateS.o updateB.o mem_alloc.o updateXI.o\
-                        updateZ.o updateWP.o  debugging.o
+                        updateZ.o updateWP.o
 mpi_transpose.o       : precision_mod.o truncation.o radial_data.o\
                         mem_alloc.o parallel.o blocking.o
-debugging.o           : precision_mod.o precision_mod.o
 timing.o              : parallel.o precision_mod.o
 radial_derivatives.o  : $(DCT_OBJS) constants.o precision_mod.o chebyshev.o
 output.o              : truncation.o blocking.o phys_param.o\

diff --git a/src/debugging.f90 b/src/debugging.f90
diff --git a/src/dtB.f90 b/src/dtB.f90
@@ -24,7 +24,7 @@ module dtB_mod
        &               lm2lmS, lm2lmA
    use radial_spectra ! rBrSpec, rBpSpec
    use sht, only: scal_to_SH, spat_to_sphertor
-   use constants, only: two, ci
+   use constants, only: zero, two, ci
    use radial_der, only: get_dr
 
    implicit none
@@ -57,6 +57,12 @@ module dtB_mod
    complex(cp), public, allocatable :: PadvLMIC_LMloc(:,:), PdifLMIC_LMloc(:,:)
    complex(cp), public, allocatable :: TadvLMIC_LMloc(:,:), TdifLMIC_LMloc(:,:)
 
+   !-- Local private complex arrays for SH transforms
+   complex(cp), allocatable :: BtVrLM(:), BpVrLM(:), BrVtLM(:)
+   complex(cp), allocatable :: BtVpLM(:), BpVtLM(:), BrVpLM(:)
+   complex(cp), allocatable :: BpVtBtVpCotLM(:), BpVtBtVpSn2LM(:)
+   complex(cp), allocatable :: BtVZLM(:), BtVZsn2LM(:), BrVZLM(:)
+
    class(type_mpitransp), pointer :: r2lo_dtB
 
    public :: initialize_dtB_mod, get_dtBLMfinish, get_dtBLM, get_dH_dtBLM, &
@@ -73,7 +79,6 @@ subroutine initialize_dtB_mod
       ! The remaining global arrays should be suppressed, they are only
       ! needed because of some movie outputs
       !
-
       if ( l_dtBmovie ) then
          if ( rank == 0 ) then
             allocate( PstrLM(lm_max,n_r_max), PadvLM(lm_max,n_r_max) )
@@ -96,6 +101,23 @@ subroutine initialize_dtB_mod
          end if
       end if
 
+      allocate( BtVrLM(lm_max), BpVrLM(lm_max), BrVtLM(lm_max), BrVpLM(lm_max) )
+      allocate( BtVpLM(lm_max), BpVtLM(lm_max), BpVtBtVpCotLM(lm_max) )
+      allocate( BpVtBtVpSn2LM(lm_max), BrVZLM(lm_max), BtVZLM(lm_max) )
+      allocate( BtVZsn2LM(lm_max) )
+      bytes_allocated = bytes_allocated+ 11*lm_max*SIZEOF_DEF_COMPLEX
+      BtVrLM(:) = zero
+      BpVrLM(:) = zero
+      BrVtLM(:) = zero
+      BrVpLM(:) = zero
+      BtVpLM(:) = zero
+      BpVtLM(:) = zero
+      BrVZLM(:) = zero
+      BtVZLM(:) = zero
+      BpVtBtVpCotLM(:) = zero
+      BpVtBtVpSn2LM(:) = zero
+      BtVZsn2LM(:) = zero
+
       allocate( PdifLM_LMloc(llmMag:ulmMag,n_r_max) )
       allocate( TdifLM_LMloc(llmMag:ulmMag,n_r_max) )
       bytes_allocated = bytes_allocated+ &
@@ -147,6 +169,8 @@ subroutine finalize_dtB_mod
          deallocate( TdifLMIC, TadvLMIC, PdifLMIC, PadvLMIC, TdifLM, PdifLM )
       end if
 
+      deallocate( BtVrLM, BpVrLM, BrVtLM, BrVpLM, BtVpLM, BpVtLM )
+      deallocate( BpVtBtVpCotLM, BpVtBtVpSn2LM, BrVZLM, BtVZLM, BtVZsn2LM )
       deallocate( PdifLM_LMloc, TdifLM_LMloc, PadvLMIC_LMloc, PdifLMIC_LMloc )
       deallocate( TadvLMIC_LMloc, TdifLMIC_LMloc )
       deallocate( dtB_Rloc_container, dtB_LMloc_container )
@@ -176,9 +200,7 @@ subroutine dtb_gather_lo_on_rank0
 
    end subroutine dtb_gather_lo_on_rank0
 !----------------------------------------------------------------------------
-   subroutine  get_dtBLM(nR,vr,vt,vp,br,bt,bp,BtVrLM,BpVrLM,BrVtLM,BrVpLM, &
-               &         BtVpLM,BpVtLM,BrVZLM,BtVZLM,BpVtBtVpCotLM,        &
-               &         BpVtBtVpSn2LM,BtVZsn2LM)
+   subroutine  get_dtBLM(nR,vr,vt,vp,br,bt,bp)
       !
       !  This subroutine calculates non-linear products in grid-space for radial
       !  level nR.
@@ -189,15 +211,6 @@ subroutine  get_dtBLM(nR,vr,vt,vp,br,bt,bp,BtVrLM,BpVrLM,BrVtLM,BrVpLM, &
       real(cp), intent(in) :: vr(:,:),vt(:,:),vp(:,:)
       real(cp), intent(in) :: br(:,:),bt(:,:),bp(:,:)
 
-      !-- Output variables:
-      complex(cp), intent(out) :: BtVrLM(:),BpVrLM(:)
-      complex(cp), intent(out) :: BrVtLM(:),BrVpLM(:)
-      complex(cp), intent(out) :: BtVpLM(:),BpVtLM(:)
-      complex(cp), intent(out) :: BrVZLM(:),BtVZLM(:)
-      complex(cp), intent(out) :: BpVtBtVpCotLM(:)
-      complex(cp), intent(out) :: BpVtBtVpSn2LM(:)
-      complex(cp), intent(out) :: BtVZsn2LM(:)
-
       !-- Local variables:
       integer :: n_theta,n_phi
       real(cp) :: fac,facCot
@@ -270,8 +283,7 @@ subroutine  get_dtBLM(nR,vr,vt,vp,br,bt,bp,BtVrLM,BpVrLM,BrVtLM,BrVpLM, &
 
    end subroutine get_dtBLM
 !-----------------------------------------------------------------------
-   subroutine get_dH_dtBLM(nR,BtVrLM,BpVrLM,BrVtLM,BrVpLM,BtVpLM,BpVtLM, &
-              &            BrVZLM,BtVZLM,BpVtBtVpCotLM,BpVtBtVpSn2LM)
+   subroutine get_dH_dtBLM(nR)
       !
       !  Purpose of this routine is to calculate theta and phi
       !  derivative related terms of the magnetic production and
@@ -280,12 +292,6 @@ subroutine get_dH_dtBLM(nR,BtVrLM,BpVrLM,BrVtLM,BrVpLM,BtVpLM,BpVtLM, &
 
       !-- Input variables:
       integer,     intent(in) :: nR
-      complex(cp), intent(in) :: BtVrLM(*),BpVrLM(*)
-      complex(cp), intent(in) :: BrVtLM(*),BrVpLM(*)
-      complex(cp), intent(in) :: BtVpLM(*),BpVtLM(*)
-      complex(cp), intent(in) :: BpVtBtVpCotLM(*)
-      complex(cp), intent(in) :: BpVtBtVpSn2LM(*)
-      complex(cp), intent(in) :: BrVZLM(*),BtVZLM(*)
 
       !-- Local variables:
       integer :: l,m,lm,lmS,lmA

diff --git a/src/dtB_arrays.f90 b/src/dtB_arrays.f90
diff --git a/src/out_dtB_frame.f90 b/src/out_dtB_frame.f90
@@ -83,7 +83,6 @@ subroutine write_dtB_frame(n_movie,b,db,aj,dj,b_ic,db_ic,aj_ic,dj_ic)
       const       =movie_const(n_movie)
 
       !--- Axisymmetric dtFL or dtAB:
-
       if ( n_type == 31 .or. n_type == 32 .or. n_type == 33 .or. &
       &    n_type == 41 .or. n_type == 42 .or. n_type == 43 ) then
 
@@ -150,7 +149,7 @@ subroutine write_dtB_frame(n_movie,b,db,aj,dj,b_ic,db_ic,aj_ic,dj_ic)
 
          end do
 
-         !--- dtBr:
+      !--- dtBr:
       else ! non-axisymmetric fields
 
          do n_field=1,n_fields
@@ -184,7 +183,6 @@ subroutine write_dtB_frame(n_movie,b,db,aj,dj,b_ic,db_ic,aj_ic,dj_ic)
             end if
 
             !------ Outer core contribution:
-
             !------ Calculate needed radial derivatives:
             if ( n_field_type == 35 ) then
                call get_dr(PstrLM,workA,lm_max,1,lm_max, &