Changeset 9562 for branches/UKMO/dev_r5518_GO6_package_moci_xios2/NEMOGCM/TOOLS

Timestamp:

2018-05-08T15:08:55+02:00 (6 years ago)

Author:

stephenhaddad

Message:

MOCI #314: Updated config to work with MOCI build/test suite.

File:

• branches/UKMO/dev_r5518_GO6_package_moci_xios2/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_moci_xios2/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

@@ -180 +180 @@
 
 #- do we need oasis libraries?
-if [ "$2" != "nocpp" ] 
-then
-    use_oasis=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_oasis3 )
-else
-    use_oasis=0
-fi
-for liboa in psmile.MPI1 mct mpeu scrip mpp_io
-do
-    have_liboa=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-l${liboa}" )
-    if [[ ( $use_oasis -eq 0 ) && ( $have_liboa -ge 1 ) ]]
-    then 
-   sed -e "s/-l${liboa}//g" ${COMPIL_DIR}/$1 > ${COMPIL_DIR}/tmp$$
-   mv -f ${COMPIL_DIR}/tmp$$ ${COMPIL_DIR}/$1
-    fi
-done
-
+# comment this out so that we can link against XIOS which is built with oasis3-mct, even if we are not using oasis at this time.
+# if [ "$2" != "nocpp" ] 
+# then
+#     use_oasis=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_oasis3 )
+# else
+#     use_oasis=0
+# fi
+# for liboa in psmile.MPI1 mct mpeu scrip mpp_io
+# do
+#     have_liboa=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-l${liboa}" )
+#     if [[ ( $use_oasis -eq 0 ) && ( $have_liboa -ge 1 ) ]]
+#     then 
+#  sed -e "s/-l${liboa}//g" ${COMPIL_DIR}/$1 > ${COMPIL_DIR}/tmp$$
+#  mv -f ${COMPIL_DIR}/tmp$$ ${COMPIL_DIR}/$1
+#     fi
+# done
+#