Changeset 3066 for branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

2011-11-09T14:09:37+01:00 (13 years ago)

Author:

rfurner

Message:

ticket #885 adding changes from branches/2011/dev_r2802_UKMO8_cice between r2802 and r3041

File:

• branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90 (modified) (5 diffs)

branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

@@ -5 +5 @@
    !!======================================================================
    !! History :  9.0  !  05-07  (C. Talandier) original code
+   !!            3.4  !  11-11  (C. Harris) decomposition changes for running with CICE
    !!----------------------------------------------------------------------
    USE dom_oce          ! ocean space and time domain variables
@@ -434 +435 @@
 
       ijpi = ( jpiglo-2*jpreci + (isplt-1) ) / isplt + 2*jpreci
+#if defined key_nemocice_decomp
+      ijpj = ( jpjglo+1-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj 
+#else
       ijpj = ( jpjglo-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj
+#endif
 
       ALLOCATE(ilcitl (isplt,jsplt))
@@ -445 +450 @@
 
       IF(  irestil == 0 )   irestil = isplt
+#if defined key_nemocice_decomp
+
+      ! In order to match CICE the size of domains in NEMO has to be changed
+      ! The last line of blocks (west) will have fewer points 
+      DO jj = 1, jsplt 
+         DO ji=1, isplt-1 
+            ilcitl(ji,jj) = ijpi 
+         END DO 
+         ilcitl(isplt,jj) = jpiglo - (isplt - 1) * (ijpi - nrecil)
+      END DO 
+
+#else 
+
       DO jj = 1, jsplt
          DO ji = 1, irestil
@@ -453 +471 @@
          END DO
       END DO
+
+#endif
       
       IF( irestjl == 0 )   irestjl = jsplt
+#if defined key_nemocice_decomp 
+
+      ! Same change to domains in North-South direction as in East-West. 
+      DO ji = 1, isplt 
+         DO jj=1, jsplt-1 
+            ilcjtl(ji,jj) = ijpj 
+         END DO 
+         ilcjtl(ji,jsplt) = jpjglo - (jsplt - 1) * (ijpj - nrecjl)
+      END DO 
+
+#else 
+
       DO ji = 1, isplt
          DO jj = 1, irestjl
@@ -463 +495 @@
          END DO
       END DO
-      
+
+#endif
       zidom = nrecil
       DO ji = 1, isplt