From 1760b11dfbdd320917c68acd43cf889595e31f60 Mon Sep 17 00:00:00 2001 From: David Minton Date: Tue, 13 Feb 2024 12:41:27 -0500 Subject: [PATCH] Updated all of the build scripts and tools to work with Negishi --- buildscripts/_build_getopts.sh | 24 ++++++++++++++---- buildscripts/build_hdf5.sh | 13 +++++----- buildscripts/build_negishi.sh | 34 ++++++++++++++++++++++++++ buildscripts/build_netcdf-c.sh | 9 +++---- buildscripts/build_netcdf-fortran.sh | 5 ++-- buildscripts/build_shtools.sh | 21 ++++++++++++---- buildscripts/build_zlib.sh | 9 ++++--- buildscripts/get_platform.sh | 12 +++++++++ buildscripts/set_compilers.sh | 29 +++++++++++++--------- buildscripts/set_environment_linux.sh | 15 +++++++----- cmake/Modules/FindNETCDF_Fortran.cmake | 20 +++++++++------ cmake/Modules/SetCompileFlag.cmake | 17 ------------- cmake/Modules/SetSwiftestFlags.cmake | 6 ++--- environment.yml | 2 +- pyproject.toml | 6 ++--- src/globals/globals_module.f90 | 2 +- version.txt | 2 +- 17 files changed, 144 insertions(+), 82 deletions(-) create mode 100755 buildscripts/build_negishi.sh diff --git a/buildscripts/_build_getopts.sh b/buildscripts/_build_getopts.sh index 113f9e526..e98f2fb9a 100755 --- a/buildscripts/_build_getopts.sh +++ b/buildscripts/_build_getopts.sh @@ -53,8 +53,22 @@ BUILD_DIR=${BUILD_DIR:-"${HOME}/Downloads"} PREFIX=${PREFIX:-"/usr/local"} DEPENDENCY_DIR=${DEPENDENCY_DIR:-${BUILD_DIR}} -mkdir -p ${DEPENDENCY_DIR} -mkdir -p ${PREFIX}/lib -mkdir -p ${PREFIX}/include -mkdir -p ${PREFIX}/share -mkdir -p ${PREFIX}/bin \ No newline at end of file + +case $OS in + Linux-gnu|Linux-ifx|Linux-ifort) + . ${SCRIPT_DIR}/set_environment_linux.sh + ;; + MacOSX) + . ${SCRIPT_DIR}/set_environment_macos.sh + ;; + + *) + printf "Unknown compiler type: ${OS}\n" + echo "Valid options are Linux-gnu, Linux-ifort, Linux-ifx, or MacOSX" + printf $USTMT + exit 1 + ;; +esac + + +mkdir -p ${DEPENDENCY_DIR} \ No newline at end of file diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh index 3f93d036b..234011f69 100755 --- a/buildscripts/build_hdf5.sh +++ b/buildscripts/build_hdf5.sh @@ -11,8 +11,8 @@ # You should have received a copy of the GNU General Public License along with Swiftest. # If not, see: https://www.gnu.org/licenses. -HDF5_VER="1_14_2" -ZLIB_VER="1.3" +HDF5_VER="1_14_3" +ZLIB_VER="1.3.1" SCRIPT_DIR=$(realpath $(dirname $0)) set -a @@ -27,7 +27,7 @@ printf "*********************************************************\n" printf "* STARTING DEPENDENCY BUILD *\n" printf "*********************************************************\n" printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" -printf "Installing to ${PREFIX}\n" +printf "Installing to ${HDF5_ROOT}\n" printf "\n" printf "*********************************************************\n" @@ -60,13 +60,11 @@ printf "CPPFLAGS: ${CPPFLAGS}\n" printf "CPATH: ${CPATH}\n" printf "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}\n" printf "LDFLAGS: ${LDFLAGS}\n" +printf "INSTALL_PREFIX: ${HDF5_ROOT}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/hdfsrc -HDF5_ROOT=${PREFIX} -ZLIB_ROOT=${PREFIX} -SZIP_ROOT=${PREFIX} if [ $OS = "MacOSX" ]; then ZLIB_LIBRARY="${ZLIB_ROOT}/lib/libz.dylib" else @@ -85,6 +83,7 @@ ARGLIST="-DCMAKE_INSTALL_PREFIX:PATH=${HDF5_ROOT} \ -DHDF5_BUILD_FORTRAN:BOOL=OFF \ -DHDF5_BUILD_EXAMPLES:BOOL=ON \ -DBUILD_TESTING:BOOL=ON \ + -DBUILD_STATIC_LIBS:BOOL=OFF \ -DHDF5_BUILD_JAVA:BOOL=OFF" if [ $OS = "MacOSX" ]; then @@ -94,7 +93,7 @@ fi cmake -B build -C ./config/cmake/cacheinit.cmake -G Ninja ${ARGLIST} . cmake --build build -j${NPROC} --config Release -if [ -w ${PREFIX} ]; then +if [ -w ${HDF5_ROOT} ]; then cmake --install build else sudo cmake --install build diff --git a/buildscripts/build_negishi.sh b/buildscripts/build_negishi.sh new file mode 100755 index 000000000..31a555de9 --- /dev/null +++ b/buildscripts/build_negishi.sh @@ -0,0 +1,34 @@ +#!/bin/zsh -l +# installs an editable (local) package in release mode on Negishi +# This is a convenience script for Kaustub + +set -a +SCRIPT_DIR=$(realpath $(dirname $0)) +ROOT_DIR=$(realpath ${SCRIPT_DIR}/..) +cd ${ROOT_DIR} +BUILD_TYPE=${1:-"Release"} + +module purge +module load intel-oneapi-compilers/2023.0.0 +module load intel-oneapi-mkl/2023.0.0 +module load intel-oneapi-mpi/2021.8.0 +source ${INTEL_ONEAPI_COMPILERS_HOME}/setvars.sh > /dev/null 2>&1 +module use /depot/daminton/etc/modules +module load use.own +module load conda-env/mintongroup-py3.9.13 +module load netcdf-fortran/intel-oneapi/4.6.1 +module load shtools/intel-oneapi/4.11.10 +cmake -P distclean.cmake +pip install --config-settings=editable.rebuild=true \ + --config-settings=build-dir="build/{wheel_tag}" \ + --config-settings=cmake.build-type="${BUILD_TYPE}" \ + --config-settings=cmake.args="-DUSE_SIMD=ON" \ + --config-settings=cmake.args="-DUSE_OPENMP=ON" \ + --config-settings=cmake.args="-DCMAKE_Fortran_COMPILER=mpiifort" \ + --config-settings=cmake.args="-DCMAKE_Fortran_FLAGS=\"-f90=ifort\"" \ + --config-settings=cmake.args="-DMACHINE_CODE_VALUE=\"CORE-AVX-I\" " \ + --no-build-isolation \ + -ve . + + +LD_LIBRARY_PATH=$(realpath ${ROOT_DIR}/build/*/bin):$LD_LIBRARY_PATH \ No newline at end of file diff --git a/buildscripts/build_netcdf-c.sh b/buildscripts/build_netcdf-c.sh index ee7415cbf..c9ec290e3 100755 --- a/buildscripts/build_netcdf-c.sh +++ b/buildscripts/build_netcdf-c.sh @@ -22,7 +22,7 @@ printf "*********************************************************\n" printf "* STARTING DEPENDENCY BUILD *\n" printf "*********************************************************\n" printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" -printf "Installing to ${PREFIX}\n" +printf "Installing to ${NCDIR}\n" printf "\n" NC_VER="4.9.2" @@ -48,16 +48,15 @@ printf "CPATH: ${CPATH}\n" printf "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}\n" printf "LDFLAGS: ${LDFLAGS}\n" printf "HDF5_ROOT: ${HDF5_ROOT}\n" +printf "INSTALL_PREFIX: ${NCDIR}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/netcdf-c-* -NCDIR="${PREFIX}" -ZLIB_ROOT=${PREFIX} cmake -B build -S . -G Ninja \ -DCMAKE_BUILD_TYPE:STRING="Release" \ -DHDF5_DIR:PATH=${HDF5_ROOT}/cmake \ -DHDF5_ROOT:PATH=${HDF5_ROOT} \ - -DCMAKE_FIND_ROOT_PATH:PATH="${PREFIX}" \ + -DCMAKE_FIND_ROOT_PATH:PATH="${NCDIR}" \ -DCMAKE_INSTALL_PREFIX:STRING="${NCDIR}" \ -DENABLE_DAP:BOOL=OFF \ -DENABLE_BYTERANGE:BOOL=OFF \ @@ -68,7 +67,7 @@ cmake -B build -S . -G Ninja \ -DENABLE_REMOTE_FORTRAN_BOOTSTRAP:BOOL=ON cmake --build build -j${NPROC} -if [ -w ${PREFIX} ]; then +if [ -w ${NCDIR} ]; then cmake --install build else sudo cmake --install build diff --git a/buildscripts/build_netcdf-fortran.sh b/buildscripts/build_netcdf-fortran.sh index c82f24573..f3021a12a 100755 --- a/buildscripts/build_netcdf-fortran.sh +++ b/buildscripts/build_netcdf-fortran.sh @@ -22,7 +22,7 @@ printf "*********************************************************\n" printf "* STARTING DEPENDENCY BUILD *\n" printf "*********************************************************\n" printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" -printf "Installing to ${PREFIX}\n" +printf "Installing to ${NFDIR}\n" printf "\n" NF_VER="4.6.1" @@ -49,7 +49,6 @@ printf "LDFLAGS: ${LDFLAGS}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/netcdf-fortran-* -NFDIR="${PREFIX}" NCLIBDIR=$(${NCDIR}/bin/nc-config --libdir) if [ $OS = "MacOSX" ]; then netCDF_LIBRARIES="${NCLIBDIR}/libnetcdf.dylib" @@ -62,7 +61,7 @@ cmake -B build -S . -G Ninja \ -DCMAKE_INSTALL_PREFIX:PATH=${NFDIR} \ -DCMAKE_INSTALL_LIBDIR="lib" cmake --build build -j${NPROC} -if [ -w ${PREFIX} ]; then +if [ -w ${NFDIR} ]; then cmake --install build else sudo cmake --install build diff --git a/buildscripts/build_shtools.sh b/buildscripts/build_shtools.sh index 7e82b8846..5ffe9f029 100755 --- a/buildscripts/build_shtools.sh +++ b/buildscripts/build_shtools.sh @@ -15,7 +15,7 @@ ARGS=$@ . ${SCRIPT_DIR}/_build_getopts.sh ${ARGS} . ${SCRIPT_DIR}/set_compilers.sh -SHTOOLS_VER="4.9.1" +SHTOOLS_VER="4.11.10" printf "*********************************************************\n" printf "* FETCHING SHTOOLS SOURCE *\n" @@ -41,12 +41,23 @@ printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/SHTOOLS* -make F95="${FC}" CXX="${CXX}" F95FLAGS="-fPIC -O3 -std=gnu -ffast-math ${FFLAGS}" fortran -make F95="${FC}" CXX="${CXX}" F95FLAGS="-fPIC -O3 -std=gnu -ffast-math ${FFLAGS}" fortran-mp +case $FC in + *"ifort"*|*"ifx"*) + echo "Using Intel Fortran compiler" + make F95="${FC}" CXX="${CXX}" F95FLAGS="-fPIC -m64 -fpp -free -O3 -Tf" fortran + make F95="${FC}" CXX="${CXX}" F95FLAGS="-fPIC -m64 -fpp -free -O3 -Tf" fortran-mp + ;; + *) + echo "Everything else" + make F95="${FC}" CXX="${CXX}" fortran + make F95="${FC}" CXX="${CXX}" fortran-mp + ;; +esac + if [ -w ${PREFIX} ]; then - make PREFIX="${PREFIX}" install + make F95="${FC}" PREFIX="${PREFIX}" install else - sudo make PREFIX="${PREFIX}" install + sudo make F95="${FC}" PREFIX="${PREFIX}" install fi cd .. diff --git a/buildscripts/build_zlib.sh b/buildscripts/build_zlib.sh index 337e6a839..358941e09 100755 --- a/buildscripts/build_zlib.sh +++ b/buildscripts/build_zlib.sh @@ -22,10 +22,10 @@ printf "*********************************************************\n" printf "* STARTING DEPENDENCY BUILD *\n" printf "*********************************************************\n" printf "Using ${OS} compilers:\nFC: ${FC}\nCC: ${CC}\nCXX: ${CXX}\n" -printf "Installing to ${PREFIX}\n" +printf "Installing to ${ZLIB_ROOT}\n" printf "\n" -ZLIB_VER="1.3" +ZLIB_VER="1.3.1" printf "*********************************************************\n" printf "* FETCHING ZLIB SOURCE *\n" @@ -46,13 +46,14 @@ printf "CPPFLAGS: ${CPPFLAGS}\n" printf "CPATH: ${CPATH}\n" printf "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}\n" printf "LDFLAGS: ${LDFLAGS}\n" +printf "INSTALL_PREFIX: ${ZLIB_ROOT}\n" printf "*********************************************************\n" cd ${DEPENDENCY_DIR}/zlib-* -cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${PREFIX} +cmake -B build -S . -G Ninja -DCMAKE_INSTALL_PREFIX=${ZLIB_ROOT} cmake --build build -j${NPROC} -if [ -w ${PREFIX} ]; then +if [ -w ${ZLIB_ROOT} ]; then cmake --install build else sudo cmake --install build diff --git a/buildscripts/get_platform.sh b/buildscripts/get_platform.sh index 583510fb3..2455d7f29 100755 --- a/buildscripts/get_platform.sh +++ b/buildscripts/get_platform.sh @@ -45,6 +45,18 @@ esac case $OS in Linux) + # Currently ifx support is not great + # if command -v ifx >/dev/null 2>&1; then + # OS="Linux-ifx" + + if command -v ifort >/dev/null 2>&1; then + OS="Linux-ifort" + elif command -v gfortran >/dev/null 2>&1; then + OS="Linux-gnu" + else + echo "No Fortran compiler found on Linux" + exit 1 + fi ;; Darwin) OS="MacOSX" diff --git a/buildscripts/set_compilers.sh b/buildscripts/set_compilers.sh index eb7322334..b04b02702 100755 --- a/buildscripts/set_compilers.sh +++ b/buildscripts/set_compilers.sh @@ -16,11 +16,11 @@ SCRIPT_DIR=$(realpath $(dirname $0)) ROOT_DIR=$(realpath ${SCRIPT_DIR}/..) case "$OS" in - Linux|MacOSX|Intel) + Linux-gnu|Linux-ifx|Linux-ifort|MacOSX) ;; *) echo "Unknown compiler type: $OS" - echo "Valid options are Intel, Linux, or MacOSX" + echo "Valid options are Linux-gnu, Linux-ifort, Linux-ifx, or MacOSX" echo $USTMT exit 1 ;; @@ -28,15 +28,25 @@ esac set -a case $OS in - Linux) - . ${SCRIPT_DIR}/set_environment_linux.sh + Linux-gnu) FC=$(command -v gfortran) CC=$(command -v gcc) CXX=$(command -v g++) CPP=$(command -v cpp) ;; + Linux-ifx) + FC=$(command -v ifx) + CC=$(command -v icx) + CXX=$(command -v icpx) + CPP=$(command -v cpp) + ;; + Linux-ifort) + FC=$(command -v ifort) + CC=$(command -v icx) + CXX=$(command -v icpx) + CPP=$(command -v cpp) + ;; MacOSX) - . ${SCRIPT_DIR}/set_environment_macos.sh FC=${HOMEBREW_PREFIX}/bin/gfortran-12 CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -Wno-deprecated-non-prototype -arch ${ARCH}" FCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -arch ${ARCH} -fno-underscoring" @@ -52,15 +62,10 @@ case $OS in RANLIB=${COMPILER_PREFIX}/bin/ranlib LDFLAGS="-Wl,-no_compact_unwind" ;; - Intel) - FC=$(command -v ifx) - CC=$(command -v icx) - CXX=$(command -v icpx) - CPP=$(command -v cpp) - ;; + *) printf "Unknown compiler type: ${OS}\n" - echo "Valid options are Intel, Linux, or MacOSX" + echo "Valid options are Linux-gnu, Linux-ifort, Linux-ifx, or MacOSX" printf $USTMT exit 1 ;; diff --git a/buildscripts/set_environment_linux.sh b/buildscripts/set_environment_linux.sh index a7c566d59..6a6c055ad 100755 --- a/buildscripts/set_environment_linux.sh +++ b/buildscripts/set_environment_linux.sh @@ -1,17 +1,20 @@ #!/bin/bash # Sets environment flags on Linux set -a -PREFIX="/usr/local" -NCDIR="${PREFIX}" -NFDIR="${PREFIX}" +PREFIX=${PREFIX:-"/usr/local"} +NCDIR=${NETCDF_HOME:-"${PREFIX}"} +NFDIR=${NETCDF_FORTRAN_HOME:-"${PREFIX}"} NETCDF_FORTRAN_HOME="${NFDIR}" NETCDF_FORTRAN_INCLUDE="${NFDIR}/include" -HDF5_ROOT="${PREFIX}" +ZLIB_ROOT=${ZLIB_ROOT:-"${ZLIB_HOME}"} +ZLIB_ROOT=${ZLIB_ROOT:-"${PREFIX}"} +HDF5_ROOT=${HDF5_ROOT:-"${HDF5_HOME}"} +HDF5_ROOT=${HDF5_ROOT:-"${PREFIX}"} HDF5_LIBDIR="${HDF5_ROOT}/lib" HDF5_INCLUDE_DIR="${HDF5_ROOT}/include" HDF5_PLUGIN_PATH="${HDF5_LIBDIR}/plugin" -LD_LIBRARY_PATH="${PREFIX}/lib" -CPATH="${PREFIX}/include:" +LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}" +CPATH="${PREFIX}/include:${CPATH}" HDF5_DIR="${HDF5_ROOT}/cmake" PATH="${HDF5_ROOT}/bin:${PATH}" CMAKE_INSTALL_LIBDIR="lib" \ No newline at end of file diff --git a/cmake/Modules/FindNETCDF_Fortran.cmake b/cmake/Modules/FindNETCDF_Fortran.cmake index ee56789a5..64ed4c923 100644 --- a/cmake/Modules/FindNETCDF_Fortran.cmake +++ b/cmake/Modules/FindNETCDF_Fortran.cmake @@ -11,14 +11,18 @@ # Tries to find the cmake config files first. Otherwise, try to find the libraries and headers by hand IF (NOT netCDF-Fortran_DIR) - IF (CMAKE_SYSTEM_NAME STREQUAL "Windows") - FILE(GLOB LIBDIRS "C:/Program Files*/NC4F") - LIST(SORT LIBDIRS) - LIST(GET LIBDIRS -1 LIBPREFIX) - SET(netCDF-Fortran_DIR "${LIBPREFIX}/lib/cmake/netCDF" CACHE PATH "Location of provided netCDF-FortranConfig.cmake file") - ELSE() - SET(netCDF-Fortran_DIR "/usr/local/lib/cmake/netCDF" CACHE PATH "Location of provided netCDF-FortranConfig.cmake file") - ENDIF () + IF (DEFINED ENV{NETCDF_FORTRAN_DIR}) + SET(netCDF-Fortran_DIR "$ENV{NETCDF_FORTRAN_DIR}" CACHE PATH "Location of provided netCDF-FortranConfig.cmake file") + ELSE() + IF (CMAKE_SYSTEM_NAME STREQUAL "Windows") + FILE(GLOB LIBDIRS "C:/Program Files*/NC4F") + LIST(SORT LIBDIRS) + LIST(GET LIBDIRS -1 LIBPREFIX) + SET(netCDF-Fortran_DIR "${LIBPREFIX}/lib/cmake/netCDF" CACHE PATH "Location of provided netCDF-FortranConfig.cmake file") + ELSE() + SET(netCDF-Fortran_DIR "/usr/local/lib/cmake/netCDF" CACHE PATH "Location of provided netCDF-FortranConfig.cmake file") + ENDIF () + ENDIF() ENDIF() MESSAGE(STATUS "Looking for netCDF-FortranConfig.cmake in ${netCDF-Fortran_DIR}") diff --git a/cmake/Modules/SetCompileFlag.cmake b/cmake/Modules/SetCompileFlag.cmake index f5644e266..72160fe63 100644 --- a/cmake/Modules/SetCompileFlag.cmake +++ b/cmake/Modules/SetCompileFlag.cmake @@ -40,23 +40,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CheckFortranCompilerFlag.cmake) FUNCTION(SET_COMPILE_FLAG FLAGVAR FLAGVAL LANG) - # Do some up front setup if Fortran - IF(LANG STREQUAL "Fortran") - # Create a list of error messages from compilers - SET(FAIL_REGEX - "ignoring unknown option" # Intel - "invalid argument" # Intel - "not supported" # Intel ifx - "unrecognized .*option" # GNU - "[Uu]nknown switch" # Portland Group - "ignoring unknown option" # MSVC - "warning D9002" # MSVC, any lang - "[Uu]nknown option" # HP - "[Ww]arning: [Oo]ption" # SunPro - "command option .* is not recognized" # XL - ) - ENDIF(LANG STREQUAL "Fortran") - # Make a variable holding the flags. Filter out REQUIRED if it is there SET(FLAG_REQUIRED FALSE) SET(FLAG_FOUND FALSE) diff --git a/cmake/Modules/SetSwiftestFlags.cmake b/cmake/Modules/SetSwiftestFlags.cmake index 4c5659c79..83bf8ac5d 100644 --- a/cmake/Modules/SetSwiftestFlags.cmake +++ b/cmake/Modules/SetSwiftestFlags.cmake @@ -338,7 +338,7 @@ IF (CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "TESTING" ) Fortran "-check all" # Intel ) SET_COMPILE_FLAG(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" - C "-check=conversions,stack,uninit" # Intel + C "-fcheck=conversions,stack,uninit" # Intel ) # Initializes matrices/arrays with NaN values SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG}" @@ -565,9 +565,7 @@ IF (CMAKE_BUILD_TYPE STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE STREQUAL "PROFILE") ) # Tells the compiler to link to certain libraries in the Intel oneAPI Math Kernel Library (oneMKL). SET_COMPILE_FLAG(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE}" - Fortran "-mkl=cluster" - "-mkl" - "-qmkl=cluster" + Fortran "-qmkl=cluster" "-qmkl" ) # Enables additional interprocedural optimizations for a single file compilation diff --git a/environment.yml b/environment.yml index 2ecab5d60..fd5ff0316 100644 --- a/environment.yml +++ b/environment.yml @@ -5,7 +5,7 @@ channels: - defaults dependencies: - - python>=3.8 + - python>=3.9 - numpy>=1.24.3 - scipy>=1.10.1 - xarray>=2022.11.0 diff --git a/pyproject.toml b/pyproject.toml index da9638d5a..6981cdee9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "swiftest" -version = "2024.1.0" +version = "2024.2.0" authors=[ {name = 'David A. Minton', email='daminton@purdue.edu'}, {name = 'Carlisle Wishard'}, @@ -112,7 +112,7 @@ CPP="/usr/bin/cpp" AR="/usr/bin/ar" NM="/usr/bin/nm" RANLIB="/usr/bin/ranlib" -netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF" +NETCDF_FORTRAN_DIR="${PREFIX}/lib/cmake/netCDF" [tool.cibuildwheel.macos] before-all = [ @@ -133,7 +133,7 @@ HDF5_INCLUDE_DIR="${HDF5_ROOT}/include" HDF5_PLUGIN_PATH="${HDF5_LIBDIR}/plugin" LD_LIBRARY_PATH="${PREFIX}/lib:/project/lib:${HDF5_LIBDIR}" CPATH="${PREFIX}/include:/project/include:${HDF5_INCLUDE_DIR}" -netCDF-Fortran_DIR="${PREFIX}/lib/cmake/netCDF" +NETCDF_FORTRAN_DIR="${PREFIX}/lib/cmake/netCDF" HDF5_DIR="${HDF5_ROOT}/cmake" SHTOOLS_HOME="${PREFIX}" PATH="${HDF5_ROOT}/bin:${PATH}" diff --git a/src/globals/globals_module.f90 b/src/globals/globals_module.f90 index ff8c91429..c17d6a2eb 100644 --- a/src/globals/globals_module.f90 +++ b/src/globals/globals_module.f90 @@ -48,7 +48,7 @@ module globals integer(I4B), parameter :: UPPERCASE_OFFSET = iachar('A') - iachar('a') !! ASCII character set parameter for lower to upper !! conversion - offset between upper and lower - character(*), parameter :: VERSION = "2024.1.0" !! Swiftest version + character(*), parameter :: VERSION = "2024.2.0" !! Swiftest version !> Symbolic name for integrator types character(*), parameter :: UNKNOWN_INTEGRATOR = "UKNOWN INTEGRATOR" diff --git a/version.txt b/version.txt index f96d3c435..032892e0c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2024.1.0 \ No newline at end of file +2024.2.0 \ No newline at end of file