Changeset 2487 for branches

Timestamp:

2010-12-19T16:07:50+01:00 (13 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

Files:

• NST_SRC/agrif_opa_interp.F90 (modified) (5 diffs)
• NST_SRC/agrif_opa_update.F90 (modified) (1 diff)
• OPA_SRC/DYN/dynnxt.F90 (modified) (2 diffs)
• OPA_SRC/DYN/sshwzv.F90 (modified) (3 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -29 +29 @@
    PRIVATE
     
-   PUBLIC   Agrif_tra, Agrif_dyn, interpu, interpv
+   PUBLIC   Agrif_tra, Agrif_dyn, Agrif_ssh, interpu, interpv
 
 #  include "domzgr_substitute.h90"  
@@ -278 +278 @@
          END DO
 
-         sshn(2,:)=sshn(3,:)
-         sshb(2,:)=sshb(3,:)
-
       ENDIF
 
@@ -355 +352 @@
          END DO
 
-         sshn(nlci-1,:)=sshn(nlci-2,:)
-         sshb(nlci-1,:)=sshb(nlci-2,:)        
       ENDIF
 
@@ -426 +421 @@
          END DO
 
-         sshn(:,2)=sshn(:,3)
-         sshb(:,2)=sshb(:,3)
       ENDIF
 
@@ -498 +491 @@
          END DO
 
-         sshn(:,nlcj-1)=sshn(:,nlcj-2)
-         sshb(:,nlcj-1)=sshb(:,nlcj-2)                
       ENDIF
 
    END SUBROUTINE Agrif_dyn
+
+
+   SUBROUTINE Agrif_ssh( kt )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE Agrif_DYN  ***
+      !!----------------------------------------------------------------------  
+      INTEGER, INTENT(in) ::   kt
+      !!
+      !!----------------------------------------------------------------------  
+
+      IF( Agrif_Root() )   RETURN
+
+
+      IF((nbondi == -1).OR.(nbondi == 2)) THEN
+         ssha(2,:)=ssha(3,:)
+         sshn(2,:)=sshn(3,:)
+      ENDIF
+
+      IF((nbondi == 1).OR.(nbondi == 2)) THEN
+         ssha(nlci-1,:)=ssha(nlci-2,:)
+         sshn(nlci-1,:)=sshn(nlci-2,:)        
+      ENDIF
+
+      IF((nbondj == -1).OR.(nbondj == 2)) THEN
+         ssha(:,2)=sshn(:,3)
+         sshn(:,2)=sshb(:,3)
+      ENDIF
+
+      IF((nbondj == 1).OR.(nbondj == 2)) THEN
+         ssha(:,nlcj-1)=ssha(:,nlcj-2)
+         ssha(:,nlcj-1)=sshn(:,nlcj-2)                
+      ENDIF
+
+   END SUBROUTINE Agrif_ssh
 
 

branches/nemo_v3_3_beta/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -93 +93 @@
       !!   *** ROUTINE recompute_diags ***
       !!---------------------------------------------
-      USE divcur
-      USE sshwzv
-!      USE cla
-
       INTEGER, INTENT(in) :: kt
-
-      ta = hdivb
-      sa = rotb
-      Call div_cur(kt)
-
-      hdivb = ta
-      rotb  = sa
-
-!      IF( n_cla == 1 ) CALL div_cla( kt )
-!      CALL wzv( kt )
 
    END SUBROUTINE recompute_diags

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 )
       !