Skip to content

Commit

Permalink
Update Perlmutter Port, switch to cce/17.0.0, gnu/12.3, and intel/202…
Browse files Browse the repository at this point in the history
…3.2.0

Update icepack_compute_tracers argument definitions to support cce/17.0.0.
Switched two arguments from explicit size to assumed shape.

Cleaned up some trailing blanks.
  • Loading branch information
apcraig committed Nov 26, 2024
1 parent 3792520 commit c66fb1c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion columnphysics/icepack_fsd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ subroutine icepack_init_fsd_bounds( &
floe_area_c (nfsd), & ! fsd area at bin centre (m^2)
floe_area_binwidth (nfsd), & ! floe area bin width (m^2)
floe_binwidth (nfsd), & ! floe bin width (m)
c_fsd_range (nfsd), & !
c_fsd_range (nfsd), & !
iweld (nfsd, nfsd), & ! fsd categories that can weld
stat=ierr)
if (ierr/=0) then
Expand Down
4 changes: 2 additions & 2 deletions columnphysics/icepack_tracers.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ subroutine icepack_compute_tracers (trcr_depend, &
trcr_base, n_trcr_strata, &
nt_strata, trcrn, Tf)

integer (kind=int_kind), dimension (ntrcr), intent(in) :: &
integer (kind=int_kind), dimension (:), intent(in) :: &
trcr_depend, & ! = 0 for aicen tracers, 1 for vicen, 2 for vsnon
n_trcr_strata ! number of underlying tracer layers

Expand All @@ -1222,7 +1222,7 @@ subroutine icepack_compute_tracers (trcr_depend, &
vicen , & ! volume per unit area of ice (m)
vsnon ! volume per unit area of snow (m)

real (kind=dbl_kind), dimension (ntrcr), intent(out) :: &
real (kind=dbl_kind), dimension (:), intent(out) :: &
trcrn ! ice tracers

real (kind=dbl_kind), intent(in) :: &
Expand Down
10 changes: 5 additions & 5 deletions configuration/scripts/machines/env.perlmutter_cray
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ source ${MODULESHOME}/init/csh
#module load cpe/23.03
#module unload gpu
module load cpu
module load PrgEnv-cray
module load PrgEnv-cray/8.5.0
module unload cce
module load cce/15.0.1
module load cce/17.0.0
module unload cray-netcdf
module unload cray-hdf5
module load cray-hdf5/1.12.2.3
module load cray-netcdf/4.9.0.3
module load cray-hdf5/1.12.2.9
module load cray-netcdf/4.9.0.9
#module unload cray-pals
#module load cray-pals/1.2.2

Expand All @@ -37,7 +37,7 @@ setenv PALS_QUIET TRUE
setenv ICE_MACHINE_MACHNAME perlmutter
setenv ICE_MACHINE_MACHINFO "HPE Cray EX AMD EPYC 7763 Milan, Slingshot-11 Interconnect"
setenv ICE_MACHINE_ENVNAME cray
setenv ICE_MACHINE_ENVINFO "Cray clang/Fortran 15.0.1, netcdf4.9.0.3"
setenv ICE_MACHINE_ENVINFO "Cray clang/Fortran 17.0.0, netcdf4.9.0.9"
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR $SCRATCH/ICEPACK_RUNS
setenv ICE_MACHINE_INPUTDATA /global/cfs/cdirs/e3sm/tcraig/cice-consortium
Expand Down
8 changes: 4 additions & 4 deletions configuration/scripts/machines/env.perlmutter_gnu
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ source ${MODULESHOME}/init/csh
#module load cpe/23.03
#module unload gpu
module load cpu
module load PrgEnv-gnu
module load PrgEnv-gnu/8.5.0
module unload gcc
module load gcc/11.2.0
module load gcc-native/12.3
module unload cray-netcdf
module unload cray-hdf5
module load cray-hdf5/1.12.2.3
module load cray-netcdf/4.9.0.3
module load cray-hdf5/1.12.2.9
module load cray-netcdf/4.9.0.9
#module unload cray-pals
#module load cray-pals/1.2.2

Expand Down
10 changes: 5 additions & 5 deletions configuration/scripts/machines/env.perlmutter_intel
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ source ${MODULESHOME}/init/csh
#module load cpe/23.03
#module unload gpu
module load cpu
module load PrgEnv-intel
module load PrgEnv-intel/8.5.0
module unload intel
module load intel/2023.1.0
module load intel/2023.2.0
module unload cray-netcdf
module unload cray-hdf5
module load cray-hdf5/1.12.2.3
module load cray-netcdf/4.9.0.3
module load cray-hdf5/1.12.2.9
module load cray-netcdf/4.9.0.9
#module unload cray-pals
#module load cray-pals/1.2.2

Expand All @@ -37,7 +37,7 @@ setenv PALS_QUIET TRUE
setenv ICE_MACHINE_MACHNAME perlmutter
setenv ICE_MACHINE_MACHINFO "HPE Cray EX AMD EPYC 7763 Milan, Slingshot-11 Interconnect"
setenv ICE_MACHINE_ENVNAME intel
setenv ICE_MACHINE_ENVINFO "ifort 2021.9.0 20230302, netcdf4.9.0.3"
setenv ICE_MACHINE_ENVINFO "ifort 2021.10.0 20230609, netcdf4.9.0.9"
setenv ICE_MACHINE_MAKE gmake
setenv ICE_MACHINE_WKDIR $SCRATCH/ICEPACK_RUNS
setenv ICE_MACHINE_INPUTDATA /global/cfs/cdirs/e3sm/tcraig/cice-consortium
Expand Down

0 comments on commit c66fb1c

Please sign in to comment.