--- MITgcm/pkg/grdchk/grdchk_getadxx.F	2003/06/24 16:08:45	1.8
+++ MITgcm/pkg/grdchk/grdchk_getadxx.F	2006/05/12 02:17:03	1.15
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/grdchk/grdchk_getadxx.F,v 1.8 2003/06/24 16:08:45 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/grdchk/grdchk_getadxx.F,v 1.15 2006/05/12 02:17:03 heimbach Exp $
 
 #include "CTRL_CPPOPTIONS.h"
 
@@ -48,7 +48,7 @@
       _RL     xx_comp
       integer mythid
 
-#ifdef ALLOW_GRADIENT_CHECK
+#ifdef ALLOW_GRDCHK
 c     == local variables ==
 
       integer il
@@ -61,6 +61,8 @@
 
       character*(80) fname
 
+      integer i,j,k
+
 c--   == external ==
 
       integer  ilnblnk
@@ -83,7 +85,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_theta_file(1:il),'.',optimcycle
 
-         call active_read_xyz( fname, tmpfld3d, 1,
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
      &                         doglobalread, ladinit, optimcycle,
      &                         mythid, dummy)
 
@@ -98,7 +100,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_salt_file(1:il),'.',optimcycle
          
-         call active_read_xyz( fname, tmpfld3d, 1,
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
      &                         doglobalread, ladinit, optimcycle,
      &                         mythid, dummy)
 
@@ -113,7 +115,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_hflux_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -128,7 +130,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_sflux_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -143,7 +145,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_tauu_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -158,7 +160,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_tauv_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -173,7 +175,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_atemp_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -188,7 +190,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_aqh_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -203,7 +205,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_uwind_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -218,7 +220,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_vwind_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -233,7 +235,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_obcsn_file(1:il),'.',optimcycle
 
