diff --git a/etc/derecho/build_tuvx_derecho_gnu.sh b/etc/derecho/build_tuvx_derecho_gnu.sh old mode 100755 new mode 100644 index ca383199..73c6818e --- a/etc/derecho/build_tuvx_derecho_gnu.sh +++ b/etc/derecho/build_tuvx_derecho_gnu.sh @@ -3,7 +3,6 @@ # The TUVX_HOME environment variable must be set to the directory to build TUV-x # in prior to calling this script - module purge module load ncarenv/23.09 module load craype/2.7.20 @@ -13,6 +12,7 @@ module load netcdf/4.9.2 module load ncarcompilers/1.0.0 module load cmake/3.26.3 + if [[ -z "${TUVX_HOME}" ]]; then echo "You must set the TUVX_HOME environment variable to the directory where TUV-x should be build." return @@ -23,29 +23,11 @@ if [[ ! -d "${TUVX_HOME}" ]]; then return fi -echo "Building JSON Fortran" - -# get & build the source code of JSON Fortran - -cd ${TUVX_HOME} -curl -LO https://github.com/jacobwilliams/json-fortran/archive/8.3.0.tar.gz -tar -zxvf 8.3.0.tar.gz -cd json-fortran-8.3.0 -mkdir build -cd build -INSTALL_DIR=$TUVX_HOME/json-fortran-8.3.0 -cmake -D SKIP_DOC_GEN:BOOL=TRUE -D CMAKE_INSTALL_PREFIX=$INSTALL_DIR .. -make install - -echo "Building TUV-x" - -# get & build the source code of TUV-x - +# download and build TUV-X cd ${TUVX_HOME} git clone git@github.com:NCAR/tuv-x.git cd tuv-x mkdir build cd build -export JSON_FORTRAN_HOME=$INSTALL_DIR/jsonfortran-gnu-8.3.0 -cmake -D CMAKE_BUILD_TYPE=release -D TUVX_ENABLE_MEMCHECK=OFF -D LAPACK_LIBRARIES=-lsci_gnu .. +cmake -D CMAKE_BUILD_TYPE=release -D TUVX_ENABLE_MEMCHECK=OFF -D LAPACK_LIBRARIES=-lsci_gnu -D BLAS_LIBRARIES=-lsci_gnu .. make -j 8 diff --git a/etc/derecho/build_tuvx_derecho_intel.sh b/etc/derecho/build_tuvx_derecho_intel.sh old mode 100755 new mode 100644 index 2bae2629..303a8f40 --- a/etc/derecho/build_tuvx_derecho_intel.sh +++ b/etc/derecho/build_tuvx_derecho_intel.sh @@ -21,24 +21,7 @@ if [[ ! -d "${TUVX_HOME}" ]]; then return fi -echo "Building JSON Fortran" - -# get & build the source code of JSON Fortran - -cd ${TUVX_HOME} -curl -LO https://github.com/jacobwilliams/json-fortran/archive/8.3.0.tar.gz -tar -zxvf 8.3.0.tar.gz -cd json-fortran-8.3.0 -mkdir build -cd build -INSTALL_DIR=$TUVX_HOME/json-fortran-8.3.0 -cmake -D SKIP_DOC_GEN:BOOL=TRUE -D CMAKE_INSTALL_PREFIX=$INSTALL_DIR .. -make install - -echo "Building TUV-x" - # get & build the source code of TUV-x - cd ${TUVX_HOME} git clone git@github.com:NCAR/tuv-x.git cd tuv-x