| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
o pkg/obcs: |
o pkg/obcs: |
| 8 |
|
- split header file "OBCS.h" into 4 separated files: |
| 9 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
| 10 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
| 11 |
|
(contain no conditional statement which depends on OBCS options). |
| 12 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
| 13 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
| 14 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
| 15 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
| 16 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
| 17 |
|
o pkg/obcs: |
| 18 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
| 19 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
| 20 |
|
over a band of OLx width) |
| 21 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
| 22 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
| 23 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
| 24 |
|
o obcs in model/src: |
| 25 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
| 26 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
| 27 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
| 28 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
| 29 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
| 30 |
|
- zero out velocity outside OB interior region: This has no effect on |
| 31 |
|
the solution but just to prevent unrealistic velocity outside OB. |
| 32 |
|
o obcs and non-lin free-surf: |
| 33 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
| 34 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
| 35 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
| 36 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
| 37 |
|
update results of test-exp. exp4(nlfs). |
| 38 |
|
o exp4 (nlfs) test-exp: |
| 39 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
| 40 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
| 41 |
|
o obcs and 2d/3d solver norm: |
| 42 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
| 43 |
|
and outside OB interior region (will allow to place OB further inside the |
| 44 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
| 45 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
| 46 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
| 47 |
|
e.g. in tutorial_plume_on_slope. |
| 48 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
| 49 |
|
o pkg rbcs: |
| 50 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
| 51 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
| 52 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
| 53 |
|
o pkg/shelfice/shelfice_init_fixed.F |
| 54 |
|
fix CPP-flag combinations |
| 55 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
| 56 |
|
* update/change/correct ice age calculations |
| 57 |
|
* add age updates for pathological cases |
| 58 |
|
Probably needs more testing... |
| 59 |
|
|
| 60 |
|
checkpoint62x (2011/05/13) |
| 61 |
|
o pkg/mom_vecinv: |
| 62 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
| 63 |
|
to zero-out (outside OB) gradient of vorticity. |
| 64 |
|
o verification exp.: |
| 65 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
| 66 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
| 67 |
|
o pkg/obcs: |
| 68 |
fix bug in OBeta for YZ sections in obcs_exf_load.F |
fix bug in OBeta for YZ sections in obcs_exf_load.F |
| 69 |
o pkg/ctrl, pkg/shelfice, and optim: |
o pkg/ctrl, pkg/shelfice, and optim: |
| 70 |
- add new control variable xx_shifwflx (fresh water flux underneath ice |
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 71 |
shelves). This is almost as tedious as obcs-ctrl, because the |
shelves). This is almost as tedious as obcs-ctrl, because the |
| 72 |
variables needs its own mask. |
variables needs its own mask. |
| 73 |
- add a cost function term that penalizes the deviation of xx_shifwflx |
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 74 |
from the first guess (zero) in analogy to other control variables |
from the first guess (zero) in analogy to other control variables |
| 75 |
o pkg/shelfice: |
o pkg/shelfice: |
| 76 |
- start basic adjoint |
- start basic adjoint |
| 77 |
o pkg/ctrl: |
o pkg/ctrl: |
| 78 |
- remove extra 2D field "for good measure" when initializing in |
- remove extra 2D field "for good measure" when initializing in |
| 79 |
ctrl_set_globfld_[xy/xz/yz].F |
ctrl_set_globfld_[xy/xz/yz].F |
| 80 |
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch