Changeset 3566 for branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2012-11-15T19:09:49+01:00 (12 years ago)

Author:

cetlod

Message:

branch dev_r3387_LOCEAN6_AGRIF_LIM: add some corrections to make AGRIF compatible with TOP

Location:

branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/OPA_SRC

Files:

• IOM/prtctl.F90 (modified) (5 diffs)
• nemogcm.F90 (modified) (1 diff)

branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -30 +30 @@
    PUBLIC prt_ctl_info    ! called by all subroutines
    PUBLIC prt_ctl_init    ! called by opa.F90
+   PUBLIC sub_dom         ! called by opa.F90
 
    !!----------------------------------------------------------------------
@@ -419 +420 @@
          nrecil, nrecjl, nldil, nleil, nldjl, nlejl
 
-      INTEGER, DIMENSION(:,:), ALLOCATABLE ::   iimpptl, ijmpptl, ilcitl, ilcjtl   ! workspace
+      INTEGER, POINTER, DIMENSION(:,:) ::   iimpptl, ijmpptl, ilcitl, ilcjtl   ! workspace
       REAL(wp) ::   zidom, zjdom            ! temporary scalars
       !!----------------------------------------------------------------------
 
+      !
+      CALL wrk_alloc( isplt, jsplt, ilcitl, ilcjtl, iimpptl, ijmpptl )
+      !
       !  1. Dimension arrays for subdomains
       ! -----------------------------------
@@ -438 +442 @@
 #endif
 
-      ALLOCATE(ilcitl (isplt,jsplt))
-      ALLOCATE(ilcjtl (isplt,jsplt))
 
       nrecil  = 2 * jpreci
@@ -512 +514 @@
       ! -------------------------------
 
-      ALLOCATE(iimpptl(isplt,jsplt))
-      ALLOCATE(ijmpptl(isplt,jsplt))
-      
       iimpptl(:,:) = 1
       ijmpptl(:,:) = 1
@@ -572 +571 @@
       END DO
       !
-      DEALLOCATE( iimpptl, ijmpptl, ilcitl, ilcjtl )
+      !
+      CALL wrk_dealloc( isplt, jsplt, ilcitl, ilcjtl, iimpptl, ijmpptl )
+      !
       !
    END SUBROUTINE sub_dom

branches/2012/dev_r3387_LOCEAN6_AGRIF_LIM/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -118 +118 @@
       CALL Agrif_Declare_Var_dom   ! AGRIF: set the meshes for DOM
       CALL Agrif_Declare_Var       !  "      "   "   "      "  DYN/TRA 
+# if defined key_top
+      CALL Agrif_Declare_Var_top   !  "      "   "   "      "  TOP
+# endif
 # if defined key_lim2
       CALL Agrif_Declare_Var_lim2  !  "      "   "   "      "  LIM
-# endif
-# if defined key_top
-      CALL Agrif_Declare_Var_top   !  "      "   "   "      "  TOP
 # endif
 #endif