Changeset 9968

Timestamp:

2018-07-19T09:39:02+02:00 (5 years ago)

Author:

timgraham

Message:

Correction to fix in cpl_oasis3.F90

File:

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

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

@@ -80 +80 @@
    INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields
+
+   INTEGER          ::   nldi_save, nlei_save
+   INTEGER          ::   nldj_save, nlej_save
    
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
@@ -335 +338 @@
       INTEGER                   , INTENT(  out) ::   kinfo     ! OASIS3 info argument
       INTEGER                   , INTENT(in   ) ::   kstep     ! ocean time-step in seconds
-      REAL(wp), DIMENSION(:,:,:), INTENT(inout) ::   pdata
+      REAL(wp), DIMENSION(:,:,:), INTENT(in   ) ::   pdata
       !!
       INTEGER                                   ::   jc,jm     ! local loop index
@@ -344 +347 @@
       ! snd data to OASIS3
       
-      CALL lbc_lnk(pdata(:,:,:), ssnd(kid)%clgrid, ssnd(kid)%nsgn)
 
       nldi_save = nldi   ;   nlei_save = nlei
@@ -408 +410 @@
       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
+
+         IF( nimpp           ==      1 ) nldi = 1
+         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi
+         IF( njmpp           ==      1 ) nldj = 1
+         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
          llfisrt = .TRUE.
 
@@ -446 +450 @@
                      WRITE(numout,*) '     -     Sum value is ', SUM(pdata(:,:,jc))
                      WRITE(numout,*) '****************'
+                     CALL FLUSH(numout)
                   ENDIF
                   
@@ -459 +464 @@
          !--- check periodicity conditions (all cases)
          IF( .not. llfisrt )   CALL lbc_lnk( pdata(:,:,jc), srcv(kid)%clgrid, srcv(kid)%nsgn )   
-
-         IF( nimpp           ==      1 ) nldi = 1
-         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi
-         IF( njmpp           ==      1 ) nldj = 1
-         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
  
       ENDDO