4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkf/exf: |
8 |
|
- add a stop if useRelativeWind with un-updated uwind/vwind (e.g., constant); |
9 |
|
similarly, stop if rotateStressOnAgrid with constant wind-stress. |
10 |
|
o pkg/seaice: |
11 |
|
- remove (comment out) diagnostics SIuwind,SIvwind,SIfu,SIfv (duplicate of |
12 |
|
EXFuwind,EXFvwind,oceTAUX,oceTAUY) and point them to their equivalent. |
13 |
|
- add diagnostics of wind-stress over seaice (SItaux,SItauy) and seaice |
14 |
|
fraction weighted wind stress over ocean+seaice (SIatmTx,SIatmTy). |
15 |
|
o pkg/diagnostics: |
16 |
|
- small piece of code to rename (old) diagnostics, when namelist is processed. |
17 |
|
o model/src: |
18 |
|
- new run-time param (useMin4hFacEdges) to select method for setting hFacW,S: |
19 |
|
originally, set as minimum of adjacent hFacC factor ; now (new default) |
20 |
|
computed from rSurfW,S and rLowW,S by applying same rules as for hFacC. |
21 |
|
Only matters when useShelfIce=T with particular ice-shelf cavity geometry. |
22 |
|
o pkg/seaice: |
23 |
|
- add momemtum advection, off by default, still in test phase |
24 |
|
most of the momentum advection code is adapted and reused from mom_vecinv |
25 |
|
o pkg/mom_vecinv: |
26 |
|
- pass these runtime flags: |
27 |
|
selectVortScheme, highOrderVorticity, upwindVorticity, useJamartMomAdv |
28 |
|
as formal parameters to s/r mom_vi_u/v_coriolis, mom_vi_u/v_coriolis_c4, |
29 |
|
so that these routines can also be used in pkg/seaice. |
30 |
|
|
31 |
|
checkpoint66g (2017/04/24) |
32 |
|
o model/src: |
33 |
|
- more robust ordering of column thickness integral (=Sum_k(drF*hFac) ) |
34 |
|
to get same expression (regarding machine truncation) in different places |
35 |
|
in ini_masks_etc.F (e.g., rSurfC,W,S is now exactly zero when it should). |
36 |
|
Update forward output of experiments: global_ocean.cs32x15 (all 5 except |
37 |
|
viscA4), isomip (x3), tutorial_global_oce_in_p & tutorial_plume_on_slope. |
38 |
|
o pkg/shelfice: |
39 |
|
- ALLOW_SHIFWFLX_CONTROL: move setting of maskSHI from shelfice_update_masks.F |
40 |
|
to shelfice_init_fixed.F |
41 |
|
- change S/R SHELFICE_UPDATE_MASKS to SHELFICE_INIT_DEPTHS (still called from |
42 |
|
ini_masks_etc.F for now) to update ocean upper boundary position according |
43 |
|
to ice-shelf topography (instead of directly updating hFacC). |
44 |
|
o model/src: |
45 |
|
- move call to CTRL_INIT & CTRL_ADMTLM from the middle to the bottom of |
46 |
|
packages_init_fixed.F to allow other pkgs to set mask and weight fields. |
47 |
|
|
48 |
|
checkpoint66f (2017/04/06) |
49 |
|
o model/src: |
50 |
|
- add specific run-time param to select level of printed plot-field-maps, |
51 |
|
set by default to debugLevel. Remove internal param "printDomain". |
52 |
|
o pkg/seaice: |
53 |
|
- add flag to add snow mass to seaiceMassC/U/V, the default is |
54 |
|
SEAICEaddSnowMass=.FALSE., not to change previous results |
55 |
|
o pkg/bling |
56 |
|
- Bug fix in bling_production regarding unit conversion for diagnostics |
57 |
|
being put in the wrong place |
58 |
|
o model/src: |
59 |
|
- add back recomputation of rSurfW & S to ensure consistent column thickness |
60 |
|
(needed for rStar) between Sum_k(hFac*drF) and rSurf-rLow, for now only |
61 |
|
when using pkg/shelfice; was initially added on 2012/06/01 (ini_masks_etc.F |
62 |
|
revision 1.51) but was removed accidentally on 2014/02/08 (v1.53). |
63 |
|
o pkg/autodiff: |
64 |
|
- clean-up "checkpoint.flow" |
65 |
|
o pkg/rw (Contribution from Jody Klymak): |
66 |
|
option to set mds file suffix as function of time in simulation: |
67 |
|
*) new input parameter "rwSuffixType" (read from PARM03 namelist) |
68 |
|
to select file suffix format; by default (=0), use iteration number; |
69 |
|
*) add simple routine to return file suffix according to rwSuffixType; |
70 |
|
*) in model/src and in most pkgs (except: atm2d, fizhi, regrid & streamice), |
71 |
|
use new S/R to get file suffix, except for debug output file (diagFreq) |
72 |
|
and pkgs offline & rbcs input files. |
73 |
|
o pkg/rw: |
74 |
|
- uniform processing of "I10" suffix across writing fld routines; used to |
75 |
|
simplify debug writing of cg2/3d_b/x in solve_for_pressure.F & post_cg3d.F |
76 |
|
(similar to cg3d.F, cg3d_ex0.F) |
77 |
|
o pkg/mom_vecinv: |
78 |
|
- highOrderVorticity in selectVortScheme=2 case: fix c4 coeff in splitted |
79 |
|
vorticity flux (keep same sum in case vBarXm=vBaXp, uBarYm=uBarYp). |
80 |
|
o pkg/bling: |
81 |
|
- Many small changes intended to clean the code. |
82 |
|
Unnecessary ADJOINT_SAFEs removed ; |
83 |
|
removed BLING_COST.h BLING_CTRL.h bling_cost.F ; |
84 |
|
diagnostics added. |
85 |
|
|
86 |
|
checkpoint66e (2017/03/14) |
87 |
|
o pkg/exf: |
88 |
|
- interpolation with #undef EXF_INTERP_USE_DYNALLOC: move buffer size |
89 |
|
definition outside EXF_PARAM.h in new header file: EXF_INTERP_SIZE.h; |
90 |
|
use fixed size buffer (passed to S/R EXF_INTERP & EXF_INTERP_UV) to |
91 |
|
avoid any dynamic allocation ; |
92 |
|
- S/R EXF_CHECK: add new check & stop when file-name is defined but not |
93 |
|
read-in ; add warning when file is read-in but not used within pkg/exf ; |
94 |
|
+ check for buffer-size (if #undef EXF_INTERP_USE_DYNALLOC). |
95 |
|
- update exf_summary.F (print {FLD}RepCycle). |
96 |
|
o verification/global_with_exf: |
97 |
|
- switch on exf interpolation in AD test (just like the forward test) |
98 |
|
o pkg/mom_vecinv: |
99 |
|
- add storage directives to avoid recomputations within mom_vecinv.F |
100 |
|
which were generating seg. fault with gfortran -devel |
101 |
|
o pkg/ctrl, pkg/smooth: |
102 |
|
- initialize array halos which were generating seg. fault with |
103 |
|
gfortran -devel in adjoint mode |
104 |
|
o pkg/exf: |
105 |
|
- for each input field, enable to specify a field specific repeat-cycle |
106 |
|
({FLD}RepCycle) which defaults to pkg/exf main "repeatPeriod". |
107 |
|
o verification/lab_sea: |
108 |
|
- update AD results of primary test and noseaicedyn test after switching |
109 |
|
to new version of TAF (5.3.13 vs 5.3.2 before); agreement with gradient |
110 |
|
check stays about the same. |
111 |
|
o pkg/exf: |
112 |
|
- fix bug in exf_zenithangle.F for cases select_ZenAlbedo > 0 with useCAL=T. |
113 |
|
- exf_check: MAX_LAT_INC need only be "loc_nlat-1", not equal to loc_nlat |
114 |
|
o pkg/bling, USE_EXFCO2 code: |
115 |
|
- add parameter "apco2RepCycle" (set to pkg/exf "repeatPeriod" by default); |
116 |
|
- update calls to EXF S/R (use new version: EXF_INIT_FLD & EXF_SET_FLD). |
117 |
|
o pkg/exf: |
118 |
|
- rename S/R EXF_INIT to EXF_INIT_VARIA ; |
119 |
|
- add arguments: fldName (for debug msg) and fldRepeatCycle (set to |
120 |
|
repeatPeriod) to S/R EXF_SET_UV and to S/R EXF_SET_GEN (renamed EXF_SET_FLD) |
121 |
|
and update calls in pkg/exf calling S/R (exf_getffields.F & exf_getclim.F) ; |
122 |
|
- add argument: fldName (for debug msg) to S/R EXF_INIT_GEN (renamed |
123 |
|
EXF_INIT_FLD) and update calls in exf_init_varia.F |
124 |
|
- For now, for backward compatibility, keep a simplified version of S/Rs |
125 |
|
EXF_SET_GEN & EXF_INIT_GEN in file exf_set_gen.F |
126 |
|
- add and pass new arguments: fldName (for debug msg) and fldRepeatCycle |
127 |
|
to S/R EXF_GetFFieldRec ; update calls in pkg/obcs/obcs_exf_load.F |
128 |
|
o tools/genmake2: |
129 |
|
- replace "bc -l" (only used once) by "expr" (already used). |
130 |
|
o verification/global_ocean.cs32x15: |
131 |
|
- turn off pkg/cal (useCAL=F) in secondary FWD exp. "icedyn". |
132 |
|
Note: exf setting (data.exf) can be compared to other exf secondary exp |
133 |
|
"seaice" (kept with useCAL=T) which has same time dependent forcing. |
134 |
|
|
135 |
|
checkpoint66d (2017/02/13) |
136 |
|
o pkg/exf: |
137 |
|
- remove setting of useCAL=T when using pkg/exf (useEXF=T); add warning |
138 |
|
early on (in packages_boot.F) to stress this change in pkg setting. |
139 |
|
- In (most) verification exp. that use pkg/exf, add useCAL=.TRUE. to data.pkg |
140 |
|
o model/src: |
141 |
|
- move call to ecco_phys to end of time step; this may induce minor |
142 |
|
cost function changes by shifting time averages by one time step |
143 |
|
for some variables; this revision resulted in changed adjoint results |
144 |
|
in MITgcm_contrib/verification_other/global_oce_cs32 |
145 |
|
o pkg/exf: |
146 |
|
- Change EXF_READ_EVAP to only activate code within #ifdef ALLOW_ATM_TEMP ; |
147 |
|
this prevents to read evap when ALLOW_ATM_TEMP is undef and other fields, |
148 |
|
e.g. precip, are not available. |
149 |
|
o pkg/flt: |
150 |
|
- flt_init_varia.F: use pickupSuff if specified |
151 |
|
- add code (within #ifdef DEVEL_FLT_EXCH2) and test case as a first, |
152 |
|
intermediate, step towards completing pkg/exch2 support within pkg/flt; |
153 |
|
ifdef DEVEL_FLT_EXCH2 then: |
154 |
|
- flt_init_fixed.F: comment out stop |
155 |
|
- flt_exch2.F: conserve ipart, jpart (grid coordinates) |
156 |
|
- exch2_recv_get_vec.F: transform ipart, jpart (grid coordinates) |
157 |
|
- flt_mapping.F: attempt to fix longitude diagnostic near date-line |
158 |
|
- flt_init_varia.F: hack initialization (for testing purposes w. LLC90) |
159 |
|
o tools/genmake2 & pkg/pkg_depend: |
160 |
|
- define new type of pkg dependency rule ("=pkg_x"), less strict than |
161 |
|
the "+" rule, that add the dependent pkg (pkg_x) unless it's disabled |
162 |
|
(-pkg_x in packages.conf). |
163 |
|
- change pkg/exf dependency rule from "exf +cal" to "exf =cal"; |
164 |
|
- add "+cal" to dependency list of pkg/ecco (needed to compile). |
165 |
|
- simplify FWD experiment "offline_exf_seaice" by removing pkg/cal. |
166 |
|
o utils/matlab: |
167 |
|
- adding ocean_basin routines for defining basin masks. |
168 |
|
o pkg/exf: |
169 |
|
- new S/R EXF_GETFFIELD_START replacing EXF_GETFIELD_START, but with more |
170 |
|
arguments, allowing to check (and stop) if parameter setting of |
171 |
|
{FLD}startdate1 & date2 and of {FLD}StartTime are consistent with |
172 |
|
useCAL= T or F. For now, kept a simplified version of EXF_GETFIELD_START |
173 |
|
for backward compatibility. |
174 |
|
- change accordingly calls in exf_init_fixed.F + default {FLD}StartTime in |
175 |
|
exf_readparms.F ; apply same changes to pkg/icefront (for SGRunOff field). |
176 |
|
o pkg/bling (USE_EXFCO2 code): |
177 |
|
- fix missing setting of apco2StartTime according to apco2startdate1 & date2 |
178 |
|
by adding a call to S/R EXF_GETFFIELD_START. |
179 |
|
o pkg/exf: |
180 |
|
- allows to compile without pkg/cal (but disabled by current dependency |
181 |
|
rules, i.e., default "pkg/pkg_depend"). Minimal changes to enable to |
182 |
|
run with useCAL=F ; this involves setting directly {FLD}StartTime instead |
183 |
|
of {FLD}startdate1 & date2 ; consistency check not yet coded. |
184 |
|
o verification/global_ocean.cs32x15: |
185 |
|
- fix all data.exf for a shift of 1 day in all field startdate1 so that it now |
186 |
|
corresponds to middle of 1rst month; update outputs (2 fwd + 3 adm + 3 tlm). |
187 |
|
o pkg/exf: |
188 |
|
- allow to use EXF_ZENITHANGLE without pkg/cal + simplify (saving some |
189 |
|
calculations); change FWD experiment global_ocean.cs32x15 |
190 |
|
(#define ALLOW_ZENITHANGLE) to test/check that this code compiles. |
191 |
|
o pkg/exf: |
192 |
|
- In preparation for addition to NAMELIST, rename internal (_RL) parameter |
193 |
|
{FIELD}startdate to {FIELD}StartTime |
194 |
|
Note: new name also fit better the content, i.e, a start time in second. |
195 |
|
o eesupp/src: |
196 |
|
- add 1 argument to S/R EEBOOT & EEBOOT_MINIMAL for interface with ESMF |
197 |
|
o pkg/exf: |
198 |
|
- add option ALLOW_READ_TURBFLUXES (and corresponding set of parameters) |
199 |
|
to allow to read-in Sensible & Latent Heat flux ; |
200 |
|
- simplify pkg/exf main options: |
201 |
|
1) move small piece of code (case ALLOW_ATM_TEMP undef) out of |
202 |
|
exf_bulkformulae.F into exf_wind.F so that exf_bulkformulae.F is |
203 |
|
compiled only when both ALLOW_ATM_TEMP & ALLOW_BULKFORMULAE are defined; |
204 |
|
2) make call to EXF_RADIATION and to EXF_WIND independent of CPP option |
205 |
|
ALLOW_BULKFORMULAE which now only applies to S/R EXF_BULKFORMULAE ; |
206 |
|
3) improve options documentation in EXF_OPTIONS.h. |
207 |
|
o pkg/ecco: |
208 |
|
- cost_gencost_customize.F,ecco.h,ecco_phys.F,ecco_readparms.F, and |
209 |
|
ecco_summary.F: add passive tracer cost functions to gencost; |
210 |
|
m_ptracer and m_boxmean_ptracer |
211 |
|
o pkg/ctrl: |
212 |
|
- ctrl_map_forcing.F: pass myIter and myTime to ctrl_map_forcing as input |
213 |
|
parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing; add to list |
214 |
|
of implemented gentim2d contol parameters: xx_qnet, xx_empmr, xx_qsw, |
215 |
|
xx_sst, xx_sss, xx_pload, xx_saltflux, xx_fu, xx_fv, xx_fe, xx_fn |
216 |
|
o model/src: |
217 |
|
- forward_step.F: pass myIter and myTime to ctrl_map_forcing as input |
218 |
|
parameters; move myIter .EQ. nIter0 inside ctrl_map_forcing |
219 |
|
o pkg/exf: |
220 |
|
- exf_getffields.F: add to list of implemented gentim2d contol parameters: |
221 |
|
xx_lwflux, xx_swflux, xx_evap, xx_apressure, xx_areamask |
222 |
|
|
223 |
|
checkpoint66c (2017/01/19) |
224 |
|
o verification: |
225 |
|
- add new option "-src" to testreport to only produce source code (*.f), |
226 |
|
including taf output src code (if using '-adm'/'-tlm' option). |
227 |
|
o pkg/exf: |
228 |
|
- add saltflx :: Net upward salt flux in psu.kg/m^2/s |
229 |
|
o pkg/diagnostics: |
230 |
|
- add run-time variable diagMdsDir to specify a subdirectory for |
231 |
|
diagnostic output when mds is being used and mdsioLocalDir is not. |
232 |
|
o pkg/mnc: |
233 |
|
- mnc_utils.F: edit stop message |
234 |
|
o pkg/autodiff: |
235 |
|
- autodiff_ini_model_io.F: PRINT_MESSAGE, clean-up comments, add _*_MASTER, |
236 |
|
add HAVE_SYSTEM bracket around system call to mkdir |
237 |
|
o pkg/profiles: |
238 |
|
- profiles_findunit.F, profiles_init_fixed.F, profiles_interp.F, |
239 |
|
profiles_readparms.F: call ALL_PROC_DIE before 'stop' |
240 |
|
- profiles_ini_io.F: use PRINT_MESSAGE, clean-up comments, add _*_MASTER, |
241 |
|
add HAVE_SYSTEM bracket around system call to mkdir |
242 |
|
o pkg/smooth: |
243 |
|
- smooth_filtervar2d.F, smooth_filtervar3d.F: call ALL_PROC_DIE before 'stop' |
244 |
|
- smooth_init2d.F, smooth_init3d.F: move print statements to readparms |
245 |
|
- smooth_readparms.F: add cleaner print statements from smooth_init?d.F |
246 |
|
o pkg/exf: |
247 |
|
- check: count errors and stop cleanly at the end (call to ALL_PROC_DIE); |
248 |
|
issue error message when climsst_interpMethod.GT.0 and climsst_lon_inc > 500 |
249 |
|
generalize tests on interpMethod, nlat, and lon_inc to all exf variables. |
250 |
|
- summary: skip detailed field report if not used (empty file-name). |
251 |
|
o tools/xmakedepend: |
252 |
|
- In case line editor "ed" is missing, switch to "sed" command to clean-up |
253 |
|
Makefile from previous dependencies (anything after "# DO NOT DELETE" line). |
254 |
|
o pkg/exf: |
255 |
|
- change definition of "hflux" input file to always include Short-Wave; |
256 |
|
this is now consistent with hflux computation (if using bulk-formulae) |
257 |
|
and hflux diagnostic & documentation (in EXF_FIELDS.h). |
258 |
|
|
259 |
|
checkpoint66b (2016/12/01) |
260 |
|
o model & momentum pkgs: |
261 |
|
- implement fully implicit bottom friction combined with implicit surf. |
262 |
|
pressure, for now, only in hydrostic formulation: |
263 |
|
+ to use: compile with #define ALLOW_SOLVE4_PS_AND_DRAG in CPP_OPTIONS.h |
264 |
|
and run with selectImplicitDrag=2 ; |
265 |
|
+ currently missing diagnostics of bottom drag and vert. viscosity tendency; |
266 |
|
- partial implicit time-stepping (bot. friction + vert. visc first, then |
267 |
|
surf. press) corresponding to selectImplicitDrag=1 should be applicable |
268 |
|
to NH formulation but not available until we solve for surf. pressure |
269 |
|
increment (instead of full etaN). |
270 |
|
- change exp. global_ocean.cs32x15.thsice to test implicit bottom drag |
271 |
|
with implicit vertical viscosity. |
272 |
|
o pkg/seaice: add linear remapping scheme (Lipscomb 2001) to ITD model |
273 |
|
- this is a first version that includes many regularisations that may |
274 |
|
not all be necessary, to be sorted out, |
275 |
|
- turned on by runtime parameter SEAICEuseLinRemapITD (true by default) |
276 |
|
- change one verification experiment in seaice_itd to use and test new code |
277 |
|
- seaice_growth: catch a case where the argument of log can be zero |
278 |
|
or smaller (important for code stability) |
279 |
|
o model/src: |
280 |
|
- modify SOLVE_DIAGONAL_LOWMEMORY version of solve_tridiagonal.F |
281 |
|
& solve_pentadiagonal.F to enable to re-used inverse matrix for solving |
282 |
|
similar A.X'=Y' system (with same matrix A) in subsequent calls; |
283 |
|
switch based on errCode (In/Out) argument value; in calling routines, |
284 |
|
initialise errCode before first call. |
285 |
|
|
286 |
|
checkpoint66a (2016/10/18) |
287 |
|
o pkg/bling: |
288 |
|
- BLING package now loads in atmospheric pCO2 file using exf package routines |
289 |
|
Enable with #define USE_EXFCO2 in BLING_OPTIONS.h |
290 |
|
o model/src & pkg/ptracers: |
291 |
|
- with INCLUDE_IMPLVERTADV_CODE defined, also call MOM_U,V_IMPLICIT_R & |
292 |
|
GAD_IMPLICIT_R (instead of IMPLDIFF) when just implicitViscosity and |
293 |
|
implicitDiffusion (respectively) are used (even without momImplVertAdv |
294 |
|
or temp,salt,PTRACERS_ImplVertAdv). |
295 |
|
o model/src & generic_advdiff: |
296 |
|
- add parenthesis in main diagonal calculation of implicit vertical |
297 |
|
diffusion matrix (impldiff.F & gad_implicit_r.F). |
298 |
|
This affects results at machine truncation level; update output of many |
299 |
|
verification experiments (31 fwd ; 10 adm ; 8 tlm ; 3 oad). |
300 |
|
o pkg/mom_commom & generic_advdiff: |
301 |
|
- add deep atmosphere and anelastic scaling factor in implicit vertical |
302 |
|
advection routines (mom_u,v_implicit_r.F & gad*_impl*_r.F). |
303 |
|
o model/src: |
304 |
|
- remove few unnecessary temp array copies in solve_tridiagonal.F |
305 |
|
& solve_pentadiagonal.F |
306 |
|
|
307 |
|
checkpoint65z (2016/09/28) |
308 |
|
o pkg/seaice: fix multithreading for seaice_fgmres.F |
309 |
|
- remove unecessary variables from common blocks |
310 |
|
- use extra dimension MAX_NO_THREADS for all variables of the Krylov space |
311 |
|
basis, that are stored in commom blocks (including integer variable i1) |
312 |
|
- clean up code a little by removing commented lines that refer to |
313 |
|
original code |
314 |
|
- turn on multi-threaded test for experiment offline_exf_seaice.dyn_jfnk. |
315 |
|
o MITgcm manual: |
316 |
|
- add uptodate pkg/ecco documentation to the manual (section 8.1; ecco.tex), |
317 |
|
preliminary documentation for generic controls (8.3; ctrl.tex), |
318 |
|
a placeholder for smooth (8.4; smooth.tex), and comment out the deprecated |
319 |
|
ecco_costfunction.tex |
320 |
|
o pkg/ecco: |
321 |
|
- update and cleanup list of CCP options |
322 |
|
- re-assign gencost_mask to specify masks rather than gencost_errfile; 'c' |
323 |
|
is now always passed to cost_generic; gencost_mask is now MAX_LEN_FNAM |
324 |
|
- add checks that retired run-time options are not used, and in relation |
325 |
|
to gencost_mask and gencost_errfile |
326 |
|
- finish deprecating gencost_scalefile, gencost_smooth2Ddiffnbt, and |
327 |
|
gencost_nrecperiod |
328 |
|
- fix m_eta computation for virtual salt flux case |
329 |
|
- add m_horflux_vol case (selected via gencost_barfile) that computes |
330 |
|
transports via cost_gencost_boxmean (gencost_flag=-3) |
331 |
|
- use gencost_flag more systematically (i.e., avoid using gencost_name) |
332 |
|
for code switches (aside from physical variable selection) |
333 |
|
o pkg/seaice: make seaice_fgmres.F fit for multithreading; this first |
334 |
|
attempt appears to be a bit of a hack and my need some repair down the road |
335 |
|
o pkg/exf: |
336 |
|
- interpolation near South Pole: fix criteria on input field latitude. |
337 |
|
o pkg/icefront & pkg/exf: |
338 |
|
- move setting of icefront Sub-Glacial RunOff forcing (currently unused) |
339 |
|
from pkg/exf (read from data.exf) to pkg/icefront (read from data.icefront) |
340 |
|
o pkg/exf: |
341 |
|
- replace CPP option ALLOW_EXF_OUTPUT_INTERP with run-time parameter |
342 |
|
"exf_output_interp" (in namelist: EXF_NML_04); change output file name |
343 |
|
(add suffix "_out" instead of a prefix); keep same record number as in |
344 |
|
input file but always write record 1 first (to avoid a STOP in I/O S/R). |
345 |
|
Change output file content by writing interpolated field before applying |
346 |
|
land-sea mask (helpful for debug). |
347 |
|
- 2 compon. vector interpolation with rotation: apply scaling factor on |
348 |
|
each compon. (Eastward and Northward) just before rotation. |
349 |
|
o pkg/bling: |
350 |
|
- Cleaned package. Removed not needed code and comments. |
351 |
|
- adjoint example now works |
352 |
|
(MITgcm_contrib/verification_other/global_oce_biogeo_bling/code_ad) |
353 |
|
o pkg/ptracers: |
354 |
|
- add Bruno Deremble's code to complete the linear surface correction |
355 |
|
for tracer conservation; |
356 |
|
- enabled for individual ptracers by PTRACERS_linFSConserve(iTr)=.TRUE. |
357 |
|
|
358 |
|
checkpoint65y (2016/07/29) |
359 |
|
o pkg/debug (stats): |
360 |
|
- change GLOBAL_SUM to GLOBAL_SUM_TILE (result independent of tile to |
361 |
|
proc/thread mapping); |
362 |
|
- fix Min & Max for case where 1 thread has only empty tiles; |
363 |
|
- use RL variable to count number of wet grid points (with big domain, |
364 |
|
can be too large to fit into integer*4). |
365 |
|
o pkg/monitor: |
366 |
|
- use RL variable to count number of wet grid points (but used only for del2) |
367 |
|
- add new routine to compute Advective CFL within tracer time-stepping with |
368 |
|
writing delayed until next monitor output. |
369 |
|
o pkg/obcs: |
370 |
|
- fix bug in OBCS_BALANCE_FLOW (OBCS_balanceFacN misspelled OBCS_balanceFacW) |
371 |
|
o pkg/cal: |
372 |
|
- calandar-dump: treat case myTime < timePhase in the same way as in |
373 |
|
eesupp/src/diff_phase_multiple.F (when not using calandar-dump). |
374 |
|
o pkg/dic & seaice: |
375 |
|
- fix compilation of ocean component for coupled atm+ocn model with |
376 |
|
seaice dynamics & dic. |
377 |
|
|
378 |
|
checkpoint65x (2016/06/11) |
379 |
|
o add a license text file in main MITgcm tree. |
380 |
|
o added pkg/bling: |
381 |
|
- intermediate complexity biogeochemical model |
382 |
|
- see bling_description.txt for details |
383 |
|
- verification experiment is global_oce_biogeo_bling (for now, in |
384 |
|
Contrib/verification_other/); tested daily on baudelaire with gfortran. |
385 |
|
- add entry point in pkg/gchem for new pkg "bling". |
386 |
|
o pkg/seaice: fix tensile stength computation |
387 |
|
- replace global field tensileStrength by tensileStrFac |
388 |
|
- tensileStrFac can be computed once in S/R seaice_init_varia |
389 |
|
- fortunately that does not affect any verification results |
390 |
|
|
391 |
|
checkpoint65w (2016/05/12) |
392 |
|
o pkg/ctrl/ctrl.h: fix a comma in common block list, so that code compiles |
393 |
|
with ECCO_CTRL_DEPRECATED defined |
394 |
|
o verification/global_ocean.cs32x15: |
395 |
|
- change secondary test "viscA4" to also test "selectP_inEOS_Zc=3" |
396 |
|
with "selectNHfreeSurf=1". |
397 |
|
o model/src (non-hydrostatic free-surface): |
398 |
|
- More "natural" expression of NH free-surface term (case selectNHfreeSurf=1): |
399 |
|
was: tmpSurf/(1+tmpSurf); changed to: 1/(1+Gamma) with Gamma=1/tmpSurf. |
400 |
|
- Calculate surface vertical velocity after 2-D solver adjustment (accounts |
401 |
|
for EmPmR if RealFreshWaterFlux); used in RHS (cg3d_b) if exactConserv |
402 |
|
and used to compute dPhiNH (in post_cg3d.F) if selectNHfreeSurf=1. |
403 |
|
This fixes EmPmR contribution when selectNHfreeSurf=1 & RealFreshWaterFlux. |
404 |
|
- Update output (changes at machine truncation level) of verification exp: |
405 |
|
exp4 (11 digits for cg2d), global_ocean.cs32x15.viscA4 (11.d), |
406 |
|
short_surf_wave (13.d) and tutorial_deep_convection.smag3d (12.d). |
407 |
|
o pkg/seaice: ITD code |
408 |
|
- fix picking up from a single category model by initialising |
409 |
|
heff/area/hsnowITD = 0. in seaice_itd_pickup.F |
410 |
|
- split a long warning message in seaice_check_pickup.F into two lines, |
411 |
|
because NEC SX-ACE cannot deal with the long line. |
412 |
|
o model/src: |
413 |
|
- fix missing dPhiNH in pressure_for_eos.F (case: selectP_inEOS_Zc=3) |
414 |
|
o pkg/seaice: |
415 |
|
- add missing checks for SEAICE_ALLOW_KRYLOV and SEAICE_ALLOW_BOTTOMDRAG |
416 |
|
o pkg/seaice: |
417 |
|
- add basal stress as parameterisation for grounding ice |
418 |
|
following Lemieux et al. (2015) |
419 |
|
- turn on by setting new parameter SEAICEbasalDragK2 to a value |
420 |
|
larger than 0. Lemieux et al. (2015) recommend 15. |
421 |
|
- The adjoint complains with extra recomputations so there is also a |
422 |
|
new cpp-flag SEAICE_ALLOW_BOTTOMDRAG that is undefined by default in |
423 |
|
order to postpone the problem |
424 |
|
- compile the new code in lab_sea |
425 |
|
o verification/halfpipe_streamice: |
426 |
|
- update both TAF and OpenAD adm output (machine truncation differences) |
427 |
|
|
428 |
|
checkpoint65v (2016/04/08) |
429 |
|
o verification/advect_xz: |
430 |
|
- increase overlap size from 3 to 4 and add new secondary test for PQM |
431 |
|
advection scheme (with mono & wino limiter). |
432 |
|
- change main exp. to test PPM (with weno limiter) adv.scheme on Temp. |
433 |
|
o model/src: |
434 |
|
- new parameters "top_Pres" & "seaLev_Z" (replacing Ro_SeaLevel and recently |
435 |
|
added phi0Ref) to set vertical axis origin and phiRef origin; |
436 |
|
keep Ro_SeaLevel for backward compatibility (with a warning). |
437 |
|
According to coordinate and fluid type: |
438 |
|
OCN in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(1), @ the top) |
439 |
|
ATM in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(Nr+1) @ bottom) |
440 |
|
OCN in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(Nr+1)/g, @ the top) |
441 |
|
ATM in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(1)/g, @ the bottom) |
442 |
|
- remove Ro_SeaLevel from ATM experiment parameter files; |
443 |
|
- in tutorial_global_oce_in_p, remove Ro_SeaLevel and set top_Pres to the |
444 |
|
complement; update output.txt (changes at machine truncation level). |
445 |
|
o pkg/seaice/seaice_evp.F |
446 |
|
- simplify computation of deltaZ and zetaZ to simple averaging following |
447 |
|
Bouillon et al. (2013). This removes a lot of code, but also changes |
448 |
|
verification experiment lab_sea.hb87 -> updated |
449 |
|
|
450 |
|
checkpoint65u (2016/03/14) |
451 |
|
o pkg/generic_advdiff: |
452 |
|
- from Darren: add PPM and PQM advection schemes (number 40-42 and 50-52) |
453 |
|
with 2 types of limiter (see: Engwirda & Kelley, submit. to JCP); |
454 |
|
Note (from Darren): unlimited PPM/PQM scheme (40 & 50) are just for |
455 |
|
testing and not for actual use. |
456 |
|
o model/src: |
457 |
|
- add parameter "phi0Ref" to specify reference [pressure/geo] potential at |
458 |
|
origin r = rF(1); |
459 |
|
- add options (parameter selectP_inEOS_Zc) to select which pressure to use |
460 |
|
in EOS for height coordinate: enable to include NH Pressure or to use |
461 |
|
more accurate pressure vertical profile; options not linked to EOS type |
462 |
|
(as previously, e.g., JMD95P/JMD95Z) but set default according to EOS type; |
463 |
|
- start to implement variable gravity (along vertical): for now, only with |
464 |
|
z-coords (not even z*). |
465 |
|
- add Ideal Gas equation of state for height coordinate. |
466 |
|
- update OpenAD output (affected at machine truncation level) of exp: |
467 |
|
global_ocean.90x40x15, OpenAD (std) and tutorial_global_oce_biogeo. |
468 |
|
o pkg/exf: |
469 |
|
- add ALLOW_EXF_OUTPUT_INTERP cpp switch to output the result |
470 |
|
of exf interpolation (before any rescaling, rotation or interpolation |
471 |
|
to velocity point) for each field that gets loaded from file. This option |
472 |
|
identically mimics the input file organization (e.g. record numbers in year |
473 |
|
by year input files) besides the change in horizontal grid. |
474 |
|
- add rotateStressOnAgrid run-time switch so that wind stress fields |
475 |
|
can be provided on the A-grid in zonal/meridional direction and |
476 |
|
rotated on the fly. This only applies to the case when the exf |
477 |
|
interpolation is off and rotateStressOnAgrid is false by default. |
478 |
|
o model/src: |
479 |
|
- rename internal parameter "useDynP_inEos_Zc" to "storePhiHyd4Phys" (since |
480 |
|
it's also used with pkg/atm_phys) and add few more parameters (but still |
481 |
|
inactive, src code yet to come) |
482 |
|
|
483 |
|
checkpoint65t (2016/02/10) |
484 |
|
o pkg/atm_phys: |
485 |
|
- from Ruth Geen: add optical depth dependence on CO2 concentration. |
486 |
|
o model/src: |
487 |
|
- fix vertical inter/extra-polation of density factor rhoFacF (for anelastic) |
488 |
|
for the case setCenterDr=T (delRc set from "data"); add output of rhoFacC&F. |
489 |
|
Update output of exp. deep_anelastic (changes at truncation level). |
490 |
|
o tools: |
491 |
|
- add a hack in "remove_comments_sed" (used only with TAF) for recent |
492 |
|
version of OpenMPI (shipped with FC.23): comment out the new header |
493 |
|
file "mpif-sizeof.h" which causes problems to TAF. |
494 |
|
o pkg/seaice: |
495 |
|
- change the termination criterion so that maxits (SEAICElinearIterMax) |
496 |
|
has an effect |
497 |
|
- unify iteration parameters for implicit solvers (JFNK and Picard) |
498 |
|
SEAICEnonLinIterMax replaces SEAICEnewtonIterMax/NPSEUDOTIMESTEPS |
499 |
|
SEAICElinearIterMax replaces SEAICEkrylovIterMax/SOLV_MAX_ITER |
500 |
|
SEAICEpreLinIterMax replaces SOLV_MAX_ITER in preconditioner |
501 |
|
SEAICEpreNL_IterMax replaces NPSEUDOTIMESTEPS in preconditioner |
502 |
|
SEAICEnonLinTol replaces JFNKgamma_nonlin |
503 |
|
- remove S/R SEAICE_FGMRES_DRIVER and put content into S/R SEAICE_JFKN |
504 |
|
- add new Picard-Krylov solver, compile with SEAICE_ALLOW_KRYLOV and |
505 |
|
use with SEAICEuseKrylov |
506 |
|
o pkg/seaice/seaice_lsr.F |
507 |
|
fix small bug: replace zetaZ by zetaZloc in S/R seaice_lsr_rhsu/v; only |
508 |
|
relevant if SEAICEuseStrImpCpl=T, and even then it does not seem to have |
509 |
|
an effect. |
510 |
|
o pkg/seaice: add two new parameters |
511 |
|
- SEAICEuseLSR to simplify the logic in seaice_dynsolver (this |
512 |
|
parameter is not in any namelist) |
513 |
|
- SEAICEusrPicardAsPrecon to allow s/r seaice_lsr to be used as |
514 |
|
a preconditioner for the non-linear Newton iteration of the JFNK |
515 |
|
solver |
516 |
|
o pkg/seaice/seaice_lsr.F: replace 1./SEAICE_deltaTdyn with recip_deltaT, |
517 |
|
affects some experiments at truncation level: |
518 |
|
- global_ocean.cs32x15.icedyn (11 digits), |
519 |
|
- global_ocean.cs32x15.seaice (11 digits), |
520 |
|
- seaice_itd (12 digits), seaice_itd.lipscomb07 (12 digits) -> update |
521 |
|
- also update global_ocean.cs32x15 adjoint and tangent-linear results |
522 |
|
o pkg/salt_plume & pkg/thsice: |
523 |
|
- for coupled set-up with pkg/thsice in ATM and pkg/salt_plume in OCN, |
524 |
|
connect salt_plume flux to ATM-OCN coupling pkgs interface: |
525 |
|
a) in ATM: also cumulate salt-plume flux in S/R THSICE_SALT_PLUME (for |
526 |
|
export to coupler interface) even without compiling pkg/salt_plume ; |
527 |
|
b) in OCN: apply coupler salt-plume flux to pkg/salt_plume field |
528 |
|
(saltPlumeFlux) just before exch call, in S/R SALT_PLUME_DO_EXCH. |
529 |
|
o pkg/dic: |
530 |
|
- use the updated seaice fraction (from seaice pkgs) for DIC forcing |
531 |
|
instead of the previous time-step value ; done in new S/R DIC_FIELDS_UPDATE |
532 |
|
called from the top of dic_biotic_forcing.F (instead of in DIC_FIELDS_LOAD); |
533 |
|
- move also update with values from ATM-OCN Coupler in the same new S/R |
534 |
|
(previously done in ocn_apply_import.F). |
535 |
|
o tools/adjoint_options: |
536 |
|
- specify explicitly "-f77" or "-f90" in default ad-optfile since TAF (default) |
537 |
|
has been changed on Jan 14, 2016. |
538 |
|
o pkg/ggl90: |
539 |
|
- add alternative discretisation of vertical shear (off by default), to |
540 |
|
compute the mean (@ grid-cell center) of vertical shear compon instead of |
541 |
|
vertical shear of mean flow (@ grid-cell center). |
542 |
|
- add correct parenthesis in ALLOW_GGL90_SMOOTH code to get the same truncated |
543 |
|
results on adjacent faces of cubed-sphere grids; this fix the restart. |
544 |
|
o pkg/atm_compon_interf: |
545 |
|
- skip time-ave over cpl_atmSendFrq of Sea-Level Pressure (atmSLPr) and just |
546 |
|
pass last value, stored directly before export to CPL ; |
547 |
|
Note: this affects results of Coupled set-up where OCN uses useImportSLP=T |
548 |
|
- remove atmSLPr from pickup files (no longer needed for restart) |
549 |
|
|
550 |
|
checkpoint65s (2016/01/13) |
551 |
|
o eesupp & genmake2: |
552 |
|
- first check for Function ETIME and, if it fails, then check for subroutine |
553 |
|
ETIME and consistent output; use the appropriate version in timers.F |
554 |
|
o model/src: |
555 |
|
- to check restart test, add option to apply EXCH to U,V earlier, just before |
556 |
|
integr_continuity; turned off by default. |
557 |
|
o pkg/dic: |
558 |
|
- remove CPP option USE_ATMOSCO2 (not needed) |
559 |
|
o tools/tst_2+2: |
560 |
|
- try to ignore difference between +0 and -0 in binary file, causing test |
561 |
|
to fail for no good reason. |
562 |
|
o eesupp & genmake2: |
563 |
|
- put back modif from Jinxuan Zhu - change etime fct call to S/R call - |
564 |
|
but also check (in genmake2) that test runs and returns meaningful results. |
565 |
|
o coupler pkgs: |
566 |
|
Finish implementation of optionally-exchanged variable switches (started on |
567 |
|
Nov 12) with addition of few more exchanged fields, including 2-way exchange |
568 |
|
of pkg/thsice vars to allow to use seaice dynamics (from pkg/seaice) & seaice |
569 |
|
advection in OCN component; this requires sequential coupling. |
570 |
|
coupler (pkg/atm_ocn_coupler): |
571 |
|
- add argument msgUnit and iter number to CPL_SEND/RECV_ATM/OCN_FIELDS |
572 |
|
routines (useful for debug). |
573 |
|
- only export/import optionally exchanged fields (RunOff, seaice, Salt-Plume |
574 |
|
flux, DIC fields) if corresponding switch is ON. |
575 |
|
- add option to export RunOff to OCN (to use for DIC river input) |
576 |
|
- add 2-way thSIce vars exchange; check for consistent cpl_sequential setting. |
577 |
|
components (pkg/atm_ & ocn_compon_interf): |
578 |
|
- to save memory space in ATM & OCN comp: add some #ifdef ALLOW_${PKG} around |
579 |
|
optionally exchanged fields; add a check & stop in cpl_readparms.F. |
580 |
|
ATMCPL.h: ALLOW_LAND for RunOff, ALLOW_THSICE for seaice, ALLOW_AIM for CO2; |
581 |
|
OCNCPL.h: ALLOW_SALT_PLUME, ALLOW_DIC for DIC, ALLOW_THSICE for 2-W thsice. |
582 |
|
- rename: fracIce -> sIceFrac_cpl (<- match coupler var name) |
583 |
|
+ in ATM: fracIceTime -> sIceFracTime ; seaIceTime -> sIceMassTime. |
584 |
|
- add 2-way thSIce vars exchange ; add Salt-Plume flux ; add RunOff in OCN. |
585 |
|
- hold in common block coupler optionally-exchanged variable switch |
586 |
|
and set default "useImportXXX" accordingly; + check & stop if inconsistent. |
587 |
|
- add diagnostics for all imported fields from coupler (in both OCN & ATM); |
588 |
|
this is intended to replace the OCN cplFldtave.* output files (not updated |
589 |
|
to contain new additional exchanged fields). |
590 |
|
o pkg/dic: |
591 |
|
- fix an other bug (also from 2014/08/30) in dic_atmos.F, in dic_int1=3 code. |
592 |
|
o pkg/thsice: |
593 |
|
- when coupled to ATM (useCoupler) with thSIce_skipThermo=T, skip reading |
594 |
|
and writing of thsice pickup files. |
595 |
|
o pkg/atm_compon_interf: |
596 |
|
- move all field individual export-call out of cpl_export_import_data.F |
597 |
|
into new S/R ATM_EXPORT_FIELDS |
598 |
|
o pkg/atm_compon_interf: |
599 |
|
- store state variables (for now, only thSIce fields) just before beeing |
600 |
|
exported (in cpl_export_import_data.F, like on ocean side) instead of from |
601 |
|
atm_store_my_data.F like all exported fluxes. |
602 |
|
- new version of pickup_cpl: write field names into meta file and read meta |
603 |
|
file to find field postion in pickup. Also only write/read fields meeded for |
604 |
|
restart (same logic as main pickup file ; also using pickupStrictlyMatch) |
605 |
|
o pkg/dic: |
606 |
|
- fix bug (added on 2014/08/30) in dic_atmos.F for the case dic_int1= 2 or 3. |
607 |
|
o pkg/seaice: add new parameter SEAICEpressReplFac to choose between |
608 |
|
pressure replacement method (=1., default) or original Hibler (1979) (=0.) |
609 |
|
value can be from domain [0,1] to average between the two methods |
610 |
|
o pkg/atm_phys: |
611 |
|
- allow to provide 2-d map of albedo and mixed-layer depth from files (but |
612 |
|
hold fixed in time). |
613 |
|
|
614 |
|
checkpoint65r (2015/12/21) |
615 |
|
o pkg/seaice: |
616 |
|
fix bug in tridiagonal solvers for SEAICE_OLx/y>0, this affects the JFNK |
617 |
|
solver (offline.dyn_jfnk) and global_ocean.cs32x15.seaice -> updated |
618 |
|
o pkg/seaice: |
619 |
|
- fix a bug in computing areaS in (J-J -> J-1) that affects runs |
620 |
|
when SEAICEscaleSurfStress=.TRUE., |
621 |
|
- apply areaW and areaS in S/R seaice_calc_lhs |
622 |
|
o pkg/atm_phys: |
623 |
|
- add diagnostics for 3-D, Nr+1 levels diagnostics of radiative fluxes |
624 |
|
(shortwave & longwave, net & downward) and diagnostics of temp. tendency |
625 |
|
for individual contribution (convection, LSC cond, radiation) |
626 |
|
- add Ruth Geen etal, GRL 2016, radiation options (see paper supp. |
627 |
|
information); activated with: solar_exponent=0. and wv_exponent=-1. |
628 |
|
o pkg/ggl90: |
629 |
|
- within IDEMIX add upper limit for horizontal group velocity to |
630 |
|
avoid instability problems in the explicit horizontal diffusion term for |
631 |
|
long time steps or high resolution |
632 |
|
o pkg/diagnostics: |
633 |
|
- simplify setting of local-array size in diagstats_output.F: uses "numLevels" |
634 |
|
(from DIAGNOSTICS_SIZE.h) to allow to write out more than Nr levels. |
635 |
|
o testreport: |
636 |
|
- remove "-v" (verbose option) in default mpirun command. |
637 |
|
o pkg/seaice/seaice_growth: |
638 |
|
- catch potential division by zero in ITD code, does not change |
639 |
|
verification results |
640 |
|
o pkg/ecco: |
641 |
|
- retire old codes to the Attic. The calls to retired functions are |
642 |
|
left in a commented form in case they ever need to be re-activated. |
643 |
|
- ecco_check.F: issue warning if any old CPP option is |
644 |
|
defined that corresponds to retired codes -- then stop. |
645 |
|
o pkg/atm_compon_interf: |
646 |
|
- change seaice fraction (use for OCN dic surf.flux) stored and sent to |
647 |
|
coupler: use last time-step value instead of average over cplSendFrq_iter |
648 |
|
time-step, similar to what is done for seaIceMass. |
649 |
|
This will affect results (pkg/dic) of coupled ATM-OCN+dic set-up. |
650 |
|
o eesupp & genmake2: |
651 |
|
- from Jinxuan Zhu: change etime fct call to S/R call (fix gfortran ETIME); |
652 |
|
<= remove until a fix is found for some ifort version on ia32 machine. |
653 |
|
o pkg/seaice/seaice_evp: |
654 |
|
- refine residual computation |
655 |
|
|
656 |
|
checkpoint65q (2015/11/18) |
657 |
|
o pkg/seaice/seaice_evp: |
658 |
|
- fix residual computations so that they no longer affect the actual |
659 |
|
simulation code |
660 |
|
- fix seaice_readparams to be able to actually set new parameters |
661 |
|
SEAICEaEVPcStar and SEAICEaEVPalphaMin, also fix logic a little |
662 |
|
o model/src: |
663 |
|
- fix wrong truncation (single prec) from "FLOAT" function in expressions |
664 |
|
like: deltaT*FLOAT(myIter) when myIter is large: |
665 |
|
a) replaced by DFLOAT (if not seen by TAF); |
666 |
|
b) remove "FLOAT" and use implicit type conversion (if seen by TAF). |
667 |
|
o pkg/aim_v23: |
668 |
|
- write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading |
669 |
|
when pickupSuff is set ; do write rolling pickups + at the end of the run. |
670 |
|
o pkg/atm_ocn_coupler + ocn_compon_interf: |
671 |
|
- in prep for using pkg/seaice Dyn in coupled set-up, implement sequential |
672 |
|
coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ; |
673 |
|
add corresponding call in DO_OCEANIC_PHYS. |
674 |
|
o coupler pkgs: |
675 |
|
Start a new way to set-up optionally-exchanged variables (previously, only |
676 |
|
there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler |
677 |
|
data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ; |
678 |
|
send switch to ATM & OCN compon before reading their own "data.cpl" (so that |
679 |
|
compononent param default can be set accordingly). |
680 |
|
Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch |
681 |
|
but rather applies to a group a fields (going both ways like for DIC) |
682 |
|
and corresponds to an option of coupling config. |
683 |
|
coupler (pkg/atm_ocn_coupler): |
684 |
|
- change parameter file from "data" to "data.cpl" (in cpl_read_params.F), |
685 |
|
and read namelist directly (without eessup S/R calls) instead of |
686 |
|
in the very un-flexible old way, 1 param per line, in fixed order; |
687 |
|
- add error-counter to track errors (e.g., missing "data.cpl") and to stop |
688 |
|
cleanly in CPL_CHECK_CPLCONFIG |
689 |
|
- add new coupling-exchange selectors (some not yet active) including |
690 |
|
cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h |
691 |
|
and ocnCpl_exchange_DIC=T in OCNIDS.h); |
692 |
|
- add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each |
693 |
|
component ; called directly from coupler.F, after comp. registrations; |
694 |
|
- rename few variable-ID names (in ATMIDS.h & OCNIDS.h): |
695 |
|
atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name -> |
696 |
|
-> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName |
697 |
|
components (pkg/atm_ & ocn_compon_interf): |
698 |
|
- add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding |
699 |
|
CPP header file in all pkg source files. |
700 |
|
- move checking of comp. configs out of cpl_exch_configs.F into new S/R |
701 |
|
ATM/OCN_CHECK_CPLCONFIG; |
702 |
|
- add error-counter to track errors (e.g., in "data.cpl") and to stop |
703 |
|
cleanly in ATM/OCN_CHECK_CPLCONFIG; |
704 |
|
- add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors |
705 |
|
from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and |
706 |
|
before PACKAGES_READPARMS; |
707 |
|
verification/cpl_aim+ocn/: |
708 |
|
- update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file |
709 |
|
"data.cpl" for coupler (in input_cpl). |
710 |
|
o eesupp/inc: |
711 |
|
- change the MPI-global-sum default (in CPP_EEOPTIONS.h) to: |
712 |
|
#define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F) |
713 |
|
to always cumulate tile local-sum in the same order (still uses |
714 |
|
MPI_Allreduce like standard code). |
715 |
|
- in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files |
716 |
|
that are now identical to standard version (in eesupp/inc). |
717 |
|
o pkg/shelfice: |
718 |
|
- add SHELFICETransCoeffTFile for initializing spatially varying |
719 |
|
heat and salt transfer coefficients |
720 |
|
o pkg/atm_compon_interf & ocn_compon_interf: |
721 |
|
- combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous |
722 |
|
S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA |
723 |
|
- move bi,bj loops inside S/R OCN_STORE_MY_DATA |
724 |
|
o pkg/atm_ocn_coupler: |
725 |
|
- initialise to zero ATMVARS.h & OCNVARS.h arrays. |
726 |
|
o pkg/rbcs: |
727 |
|
- select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows |
728 |
|
to compile with maskLEN=1 when all tracers use the same RBCS-mask. |
729 |
|
- add a short report (to STDOUT) about RBCS-mask settings. |
730 |
|
|
731 |
|
checkpoint65p (2015/10/23) |
732 |
|
o pkg/seaice/seaice_evp.F: fix store directives and key computations, since |
733 |
|
there is no adjoint test for EVP, we don't know what it does to the adjoint |
734 |
|
solution, but at least there are no more recomputation warnings left |
735 |
|
o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands |
736 |
|
a chance of giving the same results as a fully converged VP (JFNK) solver |
737 |
|
o tools/adjoint_options/adjoint_diva: |
738 |
|
- fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA |
739 |
|
o pkg/streamice: |
740 |
|
- spotted bug in streamice_driving_stress using dyG where should have been dxG |
741 |
|
o pkg/exf: |
742 |
|
- remove STOP statement that prevented to use wind or (wind-)stress |
743 |
|
interpolation for constant-in-time forcing fields (wind/stress period = 0). |
744 |
|
o pkg/seaice: |
745 |
|
- replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires |
746 |
|
5 additionals 2D fields and 6 new store directives |
747 |
|
- change logic in seaice_readparms.F: EVP code can now be turned on in |
748 |
|
various ways, setting SEAICE_deltaTev is no longer required, |
749 |
|
alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev, |
750 |
|
or SEAICEaEVPcoeff |
751 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
752 |
|
- redefining uLoc/vLoc to u/v, instead of 2u/v |
753 |
|
o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz |
754 |
|
- this is an intermediate state of a truely converging EVP that has |
755 |
|
the potential of outperforming implicit VP methods, I do not recommend |
756 |
|
using it yet. |
757 |
|
- for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION |
758 |
|
and all parameters are hardwired |
759 |
|
- for convergence it still requires very smooth regularisations, that means, |
760 |
|
if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is |
761 |
|
different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also |
762 |
|
specific averaging appears to be required, still subject to tuning |
763 |
|
- still needs cleaning and I need to turn parameter into runtime parameters |
764 |
|
- add code to compute and print residuals of iteration, compile with |
765 |
|
defining ALLOW_SEAICE_EVP_RESIDUAL to enable it |
766 |
|
o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq) |
767 |
|
that entered with r1.54 on Sep04, 2015, -> update results |
768 |
|
|
769 |
|
checkpoint65o (2015/09/14) |
770 |
|
o pkg/mom_vecinv & mom_common: |
771 |
|
- add deep-atmosphere geometry factor in mom_calc_visc.F + in routines |
772 |
|
called from there. |
773 |
|
- add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this |
774 |
|
allows to use Vector-Invariant form in deep atmos and anelastic formulation |
775 |
|
o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015) |
776 |
|
and Koenig-Beatty+Holland (2012) |
777 |
|
- two new parameters SEAICE_tensilFac and SEAICE_tensilDepth |
778 |
|
- global 2D field tensileStrength, computed in seaice_calc_ice_strength |
779 |
|
- requires an extra input argument for S/R seaice_calc_viscosities |
780 |
|
- tensileStrength's depth dependence is different from Itkin et al. (2015) |
781 |
|
(to be changed and played with, for now exponential) |
782 |
|
o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.) |
783 |
|
- if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice |
784 |
|
by AREA according to Connelly et al. (2004), JPO. |
785 |
|
- For EVP and the LSR solver, the implicit part of the drag term is |
786 |
|
the only non-zero term in the denominator when there is no ice (which |
787 |
|
prevented running the model with zero ice-ocean drag). If |
788 |
|
SEAICEscaleSurfStress = .TRUE., this results in a division by zero |
789 |
|
(or zero main diagonals BU/BV) which need to be caught. A practical |
790 |
|
consequence is that for open water, the momentum equation reduce |
791 |
|
to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if |
792 |
|
they happen to be zero, often leading to a non-zero solution over |
793 |
|
open water. |
794 |
|
o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more |
795 |
|
efficient EVP method. |
796 |
|
- introduce area-weighted averages for e12 (analogously to |
797 |
|
seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits |
798 |
|
remain, but also changing the order of terms in the previous average |
799 |
|
changed the results as much) -> update experiment |
800 |
|
- add SEAICE_DELTA_SMOOTHREG code |
801 |
|
- disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for |
802 |
|
TEM-code |
803 |
|
- adjust loop bounds so that only required fields are computed |
804 |
|
- add new averaging code for zetaZ/deltaZ (again similar to |
805 |
|
seaice_calc_viscosities.F), inactive by default for now (will change |
806 |
|
results again), but will replace old code eventually |
807 |
|
o eesupp/src: |
808 |
|
- add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F) |
809 |
|
to always cumulate tile local-sum in the same order |
810 |
|
(option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h). |
811 |
|
Still uses MPI_Allreduce (like standard code) but on array of tiles |
812 |
|
and should be faster than GLOBAL_SUM_SEND_RECV code. |
813 |
|
- switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV |
814 |
|
(defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead. |
815 |
|
- add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.: |
816 |
|
aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40, |
817 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example, |
818 |
|
natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre, |
819 |
|
tutorial_baroclinic_gyre and tutorial_held_suarez_cs. |
820 |
|
|
821 |
|
checkpoint65n (2015/07/29) |
822 |
|
o pkg/thsice: |
823 |
|
- add a warning when used with pkg/aim but without updating SST |
824 |
|
(stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ). |
825 |
|
o pkg/offline: |
826 |
|
- change where Offline-Fields are loaded, from load_fields_driver.F to |
827 |
|
directly within FORWARD_STEP, just after updating iter number and time; |
828 |
|
- move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new |
829 |
|
S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS; |
830 |
|
These changes allow: |
831 |
|
a) to recover exactly on-line results using deltaToffline=deltaTClock, |
832 |
|
tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2) |
833 |
|
both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous |
834 |
|
time-step, both with GM & KPP files and with recomputing these fields; |
835 |
|
b) no needs to switch on staggerTimeStep anymore; |
836 |
|
c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf. |
837 |
|
- update output of experiment tutorial_dic_adjoffline (only 3 digits left). |
838 |
|
o pkg/offline: |
839 |
|
- change (rarely used) offset-iteration parameter to an offset time (in s): |
840 |
|
can easily recover previous offset-iter effect by setting offset-time |
841 |
|
(offlineTimeOffset) to offset-iter x deltaToffline; |
842 |
|
- do not turn-off Temp & Salinity surface relaxation when using KPP (used |
843 |
|
in KPP as part of surface buoyancy forcing) in offline run. |
844 |
|
- fix ptracers KPP non-local term in the case where KPP is re-computed. |
845 |
|
o OpenAD |
846 |
|
- Adding preliminary ggl90 test to OpenAD verification. |
847 |
|
Config. with ggl90 currently diverges after 64 time steps |
848 |
|
so will need more work to become more stable |
849 |
|
- Adding preliminary kpp test to OpenAD verification. |
850 |
|
required small tweakes in kpp_routines.F |
851 |
|
- Merge and update from Krishna Narayanan's contrib area: |
852 |
|
* Add one variable for preliminary OpenAD DIVA |
853 |
|
* Add replacement time-stepping for OpenAD DIVA |
854 |
|
* genmake2 flag -diva (but only for OpenAD; preliminary) |
855 |
|
* required modifs for OAD_support |
856 |
|
successful preliminary test for tutorial_global_oce_biogeo/ |
857 |
|
o pkg/seaice: |
858 |
|
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
859 |
|
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
860 |
|
delta with a smooth function in s/r seaice_calc_viscosity |
861 |
|
(no effect on EVP) |
862 |
|
- rename local suffix "sqr" into "sq" for more consistent variable names |
863 |
|
o pkg/seaice: |
864 |
|
add new parameter SEAICE_deltaMin that is used ***only*** |
865 |
|
for regularizing Delta (and nothing else, like the parameter |
866 |
|
which is also used for all sorts of things SEAICE_EPS). |
867 |
|
Defaults to SEAICE_EPS for backward compatibility only. |
868 |
|
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
869 |
|
the wrong key by inialising it before use -> fixes a recomputation |
870 |
|
problem but does not fix the gradient |
871 |
|
o pkg/layers: |
872 |
|
- move resetting of flux arrays to outside the iLa loop |
873 |
|
(this caused layers_diapycnal to not work with more than one layer coord.) |
874 |
|
- fix bug in calculation of layers_recip_delta in layers_init_fixed.F |
875 |
|
o pkg/layers: |
876 |
|
- remove from common block 3D layers fields (used to diagnose transport |
877 |
|
in tracer coords) and declare them as local arrays in layers_calc.F |
878 |
|
o pkg/seaice: |
879 |
|
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
880 |
|
in lab_sea forward experiment (changes results -> updated) |
881 |
|
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
882 |
|
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
883 |
|
computations; for SEAICE_VECTORIZE_LSR |
884 |
|
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
885 |
|
sweep to the outside, |
886 |
|
- remove store directives and add "CADJ loop sequential" directives |
887 |
|
in analogy to model/src/solve_tridiagonal.F |
888 |
|
- replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop |
889 |
|
boundaries to yield more readable code. This has also the charming side |
890 |
|
effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without |
891 |
|
SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in |
892 |
|
seaice_lsr_tridiagu/v now requires either of these flags, vectorization |
893 |
|
still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as |
894 |
|
an additional option) |
895 |
|
The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F |
896 |
|
but the adjoint gradients (which are affected by this change) still explode. |
897 |
|
o coupler (atm & ocn _compon_interf): |
898 |
|
- avoid using Exch2 IO mapping if not suitable. |
899 |
|
|
900 |
|
checkpoint65m (2015/06/15) |
901 |
|
o pkg/layers: |
902 |
|
- clean-up old parameters setting (from Sep 2012): |
903 |
|
+ remove old parameters setting from common block (declared locally); |
904 |
|
+ stop if any old parameter is mixed with new parameters; |
905 |
|
+ check for valid or consistent parameter setting (e.g., layers_name) |
906 |
|
- check that layers_bounds for Pot.Density are in the right range; |
907 |
|
this is supposed to catch un-updated setting after recently shifting |
908 |
|
potential density field "prho" by -1000 (now in "sigma" scale). |
909 |
|
o pkg/layers: |
910 |
|
- Added missing call to layers_fill for keeping track of tottend in |
911 |
|
pkg/diagnostics/diagnostics_fill_state.F |
912 |
|
o pkg/layers: |
913 |
|
- added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning |
914 |
|
of diapycnal fluxes |
915 |
|
o pkg/layers: |
916 |
|
- reverted changes to interpolation to previous treatment; there |
917 |
|
was never actually a problem |
918 |
|
o pkg/layers: |
919 |
|
- fix interpolation of layers tracers in the presence of partial cells |
920 |
|
- add lots of new functionality to compute water mass transformation |
921 |
|
(enabled by CPP flag LAYERS_THERMODYNAMICS) |
922 |
|
- add new calls from main code (diags_oceanic_surf_flux.F, |
923 |
|
thermodynamics.F, impldiff.F) and gad to save the necessary fields |
924 |
|
for layers_thermodynamics calculations |
925 |
|
o pkg/ptracers: |
926 |
|
- add capability of stepping a passive tracer forward without advection |
927 |
|
by setting PTRACERS_advScheme to 0. |
928 |
|
o pkg/diagnostics: |
929 |
|
- add few (threads) _BARRIER around any update of "diag_pkgStatus". |
930 |
|
o pkg/layers: |
931 |
|
- shift potential density field "prho" by -1000 for density layer averaging so |
932 |
|
that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000); |
933 |
|
Note that density bin boundaries (layers_bounds in data.layers) have |
934 |
|
to be set accordingly (i.e., shifted, in sigma scale). |
935 |
|
o pkg/layers: |
936 |
|
- fix snap-shot output of layer thickness @ V.pt and output of pot.density |
937 |
|
- fix calculation of layer non-weighted velocity and layer probability |
938 |
|
- add diagnostics for pot.density used for layer averaging |
939 |
|
o pkg/seaice: |
940 |
|
- seaice_calc_viscosity.F: change computation of deltaC**2 to ensure |
941 |
|
positiveness, modify a few comments and improve variable names, |
942 |
|
- the changed computation of deltaC affects most seaice-related |
943 |
|
experiments at the truncation level. |
944 |
|
seaice_itd.thermo is affected by far the most, with |
945 |
|
only 7 digits of agreement remaining; update experiments. |
946 |
|
|
947 |
|
checkpoint65l (2015/05/04) |
948 |
|
o pkg/shelfice: |
949 |
|
- in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set |
950 |
|
factor drKp1 to zero where it is negative (ie. do not use |
951 |
|
SHELFICEBoundaryLayer if hFacC>1) |
952 |
|
- the same for factor drLoc in shelfice_forcing.F |
953 |
|
o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem |
954 |
|
with modules in ptracers, when using testreport option "-small_f" |
955 |
|
o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD) |
956 |
|
- replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1)) |
957 |
|
o verification/testreport |
958 |
|
- add new option -small_f |
959 |
|
with this option testreport first makes the target small_f (*.f files) |
960 |
|
before running make (all). This is useful for explicit inlining when |
961 |
|
all sources need to be full available. |
962 |
|
o pkg/exf/exf_interp.F: |
963 |
|
remove previous changes related to reverse (decreasing) input grids latitude |
964 |
|
|
965 |
|
checkpoint65k (2015/04/01) |
966 |
|
o pkg/ecco: |
967 |
|
fix missing cosphi initialization; use eccoiter in place of optimcycle; |
968 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
969 |
|
instead of active read/write |
970 |
|
o pkg/ctrl: |
971 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
972 |
|
instead of active read/write. |
973 |
|
o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F |
974 |
|
return if .NOT.useAUTODIFF |
975 |
|
o pkg/seaice: add CPP brackets (cost function related). |
976 |
|
o model/src: |
977 |
|
add useAUTODIFF run time switch. |
978 |
|
o pkg/exf/exf_interp.F: |
979 |
|
add code to allow input grids with latitude starting in the north (i.e. when |
980 |
|
j=1 corresponds to northern edge of field); modify global_with_exf to test |
981 |
|
this feature. |
982 |
|
o verification/testreport: |
983 |
|
- replace "grep -A3" with POSIX conformal sed command, because there are |
984 |
|
implementations of grep that cannot do contextual searches |
985 |
|
- replace "cat -n" by "nl" (two occurrences), because not all implementations |
986 |
|
of "cat" have the option "-n" |
987 |
|
o model/src: |
988 |
|
add new file gsw_teos10.F that contains 3 functions, more or less a copy |
989 |
|
of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to |
990 |
|
convert from conservative to potential temperature. For now they are not |
991 |
|
called anywhere. |
992 |
|
o pkg/ggl90: make "useIDEMIX" useful |
993 |
|
- re-organize code in s/r ggl90_calc a little to move computations that |
994 |
|
are different for idemix into separate loops (changes verification |
995 |
|
experiment idemix at truncation level, 12 digits remain -> updated) |
996 |
|
- requires 2 new 2D fields KappaM, verticalShear |
997 |
|
- make hFacI and recip_hFacI local 3D variables that are passed to |
998 |
|
s/r ggl90_idemix |
999 |
|
- fix and improve some comments |
1000 |
|
|
1001 |
|
checkpoint65j (2015/02/25) |
1002 |
|
o pkg/openad |
1003 |
|
- synchronize seawater.F with version in model/src: replace routine |
1004 |
|
body of sw_temp by calling sw_ptmp and fix/add a few comments. |
1005 |
|
o pkg/mnc: |
1006 |
|
- change default value of pickup_read/write_mnc params to FALSE |
1007 |
|
(since few features are missing in reading MNC pickup files). |
1008 |
|
o model/src: |
1009 |
|
- change default (background) vertical diffusivity for salt to be the |
1010 |
|
temperature (background) vertical diffusivity. |
1011 |
|
- change background vertical diffusivity in vertical mixing pkgs ggl90, |
1012 |
|
kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity. |
1013 |
|
This makes ptracers default diffusivity (that uses salt diffKr) more |
1014 |
|
consistent with vertical mixing schemes. |
1015 |
|
o verification/testreport: |
1016 |
|
- fix typo in "-pcls" option ; |
1017 |
|
- put temp files in /tmp (instead of in local dir) |
1018 |
|
- add option "-ncad" to use genmake2 new option "-nocat4ad" |
1019 |
|
- allow to use "-j" option (for multi-procs make) for AD, OAD and TLM. |
1020 |
|
o pkg/ggl90 (idemix code): |
1021 |
|
- apply few fixes ; add some missing "_d 0" ; update output of exp. |
1022 |
|
global_ocean.90x40x15.idemix |
1023 |
|
o OpenAD |
1024 |
|
- enable active file I/O and begin removal of work-around code |
1025 |
|
for OpenAD for handling control variables (memory vs. active files) |
1026 |
|
- new CPP options file OPENAD_OPTIONS.h |
1027 |
|
- revert to genarr2d gradient check for hs94.1x64x5 |
1028 |
|
- (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens) |
1029 |
|
- gentim2d works for halfpipe_streamice but not yet hs94.1x64x5 |
1030 |
|
o tools/genmake2: |
1031 |
|
- add option for an alternative Makefile (from Martin) where multiple |
1032 |
|
source files are sent to TAF (instead of all in one file). |
1033 |
|
o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013) |
1034 |
|
- code provided by Carsten Eden as an extension of ggl90 |
1035 |
|
- so far the code is turned on within ggl90 by setting a CPP-flag at |
1036 |
|
compile time; a runtime flag implementation is not yet complete |
1037 |
|
- tested in new verification experiment global_ocean.90x40x15.idemix |
1038 |
|
o verification: |
1039 |
|
- reduce length of the AD test run by half for experiments |
1040 |
|
global_ocean.cs32x15 (std + thsice) and isomip |
1041 |
|
- enable active file I/O for OpenAD, adjust verifications accordingly |
1042 |
|
- halfpipe_streamice: change gradient check from genarr2d to gentim2d |
1043 |
|
o verification/testreport: |
1044 |
|
- fix two non-POSIX sed statements so that there are no error messages |
1045 |
|
on Mac OS X |
1046 |
|
- replace hostname -s with hostname | sed 's/\..*$//' |
1047 |
|
o model/src/seawater.F: |
1048 |
|
- simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged |
1049 |
|
(following the matlab code), which would have avoided the bug caught |
1050 |
|
by Matt (see below) in the first place |
1051 |
|
o pkg/shelfice: |
1052 |
|
- implement alternative discretisation of quadratic drag (selectBotDragQuadr) |
1053 |
|
and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag. |
1054 |
|
- fix sign of friction tendency (no-slip BC) and fix u,v drag for thin |
1055 |
|
ice-shelf case (i.e., within surface level). |
1056 |
|
- add config summary in shelfice_check.F |
1057 |
|
- remove global variable recip_SHELFICElatentHeat and replace by a local |
1058 |
|
variable recip_latentHeat |
1059 |
|
- introduce diagnostics for friction velocity uStar (in case of |
1060 |
|
SHELFICEuseGammaFrict) |
1061 |
|
- change verification experiment isomip.htd: |
1062 |
|
+ start from pickup (as input_ad at nIter0=8640) |
1063 |
|
+ start from SHELFICEmassFile instead of SHELFICEloadAnomaly file |
1064 |
|
+ test SHELFICEuseGammaFrict = .TRUE. |
1065 |
|
+ test SHELFICEadvDiffHeatFlux = .TRUE. |
1066 |
|
o model/src: |
1067 |
|
- fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to |
1068 |
|
in-situ Temp) and in routine SW_TEMP (in pkg/openad); |
1069 |
|
update output of experiments global_with_exf.yearly and isomip (all 6). |
1070 |
|
o pkg/shelfice: |
1071 |
|
- change setting of kTopC to also be zero where there is no ice-shelf. |
1072 |
|
- zero out surface forcing arrays (for now, for T & S + EmPmR) where |
1073 |
|
ice-shelf is. |
1074 |
|
- first attempt to get RealFreshWaterFlux effects: for now, only without |
1075 |
|
SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping. |
1076 |
|
o pkg/seaice: add the option to prescribe a fixed thickness PDF |
1077 |
|
for thermodynamic calculations |
1078 |
|
- because of divisions of the type 7/7 not exactly equal to 1, this change |
1079 |
|
affects results of some verification experiments by up to 4 digits: |
1080 |
|
global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume, |
1081 |
|
seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides |
1082 |
|
adjoint: lab_sea, lab_sea.noseaicedyn |
1083 |
|
-> updated |
1084 |
|
|
1085 |
|
checkpoint65i (2015/01/23) |
1086 |
|
o model/src: |
1087 |
|
- change units of frictionHeating field from W to W/m^2 |
1088 |
|
- fix bug in frictional heating from stratospheric drag in |
1089 |
|
S/R ATM_PHYS_TENDENCY_APPLY_V |
1090 |
|
- with synchronous time-stepping: move resetting to zero of frictionHeating |
1091 |
|
field from load_fields_driver.F to thermodynamics.F ; |
1092 |
|
- add diagnostics for frictional heating. |
1093 |
|
o model/src & gmredi K3D: |
1094 |
|
- add frictionHeating field to pickup-files (for synchronous time-stepping) |
1095 |
|
- move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h |
1096 |
|
- rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name |
1097 |
|
and name in pickup file). |
1098 |
|
- fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F |
1099 |
|
o model/src: |
1100 |
|
- move (from ini_forcing.F) initialisation of all arrays in header file |
1101 |
|
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
1102 |
|
(since Nov 2012) with option selectAddFluid=1. |
1103 |
|
o pkg/shelfice: |
1104 |
|
- change units (+ document) of newly added field "shelfIceMassDynTendency" |
1105 |
|
- upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays. |
1106 |
|
o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers |
1107 |
|
o pkg/seaice: two new runtime parameters: |
1108 |
|
- SEAICE_cStar replaces the hard wired "20" in the strength formulation, |
1109 |
|
long overdue |
1110 |
|
- SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012) |
1111 |
|
parameterization of tensil stress for fast ice (does not do anything yet) |
1112 |
|
o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method |
1113 |
|
for LSR: move checking overlaps out of JFNK-if-block |
1114 |
|
o pkg/atm_phys: |
1115 |
|
- move copy of grid and dynamical fields out of atm_phys_driver.F into |
1116 |
|
new S/R ATM_PHYS_DYN2PHYS. |
1117 |
|
- fix level height for Linear Free-Surf case (to be consistent with |
1118 |
|
fixed-in-time pressure levels). |
1119 |
|
o pkg/mom_common (bottomdrag): |
1120 |
|
- average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center |
1121 |
|
to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG; |
1122 |
|
update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag. |
1123 |
|
o pkg/shelfice (u/v_drag): |
1124 |
|
- add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG; |
1125 |
|
- use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F |
1126 |
|
(now similar to shelfice_u_drag.F) |
1127 |
|
- remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG |
1128 |
|
from mom_vecinv.F (similar to mom_fluxform calls). |
1129 |
|
o pkg/mom_common (bottomdrag): |
1130 |
|
- add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG; |
1131 |
|
- add options for alternative discretisation of velocity norm in quadratic |
1132 |
|
bottom drag: averaging of grid-cell-center KE to U.point and V.point |
1133 |
|
(selectBotDragQuadr=0, original code) can produce noisy patterns; this |
1134 |
|
improves when averaging only the other component (e.g. vVel for U bottom |
1135 |
|
drag) using wet-point method (selectBotDragQuadr=2) or not (=1). |
1136 |
|
- add options (bottomVisc_pCell) to account for partial-cell in bottom |
1137 |
|
friction (no-slip BC) thus getting the true distance from the bottom; |
1138 |
|
off by default since this also reduces model stability (explicit bottom |
1139 |
|
friction). Changes produce different machine truncation with linear-drag |
1140 |
|
+ no-slip BC: update output of experiments exp4.stevens (10 digits) and |
1141 |
|
front_relax (bvp & mxl, 10 & 11 digits). |
1142 |
|
o model/src & mom pkgs: |
1143 |
|
- add one more level to vertical viscosity local arrays (Nr+1, previously Nr) |
1144 |
|
since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k |
1145 |
|
- for now and until vertical mixing scheme are updated to fill up level Nr+1, |
1146 |
|
just copy level Nr value to level Nr+1. |
1147 |
|
o doc: |
1148 |
|
- add notes form Abhisek Chakraborty on how to close Heat & Salt budgets. |
1149 |
|
o pkg/shelfice: |
1150 |
|
- shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F, |
1151 |
|
SHELFICE.h: move array shelficemass to init_varia, initialise |
1152 |
|
from array shelficemassinit, which is set in init_fixed and |
1153 |
|
has option to be set from file; introduce array |
1154 |
|
shelficeMassDynTend array, set thru file in init_fixed |
1155 |
|
- NEW FILE: shelfice_step_icemass.F: update shelficemass from either |
1156 |
|
shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in |
1157 |
|
pkg/streamice |
1158 |
|
- shelfice_thermodynamics.F: call shelfice_step_icemass if |
1159 |
|
SHELFICEMassStepping = .true. |
1160 |
|
- shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f |
1161 |
|
|
1162 |
|
checkpoint65h (2014/12/17) |
1163 |
|
o verification/global_ocean.90x40x15, global_ocean_ebm: |
1164 |
|
- update to generic controls. |
1165 |
|
o pkg/ctrl: |
1166 |
|
- ctrl_map_ini_genarr.F: test for igen>0 |
1167 |
|
- ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D. |
1168 |
|
- move gentim2d part of ctrl_map_ini_genarr.F to |
1169 |
|
new separate routine : ctrl_map_ini_gentim2d.F |
1170 |
|
- ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F: |
1171 |
|
add time variable weights and cyclic controls (time mean, |
1172 |
|
seasonal cycle, etc) capabilities to gentim2d |
1173 |
|
o pkg/ecco: |
1174 |
|
- move reading of error, conversion to weights from |
1175 |
|
ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei) |
1176 |
|
o global_oce_llc90, cs32: |
1177 |
|
- activte sbo. |
1178 |
|
- CTRL_SIZE.h : add maxCtrlProc. |
1179 |
|
- activate the new genctrl capabilities. |
1180 |
|
- update following reorganization of global_oce_input_fields.tar.gz |
1181 |
|
o pkg/ctrl/ctrl_ad_diff.list: |
1182 |
|
- add missing ctrl_init_rec.f |
1183 |
|
o tools/OAD_support/keepOriginal: |
1184 |
|
- add ctrl_init_rec.F |
1185 |
|
o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F: |
1186 |
|
- avoid recomputations of xx_gentim2d_dummy. |
1187 |
|
o momentum diagnostics: |
1188 |
|
- move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and |
1189 |
|
mom_vecinv.F to timestep.F (to include Smag-3D contribution). |
1190 |
|
o pkg/seaice/seaice_lsr.F: |
1191 |
|
- fix computation of BU/BV, make sure they are non-zero, only necessary |
1192 |
|
for cubed sphere exchanges and SEAICE_OLx/y>0. |
1193 |
|
This makes calling s/r fill_cs_corner_rl obsolete (removed). |
1194 |
|
o verification/global_ocean.cs32x15/input.seaice |
1195 |
|
- add test for strong implicit coupling and restricted addtive Schwarz |
1196 |
|
methods for LSR |
1197 |
|
- update results/output.seaice.txt |
1198 |
|
o verification/tutorial_global_oce_biogeo: |
1199 |
|
- AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up) |
1200 |
|
and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK); |
1201 |
|
update output_adm,_oadm,_tlm.txt |
1202 |
|
o pkg/dic: |
1203 |
|
- change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h |
1204 |
|
- add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn |
1205 |
|
for tracer 1 & 2 is set (to avoid double counting of dilution effect). |
1206 |
|
o verification/tutorial_global_oce_biogeo: |
1207 |
|
- AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since |
1208 |
|
dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ; |
1209 |
|
update output_adm,_oadm,_tlm.txt |
1210 |
|
o eesupp/src: |
1211 |
|
- add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F) |
1212 |
|
and call it in seaice_lsr when using nonzero SEAICE_OLx/y |
1213 |
|
o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing |
1214 |
|
LSR (following Hutchings et al. 2004) |
1215 |
|
- introduce zetaZ as a global variable (requires adjustments in |
1216 |
|
seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ |
1217 |
|
in seaice_calc_viscosities.F |
1218 |
|
- new flag SEAICEuseStrImpCpl (default off) |
1219 |
|
- add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the |
1220 |
|
momentum equations |
1221 |
|
- JFNK-solver (preconditioner) adjusted to allow using this method |
1222 |
|
(where it does not have any positive effect) |
1223 |
|
o pkg/seaice |
1224 |
|
- add overlap for restrictive additive Schwartz method also to LSR, but |
1225 |
|
turn it off by default (because it only seems to work for non-cubed |
1226 |
|
sphere/llc topologies) |
1227 |
|
o pkg/autodiff |
1228 |
|
- add extra exchanges in addummy_in_steppging also for mnc output |
1229 |
|
o pkg/seaice: |
1230 |
|
- add extra exchanges before dumping adjoint fields in seaice_ad_dump.F |
1231 |
|
to avoid stripes in the adjoint output (similar to addummy_in_stepping.F) |
1232 |
|
o pkg/obcs: |
1233 |
|
- add option to specify domain-connected piece Id along OB though files |
1234 |
|
(for now, only used to diagnose PhiVel; default =1 -> global correction) |
1235 |
|
- modify obcs_diag_balance.F to process each connected-part separately; |
1236 |
|
exclude OB where Id = 0 but keep the full divergence there (-> constant |
1237 |
|
Psi along this portion of OB and all inflow derived from grad(Phi)) |
1238 |
|
- add example of OB-conect files in verification/so_box_biogeo/input. |
1239 |
|
o pkg/diagnostics: |
1240 |
|
- improve treatment of Open-Boundaries in Velocity-Potential calculation: |
1241 |
|
a) use non zero matrix element across OB and solve for Phi 1 grid point |
1242 |
|
outside OB (i.e, where tracer OBCS are applied). |
1243 |
|
b) global imbalance of inFlow/outFlow across OB: instead of modifying |
1244 |
|
velocity across OB, spread it uniformly along the OB in the RHS. |
1245 |
|
|
1246 |
|
checkpoint65g (2014/11/19) |
1247 |
|
o pkg/diagnostcis: |
1248 |
|
- add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param |
1249 |
|
o pkg/my82,pp81,kl10: |
1250 |
|
- fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D |
1251 |
|
field diffKr as background diffusivity to set minimum diffusivity value. |
1252 |
|
o pkg/seaice: |
1253 |
|
- add new parameter SEAICEuseEVPrev (for revisited EVP by |
1254 |
|
Bouillon et al 2013) |
1255 |
|
- add SEAICE_evpAlpha/Beta to namelist |
1256 |
|
- modify seaice_evp code to able to use SEAICEuseEVPrev. These changes |
1257 |
|
involve trivial re-ordering of divisions/multiplications that should not |
1258 |
|
have any effects, but ... they do change the results of lab_sea.hb87 so |
1259 |
|
that only 2 digits of agreement remain, in line with the general |
1260 |
|
instability/fragility of the evp-code. For now, I do not care and just |
1261 |
|
update the verification experiment |
1262 |
|
o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc) |
1263 |
|
- remove xx_genarr2d_numsmooth etc |
1264 |
|
- use xx_genarr2d_preproc etc instead |
1265 |
|
- carry out smooth_correl2D at initialization stage rather than during |
1266 |
|
time stepping. |
1267 |
|
- get smoothOpNb from xx_gentim2d_preproc |
1268 |
|
o global_oce_cs32 : |
1269 |
|
- add test of generic ecco capabilities. |
1270 |
|
o pkg/exf/exf_getsurfacefluxes.F : |
1271 |
|
- add to tmpUE/tmpVN rather than re-initializing them (conventional behavior). |
1272 |
|
o pkg/ctrl,ecco : |
1273 |
|
- omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED |
1274 |
|
is defined. |
1275 |
|
o pkg/seaice: add diagnostics for Delta (deformation parameter) |
1276 |
|
o model/src: |
1277 |
|
- when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical |
1278 |
|
diffusivity (background) is specified but ignored. |
1279 |
|
o verification: |
1280 |
|
- in testreport, convert hostname to lower case for default output dir name |
1281 |
|
o model, pkg : add useCTRL, useECCO parameters (on/off run time switch). |
1282 |
|
o pkg/dic: add modifications from Hajoon: |
1283 |
|
- add iron sedimentation flux function of the flux of PO4 out of bottom layer |
1284 |
|
- light attenuation: add self-shading effect by climatological Chlorophyll |
1285 |
|
(read from file). |
1286 |
|
o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also |
1287 |
|
compiles when SEAICE_ALLOW_DYNAMICS is undefined |
1288 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate |
1289 |
|
AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than |
1290 |
|
ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted, |
1291 |
|
approach where CPP_OPTIONS.h includes an omnipotent |
1292 |
|
ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h'). |
1293 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where |
1294 |
|
ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong. |
1295 |
|
o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF |
1296 |
|
to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included |
1297 |
|
(it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...) |
1298 |
|
o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl : |
1299 |
|
add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed |
1300 |
|
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h |
1301 |
|
- AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h |
1302 |
|
- CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc |
1303 |
|
o pkg/ctrl,ecco,exf : |
1304 |
|
- remove variables associated with NON-generic costs, |
1305 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
1306 |
|
- remove NON-generic NON-obcs controls, |
1307 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
1308 |
|
o pkg/ctrl : added ctrl_local_params.h |
1309 |
|
o pkg/ecco : added ecco_local_params.h |
1310 |
|
o verification : added ECCO_CTRL_DEPRECATED to most as and oad |
1311 |
|
experiments, which will progressively be removed once the |
1312 |
|
experiments are revised to use only generic controls/costs. |
1313 |
|
|
1314 |
|
checkpoint65f (2014/10/13) |
1315 |
|
o pkg/ctrl, ecco, seaice : minor changes in headers |
1316 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic |
1317 |
|
cost function and control capabilities added since checkpoint65c. |
1318 |
|
o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h. |
1319 |
|
o pkg/ecco: increase modularity and improve logic |
1320 |
|
- ecco_toolbox.F (new) : basic operations that are often used, |
1321 |
|
including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk, |
1322 |
|
ecco_addcost, ecco_add, ecco_div, ecco_readbar. |
1323 |
|
- cost_gencal.F (new) : determine filnames and records. |
1324 |
|
- cost_genread.F, cost_generic.F : condense code using ecco_toolbox. |
1325 |
|
- cost_generic.F : use spzeroloc rather than hard-coded -9999, |
1326 |
|
and exploit the above functions leading to more compact code. |
1327 |
|
- cost_genread.F : rm un-necessary arguments, re-arrange args order. |
1328 |
|
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, |
1329 |
|
using_ers, using_gfo, using_mdt is now only defined within gencost) |
1330 |
|
o pkg/ecco: extend generic cost capabilities |
1331 |
|
- pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost |
1332 |
|
capabilities via gencost_preproc (+ _c,_i,_r related params), |
1333 |
|
gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod, |
1334 |
|
gencost_outputlevel arguments to cost_generic |
1335 |
|
- pkg/ecco/cost_genread.F (new) : interface between cost_generic |
1336 |
|
and active_read, making room for gencost_preproc to take effect. |
1337 |
|
Added preproc code ('climmon') to replace GENERIC_BAR_MONTH. |
1338 |
|
- pkg/ecco/cost_generic.F : |
1339 |
|
compute and store misfit maks*(model-data) in localdif that is |
1340 |
|
then used in cost and for output, output misfit if outlev.GT.0 |
1341 |
|
- pkg/ecco/cost_averagesfields.F : depend on gencost_barskip |
1342 |
|
rather gencost_barfile for deciding whether to write barfile |
1343 |
|
- pkg/ecco/ecco_cost_driver.F : extract call to cost_profiles from cost_hyd |
1344 |
|
- pkg/ecco/ecco_cost_init_fixed.F : extract gencost weights from |
1345 |
|
ecco_cost_weights, re-activate ecco_summary, determine gencost_barskip |
1346 |
|
- pkg/ecco/ecco_summary.F : report gencost variables |
1347 |
|
- pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs |
1348 |
|
o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA |
1349 |
|
o pkg/ecco: internal re-organization |
1350 |
|
- resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl |
1351 |
|
(rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter, |
1352 |
|
mv relevant variables definition from ecco_cost.h to ecco.h, |
1353 |
|
make sure gencost routines only include ecco.h) |
1354 |
|
- throughout : add missing CCP switches, rm unused variables, |
1355 |
|
and rm un-necessary CPP switches |
1356 |
|
- throughout gencost routines : replace modelstartdate with |
1357 |
|
gencost_startdate when needed |
1358 |
|
- cost_bp_read.F : use arguments, instead of common blocs |
1359 |
|
so that it can be used also by (new) cost_gencost_bpv4.F |
1360 |
|
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0 |
1361 |
|
- ecco_phys.F : compute etanFull |
1362 |
|
- ecco_readparms.F : rename using_topex as using_tpj, add |
1363 |
|
bpv4-grace to gencost list, initialize added parameters |
1364 |
|
- ecco_summary.F : include SIZE.h needed for augmented ecco.h |
1365 |
|
|
1366 |
|
checkpoint65e (2014/09/28) |
1367 |
|
o pkg/obcs: |
1368 |
|
- replaced the just-added CPP options with run-time variables |
1369 |
|
(see pkg/obcs/OBCS_PARAMS.h for details) |
1370 |
|
o pkg/obcs: |
1371 |
|
- add additional CPP options for sponge boundary layers |
1372 |
|
(see pkg/obcs/OBCS_OPTIONS.h for details) |
1373 |
|
o pkg/atm_phys: |
1374 |
|
- implement simple (obliquity only, assuming circular planet orbit) |
1375 |
|
seasonal cycle for incoming insolation ; used when run-time parameter |
1376 |
|
"select_incSW" is set to 1 ; by default (=0), uses old unchanged formula. |
1377 |
|
o pkg/exf, pkg/ecco, pkg/ctrl: |
1378 |
|
- add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets |
1379 |
|
- activate gentim2d for xx_atemp,xx_aqh,xx_swdown,xx_lwdown,xx_precip |
1380 |
|
- implement gentim2d for xx_tauu, xx_tauv |
1381 |
|
o pkg/ctrl, pkg/ecco : |
1382 |
|
- fix and complement the generic controls implementation |
1383 |
|
o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F, |
1384 |
|
pkg/shelfice/shelfice_thermodynamics.F, |
1385 |
|
verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F, |
1386 |
|
verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F : |
1387 |
|
- add weight in CTRL_GET_GEN calls |
1388 |
|
o pkg/ctrl : |
1389 |
|
- ctrl_get_gen.F : add weight as input parameter, and apply |
1390 |
|
it directly rather than using smooth_correl2Dw (to be retired). |
1391 |
|
- ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call |
1392 |
|
o pkg/ctrl : |
1393 |
|
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F, |
1394 |
|
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F) |
1395 |
|
- re-activate ctrl_summary (call in ctrl_init.F) |
1396 |
|
o pkg/ctrl/ctrl_cost_gen.F : |
1397 |
|
- fix CCP brackets, remove un-necessary myiter, mytime |
1398 |
|
o pkg/ecco, pkg/ctrl : |
1399 |
|
- remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) |
1400 |
|
- remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) |
1401 |
|
- add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F) |
1402 |
|
- add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F) |
1403 |
|
|
1404 |
|
checkpoint65d (2014/09/15) |
1405 |
|
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F : |
1406 |
|
- add xx_genarr2d_bounds,xx_genarr3d_bounds, |
1407 |
|
xx_genarr2d_numsmooth, xx_genarr3d_numsmooth |
1408 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : |
1409 |
|
- remove compilation failure |
1410 |
|
- replace hard coded example |
1411 |
|
- use ctrl_map_ini_gen2D, 3D |
1412 |
|
o pkg/ctrl/ctrl_pack.F, ctrl_unpack.F : |
1413 |
|
- on/off switch based upon xx_genarr2d_weight,3d |
1414 |
|
o src/packages_init_variables.F : |
1415 |
|
- regroup pkg/estimation calls |
1416 |
|
- remove CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
1417 |
|
(moved to ctrl_init_variables) |
1418 |
|
o cost/cost_init_varia.F : |
1419 |
|
- remove ecco_cost_init_varia |
1420 |
|
(moved to ecco_init_varia) |
1421 |
|
o ctrl/ctrl_init_variables.F : |
1422 |
|
- add CTRL_MAP_INI, CTRL_MAP_INI_ECCO |
1423 |
|
- add CTRL_MAP_INI_GENARR, SEAICE_CTRL_MAP_INI |
1424 |
|
o ctrl/ctrl_map_ini.F : |
1425 |
|
- remove ctrl_map_ini_genarr, seaice_ctrl_map_ini |
1426 |
|
(moved to ctrl_init_variables) |
1427 |
|
o ctrl/ctrl_map_ini_ecco.F : |
1428 |
|
- remove ECCO_PHYS (mv to ecco_init_varia) |
1429 |
|
- remove seaice_ctrl_map_ini (mv to ctrl_init_variables) |
1430 |
|
o ecco/ecco_ad_diff.list : |
1431 |
|
- add ecco_init_varia.f |
1432 |
|
o ecco/ecco_init_varia.F |
1433 |
|
- new routine |
1434 |
|
o pkg/streamice: |
1435 |
|
- move call to STREAMICE_INITIALIZE_PETSC from the_model_main.F |
1436 |
|
to streamice_init_fixed.F ; fix setting of STREAMICEisOn. |
1437 |
|
- from model/src, only call pkg/streamice routines if useStreamIce is TRUE. |
1438 |
|
o pkg/generic_advdiff: |
1439 |
|
- fix bug causing negatives in GAD_SMOLARKIEWICZ_HACK, introduced 8/8/2014. |
1440 |
|
o pkg/exf: |
1441 |
|
- exf_getffields.F : add xxg_atemp, xxg_aqh, xxg_swdown, xxg_lwdown, |
1442 |
|
xxg_precip capability |
1443 |
|
- exf_wind.F : no need for ALLOW_WSPEED_CONTROL cpp switch |
1444 |
|
o pkg/ctrl: |
1445 |
|
- ctrl_pack.F, ctrl_unpack.F : omit (un)packing of undefined xx_gentim2d |
1446 |
|
o model/src/load_fields_driver.F : |
1447 |
|
- move call to CTRL_MAP_GENTIM2D ahead of BULKF_FIELDS_LOAD, EXF_GETFORCING |
1448 |
|
so xx_gentim2d can be applied to e.g. exf fields in a timely manner. |
1449 |
|
o OpenAD verification experiments: |
1450 |
|
- Include explicitly AUTODIFF_OPTIONS.h, COST_OPTIONS.h, and CTRL_OPTIONS.h |
1451 |
|
in src files (to enable to skip the ECCO_CPPOPTIONS.h); |
1452 |
|
for now, only in pkgs used in OpenAD verification experiments. |
1453 |
|
- Change all except one (halfpipe_streamice) OpenAD experiments to use pkg |
1454 |
|
specific option file (AUTODIFF_OPTIONS.h, COST_OPTIONS.h & CTRL_OPTIONS.h) |
1455 |
|
instead of using ECCO_CPPOPTIONS.h (with all relevant options in it). |
1456 |
|
This applies to both TAF (*/code_ad/) and OpenAD (*/code_oad/) tests. |
1457 |
|
o OpenAD verification tests: |
1458 |
|
- finish removing ALLOW_AUTODIFF_OPENAD (replaced by ALLOW_OPENAD); |
1459 |
|
- finish replacing ALLOW_AUTODIFF_TAMC by ALLOW_AUTODIFF (except for |
1460 |
|
tape/storage which are specific to TAF/TAMC) in pkgs used in OpenAD exp. |
1461 |
|
- leave ALLOW_AUTODIFF_TAMC undef in OpenAD verification tests (*/code_oad/) |
1462 |
|
and remove local copy of "tamc.h" (needed only if ALLOW_AUTODIFF_TAMC). |
1463 |
|
o model/src & generic_advdiff: |
1464 |
|
- change hard-coded loop-range in S/R APPLY_FORCING_T/S to set T & S |
1465 |
|
forcing over 0:sNx+1, 0:sNy=1 (instead of just 1:sNx,1:sNy): Model |
1466 |
|
dynamics requires valid tracer forcing only over tile interior but, for |
1467 |
|
some diagnostics, may need to extend it over 1 point in tile halo region. |
1468 |
|
- in gad_calc_rhs.F, update calls to gmredi_x/ytransport to get valid |
1469 |
|
tendency over i,j_Min,Max range. This allows to simplfy i,j_Min,Max |
1470 |
|
setting in temp/salt/ptracer_integrate.F |
1471 |
|
o pkg/dic: |
1472 |
|
- multiply tracer tendencies by maskInC (if ussing OBCS) before updating |
1473 |
|
gchem tracers: this allows to skip the 2nd call to OBCS_APPLY_PTRACER |
1474 |
|
in gchem_forcing_sep.F |
1475 |
|
o pkg/autodiff & obcs: |
1476 |
|
- add storage of current OB values for U & V (was already done for T & S). |
1477 |
|
|
1478 |
|
checkpoint65c (2014/08/30) |
1479 |
|
o pkg/dic: |
1480 |
|
- take out of dic_atmos.F the initialisation part (corresponding to istate=0) |
1481 |
|
and move it to new S/R DIC_INI_ATMOS ; also simplify the dependencies for |
1482 |
|
AD compilers (but still a Pb with multi-threading and Ajoint dependencies). |
1483 |
|
o verification: |
1484 |
|
- new experiment testing OBCS and DIC pkgs, using params & output from |
1485 |
|
tutorial_global_oce_biogeo but limited to a sub-domain around Drake |
1486 |
|
passage: take OBCS from the last year of a 2 yrs simulation and initial |
1487 |
|
conditions from t=1.yr while keeping the same forcing. |
1488 |
|
o model/src: |
1489 |
|
- when allowFreezing=T, only reset below freezing initial Temp to Tfreezing |
1490 |
|
(at any k) if checkIniTemp is not set to FALSE (default checkIniTemp=T). |
1491 |
|
o pkg/diagnostics (Stats-Diags): |
1492 |
|
- re-write S/R DIAGSTATS_CALC (more similar to TARGET_NEC_SX part) to: |
1493 |
|
a) refine region where stats are computed, excluding where arrhFac=0 ; |
1494 |
|
b) fix missing interior mask (use with OBCS) in 3-D fields statistics; |
1495 |
|
c) extend regional stats over the region edges (for U or V pt location). |
1496 |
|
o pkg/gchem: |
1497 |
|
- add a (2nd) call to OBCS_APPLY_PTRACER in gchem_forcing_sep.F (needed since |
1498 |
|
pkg/dic is currently changing/updating ptracers values beyond the OB). |
1499 |
|
o verification (hs94): |
1500 |
|
- convert Held & Suarez external_forcing.F (from hs94.cs, with Sigma-coords |
1501 |
|
bits) to apply_forcing.F and undef USE_OLD_EXTERNAL_FORCING in experiments |
1502 |
|
hs94.cs-32x32x5 and tutorial_held_suarez_cs ; also use the same version of |
1503 |
|
apply_forcing.F in 2D hs94 (fwd, ad & oad) but keep LatLon hs94 unchanged. |
1504 |
|
o pkg/ptracers: |
1505 |
|
- implement Adams-Bashforth on pTracers (instead of on tracer tendency), |
1506 |
|
switched on by setting PTRACERS_doAB_onGpTr=F (default set to doAB_onGtGs) |
1507 |
|
- change exp4 secondary test (input.nlfs) to test AB on T & S & pTracer |
1508 |
|
with AB-2 code (so that it get tested). |
1509 |
|
o model/src: |
1510 |
|
- allow to apply Adams-Bashforth on Temp & Salt (instead of on gT,gS) |
1511 |
|
with AB-2 code (previously only available with AB-3 code). |
1512 |
|
Also move the code (call to ADAMS_BASHFORTH S/R) form thermodynamics.F |
1513 |
|
to temp/salt_integrate.F (since the 2nd part of gt/sNm1 update is done |
1514 |
|
there, by calling CYCLE_AB_TRACER). |
1515 |
|
o pkg/generic_advdiff: |
1516 |
|
- change Tracer argument (drop bi,bj indices) in S/R GAD_CALC_RHS, |
1517 |
|
GAD_C2_ADV_R, GAD_U3_ADV_R, GAD_C4_ADV_R, GAD_DIFF_R, GAD_BIHARM_R |
1518 |
|
+ also in GMREDI_X/Y/RTRANSPORT ; and update corresponding calls in |
1519 |
|
S/R temp/salt/ptracers_integrate.F |
1520 |
|
o model/src & pkg/ptracers: |
1521 |
|
- remove common block variables gT,gS (in DYNVARS.h), except when |
1522 |
|
USE_OLD_EXTERNAL_FORCING is defined; update TAF storage accordingly. |
1523 |
|
- remove common block variable gPtr. |
1524 |
|
o model/src & pkgs: |
1525 |
|
- change gTracer (and/or tracer) argument (drop bi,bj indices) in S/R |
1526 |
|
ADAMS_BASHFORTH(2&3), CYCLE_(AB_)TRACER, FREESURF_RESCALE_G, |
1527 |
|
IMPLDIFF, SOLVE_TRIDIAGONAL & _PENTADIAGONAL, GAD_SOM_ADVECT, |
1528 |
|
GAD_ADVECTION, GAD_CALC_RHS, GAD_IMPLICIT_R, TIMEAVE_CUMUL_DIF_1T |
1529 |
|
+ change accordingly all calling S/R. |
1530 |
|
- use local temperature/salinity/ptracer tendency array (without bi,bj) |
1531 |
|
in S/R temp/salt/ptracers_integrate.F |
1532 |
|
o pkg/seaice: |
1533 |
|
- move computation of stress contributions to rhsU/V in s/r seaice_lsr |
1534 |
|
to separate s/r seaice_lsr_rhsu/v in order to be able to re-use code |
1535 |
|
- make u/vIceC local variables if SEAICE_CGRID is defined only to be used |
1536 |
|
in seaice_lsr |
1537 |
|
- seaice_lsr.F: make local 4D arrays UXX, VYY, etc 2D |
1538 |
|
in s/r seaice_lsr_calc_coeffs |
1539 |
|
o pkg/mdsio: |
1540 |
|
- in MDS_READ/WRITE_FIELD, stop if file-name (+prefix) is too long |
1541 |
|
(e.g., > MAX_LEN_MBUF -90 ) or, in INI_MODEL_IO, if mdsioLocalDir is |
1542 |
|
too long (e.g., > MAX_LEN_FNAM/2 ) |
1543 |
|
|
1544 |
|
checkpoint65b (2014/08/12) |
1545 |
|
o pkg/matrix: |
1546 |
|
- pass, as argument, updated tracer field to S/R MATRIX_STORE_TENDENCY_EXP |
1547 |
|
o model/src: |
1548 |
|
- fix initialisation of geothermalFile; compile geothermal-flux code in |
1549 |
|
natl_box verification experiment. |
1550 |
|
o model/src & pkg/down_slope: |
1551 |
|
- push the k loop inside S/R TIMESTEP_TRACER (now called outside the k loop). |
1552 |
|
- in dwnslp_apply.F, update tracer tendency instead of the future tracer |
1553 |
|
field and call S/R DWNSLP_APPLY before TIMESTEP_TRACER; this affects |
1554 |
|
results at machine truncation level: update output of experiments |
1555 |
|
global_ocean.90x40x15.dwnslp (FWD) and lab_sea.noseaicedyn (AD). |
1556 |
|
o pkg/diagnostics (Stats-Diags): |
1557 |
|
- do not cumulate the full volume when DIAGNOSTICS_FILL is |
1558 |
|
called with bibjFlg < 0 (no increment of the counter for 2D/3D diag); |
1559 |
|
This fix the mean statistics when DIAGNOSTICS_FILL is called multiple |
1560 |
|
times (but Min,Max and StD are still wrong). |
1561 |
|
o model/src: |
1562 |
|
- add geothermal flux forcing: read in ini_forcing.F as time-constant |
1563 |
|
field "geothermalFlux" applied in S/R APPLY_FORCING_T (apply_forcing.F) |
1564 |
|
o model/src: |
1565 |
|
- move CYCLE_TRACER calls from tracers_correction_step.F to temp/salt/ptracer |
1566 |
|
_integrate.F so that, when leaving S/R THERMODYANMICS, theta,salt and pTrac |
1567 |
|
arrays are already updated while adjustments (filters, conv.adjustment) are |
1568 |
|
still applied later, in S/R TRACERS_CORRECTION_STEP. |
1569 |
o model/src: |
o model/src: |
1570 |
- store in common bloc array "rhoInSitu" the virtual potential temperature |
- store in common bloc array "rhoInSitu" the virtual potential temperature |
1571 |
anomaly that is used to compute geopotential: this make the atmos code |
anomaly that is used to compute geopotential: this make the atmos code |
1572 |
more similar to ocean code which already uses rhoInSitu in calc_phi_hyd.F |
more similar to ocean code which already uses rhoInSitu in calc_phi_hyd.F |
|
- add geothermal flux |
|
|
read in ini_forcing.F as time-constant field geothermalFlux |
|
|
applied in S/R APPLY_FORCING_T (apply_forcing.F) |
|
1573 |
o pkg/seaice/seaice_lsr.F |
o pkg/seaice/seaice_lsr.F |
1574 |
- rename integer variable ilcall to ipass (that's what it is called |
- rename integer variable ilcall to ipass (that's what it is called |
1575 |
in the residual diagnostics |
in the residual diagnostics |
1644 |
- collect T & S forcing tendency into local 2-D array (passed as argument to |
- collect T & S forcing tendency into local 2-D array (passed as argument to |
1645 |
apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency. |
apply_forcing S/R); add 3-D diagnostics for temp & salt forcing tendency. |
1646 |
affects results at machine truncation level (e.g., ocean: if using |
affects results at machine truncation level (e.g., ocean: if using |
1647 |
SHORTWAVE_HEATING and atmos:, if using FrictionHeating or (atm_Rq<>0) |
SHORTWAVE_HEATING ; atmos: if using FrictionHeating or (atm_Rq<>0) moist |
1648 |
moist correction due to vertical advection). |
correction due to vertical advection). |
1649 |
- update output of experiments: fizhi-cs-32x32x40 (13 digits), |
- update output of experiments: fizhi-cs-32x32x40 (13 digits), |
1650 |
global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml: |
global_ocean.cs32x15 (fwd: icedyn, seaice, thsice, all 3 @ 11d; adm & tml: |
1651 |
seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13), |
seaice_dynmix & thsice, fwd grd @ 3 & 8), hs94.1x64x5 (ad grd @ 13), |
1674 |
nearly a factor of 10 (but keep in mind there is mostly seaice code in |
nearly a factor of 10 (but keep in mind there is mostly seaice code in |
1675 |
this experiment): |
this experiment): |
1676 |
> size mitgcmuv_ad |
> size mitgcmuv_ad |
1677 |
text data bss dec hex |
text data bss dec hex |
1678 |
5100659 1216 220458952 225560827 d71c8fb |
5100659 1216 220458952 225560827 d71c8fb |
1679 |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
1680 |
but only a moderate increase of 36% for global_ocean.cs32x15: |
but only a moderate increase of 36% for global_ocean.cs32x15: |
1681 |
text data bss dec hex |
text data bss dec hex |