Skip to content

Commit

Permalink
Merge 'origin/jgfouca/cime/use_nf_config_instead_of_nc_config' into m…
Browse files Browse the repository at this point in the history 
…aster (PR #1494)

Use nf-config instead of nc-config to get fortran netcdf libs

More robust way to do it.

Fixes #1493

[BFB]

* origin/jgfouca/cime/use_nf_config_instead_of_nc_config:
  Use nf-config instead of nc-config to get fortran netcdf libs
  • Loading branch information
@jgfouca
jgfouca committed May 8, 2017
2 parents 723104f + 910dc01 commit a9ff84d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions config/acme/machines/config_compilers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ for mct, etc.
<compiler MACH="userdefined">
<NETCDF_PATH> USERDEFINED_MUST_EDIT_THIS</NETCDF_PATH>
<PNETCDF_PATH></PNETCDF_PATH>
<ADD_SLIBS># USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs)</ADD_SLIBS>
<ADD_SLIBS># USERDEFINED $(shell $(NETCDF_PATH)/bin/nf-config --flibs)</ADD_SLIBS>
<ADD_CPPDEFS></ADD_CPPDEFS>
<CONFIG_ARGS></CONFIG_ARGS>
<ESMF_LIBDIR></ESMF_LIBDIR>
Expand Down Expand Up @@ -628,7 +628,7 @@ for mct, etc.
<compiler COMPILER="gnu" MACH="linux-generic">
<NETCDF_PATH> $(NETCDF_PATH)</NETCDF_PATH>
<PNETCDF_PATH> $(PNETCDF_PATH)</PNETCDF_PATH>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nc-config --flibs) </ADD_SLIBS>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) </ADD_SLIBS>
</compiler>

<compiler COMPILER="gnu" MACH="melvin">
Expand Down Expand Up @@ -728,7 +728,7 @@ for mct, etc.
<MPI_PATH>/usr/local/tools/mvapich2-pgi-1.7/</MPI_PATH>
<MPI_LIB_NAME> mpich</MPI_LIB_NAME>
<ADD_CPPDEFS> -DNO_SHR_VMATH -DCNL </ADD_CPPDEFS>
<ADD_SLIBS>$(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
<ADD_SLIBS>$(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nf-config --flibs)</ADD_SLIBS>
<ADD_LDFLAGS> -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib -llapack -lblas</ADD_LDFLAGS>
</compiler>

Expand All @@ -742,7 +742,7 @@ for mct, etc.
<MPI_LIB_NAME> mpich</MPI_LIB_NAME>
<ADD_CPPDEFS> -DNO_SHR_VMATH -DCNL </ADD_CPPDEFS>
<ADD_FFLAGS DEBUG="TRUE"> -g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv </ADD_FFLAGS>
<ADD_SLIBS>$(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nc-config --flibs)</ADD_SLIBS>
<ADD_SLIBS>$(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nf-config --flibs)</ADD_SLIBS>
<ADD_LDFLAGS> -llapack -lblas</ADD_LDFLAGS>
</compiler>
<compiler>
Expand Down Expand Up @@ -984,7 +984,7 @@ for mct, etc.
<MPI_LIB_NAME MPILIB="mvapich"> mpi</MPI_LIB_NAME>
<MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
<MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS> -rpath $(NETCDFROOT)/lib </ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>
Expand All @@ -996,7 +996,7 @@ for mct, etc.
<MPI_PATH MPILIB="mpich">/soft/mpich2/1.4.1-intel-13.1</MPI_PATH>
<MPI_LIB_NAME MPILIB="openmpi"> mpi</MPI_LIB_NAME>
<MPI_LIB_NAME MPILIB="mpich">mpich</MPI_LIB_NAME>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
Expand All @@ -1012,7 +1012,7 @@ for mct, etc.
<NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
<MPI_PATH MPILIB="mvapich">/soft/mvapich2/2.2b_psm/intel-15.0</MPI_PATH>
<MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas </ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas </ADD_SLIBS>
<ADD_SLIBS> -Wl,-rpath -Wl,$(NETCDFROOT)/lib </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
Expand All @@ -1029,7 +1029,7 @@ for mct, etc.
<NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
<MPI_PATH MPILIB="mvapich">/blues/gpfs/home/software/spack/opt/spack/linux-x86_64/gcc-5.3.0/mvapich2-2.2b-sdh7nhddicl4sh5mgxjyzxtxox3ajqey</MPI_PATH>
<MPI_LIB_NAME MPILIB="mvapich">mpi</MPI_LIB_NAME>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY</GPTL_CPPDEFS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>
Expand All @@ -1039,24 +1039,24 @@ for mct, etc.
<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>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>

<compiler COMPILER="intel" MACH="anvil">
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas -mkl </ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas -mkl </ADD_SLIBS>
<ADD_SLIBS> -Wl,-rpath -Wl,$(NETCDF_PATH)/lib </ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>

<compiler COMPILER="gnu" MACH="anvil">
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<GPTL_CPPDEFS> -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY</GPTL_CPPDEFS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>

<compiler COMPILER="pgi" MACH="anvil">
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS>$(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas</ADD_SLIBS>
<ADD_SLIBS> -rpath $(NETCDF_PATH)/lib </ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>gpfs </PIO_FILESYSTEM_HINTS>
</compiler>
Expand Down
4 changes: 2 additions & 2 deletions config/acme/machines/config_machines.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,8 @@
</modules>
</module_system>
<environment_variables>
<env name="NETCDF_PATH">`which nc-config | xargs dirname | xargs dirname`</env>
<env name="PNETCDF_PATH" mpilib="!mpi-serial">`which pnetcdf_version | xargs dirname | xargs dirname`</env>
<env name="NETCDF_PATH">$SHELL{which nf-config | xargs dirname | xargs dirname}</env>
<env name="PNETCDF_PATH" mpilib="!mpi-serial">$SHELL{which pnetcdf_version | xargs dirname | xargs dirname}</env>
</environment_variables>
<environment_variables>
<env name="OMP_STACKSIZE">256M</env>
Expand Down

0 comments on commit a9ff84d

Please sign in to comment.