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 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90 – NEMO

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

    r3610 r4147  
    3737   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   rrau   !: heat/salt buoyancy flux ratio 
    3838 
    39    !                                  !!* Namelist namzdf_ddm : double diffusive mixing * 
    40    REAL(wp) ::   rn_avts  = 1.e-4_wp  ! maximum value of avs for salt fingering 
    41    REAL(wp) ::   rn_hsbfr = 1.6_wp    ! heat/salt buoyancy flux ratio 
     39   !                      !!* Namelist namzdf_ddm : double diffusive mixing * 
     40   REAL(wp) ::   rn_avts  ! maximum value of avs for salt fingering 
     41   REAL(wp) ::   rn_hsbfr ! heat/salt buoyancy flux ratio 
    4242 
    4343   !! * Substitutions 
    … …  
    213213      !!---------------------------------------------------------------------- 
    214214      NAMELIST/namzdf_ddm/ rn_avts, rn_hsbfr 
    215       !!---------------------------------------------------------------------- 
    216       ! 
    217       REWIND( numnam )                ! Read Namelist namzdf_ddm : double diffusion mixing scheme 
    218       READ  ( numnam, namzdf_ddm ) 
     215      INTEGER  ::   ios                 ! Local integer output status for namelist read 
     216      !!---------------------------------------------------------------------- 
     217      ! 
     218      REWIND( numnam_ref )              ! Namelist namzdf_ddm in reference namelist : Double diffusion mixing scheme 
     219      READ  ( numnam_ref, namzdf_ddm, IOSTAT = ios, ERR = 901) 
     220901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in reference namelist', lwp ) 
     221 
     222      REWIND( numnam_cfg )              ! Namelist namzdf_ddm in configuration namelist : Double diffusion mixing scheme 
     223      READ  ( numnam_cfg, namzdf_ddm, IOSTAT = ios, ERR = 902 ) 
     224902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_ddm in configuration namelist', lwp ) 
     225      WRITE ( numond, namzdf_ddm ) 
    219226      ! 
    220227      IF(lwp) THEN                    ! Parameter print 
Note: See TracChangeset for help on using the changeset viewer.