Changeset 8191 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

Timestamp:

2017-06-19T18:16:30+02:00 (7 years ago)

Author:

andmirek

Message:

merge with XIOS restart read branch

File:

• branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -157 +157 @@
       IF( iom_use("e3tdef") )   &
          CALL iom_put( "e3tdef"  , ( ( fse3t_n(:,:,:) - e3t_0(:,:,:) ) / e3t_0(:,:,:) * 100 * tmask(:,:,:) ) ** 2 )
+<<<<<<< .working
       CALL iom_put("tpt_dep", fsdept_n(:,:,:) )
       CALL iom_put("wpt_dep", fsdepw_n(:,:,:) )
+=======
+      CALL iom_put("tpt_dep", fsdept_n(:,:,:) )
+>>>>>>> .merge-right.r7923
 
 
@@ -250 +254 @@
       CALL iom_put( "avt" , avt                        )    ! T vert. eddy diff. coef.
       CALL iom_put( "avm" , avmu                       )    ! T vert. eddy visc. coef.
+#if defined key_zdftke   ||   defined key_esopa
       IF( lk_zdftke ) THEN   
          CALL iom_put( "tke"      , en                               )    ! TKE budget: Turbulent Kinetic Energy   
          CALL iom_put( "tke_niw"  , e_niw                            )    ! TKE budget: Near-inertial waves   
       ENDIF 
+#endif
       CALL iom_put( "avs" , fsavs(:,:,:)               )    ! S vert. eddy diff. coef. (useful only with key_zdfddm)
                                                             ! Log of eddy diff coef