Changeset 2487 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2010-12-19T16:07:50+01:00 (14 years ago)

Author:

rblod

Message:

Correct Agrif inconstency for ssh, nemo_v3_3_beta version, see ticket #669

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

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

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -39 +39 @@
    USE prtctl          ! Print control
 #if defined key_agrif
-   USE agrif_opa_update
    USE agrif_opa_interp
 #endif
@@ -316 +315 @@
       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 )

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -31 +31 @@
    USE iom
    USE sbcrnf, ONLY  : h_rnf, nk_rnf  ! River runoff 
+#if defined key_agrif
+   USE agrif_opa_update
+   USE agrif_opa_interp
+#endif
 #if defined key_asminc   
    USE asminc          ! Assimilation increment
@@ -165 +169 @@
       &                      * tmask(:,:,1)
 
+#if defined key_agrif
+      CALL agrif_ssh(kt)
+#endif
 #if defined key_obc
       IF( Agrif_Root() ) THEN 
@@ -341 +348 @@
       ENDIF
       !
+      ! Update velocity at AGRIF zoom boundaries
+#id defined key_agrif
+      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 )
       !