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 10854 for branches – NEMO

Changeset 10854 for branches


Ignore:
Timestamp:
2019-04-09T12:31:34+02:00 (5 years ago)
Author:
kingr
Message:

Minor changes to allow merging with OBS branch and tr@5518.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_coupling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r10478 r10854  
    122122      !!                ***  FUNCTION zdf_gls_alloc  *** 
    123123      !!---------------------------------------------------------------------- 
    124       ALLOCATE( mxln(jpi,jpj,jpk) , zwall(jpi,jpj,jpk) ,     &  
    125          &      ustars2(jpi,jpj)  , ustarb2(jpi,jpj)   ,     &  
     124      ALLOCATE( mxln(jpi,jpj,jpk), zwall(jpi,jpj,jpk) ,     & 
    126125         &      rsbc_tke1(jpi,jpj), rsbc_tke3(jpi,jpj) ,     &  
    127          &      rsbc_psi1(jpi,jpj), rtrans(jpi,jpj), STAT= zdf_gls_alloc ) 
     126         &      rsbc_psi1(jpi,jpj), rtrans(jpi,jpj),         & 
     127         &      ustars2(jpi,jpj), ustarb2(jpi,jpj)                      , STAT= zdf_gls_alloc ) 
    128128         ! 
    129129      IF( lk_mpp             )   CALL mpp_sum ( zdf_gls_alloc ) 
     
    410410      !  
    411411      ! One level below 
    412       en(:,:,2) = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1_default * ((zhsro(:,:)+fsdepw(:,:,2)) & 
    413           &            / zhsro(:,:) )**(1.5_wp*ra_sf))**(2._wp/3._wp) 
     412      en(:,:,2) = rc02r * ustars2(:,:) * (1._wp + rsbc_tke1_default * ((zhsro(:,:)+fsdepw(:,:,2))/zhsro(:,:) )**(1.5_wp*ra_sf))**(2._wp/3._wp) 
    414413      en(:,:,2) = MAX(en(:,:,2), rn_emin ) 
    415414      z_elem_a(:,:,2) = 0._wp  
     
    431430      z_elem_a(:,:,2) = 0._wp 
    432431      zkar(:,:)       = (rl_sf + (vkarmn-rl_sf)*(1.-exp(-rtrans_default*fsdept(:,:,1)/zhsro(:,:)) )) 
    433       zflxs(:,:)      = rsbc_tke2 * ustars2(:,:)**1.5_wp * zkar(:,:) & 
    434            &                      * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5_wp*ra_sf) 
     432      zflxs(:,:)      = rsbc_tke2 * ustars2(:,:)**1.5_wp * zkar(:,:) * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5_wp*ra_sf) 
    435433 
    436434      en(:,:,2) = en(:,:,2) + zflxs(:,:)/fse3w(:,:,2) 
Note: See TracChangeset for help on using the changeset viewer.