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

[Gael Forget]

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

Modified Files:
	cost_atlantic.F cost_averagesfields.F cost_averagesgeneric.F 
	cost_generic.F cost_trans_merid.F cost_trans_zonal.F 
	ecco_ad_check_lev2_dir.h ecco_ad_check_lev3_dir.h 
	ecco_ad_check_lev4_dir.h ecco_cost.h ecco_cost_driver.F 
	ecco_cost_final.F ecco_cost_init_barfiles.F 
	ecco_cost_init_varia.F 
Log Message:

- ecco_cost_final.F : add fc definition when pkg/cost is omitted,
  omit global_sum of fc when pkg/cost is included (see joint modif).
- ecco_cost.h : define tbar, sbar, ubar, vbar accordingly if ALLOW_COST_TRANSPORT.
- add CPP brackets around pkg/cost and pkg/ctrl includes of "CTRL_SIZE.h" 
  "ctrl.h" "ctrl_dummy.h" "optim.h" / "cost.h" accordingly.
- 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).
- ALLOW_COST_ATLANTIC ifdef ALLOW_ECCO_EVOLUTION : add calls   
  to cost_atlantic (that also does the associated time averaging) 
  in cost_averagesfields.F and ecco_cost_driver.F, along with 
  the relevant ecco_ad_check_lev*_dir.h stores.