diff --git a/components/homme/cmake/machineFiles/cori-haswell.cmake b/components/homme/cmake/machineFiles/cori-haswell.cmake index a9aa03490dad..a9c679d4401d 100644 --- 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 index 45de24bedd9c..c91d2b0e62dd 100644 --- 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 index d0e18f39958f..45a3fd1140db 100644 --- 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 "")