Changeset 7421 for branches/2016/dev_merge_2016/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

Timestamp:

2016-12-01T18:10:41+01:00 (8 years ago)

Author:

flavoni

Message:

#1811 merge dev_CNRS_MERATOR_2016 with dev_merge_2016 branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh (modified) (1 diff)

branches/2016/dev_merge_2016/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

@@ -166 +166 @@
 
 #- do we need xios library?
-if [ "$2" != "nocpp" ] 
+#- 2 cases: 
+#- in CONFIG directory looking for key_iomput
+if [ "$1" == "arch_nemo.fcm" ]
 then
-    use_iom=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_iomput )
+    if [ "$2" != "nocpp" ] 
+    then
+        use_iom=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_iomput )
+    else
+        use_iom=0
+    fi
+    have_lxios=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-lxios" )
+    if [[ ( $use_iom -eq 0 ) && ( $have_lxios -ge 1 ) ]]
+    then 
+        sed -e "s/-lxios//g" ${COMPIL_DIR}/$1 > ${COMPIL_DIR}/tmp$$
+        mv -f ${COMPIL_DIR}/tmp$$ ${COMPIL_DIR}/$1
+    fi
+#- in TOOLS directory looking for USE xios
 else
-    use_iom=0
-fi
-have_lxios=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-lxios" )
-if [[ ( $use_iom -eq 0 ) && ( $have_lxios -ge 1 ) ]]
-then 
-    sed -e "s/-lxios//g" ${COMPIL_DIR}/$1 > ${COMPIL_DIR}/tmp$$
-    mv -f ${COMPIL_DIR}/tmp$$ ${COMPIL_DIR}/$1
+    use_iom=$( egrep --exclude-dir=.svn -r USE ${NEW_CONF}/src/* | grep -c xios )
+    have_lxios=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-lxios" )
+    if [[ ( $use_iom -eq 0 ) || ( $have_lxios != 1 ) ]]
+    then 
+        sed -e "s/-lxios//g" ${COMPIL_DIR}/$1 > ${COMPIL_DIR}/tmp$$
+        mv -f ${COMPIL_DIR}/tmp$$ ${COMPIL_DIR}/$1
+    fi
 fi