Changeset 9918

Timestamp:

2018-07-10T17:00:38+02:00 (6 years ago)

Author:

timgraham

Message:

Fix for wraparound points in coupling (to be added to trunk as well).

File:

• branches/UKMO/dev_merge_2017_GC_couple_pkg/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (7 diffs)

branches/UKMO/dev_merge_2017_GC_couple_pkg/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -156 +156 @@
       CHARACTER(LEN=64) :: zclname
       CHARACTER(LEN=2) :: cli2
+      INTEGER          ::   nldi_save, nlei_save
+      INTEGER          ::   nldj_save, nlej_save
       !!--------------------------------------------------------------------
 
@@ -177 +179 @@
          CALL oasis_abort ( ncomp_id, 'cpl_define', 'nsnd is larger than nmaxfld, increase nmaxfld')   ;   RETURN
       ENDIF
+
+      nldi_save = nldi   ;   nlei_save = nlei
+      nldj_save = nldj   ;   nlej_save = nlej
+      IF( nimpp           ==      1 ) nldi = 1
+      IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi
+      IF( njmpp           ==      1 ) nldj = 1
+      IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       !
       ! ... Define the shape for the area that excludes the halo
@@ -308 +317 @@
       CALL oasis_enddef(nerror)
       IF( nerror /= OASIS_Ok )   CALL oasis_abort ( ncomp_id, 'cpl_define', 'Failure in oasis_enddef')
+
+      nldi = nldi_save   ;   nlei = nlei_save
+      nldj = nldj_save   ;   nlej = nlej_save
+
       !
    END SUBROUTINE cpl_define
@@ -325 +338 @@
       !!
       INTEGER                                   ::   jc,jm     ! local loop index
+      INTEGER                                   ::   nldi_save, nlei_save
+      INTEGER                                   ::   nldj_save, nlej_save
       !!--------------------------------------------------------------------
       !
       ! snd data to OASIS3
       !
+
+      nldi_save = nldi   ;   nlei_save = nlei
+      nldj_save = nldj   ;   nlej_save = nlej
+      IF( nimpp           ==      1 ) nldi = 1
+      IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi
+      IF( njmpp           ==      1 ) nldj = 1
+      IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       DO jc = 1, ssnd(kid)%nct
          DO jm = 1, ssnd(kid)%ncplmodel
@@ -354 +376 @@
          ENDDO
       ENDDO
+      nldi = nldi_save   ;   nlei = nlei_save
+      nldj = nldj_save   ;   nlej = nlej_save
       !
     END SUBROUTINE cpl_snd
@@ -379 +403 @@
       kinfo = OASIS_idle
       !
+      nldi_save = nldi   ;   nlei_save = nlei
+      nldj_save = nldj   ;   nlej_save = nlej
+      IF( nimpp           ==      1 ) nldi = 1
+      IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi
+      IF( njmpp           ==      1 ) nldj = 1
+      IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       DO jc = 1, srcv(kid)%nct
          llfisrt = .TRUE.
@@ -420 +450 @@
             
          ENDDO
+         nldi = nldi_save   ;   nlei = nlei_save
+         nldj = nldj_save   ;   nlej = nlej_save
 
          !--- Fill the overlap areas and extra hallows (mpp)