Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Gnu compilation on Hera #965

Merged
merged 10 commits into from
Jul 15, 2024
Merged

Fix Gnu compilation on Hera #965

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
074502c
Update to build with spack v1.7 gnu on Hera.
GeorgeGayno-NOAA Jun 14, 2024
1f205e5
Merge branch 'develop' into v1.7_spack_hera
GeorgeGayno-NOAA Jun 14, 2024
c5749e0
Merge branch 'develop' into v1.7_spack_hera
GeorgeGayno-NOAA Jun 18, 2024
bd4f523
Point to a corrected version of spack stack 1.6.0.
GeorgeGayno-NOAA Jun 18, 2024
02ea4ed
Update cpld_gridgen namelist template so it can be read
GeorgeGayno-NOAA Jun 18, 2024
ee52ee5
Update global_cycle namelist logic so it works with
GeorgeGayno-NOAA Jun 18, 2024
ad8c76f
Minor update to chgres_cube to eliminate a warning when
GeorgeGayno-NOAA Jun 21, 2024
05b6fc2
Merge branch 'develop' into v1.7_spack_hera
GeorgeGayno-NOAA Jun 26, 2024
4dca77a
Remove some unnecessary module loads.
GeorgeGayno-NOAA Jul 3, 2024
b53afbf
Merge branch 'develop' into v1.7_spack_hera
GeorgeGayno-NOAA Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions modulefiles/build.hera.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ Load environment to compile UFS_UTILS on Hera using Gnu
hpss_ver=os.getenv("hpss_ver") or ""
load(pathJoin("hpss", hpss_ver))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8-ompi416/install/modulefiles/Core")

stack_gcc_ver=os.getenv("stack_gcc_ver") or "9.2"
load(pathJoin("stack-gcc", gnu_ver))

stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6"
load(pathJoin("stack-openmpi", stack_openmpi_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
Expand Down Expand Up @@ -41,7 +41,7 @@ load(pathJoin("w3emc", w3emc_ver))
sigio_ver=os.getenv("sigio_ver") or "2.3.2"
load(pathJoin("sigio", sigio_ver))

hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
hdf5_ver=os.getenv("hdf5_ver") or "1.14.3_gnu9.2.0"
GeorgeGayno-NOAA marked this conversation as resolved.
Show resolved Hide resolved
load(pathJoin("hdf5", hdf5_ver))

netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2"
Expand All @@ -50,13 +50,13 @@ load(pathJoin("netcdf-c", netcdf_c_ver))
netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1"
load(pathJoin("netcdf-fortran", netcdf_fortran_ver))

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
nccmp_ver=os.getenv("nccmp_ver") or "1.9.1"
load(pathJoin("nccmp", nccmp_ver))

esmf_ver=os.getenv("esmf_ver") or "8.6.0"
esmf_ver=os.getenv("esmf_ver") or "8.5.0"
load(pathJoin("esmf", esmf_ver))

nco_ver=os.getenv("nco_ver") or "5.0.6"
nco_ver=os.getenv("nco_ver") or "5.1.6"
load(pathJoin("nco", nco_ver))

whatis("Description: UFS_UTILS build environment")
2 changes: 1 addition & 1 deletion reg_tests/cpld_gridgen/parm/grid.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
& grid_nml
&grid_nml
ni=NI_GLB
nj=NJ_GLB
dirsrc='FIXDIR'
Expand Down
2 changes: 1 addition & 1 deletion sorc/chgres_cube.fd/program_setup.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ subroutine read_setup_namelist(filename)
print*,'- INPUT DATA FROM SPECTRAL GFS GAUSSIAN NEMSIO FILE.'
case ("gfs_sigio")
print*,'- INPUT DATA FROM SPECTRAL GFS SIGIO/SFCIO FILE.'
#endif()
#endif
case ("gaussian_netcdf")
print*,'- INPUT DATA FROM FV3 GAUSSIAN NETCDF FILE.'
case ("grib2")
Expand Down
20 changes: 18 additions & 2 deletions sorc/global_cycle.fd/cycle.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,15 @@ PROGRAM SFC_DRV
PRINT*,"READ NAMCYC NAMELIST."

CALL BAOPENR(36, "fort.36", IERR)
READ(36, NML=NAMCYC)
IF (IERR /= 0) THEN
PRINT*,'FATAL ERROR READING FORT.36 NAMELIST. IERR: ', IERR
CALL MPI_ABORT(MPI_COMM_WORLD, 32, IERR)
ENDIF
READ(36, NML=NAMCYC, IOSTAT=IERR)
IF (IERR /= 0) THEN
PRINT*,'FATAL ERROR READING FORT.36 NAMELIST. IERR: ', IERR
CALL MPI_ABORT(MPI_COMM_WORLD, 33, IERR)
ENDIF
!IF (MYRANK==0) WRITE(6,NAMCYC)

IF (MAX_TASKS < 99999 .AND. MYRANK > (MAX_TASKS - 1)) THEN
Expand Down Expand Up @@ -412,7 +420,15 @@ SUBROUTINE SFCDRV(LUGB, IDIM,JDIM,LENSFC,LSOIL,DELTSFC, &
INPUT_NML_FILE = "NULL"

CALL BAOPENR(37, "fort.37", IERR)
READ (37, NML=NAMSFCD)
IF (IERR /= 0) THEN
PRINT*,'FATAL ERROR OPENING FORT.37 NAMELIST. IERR: ', IERR
CALL MPI_ABORT(MPI_COMM_WORLD, 30, IERR)
ENDIF
READ (37, NML=NAMSFCD, IOSTAT=IERR)
IF (IERR /= 0) THEN
PRINT*,'FATAL ERROR READING FORT.37 NAMELIST. IERR: ', IERR
CALL MPI_ABORT(MPI_COMM_WORLD, 31, IERR)
ENDIF

PRINT*
PRINT*,'IN ROUTINE SFCDRV,IDIM=',IDIM,'JDIM=',JDIM,'FH=',FH
Expand Down
2 changes: 1 addition & 1 deletion ush/global_cycle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ cat << EOF > fort.36
&NAMCYC
idim=$CRES, jdim=$CRES, lsoil=$LSOIL,
iy=$iy, im=$im, id=$id, ih=$ih, fh=$FHOUR,
deltsfc=$DELTSFC,ialb=$IALB,use_ufo=$use_ufo,donst=$DONST,
deltsfc=$DELTSFC,ialb=$IALB,use_ufo=$use_ufo,donst="$DONST",
do_sfccycle=$DO_SFCCYCLE,do_lndinc=$DO_LNDINC,isot=$ISOT,ivegsrc=$IVEGSRC,
zsea1_mm=$zsea1,zsea2_mm=$zsea2,MAX_TASKS=$MAX_TASKS_CY,
frac_grid=$FRAC_GRID
Expand Down
Loading