[MITgcm-cvs] MITgcm/pkg/cost CVS Commit

[Gael Forget]

Update of /u/gcmpack/MITgcm/pkg/cost
In directory baudelaire:/srv/scratch/gforget/MITgcm/pkg/cost

Modified Files:
	cost_atlantic_heat.F cost_final.F cost_init_varia.F 
	cost_readparms.F 
Log Message:

- cost_final.F : allow for use of pkg/ecco and pkg/cost     
  cost functions jointly. The exclusive ifdefs were removed,
  so that costs terms (when defined) from both packages are all 
  added to fc. Notes : 1) the fc global sum in pkg/ecco was
  removed accordingly; 2) for objf_atl we use either the 
  pkg/ecco or the pkg/cost term depending on CPPs.
- ALLOW_COST_ATLANTIC_HEAT vs ALLOW_COST_ATLANTIC :
 attempt to sort out ALLOW_COST_ATLANTIC (in ecco) vs
 ALLOW_COST_ATLANTIC_HEAT (in cost) that both use objf_atl (from cost).
- add comments to explain special and/or untested setups.