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

[Gael Forget]

Update of /u/gcmpack/MITgcm/pkg/seaice
In directory faulks.csail.mit.edu:/u/u2/gforget/MITgcm/pkg/seaice

Modified Files:
	seaice_growth.F 
Log Message:

Merging seaice_growth codes -- part 3 -- the merging, at last.

- introducing HEFFpreTH, HSNWpreTH, and AREApreTH that allows the switch from the 'legacy' code to 
  the 'merged' code. In 'legacy' HEFFpreTH=HEFFnm1 (pre adv-diff), HSNWpreTH=hsnow (post adv-diff), 
  AREApreTH=areanm1 (pre adv-diff), while HEFF/HSNOW/ARE (post adv-diff) are the stocks that get 
  updated by seaice-growth.F, and we treat pathological cases along the way, and at the end 
  mostly (after all thermo updates, but for the flooding).
- in the 'merged' way, we start with post-advection HEFF/HSNOW/AREA, treat pathological cases 
  at once, and use the result (a self-consistent HEFF/HSNOW/AREA set) as our starting point.
- the CPP switch is SEAICE_GROWTH_LEGACY, which for now is hard-coded to #define.
- cosmetic changes the salinity and age blocks, which will ease the rest of the merging.

- I will update results, although they barely changed. On faulks with g77:
Y Y Y Y>16<16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . pass  lab_sea
Y Y Y Y>16<16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . pass  lab_sea.fd
Y Y Y Y>16<16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . pass  lab_sea.hb87
Y Y Y Y>12<16 16 16 16 16 16 16 16 14 16 13 16 12 13 13 14  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . FAIL  lab_sea.salt_plume
Y Y Y Y -- 16 16 16 16 16 16 16 16 22 22 22 22 22 22 22 22 16 16 16>16< .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . pass  offline_exf_seaice
Y Y Y Y -- 16 16 16 16 16 16 16 16 22 22 22 22 22 22 22 22 16 16 16 16 16 16 16>16< .  .  .  .  .  .  .  .  .  .  .  . pass  offline_exf_seaice.seaicetd
Y Y Y Y>14<16 16 16 16 16 16 16 16 16 14 13 14 14 16 16 14  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . pass  seaice_obcs
Y Y Y Y 16>14<pass  lab_sea
Y Y Y Y 16>13<pass  lab_sea.evp
Y Y Y Y 16>16<pass  lab_sea.noseaice
Y Y Y Y 16>14<pass  lab_sea.noseaicedyn
Y Y Y Y 16>16<pass  offline_exf_seaice