| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/seaice: |
o pkg/seaice: |
| 8 |
|
- add SEAICE_SIZE.h anywhere in the code where SEAICE.h is included ; |
| 9 |
|
- move MULTDIM declaration and setting from SEAICE.h to SEAICE_SIZE.h ; |
| 10 |
|
- keep experiment offline_exf_seaice truly single category (set MULTDIM=1). |
| 11 |
|
o pkg/ecco: |
| 12 |
|
- fix writing of output file DiagnosCost_ClimSalt/Theta |
| 13 |
|
and DiagnosCost_DriftSalt/Theta (if multi-tiles per proc). |
| 14 |
|
o pkg/seaice: |
| 15 |
|
- add missing initialisation of COR_ICE array in dynsolver.F |
| 16 |
|
- merging SEAICE_MULTICATEGORY define and undef cases. Now the same code is |
| 17 |
|
compiled either way, and is tested in all exps (multidim was only tested |
| 18 |
|
in lab_sea ad before). |
| 19 |
|
- cosmetic change to prepare for future addition of ITD. no change to results. |
| 20 |
|
no defaults change. |
| 21 |
|
- added run time param SEAICE_multDim (7 for SEAICE_MULTICATEGORY, 1 otherwise). |
| 22 |
|
- by lack of adequate verification experiments, I further used custom versions |
| 23 |
|
of global_ocean.cs32x15 to test multicat or not, with pickup or not. All |
| 24 |
|
should be correct. |
| 25 |
|
- avoid recomputations in ad. |
| 26 |
|
o array initialisation in adjoint mode: |
| 27 |
|
1) pkg/mom_common/mom_calc_ke.F: |
| 28 |
|
add full array initialisation of KE inside mom_calc_ke.F (ALLOW_AUTODIFF_TAMC): |
| 29 |
|
The S/R which calls MOM_CALC_KE initialises KE but in some recomputation |
| 30 |
|
part this initialisation is gone, resulting in Floating Point Exception |
| 31 |
|
(caught by open64 compiler with debug option). |
| 32 |
|
2) model/src/convective_weights.F |
| 33 |
|
set output convectCount over the full array range (instead of doing |
| 34 |
|
an update): this fix a similar issue when called within recomputation (adjoint) |
| 35 |
|
which could by-pass the initialisation (normally done in the caller S/R). |
| 36 |
|
o pkg/seaice: |
| 37 |
|
- final version of turbulent flux params, as agreed at MIT ice meet: |
| 38 |
|
SEAICE_mcPheePiston (default is ~ 0.000875) |
| 39 |
|
SEAICE_mcPheeTaper (default is 0.) |
| 40 |
|
SEAICE_frazilFrac (defualt is 1.) |
| 41 |
|
SEAICE_mcPheeStepFunc (default is false) |
| 42 |
|
- changes results at trunction error level |
| 43 |
|
- ifdef SEAICE_EXTERNAL_FLUXES, disallow SEAICE_waterAlbedo |
| 44 |
|
o added pkg/frazil: |
| 45 |
|
- see frazil_description.tex for details |
| 46 |
|
- verification experiment is global_with_exf/input.yearly; changes output.yearly.txt |
| 47 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
| 48 |
|
- fix exponents for velocity dependent exchange coefficients: change |
| 49 |
|
from 2/3(=0) to 0.66666666666666667 |
| 50 |
|
- move computation of velocity dependent exchange coefficients into |
| 51 |
|
separate loop, so that it applies to both thermodynamics |
| 52 |
|
- move some divisions by constants out of loops |
| 53 |
|
|
| 54 |
|
checkpoint63j (2012/02/16) |
| 55 |
|
o pkg/seaice: |
| 56 |
|
- overhaul of seaice_summary.F after feb 2012 clean-up of seaice_growth.F etc. |
| 57 |
|
- SItracer: added run time params, and allow coupling to ocn salinity. |
| 58 |
|
o pkg/seaice: remove (almost) all divisions by constants within loops |
| 59 |
|
in seaice_growth.F and seaice_solve4temp.F, this changes (only) the cg2d |
| 60 |
|
results of global_ocean.cs32x15.seaice from 16 to 11 digits (but only |
| 61 |
|
those, caused by 1/QI -> recip_QI) -> update output.seaice.txt, |
| 62 |
|
output_adm.seaice_dynmix.txt and also lab_sea: output_adm.evp.txt |
| 63 |
|
o pkg/seaice : |
| 64 |
|
- simplify McPhee tapering, and allow to use it with SEAICEturbFluxFormula |
| 65 |
|
= 1 or 2, using newly added run time parameter SEAICE_availHeatTaper. |
| 66 |
|
- fix d_AREAbyATM, d_AREAbyOCN, d_AREAbyICE diags I broke in r1.148. |
| 67 |
|
- add permanent SItflux diag that corresponds to TFLUX but includes |
| 68 |
|
ice+snow. Hence SItflux-TFLUX should match the ice+snow heat budget. |
| 69 |
|
- allow activation/testing of a fix for suspected missing term in |
| 70 |
|
ocn-ice heat budget (to be confirmed). To test this, you want to |
| 71 |
|
undef SEAICE_DISABLE_HEATCONSFIX, and then set the run time param |
| 72 |
|
SEAICEheatConsFix to .TRUE. that also allows the 'SIaaflux' diagnostic. |
| 73 |
|
- no change in results, fwd or ad. |
| 74 |
|
o global_ocean.cs32x15/results: 3 changes following from the pkg/seaice commit below: |
| 75 |
|
- switch to variable freezing point. |
| 76 |
|
Results change : cg2d -> 1 digits; ad -> 3-6-6 digits. |
| 77 |
|
- bug fix : the sublimation term that was missing is now activated. |
| 78 |
|
Results change : cg2d -> 2 digits; ad -> 8-6-6 digits. |
| 79 |
|
- bug fix : flooding sign term for SIsal0.NE.0. |
| 80 |
|
Result change : cg2d -> 8 digits; ad -> 11-12-9 digits. |
| 81 |
|
o pkg/seaice: |
| 82 |
|
- unified freezing point treatment : the old SEAICE_VARIABLE_FREEZING_POINT |
| 83 |
|
is now the default, and the old default constant freezing point is recovered |
| 84 |
|
with SEAICE_tempFrz0 = -1.96, |
| 85 |
|
SEAICE_dTempFrz_dS = 0., |
| 86 |
|
- retire SEAICE_freeze (= the old way of specifycing the constant freezing point) |
| 87 |
|
- remove ALLOW_SEAICE_FLOODING brackets; run time switch is already there. |
| 88 |
|
- bug fix (thanks to M. Losch) : the sublimation term that was missing is now |
| 89 |
|
activated. To reproduce old results with this bug define SEAICE_DISABLE_SUBLIM. |
| 90 |
|
- bug fix (silly me) : flooding sign term (seaice_growth.F r 1.149line 1211) |
| 91 |
|
was wrong for SIsal0.NE.0. Changes cs32x15 results (see above item for detail). |
| 92 |
|
- bug fix (thanks to O. Jahn) : area loss for melting got messed up in |
| 93 |
|
seaice_growth r149 for legacy branch (no results change). |
| 94 |
|
- introduce SEAICE_CAP_SUBLIM : caps sublimation heat flux in solve4temp (code |
| 95 |
|
from I. Fenty). |
| 96 |
|
- results did not change except for global_ocean.cs32x15, mostly due to the |
| 97 |
|
switch to variable freezing point (see above item for detail). |
| 98 |
|
o pkg/thsice: |
| 99 |
|
- fix and simplify interface to salt_plume pkg ; diagnose directly amount of |
| 100 |
|
seawater freezing in thsice_calc_thickn (not used). |
| 101 |
|
o pkg/seaice: turbulent flux term specification via run time params. |
| 102 |
|
- replace CPP switches with run time switches to facilitate testing |
| 103 |
|
- retired CPPs : MCPHEE_OCEAN_ICE_HEAT_FLUX, |
| 104 |
|
GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR |
| 105 |
|
- added runtime parameter : SEAICEturbFluxFormula |
| 106 |
|
- move Mcphee constants to SEAICE_PARAMS.h |
| 107 |
|
- seaice_readparms.F : read turbulent flux term params (SEAICEturbFluxFormula; |
| 108 |
|
SEAICE_availHeatFrac/Frz, or SEAICE_gamma_t/_frz if apply); |
| 109 |
|
remove seaice_summary call (moved to seaice_init_fixed) |
| 110 |
|
- seaice_init_fixed.F : set SEAICE_availHeatFrac/Frz depending on |
| 111 |
|
SEAICEturbFluxFormula, and seaice_summary call (moved from seaice_readparms) |
| 112 |
|
- seaice_summary.F : add missing report of read turbulent flux term set up |
| 113 |
|
and SITRACER. |
| 114 |
|
- seaice_check.F : check range; inform and stop if retired CPPs are used |
| 115 |
|
(incl. SEAICE_AGE). |
| 116 |
|
- seaice_growth.F : unified use of SEAICE_availHeatFrac/Frz, without |
| 117 |
|
CPP switch, same computation as before for the different options. |
| 118 |
|
- change results at the truncation level. |
| 119 |
|
o pkg/seaice: |
| 120 |
|
- remove un-used parameters LAD & MAX_TICE ; add new run-time parameters: |
| 121 |
|
useMaykutSatVapPoly (default=F), postSolvTempIter (default=2) and |
| 122 |
|
SEAICE_wetAlbTemp (default=-1e-3). Remove option SEAICE_SOLVE4TEMP_LEGACY. |
| 123 |
|
- update verification/*/input*/data.seaice: |
| 124 |
|
to reproduce previous results with former #defined SEAICE_SOLVE4TEMP_LEGACY |
| 125 |
|
code, set useMaykutSatVapPoly=T & postSolvTempIter=0 ; |
| 126 |
|
and to reproduce previous results with former non-SOLVE4TEMP_LEGACY code, |
| 127 |
|
set SEAICE_wetAlbTemp=0 & SEAICE_snowThick=0. |
| 128 |
|
o pkg/seaice/seaice_solve4temp.F (SOLVE4TEMP_LEGACY): |
| 129 |
|
- remove LEGACY code for solving for tsurf (A1,A2,A3) but maintain the same |
| 130 |
|
algorithm (same choice: useMaykutPolySatVap=T, postSolvTempIter=0); |
| 131 |
|
difference in results only due to machine truncation. |
| 132 |
|
- remove MAX_TICE (tsurf is always =< TMELT anyway); keep MIN_TICE if using |
| 133 |
|
MaykutPolySatVap; keep MIN_LWDOWN. |
| 134 |
|
- adapt SEAICE_MODIFY_GROWTH_ADJ code (untested) to non-legacy formulation. |
| 135 |
|
- update output of verification exp. lab_sea (4 fwd: 11 cg2d digits except hb87, |
| 136 |
|
+ 3 AD: 6 digits except evp) and offline_exf_seaice.seaice (12 digits). |
| 137 |
|
o pkg/salt_plume: |
| 138 |
|
- isolate saltPlumeFlux array exch into a specific S/R called from |
| 139 |
|
do_oceanic_phys.F |
| 140 |
|
- add interface to pkg/salt_plume (filling of saltPlumeFlux) in pkg/thsice. |
| 141 |
|
o verification: |
| 142 |
|
- move untested set-up to MITgcm_contrib/verification_other. |
| 143 |
|
o pkg/seaice: |
| 144 |
|
- retire old way of SEAICE_AGE. Now replaced with ALLOW_SITRACER. |
| 145 |
|
o pkg/seaice: |
| 146 |
- seaice_solve4temp.F (keeping results unchanged): |
- seaice_solve4temp.F (keeping results unchanged): |
| 147 |
* add 2 future run-time params to select which saturation vapor pressure |
* add 2 future run-time params to select which saturation vapor pressure |
| 148 |
formula is used and how post-iteration fluxes are set. |
formula is used and how post-iteration fluxes are set. |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch