--- MITgcm/pkg/seaice/seaice_cost_sss.F 2010/03/22 00:57:19 1.3 +++ MITgcm/pkg/seaice/seaice_cost_sss.F 2012/11/09 22:15:18 1.7 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.3 2010/03/22 00:57:19 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.7 2012/11/09 22:15:18 heimbach Exp $ C $Name: $ #include "SEAICE_OPTIONS.h" @@ -27,10 +27,13 @@ # include "cal.h" #endif #ifdef ALLOW_COST -# include "ecco_cost.h" # include "optim.h" +# ifdef ALLOW_ECCO +# include "ecco_cost.h" +# endif # ifdef ALLOW_SEAICE # include "SEAICE_COST.h" +# include "SEAICE_SIZE.h" # include "SEAICE_PARAMS.h" # endif #endif @@ -49,7 +52,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 @@ -65,7 +68,7 @@ character*(MAX_LEN_FNAM) localbarfile character*(MAX_LEN_FNAM) localobsfile -#ifdef ALLOW_COST +#if (defined (ALLOW_ECCO) && defined (ALLOW_COST)) c == local variables == integer bi,bj