diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm index 9f046181bb9bc3798655507d68131ae3da86727c..b546a5330efa8ebe5eb57dc190069dcb628484c9 100755 --- a/conf/profile_mesonh.ihm +++ b/conf/profile_mesonh.ihm @@ -66,8 +66,10 @@ export CONF_DOLLAR=${CONF_DOLLAR} # Version of NETCDF / HDF # export VER_CDF=${VER_CDF} -export VERSION_CDF=${VERSION_CDF} +export VERSION_CDFC=${VERSION_CDFC} +export VERSION_CDFF=${VERSION_CDFF} export VERSION_HDF=${VERSION_HDF} +export VERSION_LIBAEC=${VERSION_LIBAEC} # # NETCDF4 INPUT/OUTPUT # diff --git a/src/LIB/hdf5-1.8.20.tar.gz b/src/LIB/hdf5-1.8.20.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..447023d0e56d0d777591e73b0fedcf4e395f89a3 --- /dev/null +++ b/src/LIB/hdf5-1.8.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ed660ccd2bc45aa808ea72e08f33cc64009e9dd4e3a372b53438b210312e8d9 +size 12475267 diff --git a/src/LIB/hdf5-1.8.9.tar.gz b/src/LIB/hdf5-1.8.9.tar.gz deleted file mode 100644 index 9a262b915b2bbbfbaba826897c01bd178973b0fc..0000000000000000000000000000000000000000 --- a/src/LIB/hdf5-1.8.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22ece2ee73f653db9d904e113a03b4d6b4a54d101ed4cd4b46b50731a842add8 -size 8258774 diff --git a/src/LIB/libaec-0.3.2.tar.gz b/src/LIB/libaec-0.3.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3db97620e305b772c290ad9ee1bca700cbd1ad0e --- /dev/null +++ b/src/LIB/libaec-0.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb7cbf4e8f3c63a9ea1af1e1a2d0c9658f4831deb7327f110bdd5c187dc3441 +size 353185 diff --git a/src/LIB/netcdf-4.1.3.tar.gz b/src/LIB/netcdf-4.1.3.tar.gz deleted file mode 100644 index b93f29d62ac2f34f6b88c42b5de81feaa53c7ac4..0000000000000000000000000000000000000000 --- a/src/LIB/netcdf-4.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:315bc385b0750dd85b9a122194382db52f432dea1390de9f7afa11cf91869213 -size 11097157 diff --git a/src/LIB/netcdf-4.5.0.tar.gz b/src/LIB/netcdf-4.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0a4c4e97f1205f13cced56a6f990769fc0e48d76 --- /dev/null +++ b/src/LIB/netcdf-4.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbe70049cf1643c4ad7453f86510811436c9580cb7a1684ada2f32b95b00ca79 +size 5494644 diff --git a/src/LIB/netcdf-fortran-4.4.4.tar.gz b/src/LIB/netcdf-fortran-4.4.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9be947375c0f2c086b65cc306376e822cda7eb04 --- /dev/null +++ b/src/LIB/netcdf-fortran-4.4.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2d395175f8d283e68c8be516e231a96b191ade67ad0caafaf7fa01b1e6b5d75 +size 1025980 diff --git a/src/Makefile b/src/Makefile index 4c9ffe28a2dbbe486bb2ce954374bd959250d7d5..317f4015c59387c8c9c96b3dd47ac44614bc099d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -326,7 +326,7 @@ A64=A64 endif gribapi : $(GRIBAPI_INC) $(GRIBAPI_INC) : - cd ${DIR_GRIBAPI} && ./configure --disable-shared --disable-jpeg --prefix=${GRIBAPI_PATH} FC="$(FC)" ${GRIBAPI_CONF} && $(MAKE) -j 1 clean && $(MAKE) -j 1 && $(MAKE) -j 1 install && $(MAKE) -j 1 clean + cd ${DIR_GRIBAPI} && ./configure --disable-shared --disable-jpeg --prefix=${GRIBAPI_PATH} CC="$(CC)" FC="$(FC)" ${GRIBAPI_CONF} && $(MAKE) -j 1 clean && $(MAKE) -j 1 && $(MAKE) -j 1 install && $(MAKE) -j 1 clean gribapi_clean : - [ -d ${GRIBAPI_PATH} ] && rm -fr ${GRIBAPI_PATH} @@ -340,12 +340,19 @@ ifeq "$(VER_CDF)" "CDFAUTO" HDF_OPT = ${OPT_BASE_I4:-$OPT_BASE} NETCDF_OPT = ${OPT_BASE_I4:-$OPT_BASE} # -cdf : $(CDF_INC) -$(CDF_INC) : - cd ${DIR_HDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 \ - FC="$(FC)" FCFLAGS="$(HDF_OPT)" CPPFLAGS="-DpgiFortran" ${HDF_CONF} && make && make install && $(MAKE) -j 1 clean - cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --enable-f90 --disable-dap \ - FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" CPPFLAGS="-DpgiFortran ${INC_NETCDF}" ${CDF_CONF} LDFLAGS=" -L${CDF_PATH}/lib64" && make && make install && $(MAKE) -j 1 clean +cdf : $(CDF_MOD) +$(CDF_MOD) : + cd ${DIR_LIBAEC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 CC="$(CC)" CFLAGS="$(HDF_OPT)" && \ + $(MAKE) && $(MAKE) install && $(MAKE) clean + cd ${DIR_HDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-szlib=${CDF_PATH}/include,${CDF_PATH}/lib64 \ + CC="$(CC)" CFLAGS="$(HDF_OPT)" LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lsz -laec -lz" && \ + $(MAKE) && $(MAKE) install && $(MAKE) clean + cd ${DIR_CDFC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-dap \ + CC="$(CC)" CFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lhdf5_hl -lhdf5 -lsz -laec -lz" && \ + $(MAKE) && $(MAKE) install && $(MAKE) clean + cd ${DIR_CDFF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 \ + FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lsz -laec -lz" && \ + $(MAKE) && $(MAKE) install && $(MAKE) clean cleanmaster : cleancdf cleancdf : diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk index 9671c06ffa9b00c923c65d8ccc5f289604941534..08f0a5f11fb5d6ce14085a8495df8a5eadcef567 100644 --- a/src/Makefile.MESONH.mk +++ b/src/Makefile.MESONH.mk @@ -434,16 +434,19 @@ endif # # ifeq "$(VER_CDF)" "CDFAUTO" -DIR_CDF?=${SRC_MESONH}/src/LIB/netcdf-${VERSION_CDF} -CDF_PATH?=${DIR_CDF}-${ARCH}I${MNH_INT} -CDF_INC?=${CDF_PATH}/include/netcdf.inc +DIR_CDFC?=${SRC_MESONH}/src/LIB/netcdf-${VERSION_CDFC} +DIR_CDFF?=${SRC_MESONH}/src/LIB/netcdf-fortran-${VERSION_CDFF} +CDF_PATH?=${SRC_MESONH}/src/LIB/netcdf-${ARCH}I${MNH_INT} +CDF_MOD?=${CDF_PATH}/include/netcdf.mod # INC_NETCDF ?= -I${CDF_PATH}/include -LIB_NETCDF ?= -L${CDF_PATH}/lib -L${CDF_PATH}/lib64 -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz +LIB_NETCDF ?= -L${CDF_PATH}/lib -L${CDF_PATH}/lib64 -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lsz -laec -lz -ldl INC += $(INC_NETCDF) LIBS += $(LIB_NETCDF) # DIR_HDF?=${SRC_MESONH}/src/LIB/hdf5-${VERSION_HDF} +# +DIR_LIBAEC?=${SRC_MESONH}/src/LIB/libaec-${VERSION_LIBAEC} endif # # NetCDF : CDF LaReunion Local diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk index dec164ce1795effcc1d1151aa6f6e42b61b20d4c..b5b3fb6b7b00aa1b1b88a97e81275a20316989d7 100644 --- a/src/Rules.LXgfortran.mk +++ b/src/Rules.LXgfortran.mk @@ -57,6 +57,7 @@ CFLAGS += -g -O0 endif # # +CC = gcc FC = gfortran ifeq "$(VER_MPI)" "MPIAUTO" F90 = mpif90 diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk index 76a7bb078fc2546d7853641392e0f13aecd4883f..48099b4902fc0970139c85951cc1d17166b920d2 100644 --- a/src/Rules.LXpgi.mk +++ b/src/Rules.LXpgi.mk @@ -78,6 +78,7 @@ endif #-Mcuda -ta=nvidia,host,time -Minfo=accel,intensity # +CC = pgcc FC = pgf90 ifeq "$(VER_MPI)" "MPIAUTO" F90 = mpif90