diff --git a/src/programs/ectrans-benchmark.F90 b/src/programs/ectrans-benchmark.F90 index 2e5232b9..35059838 100644 --- a/src/programs/ectrans-benchmark.F90 +++ b/src/programs/ectrans-benchmark.F90 @@ -147,7 +147,6 @@ program transform_test integer(kind=jpim) :: nmax_resol = 37 ! Max number of resolutions integer(kind=jpim) :: npromatr = 0 ! nproma for trans lib -integer(kind=jpim) :: ncombflen = 1800000 ! Size of comm buffer integer(kind=jpim) :: nproc ! Number of procs integer(kind=jpim) :: nthread @@ -379,7 +378,7 @@ program transform_test call gstats(1, 0) call setup_trans0(kout=nout, kerr=nerr, kprintlev=merge(2, 0, verbosity == 1), & & kmax_resol=nmax_resol, kpromatr=npromatr, kprgpns=nprgpns, kprgpew=nprgpew, & - & kprtrw=nprtrw, kcombflen=ncombflen, ldsync_trans=lsync_trans, & + & kprtrw=nprtrw, ldsync_trans=lsync_trans, & & ldeq_regions=leq_regions, prad=zra, ldalloperm=.true., ldmpoff=.not.luse_mpi) call gstats(1, 1) diff --git a/src/trans/external/setup_trans0.F90 b/src/trans/external/setup_trans0.F90 index 8f63af35..60779f54 100644 --- a/src/trans/external/setup_trans0.F90 +++ b/src/trans/external/setup_trans0.F90 @@ -9,7 +9,7 @@ ! SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& -& KPRGPNS,KPRGPEW,KPRTRW,KCOMBFLEN,& +& KPRGPNS,KPRGPEW,KPRTRW,& & LDMPOFF,LDSYNC_TRANS,KTRANS_SYNC_LEVEL,& & LDEQ_REGIONS,K_REGIONS_NS,K_REGIONS_EW,K_REGIONS,& & PRAD,LDALLOPERM,KOPT_MEMORY_TR) @@ -34,7 +34,6 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& ! KPRGPNS - splitting level in N-S direction in grid-point space [1] ! KPRGPEW - splitting level in E-W direction in grid-point space [1] ! KPRTRW - splitting level in wave direction in spectral space [1] -! KCOMBFLEN - Size of communication buffer [1800000 (*8bytes) ] ! LDMPOFF - switch off message passing [false] ! LDSYNC_TRANS - switch to activate barriers in trmtol trltom [false] ! KTRANS_SYNC_LEVEL - use of synchronization/blocking [0] @@ -74,7 +73,7 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& USE TPM_GEN ,ONLY : NERR, NOUT, LMPOFF, LSYNC_TRANS, NTRANS_SYNC_LEVEL, MSETUP0, & & NMAX_RESOL, NPRINTLEV, NPROMATR, LALLOPERM, NSTACK_MEMORY_TR -USE TPM_DISTR ,ONLY : LEQ_REGIONS, NCOMBFLEN, NPRGPEW,NPRGPNS, NPRTRW +USE TPM_DISTR ,ONLY : LEQ_REGIONS, NPRGPEW,NPRGPNS, NPRTRW USE TPM_CONSTANTS ,ONLY : RA USE SUMP_TRANS0_MOD ,ONLY : SUMP_TRANS0 @@ -87,7 +86,7 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& IMPLICIT NONE INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR -INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KPRGPNS,KPRGPEW,KPRTRW,KCOMBFLEN +INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KPRGPNS,KPRGPEW,KPRTRW LOGICAL ,OPTIONAL,INTENT(IN) :: LDMPOFF LOGICAL ,OPTIONAL,INTENT(IN) :: LDSYNC_TRANS INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KTRANS_SYNC_LEVEL @@ -121,7 +120,6 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& N_REGIONS_NS=1 N_REGIONS_EW=1 NPROMATR = 0 -NCOMBFLEN = 1800000 LMPOFF = .FALSE. LSYNC_TRANS=.FALSE. NTRANS_SYNC_LEVEL=0 @@ -170,9 +168,6 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& IF(PRESENT(KPRTRW)) THEN NPRTRW = KPRTRW ENDIF -IF(PRESENT(KCOMBFLEN)) THEN - NCOMBFLEN = KCOMBFLEN -ENDIF IF(PRESENT(LDMPOFF)) THEN LMPOFF = LDMPOFF ENDIF diff --git a/src/trans/include/ectrans/setup_trans0.h b/src/trans/include/ectrans/setup_trans0.h index d47d103f..80f4f3a7 100644 --- a/src/trans/include/ectrans/setup_trans0.h +++ b/src/trans/include/ectrans/setup_trans0.h @@ -10,7 +10,7 @@ INTERFACE SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& -& KPRGPNS,KPRGPEW,KPRTRW,KCOMBFLEN,& +& KPRGPNS,KPRGPEW,KPRTRW,& & LDMPOFF,LDSYNC_TRANS,KTRANS_SYNC_LEVEL,& & LDEQ_REGIONS,K_REGIONS_NS,K_REGIONS_EW,K_REGIONS,& & PRAD,LDALLOPERM,KOPT_MEMORY_TR) @@ -35,7 +35,6 @@ SUBROUTINE SETUP_TRANS0(KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR,& ! KPRGPNS - splitting level in N-S direction in grid-point space [1] ! KPRGPEW - splitting level in E-W direction in grid-point space [1] ! KPRTRW - splitting level in wave direction in spectral space [1] -! KCOMBFLEN - Size of communication buffer [1800000 (*8bytes) ] ! LDMPOFF - switch off message passing [false] ! LDSYNC_TRANS - switch to activate barrier before transforms [false] ! KTRANS_SYNC_LEVEL - use of synchronization/blocking [0] @@ -74,7 +73,7 @@ USE EC_PARKIND ,ONLY : JPIM ,JPRD IMPLICIT NONE INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KOUT,KERR,KPRINTLEV,KMAX_RESOL,KPROMATR -INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KPRGPNS,KPRGPEW,KPRTRW,KCOMBFLEN +INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KPRGPNS,KPRGPEW,KPRTRW LOGICAL ,OPTIONAL,INTENT(IN) :: LDMPOFF LOGICAL ,OPTIONAL,INTENT(IN) :: LDSYNC_TRANS INTEGER(KIND=JPIM) ,OPTIONAL,INTENT(IN) :: KTRANS_SYNC_LEVEL diff --git a/src/trans/internal/tpm_distr.F90 b/src/trans/internal/tpm_distr.F90 index 8ada1a93..ce0064f6 100644 --- a/src/trans/internal/tpm_distr.F90 +++ b/src/trans/internal/tpm_distr.F90 @@ -32,7 +32,6 @@ MODULE TPM_DISTR INTEGER(KIND=JPIM) :: MYPROC ! My processor number INTEGER(KIND=JPIM) :: MYSETW ! My set number in wave direction (spectral space) INTEGER(KIND=JPIM) :: MYSETV ! My set number in field direction(S.S and F.S) -INTEGER(KIND=JPIM) :: NCOMBFLEN ! Size of communication buffer INTEGER(KIND=JPIM) :: MTAGLETR ! Tag INTEGER(KIND=JPIM) :: MTAGML ! Tag