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

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/LBC/mppini.F90 (modified) (4 diffs)

branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -125 +125 @@
       !!        !  98-05  (M. Imbard, J. Escobar, L. Colombet )  SHMEM and MPI versions
       !!   8.5  !  02-08  (G. Madec)  F90 : free form
+      !!   3.4  !  11-11  (C. Harris) decomposition changes for running with CICE
       !!----------------------------------------------------------------------
       INTEGER  ::   ji, jj, jn   ! dummy loop indices
@@ -152 +153 @@
 
       IF(  iresti == 0 )   iresti = jpni
+
+#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, jpnj
+         DO ji=1, jpni-1
+            ilcit(ji,jj) = jpi
+         END DO
+         ilcit(jpni,jj) = jpiglo - (jpni - 1) * (jpi - nreci)
+      END DO
+
+#else
+
       DO jj = 1, jpnj
          DO ji = 1, iresti
@@ -161 +176 @@
       END DO
       
+#endif
       IF( irestj == 0 )   irestj = jpnj
+
+#if defined key_nemocice_decomp
+      ! Same change to domains in North-South direction as in East-West. 
+      DO ji=1,jpni
+         DO jj=1,jpnj-1
+            ilcjt(ji,jj) = jpj
+         END DO
+         ilcjt(ji,jpnj) = jpjglo - (jpnj - 1) * (jpj - nrecj)
+      END DO
+
+#else
+
       DO ji = 1, jpni
          DO jj = 1, irestj
@@ -171 +199 @@
       END DO
       
+#endif
       IF(lwp) THEN
          WRITE(numout,*)