Changeset 7342 for branches/2016/dev_NOC_2016/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2016-11-25T17:17:41+01:00 (7 years ago)

Author:

acc

Message:

Ticket #1802. Merged in changes from 6998:HEAD of NERC/dev_r6998_ORCHESTRA (BDY changes only). This branch already includes trunk changes up to rev 7161

File:

• branches/2016/dev_NOC_2016/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (6 diffs)

branches/2016/dev_NOC_2016/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -100 +100 @@
          &             cn_ice_lim, nn_ice_lim_dta,                           &
          &             rn_ice_tem, rn_ice_sal, rn_ice_age,                 &
-         &             ln_vol, nn_volctl, nn_rimwidth
+         &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
          !
       NAMELIST/nambdy_index/ ctypebdy, nbdyind, nbdybeg, nbdyend
@@ -209 +209 @@
              dta_bdy(ib_bdy)%ll_u3d = .true.
              dta_bdy(ib_bdy)%ll_v3d = .true.
+          CASE('neumann')
+             IF(lwp) WRITE(numout,*) '      Neumann conditions'
+             dta_bdy(ib_bdy)%ll_u3d = .false.
+             dta_bdy(ib_bdy)%ll_v3d = .false.
+          CASE('zerograd')
+             IF(lwp) WRITE(numout,*) '      Zero gradient for baroclinic velocities'
+             dta_bdy(ib_bdy)%ll_u3d = .false.
+             dta_bdy(ib_bdy)%ll_v3d = .false.
           CASE('zero')
              IF(lwp) WRITE(numout,*) '      Zero baroclinic velocities (runoff case)'
@@ -377 +385 @@
           IF(lwp) WRITE(numout,*) 'No volume correction applied at open boundaries'
           IF(lwp) WRITE(numout,*)
+        ENDIF
+        IF( nb_jpk_bdy > 0 ) THEN
+           IF(lwp) WRITE(numout,*) '*** open boundary will be interpolate in the vertical onto the native grid ***'
+        ELSE
+           IF(lwp) WRITE(numout,*) '*** open boundary will be read straight onto the native grid without vertical interpolation ***'
         ENDIF
      ENDIF
@@ -499 +512 @@
             &      nbrdta(jpbdta, jpbgrd, nb_bdy) )
 
-         ALLOCATE( dta_global(jpbdtau, 1, jpk) )
-         IF ( icount>0 ) ALLOCATE( dta_global2(jpbdtas, nrimmax, jpk) )
+         IF( nb_jpk_bdy>0 ) THEN
+            ALLOCATE( dta_global(jpbdtau, 1, nb_jpk_bdy) )
+            ALLOCATE( dta_global_z(jpbdtau, 1, nb_jpk_bdy) )
+            ALLOCATE( dta_global_dz(jpbdtau, 1, nb_jpk_bdy) )
+         ELSE
+            ALLOCATE( dta_global(jpbdtau, 1, jpk) )
+            ALLOCATE( dta_global_z(jpbdtau, 1, jpk) ) ! needed ?? TODO
+            ALLOCATE( dta_global_dz(jpbdtau, 1, jpk) )! needed ?? TODO
+         ENDIF
+
+         IF ( icount>0 ) THEN
+            IF( nb_jpk_bdy>0 ) THEN
+               ALLOCATE( dta_global2(jpbdtas, nrimmax, nb_jpk_bdy) )
+               ALLOCATE( dta_global2_z(jpbdtas, nrimmax, nb_jpk_bdy) )
+               ALLOCATE( dta_global2_dz(jpbdtas, nrimmax, nb_jpk_bdy) )
+            ELSE
+               ALLOCATE( dta_global2(jpbdtas, nrimmax, jpk) )
+               ALLOCATE( dta_global2_z(jpbdtas, nrimmax, jpk) ) ! needed ?? TODO
+               ALLOCATE( dta_global2_dz(jpbdtas, nrimmax, jpk) )! needed ?? TODO  
+            ENDIF
+         ENDIF
          ! 
       ENDIF
@@ -1092 +1124 @@
       !          = 0  elsewhere   
  
+      bdytmask(:,:) = ssmask(:,:)
+
       IF( ln_mask_file ) THEN
          CALL iom_open( cn_mask_file, inum )
@@ -1108 +1142 @@
          CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond.
 
-
-         ! Mask corrections
-         ! ----------------
-         DO ik = 1, jpkm1
-            DO ij = 1, jpj
-               DO ii = 1, jpi
-                  tmask(ii,ij,ik) = tmask(ii,ij,ik) * bdytmask(ii,ij)
-                  umask(ii,ij,ik) = umask(ii,ij,ik) * bdyumask(ii,ij)
-                  vmask(ii,ij,ik) = vmask(ii,ij,ik) * bdyvmask(ii,ij)
-               END DO      
-            END DO
-            DO ij = 2, jpjm1
-               DO ii = 2, jpim1
-                  fmask(ii,ij,ik) = fmask(ii,ij,ik) * bdytmask(ii,ij  ) * bdytmask(ii+1,ij  )   &
-                     &                              * bdytmask(ii,ij+1) * bdytmask(ii+1,ij+1)
-               END DO      
-            END DO
-         END DO
-         tmask_i (:,:) = ssmask(:,:) * tmask_i(:,:)
-         !
       ENDIF ! ln_mask_file=.TRUE.
       
-      bdytmask(:,:) = ssmask(:,:)
       IF( .NOT.ln_mask_file ) THEN
          ! If .not. ln_mask_file then we need to derive mask on U and V grid from mask on T grid here.