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 13832 – NEMO

Changeset 13832


Ignore:
Timestamp:
2020-11-19T16:34:53+01:00 (3 years ago)
Author:
rbb
Message:

#ticket2052 stop for top + correct for NAN at bottom

Location:
NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE/ZDF
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE/ZDF/zdfmfc.F90

    r13826 r13832  
    117117      REAL(wp), DIMENSION(jpi,jpj,2  ) ::   zab, zabm1, zabp ! alpha and beta 
    118118      
     119      REAL(wp), PARAMETER :: zepsilon = 1.e-30                 ! local small value 
     120 
    119121      REAL(wp) :: zrho, zrhop 
    120122      REAL(wp) :: zcnh, znum, zden, zcoef1, zcoef2 
    … …  
    213215         zphpm1(:,:) = zphpm1(:,:) + grav * zraupl(:,:)   * e3t(:,:,jk-1, Kmm) 
    214216         zph(:,:)    = zphm1(:,:)  + grav * zrautb(:,:)   * e3t(:,:,jk  , Kmm) 
     217         zph(:,:)    = MAX( zph(:,:), zepsilon) 
    215218 
    216219         WHERE(zrautbm1 .NE. 0.) zfbuo(:,:)  =  grav * (zraupl(:,:) - zrautbm1(:,:)) / zrautbm1(:,:) 
    … …  
    323326         edmfm(:,:,jk) = (zedmf(:,:,jk+1)  + zedmf(:,:,jk) )*0.5 
    324327      END DO 
     328      edmfm(:,:,jpk) = zedmf(:,:,jpk)  
    325329 
    326330      ! Save variable (on T point) 
    … …  
    348352         edmfc(:,:,jk) =  edmfm(:,:,jk+1) / e3w(:,:,jk+1,Kmm) 
    349353      END DO 
    350       edmfa(:,:,jpk) = -edmfm(:,:,jpk-1) / e3w(:,:,jpk,Kmm) 
    351       edmfb(:,:,jpk) =  edmfm(:,:,jpk  ) / e3w(:,:,jpk,Kmm) 
    352       edmfc(:,:,jpk) =  0. 
     354      edmfa(:,:,jpk)   = -edmfm(:,:,jpk-1) / e3w(:,:,jpk,Kmm) 
     355      edmfb(:,:,jpk)   =  edmfm(:,:,jpk  ) / e3w(:,:,jpk,Kmm) 
     356      edmfc(:,:,jpk)   =  0. 
    353357 
    354358      !--------------------------------------------------------------- 

  • NEMO/branches/2020/dev_r2052_ENHANCE-09_rbourdal_massfluxconvection/src/OCE/ZDF/zdfphy.F90

    r13826 r13832  
    180180      IF( lk_top    .AND. ln_zdfnpc )   CALL ctl_stop( 'zdf_phy_init: npc scheme is not working with key_top' ) 
    181181      IF( lk_top    .AND. ln_zdfosm )   CALL ctl_stop( 'zdf_phy_init: osmosis scheme is not working with key_top' ) 
     182      IF( lk_top    .AND. ln_zdfmfc )   CALL ctl_stop( 'zdf_phy_init: Mass Flux scheme is not working with key_top' ) 
    182183      IF(lwp) THEN 
    183184         WRITE(numout,*) 
Note: See TracChangeset for help on using the changeset viewer.