--- MITgcm/pkg/seaice/seaice_cost_sss.F	2010/03/23 18:50:02	1.5
+++ MITgcm/pkg/seaice/seaice_cost_sss.F	2014/10/20 03:20:57	1.9
@@ -1,7 +1,16 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.5 2010/03/23 18:50:02 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.9 2014/10/20 03:20:57 gforget Exp $
 C $Name:  $
 
 #include "SEAICE_OPTIONS.h"
+#ifdef ALLOW_ECCO
+# include "ECCO_OPTIONS.h"
+#endif
+#ifdef ALLOW_CTRL
+# include "CTRL_OPTIONS.h"
+#endif
+#ifdef ALLOW_COST
+# include "COST_OPTIONS.h"
+#endif
 
 c read the area dat file and compare against the averaged salinity file
 
@@ -27,12 +36,15 @@
 # include "cal.h"
 #endif
 #ifdef ALLOW_COST
-# include "optim.h"
+# ifdef ALLOW_CTRL
+#  include "optim.h"
+# endif
 # ifdef ALLOW_ECCO
-#  include "ecco_cost.h"
+#  include "ecco.h"
 # endif
 # ifdef ALLOW_SEAICE
 #  include "SEAICE_COST.h"
+#  include "SEAICE_SIZE.h"
 #  include "SEAICE_PARAMS.h"
 # endif
 #endif
@@ -51,7 +63,7 @@
 
       _RL localobs   (1-olx:snx+olx,1-oly:sny+oly,nnzobs,nsx,nsy)
       _RL localweight(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)
-      _RL localmask  (1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
+      _RS localmask  (1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy)
       _RL xx_localbar_mean_dummy
       _RL xx_areabar_mean_dummy
       _RL mult_local
@@ -93,7 +105,6 @@
       _RL cmask (1-olx:snx+olx,1-oly:sny+oly,nnzobs)
 
       character*(128) fname1, fname2,fname3
-      character*(MAX_LEN_MBUF) msgbuf
 
 cnew(
       _RL daytime
@@ -104,8 +115,6 @@
       integer middate(4)
       integer yday, ymod
       integer md, dd, sd, ld, wd
-      integer mody, modm
-      integer beginmodel, beginlocal
       logical exst
 cnew)