Changeset 4726 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2014-07-23T18:27:21+02:00 (10 years ago)

Author:

mathiot

Message:

ISF branch: change name of 2 variables (icedep => risfdep and lmask => ssmask), cosmetic changes and add ldfslp key

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (4 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -186 +186 @@
       
       ! (ISF) define barotropic mask and mask the ice shelf point
-      lmask(:,:)=tmask(:,:,1) ! at this stage ice shelf is not masked
+      ssmask(:,:)=tmask(:,:,1) ! at this stage ice shelf is not masked
       
       DO jk = 1, jpk
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF( REAL( micedep(ji,jj) - jk, wp ) - 0.1_wp >= 0._wp )   THEN
+               IF( REAL( misfdep(ji,jj) - jk, wp ) - 0.1_wp >= 0._wp )   THEN
                   tmask(ji,jj,jk) = 0._wp
                END IF
@@ -220 +220 @@
       ! Interior domain mask (used for global sum)
       ! --------------------
-      tmask_i(:,:) = lmask(:,:)            ! (ISH) tmask_i = 1 even on the ice shelf
+      tmask_i(:,:) = ssmask(:,:)            ! (ISH) tmask_i = 1 even on the ice shelf
       iif = jpreci                         ! ???
       iil = nlci - jpreci + 1
@@ -266 +266 @@
       DO jj = 1, jpjm1
          DO ji = 1, fs_jpim1   ! vector loop
-            umask_i(ji,jj)  = lmask(ji,jj) * lmask(ji+1,jj  )  * MIN(1._wp,SUM(umask(ji,jj,:)))
-            vmask_i(ji,jj)  = lmask(ji,jj) * lmask(ji  ,jj+1)  * MIN(1._wp,SUM(vmask(ji,jj,:)))
+            umask_i(ji,jj)  = ssmask(ji,jj) * ssmask(ji+1,jj  )  * MIN(1._wp,SUM(umask(ji,jj,:)))
+            vmask_i(ji,jj)  = ssmask(ji,jj) * ssmask(ji  ,jj+1)  * MIN(1._wp,SUM(vmask(ji,jj,:)))
          END DO
          DO ji = 1, jpim1      ! NO vector opt.
-            fmask_i(ji,jj) =  lmask(ji,jj  ) * lmask(ji+1,jj  )   &
-               &            * lmask(ji,jj+1) * lmask(ji+1,jj+1) * MIN(1._wp,SUM(fmask(ji,jj,:)))
+            fmask_i(ji,jj) =  ssmask(ji,jj  ) * ssmask(ji+1,jj  )   &
+               &            * ssmask(ji,jj+1) * ssmask(ji+1,jj+1) * MIN(1._wp,SUM(fmask(ji,jj,:)))
          END DO
       END DO
@@ -284 +284 @@
       ! 4. ocean/land mask for the elliptic equation
       ! --------------------------------------------
-      bmask(:,:) = lmask(:,:)       ! elliptic equation is written at t-point
+      bmask(:,:) = ssmask(:,:)       ! elliptic equation is written at t-point
       !
       !                               ! Boundary conditions