4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o verification/global_ocean.cs32x15: |
8 |
|
- change secondary test "viscA4" to also test "selectP_inEOS_Zc=3" |
9 |
|
with "selectNHfreeSurf=1". |
10 |
|
o model/src (non-hydrostatic free-surface): |
11 |
|
- More "natural" expression of NH free-surface term (case selectNHfreeSurf=1): |
12 |
|
was: tmpSurf/(1+tmpSurf); changed to: 1/(1+Gamma) with Gamma=1/tmpSurf. |
13 |
|
- Calculate surface vertical velocity after 2-D solver adjustment (accounts |
14 |
|
for EmPmR if RealFreshWaterFlux); used in RHS (cg3d_b) if exactConserv |
15 |
|
and used to compute dPhiNH (in post_cg3d.F) if selectNHfreeSurf=1. |
16 |
|
This fixes EmPmR contribution when selectNHfreeSurf=1 & RealFreshWaterFlux. |
17 |
|
- Update output (changes at machine truncation level) of verification exp: |
18 |
|
exp4 (11 digits for cg2d), global_ocean.cs32x15.viscA4 (11.d), |
19 |
|
short_surf_wave (13.d) and tutorial_deep_convection.smag3d (12.d). |
20 |
|
o pkg/seaice: ITD code |
21 |
|
- fix picking up from a single category model by initialising |
22 |
|
heff/area/hsnowITD = 0. in seaice_itd_pickup.F |
23 |
|
- split a long warning message in seaice_check_pickup.F into two lines, |
24 |
|
because NEC SX-ACE cannot deal with the long line. |
25 |
|
o model/src: |
26 |
|
- fix missing dPhiNH in pressure_for_eos.F (case: selectP_inEOS_Zc=3) |
27 |
|
o pkg/seaice: |
28 |
|
- add missing checks for SEAICE_ALLOW_KRYLOV and SEAICE_ALLOW_BOTTOMDRAG |
29 |
|
o pkg/seaice: |
30 |
|
- add basal stress as parameterisation for grounding ice |
31 |
|
following Lemieux et al. (2015) |
32 |
|
- turn on by setting new parameter SEAICEbasalDragK2 to a value |
33 |
|
larger than 0. Lemieux et al. (2015) recommend 15. |
34 |
|
- The adjoint complains with extra recomputations so there is also a |
35 |
|
new cpp-flag SEAICE_ALLOW_BOTTOMDRAG that is undefined by default in |
36 |
|
order to postpone the problem |
37 |
|
- compile the new code in lab_sea |
38 |
|
o verification/halfpipe_streamice: |
39 |
|
- update both TAF and OpenAD adm output (machine truncation differences) |
40 |
|
|
41 |
|
checkpoint65v (2016/04/08) |
42 |
|
o verification/advect_xz: |
43 |
|
- increase overlap size from 3 to 4 and add new secondary test for PQM |
44 |
|
advection scheme (with mono & wino limiter). |
45 |
|
- change main exp. to test PPM (with weno limiter) adv.scheme on Temp. |
46 |
|
o model/src: |
47 |
|
- new parameters "top_Pres" & "seaLev_Z" (replacing Ro_SeaLevel and recently |
48 |
|
added phi0Ref) to set vertical axis origin and phiRef origin; |
49 |
|
keep Ro_SeaLevel for backward compatibility (with a warning). |
50 |
|
According to coordinate and fluid type: |
51 |
|
OCN in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(1), @ the top) |
52 |
|
ATM in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(Nr+1) @ bottom) |
53 |
|
OCN in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(Nr+1)/g, @ the top) |
54 |
|
ATM in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(1)/g, @ the bottom) |
55 |
|
- remove Ro_SeaLevel from ATM experiment parameter files; |
56 |
|
- in tutorial_global_oce_in_p, remove Ro_SeaLevel and set top_Pres to the |
57 |
|
complement; update output.txt (changes at machine truncation level). |
58 |
|
o pkg/seaice/seaice_evp.F |
59 |
|
- simplify computation of deltaZ and zetaZ to simple averaging following |
60 |
|
Bouillon et al. (2013). This removes a lot of code, but also changes |
61 |
|
verification experiment lab_sea.hb87 -> updated |
62 |
|
|
63 |
|
checkpoint65u (2016/03/14) |
64 |
|
o pkg/generic_advdiff: |
65 |
|
- from Darren: add PPM and PQM advection schemes (number 40-42 and 50-52) |
66 |
|
with 2 types of limiter (see: Engwirda & Kelley, submit. to JCP); |
67 |
|
Note (from Darren): unlimited PPM/PQM scheme (40 & 50) are just for |
68 |
|
testing and not for actual use. |
69 |
|
o model/src: |
70 |
|
- add parameter "phi0Ref" to specify reference [pressure/geo] potential at |
71 |
|
origin r = rF(1); |
72 |
|
- add options (parameter selectP_inEOS_Zc) to select which pressure to use |
73 |
|
in EOS for height coordinate: enable to include NH Pressure or to use |
74 |
|
more accurate pressure vertical profile; options not linked to EOS type |
75 |
|
(as previously, e.g., JMD95P/JMD95Z) but set default according to EOS type; |
76 |
|
- start to implement variable gravity (along vertical): for now, only with |
77 |
|
z-coords (not even z*). |
78 |
|
- add Ideal Gas equation of state for height coordinate. |
79 |
|
- update OpenAD output (affected at machine truncation level) of exp: |
80 |
|
global_ocean.90x40x15, OpenAD (std) and tutorial_global_oce_biogeo. |
81 |
|
o pkg/exf: |
82 |
|
- add ALLOW_EXF_OUTPUT_INTERP cpp switch to output the result |
83 |
|
of exf interpolation (before any rescaling, rotation or interpolation |
84 |
|
to velocity point) for each field that gets loaded from file. This option |
85 |
|
identically mimics the input file organization (e.g. record numbers in year |
86 |
|
by year input files) besides the change in horizontal grid. |
87 |
|
- add rotateStressOnAgrid run-time switch so that wind stress fields |
88 |
|
can be provided on the A-grid in zonal/meridional direction and |
89 |
|
rotated on the fly. This only applies to the case when the exf |
90 |
|
interpolation is off and rotateStressOnAgrid is false by default. |
91 |
|
o model/src: |
92 |
|
- rename internal parameter "useDynP_inEos_Zc" to "storePhiHyd4Phys" (since |
93 |
|
it's also used with pkg/atm_phys) and add few more parameters (but still |
94 |
|
inactive, src code yet to come) |
95 |
|
|
96 |
|
checkpoint65t (2016/02/10) |
97 |
|
o pkg/atm_phys: |
98 |
|
- from Ruth Geen: add optical depth dependence on CO2 concentration. |
99 |
|
o model/src: |
100 |
|
- fix vertical inter/extra-polation of density factor rhoFacF (for anelastic) |
101 |
|
for the case setCenterDr=T (delRc set from "data"); add output of rhoFacC&F. |
102 |
|
Update output of exp. deep_anelastic (changes at truncation level). |
103 |
|
o tools: |
104 |
|
- add a hack in "remove_comments_sed" (used only with TAF) for recent |
105 |
|
version of OpenMPI (shipped with FC.23): comment out the new header |
106 |
|
file "mpif-sizeof.h" which causes problems to TAF. |
107 |
|
o pkg/seaice: |
108 |
|
- change the termination criterion so that maxits (SEAICElinearIterMax) |
109 |
|
has an effect |
110 |
|
- unify iteration parameters for implicit solvers (JFNK and Picard) |
111 |
|
SEAICEnonLinIterMax replaces SEAICEnewtonIterMax/NPSEUDOTIMESTEPS |
112 |
|
SEAICElinearIterMax replaces SEAICEkrylovIterMax/SOLV_MAX_ITER |
113 |
|
SEAICEpreLinIterMax replaces SOLV_MAX_ITER in preconditioner |
114 |
|
SEAICEpreNL_IterMax replaces NPSEUDOTIMESTEPS in preconditioner |
115 |
|
SEAICEnonLinTol replaces JFNKgamma_nonlin |
116 |
|
- remove S/R SEAICE_FGMRES_DRIVER and put content into S/R SEAICE_JFKN |
117 |
|
- add new Picard-Krylov solver, compile with SEAICE_ALLOW_KRYLOV and |
118 |
|
use with SEAICEuseKrylov |
119 |
|
o pkg/seaice/seaice_lsr.F |
120 |
|
fix small bug: replace zetaZ by zetaZloc in S/R seaice_lsr_rhsu/v; only |
121 |
|
relevant if SEAICEuseStrImpCpl=T, and even then it does not seem to have |
122 |
|
an effect. |
123 |
|
o pkg/seaice: add two new parameters |
124 |
|
- SEAICEuseLSR to simplify the logic in seaice_dynsolver (this |
125 |
|
parameter is not in any namelist) |
126 |
|
- SEAICEusrPicardAsPrecon to allow s/r seaice_lsr to be used as |
127 |
|
a preconditioner for the non-linear Newton iteration of the JFNK |
128 |
|
solver |
129 |
|
o pkg/seaice/seaice_lsr.F: replace 1./SEAICE_deltaTdyn with recip_deltaT, |
130 |
|
affects some experiments at truncation level: |
131 |
|
- global_ocean.cs32x15.icedyn (11 digits), |
132 |
|
- global_ocean.cs32x15.seaice (11 digits), |
133 |
|
- seaice_itd (12 digits), seaice_itd.lipscomb07 (12 digits) -> update |
134 |
|
- also update global_ocean.cs32x15 adjoint and tangent-linear results |
135 |
|
o pkg/salt_plume & pkg/thsice: |
136 |
|
- for coupled set-up with pkg/thsice in ATM and pkg/salt_plume in OCN, |
137 |
|
connect salt_plume flux to ATM-OCN coupling pkgs interface: |
138 |
|
a) in ATM: also cumulate salt-plume flux in S/R THSICE_SALT_PLUME (for |
139 |
|
export to coupler interface) even without compiling pkg/salt_plume ; |
140 |
|
b) in OCN: apply coupler salt-plume flux to pkg/salt_plume field |
141 |
|
(saltPlumeFlux) just before exch call, in S/R SALT_PLUME_DO_EXCH. |
142 |
|
o pkg/dic: |
143 |
|
- use the updated seaice fraction (from seaice pkgs) for DIC forcing |
144 |
|
instead of the previous time-step value ; done in new S/R DIC_FIELDS_UPDATE |
145 |
|
called from the top of dic_biotic_forcing.F (instead of in DIC_FIELDS_LOAD); |
146 |
|
- move also update with values from ATM-OCN Coupler in the same new S/R |
147 |
|
(previously done in ocn_apply_import.F). |
148 |
|
o tools/adjoint_options: |
149 |
|
- specify explicitly "-f77" or "-f90" in default ad-optfile since TAF (default) |
150 |
|
has been changed on Jan 14, 2016. |
151 |
|
o pkg/ggl90: |
152 |
|
- add alternative discretisation of vertical shear (off by default), to |
153 |
|
compute the mean (@ grid-cell center) of vertical shear compon instead of |
154 |
|
vertical shear of mean flow (@ grid-cell center). |
155 |
|
- add correct parenthesis in ALLOW_GGL90_SMOOTH code to get the same truncated |
156 |
|
results on adjacent faces of cubed-sphere grids; this fix the restart. |
157 |
|
o pkg/atm_compon_interf: |
158 |
|
- skip time-ave over cpl_atmSendFrq of Sea-Level Pressure (atmSLPr) and just |
159 |
|
pass last value, stored directly before export to CPL ; |
160 |
|
Note: this affects results of Coupled set-up where OCN uses useImportSLP=T |
161 |
|
- remove atmSLPr from pickup files (no longer needed for restart) |
162 |
|
|
163 |
|
checkpoint65s (2016/01/13) |
164 |
|
o eesupp & genmake2: |
165 |
|
- first check for Function ETIME and, if it fails, then check for subroutine |
166 |
|
ETIME and consistent output; use the appropriate version in timers.F |
167 |
|
o model/src: |
168 |
|
- to check restart test, add option to apply EXCH to U,V earlier, just before |
169 |
|
integr_continuity; turned off by default. |
170 |
|
o pkg/dic: |
171 |
|
- remove CPP option USE_ATMOSCO2 (not needed) |
172 |
|
o tools/tst_2+2: |
173 |
|
- try to ignore difference between +0 and -0 in binary file, causing test |
174 |
|
to fail for no good reason. |
175 |
|
o eesupp & genmake2: |
176 |
|
- put back modif from Jinxuan Zhu - change etime fct call to S/R call - |
177 |
|
but also check (in genmake2) that test runs and returns meaningful results. |
178 |
|
o coupler pkgs: |
179 |
|
Finish implementation of optionally-exchanged variable switches (started on |
180 |
|
Nov 12) with addition of few more exchanged fields, including 2-way exchange |
181 |
|
of pkg/thsice vars to allow to use seaice dynamics (from pkg/seaice) & seaice |
182 |
|
advection in OCN component; this requires sequential coupling. |
183 |
|
coupler (pkg/atm_ocn_coupler): |
184 |
|
- add argument msgUnit and iter number to CPL_SEND/RECV_ATM/OCN_FIELDS |
185 |
|
routines (useful for debug). |
186 |
|
- only export/import optionally exchanged fields (RunOff, seaice, Salt-Plume |
187 |
|
flux, DIC fields) if corresponding switch is ON. |
188 |
|
- add option to export RunOff to OCN (to use for DIC river input) |
189 |
|
- add 2-way thSIce vars exchange; check for consistent cpl_sequential setting. |
190 |
|
components (pkg/atm_ & ocn_compon_interf): |
191 |
|
- to save memory space in ATM & OCN comp: add some #ifdef ALLOW_${PKG} around |
192 |
|
optionally exchanged fields; add a check & stop in cpl_readparms.F. |
193 |
|
ATMCPL.h: ALLOW_LAND for RunOff, ALLOW_THSICE for seaice, ALLOW_AIM for CO2; |
194 |
|
OCNCPL.h: ALLOW_SALT_PLUME, ALLOW_DIC for DIC, ALLOW_THSICE for 2-W thsice. |
195 |
|
- rename: fracIce -> sIceFrac_cpl (<- match coupler var name) |
196 |
|
+ in ATM: fracIceTime -> sIceFracTime ; seaIceTime -> sIceMassTime. |
197 |
|
- add 2-way thSIce vars exchange ; add Salt-Plume flux ; add RunOff in OCN. |
198 |
|
- hold in common block coupler optionally-exchanged variable switch |
199 |
|
and set default "useImportXXX" accordingly; + check & stop if inconsistent. |
200 |
|
- add diagnostics for all imported fields from coupler (in both OCN & ATM); |
201 |
|
this is intended to replace the OCN cplFldtave.* output files (not updated |
202 |
|
to contain new additional exchanged fields). |
203 |
|
o pkg/dic: |
204 |
|
- fix an other bug (also from 2014/08/30) in dic_atmos.F, in dic_int1=3 code. |
205 |
|
o pkg/thsice: |
206 |
|
- when coupled to ATM (useCoupler) with thSIce_skipThermo=T, skip reading |
207 |
|
and writing of thsice pickup files. |
208 |
|
o pkg/atm_compon_interf: |
209 |
|
- move all field individual export-call out of cpl_export_import_data.F |
210 |
|
into new S/R ATM_EXPORT_FIELDS |
211 |
|
o pkg/atm_compon_interf: |
212 |
|
- store state variables (for now, only thSIce fields) just before beeing |
213 |
|
exported (in cpl_export_import_data.F, like on ocean side) instead of from |
214 |
|
atm_store_my_data.F like all exported fluxes. |
215 |
|
- new version of pickup_cpl: write field names into meta file and read meta |
216 |
|
file to find field postion in pickup. Also only write/read fields meeded for |
217 |
|
restart (same logic as main pickup file ; also using pickupStrictlyMatch) |
218 |
|
o pkg/dic: |
219 |
|
- fix bug (added on 2014/08/30) in dic_atmos.F for the case dic_int1= 2 or 3. |
220 |
|
o pkg/seaice: add new parameter SEAICEpressReplFac to choose between |
221 |
|
pressure replacement method (=1., default) or original Hibler (1979) (=0.) |
222 |
|
value can be from domain [0,1] to average between the two methods |
223 |
|
o pkg/atm_phys: |
224 |
|
- allow to provide 2-d map of albedo and mixed-layer depth from files (but |
225 |
|
hold fixed in time). |
226 |
|
|
227 |
|
checkpoint65r (2015/12/21) |
228 |
|
o pkg/seaice: |
229 |
|
fix bug in tridiagonal solvers for SEAICE_OLx/y>0, this affects the JFNK |
230 |
|
solver (offline.dyn_jfnk) and global_ocean.cs32x15.seaice -> updated |
231 |
|
o pkg/seaice: |
232 |
|
- fix a bug in computing areaS in (J-J -> J-1) that affects runs |
233 |
|
when SEAICEscaleSurfStress=.TRUE., |
234 |
|
- apply areaW and areaS in S/R seaice_calc_lhs |
235 |
|
o pkg/atm_phys: |
236 |
|
- add diagnostics for 3-D, Nr+1 levels diagnostics of radiative fluxes |
237 |
|
(shortwave & longwave, net & downward) and diagnostics of temp. tendency |
238 |
|
for individual contribution (convection, LSC cond, radiation) |
239 |
|
- add Ruth Geen etal, GRL 2016, radiation options (see paper supp. |
240 |
|
information); activated with: solar_exponent=0. and wv_exponent=-1. |
241 |
|
o pkg/ggl90: |
242 |
|
- within IDEMIX add upper limit for horizontal group velocity to |
243 |
|
avoid instability problems in the explicit horizontal diffusion term for |
244 |
|
long time steps or high resolution |
245 |
|
o pkg/diagnostics: |
246 |
|
- simplify setting of local-array size in diagstats_output.F: uses "numLevels" |
247 |
|
(from DIAGNOSTICS_SIZE.h) to allow to write out more than Nr levels. |
248 |
|
o testreport: |
249 |
|
- remove "-v" (verbose option) in default mpirun command. |
250 |
|
o pkg/seaice/seaice_growth: |
251 |
|
- catch potential division by zero in ITD code, does not change |
252 |
|
verification results |
253 |
|
o pkg/ecco: |
254 |
|
- retire old codes to the Attic. The calls to retired functions are |
255 |
|
left in a commented form in case they ever need to be re-activated. |
256 |
|
- ecco_check.F: issue warning if any old CPP option is |
257 |
|
defined that corresponds to retired codes -- then stop. |
258 |
|
o pkg/atm_compon_interf: |
259 |
|
- change seaice fraction (use for OCN dic surf.flux) stored and sent to |
260 |
|
coupler: use last time-step value instead of average over cplSendFrq_iter |
261 |
|
time-step, similar to what is done for seaIceMass. |
262 |
|
This will affect results (pkg/dic) of coupled ATM-OCN+dic set-up. |
263 |
|
o eesupp & genmake2: |
264 |
|
- from Jinxuan Zhu: change etime fct call to S/R call (fix gfortran ETIME); |
265 |
|
<= remove until a fix is found for some ifort version on ia32 machine. |
266 |
|
o pkg/seaice/seaice_evp: |
267 |
|
- refine residual computation |
268 |
|
|
269 |
|
checkpoint65q (2015/11/18) |
270 |
|
o pkg/seaice/seaice_evp: |
271 |
|
- fix residual computations so that they no longer affect the actual |
272 |
|
simulation code |
273 |
|
- fix seaice_readparams to be able to actually set new parameters |
274 |
|
SEAICEaEVPcStar and SEAICEaEVPalphaMin, also fix logic a little |
275 |
|
o model/src: |
276 |
|
- fix wrong truncation (single prec) from "FLOAT" function in expressions |
277 |
|
like: deltaT*FLOAT(myIter) when myIter is large: |
278 |
|
a) replaced by DFLOAT (if not seen by TAF); |
279 |
|
b) remove "FLOAT" and use implicit type conversion (if seen by TAF). |
280 |
|
o pkg/aim_v23: |
281 |
|
- write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading |
282 |
|
when pickupSuff is set ; do write rolling pickups + at the end of the run. |
283 |
|
o pkg/atm_ocn_coupler + ocn_compon_interf: |
284 |
|
- in prep for using pkg/seaice Dyn in coupled set-up, implement sequential |
285 |
|
coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ; |
286 |
|
add corresponding call in DO_OCEANIC_PHYS. |
287 |
|
o coupler pkgs: |
288 |
|
Start a new way to set-up optionally-exchanged variables (previously, only |
289 |
|
there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler |
290 |
|
data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ; |
291 |
|
send switch to ATM & OCN compon before reading their own "data.cpl" (so that |
292 |
|
compononent param default can be set accordingly). |
293 |
|
Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch |
294 |
|
but rather applies to a group a fields (going both ways like for DIC) |
295 |
|
and corresponds to an option of coupling config. |
296 |
|
coupler (pkg/atm_ocn_coupler): |
297 |
|
- change parameter file from "data" to "data.cpl" (in cpl_read_params.F), |
298 |
|
and read namelist directly (without eessup S/R calls) instead of |
299 |
|
in the very un-flexible old way, 1 param per line, in fixed order; |
300 |
|
- add error-counter to track errors (e.g., missing "data.cpl") and to stop |
301 |
|
cleanly in CPL_CHECK_CPLCONFIG |
302 |
|
- add new coupling-exchange selectors (some not yet active) including |
303 |
|
cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h |
304 |
|
and ocnCpl_exchange_DIC=T in OCNIDS.h); |
305 |
|
- add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each |
306 |
|
component ; called directly from coupler.F, after comp. registrations; |
307 |
|
- rename few variable-ID names (in ATMIDS.h & OCNIDS.h): |
308 |
|
atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name -> |
309 |
|
-> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName |
310 |
|
components (pkg/atm_ & ocn_compon_interf): |
311 |
|
- add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding |
312 |
|
CPP header file in all pkg source files. |
313 |
|
- move checking of comp. configs out of cpl_exch_configs.F into new S/R |
314 |
|
ATM/OCN_CHECK_CPLCONFIG; |
315 |
|
- add error-counter to track errors (e.g., in "data.cpl") and to stop |
316 |
|
cleanly in ATM/OCN_CHECK_CPLCONFIG; |
317 |
|
- add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors |
318 |
|
from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and |
319 |
|
before PACKAGES_READPARMS; |
320 |
|
verification/cpl_aim+ocn/: |
321 |
|
- update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file |
322 |
|
"data.cpl" for coupler (in input_cpl). |
323 |
|
o eesupp/inc: |
324 |
|
- change the MPI-global-sum default (in CPP_EEOPTIONS.h) to: |
325 |
|
#define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F) |
326 |
|
to always cumulate tile local-sum in the same order (still uses |
327 |
|
MPI_Allreduce like standard code). |
328 |
|
- in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files |
329 |
|
that are now identical to standard version (in eesupp/inc). |
330 |
|
o pkg/shelfice: |
331 |
|
- add SHELFICETransCoeffTFile for initializing spatially varying |
332 |
|
heat and salt transfer coefficients |
333 |
|
o pkg/atm_compon_interf & ocn_compon_interf: |
334 |
|
- combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous |
335 |
|
S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA |
336 |
|
- move bi,bj loops inside S/R OCN_STORE_MY_DATA |
337 |
|
o pkg/atm_ocn_coupler: |
338 |
|
- initialise to zero ATMVARS.h & OCNVARS.h arrays. |
339 |
|
o pkg/rbcs: |
340 |
|
- select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows |
341 |
|
to compile with maskLEN=1 when all tracers use the same RBCS-mask. |
342 |
|
- add a short report (to STDOUT) about RBCS-mask settings. |
343 |
|
|
344 |
|
checkpoint65p (2015/10/23) |
345 |
|
o pkg/seaice/seaice_evp.F: fix store directives and key computations, since |
346 |
|
there is no adjoint test for EVP, we don't know what it does to the adjoint |
347 |
|
solution, but at least there are no more recomputation warnings left |
348 |
|
o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands |
349 |
|
a chance of giving the same results as a fully converged VP (JFNK) solver |
350 |
|
o tools/adjoint_options/adjoint_diva: |
351 |
|
- fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA |
352 |
|
o pkg/streamice: |
353 |
|
- spotted bug in streamice_driving_stress using dyG where should have been dxG |
354 |
|
o pkg/exf: |
355 |
|
- remove STOP statement that prevented to use wind or (wind-)stress |
356 |
|
interpolation for constant-in-time forcing fields (wind/stress period = 0). |
357 |
|
o pkg/seaice: |
358 |
|
- replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires |
359 |
|
5 additionals 2D fields and 6 new store directives |
360 |
|
- change logic in seaice_readparms.F: EVP code can now be turned on in |
361 |
|
various ways, setting SEAICE_deltaTev is no longer required, |
362 |
|
alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev, |
363 |
|
or SEAICEaEVPcoeff |
364 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
365 |
|
- redefining uLoc/vLoc to u/v, instead of 2u/v |
366 |
|
o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz |
367 |
|
- this is an intermediate state of a truely converging EVP that has |
368 |
|
the potential of outperforming implicit VP methods, I do not recommend |
369 |
|
using it yet. |
370 |
|
- for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION |
371 |
|
and all parameters are hardwired |
372 |
|
- for convergence it still requires very smooth regularisations, that means, |
373 |
|
if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is |
374 |
|
different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also |
375 |
|
specific averaging appears to be required, still subject to tuning |
376 |
|
- still needs cleaning and I need to turn parameter into runtime parameters |
377 |
|
- add code to compute and print residuals of iteration, compile with |
378 |
|
defining ALLOW_SEAICE_EVP_RESIDUAL to enable it |
379 |
|
o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq) |
380 |
|
that entered with r1.54 on Sep04, 2015, -> update results |
381 |
|
|
382 |
|
checkpoint65o (2015/09/14) |
383 |
|
o pkg/mom_vecinv & mom_common: |
384 |
|
- add deep-atmosphere geometry factor in mom_calc_visc.F + in routines |
385 |
|
called from there. |
386 |
|
- add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this |
387 |
|
allows to use Vector-Invariant form in deep atmos and anelastic formulation |
388 |
|
o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015) |
389 |
|
and Koenig-Beatty+Holland (2012) |
390 |
|
- two new parameters SEAICE_tensilFac and SEAICE_tensilDepth |
391 |
|
- global 2D field tensileStrength, computed in seaice_calc_ice_strength |
392 |
|
- requires an extra input argument for S/R seaice_calc_viscosities |
393 |
|
- tensileStrength's depth dependence is different from Itkin et al. (2015) |
394 |
|
(to be changed and played with, for now exponential) |
395 |
|
o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.) |
396 |
|
- if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice |
397 |
|
by AREA according to Connelly et al. (2004), JPO. |
398 |
|
- For EVP and the LSR solver, the implicit part of the drag term is |
399 |
|
the only non-zero term in the denominator when there is no ice (which |
400 |
|
prevented running the model with zero ice-ocean drag). If |
401 |
|
SEAICEscaleSurfStress = .TRUE., this results in a division by zero |
402 |
|
(or zero main diagonals BU/BV) which need to be caught. A practical |
403 |
|
consequence is that for open water, the momentum equation reduce |
404 |
|
to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if |
405 |
|
they happen to be zero, often leading to a non-zero solution over |
406 |
|
open water. |
407 |
|
o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more |
408 |
|
efficient EVP method. |
409 |
|
- introduce area-weighted averages for e12 (analogously to |
410 |
|
seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits |
411 |
|
remain, but also changing the order of terms in the previous average |
412 |
|
changed the results as much) -> update experiment |
413 |
|
- add SEAICE_DELTA_SMOOTHREG code |
414 |
|
- disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for |
415 |
|
TEM-code |
416 |
|
- adjust loop bounds so that only required fields are computed |
417 |
|
- add new averaging code for zetaZ/deltaZ (again similar to |
418 |
|
seaice_calc_viscosities.F), inactive by default for now (will change |
419 |
|
results again), but will replace old code eventually |
420 |
|
o eesupp/src: |
421 |
|
- add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F) |
422 |
|
to always cumulate tile local-sum in the same order |
423 |
|
(option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h). |
424 |
|
Still uses MPI_Allreduce (like standard code) but on array of tiles |
425 |
|
and should be faster than GLOBAL_SUM_SEND_RECV code. |
426 |
|
- switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV |
427 |
|
(defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead. |
428 |
|
- add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.: |
429 |
|
aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40, |
430 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example, |
431 |
|
natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre, |
432 |
|
tutorial_baroclinic_gyre and tutorial_held_suarez_cs. |
433 |
|
|
434 |
|
checkpoint65n (2015/07/29) |
435 |
|
o pkg/thsice: |
436 |
|
- add a warning when used with pkg/aim but without updating SST |
437 |
|
(stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ). |
438 |
|
o pkg/offline: |
439 |
|
- change where Offline-Fields are loaded, from load_fields_driver.F to |
440 |
|
directly within FORWARD_STEP, just after updating iter number and time; |
441 |
|
- move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new |
442 |
|
S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS; |
443 |
|
These changes allow: |
444 |
|
a) to recover exactly on-line results using deltaToffline=deltaTClock, |
445 |
|
tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2) |
446 |
|
both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous |
447 |
|
time-step, both with GM & KPP files and with recomputing these fields; |
448 |
|
b) no needs to switch on staggerTimeStep anymore; |
449 |
|
c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf. |
450 |
|
- update output of experiment tutorial_dic_adjoffline (only 3 digits left). |
451 |
|
o pkg/offline: |
452 |
|
- change (rarely used) offset-iteration parameter to an offset time (in s): |
453 |
|
can easily recover previous offset-iter effect by setting offset-time |
454 |
|
(offlineTimeOffset) to offset-iter x deltaToffline; |
455 |
|
- do not turn-off Temp & Salinity surface relaxation when using KPP (used |
456 |
|
in KPP as part of surface buoyancy forcing) in offline run. |
457 |
|
- fix ptracers KPP non-local term in the case where KPP is re-computed. |
458 |
o OpenAD |
o OpenAD |
459 |
- Adding preliminary ggl90 test to OpenAD verification. |
- Adding preliminary ggl90 test to OpenAD verification. |
460 |
Config. with ggl90 currently diverges after 64 time steps |
Config. with ggl90 currently diverges after 64 time steps |
461 |
so will need more work to become more stable |
so will need more work to become more stable |
462 |
o pkg/seaice: |
- Adding preliminary kpp test to OpenAD verification. |
463 |
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
required small tweakes in kpp_routines.F |
464 |
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
- Merge and update from Krishna Narayanan's contrib area: |
465 |
delta with a smooth function in s/r seaice_calc_viscosity |
* Add one variable for preliminary OpenAD DIVA |
466 |
(no effect on EVP) |
* Add replacement time-stepping for OpenAD DIVA |
467 |
- rename local suffix "sqr" into "sq" for more consistent variable names |
* genmake2 flag -diva (but only for OpenAD; preliminary) |
468 |
o pkg/seaice: add new parameter SEAICE_deltaMin that is used ***only*** |
* required modifs for OAD_support |
469 |
for regularizing Delta (and nothing else, like the parameter |
successful preliminary test for tutorial_global_oce_biogeo/ |
470 |
which is also used for all sorts of things SEAICE_EPS). Defaults to |
o pkg/seaice: |
471 |
SEAICE_EPS for backward compatibility only. |
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
472 |
|
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
473 |
|
delta with a smooth function in s/r seaice_calc_viscosity |
474 |
|
(no effect on EVP) |
475 |
|
- rename local suffix "sqr" into "sq" for more consistent variable names |
476 |
|
o pkg/seaice: |
477 |
|
add new parameter SEAICE_deltaMin that is used ***only*** |
478 |
|
for regularizing Delta (and nothing else, like the parameter |
479 |
|
which is also used for all sorts of things SEAICE_EPS). |
480 |
|
Defaults to SEAICE_EPS for backward compatibility only. |
481 |
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
482 |
the wrong key by inialising it before use -> fixes a recomputation |
the wrong key by inialising it before use -> fixes a recomputation |
483 |
problem but does not fix the gradient |
problem but does not fix the gradient |
484 |
o pkg/layers: |
o pkg/layers: |
485 |
- move resetting of flux arrays to outside the iLa loop |
- move resetting of flux arrays to outside the iLa loop |
486 |
(this caused layers_diapycnal to not work with more than one layer coord.) |
(this caused layers_diapycnal to not work with more than one layer coord.) |
492 |
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
493 |
in lab_sea forward experiment (changes results -> updated) |
in lab_sea forward experiment (changes results -> updated) |
494 |
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
495 |
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
496 |
computations; for SEAICE_VECTORIZE_LSR |
computations; for SEAICE_VECTORIZE_LSR |
497 |
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
498 |
sweep to the outside, |
sweep to the outside, |
499 |
- remove store directives and add "CADJ loop sequential" directives |
- remove store directives and add "CADJ loop sequential" directives |