Changeset 10128

Timestamp:

2018-09-13T18:35:13+02:00 (5 years ago)

Author:

jchanut

Message:

ztilde update, #2126: use lbc_lnk_multi + some changes after using more severe compilation options

Location:

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE

Files:

• src/OCE/DOM/domvvl.F90 (modified) (10 diffs)
• tests/COMODO-IW/EXPREF/namelist_cfg (modified) (1 diff)

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE/DOM/domvvl.F90

@@ -579 +579 @@
 !         vn_td(:,:,:) = vn_td(:,:,:) + ztv(:,:,:)
 
-         CALL lbc_lnk( un_td , 'U' , -1.)
-         CALL lbc_lnk( vn_td , 'V' , -1.) 
+         CALL lbc_lnk_multi( un_td, 'U', -1., vn_td, 'V', -1. )     !* local domain boundaries
          !
          CALL dom_vvl_ups_cor( kt, tilde_e3t_a, un_td, vn_td )
@@ -1664 +1663 @@
                   jk = i_int_bot(ji,jj)
                   hsm(ji,jj) = zfrac_bot * e3w_1d(jk)
-!                  dsm(ji,jj) = MAX(dsm(ji,jj), 0.1_wp*ht_0(ji,jj))
+                  dsm(ji,jj) = MAX(dsm(ji,jj), 0.05_wp*ht_0(ji,jj))
                END DO
             END DO
@@ -1672 +1671 @@
                   jk = i_int_bot(ji,jj)
                   hsm(ji,jj) = zfrac_bot * e3w_0(ji,jj,jk)
-!                  dsm(ji,jj) = MAX(dsm(ji,jj), 0.1_wp*ht_0(ji,jj))
+                  dsm(ji,jj) = MAX(dsm(ji,jj), 0.05_wp*ht_0(ji,jj))
                END DO
             END DO
@@ -2117 +2116 @@
       END DO
       
-      CALL lbc_lnk( zwx, 'U', -1. )   ;   CALL lbc_lnk( zwy, 'V', -1. )         ! Lateral boundary conditions
+      CALL lbc_lnk_multi( zwx, 'U', -1., zwy, 'V', -1. )     !* local domain boundaries
 
       ! 4. monotonicity algorithm
@@ -2187 +2186 @@
          END DO
       ENDDO
-
+ 
       ! Compute upstream depths:
       zhu_b(:,:) = 0.e0
@@ -2248 +2247 @@
       ENDIF
 
+      CALL lbc_lnk_multi( zhu_b(:,:), 'U', 1., zhv_b(:,:), 'V', 1. )     !* local domain boundaries
+
       ! Corrective barotropic velocity (times hor. scale factor)
       zbu(:,:) = zbu(:,:)/ (zhu_b(:,:)*umask(:,:,1)+1._wp-umask(:,:,1))
       zbv(:,:) = zbv(:,:)/ (zhv_b(:,:)*vmask(:,:,1)+1._wp-vmask(:,:,1))
-
-      CALL lbc_lnk( zbu(:,:), 'U', -1. )
-      CALL lbc_lnk( zbv(:,:), 'V', -1. )
       
       ! Set corrective fluxes in upstream direction:
@@ -2259 +2257 @@
       zwx(:,:,:) = 0.e0
       zwy(:,:,:) = 0.e0
+
       IF ( ll_shorizd ) THEN
          DO jj = 1, jpjm1
@@ -2309 +2308 @@
          END DO
       ENDIF
-      CALL lbc_lnk( zwx, 'U', -1. )   ;   CALL lbc_lnk( zwy, 'V', -1. )         ! Lateral boundary conditions
+
+      CALL lbc_lnk_multi( zwx, 'U', -1., zwy, 'V', -1. )     !* local domain boundaries
 
       uin(:,:,:) = uin(:,:,:) + zwx(:,:,:)
@@ -2405 +2405 @@
          END DO
       END DO
-
-      CALL lbc_lnk( zbetup, 'T', 1. )   ;   CALL lbc_lnk( zbetdo, 'T', 1. )   ! lateral boundary cond. (unchanged sign)
+      CALL lbc_lnk_multi( zbetup, 'T', 1. , zbetdo, 'T', 1. )   ! lateral boundary cond. (unchanged sign)
 
       ! 3. monotonic flux in the i & j direction (paa & pbb)
@@ -2425 +2424 @@
          END DO
       END DO
-      CALL lbc_lnk( paa, 'U', -1. )   ;   CALL lbc_lnk( pbb, 'V', -1. )   ! lateral boundary condition (changed sign)
+      CALL lbc_lnk_multi( paa, 'U', -1., pbb, 'V', -1. )     !* local domain boundaries
       !
       IF( ln_timing )  CALL timing_stop('nonosc2')

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/tests/COMODO-IW/EXPREF/namelist_cfg

@@ -137 +137 @@
    ln_dyn3d_dmp  =.true.,.true.  !  open boundary condition for baroclinic velocities
    rn_time_dmp   =  0.05,0.05    !  Damping time scale in days
+   rn_time_dmp_out =  0.05,0.05  !  Outflow damping time scale in days
    nn_rimwidth   = 155,155       !  width of the relaxation zone
 /