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 3804 for branches/2012/dev_v3_4_STABLE_2012 – NEMO

Ignore:
Timestamp:
2013-02-12T14:16:51+01:00 (11 years ago)
Author:
cbricaud
Message:

add same modifications than TKE to have any impact of evd,tmx,ddm on the turbulent closure solution ; see ticket 954

Location:
branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfevd.F90

    r3294 r3804  
    1919   USE zdf_oce         ! ocean vertical physics variables 
    2020   USE zdfkpp          ! KPP vertical mixing 
     21   USE zdfgls          ! GLS vertical mixing 
    2122   USE in_out_manager  ! I/O manager 
    2223   USE iom             ! for iom_put 
     
    6768         IF(lwp) WRITE(numout,*) '~~~~~~~ ' 
    6869         IF(lwp) WRITE(numout,*) 
     70         ! 
     71         IF(lwp .AND. lk_zdfgls )   CALL ctl_warn(' No need zdf_evd with GLS closures ') 
     72         ! 
    6973      ENDIF 
    7074 
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r3558 r3804  
    4545   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   mxln    !: now mixing length 
    4646   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   zwall   !: wall function 
     47   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   avt_k   ! not enhanced Kz 
     48   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   avm_k   ! not enhanced Kz 
     49   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   avmu_k  ! not enhanced Kz 
     50   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   avmv_k  ! not enhanced Kz 
    4751   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ustars2 !: Squared surface velocity scale at T-points 
    4852   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ustarb2 !: Squared bottom  velocity scale at T-points 
     
    120124      !!---------------------------------------------------------------------- 
    121125      ALLOCATE( en(jpi,jpj,jpk),  mxln(jpi,jpj,jpk), zwall(jpi,jpj,jpk) ,     & 
     126         &      avt_k (jpi,jpj,jpk) , avm_k (jpi,jpj,jpk),                    & 
     127         &      avmu_k(jpi,jpj,jpk) , avmv_k(jpi,jpj,jpk),                    & 
    122128         &      ustars2(jpi,jpj), ustarb2(jpi,jpj)                      , STAT= zdf_gls_alloc ) 
    123129         ! 
     
    160166 
    161167      ustars2 = 0._wp   ;   ustarb2 = 0._wp   ;   psi  = 0._wp   ;   zwall_psi = 0._wp 
     168 
     169      IF( kt /= nit000 ) THEN   ! restore before value to compute tke 
     170         avt (:,:,:) = avt_k (:,:,:) 
     171         avm (:,:,:) = avm_k (:,:,:) 
     172         avmu(:,:,:) = avmu_k(:,:,:) 
     173         avmv(:,:,:) = avmv_k(:,:,:)  
     174      ENDIF 
    162175 
    163176      ! Compute surface and bottom friction at T-points 
     
    883896      ENDIF 
    884897      ! 
     898      avt_k (:,:,:) = avt (:,:,:) 
     899      avm_k (:,:,:) = avm (:,:,:) 
     900      avmu_k(:,:,:) = avmu(:,:,:) 
     901      avmv_k(:,:,:) = avmv(:,:,:) 
     902      ! 
    885903      CALL wrk_dealloc( jpi,jpj, zdep, zflxs, zhsro ) 
    886904      CALL wrk_dealloc( jpi,jpj,jpk, eb, mxlb, shear, eps, zwall_psi, z_elem_a, z_elem_b, z_elem_c, psi ) 
     
    12461264         IF(lwp) WRITE(numout,*) '---- gls-rst ----' 
    12471265         CALL iom_rstput( kt, nitrst, numrow, 'en'   , en    ) 
    1248          CALL iom_rstput( kt, nitrst, numrow, 'avt'  , avt   ) 
    1249          CALL iom_rstput( kt, nitrst, numrow, 'avm'  , avm   ) 
    1250          CALL iom_rstput( kt, nitrst, numrow, 'avmu' , avmu  ) 
    1251          CALL iom_rstput( kt, nitrst, numrow, 'avmv' , avmv  ) 
     1266         CALL iom_rstput( kt, nitrst, numrow, 'avt'  , avt_k  ) 
     1267         CALL iom_rstput( kt, nitrst, numrow, 'avm'  , avm_k  ) 
     1268         CALL iom_rstput( kt, nitrst, numrow, 'avmu' , avmu_k ) 
     1269         CALL iom_rstput( kt, nitrst, numrow, 'avmv' , avmv_k ) 
    12521270         CALL iom_rstput( kt, nitrst, numrow, 'mxln' , mxln  ) 
    12531271         ! 
Note: See TracChangeset for help on using the changeset viewer.