-         call active_read_xz( fname, tmpfldxz, icvrec,
+         call active_read_xz_loc( fname, tmpfldxz, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -248,7 +250,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_obcss_file(1:il),'.',optimcycle
 
-         call active_read_xz( fname, tmpfldxz, icvrec,
+         call active_read_xz_loc( fname, tmpfldxz, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -263,7 +265,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_obcsw_file(1:il),'.',optimcycle
 
-         call active_read_yz( fname, tmpfldyz, icvrec,
+         call active_read_yz_loc( fname, tmpfldyz, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -278,7 +280,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_obcse_file(1:il),'.',optimcycle
 
-         call active_read_yz( fname, tmpfldyz, icvrec,
+         call active_read_yz_loc( fname, tmpfldyz, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -286,6 +288,36 @@
 
 #endif /* ALLOW_OBCSE_CONTROL */
 
+#ifdef ALLOW_DIFFKR_CONTROL
+      else if ( grdchkvarindex .eq. 15 ) then
+         il=ilnblnk( xx_diffkr_file )
+         write(fname(1:80),'(80a)') ' '
+         write(fname(1:80),'(3a,i10.10)')
+     &        yadmark, xx_diffkr_file(1:il),'.',optimcycle
+
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
+     &                         doglobalread, ladinit, optimcycle,
+     &                         mythid, dummy)
+
+         xx_comp = tmpfld3d( itilepos,jtilepos,layer,itile,jtile )
+
+#endif /* ALLOW_DIFFKR_CONTROL */
+
+#ifdef ALLOW_KAPGM_CONTROL
+      else if ( grdchkvarindex .eq. 16 ) then
+         il=ilnblnk( xx_kapgm_file )
+         write(fname(1:80),'(80a)') ' '
+         write(fname(1:80),'(3a,i10.10)')
+     &        yadmark, xx_kapgm_file(1:il),'.',optimcycle
+
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
+     &                         doglobalread, ladinit, optimcycle,
+     &                         mythid, dummy)
+
+         xx_comp = tmpfld3d( itilepos,jtilepos,layer,itile,jtile )
+
+#endif /* ALLOW_KAPGM_CONTROL */
+
 #ifdef ALLOW_TR10_CONTROL
       else if ( grdchkvarindex .eq. 17 ) then
          il=ilnblnk( xx_tr1_file )
@@ -293,7 +325,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_tr1_file(1:il),'.',optimcycle
          
-         call active_read_xyz( fname, tmpfld3d, 1,
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
      &                         doglobalread, ladinit, optimcycle,
      &                         mythid, dummy)
 
@@ -301,14 +333,14 @@
 
 #endif /* ALLOW_TR10_CONTROL */
 
-#ifdef ALLOW_SST0_CONTROL
+#if (defined (ALLOW_SST_CONTROL) || defined (ALLOW_SST0_CONTROL))
       else if ( grdchkvarindex .eq. 18 ) then
          il=ilnblnk( xx_sst_file )
          write(fname(1:80),'(80a)') ' '
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_sst_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -316,14 +348,14 @@
 
 #endif /* ALLOW_SST0_CONTROL */
 
-#ifdef ALLOW_SSS0_CONTROL
+#if (defined (ALLOW_SSS_CONTROL) || defined (ALLOW_SSS0_CONTROL))
       else if ( grdchkvarindex .eq. 19 ) then
          il=ilnblnk( xx_sss_file )
          write(fname(1:80),'(80a)') ' '
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_sss_file(1:il),'.',optimcycle
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -340,7 +372,7 @@
 
 #ifdef ALLOW_HFACC3D_CONTROL
 
-         call active_read_xyz( fname, tmpfld3d, icvrec,
+         call active_read_xyz_loc( fname, tmpfld3d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -348,7 +380,7 @@
 
 #else
 
-         call active_read_xy( fname, tmpfld2d, icvrec,
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
      &                        doglobalread, ladinit, optimcycle,
      &                        mythid, dummy)
 
@@ -364,7 +396,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_efluxy_file(1:il),'.',optimcycle
 
-         call active_read_xyz( fname, tmpfld3d, 1,
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
      &                         doglobalread, ladinit, optimcycle,
      &                         mythid, dummy)
 
@@ -379,7 +411,7 @@
          write(fname(1:80),'(3a,i10.10)')
      &        yadmark, xx_efluxp_file(1:il),'.',optimcycle
 
-         call active_read_xyz( fname, tmpfld3d, 1,
+         call active_read_xyz_loc( fname, tmpfld3d, 1,
      &                         doglobalread, ladinit, optimcycle,
      &                         mythid, dummy)
 
@@ -387,11 +419,56 @@
 
 #endif /* ALLOW_EFLUXP0_CONTROL */
 
+#ifdef ALLOW_PRECIP_CONTROL
+      else if ( grdchkvarindex .eq. 32 ) then
+         il=ilnblnk( xx_precip_file )
+         write(fname(1:80),'(80a)') ' '
+         write(fname(1:80),'(3a,i10.10)')
+     &        yadmark, xx_precip_file(1:il),'.',optimcycle
+
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
+     &                        doglobalread, ladinit, optimcycle,
+     &                        mythid, dummy)
+
+         xx_comp = tmpfld2d( itilepos,jtilepos,itile,jtile )
+
+#endif /* ALLOW_PRECIP_CONTROL */
+
+#ifdef ALLOW_SWFLUX_CONTROL
+      else if ( grdchkvarindex .eq. 33 ) then
+         il=ilnblnk( xx_swflux_file )
+         write(fname(1:80),'(80a)') ' '
+         write(fname(1:80),'(3a,i10.10)')
+     &        yadmark, xx_swflux_file(1:il),'.',optimcycle
+
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
+     &                        doglobalread, ladinit, optimcycle,
+     &                        mythid, dummy)
+
+         xx_comp = tmpfld2d( itilepos,jtilepos,itile,jtile )
+
+#endif /* ALLOW_SWFLUX_CONTROL */
+
+#ifdef ALLOW_SWDOWN_CONTROL
+      else if ( grdchkvarindex .eq. 34 ) then
+         il=ilnblnk( xx_swdown_file )
+         write(fname(1:80),'(80a)') ' '
+         write(fname(1:80),'(3a,i10.10)')
+     &        yadmark, xx_swdown_file(1:il),'.',optimcycle
+
+         call active_read_xy_loc( fname, tmpfld2d, icvrec,
+     &                        doglobalread, ladinit, optimcycle,
+     &                        mythid, dummy)
+
+         xx_comp = tmpfld2d( itilepos,jtilepos,itile,jtile )
+
+#endif /* ALLOW_SWDOWN_CONTROL */
+
       else
 ce      --> this index does not exist yet.
       endif
 
-#endif /* ALLOW_GRADIENT_CHECK */
+#endif /* ALLOW_GRDCHK */
 
       end