--- MITgcm/pkg/seaice/seaice_cost_sss.F 2010/03/23 15:05:46 1.4 +++ MITgcm/pkg/seaice/seaice_cost_sss.F 2012/08/02 01:26:45 1.6 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/seaice/seaice_cost_sss.F,v 1.4 2010/03/23 15:05:46 heimbach Exp $ +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 $Name: $ #include "SEAICE_OPTIONS.h" @@ -51,7 +51,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 @@ -67,7 +67,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