Changeset 6354

Timestamp:

2016-02-26T05:06:05+01:00 (8 years ago)

Author:

deazer

Message:

Remove cs15 keys

Location:

branches/UKMO/CO6_KD490/NEMOGCM/NEMO/OPA_SRC

Files:

• BDY/bdydyn2d.F90 (modified) (1 diff)
• DOM/dommsk.F90 (modified) (3 diffs)

branches/UKMO/CO6_KD490/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

@@ -161 +161 @@
 
       z1_2 = 0.5_wp
-#if defined key_cs15
-      z1_2 = 0.0_wp
-#endif
 
       ! ---------------------------------!

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

@@ -136 +136 @@
       INTEGER  ::   ios
       INTEGER  ::   isrow                    ! index for ORCA1 starting row
-#if defined key_bdy && defined key_cs15
-      INTEGER  ::   inum !slwa
-#endif
       INTEGER , POINTER, DIMENSION(:,:) ::  imsk
       REAL(wp), POINTER, DIMENSION(:,:) ::  zwf
@@ -176 +173 @@
          CALL ctl_stop( ctmp1 )
       ENDIF
-!slwa
-! read in mask for unstructured open boundaries
-#if defined key_bdy && defined key_cs15
-         CALL iom_open( 'mask_CS15.nc', inum )
-         CALL iom_get ( inum, jpdom_data, 'bdy_msk', zwf(:,:) )
-         CALL iom_close( inum )
-#endif
-!slwa
 
       ! 1. Ocean/land mask at t-point (computed from mbathy)
@@ -194 +183 @@
             DO ji = 1, jpi
                IF( REAL( mbathy(ji,jj) - jk, wp ) + 0.1_wp >= 0._wp )   tmask(ji,jj,jk) = 1._wp
-#if defined key_bdy && defined key_cs15
-               tmask(ji,jj,jk) = tmask(ji,jj,jk) * zwf(ji,jj)  ! slwa
-#endif
             END DO  
          END DO