--- MITgcm/pkg/seaice/seaice_cost_sss.F 2012/08/02 01:26:45 1.6 +++ MITgcm/pkg/seaice/seaice_cost_sss.F 2015/03/23 21:04:59 1.10 @@ -1,7 +1,16 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.6 2012/08/02 01:26:45 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.10 2015/03/23 21:04:59 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 @@ -68,6 +80,8 @@ character*(MAX_LEN_FNAM) localobsfile #if (defined (ALLOW_ECCO) && defined (ALLOW_COST)) +#ifdef ALLOW_SEAICE_COST_SMR_AREA + c == local variables == integer bi,bj @@ -93,7 +107,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 +117,6 @@ integer middate(4) integer yday, ymod integer md, dd, sd, ld, wd - integer mody, modm - integer beginmodel, beginlocal logical exst cnew) @@ -359,6 +370,8 @@ c-- End of mult_local or localobsfile endif + +#endif /* ALLOW_SEAICE_COST_SMR_AREA */ #endif /* ifdef ALLOW_COST */ end