| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/obcs: |
o pkg/obcs: |
| 8 |
|
- change OBCSfixTopo default from True to False (should not change the results); |
| 9 |
|
keep OBCSfixTopo=T in verification-exp. seaice_obcs. |
| 10 |
|
o pkg/thsice: |
| 11 |
|
- fix bug in thsice_calc_thickn.F (was introduced in version 1.18) in |
| 12 |
|
2nd layer seaice sublimation (unlikely to happen) |
| 13 |
|
- use Interior mask for OBCS in thsice_advection.F (similar to what is |
| 14 |
|
done in gad_advection & seaice_advection). |
| 15 |
|
o adjoint: |
| 16 |
|
bug fix spotted by Gael Forget: |
| 17 |
|
seaice_advection and thsice_advection still had |
| 18 |
|
legacy CPP options to avoid CS corner updates for adjoint |
| 19 |
|
o pkg/seaice: |
| 20 |
|
=> Change some of the defaults (2011/05/29): |
| 21 |
|
- change SEAICEuseFluxForm default (from False to True) |
| 22 |
|
- change DIFF1 default (from 0.004 m/s to 0. m/s) |
| 23 |
|
And print warnings if DIFF1 is not set in data.seaice and centered |
| 24 |
|
avection scheme is used without any diffusion. |
| 25 |
|
also: |
| 26 |
|
- fix seaice_diffusion calls in default AdvScheme part of seaice_advdiff.F; |
| 27 |
|
- set SEAICEdiffKh[] default in the same way as SEAICEadvSch[] |
| 28 |
|
- stop if DIFF1<>0 with SEAICEadvScheme <> 2, if DIFF1<>0 with any |
| 29 |
|
other non-zero SEAICEdiffKh[] diffusivity, if SEAICEadvSalt=T with |
| 30 |
|
#undef SEAICE_VARIABLE_SALINITY, if SEAICEadvAge=T with #undef SEAICE_AGE. |
| 31 |
|
update results of test exp.: |
| 32 |
|
lab_sea: output.fd (switch to AdvScheme=33 with diffKh=20) |
| 33 |
|
output.hb87, output_adm.evp (SEAICEuseFluxForm=T and diffKh=200) |
| 34 |
|
output_adm.noseaicedyn (SEAICEuseFluxForm=T) |
| 35 |
|
offline_exf_seaice: output.seaicetd, output_adm (SEAICEuseFluxForm=T) |
| 36 |
|
seaice_obcs: output (SEAICEuseFluxForm=T) |
| 37 |
|
and prescribe old default for SEAICEuseFluxForm (=F) and DIFF1 (=0.004) |
| 38 |
|
for standard fwd & AD lab_sea tests (to keep the same output). |
| 39 |
|
o pkg/seaice/seaice_growth.F: |
| 40 |
|
- use Ian Fenty's capping formulas for actual ice |
| 41 |
|
thickness thoughout EVOLUTION branch. |
| 42 |
|
- put treatment pathological case #2) in CPP brackets |
| 43 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
| 44 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
| 45 |
|
o pkg/seaice: |
| 46 |
|
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
| 47 |
|
pass the Laplacian diffusivity (in m^2/s) diffKh as a parameter; |
| 48 |
|
also pass fac as a param, which can be 1. (to update the tendency |
| 49 |
|
field) or the time step (to update the field itself). |
| 50 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
| 51 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
| 52 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
| 53 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
| 54 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
| 55 |
|
o pkg/seaice: |
| 56 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
| 57 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
| 58 |
|
to just compute the laplacian of input-field. |
| 59 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
| 60 |
|
- fix flux-form version in diffus.F to conserve tracer. |
| 61 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
| 62 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
| 63 |
|
|
| 64 |
|
checkpoint62y (2011/05/26) |
| 65 |
|
o pkg/seaice: |
| 66 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
| 67 |
|
a_QSWbyATM_cover in qnet (as it should be). |
| 68 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
| 69 |
|
(output.seaice.txt output_adm.seaice.txt). |
| 70 |
|
o pkg/seaice + obcs: |
| 71 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
| 72 |
|
equivalent of assuming no tracer gradient outside the OB region. |
| 73 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
| 74 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
| 75 |
|
after changes above); |
| 76 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
| 77 |
|
only at OB location (instead of over a band of OLx width). |
| 78 |
|
o pkg/seaice: |
| 79 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
| 80 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
| 81 |
|
o pkg/obcs: |
| 82 |
- split header file "OBCS.h" into 4 separated files: |
- split header file "OBCS.h" into 4 separated files: |
| 83 |
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
| 84 |
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch