Changeset 5433 for branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90

Timestamp:

2015-06-18T08:37:20+02:00 (9 years ago)

Author:

deazer

Message:

Corrected loop order, and changed variable names, checked with sette , ok
new output also ok.

File:

• branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90 (modified) (3 diffs)

branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90

@@ -62 +62 @@
    END SUBROUTINE dia_tmb_init
 
-   SUBROUTINE dia_calctmb( infield,outtmb )
+   SUBROUTINE dia_calctmb( pinfield,pouttmb )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE dia_tmb  ***
@@ -81 +81 @@
 
       ! Routine arguments
-      REAL(wp), DIMENSION(jpi, jpj, jpk), INTENT(IN   ) :: infield    ! Input 3d field and mask
-      REAL(wp), DIMENSION(jpi, jpj, 3  ), INTENT(  OUT) :: outtmb     ! Output top, middle, bottom
+      REAL(wp), DIMENSION(jpi, jpj, jpk), INTENT(IN   ) :: pinfield    ! Input 3d field and mask
+      REAL(wp), DIMENSION(jpi, jpj, 3  ), INTENT(  OUT) :: pouttmb     ! Output top, middle, bottom
 
 
@@ -95 +95 @@
 
       ! Calculate top
-      outtmb(:,:,1) = infield(:,:,1)*tmask(:,:,1)  + zmdi*(1.0-tmask(:,:,1))
+      pouttmb(:,:,1) = pinfield(:,:,1)*tmask(:,:,1)  + zmdi*(1.0-tmask(:,:,1))
 
       ! Calculate middle
-      DO ji = 1,jpi
-         DO jj = 1,jpj
+      DO jj = 1,jpj
+         DO ji = 1,jpi
             jk              = max(1,mbathy(ji,jj)/2)
-            outtmb(ji,jj,2) = infield(ji,jj,jk)*tmask(ji,jj,jk)  + zmdi*(1.0-tmask(ji,jj,jk))
+            pouttmb(ji,jj,2) = pinfield(ji,jj,jk)*tmask(ji,jj,jk)  + zmdi*(1.0-tmask(ji,jj,jk))
          END DO
       END DO
 
       ! Calculate bottom
-      DO ji = 1,jpi
-         DO jj = 1,jpj
+      DO jj = 1,jpj
+         DO ji = 1,jpi
             jk              = max(1,mbathy(ji,jj) - 1)
-            outtmb(ji,jj,3) = infield(ji,jj,jk)*tmask(ji,jj,jk)  + zmdi*(1.0-tmask(ji,jj,jk))
+            pouttmb(ji,jj,3) = pinfield(ji,jj,jk)*tmask(ji,jj,jk)  + zmdi*(1.0-tmask(ji,jj,jk))
          END DO
       END DO