Changeset 15120

Timestamp:

2021-07-14T11:50:26+02:00 (3 years ago)

Author:

dancopsey

Message:

Fix to get EXPOUT to work when using land suppression.

File:

• NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_pkg/src/OCE/SBC/cpl_oasis3.F90 (modified) (8 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GC_couple_pkg/src/OCE/SBC/cpl_oasis3.F90

@@ -69 +69 @@
    INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields
-   LOGICAL, PARAMETER         ::   ltmp_wapatch = .TRUE.   ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define  
+   LOGICAL, PARAMETER         ::   ltmp_wapatch = .FALSE.   ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define  
+   LOGICAL, PARAMETER         ::   ltmp_landproc = .TRUE.   ! patch to restrict coupled area to non halo cells
    INTEGER                    ::   nldi_save, nlei_save
    INTEGER                    ::   nldj_save, nlej_save
@@ -157 +158 @@
          IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       ENDIF 
+
+      ! patch to restrict coupled area to non halo cells
+      IF ( ltmp_landproc ) THEN
+         nldi_save = nldi   ;   nlei_save = nlei
+         nldj_save = nldj   ;   nlej_save = nlej
+         IF( nowe == -1 ) nldi = nldi + 1
+         IF( noea == -1 ) nlei = nlei - 1
+         IF( noso == -1 ) nldj = nldj + 1
+         IF( nono == -1 ) nlej = nlej - 1
+      ENDIF 
+
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'cpl_define : initialization in coupled ocean/atmosphere case'
+      IF(lwp) WRITE(numout,*) 'cpl_define : initialization in coupled ocean/atmosphere case', nldi
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~~~'
       IF(lwp) WRITE(numout,*)
@@ -316 +328 @@
 #endif
       !
-      IF ( ltmp_wapatch ) THEN
+      IF ( ltmp_wapatch .OR. ltmp_landproc ) THEN
          nldi = nldi_save   ;   nlei = nlei_save
          nldj = nldj_save   ;   nlej = nlej_save
@@ -346 +358 @@
          IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
       ENDIF
+      IF ( ltmp_landproc ) THEN
+         nldi_save = nldi   ;   nlei_save = nlei
+         nldj_save = nldj   ;   nlej_save = nlej
+         IF( nowe == -1 ) nldi = nldi + 1
+         IF( noea == -1 ) nlei = nlei - 1
+         IF( noso == -1 ) nldj = nldj + 1
+         IF( nono == -1 ) nlej = nlej - 1
+      ENDIF 
       !
       ! snd data to OASIS3
@@ -374 +394 @@
          ENDDO
       ENDDO
-      IF ( ltmp_wapatch ) THEN
+      IF ( ltmp_wapatch .OR. ltmp_landproc ) THEN
          nldi = nldi_save   ;   nlei = nlei_save
          nldj = nldj_save   ;   nlej = nlej_save
@@ -399 +419 @@
       !!--------------------------------------------------------------------
       ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define
-      IF ( ltmp_wapatch ) THEN
+      IF ( ltmp_wapatch .OR. ltmp_landproc ) THEN
          nldi_save = nldi   ;   nlei_save = nlei
          nldj_save = nldj   ;   nlej_save = nlej
@@ -414 +434 @@
             IF( njmpp           ==      1 ) nldj = 1
             IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj
-         ENDIF
+         ENDIF 
+         IF ( ltmp_landproc ) THEN
+            IF( nowe == -1 ) nldi = nldi + 1
+            IF( noea == -1 ) nlei = nlei - 1
+            IF( noso == -1 ) nldj = nldj + 1
+            IF( nono == -1 ) nlej = nlej - 1
+         ENDIF 
+
          llfisrt = .TRUE.
 
@@ -457 +484 @@
          ENDDO
 
-         IF ( ltmp_wapatch ) THEN
+         IF ( ltmp_wapatch .OR. ltmp_landproc ) THEN
             nldi = nldi_save   ;   nlei = nlei_save
             nldj = nldj_save   ;   nlej = nlej_save