Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -52 +52 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   hkpp     !: boundary layer depth
 
-   !                                        !!* Namelist namzdf_kpp *
-   REAL(wp) ::   rn_difmiw  =  1.2e-04_wp    ! constant internal wave viscosity (m2/s)
-   REAL(wp) ::   rn_difsiw  =  1.2e-05_wp    ! constant internal wave diffusivity (m2/s)
-   REAL(wp) ::   rn_riinfty =  0.8_wp        ! local Richardson Number limit for shear instability
-   REAL(wp) ::   rn_difri   =  5.e-03_wp     ! maximum shear mixing at Rig = 0    (m2/s)
-   REAL(wp) ::   rn_bvsqcon = -1.e-09_wp     ! Brunt-Vaisala squared (1/s**2) for maximum convection
-   REAL(wp) ::   rn_difcon  =  1._wp         ! maximum mixing in interior convection (m2/s)
-   INTEGER  ::   nn_ave     =  1             ! = 0/1 flag for horizontal average on avt, avmu, avmv
+   !                          !!* Namelist namzdf_kpp *
+   REAL(wp) ::   rn_difmiw     ! constant internal wave viscosity (m2/s)
+   REAL(wp) ::   rn_difsiw     ! constant internal wave diffusivity (m2/s)
+   REAL(wp) ::   rn_riinfty    ! local Richardson Number limit for shear instability
+   REAL(wp) ::   rn_difri      ! maximum shear mixing at Rig = 0    (m2/s)
+   REAL(wp) ::   rn_bvsqcon    ! Brunt-Vaisala squared (1/s**2) for maximum convection
+   REAL(wp) ::   rn_difcon     ! maximum mixing in interior convection (m2/s)
+   INTEGER  ::   nn_ave        ! = 0/1 flag for horizontal average on avt, avmu, avmv
 
 #if defined key_zdfddm
@@ -67 +67 @@
    REAL(wp) ::   difsdc  = 1.5e-06_wp        ! maximum diffusive convection mixing
 #endif
-   LOGICAL  ::   ln_kpprimix  = .TRUE.       ! Shear instability mixing 
+   LOGICAL  ::   ln_kpprimix       ! Shear instability mixing 
 
    !                                        !!! ** General constants  **
@@ -1382 +1382 @@
       REAL(wp) ::   zustar, zucube, zustvk, zeta, zehat   ! tempory scalars
 #endif
+      INTEGER  ::   ios            ! Local integer output status for namelist read
       REAL(wp) ::   zhbf           ! tempory scalars
       LOGICAL  ::   ll_kppcustom   ! 1st ocean level taken as surface layer
@@ -1391 +1392 @@
       IF( nn_timing == 1 )  CALL timing_start('zdf_kpp_init')
       !
-      REWIND ( numnam )               ! Read Namelist namkpp : K-Profile Parameterisation
-      READ   ( numnam, namzdf_kpp )
+      REWIND( numnam_ref )              ! Namelist namzdf_kpp in reference namelist : Vertical eddy diffivity and viscosity using kpp turbulent closure scheme
+      READ  ( numnam_ref, namzdf_kpp, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_kpp in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namzdf_kpp in configuration namelist : Vertical eddy diffivity and viscosity using kpp turbulent closure scheme
+      READ  ( numnam_cfg, namzdf_kpp, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_kpp in configuration namelist', lwp )
+      WRITE ( numond, namzdf_kpp )
 
       IF(lwp) THEN                    ! Control print