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 7931 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90 – NEMO

Ignore:
Timestamp:
2017-04-19T12:15:07+02:00 (7 years ago)
Author:
gm
Message:

#1880 (HPC-09): remove key_zdfddm + phasing with last changes of HPC08 branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90

    r7753 r7931  
    4444 
    4545   !! * Substitutions 
    46 #  include "zdfddm_substitute.h90" 
    4746#  include "vectopt_loop_substitute.h90" 
    4847   !!---------------------------------------------------------------------- 
     
    6665      !!      It is computed using a backward time scheme (t=after field) 
    6766      !!      which provide directly the after tracer field. 
    68       !!      If lk_zdfddm=T, use avs for salinity or for passive tracers 
     67      !!      If ln_zdfddm=T, use avs for salinity or for passive tracers 
    6968      !!      Surface and bottom boundary conditions: no diffusive flux on 
    7069      !!      both tracers (bottom, applied through the masked field avt). 
     
    102101         ! Build matrix if temperature or salinity (only in double diffusion case) or first passive tracer 
    103102         ! 
    104          IF(  ( cdtype == 'TRA' .AND. ( jn == jp_tem .OR. ( jn == jp_sal .AND. lk_zdfddm ) ) ) .OR.   & 
     103         IF(  ( cdtype == 'TRA' .AND. ( jn == jp_tem .OR. ( jn == jp_sal .AND. ln_zdfddm ) ) ) .OR.   & 
    105104            & ( cdtype == 'TRC' .AND. jn == 1 )  )  THEN 
    106105            ! 
    107106            ! vertical mixing coef.: avt for temperature, avs for salinity and passive tracers 
    108             IF( cdtype == 'TRA' .AND. jn == jp_tem ) THEN   ;   zwt(:,:,2:jpk) = avt  (:,:,2:jpk) 
    109             ELSE                                            ;   zwt(:,:,2:jpk) = fsavs(:,:,2:jpk) 
     107            IF( cdtype == 'TRA' .AND. jn == jp_tem ) THEN   ;   zwt(:,:,2:jpk) = avt(:,:,2:jpk) 
     108            ELSE                                            ;   zwt(:,:,2:jpk) = avs(:,:,2:jpk) 
    110109            ENDIF 
    111110            zwt(:,:,1) = 0._wp 
Note: See TracChangeset for help on using the changeset viewer.