| 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 |
| 69 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
| 70 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 71 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
| 72 |
|
variables needs its own mask. |
| 73 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 74 |
|
from the first guess (zero) in analogy to other control variables |
| 75 |
|
o pkg/shelfice: |
| 76 |
|
- start basic adjoint |
| 77 |
|
o pkg/ctrl: |
| 78 |
|
- remove extra 2D field "for good measure" when initializing in |
| 79 |
|
ctrl_set_globfld_[xy/xz/yz].F |
| 80 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
| 81 |
|
- improve error messages in ctrl_set_unpack_* |
| 82 |
|
o OBC implementation in momentum: |
| 83 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
| 84 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
| 85 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
| 86 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
| 87 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
| 88 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
| 89 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
| 90 |
|
Update output of experiment dome and exp4 (+nlfs). |
| 91 |
|
o exp4 test-exp: |
| 92 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
| 93 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
| 94 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
| 95 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
| 96 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
| 97 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
| 98 |
|
o pkg/obcs: |
| 99 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
| 100 |
|
o model/src: |
| 101 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
| 102 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
| 103 |
|
from the other without ambiguity. |
| 104 |
|
o seaice_obcs test-exp.: |
| 105 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
| 106 |
|
o pkg/obcs: |
| 107 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
| 108 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
| 109 |
|
o pkg/seaice: |
| 110 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
| 111 |
|
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
| 112 |
|
- fixed bug in the initialization of sea ice salinity variable HSALT |
| 113 |
|
in seaice_init_varia.F (removed dependence on ICE2WATR) |
| 114 |
|
o fizhi-cs test exp.: |
| 115 |
|
switch reference output convention for these 2 non-standard test-exp, |
| 116 |
|
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
| 117 |
|
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
| 118 |
|
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
| 119 |
|
o model/inc: |
| 120 |
|
- change type of PmEpR array (from _RS to _RL) to fix restart (with "-use_r4") |
| 121 |
|
of exp. global_ocean.90x40x15 (Suncronous time-stepping + Real-FW + NonLin-FS) |
| 122 |
|
o pkg/seaice: |
| 123 |
|
- fix calculation of saltFlux and saltPlumeFlux when using SEAICE_SALINITY |
| 124 |
|
o verification/lab_sea, 1D_ocean_ice_column, seaice_obcs, global_ocean.cs32x15 |
| 125 |
|
- updated output*.txt files due to bug fixes in salt, saltPlumeFlux, |
| 126 |
|
and initial HSALT |
| 127 |
|
|
| 128 |
|
checkpoint62w (2011/04/26) |
| 129 |
|
o pkg/mom_fluxform: |
| 130 |
|
- fix calculation of del2u & del2v (no-slip BC) when using Non-Lin Free-Surf. |
| 131 |
|
- use parameter "sideDragFactor" in no-slip BC side-drag part. |
| 132 |
|
- update output of exp. global_ocean.90x40x15 |
| 133 |
|
o pkg/mom_vecinv: |
| 134 |
|
mask del2u & del2v (no effect on results, but cleaner & closer to mom_fluxform) |
| 135 |
|
o update seaice exp.: |
| 136 |
|
use more consistent parameter values (remove "backward compatability only": |
| 137 |
|
ICE2WATR, SEAICE_lhSublim, SEAICE_cpAir, SEAICE_rhoAir + set rhoConstFresh) |
| 138 |
|
related to thermodynamics seaice. Update output (fwd+AD) of exp.: |
| 139 |
|
1D_ocean_ice_column (x2), lab_sea (x8), ioffline_exf_seaice (x2) & seaice_obcs |
| 140 |
|
o update test-exp global_ocean.90x40x15: |
| 141 |
|
o use default CD_CODE_OPTIONS file (Adams-Bashforth on CD Mom & Coriolis). |
| 142 |
|
o increase Overlap size from 2 to 3 (to allow to test bi-harmonic Visc.) |
| 143 |
|
o new pickup-files from a 100.yr run with pkg/down_slope (input.dwnslp params) |
| 144 |
|
o turn on zStar & viscA4 in standard set-up (dir input/) |
| 145 |
|
and update output files: output.txt & output.dwnslp.txt |
| 146 |
|
o new AD-test experiment: obcs_ctrl |
| 147 |
|
(From Matt MITgcm_Contrib/SOSE/BoxAdj) to test OBCS as control vector. |
| 148 |
|
o pkg/dic: |
| 149 |
|
fix two bugs in handling water vapour pressure in carbonate chemistry |
| 150 |
|
and air-sea fluxes. Found by Val Bennington and Galen McKinley |
| 151 |
|
(add DIC Option = WATERVAP_BUG to recover old results) |
| 152 |
|
update output of tutorial_global_oce_biogeo (fwd+AD) & tutorial_dic_adjoffline |
| 153 |
|
o adding allowInteriorFreezing option to check for water below freezing point |
| 154 |
|
at depth and bring the negative heat anomaly to the surface level |
| 155 |
|
o pkgs _fields_load: |
| 156 |
|
- extend GET_PERIODIC_INTERVAL to deal with non-periodic case (from pkg/rbcs) |
| 157 |
|
- use new S/R GET_PERIODIC_INTERVAL in pkgs: |
| 158 |
|
bulk_force, cheapaml, cfc, dic, obcs (+ ctrl/ctrl_get_gen_rec), offline and |
| 159 |
|
rbcs to get interpolation weights and time reccord number. |
| 160 |
|
- fix multi-threading in aim_fields_load.F |
| 161 |
|
- apply EXCH to temp arrays [0,1] after reading in dic_fields_load.F |
| 162 |
|
o external_fields_load: |
| 163 |
|
new S/R GET_PERIODIC_INTERVAL to calculate which time-record (and linear |
| 164 |
|
interpolation weights) to use in a periodic time-series ; do not divide by |
| 165 |
|
time-step to convert to integer: |
| 166 |
|
- this fixes case where externForcingPeriod is not multiple of time-step |
| 167 |
|
(Thanks to Christopher L. Wolfe) |
| 168 |
|
- this fixes case where externForcingPeriod is an odd multiple of time-step |
| 169 |
|
(was wrong by half of time-step); update results of tutorial_global_oce_in_p. |
| 170 |
|
store index of time-record which is currently loaded: |
| 171 |
|
- works without any assumption on sequence of calls to EXTERNAL_FIELDS_LOAD ; |
| 172 |
|
- needed for the adjoint but not yet used because of extensive recomputations; |
| 173 |
|
(to be fixed soon) |
| 174 |
|
|
| 175 |
|
checkpoint62v (2011/04/02) |
| 176 |
|
o verification/1D_ocean_ice_column added to test Ian Fenty's |
| 177 |
|
pkg/seaice_growth.F modifications for improving sea ice code differentiability |
| 178 |
|
o update output of exp4, internal_wave, seaice_obcs, tutorial_plume_on_slope |
| 179 |
|
(new velocity statistics after changing maskInW & maskInS definition) |
| 180 |
|
o pkg/generic_advdiff with OBCS: |
| 181 |
|
use maksInW & maskInS in advective flux and in biharmonic diffusion calculation: |
| 182 |
|
equivalent to assumption of no tracer gradient outside the OB region. |
| 183 |
|
This will affect the results if using obcs+biharmonic diffusion. |
| 184 |
|
update output_adm.txt of experiment bottom_ctrl_5x5 (not expected since no obc) |
| 185 |
|
o pkg/obcs: |
| 186 |
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
change definition of maskInW & maskInS: leave OB edges inside (maskIn=1) |
| 187 |
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
(e.g., maskInW(OB_Ie)=1 ) so that velocity normal-component at OB is still |
| 188 |
in Interior region. No impact on solution but affects Velocity monitor stats. |
in Interior region. No impact on solution but affects Velocity monitor stats. |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch