--- MITgcm/pkg/ctrl/ctrl_getobcsw.F	2011/04/20 19:14:07	1.12
+++ MITgcm/pkg/ctrl/ctrl_getobcsw.F	2014/10/09 00:49:26	1.17
@@ -1,12 +1,11 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/ctrl/ctrl_getobcsw.F,v 1.12 2011/04/20 19:14:07 mmazloff Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/ctrl/ctrl_getobcsw.F,v 1.17 2014/10/09 00:49:26 gforget Exp $
 C $Name:  $
 
-#include "CTRL_CPPOPTIONS.h"
+#include "CTRL_OPTIONS.h"
 #ifdef ALLOW_OBCS
 # include "OBCS_OPTIONS.h"
 #endif
 
-
       subroutine ctrl_getobcsw(
      I                             mytime,
      I                             myiter,
@@ -29,26 +28,28 @@
 
       implicit none
 
-#ifdef ALLOW_OBCSW_CONTROL
-
 c     == global variables ==
-
+#ifdef ALLOW_OBCSW_CONTROL
 #include "EEPARAMS.h"
 #include "SIZE.h"
 #include "PARAMS.h"
 #include "GRID.h"
-#include "OBCS.h"
-
+c#include "OBCS_PARAMS.h"
+#include "OBCS_GRID.h"
+#include "OBCS_FIELDS.h"
+#include "CTRL_SIZE.h"
 #include "ctrl.h"
 #include "ctrl_dummy.h"
+#include "CTRL_OBCS.h"
 #include "optim.h"
+#endif /* ALLOW_OBCSW_CONTROL */
 
 c     == routine arguments ==
-
       _RL     mytime
       integer myiter
       integer mythid
 
+#ifdef ALLOW_OBCSW_CONTROL
 c     == local variables ==
 
       integer bi,bj
@@ -130,6 +131,7 @@
           if (iobcs .gt. 2) then
            do j = jmin,jmax
             i = OB_Iw(j,bi,bj)
+            IF ( i.EQ.OB_indexNone ) i = 1
 cih    Determine number of open vertical layers.
             nz = 0
             do k = 1,Nr
@@ -198,6 +200,7 @@
           if (iobcs .gt. 2) then
            do j = jmin,jmax
             i = OB_Iw(j,bi,bj)
+            IF ( i.EQ.OB_indexNone ) i = 1
 cih    Determine number of open vertical layers.
             nz = 0
             do k = 1,Nr
@@ -249,6 +252,7 @@
          do k = 1,nr
           do j = 1,sny
            i = OB_Iw(j,bi,bj)
+           IF ( i.EQ.OB_indexNone ) i = 1
            if (iobcs .EQ. 1) then
             OBWt(j,k,bi,bj) = OBWt (j,k,bi,bj)
      &           + obcswfac            *xx_obcsw0(j,k,bi,bj,iobcs)
@@ -278,21 +282,11 @@
          enddo
         enddo
        enddo
-       
+
 C--   End over iobcs loop
       enddo
 
-#else /* ALLOW_OBCSW_CONTROL undefined */
-
-c     == routine arguments ==
-
-      _RL     mytime
-      integer myiter
-      integer mythid
-
-c--   CPP flag ALLOW_OBCSW_CONTROL undefined.
-
 #endif /* ALLOW_OBCSW_CONTROL */
 
+      return
       end
-