Changeset 6837 for branches/UKMO/dev_r5518_convadj

Timestamp:

2016-08-03T14:09:32+02:00 (8 years ago)

Author:

timgraham

Message:

Added in convective adjustment module and associated changes

Location:

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC

Files:

• TRA/traldf_iso.F90 (modified) (4 diffs)
• ZDF/zdfconvadj.F90 (added)
• step.F90 (modified) (2 diffs)
• step_oce.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90

@@ -32 +32 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
+   USE zdfconvadj
+   USE zdfmxl, ONLY : nmln
 
    IMPLICIT NONE
@@ -103 +105 @@
       REAL(wp)                             , INTENT(in   ) ::   pahtb0     ! background diffusion coef
       !
+      INTEGER  :: zconvadjw, zconvadju, zconvadjv 
       INTEGER  ::  ji, jj, jk, jn   ! dummy loop indices
       INTEGER  ::  ikt
@@ -212 +215 @@
                   zcof2 = - fsahtv(ji,jj,jk) * e1v(ji,jj) * vslp(ji,jj,jk) * zmskv
                   !
-                  zftu(ji,jj,jk ) = (  zabe1 * zdit(ji,jj,jk)   &
+                  IF(ln_convadj .AND. (jk .GT. nmln(ji,jj)) ) THEN
+                     zconvadju = 1 - MAX( convadj_mask(ji,jj), convadj_mask(ji+1,jj) )
+                     zconvadjv = 1 - MAX( convadj_mask(ji,jj), convadj_mask(ji,jj+1) )
+                  ELSE
+                     zconvadju = 1
+                     zconvadjv = 1
+                  END IF
+                  zftu(ji,jj,jk ) = zconvadju * (  zabe1 * zdit(ji,jj,jk)   &
                      &              + zcof1 * (  zdkt (ji+1,jj,jk) + zdk1t(ji,jj,jk)      &
                      &                         + zdk1t(ji+1,jj,jk) + zdkt (ji,jj,jk)  )  ) * umask(ji,jj,jk)
-                  zftv(ji,jj,jk) = (  zabe2 * zdjt(ji,jj,jk)   &
+                  zftv(ji,jj,jk) = zconvadjv * (  zabe2 * zdjt(ji,jj,jk)   &
                      &              + zcof2 * (  zdkt (ji,jj+1,jk) + zdk1t(ji,jj,jk)      &
                      &                         + zdk1t(ji,jj+1,jk) + zdkt (ji,jj,jk)  )  ) * vmask(ji,jj,jk)                  
@@ -296 +306 @@
                      &            + vmask(ji,jj-1,jk-1) + vmask(ji,jj  ,jk), 1.  )
                   !
-                  zcoef3 = zcoef0 * e2t(ji,jj) * zmsku * wslpi (ji,jj,jk)
-                  zcoef4 = zcoef0 * e1t(ji,jj) * zmskv * wslpj (ji,jj,jk)
+                  IF(ln_convadj .AND. ( jk .GT. nmln(ji,jj)) ) THEN
+                     zconvadjw = 1 - convadj_mask(ji,jj)
+                  ELSE
+                     zconvadjw = 1
+                  ENDIF
+                  zcoef3 = zcoef0 * e2t(ji,jj) * zmsku * wslpi (ji,jj,jk) * zconvadjw
+                  zcoef4 = zcoef0 * e1t(ji,jj) * zmskv * wslpj (ji,jj,jk) * zconvadjw
                   !
                   ztfw(ji,jj,jk) = zcoef3 * (   zdit(ji  ,jj  ,jk-1) + zdit(ji-1,jj  ,jk)      &

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -98 +98 @@
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-      ! Update data, open boundaries, surface boundary condition (including sea-ice)
+      ! Update data, open boundaries, surface boundary condition (including sea-ice), convective adjustment (cliff)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       IF( lk_tide    )   CALL sbc_tide( kstp )
@@ -105 +105 @@
                          CALL bdy_dta ( kstp, time_offset=+1 )   ! update dynamic & tracer data at open boundaries
       ENDIF
+
+      IF( ln_convadj )   CALL zdf_convadj( kstp )     ! Called here so that tsn is updated before rest of physics is called
+
+
                          CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
                                                       ! clem: moved here for bdy ice purpose

branches/UKMO/dev_r5518_convadj/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -84 +84 @@
    USE zdfric           ! Richardson vertical mixing       (zdf_ric routine)
    USE zdfmxl           ! Mixed-layer depth                (zdf_mxl routine)
+   USE zdfconvadj       ! Convective adjustment            (zdf_convadj routine)
 
    USE zpshde           ! partial step: hor. derivative     (zps_hde routine)