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

Changeset 10466


Ignore:
Timestamp:
2019-01-08T11:15:29+01:00 (4 years ago)
Author:
deazer
Message:

Cosmetic changes to fit coding standards.

Location:
NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/cfgs/SHARED/namelist_ref

    r10456 r10466  
    122122   rn_wdld     =  2.5      !  Land elevation below which WaD is allowed 
    123123   nn_wdit     =   20      !  Max iterations for WaD limiter 
    124    rn_wd_sbcdep =  5.0    !  Depth at which to taper sbc fluxes 
     124   rn_wd_sbcdep =  5.0     !  Depth at which to taper sbc fluxes 
    125125   rn_wd_sbcfra =  0.999   !  Fraction of SBC fluxes at taper depth (Must be <1) 
    126     
    127126/ 
    128127!----------------------------------------------------------------------- 
  • NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/src/OCE/DOM/istate.F90

    r10456 r10466  
    100100            ! 
    101101            sshb(:,:)   = 0._wp               ! set the ocean at rest 
    102             IF(ll_wd) then 
     102            IF( ll_wd ) THEN 
    103103               sshb(:,:) =  -ssh_ref  ! Added in 30 here for bathy that adds 30 as Iterative test CEOD  
    104104               ! 
  • NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/src/OCE/SBC/sbcmod.F90

    r10456 r10466  
    466466!!$!clem: it looks like it is necessary for the north fold (in certain circumstances). Don't know why. 
    467467!!$      CALL lbc_lnk( 'sbcmod', emp, 'T', 1. ) 
    468    IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now 
    469     zthscl = atanh(rn_wd_sbcfra)                     ! taper frac default is .999  
    470     zwdht(:,:) = sshn(:,:) + ht_0(:,:) - rn_wdmin1   ! do this calc of water 
     468      IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now 
     469         zthscl = atanh(rn_wd_sbcfra)                     ! taper frac default is .999  
     470         zwdht(:,:) = sshn(:,:) + ht_0(:,:) - rn_wdmin1   ! do this calc of water 
    471471                                                     ! depth above wd limit once 
    472     WHERE( zwdht(:,:) <= 0.0 ) 
     472         WHERE( zwdht(:,:) <= 0.0 ) 
    473473            taum(:,:) = 0.0 
    474474            utau(:,:) = 0.0 
     
    478478            emp (:,:) = min(emp(:,:),0.0) !can allow puddles to grow but not shrink 
    479479            sfx (:,:) = 0.0 
    480     END WHERE 
    481     zwght(:,:) = tanh(zthscl*zwdht(:,:)) 
    482     WHERE( zwdht(:,:) > 0.0  .and. zwdht(:,:) < rn_wd_sbcdep ) !  5 m hard limit here is arbitrary 
     480         END WHERE 
     481         zwght(:,:) = tanh(zthscl*zwdht(:,:)) 
     482         WHERE( zwdht(:,:) > 0.0  .and. zwdht(:,:) < rn_wd_sbcdep ) !  5 m hard limit here is arbitrary 
    483483            qsr  (:,:) =  qsr(:,:)  * zwght(:,:) 
    484484            qns  (:,:) =  qns(:,:)  * zwght(:,:) 
     
    486486            utau (:,:) =  utau(:,:) * zwght(:,:) 
    487487            vtau (:,:) =  vtau(:,:) * zwght(:,:) 
    488             sfx (:,:) =  sfx(:,:)  * zwght(:,:) 
     488            sfx  (:,:) =  sfx(:,:)  * zwght(:,:) 
    489489            emp  (:,:) =  emp(:,:)  * zwght(:,:) 
    490     END WHERE 
    491    ENDIF 
     490         END WHERE 
     491      ENDIF 
    492492      ! 
    493493      IF( kt == nit000 ) THEN                          !   set the forcing field at nit000 - 1    ! 
Note: See TracChangeset for help on using the changeset viewer.