Changeset 10466 for NEMO/branches/UKMO

Timestamp:

2019-01-08T11:15:29+01:00 (5 years ago)

Author:

deazer

Message:

Cosmetic changes to fit coding standards.

Location:

NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX

Files:

• cfgs/SHARED/namelist_ref (modified) (1 diff)
• src/OCE/DOM/istate.F90 (modified) (1 diff)
• src/OCE/SBC/sbcmod.F90 (modified) (3 diffs)

NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/cfgs/SHARED/namelist_ref

@@ -122 +122 @@
    rn_wdld     =  2.5      !  Land elevation below which WaD is allowed
    nn_wdit     =   20      !  Max iterations for WaD limiter
-   rn_wd_sbcdep =  5.0    !  Depth at which to taper sbc fluxes
+   rn_wd_sbcdep =  5.0     !  Depth at which to taper sbc fluxes
    rn_wd_sbcfra =  0.999   !  Fraction of SBC fluxes at taper depth (Must be <1)
-   
 /
 !-----------------------------------------------------------------------

NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/src/OCE/DOM/istate.F90

@@ -100 +100 @@
             !
             sshb(:,:)   = 0._wp               ! set the ocean at rest
-            IF(ll_wd) then
+            IF( ll_wd ) THEN
                sshb(:,:) =  -ssh_ref  ! Added in 30 here for bathy that adds 30 as Iterative test CEOD 
                !

NEMO/branches/UKMO/dev_10448_WAD_SBC_BUGFIX/src/OCE/SBC/sbcmod.F90

@@ -466 +466 @@
 !!$!clem: it looks like it is necessary for the north fold (in certain circumstances). Don't know why.
 !!$      CALL lbc_lnk( 'sbcmod', emp, 'T', 1. )
-   IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now
-    zthscl = atanh(rn_wd_sbcfra)                     ! taper frac default is .999 
-    zwdht(:,:) = sshn(:,:) + ht_0(:,:) - rn_wdmin1   ! do this calc of water
+      IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now
+         zthscl = atanh(rn_wd_sbcfra)                     ! taper frac default is .999 
+         zwdht(:,:) = sshn(:,:) + ht_0(:,:) - rn_wdmin1   ! do this calc of water
                                                      ! depth above wd limit once
-    WHERE( zwdht(:,:) <= 0.0 )
+         WHERE( zwdht(:,:) <= 0.0 )
             taum(:,:) = 0.0
             utau(:,:) = 0.0
@@ -478 +478 @@
             emp (:,:) = min(emp(:,:),0.0) !can allow puddles to grow but not shrink
             sfx (:,:) = 0.0
-    END WHERE
-    zwght(:,:) = tanh(zthscl*zwdht(:,:))
-    WHERE( zwdht(:,:) > 0.0  .and. zwdht(:,:) < rn_wd_sbcdep ) !  5 m hard limit here is arbitrary
+         END WHERE
+         zwght(:,:) = tanh(zthscl*zwdht(:,:))
+         WHERE( zwdht(:,:) > 0.0  .and. zwdht(:,:) < rn_wd_sbcdep ) !  5 m hard limit here is arbitrary
             qsr  (:,:) =  qsr(:,:)  * zwght(:,:)
             qns  (:,:) =  qns(:,:)  * zwght(:,:)
@@ -486 +486 @@
             utau (:,:) =  utau(:,:) * zwght(:,:)
             vtau (:,:) =  vtau(:,:) * zwght(:,:)
-            sfx (:,:)  =  sfx(:,:)  * zwght(:,:)
+            sfx  (:,:) =  sfx(:,:)  * zwght(:,:)
             emp  (:,:) =  emp(:,:)  * zwght(:,:)
-    END WHERE
-   ENDIF
+         END WHERE
+      ENDIF
       !
       IF( kt == nit000 ) THEN                          !   set the forcing field at nit000 - 1    !