Changeset 6877 for branches

Timestamp:

2016-08-23T15:31:34+02:00 (8 years ago)

Author:

stephenhaddad

Message:

crum #160: Update to ensure that NEMO treats xios1.0 and xios2.0 the same when sending the bounds.

File:

• branches/UKMO/dev_r6436_linkOasisNoKeys/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (2 diffs)

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

@@ -190 +190 @@
 
       ! 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 )
@@ -204 +199 @@
       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 )