Changeset 5208 for branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2015-04-13T15:08:59+02:00 (9 years ago)

Author:

davestorkey

Message:

Merge in changes from trunk up to 5021.

File:

• branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (1 diff)

branches/2014/dev_r4650_UKMO11_restart_functionality/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -1154 +1154 @@
          END DO
 
-         tmask_i (:,:) = tmask(:,:,1) * tmask_i(:,:)
+         tmask_i (:,:) = ssmask(:,:) * tmask_i(:,:)
 
       ENDIF ! ln_mask_file=.TRUE.
       
-      bdytmask(:,:) = tmask(:,:,1)
+      bdytmask(:,:) = ssmask(:,:)
       IF( .not. ln_mask_file ) THEN
          ! If .not. ln_mask_file then we need to derive mask on U and V grid