Changeset 10337 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src

Timestamp:

2018-11-19T15:55:42+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 3d: force safe NPF (2 lines update) for field recieved from oasis, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE

Files:

• LBC/lib_mpp.F90 (modified) (1 diff)
• LBC/mpp_nfd_generic.h90 (modified) (1 diff)
• SBC/cpl_oasis3.F90 (modified) (1 diff)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/lib_mpp.F90

@@ -163 +163 @@
    INTEGER, PUBLIC                               ::   n_sequence_glb = 0           !: # of global communications
    INTEGER, PUBLIC                               ::   numcom = -1                  !: logical unit for communicaton report
+   INTEGER, PUBLIC                               ::   l_full_nf_update = .FALSE.   !: logical for a full (2lines) update of bc at North fold report
 
    ! timing summary report

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/mpp_nfd_generic.h90

@@ -90 +90 @@
          !  to correct possible incoherent values on North fold lines from restart 
 
-         DO jf = 1, ipf
-            IF ( ncom_stp <= nit000 ) ipj_s(jf) = 2
-         ENDDO
+         ! Two lines update (slower but necessary to avoid different values ion identical grid points
+         IF ( l_full_nf_update .OR.                          &    ! if coupling fields
+              ( ncom_stp == nit000 .AND. .NOT. ln_rstart ) ) &    ! at first time step, if not restart
+            ipj_s(:) = 2
 
          ! Index of modifying lines in input

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/SBC/cpl_oasis3.F90

@@ -454 +454 @@
          !--- Fill the overlap areas and extra hallows (mpp)
          !--- check periodicity conditions (all cases)
-         IF( .not. llfisrt )   CALL lbc_lnk( 'cpl_oasis3', pdata(:,:,jc), srcv(kid)%clgrid, srcv(kid)%nsgn )   
+         IF( .not. llfisrt ) THEN
+            l_full_nf_update = .TRUE.    ! enable full North fold update
+            CALL lbc_lnk( 'cpl_oasis3', pdata(:,:,jc), srcv(kid)%clgrid, srcv(kid)%nsgn )   
+            l_full_nf_update = .FALSE.   ! disable full North fold update (performances)
+         ENDIF
  
       ENDDO