diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml
index 6800026f84d..4c611053896 100644
--- a/config/acme/machines/config_compilers.xml
+++ b/config/acme/machines/config_compilers.xml
@@ -521,7 +521,7 @@ for mct, etc.
USERDEFINED_MUST_EDIT_THIS
- # USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs)
+ # USERDEFINED $(shell $(NETCDF_PATH)/bin/nf-config --flibs)
@@ -628,7 +628,7 @@ for mct, etc.
$(NETCDF_PATH)
$(PNETCDF_PATH)
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs)
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs)
@@ -728,7 +728,7 @@ for mct, etc.
/usr/local/tools/mvapich2-pgi-1.7/
mpich
-DNO_SHR_VMATH -DCNL
- $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs)
+ $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nf-config --flibs)
-Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib -llapack -lblas
@@ -742,7 +742,7 @@ for mct, etc.
mpich
-DNO_SHR_VMATH -DCNL
-g -traceback -O0 -fpe0 -check all -check noarg_temp_created -ftrapuv
- $(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nc-config --flibs)
+ $(shell /usr/local/tools/netcdf-intel-4.1.3/bin/nf-config --flibs)
-llapack -lblas
@@ -984,7 +984,7 @@ for mct, etc.
mpi
mpi
mpich
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
-rpath $(NETCDFROOT)/lib
gpfs
@@ -996,7 +996,7 @@ for mct, etc.
/soft/mpich2/1.4.1-intel-13.1
mpi
mpich
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
gpfs
-mkl=cluster
-mkl=cluster
@@ -1012,7 +1012,7 @@ for mct, etc.
$(NETCDFROOT)
/soft/mvapich2/2.2b_psm/intel-15.0
mpi
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
-Wl,-rpath -Wl,$(NETCDFROOT)/lib
-mkl=cluster
-mkl=cluster
@@ -1029,7 +1029,7 @@ for mct, etc.
$(NETCDFROOT)
/blues/gpfs/home/software/spack/opt/spack/linux-x86_64/gcc-5.3.0/mvapich2-2.2b-sdh7nhddicl4sh5mgxjyzxtxox3ajqey
mpi
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
-DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY
gpfs
@@ -1039,24 +1039,24 @@ for mct, etc.
$(NETCDFROOT)
/home/robl/soft/mpich-3.1.4-nag-6.0
mpi
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
gpfs
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas -mkl
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas -mkl
-Wl,-rpath -Wl,$(NETCDF_PATH)/lib
gpfs
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
-DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC -DHAVE_GETTIMEOFDAY
gpfs
- $(shell $(NETCDF_PATH)/bin/nc-config --flibs) -llapack -lblas
+ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -llapack -lblas
-rpath $(NETCDF_PATH)/lib
gpfs
diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml
index 605cc7eaff8..58f8b8e74a5 100644
--- a/config/acme/machines/config_machines.xml
+++ b/config/acme/machines/config_machines.xml
@@ -1004,8 +1004,8 @@
- `which nc-config | xargs dirname | xargs dirname`
- `which pnetcdf_version | xargs dirname | xargs dirname`
+ $SHELL{which nf-config | xargs dirname | xargs dirname}
+ $SHELL{which pnetcdf_version | xargs dirname | xargs dirname}
256M