Changeset 2185

Timestamp:

Dec 6, 2019, 11:30:13 AM (5 years ago)

Author:

emillour

Message:

Minor update of the install_ioipsl_centos-ifort.bash to ensure it uses the same arch.path and arch.env as the GCM.
EM

File:

• trunk/LMDZ.COMMON/ioipsl/install_ioipsl_centos-ifort.bash (modified) (3 diffs)

trunk/LMDZ.COMMON/ioipsl/install_ioipsl_centos-ifort.bash

@@ -1 +1 @@
 #!/bin/bash
-# script to download and install the latest version of IOIPSL on Gnome
+# script to download and install the latest version of IOIPSL on LMD CentOS machines
 #
 
 #0. Preliminary stuff 
-source ../arch.env
-
-####
-#source ../arch.path
-#marche pas car -I deja inclus
-#donc mettre en dur:
-####
-NETCDF="/opt/netcdf45/ifort15"
-netcdf_include="$NETCDF/include"
-netcdf_lib="$NETCDF/lib"
-echo $netcdf_include
-echo $netcdf_lib
+# source the environment from the GCM arch files
+source ../arch/arch-centos-ifort-para.env
+source ../arch/arch-centos-ifort-para.path
 
 whereami=`pwd -P`
@@ -27 +18 @@
 # 2. Set correct settings:
 # add a "ciclad" configuration to AA_make.gdef
-echo "#-Q- cicladi  #- Global definitions for ciclad at UPMC, ifort" >> AA_make.gdef
+echo "#-Q- cicladi  #- Global definitions for CentOS at LMD, ifort" >> AA_make.gdef
 echo "#-Q- cicladi  M_K = make" >> AA_make.gdef
 echo "#-Q- cicladi  P_C = cpp" >> AA_make.gdef
@@ -48 +39 @@
 echo "#-Q- cicladi  C_L = icc" >> AA_make.gdef
 echo "#-Q- cicladi  #-" >> AA_make.gdef
-echo "#-Q- cicladi  NCDF_INC = ${netcdf_include}" >> AA_make.gdef
-echo "#-Q- cicladi  NCDF_LIB = -L${netcdf_lib} -lnetcdff" >> AA_make.gdef
-#echo "#-Q- cicladi  NCDF_INC = ${NETCDF_INCDIR}" >> AA_make.gdef
-#echo "#-Q- cicladi  NCDF_LIB = -L${NETCDF_LIBDIR} -lnetcdff" >> AA_make.gdef
+echo "#-Q- cicladi  NCDF_INC = ${NETCDF_INCDIR:2}" >> AA_make.gdef
+echo "#-Q- cicladi  NCDF_LIB = ${NETCDF_LIBDIR} ${NETCDF_LIB}" >> AA_make.gdef
 echo "#-Q- cicladi  #-" >> AA_make.gdef