| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o pkg/seaice/seaice_growth.F: |
| 8 |
|
- use Ian Fenty's capping formulas for actual ice |
| 9 |
|
thickness thoughout EVOLUTION branch. |
| 10 |
|
- put treatment pathological case #2) in CPP brackets |
| 11 |
|
(ALLOW_AVOID_INFINITESIMAL_AREA, undef by default). |
| 12 |
|
- update global_ocean.cs32x15 and 1D_ocean_ice_colum results accordingly. |
| 13 |
o pkg/seaice: |
o pkg/seaice: |
| 14 |
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
- seaice_diffusion.F : remove the min(DX,DY) factor permanently; |
| 15 |
|
pass the Laplacian diffusivity (in m/s2) diffKh as a parameter; |
| 16 |
|
also pass fac as a param, which can be 1. (to update the tendency |
| 17 |
|
field) or the time step (to update the field itself). |
| 18 |
|
- seaice_advdiff.F: for multidim, call seaice_diffusion with |
| 19 |
|
e.g. SEAICEdiffKhHeff and with fac=1; for single-dim, call |
| 20 |
|
seaice_diffusion with e.g. SEAICEdiffKhHeff and with fac=time step. |
| 21 |
|
- SEAICE_PARAMS.h, seaice_readparms.F, seaice_check.F : |
| 22 |
|
hooks to handle SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
| 23 |
|
- note: if any of SEAICEdiffKhHeff, SEAICEdiffKhArea, etc. |
| 24 |
|
is specified to be >0, then DIFF1 is set to 0. |
| 25 |
|
o pkg/seaice: |
| 26 |
|
diffusion with centered advection scheme (diffus.F & advect.F): |
| 27 |
|
- simplify S/R DIFFUS (put deltaT & DIFF1 factor outside, move EXCH outside) |
| 28 |
|
to just compute the laplacian of input-field. |
| 29 |
|
- unroll k loop (harmonic,biharmonic diff) in advect.F to save 1 exch call. |
| 30 |
|
- fix flux-form version in diffus.F to conserve tracer. |
| 31 |
|
update output of lab_sea.fd & lab_sea.hb87 (1rst set of modif affects |
| 32 |
|
machine truncation) and lab_sea.salt_plume (conservative flux-form modif) |
| 33 |
|
|
| 34 |
|
checkpoint62y (2011/05/26) |
| 35 |
|
o pkg/seaice: |
| 36 |
|
- seaice_growth.F : in EVOLUTION branch, always include |
| 37 |
|
a_QSWbyATM_cover in qnet (as it should be). |
| 38 |
|
- verification/global_ocean.cs32x15 : update results accordingly |
| 39 |
|
(output.seaice.txt output_adm.seaice.txt). |
| 40 |
|
o pkg/seaice + obcs: |
| 41 |
|
- use maskInW & maskInS in multi-dim advection and biharmonic diffusion: |
| 42 |
|
equivalent of assuming no tracer gradient outside the OB region. |
| 43 |
|
update output of seaice_obcs (uses DIFF1 <>0 => biharmonic diffusion) |
| 44 |
|
- remove calls to OBCS_COPY_TRACER after EXCH calls (no longer needed |
| 45 |
|
after changes above); |
| 46 |
|
- obcs+seaice cleaning: apply seaice-tracer OB values to tracer field |
| 47 |
|
only at OB location (instead of over a band of OLx width). |
| 48 |
|
o pkg/seaice: |
| 49 |
|
- fix wrong indices in old (non Flux-Form) diffusion default S/R diffus.F |
| 50 |
|
(dxG(I+1, ...) changed to dxG(I, ...), no impact on Lat-Lon grid) |
| 51 |
|
o pkg/obcs: |
| 52 |
|
- split header file "OBCS.h" into 4 separated files: |
| 53 |
|
OBCS_PARAMS.h, OBCS_GRID.h, OBCS_FIELDS.h & OBCS_SEAICE.h |
| 54 |
|
Note: OBCS_PARAMS.h & OBCS_GRID.h can be included without OBCS_OPTIONS.h |
| 55 |
|
(contain no conditional statement which depends on OBCS options). |
| 56 |
|
- move "useOBCSYearlyFields" from "data.obcs" (hold in OBCS_PARAMS.h) |
| 57 |
|
to parameter file "data.exf", namelist EXF_NML_OBCS (in EXF_PARAM.h). |
| 58 |
|
o ctrl, cost, grdchk & autodiff pkgs: |
| 59 |
|
- make options file more standard (like other {PKG}_OPTIONS.h file but |
| 60 |
|
with AD_CONFIG.h); clean-up some of the included header files. |
| 61 |
|
o pkg/obcs: |
| 62 |
|
- do not mask tracer when applying OB (tracer == 0 could generate problems) |
| 63 |
|
- apply tracer OB values to tracer field only at OB location (instead of |
| 64 |
|
over a band of OLx width) |
| 65 |
|
- clean-up obcs_apply_w.F & obcs_apply_eta.F (since less calls to these S/R) |
| 66 |
|
- remove OBCS_MULTIDIM_OLD_VERSION code in gad_advection.F and remove |
| 67 |
|
obcs_apply_tloc.F & obcs_apply_sloc.F |
| 68 |
|
o obcs in model/src: |
| 69 |
|
- call OBCS_APPLY_W only if NonHydrostatic. |
| 70 |
|
- call OBCS_APPLY_ETA only if NonLinFreeSurf. |
| 71 |
|
- reset dEtaHdt and wVel to zero outside OB interior region ; |
| 72 |
|
- leave tracer unchanged outside OB interior region: This has no effect |
| 73 |
|
on the solution but just to prevent unrealistic tracer value outside OB. |
| 74 |
|
- zero out velocity outside OB interior region: This has no effect on |
| 75 |
|
the solution but just to prevent unrealistic velocity outside OB. |
| 76 |
|
o obcs and non-lin free-surf: |
| 77 |
|
move call to OBCS_APPLY_R_STAR from update_r_star.F to calc_r_star.F |
| 78 |
|
and call to OBCS_APPLY_SURF_DR from update_surf_dr.F to calc_surf_dr.F |
| 79 |
|
+ add argument "etaFld" to OBCS_APPLY_R_STAR & OBCS_APPLY_SURF_DR: |
| 80 |
|
this fixes missing EXCH + get consistent eta OB value (+ fix restart). |
| 81 |
|
update results of test-exp. exp4(nlfs). |
| 82 |
|
o exp4 (nlfs) test-exp: |
| 83 |
|
use OBC for Eta at Western & Eastern OB (to test prescribing Eta |
| 84 |
|
with NonLin-FreeSurf); update output.nlfs.txt |
| 85 |
|
o obcs and 2d/3d solver norm: |
| 86 |
|
use interior masks (maskInC) to cancel out cg2d & cg3d matrix coeff at OB |
| 87 |
|
and outside OB interior region (will allow to place OB further inside the |
| 88 |
|
domain). Depending on the domain, can affects cg2d-Norm (previous |
| 89 |
|
cancellation outside OB was only partial), e.g. in exp4 & obcs_ctrl, |
| 90 |
|
and cg3d-Norm (previous Norm was computed before canceling OB terms), |
| 91 |
|
e.g. in tutorial_plume_on_slope. |
| 92 |
|
- update output of exp.: exp4 (x2), obcs_ctrl and tutorial_plume_on_slope. |
| 93 |
|
o pkg rbcs: |
| 94 |
|
- split RBCS.h into 3 files: RBCS_SIZE.h, RBCS_PARAMS.h & RBCS_FIELDS.h |
| 95 |
|
- add capability to apply relaxation to horizontal velocity uVel & vVel. |
| 96 |
|
o pkg/grdchk: add gradient check for control variable xx_shifwflx |
| 97 |
|
o pkg/shelfice/shelfice_init_fixed.F |
| 98 |
|
fix CPP-flag combinations |
| 99 |
|
o pkg/seaice: Merge iceage code of Pierre Rampal |
| 100 |
|
* update/change/correct ice age calculations |
| 101 |
|
* add age updates for pathological cases |
| 102 |
|
Probably needs more testing... |
| 103 |
|
|
| 104 |
|
checkpoint62x (2011/05/13) |
| 105 |
|
o pkg/mom_vecinv: |
| 106 |
|
high-order vorticity scheme: use interior masks (maskInW & S) |
| 107 |
|
to zero-out (outside OB) gradient of vorticity. |
| 108 |
|
o verification exp.: |
| 109 |
|
turn on "useEnergyConservingCoriolis" (better discretisation) in exp. |
| 110 |
|
hs94.128x64x5 and seaice_obcs ; update results. |
| 111 |
|
o pkg/obcs: |
| 112 |
|
fix bug in OBeta for YZ sections in obcs_exf_load.F |
| 113 |
|
o pkg/ctrl, pkg/shelfice, and optim: |
| 114 |
|
- add new control variable xx_shifwflx (fresh water flux underneath ice |
| 115 |
|
shelves). This is almost as tedious as obcs-ctrl, because the |
| 116 |
|
variables needs its own mask. |
| 117 |
|
- add a cost function term that penalizes the deviation of xx_shifwflx |
| 118 |
|
from the first guess (zero) in analogy to other control variables |
| 119 |
|
o pkg/shelfice: |
| 120 |
|
- start basic adjoint |
| 121 |
|
o pkg/ctrl: |
| 122 |
|
- remove extra 2D field "for good measure" when initializing in |
| 123 |
|
ctrl_set_globfld_[xy/xz/yz].F |
| 124 |
|
- replace hard coded precision 32 (a bug) in ctrl_map_ini_gen by ctrlprec |
| 125 |
|
- improve error messages in ctrl_set_unpack_* |
| 126 |
|
o OBC implementation in momentum: |
| 127 |
|
use interior masks (maskInC,W & S) in momentum S/R: |
| 128 |
|
- multiply divergence, tension and some del^i.u or del^j.v by maskInC |
| 129 |
|
- multiply del2u,del2v by maskInW/S (biharmonic viscosity) |
| 130 |
|
- multiply horiz. grad of vorticity by maskInW/S (in Leith scheme) |
| 131 |
|
- multiply gradient of wVel by maskInW/S in del2w calculation (NonHyd) |
| 132 |
|
Motivation: fix/clean implementation of OBC with biharmonic-viscosity |
| 133 |
|
(and also with Leith/Smagorinsky harmonic-viscosity). |
| 134 |
|
Update output of experiment dome and exp4 (+nlfs). |
| 135 |
|
o exp4 test-exp: |
| 136 |
|
- turn on: nonHydrostatic, exactConserv, viscA4 (with momDissip_In_AB=F) |
| 137 |
|
and prescribe time-varying OB (without pkg/exf) for zonal-velocity |
| 138 |
|
at Western & Eastern Boundaries (+/- 1 per-cent); Also prescribe |
| 139 |
|
time-varying OB at Western-side for wVel (NonHyd); update output. |
| 140 |
|
- add secondary set-up (.nlfs) using NonLin FreeSurf (z*) + mom_vecinv |
| 141 |
|
and biharmonic-viscosity ; also use prescribed time varying OB. |
| 142 |
|
o pkg/obcs: |
| 143 |
|
fix bug in OBWeta,OBWeta indices in obcs_apply_r_star.F |
| 144 |
|
o model/src: |
| 145 |
|
- fix startTime setting when baseTime<>0 & nIter0=0 are specified ; |
| 146 |
|
- initialise startTime & nIter0 with unlikely values: allows to set one |
| 147 |
|
from the other without ambiguity. |
| 148 |
|
o seaice_obcs test-exp.: |
| 149 |
|
add small diffK4T,S to test biharmonic diffusivity with OBCS ; update output. |
| 150 |
|
o pkg/obcs: |
| 151 |
|
- remove calls to OBCS_COPY_TRACER after EXCH for T,S & pTracer: |
| 152 |
|
no longer needed with maskInC,W,S in pkg/generic_advdiff. |
| 153 |
|
o pkg/seaice: |
| 154 |
|
- retired SEAICE_SALINITY and SEAICE_salinity in favor of |
| 155 |
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
SEAICE_VARIABLE_SALINITY and SIsalFRAC, respectively. |
| 156 |
- fixed bug in the initialization of sea ice salinity variable HSALT |
- fixed bug in the initialization of sea ice salinity variable HSALT |
| 157 |
in seaice_init_varia.F (removed dependence on ICE2WATR) |
in seaice_init_varia.F (removed dependence on ICE2WATR) |
| 158 |
o fizhi-cs test exp.: |
o fizhi-cs test exp.: |
| 159 |
switch reference output convention for these 2 non-standard test-exp, |
switch reference output convention for these 2 non-standard test-exp, |
| 160 |
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
from: pgi 6.1-5 on faulks (FC.6, -of linux_ia32_pgf77+authors_fc5) |
| 161 |
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
to: ifort 11.1 on baudelaire (FC.13, -of linux_amd64_ifort11) |
| 162 |
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
reason: faulks might get retired soon and pkg/fizhi has still Pb with gfortran |
| 163 |
o model/inc: |
o model/inc: |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch