Changeset 3837 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/arpdebugging.f90

Timestamp:

2013-03-12T15:55:32+01:00 (11 years ago)

Author:

trackstand2

Message:

Merge of finiss

File:

• branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/arpdebugging.f90 (modified) (10 diffs)

branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/arpdebugging.f90

@@ -11 +11 @@
   CONTAINS
 
-    SUBROUTINE dump_rarray(count, name, field1, field2, withHalos)
+    SUBROUTINE dump_rarray(count, name, field1, field2, withHalos, &
+                           toGlobal)
       IMPLICIT none
       INTEGER,           INTENT(in) :: count  ! What timestep we're on
@@ -18 +19 @@
       REAL,              INTENT(in), DIMENSION(:,:), OPTIONAL :: field2
       LOGICAL,           INTENT(in),                 OPTIONAL :: withHalos
+      LOGICAL,           INTENT(in),                 OPTIONAL :: toGlobal
       ! Locals
       INTEGER           :: ji, jj
       CHARACTER (len=4) :: crank,ccount
-      LOGICAL           :: lwithHalos
+      LOGICAL           :: lwithHalos, ltoGlobal
       INTEGER           :: ibound, jbound
       INTEGER, DIMENSION(2) :: shape1, shape2
@@ -37 +39 @@
       lwithHalos = .false.
       IF(present(withHalos))lwithHalos = withHalos
+      ! By default we convert to global coordinates rather than those local
+      ! to this process
+      ltoGlobal = .true.
+      IF(present(toGlobal))ltoGlobal = toGlobal
 
       WRITE(crank,FMT="(I4)") narea-1
@@ -57 +63 @@
             END DO
          ELSE
-            DO jj=nldj,nlej,1
-               DO ji=nldi,nlei,1
-                  WRITE(997,FMT=fmt_var) mig(ji),mjg(jj), &
-                                               field1(ji,jj)
-               END DO
-            END DO
+
+            IF(ltoGlobal)THEN
+               DO jj=nldj,nlej,1
+                  DO ji=nldi,nlei,1
+                     WRITE(997,FMT=fmt_var) mig(ji),mjg(jj), &
+                                            field1(ji,jj)
+                  END DO
+               END DO
+            ELSE
+               DO jj=nldj,nlej,1
+                  DO ji=nldi,nlei,1
+                     WRITE(997,FMT=fmt_var) ji,jj, field1(ji,jj)
+                  END DO
+               END DO
+            END IF
          END IF
 
@@ -71 +86 @@
 
          IF(PRESENT(field2))THEN
-            DO ji=1,ibound,1
-               DO jj=1,jbound,1
-                  WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), &
-                                                field1(ji,jj),field2(ji,jj)
-               END DO
-               WRITE(997,*)
-            END DO
-         ELSE
-            DO ji=1,ibound,1
-               DO jj=1,jbound,1
-                  WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), field1(ji,jj)
-               END DO
-               WRITE(997,*)
-            END DO
+            IF(ltoGlobal)THEN
+               DO ji=1,ibound,1
+                  DO jj=1,jbound,1
+                     WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), &
+                                            field1(ji,jj),field2(ji,jj)
+                  END DO
+                  WRITE(997,*)
+               END DO
+            ELSE
+               DO ji=1,ibound,1
+                  DO jj=1,jbound,1
+                     WRITE(997,FMT=fmt_var) ji, jj, field1(ji,jj), field2(ji,jj)
+                  END DO
+                  WRITE(997,*)
+               END DO
+            END IF
+         ELSE
+            IF(ltoGlobal)THEN
+               DO ji=1,ibound,1
+                  DO jj=1,jbound,1
+                     WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), field1(ji,jj)
+                  END DO
+                  WRITE(997,*)
+               END DO
+            ELSE
+               DO ji=1,ibound,1
+                  DO jj=1,jbound,1
+                     WRITE(997,FMT=fmt_var) ji, jj, field1(ji,jj)
+                  END DO
+                  WRITE(997,*)
+               END DO
+            END IF
          END IF
 
@@ -94 +127 @@
 
 
-    SUBROUTINE dump_iarray(count, name, field1, field2, withHalos)
+    SUBROUTINE dump_iarray(count, name, field1, field2, withHalos, &
+                           toGlobal)
       IMPLICIT none
       INTEGER,           INTENT(in) :: count  ! What timestep we're on
@@ -101 +135 @@
       INTEGER,           INTENT(in), DIMENSION(:,:), OPTIONAL :: field2
       LOGICAL,           INTENT(in),                 OPTIONAL :: withHalos
+      LOGICAL,           INTENT(in),                 OPTIONAL :: toGlobal
       ! Locals
       INTEGER           :: ji, jj
       CHARACTER (len=4) :: crank,ccount
-      LOGICAL           :: lwithHalos
+      LOGICAL           :: lwithHalos, ltoGlobal
       INTEGER           :: ibound, jbound
       INTEGER, DIMENSION(2) :: shape1, shape2
@@ -120 +155 @@
       lwithHalos = .false.
       IF(present(withHalos))lwithHalos = withHalos
+      ! By default we convert to global coordinates rather than those local
+      ! to this process
+      ltoGlobal = .true.
+      IF(present(toGlobal))ltoGlobal = toGlobal
 
       WRITE(crank,FMT="(I4)") narea-1
@@ -156 +195 @@
             DO ji=1,ibound,1
                DO jj=1,jbound,1
-                  WRITE(997,FMT=fmt_var) ji, jj, &
+                  WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), &
                                                 field1(ji,jj),field2(ji,jj)
                END DO
@@ -164 +203 @@
             DO ji=1,ibound,1
                DO jj=1,jbound,1
-                  WRITE(997,FMT=fmt_var) ji, jj, field1(ji,jj)
+                  WRITE(997,FMT=fmt_var) mig(ji), mjg(jj), field1(ji,jj)
                END DO
                WRITE(997,*)