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

[Gael Forget]

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

Modified Files:
	SEAICE.h SEAICE_PARAMS.h seaice_ad_check_lev1_dir.h 
	seaice_ad_check_lev2_dir.h seaice_ad_check_lev3_dir.h 
	seaice_ad_check_lev4_dir.h seaice_check_pickup.F 
	seaice_diagnostics_state.F seaice_growth.F seaice_init_varia.F 
	seaice_read_pickup.F seaice_readparms.F seaice_solve4temp.F 
	seaice_write_pickup.F 
Log Message:

- merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is compiled either 
  way, and is tested in all exps (multidim was only tested in lab_sea ad before).
- cosmetic change to prepare for future addition of ITD. no change to results. no defaults change.
- by lack of adequate verification experiments, I further used custom versions of 
  global_ocean.cs32x15 to test multicat or not, with pickup or not. All should be correct.

- details :
  - added SEAICE_multDim run time param to be able to switch from single to multi cat.
  - "ifdef SEAICE_MULTICATEGORY" switches are replaced with "IF (SEAICE_multDim.GT.1) THEN".
  - "DO IT=1,MULTDIM" is replaced with "DO IT=1,SEAICE_multDim" in seaice_growth.F. For pickups and 
    initializations I kept full loops (did not want to mess with the somewhat funky TICE/TICES pickup logic).
  - homogeneize seaice_growth names (heffActualP->heffActualMult and latentHeatFluxMaxP->latentHeatFluxMaxMult).
  - in growth, add extra MULTDIM dimension in all relevant local fields (needed to simplify logic, and get taf to behave).
  - clean-up growth/solve4temp interface by adding ticeInMult (TSURFin entering solve4etmp) 
  and ticeOutMult (TSURFout leaving solve4temp). update seaice_solve4temp accordingly.
  - avoid recomputations (added store directives and clear logic of solve4temp input/output).