| 4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
| 5 |
============================== |
============================== |
| 6 |
|
|
| 7 |
|
o pkg/exf/exf_radiation.F: add the factor ocean_emissivity to lwdown, for |
| 8 |
|
within #ifdef EXF_LWDOWN_WITH_EMISSIVITY/#endif. Unless ocean_emissivity=1. |
| 9 |
|
this factor is absolutely required, because the lw exitance (= out-going |
| 10 |
|
long wave radiation) is emissivity*stefanBoltzmann*T^4 + rho*lwdown, |
| 11 |
|
where the reflectivity rho = 1-emissivity for conservation reasons. Once |
| 12 |
|
this is established, we can remove the CPP-Flag (if we want to). |
| 13 |
|
o pkg/seaice: |
| 14 |
|
- qualify a stop statement in S/R seaice_check: EXF_READ_EVAP and |
| 15 |
|
ALLOW_BULKFORMULAE are only required if SEAICE_EXTERNAL_FLUXES is defined |
| 16 |
|
- sort out emissivity and long wave radiation, step 1: make SEAICE_emissivity |
| 17 |
|
what the name implies (and not emissivity*BoltzmannConstant), this means |
| 18 |
|
the old default value of 5.5e-8 now means |
| 19 |
|
5.5e-8/5.670e-8 = 0.97001763668430343479 as ocean_emissivity in |
| 20 |
|
S/R exf_readparms |
| 21 |
|
- FV-discretization of the B-grid LSOR solver, turn on with |
| 22 |
|
SEAICE_LSRBNEW. This new solver also involves a slight re-organization |
| 23 |
|
of the calling routine dynsolver, so that B and C-grid code look a |
| 24 |
|
little more alike. |
| 25 |
|
- fix index bugs in ostres.F (B-grid code) |
| 26 |
|
o pkg/seaice/seaice_ocean_budget.F: change (unused) code to make it look better |
| 27 |
|
o pkg/seaice/seaice_readparms.F: make ocean_emissivity*stefanBoltzmann the |
| 28 |
|
default for SEAICE_emissivity, if useEXF; requires setting a wrong |
| 29 |
|
parameter value in global_ocean.cs32x15/input.seaice/data.seaice for |
| 30 |
|
backward compatiblity |
| 31 |
|
o model/src: use sigmaR in calc_ivdc |
| 32 |
|
|
| 33 |
|
checkpoint63g (2011/12/16) |
| 34 |
|
o pkg/seaice/seaice_growth.F: |
| 35 |
|
fix heat conservation of the coupled ocean-seaice system. |
| 36 |
|
when SEAICE_HEAT_CONSERV_FIX is defined, the mismatch of |
| 37 |
|
solid vs liquid water treatment is resolved via QNET. |
| 38 |
|
o pkg/seaice/seaice_growth.F: |
| 39 |
|
add missing term for sublimation in saltFlux, which was breaking conservation. |
| 40 |
|
o pkg/seaice/seaice_model.F: |
| 41 |
|
Remove this patholigical case treatment in evolution branch, |
| 42 |
|
where it is un-necessary and breaks conservation. |
| 43 |
|
Update global_ocean.cs32x15/results accordingly for |
| 44 |
|
output.seaice.txt output_adm.seaice.txt and output_adm.seaice_dynmix.txt |
| 45 |
|
o model/src: |
| 46 |
|
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in |
| 47 |
|
external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE. |
| 48 |
|
o pkg/obcs: |
| 49 |
|
modify Stevens boundary conditions so that S/R obcs_calc_stevens computes |
| 50 |
|
tendency for temperature and salinity that is then applied to update |
| 51 |
|
theta and salt in S/R obcs_apply_ts; this requires proper masking of all |
| 52 |
|
horizontal advection and diffusion contributions on the boundary (in |
| 53 |
|
S/Rs gad_advection, gad_calc_rhs, gmredi_rtransport, gmredi_calc_diff), and |
| 54 |
|
removing the mask in S/R timestep_tracer. The advantage of this approach is |
| 55 |
|
that the updated tracer values include contributions from the surface |
| 56 |
|
forcing and vertical diffusion. |
| 57 |
|
This modification changes exp4.stevens because of vertical diffusion. |
| 58 |
|
o model/src: |
| 59 |
|
change non-curvilinear grid setting to also work with exch2 + blank tiles: |
| 60 |
|
- move delX,delY to new header file (SET_GRID.h) and adjust length to 1rst |
| 61 |
|
face dimensions. |
| 62 |
|
- new S/R INI_LOCAL_GRID to define model tile-local grid (using same units |
| 63 |
|
as delX,delY) and called from S/R INI_CARTESIAN_GRID, INI_CYLINDER_GRID |
| 64 |
|
and INI_SPHERICAL_POLAR_GRID. |
| 65 |
|
change test-experiment global_ocean.90x40x15: |
| 66 |
|
- split the domain in many more tiles (9x4 tiles of 10x10 each); |
| 67 |
|
- switch to exch2 and remove 1 blank-tile (but only for MPI test). |
| 68 |
|
- update results of both test (std & dwnslp). |
| 69 |
|
o pkg/diagnostics/diagstat_calc.F: fix problem with non-initialised halos in |
| 70 |
|
tmp-fields for TARGET_NEC_SX at the cost of extra loops and less vectorisation |
| 71 |
|
o model/src: |
| 72 |
|
- take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS |
| 73 |
|
and fix initialisation when using sigma-coords. |
| 74 |
|
o model/src: |
| 75 |
|
- improve Gael's changes from Jan 14, 2011 "addition of an 'update' of hfacc etc. |
| 76 |
|
to their current value at the beginning of forward_step.F": add a new run-time |
| 77 |
|
switch "doResetHFactors" (default=false) and use it to do (or not) the resetting. |
| 78 |
|
- set doResetHFactors=T in the following test exp: |
| 79 |
|
global_ocean.90x40x15/input (rStar) & input.dwnslp (linFS), |
| 80 |
|
global_ocean.cs32x15/input.seaice (rStar), hs94.cs-32x32x5/input.impIGW (linFS) |
| 81 |
|
and tutorial_global_oce_in_p (nonLinFS in p) |
| 82 |
|
o pkg/ecco |
| 83 |
|
- added IES cost term |
| 84 |
|
o verification/advect_xz |
| 85 |
|
- scale down the depth by 1/100 (from 200 km to just 2.km) |
| 86 |
|
- add secondary test using divergent flow, r-star and implicit vertical advection. |
| 87 |
|
- add note (check_conserve_TS.txt) and matlab script to check global |
| 88 |
|
conservation of T & S with NonLin-FreeSurf and Adams-Bashforth. |
| 89 |
|
o pkg/rbcs: |
| 90 |
|
- add missing relaxUFile & relaxVFile in namelist (in rbcs_readparms.F). |
| 91 |
|
o pkg/obcs (Stevens BCs): |
| 92 |
|
- fix various problems in the phase speed computations of the Stevens |
| 93 |
|
boundary conditions: |
| 94 |
|
- sign error for western and southern boundaries, |
| 95 |
|
- time tendencies were underestimated by factor of dTracerLev and some just |
| 96 |
|
zero (for multidim advection schemes) -> now estimate time tendencies |
| 97 |
|
from difference between previous (n) time level and the one before (n-1); |
| 98 |
|
this requires storing a field per tracer per boundary, also in the pickup |
| 99 |
|
files. |
| 100 |
|
- replace deltaTmom in cflMer/Zon computation with dTracerLev |
| 101 |
|
- set default phase velocity to cflMer/Zon |
| 102 |
|
- update verification experiment exp4.stevens |
| 103 |
|
o pkg/generic_advdiff (implicit_r): |
| 104 |
|
- fix implicit vertical advection conservation with AB and/or NonLin-FreeSurf |
| 105 |
|
(remove Tr*d/dz(w) in gad_implicit_r.F and add it in gad_calc_rhs.F); |
| 106 |
|
- fix implicit vertical diffusion or advection with NonLin FreeSurf |
| 107 |
|
(was using current recip_hFacC instead of future recip_hFacC): set future |
| 108 |
|
recip_hFac in thermodynamics.F and pass & use it in all vertical implicit |
| 109 |
|
solver S/R ; |
| 110 |
|
- fill diagnostics of vertical advective fluxes (computed from tendency) |
| 111 |
|
when using implicit vert. advection; |
| 112 |
|
- update output of exp that uses NonLin-FreeSurf & implicit vertical diffusion: |
| 113 |
|
global_ocean.90x40x15 (fwd+AD), global_ocean.cs32x15 (4 fwd +4 AD), |
| 114 |
|
tutorial_global_oce_in_p (fwd), tutorial_tracer_adjsens (AD) |
| 115 |
|
and cpl_aim+ocn (used in ocean); to be fixed: bottom_ctrl_5x5. |
| 116 |
|
o pkg/diagnostics: |
| 117 |
|
- add diags for T & S tendency which goes through Adams-Bashforth. |
| 118 |
|
|
| 119 |
|
checkpoint63f (2011/11/30) |
| 120 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 121 |
|
- join some loops to reduce number of if-statements |
| 122 |
|
- fix a bug in code for northern and southern boundaries. |
| 123 |
|
o pkg/seaice/seaice_init_varia.F |
| 124 |
|
- undo resetting UVM=0 that has slipped in unnoticed in r1.49 and |
| 125 |
|
caused zero ice-velocities for the B-grid code |
| 126 |
|
o pkg/seaice/seaice_init_fixed.F |
| 127 |
|
- fix a bug in the initialisation of the second metric terms |
| 128 |
|
k2AtC and k2AtZ: k2AtC was set to the value of k2AtZ and k2AtZ was 0. |
| 129 |
|
- this affects all seaice configurations with useCurviLinearGrid = .true. |
| 130 |
|
and SEAICEuseDynamics = .true. (default) and SEAICEuseMetricTerms |
| 131 |
|
= .true. (default) |
| 132 |
|
- the only verification experiment affected is global_ocean.cs32x15: |
| 133 |
|
icedyn, seaice, and seaice_dynmix (AD) |
| 134 |
|
o pkg/thsice/thsice_diagnostics_state.F |
| 135 |
|
- only for TARGET_NEC_SX: initialise all of tmpFld, so that overlap does |
| 136 |
|
not contain garbage that can lead to surprises in diagstats_calc.F |
| 137 |
|
o model/src: |
| 138 |
|
- move bi,bj loops inside INTEGR_CONTINUITY ; |
| 139 |
|
- call INTEGR_CONTINUITY directly from forward_step.F |
| 140 |
|
(previously called from momentum_correction_step.F) |
| 141 |
|
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F, |
| 142 |
|
forward_step.F and pkg/ecco/the_main_loop.F |
| 143 |
|
o model/src/do_oceanic_phys.F: |
| 144 |
|
- reset addMass to zero only if useICEFRONT ; |
| 145 |
|
- separated k-loop for rhoInSitu calculation ; |
| 146 |
|
- add 2 diagnostics for wVel*delta^k(Rho) at constant pressure (= WdRHO_P) |
| 147 |
|
and at constant T,S (= WdRHOdP); |
| 148 |
|
NOTE: change diagnostics WRHOMASS : this is now simply the Vertical transport |
| 149 |
|
of In-Situ Density (Anomaly) (=wVel*rho^bar-k) (previously was Vertical |
| 150 |
|
transport of locally-referenced potential density); |
| 151 |
|
to recover old diag: (WRHOMASS)_old = (WRHOMASS)_new -1/2 * (WdRHOdP) |
| 152 |
|
o gluemnc: |
| 153 |
|
- replace ncrcat with ncks when adding variables to *.glob.nc |
| 154 |
|
- change the way variables without record dimensions are handled so that |
| 155 |
|
files that have variables with and without record variables can be glued: |
| 156 |
|
add a record dimension with a new unique name to be able to differentiate |
| 157 |
|
between variable with and without a-prior record dimensions. Remove |
| 158 |
|
this record dimension before adding the variable to the *.glob.nc file. |
| 159 |
|
This procedure automatically works also for grid.*.nc files that do not |
| 160 |
|
have any record dimension. |
| 161 |
|
o verification/cpl_aim+ocn: |
| 162 |
|
- generate new reference output on baudelaire (gfortran, mpich2) (previously |
| 163 |
|
from old aces-grid cluster, ao + ifort) and update 'run_cpl_test' script. |
| 164 |
|
o pkg/obcs/obcs_calc_stevens.F: |
| 165 |
|
- add code for northern and southern boundaries. |
| 166 |
|
- reorder some loops to save some operations and so that drFBar can be scalar |
| 167 |
|
o model/src: |
| 168 |
|
- re-arrange extrapolation calculation in Adams-Bashforth S/R (affects machine |
| 169 |
|
truncation) and add diagnostics for Adams-Bashforth tendency increment. |
| 170 |
|
- update test-exp. AD output: |
| 171 |
|
1D_ocean_ice_column, bottom_ctrl_5x5, lab_sea.noseaicedyn, obcs_ctrl; |
| 172 |
|
and FWD output: exp4 (x3), fizhi-cs-32x32x40, fizhi-cs-aqualev20, |
| 173 |
|
front_relax (x3), global_ocean.90x40x15 (x2), global_ocean.cs32x15 (x5), |
| 174 |
|
global_ocean_ebm, ideal_2D_oce, internal_wave, isomip (x3), lab_sea (x4), |
| 175 |
|
matrix_example, MLAdjust (x5), natl_box (x2), tutorial_advection_in_gyre, |
| 176 |
|
tutorial_global_oce_in_p, tutorial_global_oce_latlon and |
| 177 |
|
tutorial_plume_on_slope. |
| 178 |
|
o pkg/diagnostics/diagstats_calc.F: add special code for TARGET_NEC_SX |
| 179 |
|
that vectorises. This code uses 3 extra 2D fields, F90 array assignments |
| 180 |
|
and F90 intrinsic routines SUM, MINVAL, MAXVAL, but since TARGET_NEC_SX |
| 181 |
|
does not even come with an F77 compiler anymore, this should not be |
| 182 |
|
a limitation |
| 183 |
|
|
| 184 |
|
checkpoint63e (2011/11/06) |
| 185 |
|
o pkg/seaice adjoint of LSR: |
| 186 |
|
- substantially rework STORE dirs. |
| 187 |
|
- add new flag SEAICE_LSR_ADJOINT_ITER and parameter SOLV_MAX_FIXED |
| 188 |
|
this flag will do SOLV_MAX_ITERS but only store SOLV_MAX_FIXED fields |
| 189 |
|
and only perform SOLV_MAX_FIXED adjoint iters. |
| 190 |
|
If flag SEAICE_LSR_ADJOINT_ITER is undef-ined, the store in the iteration |
| 191 |
|
always goes to same record, meaning that the last forward field will be |
| 192 |
|
the one used in the adjoint - an approximation. |
| 193 |
|
- now produces non-zero LSR-related gradients, and acceptable gradients for |
| 194 |
|
An's zonal (x-z) test case (to be checked in) |
| 195 |
|
- lab_sea: produces acceptable gradients for lab_sea with forward/backward LSR |
| 196 |
|
(but these are screwed up by the thermodynamics in the first place); |
| 197 |
|
reduce from 4 to 3 timesteps to avoid t.d. issue as temporary solution; |
| 198 |
|
output_adm.txt also reflects changes to seaice_lsr |
| 199 |
|
- global_ocean.cs32x15: |
| 200 |
|
* the "default" input_ad.seaice has been re-defined to always exclude dynamics |
| 201 |
|
(output_adm.seaice.txt was updated) |
| 202 |
|
* new input_ad.seaice_dynmix tests a forward LSR / backward free-drift |
| 203 |
|
(output_adm.seaice_dynmix.txt) |
| 204 |
|
o test-exp. exp4+stevens: |
| 205 |
|
- switch off pTracers and nonHydrostatic (restart problems with NH); update output |
| 206 |
|
o pkg/seaice (lsr solver): |
| 207 |
|
- put coriolis term into FORCEX,Y (as in seaice_evp.F; previously in rhsU,V only); |
| 208 |
|
update output (change truncation) of FWD test exp lab_sea & global_ocean.cs32x15 |
| 209 |
|
- fix SEAICEuseFREEDRIFT for new OBCS version (ndef OBCS_UVICE_OLD) |
| 210 |
|
- new parameter "LSR_mixIniGuess" allows (if=2,4) to mix free-drift solution |
| 211 |
|
into initial guess for linearised solver; use weight ~ (1/err)^2,4. |
| 212 |
|
- compute (with new S/R) and print initial (+ free-driff sol. if available) |
| 213 |
|
and final residual of linearised system. |
| 214 |
|
o pkg/pp81: add diagnostics for vertical eddy viscosity and diffusivity |
| 215 |
|
(requires new subroutines pp81_init_fixed.F/pp81_diagnostics_init.F) |
| 216 |
|
o pkg/obcs: Stevens BCs (still only for east and west) |
| 217 |
|
- fix Stevens BCs by using intermediate velocities of previous |
| 218 |
|
time step as "baroclinic" contribution rather velocity of one grid cell |
| 219 |
|
inside the boundaries; more consistent but makes the entire treatment |
| 220 |
|
more complicated, requires new pickup files and two new S/Rs: |
| 221 |
|
obcs_copy_uv_n and obcs_save_uv_n |
| 222 |
|
keep old version with flag OBCS_STEVENS_USE_INTERIOR_VELOCITY |
| 223 |
|
(undefined by default) |
| 224 |
|
- silently move computation of some grid factors into separate loops to |
| 225 |
|
save some recomputations |
| 226 |
|
- add a hack for non-linear free surface |
| 227 |
|
- add a verification experiment to exp4 that tests this code |
| 228 |
|
o make gluemnc/xplodemnc work with (moron) non-GNU shell tools |
| 229 |
|
|
| 230 |
|
checkpoint63d (2011/10/25) |
| 231 |
|
o pkg/obcs + seaice-dynamics: |
| 232 |
|
- new implementation calls OBCS_APPLY_UVICE (in seaice_dynsolver.F) before |
| 233 |
|
solving for uIce,vIce and prevent SEAICE_LSR or SEAICE_EVP to modify OB |
| 234 |
|
values (consistent with an implicit method). |
| 235 |
|
- add option OBCS_UVICE_OLD (in OBCS_OPTIONS.h, defined by default) to |
| 236 |
|
return to older implementation (same results as before); note that none of |
| 237 |
|
the "experimental" OBCS_SEAICE options are implemented in the new version. |
| 238 |
|
- switch test exp. seaice_obcs to use new version (update output). |
| 239 |
|
o pkg/seaice: |
| 240 |
|
- add few stop (B-grid & CS-exch, B-grid & obcs, AUTODIFF & SEAICE_maskRHS) |
| 241 |
|
- add parenthesis in Water-Ice drag calculations (evp & lsr); |
| 242 |
|
- in seaice_lsr.F, simplify and fix AA3 setting in case sNx or sNy=1; |
| 243 |
|
and fix case SEAICE_waterDrag=0 (but unstable if no or little seaice) |
| 244 |
|
- update output of test exp lab_sea that uses evp or lsr (fwd+ad) |
| 245 |
|
and global_ocean.cs32x15 (icedyn & seaice fwd+ad). |
| 246 |
|
o pkg/layers: |
| 247 |
|
- Include potential density as new coordinate (Thanks to David Munday) |
| 248 |
|
o pkg/dic: |
| 249 |
|
- Remove subroutine CALC_PCO2_APPROX_CO3 from carbon_chem.F and add |
| 250 |
|
carbonate computation/output to CALC_PCO2_APPROX |
| 251 |
|
o pkg/generic_advdiff |
| 252 |
|
- make TAF generate code that vectorizes: |
| 253 |
|
gad_dst3fl_adv_*.F, gad_u3c4_impl_r.F |
| 254 |
|
o model/src: |
| 255 |
|
- improve vectorization also for adjoint code of |
| 256 |
|
solve_tridiagonal and solve_pentadiagonal. As this requires up to |
| 257 |
|
5 new 3D-fields, this code is only turned on for the combination of |
| 258 |
|
ALLOW_AUTODIFF_TAMC and TARGET_NEC_SX. Also remove error message |
| 259 |
|
for singular matrix check (only for TARGET_NEC_SX). |
| 260 |
|
- remove hard-wiring of CPP-flag ALLOW_SOLVERS_KLOOPINSIDE to |
| 261 |
|
ALLOW_AUTODIFF. This flag now needs to be set outside of |
| 262 |
|
solve_tri/pentadiagonal.F |
| 263 |
|
o pkg/exf: |
| 264 |
|
- fix previous modif in exf_readparms.F (revision 1.66: treatment of |
| 265 |
|
optional namelist EXF_NML_OBCS). |
| 266 |
|
- add many debug-print (to trace down where pkg/cal error msg comes from) |
| 267 |
|
o pkg/mom_vecinv/mom_vi_hdissip.F |
| 268 |
|
- rearrange loops so that vectorization is improved and in particular |
| 269 |
|
the adjoint routine vectorizes. The code is a little longer now, but I |
| 270 |
|
think easier to read. |
| 271 |
|
Note: CPP-flag MOM_VI_ORIGINAL_VISCA4 is not tested. |
| 272 |
|
o pkg/seaice: |
| 273 |
|
- allow to specify initial seaice velocity from files (uIceFile,vIceFile) |
| 274 |
o pkg/exch2: |
o pkg/exch2: |
| 275 |
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
- alternative code (without tile x tile matrix) for cumulated (global) sum; |
| 276 |
used as default; keep using matrix version in adjustment.cs-32x32x1. |
used as default; keep using matrix version in adjustment.cs-32x32x1. |
Parent Directory
| 
Revision Log
| 
Revision Graph
| 
Patch