Changeset 4245 for branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90

Timestamp:

2013-11-19T12:19:21+01:00 (10 years ago)

Author:

cetlod

Message:

dev_locean_cmcc_ingv_ukmo_merc : merge in the MERC_UKMO dev branch with trunk rev 4119

File:

• branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90 (copied) (copied from branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90) (3 diffs)

branches/2013/dev_LOCEAN_CMCC_INGV_MERC_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90

@@ -29 +29 @@
 
    !                                               !!* namelist namtra_adv_mle *
-   LOGICAL, PUBLIC ::   ln_mle    = .TRUE.          ! flag to activate the Mixed Layer Eddy (MLE) parameterisation
-   INTEGER         ::   nn_mle    = 0               ! MLE type: =0 standard Fox-Kemper ; =1 new formulation
-   INTEGER         ::   nn_mld_uv = 0               ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max)
-   INTEGER         ::   nn_conv   = 0               ! =1 no MLE in case of convection ; =0 always MLE
-   REAL(wp)        ::   rn_ce   = 0.06_wp           ! MLE coefficient
-   !                                                ! parameters used in nn_mle = 0 case
-   REAL(wp)        ::   rn_lf   = 5.e+3_wp               ! typical scale of mixed layer front
-   REAL(wp)        ::   rn_time = 2._wp * 86400._wp      ! time scale for mixing momentum across the mixed layer
-   !                                                ! parameters used in nn_mle = 1 case
-   REAL(wp)        ::   rn_lat  = 20._wp                 ! reference latitude for a 5 km scale of ML front
-   REAL(wp)        ::   rn_rho_c_mle  = 0.01        ! Density criterion for definition of MLD used by FK
+   LOGICAL, PUBLIC ::   ln_mle              ! flag to activate the Mixed Layer Eddy (MLE) parameterisation
+   INTEGER         ::   nn_mle              ! MLE type: =0 standard Fox-Kemper ; =1 new formulation
+   INTEGER         ::   nn_mld_uv           ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max)
+   INTEGER         ::   nn_conv             ! =1 no MLE in case of convection ; =0 always MLE
+   REAL(wp)        ::   rn_ce               ! MLE coefficient
+   !                                           ! parameters used in nn_mle = 0 case
+   REAL(wp)        ::   rn_lf                  ! typical scale of mixed layer front
+   REAL(wp)        ::   rn_time             ! time scale for mixing momentum across the mixed layer
+   !                                             ! parameters used in nn_mle = 1 case
+   REAL(wp)        ::   rn_lat                   ! reference latitude for a 5 km scale of ML front
+   REAL(wp)        ::   rn_rho_c_mle         ! Density criterion for definition of MLD used by FK
 
    REAL(wp) ::   r5_21 = 5.e0 / 21.e0   ! factor used in mle streamfunction computation
@@ -271 +271 @@
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   ierr
+      INTEGER ::    ios                 ! Local integer output status for namelist read
       REAL(wp) ::   z1_t2, zfu, zfv                                !    -         -
       !
@@ -276 +277 @@
       !!----------------------------------------------------------------------
 
-      REWIND ( numnam )                ! Read Namelist namtra_adv_mle : mixed layer eddy advection acting on tracers
-      READ   ( numnam, namtra_adv_mle )
+
+      REWIND( numnam_ref )              ! Namelist namtra_adv_mle in reference namelist : Tracer advection scheme
+      READ  ( numnam_ref, namtra_adv_mle, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_adv_mle in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namtra_adv_mle in configuration namelist : Tracer advection scheme
+      READ  ( numnam_cfg, namtra_adv_mle, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_adv_mle in configuration namelist', lwp )
+      WRITE ( numond, namtra_adv_mle )
 
       IF(lwp) THEN                     ! Namelist print