Changeset 3584 for branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/LIM_SRC_2

Timestamp:

2012-11-16T17:21:47+01:00 (12 years ago)

Author:

cetlod

Message:

Add in branch 2012/dev_LOCEAN_2012 changes from dev_r3438_LOCEAN15_PISLOB & dev_r3387_LOCEAN6_AGRIF_LIM, see ticket 1000

Location:

branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/LIM_SRC_2

Files:

• limrhg_2.F90 (modified) (3 diffs)
• limtrp_2.F90 (modified) (3 diffs)

branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90

@@ -30 +30 @@
    USE in_out_manager ! I/O manager
    USE prtctl         ! Print control
+#if defined key_agrif
+   USE agrif_lim2_interp ! nesting
+#endif
 
    IMPLICIT NONE
@@ -129 +132 @@
 !i    zviszeta(:,jpj+1) = 0._wp    ;    zviseta(:,jpj+1) = 0._wp
 
+#if defined key_agrif
+      ! load the boundary value of velocity in special array zuive and zvice
+      CALL agrif_rhg_lim2_load
+#endif
 
       ! Ice mass, ice strength, and wind stress at the center            |
@@ -533 +540 @@
             CALL lbc_lnk( zv_n(:,1:jpj), 'I', -1. )
 
+#if defined key_agrif
+            ! copy the boundary value from u_ice_nst and v_ice_nst to u_ice and v_ice
+            ! before next interations
+            CALL agrif_rhg_lim2(zu_n,zv_n)
+#endif
+
             ! Test of Convergence
             DO jj = k_j1+1 , k_jpj-1

branches/2012/dev_LOCEAN_2012/NEMOGCM/NEMO/LIM_SRC_2/limtrp_2.F90

@@ -28 +28 @@
    USE lib_mpp         ! MPP library
    USE wrk_nemo        ! work arrays
+# if defined key_agrif
+   USE agrif_lim2_interp ! nesting
+# endif
 
    IMPLICIT NONE
@@ -80 +83 @@
 
       IF( kt == nit000  )   CALL lim_trp_init_2      ! Initialization (first time-step only)
+
+# if defined key_agrif
+      CALL agrif_trp_lim2_load      ! First interpolation
+# endif
 
       zsm(:,:) = area(:,:)
@@ -269 +276 @@
       ENDIF
       !
+# if defined key_agrif
+      CALL agrif_trp_lim2      ! Fill boundaries of the fine grid
+# endif
+      ! 
       CALL wrk_dealloc( jpi, jpj, zui_u , zvi_v , zsm, zs0ice, zs0sn , zs0a, zs0c0 , zs0c1 , zs0c2 , zs0st )
       !