Changeset 12960 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/IOM/iom.F90

Timestamp:

2020-05-22T09:05:34+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: additional bugfixes and developments, see #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/IOM/iom.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/IOM/iom.F90

@@ -119 +119 @@
       INTEGER ::   Nis0_save, Nie0_save    !:      and close boundaries in output files
       INTEGER ::   Njs0_save, Nje0_save    !:
+      INTEGER ::   Ni_0_save, Nj_0_save    !:
       LOGICAL ::   ll_closedef = .TRUE.
       !!----------------------------------------------------------------------
@@ -129 +130 @@
          Nis0_save = Nis0   ;   Nie0_save = Nie0
          Njs0_save = Njs0   ;   Nje0_save = Nje0
-         IF( nimpp           ==      1 ) Nis0 = 1
-         IF( nimpp + jpi - 1 == jpiglo ) Nie0 = jpi
-         IF( njmpp           ==      1 ) Njs0 = 1
-         IF( njmpp + jpj - 1 == jpjglo ) Nje0 = jpj
+         Ni_0_save = Ni_0   ;   Nj_0_save = Nj_0
+         IF( mig( 1 ) ==      1 ) Nis0 = 1
+         IF( mig(jpi) == jpiglo ) Nie0 = jpi
+         IF( mjg( 1 ) ==      1 ) Njs0 = 1
+         IF( mjg(jpj) == jpjglo ) Nje0 = jpj
+         Ni_0 = Nie0 - Nis0 + 1
+         Nj_0 = Nje0 - Njs0 + 1
       ENDIF
       IF ( PRESENT(ld_closedef) ) ll_closedef = ld_closedef
@@ -150 +154 @@
 
       SELECT CASE ( nleapy )        ! Choose calendar for IOIPSL
-      CASE ( 1)   ; CALL xios_define_calendar( TYPE = "Gregorian", time_origin = xios_date(irefyear,irefmonth,irefday,00,00,00), &
-          &                                    start_date = xios_date(nyear,nmonth,nday,0,0,0) )
-      CASE ( 0)   ; CALL xios_define_calendar( TYPE = "NoLeap"   , time_origin = xios_date(irefyear,irefmonth,irefday,00,00,00), &
-          &                                    start_date = xios_date(nyear,nmonth,nday,0,0,0) )
-      CASE (30)   ; CALL xios_define_calendar( TYPE = "D360"     , time_origin = xios_date(irefyear,irefmonth,irefday,00,00,00), &
-          &                                    start_date = xios_date(nyear,nmonth,nday,0,0,0) )
+      CASE ( 1)   ;   CALL xios_define_calendar( TYPE = "Gregorian", time_origin = xios_date(irefyear,irefmonth,irefday,0,0,0),   &
+          &                                                          start_date  = xios_date(   nyear,   nmonth,   nday,0,0,0) )
+      CASE ( 0)   ;   CALL xios_define_calendar( TYPE = "NoLeap"   , time_origin = xios_date(irefyear,irefmonth,irefday,0,0,0),   &
+          &                                                          start_date  = xios_date(   nyear,   nmonth,   nday,0,0,0) )
+      CASE (30)   ;   CALL xios_define_calendar( TYPE = "D360"     , time_origin = xios_date(irefyear,irefmonth,irefday,0,0,0),   &
+          &                                                          start_date  = xios_date(   nyear,   nmonth,   nday,0,0,0) )
       END SELECT
 
@@ -284 +288 @@
          Nis0 = Nis0_save   ;   Nie0 = Nie0_save
          Njs0 = Njs0_save   ;   Nje0 = Nje0_save
+         Ni_0 = Ni_0_save   ;   Nj_0 = Nj_0_save
       ENDIF
 #endif
@@ -1162 +1167 @@
             ELSE   !   not a 1D array as pv_r1d requires jpdom_unknown
                ! we do not read the overlap and the extra-halos -> from Nis0 to Nie0 and from Njs0 to Nje0 
-               IF( idom == jpdom_global )   istart(1:2) = (/ mig(Nis0)-nn_hls, mjg(Njs0)-nn_hls /)
+               IF( idom == jpdom_global )   istart(1:2) = (/ mig0(Nis0), mjg0(Njs0) /)
                icnt(1:2) = (/ Ni_0, Nj_0 /)
                IF( PRESENT(pv_r3d) ) THEN