Changeset 9023 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

Timestamp:

2017-12-13T18:08:50+01:00 (6 years ago)

Author:

timgraham

Message:

Merged METO_MERCATOR branch and resolved all conflicts in OPA_SRC

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (7 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -27 +27 @@
    USE agrif_opa_interp
 #endif
-#if defined key_asminc   
-   USE   asminc       ! Assimilation increment
-#endif
    !
    USE in_out_manager ! I/O manager
@@ -37 +34 @@
    USE lib_mpp        ! MPP library
    USE timing         ! Timing
-   USE wet_dry        ! Wetting/Drying flux limting
+   USE wet_dry        ! Wetting/Drying flux limiting
 
    IMPLICIT NONE
@@ -91 +88 @@
       !                                           !   After Sea Surface Height   !
       !                                           !------------------------------!
-      IF(ln_wd) THEN
+      IF(ln_wd_il) THEN
          CALL wad_lmt(sshb, zcoef * (emp_b(:,:) + emp(:,:)), z2dt)
       ENDIF
@@ -106 +103 @@
       ! 
       ssha(:,:) = (  sshb(:,:) - z2dt * ( zcoef * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * ssmask(:,:)
-
+      !
+#if defined key_agrif
+      CALL agrif_ssh( kt )
+#endif
+      !
       IF ( .NOT.ln_dynspg_ts ) THEN
-         ! These lines are not necessary with time splitting since
-         ! boundary condition on sea level is set during ts loop
-# if defined key_agrif
-         CALL agrif_ssh( kt )
-# endif
          IF( ln_bdy ) THEN
             CALL lbc_lnk( ssha, 'T', 1. )    ! Not sure that's necessary
@@ -118 +114 @@
          ENDIF
       ENDIF
-
-#if defined key_asminc
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN     ! Include the IAU weighted SSH increment
-         CALL ssh_asm_inc( kt )
-         ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:)
-      ENDIF
-#endif
       !                                           !------------------------------!
       !                                           !           outputs            !
@@ -209 +198 @@
       ENDIF
       !
-      IF( ln_timing )   CALL timing_stop('wzv')
+#if defined key_agrif 
+      IF( .NOT. AGRIF_Root() ) THEN 
+         IF ((nbondi ==  1).OR.(nbondi == 2)) wn(nlci-1 , :     ,:) = 0.e0      ! east 
+         IF ((nbondi == -1).OR.(nbondi == 2)) wn(2      , :     ,:) = 0.e0      ! west 
+         IF ((nbondj ==  1).OR.(nbondj == 2)) wn(:      ,nlcj-1 ,:) = 0.e0      ! north 
+         IF ((nbondj == -1).OR.(nbondj == 2)) wn(:      ,2      ,:) = 0.e0      ! south 
+      ENDIF 
+#endif 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('wzv')
       !
    END SUBROUTINE wzv
@@ -246 +244 @@
       ENDIF
       !              !==  Euler time-stepping: no filter, just swap  ==!
-      IF(  ( neuler == 0 .AND. kt == nit000 ) .OR.    &
-         & ( ln_bt_fw    .AND. ln_dynspg_ts )      ) THEN 
+      IF  ( neuler == 0 .AND. kt == nit000 ) THEN
          sshb(:,:) = sshn(:,:)                              ! before <-- now
          sshn(:,:) = ssha(:,:)                              ! now    <-- after  (before already = now)