14 |
- modified diag: SIdA; output actual effect, as the description states. |
- modified diag: SIdA; output actual effect, as the description states. |
15 |
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
- modified description: SIqneti, SIqneto, SIuheff, SIvheff, SIdAb*, HSNOW. |
16 |
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
- retired redundant diags: SIyneg, SIfice, SIsnwice, SIthdgrh. |
17 |
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
(SIyneg->SIdHbOCN; SIfice->SIdHbATC; SIsnwice->SIdHbFLO; |
18 |
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
and SIthdgrh->SIdHbOCN+SIdHbATC+SIdHbATO) |
19 |
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
- modified diags (2) : switch all SIdA*, SIdH*, SIdS* from delta to rates. |
20 |
- added diagnostics for seaice genereic tracers (SItr*). |
- added diagnostics for seaice generic tracers (SItr*). |
21 |
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
- added SItrUnit and SItrNameLong run time param (for SItr* diags). |
22 |
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
- in diag names, replaced 'PrTh' abbrev. of 'preceeding thermo' with 'PT'. |
23 |
I. Fenty: 18-Jun-2011: |
I. Fenty: 18-Jun-2011: |
24 |
Minor changes to seaice package: |
Minor changes to seaice package: |
25 |
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
1) Retired old variables (A22, SEAICE_lhsublim, areaMax, areaMin, hiceMin) and |
26 |
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
added some new ones (SEAICE_area_reg, SEAICE_hice_reg, SEAICE_area_floor) |
27 |
- Differentiated "regularization variables" from "floor variables" |
- Differentiated "regularization variables" from "floor variables" |
28 |
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
* areaMin became SEAICE_area_reg (old A22) and SEAICE_area_floor |
29 |
* hiceMin became SEAICE_hice_reg (old hiceMin) |
* hiceMin became SEAICE_hice_reg (old hiceMin) |
30 |
(with _reg meaning regularization variable) |
(with _reg meaning regularization variable) |
31 |
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
- SEAICE_lhSublim becomes lhSublim, the sum of SEAICE_lhEvap and SEAICE_lhFusion |
32 |
so as to ensure energy conservation when going between phases |
so as to ensure energy conservation when going between phases |
33 |
- A22 was not used anywhere |
- A22 was not used anywhere |
34 |
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
2) Changed regularization procedure for heffActual and hsnowActual to ensure |
35 |
well-boundedness and smooth adjoint in seaice_growth.F |
well-boundedness and smooth adjoint in seaice_growth.F |
36 |
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
3) Fixed a bug where seaice_solve4temp would not recognize ice-free grid cells |
37 |
because the old regularization always set heffActual >= 0.05 cm |
because the old regularization always set heffActual >= 0.05 cm |
38 |
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
4) Changed the model so that the default behavior is to put a small (10^-5) "floor" |
39 |
on AREA when HEFF > 0. |
on AREA when HEFF > 0. |
40 |
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
- went from requiring ALLOW_PRECLUDE_INFINITESIMAL_AREA to be defined to |
41 |
requiring that DISABLE_AREA_FLOOR *not* be defined |
requiring that DISABLE_AREA_FLOOR *not* be defined |
42 |
Affected verifications: |
Affected verifications: |
43 |
- 1D_ocean_ice_column (output.txt output_adm.txt) |
- 1D_ocean_ice_column (output.txt output_adm.txt) |
44 |
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
- global_ocean.cs32x15 (output.seaice.txt output_adm.seaice.txt) |
49 |
- add pieces of code to compute velocity potential at each level (new diagnostics |
- add pieces of code to compute velocity potential at each level (new diagnostics |
50 |
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
PhiVEL, works only when UVELMASS & VVELMASS are also turned on); |
51 |
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
for now, using same params as CG2D (target-resisual, max Nb of iter ...). |
52 |
|
- fix few issues with counter diagnostics in diagnostics_setdiag.F & |
53 |
|
diagstats_setdiag.F (if diagnostic counter is itself a counter diag) |
54 |
|
and in diagnostics_fract_fill.F (do not need a valid pointer for the |
55 |
|
diagnostics counter-mate); check that definition of counter-diagnostic |
56 |
|
includes a valid counter-mate (in diagnostics_set_levels.F). |
57 |
o model/src (rStar): |
o model/src (rStar): |
58 |
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
- add rStar scaling factor in diags_phi_hyd.F (similar to calc_grad_phi_hyd.F); |
59 |
affect solution only if z* with full pressure in EOS; |
affect solution only if z* with full pressure in EOS; |