Changeset 13230 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/DYN

Timestamp:

2020-07-02T17:50:26+02:00 (4 years ago)

Author:

smasson

Message:

dev_r12558_HPC-08_epico_Extra_Halo: finish merge with trunk@13218, see #2366

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/DYN/sshwzv.F90 (modified) (6 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/DYN/sshwzv.F90

@@ -200 +200 @@
       ENDIF
       !
-#if defined key_agrif 
       IF( .NOT. AGRIF_Root() ) THEN
          !
@@ -207 +206 @@
          DO jk = 1, jpkm1
             ! --- West --- !
-            IF( lk_west ) THEN
+            IF( lk_west) THEN
                DO ji = mi0(2+nn_hls), mi1(2+nn_hls)
                   DO jj = 1, jpj
@@ -216 +215 @@
             !
             ! --- East --- !
-            IF( lk_east ) THEN
+            IF( lk_east) THEN
                DO ji = mi0(jpiglo-1-nn_hls), mi1(jpiglo-1-nn_hls)
                   DO jj = 1, jpj
@@ -225 +224 @@
             !
             ! --- South --- !
-            IF( lk_south ) THEN
+            IF( lk_south) THEN
                DO jj = mj0(2+nn_hls), mj1(2+nn_hls)
                   DO ji = 1, jpi
@@ -234 +233 @@
             !
             ! --- North --- !
-            IF( lk_north ) THEN
+            IF( lk_north) THEN
                DO jj = mj0(jpjglo-1-nn_hls), mj1(jpjglo-1-nn_hls)
                   DO ji = 1, jpi
@@ -241 +240 @@
                END DO
             ENDIF
+            !
          END DO
          !
       ENDIF 
-#endif
       !
       IF( ln_timing )   CALL timing_stop('wzv')