Changeset 2486 for trunk/NEMO/OPA_SRC

Timestamp:

2010-12-19T16:07:25+01:00 (13 years ago)

Author:

rblod

Message:

Correct Agrif inconstency for ssh, nemo_v3_2 version, see ticket 669

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynnxt.F90 (modified) (2 diffs)
• sshwzv.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -32 +32 @@
    USE bdydta          ! unstructured open boundary conditions
    USE bdydyn          ! unstructured open boundary conditions
-   USE agrif_opa_update
    USE agrif_opa_interp
    USE in_out_manager  ! I/O manager
@@ -259 +258 @@
       ENDIF
 
-#if defined key_agrif
-      ! Update velocity at AGRIF zoom boundaries
-      IF (.NOT.Agrif_Root())    CALL Agrif_Update_Dyn( kt )
-#endif      
-
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=un, clinfo1=' nxt  - Un: ', mask1=umask,   &
          &                       tab3d_2=vn, clinfo2=' Vn: '       , mask2=vmask )

trunk/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -27 +27 @@
    USE diaar5, ONLY :   lk_diaar5
    USE iom
+   USE agrif_opa_interp
+   USE agrif_opa_update
 
    IMPLICIT NONE
@@ -156 +158 @@
       ssha(:,:) = (  sshb(:,:) - z2dt * ( zraur * emp(:,:) + zhdiv(:,:) )  ) * tmask(:,:,1)
 
+#if defined key_agrif
+      CALL agrif_ssh(kt)
+#endif
 #if defined key_obc
       IF ( Agrif_Root() ) THEN 
@@ -275 +280 @@
       ENDIF
       !
+#if defined key_agrif
+      ! Update velocity at AGRIF zoom boundaries
+      IF (.NOT.Agrif_Root())    CALL Agrif_Update_Dyn( kt )
+#endif
+
       IF(ln_ctl)   CALL prt_ctl(tab2d_1=sshb    , clinfo1=' sshb  - : ', mask1=tmask, ovlap=1 )
       !