Merge branch 'jgfouca/cime/fix_homme_on_edison' into master (PR #1363)

Fix HOMME builds on NERSC machines Need to set PNETCDF and MKLROOT in homme machine cmake files. Fixes #1269 [BFB] * jgfouca/cime/fix_homme_on_edison: Fix HOMME builds on NERSC machines
E3SM-Project · Apr 4, 2017 · f5f6cde · f5f6cde
2 parents 9efd0e6 + 36b0e93
commit f5f6cde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/components/homme/cmake/machineFiles/cori-haswell.cmake b/components/homme/cmake/machineFiles/cori-haswell.cmake
@@ -8,8 +8,11 @@ SET (CMAKE_C_COMPILER cc CACHE FILEPATH "")
 SET (CMAKE_CXX_COMPILER CC CACHE FILEPATH "")
 
 SET (NETCDF_DIR $ENV{NETCDF_DIR} CACHE FILEPATH "")
+SET (PNETCDF_DIR $ENV{PARALLEL_NETCDF_DIR} CACHE FILEPATH "")
 SET (HDF5_DIR $ENV{HDF5_DIR} CACHE FILEPATH "")
 
+SET (MKLROOT $ENV{MKLROOT} CACHE FILEPATH "")
+
 #ZLIB_DIR=/global/common/cori/software/zlib/1.2.8/hsw/intel
 SET (ZLIB_DIR $ENV{ZLIB_DIR} CACHE FILEPATH "")
 SET (ZLIB_LIBRARY ${ZLIB_DIR}/lib/libz.a CACHE FILEPATH "")

diff --git a/components/homme/cmake/machineFiles/cori-knl.cmake b/components/homme/cmake/machineFiles/cori-knl.cmake
@@ -8,8 +8,11 @@ SET (CMAKE_C_COMPILER cc CACHE FILEPATH "")
 SET (CMAKE_CXX_COMPILER CC CACHE FILEPATH "")
 
 SET (NETCDF_DIR $ENV{NETCDF_DIR} CACHE FILEPATH "")
+SET (PNETCDF_DIR $ENV{PARALLEL_NETCDF_DIR} CACHE FILEPATH "")
 SET (HDF5_DIR $ENV{HDF5_DIR} CACHE FILEPATH "")
 
+SET (MKLROOT $ENV{MKLROOT} CACHE FILEPATH "")
+
 #ZLIB_DIR=/global/common/cori/software/zlib/1.2.8/hsw/intel
 SET (ZLIB_DIR $ENV{ZLIB_DIR} CACHE FILEPATH "")
 SET (ZLIB_LIBRARY ${ZLIB_DIR}/lib/libz.a CACHE FILEPATH "")

diff --git a/components/homme/cmake/machineFiles/edison.cmake b/components/homme/cmake/machineFiles/edison.cmake
@@ -7,12 +7,12 @@ SET (CMAKE_Fortran_COMPILER ftn CACHE FILEPATH "")
 SET (CMAKE_C_COMPILER cc CACHE FILEPATH "")
 SET (CMAKE_CXX_COMPILER CC CACHE FILEPATH "")
 SET (NETCDF_DIR $ENV{NETCDF_DIR} CACHE FILEPATH "")
-SET (HDF5_DIR $ENV{HDF5_DIR} CACHE FILEPATH "")
-#ndk SET (PNETCDF_DIR $ENV{PARALLEL_NETCDF_DIR} CACHE FILEPATH "")
-# this env var is not set with module cray-netcdf-hdf5parallel/4.3.3.1
+SET (PNETCDF_DIR $ENV{PARALLEL_NETCDF_DIR} CACHE FILEPATH "")
 
 SET (HDF5_DIR $ENV{HDF5_DIR} CACHE FILEPATH "")
 
+SET (MKLROOT $ENV{MKLROOT} CACHE FILEPATH "")
+
 SET (CMAKE_SYSTEM_NAME Catamount CACHE FILEPATH "")
 
 SET (USE_QUEUING FALSE CACHE BOOL "")