--- MITgcm/pkg/ctrl/ctrl_getobcsw.F	2012/07/31 16:05:56	1.14
+++ MITgcm/pkg/ctrl/ctrl_getobcsw.F	2012/09/18 20:21:23	1.16
@@ -1,7 +1,7 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/ctrl/ctrl_getobcsw.F,v 1.14 2012/07/31 16:05:56 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/ctrl/ctrl_getobcsw.F,v 1.16 2012/09/18 20:21:23 jmc Exp $
 C $Name:  $
 
-#include "CTRL_CPPOPTIONS.h"
+#include "CTRL_OPTIONS.h"
 #ifdef ALLOW_OBCS
 # include "OBCS_OPTIONS.h"
 #endif
@@ -130,6 +130,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 +199,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 +251,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)