Changeset 389 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2006-03-09T18:22:04+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• configuration parameters are just integer when agrif is used
• add call to agrif routines with key_agrif

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• divcur.F90 (modified) (3 diffs)
• dynnxt.F90 (modified) (3 diffs)
• dynspg_flt.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/divcur.F90

@@ -117 +117 @@
                hdivn(ji,jj,jk) = (  e2u(ji,jj) * un(ji,jj,jk) - e2u(ji-1,jj  ) * un(ji-1,jj  ,jk)      &
                   &               + e1v(ji,jj) * vn(ji,jj,jk) - e1v(ji  ,jj-1) * vn(ji  ,jj-1,jk)  )   &
-                  &            / ( e1t(ji,jj) * e2t(ji,jj) )
+     &            / ( e1t(ji,jj) * e2t(ji,jj) )
 #endif
             END DO
@@ -130 +130 @@
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
 #endif         
+#if defined key_AGRIF
+         if ( .NOT. AGRIF_Root() ) then
+            IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
+            IF ((nbondi == -1).OR.(nbondi == 2)) hdivn(2      , :     ,jk) = 0.e0      ! west
+            IF ((nbondj ==  1).OR.(nbondj == 2)) hdivn(:      ,nlcj-1 ,jk) = 0.e0      ! north
+            IF ((nbondj == -1).OR.(nbondj == 2)) hdivn(:      ,2      ,jk) = 0.e0      ! south
+         endif
+#endif       
 
          !                                             ! --------
@@ -326 +334 @@
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
 #endif         
+#if defined key_AGRIF
+         if ( .NOT. AGRIF_Root() ) then
+            IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
+            IF ((nbondi == -1).OR.(nbondi == 2)) hdivn(2      , :     ,jk) = 0.e0      ! west
+            IF ((nbondj ==  1).OR.(nbondj == 2)) hdivn(:      ,nlcj-1 ,jk) = 0.e0      ! north
+            IF ((nbondj == -1).OR.(nbondj == 2)) hdivn(:      ,2      ,jk) = 0.e0      ! south
+         endif
+#endif       
          !                                             ! --------
          ! relative vorticity                          !   rot 

trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -19 +19 @@
    USE lbclnk          ! lateral boundary condition (or mpp link)
    USE prtctl          ! Print control
+   USE agrif_opa_update
+   USE agrif_opa_interp
 
    IMPLICIT NONE
@@ -133 +135 @@
          !                                             ! ===============
 # endif
+# if defined key_AGRIF
+         !                                             ! ===============
+      END DO                                           !   End of slab
+      !                                                ! ===============
+      ! Update (ua,va) along open boundaries (only in the rigid-lid case)
+      CALL Agrif_dyn( kt )
+      !                                                ! ===============
+      DO jk = 1, jpkm1                                 ! Horizontal slab
+         !                                             ! ===============
+# endif
 #endif
          ! Time filter and swap of dynamics arrays
@@ -166 +178 @@
       ENDIF
 
+#if defined key_AGRIF
+      IF (.NOT.Agrif_Root())    CALL Agrif_Update_Dyn( kt )
+#endif      
+
    END SUBROUTINE dyn_nxt
 

trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -33 +33 @@
    USE prtctl          ! Print control
    USE in_out_manager  ! I/O manager
+   USE agrif_opa_interp
 
    IMPLICIT NONE
@@ -163 +164 @@
          END DO
       END DO
+
 #if defined key_obc
       ! Update velocities on each open boundary with the radiation algorithm
@@ -168 +170 @@
       ! Correction of the barotropic componant velocity to control the volume of the system
       CALL obc_vol( kt )
+#endif
+#if defined key_AGRIF
+      ! Update velocities on each coarse/fine interfaces
+
+      CALL Agrif_dyn( kt )
+
 #endif
 #if defined key_orca_r2
@@ -230 +238 @@
       ! applied the lateral boundary conditions
       IF( nsolv == 4 )   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
+
+#if defined key_AGRIF
+
+       If (.NOT.AGRIF_ROOT()) THEN
+
+         ! add contribution of gradient of after barotropic transport divergence 
+        IF ((nbondi == -1).OR.(nbondi == 2)) gcb(3,:) = gcb(3,:) &
+                        -znugdt * z2dt*laplacu(2,:)*gcdprc(3,:)*hu(2,:)*e2u(2,:)
+        IF ((nbondi == 1).OR.(nbondi == 2))  gcb(nlci-2,:) = gcb(nlci-2,:) &
+                       +znugdt * z2dt*laplacu(nlci-2,:)*gcdprc(nlci-2,:)*hu(nlci-2,:)*e2u(nlci-2,:)
+        IF ((nbondj == -1).OR.(nbondj == 2)) gcb(:,3) = gcb(:,3) &
+                       -znugdt * z2dt*laplacv(:,2)*gcdprc(:,3)*hv(:,2)*e1v(:,2)
+        IF ((nbondj == 1).OR.(nbondj == 2))  gcb(:,nlcj-2) = gcb(:,nlcj-2) &
+                       +znugdt * z2dt*laplacv(:,nlcj-2)*gcdprc(:,nlcj-2)*hv(:,nlcj-2)*e1v(:,nlcj-2)
+
+       ENDIF
+
+#endif
+
 
       ! Relative precision (computation on one processor)
@@ -288 +315 @@
       END DO
 
-      ! Add the trends multiplied by z2dt to the after velocity
-      ! -------------------------------------------------------
+#if defined key_AGRIF      
+      IF (.NOT. Agrif_Root()) THEN
+      ! caution : grad D (fine) = grad D (coarse) at coarse/fine interface
+        IF ((nbondi == -1).OR.(nbondi == 2)) spgu(2,:) = znugdt * z2dt * laplacu(2,:) * umask(2,:,1)
+        IF ((nbondi == 1).OR.(nbondi == 2)) spgu(nlci-2,:) = znugdt * z2dt * laplacu(nlci-2,:) * umask(nlci-2,:,1)
+        IF ((nbondj == -1).OR.(nbondj == 2)) spgv(:,2) = znugdt * z2dt * laplacv(:,2) * vmask(:,2,1)
+        IF ((nbondj == 1).OR.(nbondj == 2)) spgv(:,nlcj-2) = znugdt * z2dt * laplacv(:,nlcj-2) * vmask(:,nlcj-2,1)
+      ENDIF
+#endif      
+      ! 7.  Add the trends multiplied by z2dt to the after velocity
+      ! -----------------------------------------------------------
       !     ( c a u t i o n : (ua,va) here are the after velocity not the
       !                       trend, the leap-frog time stepping will not