Changeset 10020 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2018-07-31T17:47:55+02:00 (6 years ago)

Author:

marc

Message:

GMED ticket 406. CPP key fixes.

Location:

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (1 diff)
• TRA/traadv_tvd.F90 (modified) (1 diff)
• TRD/trdken.F90 (modified) (2 diffs)

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

@@ -253 +253 @@
       CALL iom_put( "avt" , avt                        )    ! T vert. eddy diff. coef.
       CALL iom_put( "avm" , avmu                       )    ! T vert. eddy visc. coef.
+#if defined key_zdftke
       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

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -33 +33 @@
    USE wrk_nemo       ! Memory Allocation
    USE timing         ! Timing
+   USE phycst         ! Physical constants
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
    USE iom

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRD/trdken.F90

@@ -195 +195 @@
                     CALL ken_p2k( kt , zke )
                       CALL iom_put( "ketrd_convP2K", zke )     ! conversion -rau*g*w
+# if defined key_ldfslp || key_esopa
         CASE( jpdyn_eivke )
             ! CMIP6 diagnostic tknebto = tendency of KE from
@@ -216 +217 @@
             CALL iom_put("ketrd_eiv", zke2d)
             CALL wrk_dealloc( jpi, jpj, zke2d )
+#endif
          !
       END SELECT