Changeset 392 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2006-03-10T11:55:45+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• add agrif to dynspg_flt_jki.F90
• cosmetic change of key_AGRIF in key_agrif

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• divcur.F90 (modified) (2 diffs)
• dynnxt.F90 (modified) (2 diffs)
• dynspg_flt.F90 (modified) (3 diffs)
• dynspg_flt_jki.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DYN/divcur.F90

@@ -130 +130 @@
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
 #endif         
-#if defined key_AGRIF
+#if defined key_agrif
          if ( .NOT. AGRIF_Root() ) then
             IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east
@@ -334 +334 @@
          IF( lp_obc_south )   hdivn(nis0  :nis1  ,njs0  :njs1  ,jk) = 0.e0      ! south
 #endif         
-#if defined key_AGRIF
+#if defined key_agrif
          if ( .NOT. AGRIF_Root() ) then
             IF ((nbondi ==  1).OR.(nbondi == 2)) hdivn(nlci-1 , :     ,jk) = 0.e0      ! east

trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -135 +135 @@
          !                                             ! ===============
 # endif
-# if defined key_AGRIF
+# if defined key_agrif
          !                                             ! ===============
       END DO                                           !   End of slab
@@ -178 +178 @@
       ENDIF
 
-#if defined key_AGRIF
+#if defined key_agrif
       IF (.NOT.Agrif_Root())    CALL Agrif_Update_Dyn( kt )
 #endif      

trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -171 +171 @@
       CALL obc_vol( kt )
 #endif
-#if defined key_AGRIF
+#if defined key_agrif
       ! Update velocities on each coarse/fine interfaces
 
@@ -239 +239 @@
       IF( nsolv == 4 )   CALL lbc_lnk_e( gcb, c_solver_pt, 1. )   
 
-#if defined key_AGRIF
+#if defined key_agrif
 
        If (.NOT.AGRIF_ROOT()) THEN
@@ -315 +315 @@
       END DO
 
-#if defined key_AGRIF      
+#if defined key_agrif      
       IF (.NOT. Agrif_Root()) THEN
       ! caution : grad D (fine) = grad D (coarse) at coarse/fine interface

trunk/NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90

@@ -37 +37 @@
    USE prtctl          ! Print control
    USE in_out_manager  ! I/O manager
+   USE agrif_opa_interp
 
    IMPLICIT NONE
@@ -178 +179 @@
          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
       IF( n_cla == 1 )   CALL dyn_spg_cla( kt )      ! Cross Land Advection (Update (ua,va))
@@ -237 +244 @@
       ! 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
 
       !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -310 +335 @@
          END DO
          
+#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
          ! -----------------------------------------------------------