--- MITgcm/pkg/seaice/seaice_cost_sss.F 2010/03/23 18:50:02 1.5 +++ MITgcm/pkg/seaice/seaice_cost_sss.F 2014/10/11 19:02:25 1.8 @@ -1,4 +1,4 @@ -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.8 2014/10/11 19:02:25 gforget Exp $ C $Name: $ #include "SEAICE_OPTIONS.h" @@ -29,10 +29,11 @@ #ifdef ALLOW_COST # include "optim.h" # 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 +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