Changeset 6883

Timestamp:

2016-08-24T10:51:33+02:00 (8 years ago)

Author:

stephenhaddad

Message:

Commented out script code to remove oasis link arguments and corrected iom.F90 to make it compatible with latest revisions of XIOS-1.0.

Location:

branches/UKMO/dev_r6237_moci_GC3/NEMOGCM

Files:

• NEMO/OPA_SRC/IOM/iom.F90 (modified) (3 diffs)
• TOOLS/COMPILE/Fcheck_archfile.sh (modified) (1 diff)

branches/UKMO/dev_r6237_moci_GC3/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -106 +106 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z_bnds
       !!----------------------------------------------------------------------
-#if ! defined key_xios2
-      ALLOCATE( z_bnds(jpk,2) )
-#else
+
       ALLOCATE( z_bnds(2,jpk) )
-#endif
 
       clname = cdname
@@ -192 +189 @@
 
       ! Add vertical grid bounds
-#if ! defined key_xios2
-      z_bnds(:      ,1) = gdepw_1d(:)
-      z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk)
-      z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk)
-#else
       z_bnds(1      ,:) = gdepw_1d(:)
       z_bnds(2,1:jpkm1) = gdepw_1d(2:jpk)
       z_bnds(2,jpk:   ) = gdepw_1d(jpk) + e3t_1d(jpk)
-#endif
 
       CALL iom_set_axis_attr( "deptht", bounds=z_bnds )
@@ -206 +197 @@
       CALL iom_set_axis_attr( "depthv", bounds=z_bnds )
 
-#if ! defined key_xios2
-      z_bnds(:    ,2)  = gdept_1d(:)
-      z_bnds(2:jpk,1)  = gdept_1d(1:jpkm1)
-      z_bnds(1    ,1)  = gdept_1d(1) - e3w_1d(1)
-#else
       z_bnds(2,:    )  = gdept_1d(:)
       z_bnds(1,2:jpk)  = gdept_1d(1:jpkm1)
       z_bnds(1,1    )  = gdept_1d(1) - e3w_1d(1)
-#endif
+      
       CALL iom_set_axis_attr( "depthw", bounds=z_bnds )
 

branches/UKMO/dev_r6237_moci_GC3/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
+# 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