From 9c10b85fedf70bc31bdde65eeea5a2e67d057eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=81=A5=E9=82=A6?= Date: Tue, 18 Jul 2023 03:04:03 +0000 Subject: [PATCH] =?UTF-8?q?update=20package/ioapi/3.2/clang/install.sh.=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9PARMS3.EXT=E3=80=81FDESC3.EXT=E3=80=81IODECL3?= =?UTF-8?q?.EXT=E4=B8=89=E4=B8=AA=E6=96=87=E4=BB=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=99=90=E5=88=B6fortran=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=20=E5=AE=8C=E5=96=84modufiles=20?= =?UTF-8?q?=E9=87=87=E7=94=A8netcdf=E5=92=8Chdf5=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E9=87=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 叶健邦 --- package/ioapi/3.2/clang/install.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/ioapi/3.2/clang/install.sh b/package/ioapi/3.2/clang/install.sh index 9264530..cf0bbea 100755 --- a/package/ioapi/3.2/clang/install.sh +++ b/package/ioapi/3.2/clang/install.sh @@ -1,6 +1,7 @@ #!/bin/bash set -x set -e +#module add netcdf-clang/4.7.4 hdf5-clang/1.12.0 . ${DOWNLOAD_TOOL} -u https://codeload.github.com/cjcoats/ioapi-3.2/tar.gz/2020111 -f ioapi-3.2-2020111.tar.gz cd ${JARVIS_TMP} rm -rf ioapi-3.2-2020111 ioapi-3.2 @@ -15,8 +16,7 @@ sed -i "30c\#FSFLAGS = -save" ioapi/Makeinclude.Linux4_aarch64 cp ioapi/Makefile.nocpl ioapi/Makefile export HOME=${JARVIS_TMP} cp m3tools/Makefile.nocpl m3tools/Makefile -sed -i "65c\LIBS = -L\${OBJDIR} -lioapi -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/netcdf/4.7.0/lib/ -lnetcdff -lnetcdf -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/hdf5/1.10.1/lib -lhdf5_hl -lhdf5 -lz \$(OMPLIBS) \$(ARCHLIB) \$(ARCHLIBS)" m3tools/Makefile -sed -i "146c\LIBS = -L\${OBJDIR} -lioapi -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/netcdf/4.7.0/lib/ -lnetcdff -lnetcdf -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/hdf5/1.10.1/lib -lhdf5_hl -lhdf5 -lz \$(OMPLIBS) \$(ARCHLIB) \$(ARCHLIBS)" m3tools/Makefile +sed -i "65c\LIBS = -L\${OBJDIR} -lioapi -L${NETCDF_CLANG_PATH}/lib/ -lnetcdff -lnetcdf -L${HDF5_CLANG_PATH}/lib -lhdf5_hl -lhdf5 -lz \$(OMPLIBS) \$(ARCHLIB) \$(ARCHLIBS)" m3tools/Makefile cp Makefile.template Makefile sed -i "138c\BIN = Linux4_aarch64" Makefile @@ -26,7 +26,7 @@ sed -i "141c\LIBINST = \$(INSTALL)/\$(BIN)" Makefile sed -i "142c\BININST = \$(INSTALL)/\$(BIN)" Makefile sed -i "143c\CPLMODE = nocpl" Makefile sed -i '144c\IOAPIDEFS = "-DIOAPI_NCF4"' Makefile -sed -i "193c\NCFLIBS = -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/netcdf/4.7.0/lib/ -lnetcdff -lnetcdf -L${JARVIS_ROOT}/software/libs/bisheng2.1.0/hmpi1.1.1/hdf5/1.10.1/lib -lhdf5_hl -lhdf5 -lz" Makefile +sed -i "193c\NCFLIBS = -L${NETCDF_CLANG_PATH}/lib/ -lnetcdff -lnetcdf -L${HDF5_CLANG_PATH}/lib -lhdf5_hl -lhdf5 -lz" Makefile make BIN=Linux4_aarch64 sed -i "174c\ COMMON / BSTATE3 / " ioapi/STATE3.EXT sed -i "175c\ & P_ALP3, P_BET3, P_GAM3, " ioapi/STATE3.EXT @@ -42,5 +42,11 @@ sed -i "184c\ & BSIZE3, LDATE3, LTIME3, NDATE3, NTIME3, ILAST3, sed -i "185c\ & VTYPE3, " ioapi/STATE3.EXT sed -i "186c\ & ILCNT3, NLIST3, IFRST3, ILIST3, BEGRC3, ENDRC3, " ioapi/STATE3.EXT sed -i "191c\ COMMON / CSTATE3 / " ioapi/STATE3.EXT +sed -i '104 s/.$//' ioapi/PARMS3.EXT +sed -i '231,236 s/.$//' ioapi/FDESC3.EXT +sed -i '241,242 s/.$//' ioapi/FDESC3.EXT +sed -i '93 s/.$//' ioapi/IODECL3.EXT +sed -i '113 s/.$//' ioapi/IODECL3.EXT cp -a Linux4_aarch64 $1/bin - +cp -a Linux4_aarch64 $1/lib +cp -a ioapi $1/include -- Gitee