Changeset 7277 for branches/2016/dev_CNRS_2016/NEMOGCM/TOOLS

Timestamp:

2016-11-21T09:55:07+01:00 (8 years ago)

Author:

flavoni

Message:

update 2016 branch with simplif-2

Location:

branches/2016/dev_CNRS_2016/NEMOGCM/TOOLS

Files:

• COMPILE/Fadd_keys.sh (modified) (2 diffs)
• COMPILE/Fcheck_archfile.sh (modified) (1 diff)
• COMPILE/bld_tools.cfg (modified) (1 diff)
• COMPILE/tools.txt (modified) (1 diff)
• DOMAINcfg (copied) (copied from branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/TOOLS/DOMAINcfg)

branches/2016/dev_CNRS_2016/NEMOGCM/TOOLS/COMPILE/Fadd_keys.sh

@@ -44 +44 @@
 # ::
 #
-#  $ ./Fadd_keys.sh ORCA2_LIM add_key "key_mpp_mpi key_nproci=1 key_nprocj=10"
+#  $ ./Fadd_keys.sh ORCA2_LIM add_key "key_mpp_rep"
 #
 #
@@ -65 +65 @@
  echo "Adding keys in : ${NEW_CONF}" 
  for i in ${list_add_key} ; do
-   if [ "$(echo ${i} | grep -c key_nproc )" -ne 0 ] ; then
-      sed -e "s/key_nproc[ij]=.[0-9]* //"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-            mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-      echo " "
-      sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-            mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-   elif [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then
-   echo "key $i already present in cpp_${NEW_CONF}.fcm" 
+   if [ "$(cat ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm | grep -c "$i" )" -ne 0 ] ; then
+      echo "key $i already present in cpp_${NEW_CONF}.fcm" 
    else
-   sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
-   mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
-   echo "added key $i in ${NEW_CONF}" 
+      sed -e "s/$/ ${i}/"  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm >  ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp
+      mv ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm.tmp   ${CONFIG_DIR}/${NEW_CONF}/cpp_${NEW_CONF}.fcm
+      echo "added key $i in ${NEW_CONF}" 
    fi
  done

branches/2016/dev_CNRS_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
 

branches/2016/dev_CNRS_2016/NEMOGCM/TOOLS/COMPILE/bld_tools.cfg

@@ -29 +29 @@
 bld::excl_dep        inc::netcdf.inc
 bld::excl_dep        use::netcdf
+bld::excl_dep        use::xios
 bld::excl_dep        h::netcdf.inc
 bld::excl_dep        h::mpif.h

branches/2016/dev_CNRS_2016/NEMOGCM/TOOLS/COMPILE/tools.txt

@@ -1 @@
-REBUILD 
+DOMAINcfg