From 1ad141238d5597fa79d27ebf40dfd1a70e99a92b Mon Sep 17 00:00:00 2001 From: Juan ESCOBAR <juan.escobar@aero.obs-mip.fr> Date: Wed, 10 Aug 2022 17:36:09 +0200 Subject: [PATCH] Juan 10/08/2022:configure+mnh_expand: add tar files:filepp-1.8.0.tar.gz/MNH_EXPAND_1-2-0.tar.gz to install mnh_expand automatically during main MesoNH ./configure --- pub/FILEPP/MNH_EXPAND_1-2-0.tar.gz | 3 +++ pub/FILEPP/README_MNH_EXPAND | 11 +++++++++++ pub/FILEPP/filepp-1.8.0.tar.gz | 3 +++ src/configure | 25 ++++++++++++++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pub/FILEPP/MNH_EXPAND_1-2-0.tar.gz create mode 100644 pub/FILEPP/README_MNH_EXPAND create mode 100644 pub/FILEPP/filepp-1.8.0.tar.gz diff --git a/pub/FILEPP/MNH_EXPAND_1-2-0.tar.gz b/pub/FILEPP/MNH_EXPAND_1-2-0.tar.gz new file mode 100644 index 000000000..21bf32623 --- /dev/null +++ b/pub/FILEPP/MNH_EXPAND_1-2-0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0338893329ca7716536d37c0ac5da053f411ba3aa28308fdfdcd1526571c7fa8 +size 36030 diff --git a/pub/FILEPP/README_MNH_EXPAND b/pub/FILEPP/README_MNH_EXPAND new file mode 100644 index 000000000..5b5d556f5 --- /dev/null +++ b/pub/FILEPP/README_MNH_EXPAND @@ -0,0 +1,11 @@ +# +# source file get form here +# +wget https://github.com/JuanEscobarMunoz/MNH_Expand_Array/archive/refs/tags/MNH_EXPAND_1-2-0.tar.gz +wget https://www-users.york.ac.uk/~dm26/filepp/filepp-1.8.0.tar.gz + +# +# For installation , look MesoNH main configure script +# Looking for VER_MNHEXP variable +# + diff --git a/pub/FILEPP/filepp-1.8.0.tar.gz b/pub/FILEPP/filepp-1.8.0.tar.gz new file mode 100644 index 000000000..807ca3cd3 --- /dev/null +++ b/pub/FILEPP/filepp-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12bd2297184ac3a9a38df9e8d0c76083eef2d5d561661b4fd93c426e76dab956 +size 142875 diff --git a/src/configure b/src/configure index 450f9c2ca..853d2c756 100755 --- a/src/configure +++ b/src/configure @@ -32,6 +32,13 @@ export VERSION_NCL=${VERSION_NCL:-"ncl-6.4.0"} export VERSION_ECRAD=${VERSION_ECRAD:-"1.4.0"} export VER_ECRAD=${VERSION_ECRAD//./} +# +# Install MNH_EXPAND if VER_MNHEXP=MNHEXPAUTO +# +export VER_MNHEXP=${VER_MNHEXP:-"MNHEXPAUTO"} +export VERSION_MNHEXP=${VERSION_MNHEXP:-"MNH_EXPAND_1-2-0"} +export VERSION_FILEPP=${VERSION_FILEPP:-"1.8.0"} + export LEN_HREC=${LEN_HREC:-16} # @@ -498,7 +505,22 @@ if [ "x${NEED_TOOLS}" == "xYES" ] ; then ;; esac fi - +# +# Install MNH_EXPAND if VER_MNHEXP=MNHEXPAUTO +# +if [ "x${VER_MNHEXP}" == "xMNHEXPAUTO" ] ;then + ( + cd $LOCAL/pub/FILEPP + if [ ! -d MNH_Expand_Array-${VERSION_MNHEXP} ] ; then + tar xvf ${VERSION_MNHEXP}.tar.gz + tar xvf filepp-${VERSION_FILEPP}.tar.gz + cd filepp-${VERSION_FILEPP} + FILEPP=$LOCAL/pub/FILEPP + ./configure --prefix=${FILEPP}/FILEPP-${VERSION_FILEPP} + make install + fi + ) +fi # # Generate profile_mesonh # @@ -570,6 +592,7 @@ fi if [ "x${MNH_ECRAD}" == "x1" ] && [ "x${VERSION_ECRAD}" == "x1.4.0" ] ; then ( cd $LOCAL/src/LIB/RAD ; [ ! -d ecrad-1.4.0 ] && tar xvfz ecrad-1.4.0.tar.gz ) fi + ########################################################## # # # RESUME # -- GitLab