Diff of /MITgcm/pkg/seaice/seaice_cost_sss.F

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm/pkg/seaice/seaice_cost_sss.F	2014/10/11 19:02:25	1.8
+++ 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.8 2014/10/11 19:02:25 gforget 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,7 +36,9 @@
 # include "cal.h"
 #endif
 #ifdef ALLOW_COST
-# include "optim.h"
+# ifdef ALLOW_CTRL
+#  include "optim.h"
+# endif
 # ifdef ALLOW_ECCO
 #  include "ecco.h"
 # endif
@@ -94,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
@@ -105,8 +115,6 @@
       integer middate(4)
       integer yday, ymod
       integer md, dd, sd, ld, wd
-      integer mody, modm
-      integer beginmodel, beginlocal
       logical exst
 cnew)