Changeset 4476

Timestamp:

2014-02-04T13:18:55+01:00 (10 years ago)

Author:

trackstand2

Message:

Remove col-trimming when halo packing as is broken - recvs need to know about it too and currently they cannot.

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/exchmod.F90 (modified) (5 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/LBC/exchmod.F90

@@ -3764 +3764 @@
                 DO j=jstart, jend, 1
                    DO i=istart, iend, 1
+#if defined key_halo_column_trim
+                      ARPDBG: THIS FUNCTIONALITY IS NOT YET IMPLEMENTED!
+                              Need to supply accurate point count to the
+                              mpi recv and that requires extension of 
+                              the mapcomm_mod::clip_msg() routine.
                       DO k=1,mbkmax(i,j),1
-                      !DO k=1, nzsendp(ipatch,isend,1),1
+#else
+                      DO k=1, nzsendp(ipatch,isend,1),1
+#endif
 #else
                 DO k=1,nzsendp(ipatch,isend,1),1
@@ -3802 +3809 @@
                  DO j=jstart, jend, 1
                     DO i=istart, iend, 1
+#if defined key_halo_column_trim
                        DO k=1,mbkmax(i,j),1
-                       !DO k=1, nzsendp(ipatch,isend,1),1
+#else
+                       DO k=1, nzsendp(ipatch,isend,1),1
+#endif
 #else
                  DO k=1,nzsendp(ipatch,isend,1),1
@@ -3920 +3930 @@
                 DO j=jstart, jend, 1
                    DO i=istart, iend, 1
+#if defined key_halo_column_trim
                       DO k=1,mbkmax(i,j),1
-                      !DO k=1, nzrecvp(ipatch,irecv,1),1
+#else
+                      DO k=1, nzrecvp(ipatch,irecv,1),1
+#endif
 #else
                 DO k=1,nzrecvp(ipatch,irecv,1),1
@@ -3932 +3945 @@
 #if defined key_z_first
                       ! ARPDBG - wipe anything below the ocean bottom
-                      !b3(i,j,nzrecvp(ipatch,irecv,1)+1:jpk) = 0.0_wp
+#if defined key_halo_column_trim
                       b3(i,j,mbkmax(i,j)+1:jpk) = 0.0_wp
+#else
+                      b3(i,j,nzrecvp(ipatch,irecv,1)+1:jpk) = 0.0_wp
+#endif
 #endif
                    END DO
@@ -3965 +3981 @@
                 DO j=jstart, jend, 1
                    DO i=istart, iend, 1
+#if defined key_halo_column_trim
                       DO k=1,mbkmax(i,j),1
-                      !DO k=1,nzrecvp(ipatch,irecv,1),1
+#else
+                      DO k=1,nzrecvp(ipatch,irecv,1),1
+#endif
 #else
                 DO k=1,nzrecvp(ipatch,irecv,1),1