Changeset 7412 for branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/iom.F90

Timestamp:

2016-12-01T11:30:29+01:00 (8 years ago)

Author:

lovato

Message:

Merge dev_NOC_CMCC_merge_2016 into branch

Location:

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES

Files:

• . (added)
• MY_SRC (added)
• MY_SRC/iom.F90 (copied) (copied from branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90) (3 diffs)

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/iom.F90

@@ -78 +78 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id$
+   !! $Id: iom.F90 6140 2015-12-21 11:35:23Z timgraham $
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -114 +114 @@
       CASE (30)   ;   CALL xios_set_context_attr(TRIM(clname), calendar_type= "D360")
       END SELECT
-      WRITE(cldate,"(i4.4,'-',i2.2,'-',i2.2,' ',i2.2,':',i2.2,':00')") nyear,nmonth,nday,nhour,nminute
+      WRITE(cldate,"(i4.4,'-',i2.2,'-',i2.2,' 00:00:00')") nyear,nmonth,nday 
       CALL xios_set_context_attr(TRIM(clname), start_date=cldate )
 
@@ -172 +172 @@
       z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk)
       z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk)
-      CALL iom_set_axis_attr( "deptht", bounds=z_bnds )
-      CALL iom_set_axis_attr( "depthu", bounds=z_bnds )
-      CALL iom_set_axis_attr( "depthv", bounds=z_bnds )
+      !CALL iom_set_axis_attr( "deptht", bounds=z_bnds )
+      !CALL iom_set_axis_attr( "depthu", bounds=z_bnds )
+      !CALL iom_set_axis_attr( "depthv", bounds=z_bnds )
       z_bnds(:    ,2) = gdept_1d(:)
       z_bnds(2:jpk,1) = gdept_1d(1:jpkm1)
       z_bnds(1    ,1) = gdept_1d(1) - e3w_1d(1)
-      CALL iom_set_axis_attr( "depthw", bounds=z_bnds )
+      !CALL iom_set_axis_attr( "depthw", bounds=z_bnds )
 
 # if defined key_floats