Changeset 8090 for branches/2015

Timestamp:

2017-05-30T09:59:39+02:00 (7 years ago)

Author:

cbricaud

Message:

adapt maskland option to CRS

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (2 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -1390 +1390 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmask
       INTEGER  :: ni,nj
+      !!----------------------------------------------------------------------
       
       ni=nlei-nldi+1 ; nj=nlej-nldj+1
@@ -1404 +1405 @@
       IF ( ln_mskland ) THEN
          ! mask land points, keep values on coast line -> specific mask for U, V and W points
-         SELECT CASE ( cdgrd )
-         CASE('T')   ;   zmask(:,:,:)       = tmask(:,:,:)
-         CASE('U')   ;   zmask(2:jpim1,:,:) = tmask(2:jpim1,:,:) + tmask(3:jpi,:,:)   ;   CALL lbc_lnk( zmask, 'U', 1. )
-         CASE('V')   ;   zmask(:,2:jpjm1,:) = tmask(:,2:jpjm1,:) + tmask(:,3:jpj,:)   ;   CALL lbc_lnk( zmask, 'V', 1. )
-         CASE('W')   ;   zmask(:,:,2:jpk  ) = tmask(:,:,1:jpkm1) + tmask(:,:,2:jpk)   ;   zmask(:,:,1) = tmask(:,:,1)
-         END SELECT
+
+         IF( lk_crs .AND. jpi == jpi_crs .AND. jpi .NE. 0  )THEN
+
+            SELECT CASE ( cdgrd )
+            CASE('T')   ;   zmask(:,:,:)       = tmask_crs(:,:,:)
+            CASE('U')   ;   zmask(2:jpim1,:,:) = tmask_crs(2:jpim1,:,:) + tmask_crs(3:jpi,:,:)   ;   CALL crs_lbc_lnk( zmask, 'U', 1. )
+            CASE('V')   ;   zmask(:,2:jpjm1,:) = tmask_crs(:,2:jpjm1,:) + tmask_crs(:,3:jpj,:)   ;   CALL crs_lbc_lnk( zmask, 'V', 1. )
+            CASE('W')   ;   zmask(:,:,2:jpk  ) = tmask_crs(:,:,1:jpkm1) + tmask_crs(:,:,2:jpk)   ;   zmask(:,:,1) = tmask_crs(:,:,1)
+            END SELECT
+
+         ELSE
+
+            SELECT CASE ( cdgrd )
+            CASE('T')   ;   zmask(:,:,:)       = tmask(:,:,:)
+            CASE('U')   ;   zmask(2:jpim1,:,:) = tmask(2:jpim1,:,:) + tmask(3:jpi,:,:)   ;   CALL lbc_lnk( zmask, 'U', 1. )
+            CASE('V')   ;   zmask(:,2:jpjm1,:) = tmask(:,2:jpjm1,:) + tmask(:,3:jpj,:)   ;   CALL lbc_lnk( zmask, 'V', 1. )
+            CASE('W')   ;   zmask(:,:,2:jpk  ) = tmask(:,:,1:jpkm1) + tmask(:,:,2:jpk)   ;   zmask(:,:,1) = tmask(:,:,1)
+            END SELECT
+
+         ENDIF
          !
 #if ! defined key_xios2