New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6843 – NEMO

Changeset 6843


Ignore:
Timestamp:
2016-08-04T15:05:29+02:00 (8 years ago)
Author:
timgraham
Message:

Changes so that nmld gets allocated when nn_etau/=2

Location:
branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/ZDF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfconvadj.F90

    r6838 r6843  
    1616   USE timing          ! Timing 
    1717   USE wrk_nemo        ! Wrk arrays 
    18    USE zdfmxl, ONLY : nmln 
     18   USE zdfmxl 
     19   USE zdftke, ONLY : nn_etau 
    1920 
    2021   IMPLICIT NONE 
     
    170171      USE iom 
    171172 
    172       INTEGER               ::   imask 
     173      INTEGER               ::   imask, ierr 
    173174 
    174175      NAMELIST/namzdf_convadj/ nn_con, cn_convadj_mask, ln_convadj 
     
    176177      REWIND ( numnam_ref )               !* Read Namelist namzdf_tke : Turbulente Kinetic Energy 
    177178      READ   ( numnam_ref, namzdf_convadj ) 
    178  
    179179 
    180180      REWIND ( numnam_cfg )               !* Read Namelist namzdf_tke : Turbulente Kinetic Energy 
     
    197197         CALL iom_get  ( imask, jpdom_autoglo, 'convadj_mask', convadj_mask) 
    198198         CALL iom_close( imask ) 
     199      ENDIF 
     200 
     201      IF( nn_etau /= 2) THEN  ! nmln is only initialised in zdftke if nn_etau=2 
     202          ierr = zdf_mxl_alloc() 
     203          nmln(:,:) = nlb10           ! Initialization of nmln 
    199204      ENDIF 
    200205 
  • branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

    r6839 r6843  
    8080   REAL(wp) ::   rn_emin0  ! surface minimum value of tke   [m2/s2] 
    8181   REAL(wp) ::   rn_bshear ! background shear (>0) currently a numerical threshold (do not change it) 
    82    INTEGER  ::  nn_etau   ! type of depth penetration of surface tke (=0/1/2/3) 
     82   INTEGER , PUBLIC :: nn_etau   ! type of depth penetration of surface tke (=0/1/2/3) 
    8383   INTEGER  ::   nn_htau   ! type of tke profile of penetration (=0/1) 
    8484   REAL(wp) ::   rn_efr    ! fraction of TKE surface value which penetrates in the ocean 
Note: See TracChangeset for help on using the changeset viewer.