Changeset 7439 for branches/2016/dev_merge_2016

Timestamp:

2016-12-02T12:17:06+01:00 (7 years ago)

Author:

lovato

Message:

#1811 - Reinstate developments from dev_NOC_CMCC branch lost in merge

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/dommsk.F90 (modified) (2 diffs)
• DYN/dynspg_ts.F90 (modified) (1 diff)
• LBC/mppini_2.h90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -95 +95 @@
       !!
       NAMELIST/namlbc/ rn_shlat, ln_vorlat
-      NAMELIST/nambdy/ ln_bdy ,nb_bdy, ln_coords_file, cn_coords_file,         &
-         &             ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta,     &
-         &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &
-         &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
-         &             cn_ice_lim, nn_ice_lim_dta,                           &
-         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                 &
-         &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
       !!---------------------------------------------------------------------
       !
@@ -149 +142 @@
 !SF  add here lbc_lnk: bug not still understood : cause now domain configuration is read !
 !!gm I don't understand why...  
-   CALL lbc_lnk( tmask  , 'T', 1._wp )      ! Lateral boundary conditions
-      
+      CALL lbc_lnk( tmask  , 'T', 1._wp )      ! Lateral boundary conditions
+
+      ! Mask corrections for bdy (read in mppini2)
+      ! ------------------------
+      IF ( ln_bdy .AND. ln_mask_file ) THEN
+         DO jk = 1, jpkm1
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  tmask(ji,jj,jk) = tmask(ji,jj,jk) * bdytmask(ji,jj)
+               END DO
+            END DO
+         END DO
+      ENDIF
+         
       !  Ocean/land mask at u-, v-, and f-points   (computed from tmask)
       ! ----------------------------------------

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -33 +33 @@
    USE dynvor          ! vorticity term
    USE wet_dry         ! wetting/drying flux limter
+   USE bdy_oce         ! open boundary
    USE bdytides        ! open boundary condition data
    USE bdydyn2d        ! open boundary conditions on barotropic variables

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

@@ -67 +67 @@
          ibne  , ibnw  , ibse  , ibsw         !    "           "
       INTEGER,  DIMENSION(jpiglo,jpjglo) ::   imask               ! global workspace
-      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop, zdta    ! global workspace
+      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop          ! global workspace
       REAL(wp) ::   zidom , zjdom          ! local scalars
       NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         &
@@ -116 +116 @@
       IF( ln_bdy .AND. ln_mask_file ) THEN
          CALL iom_open( cn_mask_file, inum )
-         CALL iom_get ( inum, jpdom_unknown, 'bdy_msk', zdta(:,:) )
+         CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) )
          CALL iom_close( inum )
-         WHERE ( zdta(:,:) <= 0. ) imask = 0
+         WHERE ( bdytmask(:,:) <= 0. ) imask = 0
       ENDIF