--- MITgcm/pkg/ctrl/ctrl_getobcsw.F	2011/04/20 19:14:07	1.12
+++ MITgcm/pkg/ctrl/ctrl_getobcsw.F	2012/07/31 16:05:56	1.14
@@ -1,4 +1,4 @@
-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.14 2012/07/31 16:05:56 heimbach Exp $
 C $Name:  $
 
 #include "CTRL_CPPOPTIONS.h"
@@ -6,7 +6,6 @@
 # include "OBCS_OPTIONS.h"
 #endif
 
-
       subroutine ctrl_getobcsw(
      I                             mytime,
      I                             myiter,
@@ -29,26 +28,27 @@
 
       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 "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
@@ -278,21 +278,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
-