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

Add NAG to Blues #346

Merged
merged 4 commits into from
Oct 28, 2015
+46 −4
Merged

Add NAG to Blues #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a29a408
Add NAG to Blues
rljacob Oct 6, 2015
a8608dc
Change NAG compiler settings for Blues
rljacob Oct 20, 2015
c7c2ae8
Workaround for serial netcdf for pgi,nag on blues
rljacob Oct 20, 2015
760ef66
Make pgi the default compiler on blues
rljacob Oct 21, 2015
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
11 changes: 10 additions & 1 deletion cime/machines-acme/config_compilers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ for mct, etc.
<!-- interfaces from certain argument checks. Should not be necessary in -->
<!-- libraries that only use the F90 module interface. mpibcast and -->
<!-- mpiscatterv are actually CAM wrappers for MPI. -->
<FFLAGS > -kind=byte -wmismatch=mpi_send,mpi_recv,mpi_bcast,mpi_allreduce,mpi_reduce,mpi_isend,mpi_irecv,mpi_irsend,mpi_rsend,mpi_gatherv,mpi_gather,mpi_scatterv,mpi_allgather,mpi_alltoallv,mpi_file_read_all,mpi_file_write_all,mpibcast,mpiscatterv,mpi_alltoallw,nfmpi_get_vara_all,NFMPI_IPUT_VARA,NFMPI_GET_VAR_ALL,NFMPI_PUT_VARA,NFMPI_PUT_ATT_REAL,NFMPI_PUT_ATT_DOUBLE,NFMPI_PUT_ATT_INT,NFMPI_GET_ATT_REAL,NFMPI_GET_ATT_INT,NFMPI_GET_ATT_DOUBLE,NFMPI_PUT_VARA_DOUBLE_ALL,NFMPI_PUT_VARA_REAL_ALL,NFMPI_PUT_VARA_INT_ALL -convert=BIG_ENDIAN </FFLAGS>
<FFLAGS > -wmismatch=mpi_send,mpi_recv,mpi_bcast,mpi_allreduce,mpi_reduce,mpi_isend,mpi_irecv,mpi_irsend,mpi_rsend,mpi_gatherv,mpi_gather,mpi_scatterv,mpi_allgather,mpi_alltoallv,mpi_file_read_all,mpi_file_write_all,mpibcast,mpiscatterv,mpi_alltoallw,nfmpi_get_vara_all,NFMPI_IPUT_VARA,NFMPI_GET_VAR_ALL,NFMPI_PUT_VARA,NFMPI_PUT_ATT_REAL,NFMPI_PUT_ATT_DOUBLE,NFMPI_PUT_ATT_INT,NFMPI_GET_ATT_REAL,NFMPI_GET_ATT_INT,NFMPI_GET_ATT_DOUBLE,NFMPI_PUT_VARA_DOUBLE_ALL,NFMPI_PUT_VARA_REAL_ALL,NFMPI_PUT_VARA_INT_ALL -convert=BIG_ENDIAN </FFLAGS>
<FFLAGS_NOOPT> $(FFLAGS) </FFLAGS_NOOPT>

<!-- DEBUG vs. non-DEBUG runs. -->
Expand Down Expand Up @@ -905,6 +905,15 @@ for mct, etc.
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>

<compiler COMPILER="nag" MACH="blues">
<PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
<NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
<MPI_PATH MPILIB="mpich">/home/robl/soft/mpich-3.1.4-nag-6.0</MPI_PATH>
<MPI_LIB_NAME MPILIB="mpich"> mpi </MPI_LIB_NAME>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>

<compiler COMPILER="pgi" MACH="eastwind">
<ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
<ADD_FFLAGS DEBUG="FALSE"> -O2 </ADD_FFLAGS>
Expand Down
2 changes: 1 addition & 1 deletion cime/machines-acme/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@

<machine MACH="blues">
<DESC>ANL/LCRC Linux Cluster</DESC>
<COMPILERS>intel,gnu,pgi</COMPILERS>
<COMPILERS>pgi,intel,gnu,nag</COMPILERS>
<MPILIBS>mpich,openmpi,mpi-serial</MPILIBS>
<CESMSCRATCHROOT>/lcrc/project/$PROJECT/$CCSMUSER/acme_scratch</CESMSCRATCHROOT>
<RUNDIR>$CESMSCRATCHROOT/$CASE/run</RUNDIR>
Expand Down
37 changes: 35 additions & 2 deletions cime/machines-acme/env_mach_specific.blues
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,13 @@ endif

if ( $COMPILER == "pgi" ) then
soft add +pgi-13.9
soft add +netcdf-4.3.1-serial-pgi
setenv NETCDFROOT /soft/netcdf/4.3.1-serial/pgi-13.9
# soft add +netcdf-4.3.1-serial-pgi
setenv NETCDFROOT /home/jacob/netcdf-4.3.3.1pg13.9
# Get newer netcdf
setenv PATH $NETCDFROOT/bin:$PATH
setenv LD_LIBRARY_PATH $NETCDFROOT/lib:$LD_LIBRARY_PATH
setenv NETCDF_INCLUDES $NETCDFROOT/include
setenv NETCDF_LIBS $NETCDFROOT/lib
if ( $MPILIB == "mpi-serial") then
setenv PNETCDFROOT ""
else if ( $MPILIB == "openmpi") then
Expand Down Expand Up @@ -81,6 +86,34 @@ if ( $COMPILER == "gnu" ) then
setenv PNETCDFROOT /soft/pnetcdf/1.5.0/gcc-4.7.2/mpich2-1.4.1
endif
endif

if ( $COMPILER == "nag" ) then
soft add +nag-6.0
soft add +gcc-4.7.2
# soft add +netcdf-4.3.1-serial-nag
setenv NETCDFROOT /home/jacob/netcdf-4.3.3.1nag6
# Get newer netcdf
setenv PATH $NETCDFROOT/bin:$PATH
setenv LD_LIBRARY_PATH $NETCDFROOT/lib:$LD_LIBRARY_PATH
setenv NETCDF_INCLUDES $NETCDFROOT/include
setenv NETCDF_LIBS $NETCDFROOT/lib
if ( $MPILIB == "openmpi") then
echo "ERROR: OpenMPI+pnetcdf is currently not supported with nag compilers"
exit 1
endif
if ( $MPILIB == "mpi-serial") then
setenv PNETCDFROOT ""
else if ( $MPILIB == "mpich") then
soft add +mpich3-3.1.4-nag-6.0
soft add +pnetcdf-1.6.1-mpich-3.1.4-nag-6.0
setenv PNETCDFROOT /home/robl/soft/pnetcf-trunk-mpich-3.1.4-nag-6.0
else
# default - mpich + pnetcdf
soft add +mpich3-3.1.4-nag-6.0
soft add +pnetcdf-1.6.1-mpich-3.1.4-nag-6.0
setenv PNETCDFROOT /home/robl/soft/pnetcf-trunk-mpich-3.1.4-nag-6.0
endif
endif
if ( $?PERL ) then
printenv
endif