Changeset 11559 for branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2019-09-18T10:53:22+02:00 (5 years ago)

Author:

mattmartin

Message:

Added code to include variable slip condition which is used by orca12 into the main GO6 FOAM branch so that the branch list doesn't need to be different for orca12 and orca025.

File:

• branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -33 +33 @@
    USE domwri
    USE timing          ! Timing
-
+   USE iom             ! For shlat2d
+   USE fldread         ! for sn_shlat2d
+   
    IMPLICIT NONE
    PRIVATE
@@ -141 +143 @@
       REAL(wp), POINTER, DIMENSION(:,:) ::  zwf
       REAL(wp) :: uvt(jpi,jpj)   ! dummy array for masking purposes.
-      !!
-      NAMELIST/namlbc/ rn_shlat, ln_vorlat
+      INTEGER  :: inum             !  logical unit for shlat2d
+      REAL(wp) :: zshlat           !: locally modified shlat for some strait
+      REAL(wp), POINTER, DIMENSION(:,:) :: zshlat2d
+      LOGICAL  :: ln_shlat2d
+      TYPE(FLD_N) :: sn_shlat2d
+      !!
+      NAMELIST/namlbc/ rn_shlat, ln_vorlat, ln_shlat2d, sn_shlat2d
       !!---------------------------------------------------------------------
       !
@@ -177 +184 @@
       ENDIF
 
+      IF ( ln_shlat2d ) THEN
+         IF(lwp) WRITE(numout,*) '         READ shlat as a 2D coefficient in a file '
+         CALL wrk_alloc( jpi, jpj, zshlat2d  )
+         CALL iom_open(sn_shlat2d%clname, inum)
+         CALL iom_get (inum, jpdom_data, sn_shlat2d%clvar, zshlat2d, 1) !
+         CALL iom_close(inum)
+      ENDIF
+      
       ! 1. Ocean/land mask at t-point (computed from mbathy)
       ! -----------------------------
@@ -391 +406 @@
       DO jk = 1, jpk
          zwf(:,:) = fmask(:,:,jk)         
-         DO jj = 2, jpjm1
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               IF( fmask(ji,jj,jk) == 0._wp ) THEN
-                  fmask(ji,jj,jk) = rn_shlat * MIN( 1._wp , MAX( zwf(ji+1,jj), zwf(ji,jj+1),   &
-                     &                                           zwf(ji-1,jj), zwf(ji,jj-1)  )  )
-               ENDIF
-            END DO
-         END DO
+         IF (  ln_shlat2d ) THEN
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  IF( fmask(ji,jj,jk) == 0. ) THEN
+                     fmask(ji,jj,jk) = zshlat2d(ji,jj) * MIN( 1._wp, MAX( zwf(ji+1,jj), zwf(ji,jj+1),   &
+                        &                                              zwf(ji-1,jj), zwf(ji,jj-1)  )  )
+                  ENDIF
+               END DO
+            END DO
+         ELSE
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  IF( fmask(ji,jj,jk) == 0._wp ) THEN
+                     fmask(ji,jj,jk) = rn_shlat * MIN( 1._wp , MAX( zwf(ji+1,jj), zwf(ji,jj+1),   &
+                        &                                           zwf(ji-1,jj), zwf(ji,jj-1)  )  )
+                  ENDIF
+               END DO
+            END DO
+         ENDIF
          DO jj = 2, jpjm1
             IF( fmask(1,jj,jk) == 0._wp ) THEN
@@ -561 +587 @@
       CALL wrk_dealloc( jpi, jpj, imsk )
       CALL wrk_dealloc( jpi, jpj, zwf  )
+      IF ( ln_shlat2d ) THEN
+        CALL wrk_dealloc( jpi, jpj, zshlat2d  )
+      ENDIF
       !
       IF( nn_timing == 1 )  CALL timing_stop('dom_msk')