2 |
|
|
3 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
4 |
============================== |
============================== |
5 |
|
|
6 |
|
checkpoint52b_post |
7 |
|
o new version: "thsice" of thermodynamic sea-ice pkg: |
8 |
|
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
9 |
|
- modify fluxes but do not change theta directly; |
10 |
|
- light cleaning of bulk_force pkg (still needed with thsice). |
11 |
|
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
12 |
|
+ output_thsice.txt to test thsice & bulk_force pkgs. |
13 |
|
o put back grid & coriolis monitor output. |
14 |
|
checkpoint52b_pre |
15 |
|
|
16 |
|
o call "do_the_model_io" at the beginning (=> dump initial state) |
17 |
|
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
18 |
|
o sort out interplay between tamc.h and PTRACERS_OPTIONS.h |
19 |
|
(need info on NUMBER_OF_PTRACERS) |
20 |
|
o missing PTRACERS headers in some routines |
21 |
|
o default tamc.h in pkg/autodiff supposed to crash |
22 |
|
to ensure proper customization |
23 |
|
|
24 |
|
checkpoint52a_post |
25 |
|
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
26 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
27 |
|
- subroutine FREEZE_SURFACE now limits only surface temperature |
28 |
|
and is called in FORWARD_STEP (if allowFreezing=.TRUE.) |
29 |
|
=> new output.txt for global_ocean.cs32x15 & global_with_exf |
30 |
|
- keep the old version of FREEZE for backward compatibility; |
31 |
|
global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE. |
32 |
|
- corresponding modifs for TAF directives |
33 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
34 |
|
o time-averaged output for pkg/ptracers |
35 |
|
o fix problem with ECCO-related divided adjoint |
36 |
|
snapshot file was missing some ad-variables, |
37 |
|
but no warning issued by TAF |
38 |
|
|
39 |
|
checkpoint52a_pre |
40 |
|
o some bug fixes for #undef REAL4_IS_SLOW |
41 |
|
|
42 |
|
checkpoint52 = ecco_c52_e35 |
43 |
|
o after testing adjoints of checkpoint51u_post |
44 |
|
|
45 |
|
checkpoint51u_post |
46 |
|
o this is the post-merge tag of the ecco-branch |
47 |
|
(needs another clean checkout and re-testing) |
48 |
|
o various natl_box_adjoint configs and results |
49 |
|
but no input fields |
50 |
|
o obcs adjoint not yet merged! |
51 |
|
o adding ECCO global 1x1 and 2x2 degree configs |
52 |
|
o updated/extended some store directives for seaice |
53 |
|
o pkg/ecco now containes ecco-specific part of cost function |
54 |
|
o top level routines the_main_loop, forward_step |
55 |
|
supersede those in model/src/ |
56 |
|
previous input data.cost now in data.ecco |
57 |
|
(new namelist ecco_cost_nml) |
58 |
|
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
59 |
|
|
60 |
|
checkpoint51t_post |
61 |
|
o this is the pre-merge tag of the ecco-branch |
62 |
|
|
63 |
|
checkpoint51s_post |
64 |
|
o cleanup: removed various obsolete #define-s |
65 |
|
o pkg/grdchk |
66 |
|
- renamed 'ph-grd 3' to 'grad-res' |
67 |
|
- merged from ecco-branch |
68 |
|
(remaining bug fixes for obcs gradient checks) |
69 |
|
- additional high-precision output for testreport |
70 |
|
(grep for 'precision_grdchk_result') |
71 |
|
|
72 |
|
checkpoint51r_post |
73 |
|
o cleaned up or removed CPP_OPTIONS.h files |
74 |
|
o updated results for some of the tests to reflect the new |
75 |
|
optfiles (-ieee: -O0 instead of -O3) |
76 |
|
|
77 |
|
checkpoint51q_post |
78 |
|
o cd_code: |
79 |
|
- moved cd_scheme.F -> cd_code_scheme.F |
80 |
|
- separate read_checkpoint from cd_code_ini_vars.F |
81 |
|
- separated cd_code part from write_checkpoint |
82 |
|
- updated AD_SOURCE, generated .flow |
83 |
|
- added CD_CODE_VARS.h to the_main_loop |
84 |
|
- Moving cd_code specific store dir.s to pkg/cd_code |
85 |
|
o ctrl package totally restructured |
86 |
|
- pack/unpack now optional and decoupled from |
87 |
|
xx_/adxx_ I/O |
88 |
|
- ctrl_pack/unpack cleaned |
89 |
|
(new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F) |
90 |
|
- confined inclusion of AD_CONFIG.h to where necessary. |
91 |
|
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
92 |
|
|
93 |
|
checkpoint51p_post |
94 |
|
o create initial cd_code package |
95 |
|
- WARNING: the initialization of fields within packages |
96 |
|
is broken because INI_FIELDS (where READ_CHECKPOINT is |
97 |
|
called) is called *before* PACKAGES_INIT_VARIABLES. |
98 |
|
This seems to be backwards since |
99 |
|
1) its important to initially zero the entire field including |
100 |
|
the "halo" region |
101 |
|
2) zeroing needs to be done *before* reading pickup info |
102 |
|
and the pickup call might or might not happen in any |
103 |
|
particular run |
104 |
|
- this needs an overhaul for R2 |
105 |
|
o cleanup verification/*/code/GMREDI_OPTIONS.h |
106 |
|
o cleanup testreport |
107 |
|
|
108 |
|
checkpoint51o_post |
109 |
|
o bringing AD-related verif's up to date with genmake2 |
110 |
|
- carbon/ |
111 |
|
- global_ocean.90x40x15/ |
112 |
|
- hs.94.1x64x5/ |
113 |
|
- (front_relax/ ) |
114 |
|
o (more) consistent directory structure for AD-related verif.'s |
115 |
|
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK |
116 |
|
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF |
117 |
|
o bug fix in find_alpha.F for MDJWF: |
118 |
|
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for |
119 |
|
change rho -> rho-rhoConst |
120 |
|
- replace call find_rho to find_rhonum |
121 |
|
o initialisation of rFlx extended to full array (required by TAF) |
122 |
|
and shifted to thermodynamics |
123 |
|
o removed PTRACERS.h in ptracers routine |
124 |
|
o added surfacetendencyPtr to S/R parameter list pracers_forcing |
125 |
|
o Correcting initialisations for fVerU, fVerV. |
126 |
|
o helping TAF to recognize dependency on kUp for |
127 |
|
fVerU, fVerV |
128 |
|
o Replacing delZ by delR in pkg/ctrl/ |
129 |
|
checkpoint51o_pre |
130 |
|
|
131 |
|
o undid all of cp51 pending some cleanups and discussion |
132 |
|
o added the [#include "AD_CONFIG.h"] statement to all files that need |
133 |
|
it for adjoint/tl #defines |
134 |
|
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
135 |
|
o removed tools/genmake since it no longer works |
136 |
|
|
137 |
|
checkpoint51n_post |
138 |
|
o modifications to make FREEZE flux visible to pkg/kpp |
139 |
|
- moved surfaceTendencyTice from pkg/seaice to main code |
140 |
|
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
141 |
|
- subroutine FREEZE now limits only surface temperature |
142 |
|
(this means new output.txt for global_ocean.90x40x15, |
143 |
|
global_ocean.cs32x15, and global_with_exf) |
144 |
|
o added surface flux output variables to TIMEAVE_STATVARS |
145 |
|
|
146 |
|
checkpoint51n_pre |
147 |
|
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
148 |
|
o added [#include "AD_CONFIG.h"] to all files that use the following |
149 |
|
defines: |
150 |
|
- ALLOW_ADJOINT_RUN |
151 |
|
- ALLOW_TANGENTLINEAR_RUN |
152 |
|
- ALLOW_ECCO_OPTIMIZATION |
153 |
|
|
154 |
|
checkpoint51m_post |
155 |
|
o incorporating changes to get TAMC/TAF working in genmake2 |
156 |
|
- added new TAMC/TAF targets to the Makefile |
157 |
|
- various cleanups related to package handling |
158 |
|
- these changes should have no impact on the forward model |
159 |
|
|
160 |
|
checkpoint51l_post |
161 |
|
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
162 |
|
- faster algorithm for cal_addtime.F |
163 |
|
- higher precision arithmetic, where needed |
164 |
|
- pkg/exf *startdate variables changed from calendar date to |
165 |
|
model integration time |
166 |
|
|
167 |
|
checkpoint51l_pre |
168 |
|
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
169 |
|
o enable to apply restoring on S & T only in a latitude band. |
170 |
|
o update output (external_forcing_surf modif. change truncation errors) |
171 |
|
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
172 |
|
|
173 |
|
checkpoint51k_post |
174 |
|
o change default to: useNHMTerms=.FALSE. |
175 |
|
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
176 |
|
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
177 |
|
- new output.txt for idealized oceanic exp (NHMTerms are now turned off): |
178 |
|
exp1, ideal_2D_oce |
179 |
|
- change data file of oceanic exp (leave the results unchanged for now) |
180 |
|
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box |
181 |
|
o set gravitySign automatically according to the vertical coordinate used |
182 |
|
(and change sign: back to "logical" value: +1 when R increases downward) |
183 |
|
o added an include barrier to the default CPP_OPTIONS.h and |
184 |
|
removed the #include "PACKAGES_CONFIG.h" from it |
185 |
|
o fix a bug in mom_fluxform (from chk51j_post) |
186 |
|
|
187 |
|
checkpoint51j_post |
188 |
|
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
189 |
|
o adjusted some flow directives (dynamics, thermodynamics) |
190 |
|
o added cubed-sphere case to test cost function |
191 |
|
o heckpoint_lev?_directives.h now include |
192 |
|
pkg-specific directives, whenever those are enabled. |
193 |
|
o Moving pkg-specific flow directives to corresponding pkg |
194 |
|
Moving pkg-specific differentiation list to corresponding pkg |
195 |
|
Moving pkg-specific checkpoint-lev storing to corresponding pkg |
196 |
|
---> conventions are |
197 |
|
- pkg_ad.flow |
198 |
|
- pkg_ad_diff.list |
199 |
|
- pkg_ad_check_lev?_dir.h |
200 |
|
|
201 |
|
checkpoint51i_post |
202 |
|
o merge of the branch-genmake2 |
203 |
|
- knowingly breaks the older genmake |
204 |
|
- automatic generation of all ALLOW_${PKG_NAME} defines |
205 |
|
- new testreport supersedes older testscript |
206 |
|
o large number of package inclusion and header cleanups |
207 |
|
checkpoint51i_pre |
208 |
|
|
209 |
|
o new output for adjoin of global ocean vector invariant |
210 |
|
o fix for checkpoint of thermodynamic seaice and bulk_force |
211 |
|
o Steph gchem various cleanups |
212 |
|
|
213 |
|
checkpoint 51h_pre |
214 |
|
o fixed some single quotes |
215 |
|
o modify gchem pkg to be more versatile |
216 |
|
o modifications to clean up dic pkg |
217 |
|
o add pkg/cfc |
218 |
|
|
219 |
|
checkpoint51g_post |
220 |
|
o provide links for ARPACK and ADM*TLM |
221 |
|
o start removing verification/vero/ |
222 |
|
o update AD-related stuff |
223 |
|
(in particular some IF-statements in model/src/ routines) |
224 |
|
o adding to verification/global_ocean.90x40x15/ adjoint of |
225 |
|
vector invariant setup |
226 |
|
|
227 |
|
checkpoint51f_post |
228 |
|
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
229 |
|
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
230 |
|
of tracer Green's fucntions for ocean inversion project. |
231 |
|
|
232 |
|
checkpoint51f_pre |
233 |
|
o Added on-the-fly spatial interpolation capability |
234 |
|
"USE_EXF_INTERPOLATION" to pkg/exf. |
235 |
|
- This is a temporary Cartesian-grid hack until |
236 |
|
the super-duper ESMF coupler becomes available. |
237 |
|
- See verification/global_with_exf/README for usage example. |
238 |
|
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid |
239 |
|
flags and modified pkg/seaice accordingly. |
240 |
|
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F, |
241 |
|
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
242 |
|
non-local transport term. |
243 |
|
|
244 |
|
checkpoint51e_post |
245 |
|
o pkg/mom_vecinv: |
246 |
|
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
247 |
|
- add time-ave diagnostic of vorticity advection. |
248 |
|
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV. |
249 |
|
o atmospheric geopotential: - include water vapor effect; |
250 |
|
- use p^kappa in p* scaling. |
251 |
|
o land pkg: read initial state from files. |
252 |
|
o AIM : add stratospheric drag in the upper level |
253 |
|
|
254 |
|
checkpoint51d_post |
255 |
|
o change function ILNBLNK (=> last non-blank char.) to return zero |
256 |
|
(instead of the string length) when the string. char is empty |
257 |
|
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
258 |
|
o modif's to restore TAMC compatibility |
259 |
|
- avoid "_d" constructs in PARAMETER declarations |
260 |
|
- avoid interrupting lines by comment lines |
261 |
|
o Use cluster local disks for purely local I/O |
262 |
|
vs. globally visible disks needed for ctrl stuff |
263 |
|
(merged from ecco-branch) |
264 |
|
- new active_file_loc... and mdsio_..._loc routines |
265 |
|
- affected packages: autodiff, ctrl, grdchk, mdsio |
266 |
|
|
267 |
|
checkpoint51c_post |
268 |
|
o introducing integer flag debugLevel |
269 |
|
- debLevZero: suppress all output |
270 |
|
- debLevA: standard |
271 |
|
- debLevB: equivalent to current debugMode=.TRUE. |
272 |
|
o introducing pathname variable mdsioLocalDir for mdsio |
273 |
|
that can be specified at runtime |
274 |
|
(relevant for cluster I/O to local disk) |
275 |
|
` |
276 |
|
>>>checkpoint51b_post |
277 |
|
adjoint of ptracers |
278 |
|
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM |
279 |
|
o extended state in checkpoint_lev?, etc. |
280 |
|
o alternative ctrl/cost with tr1 or ptracer |
281 |
|
o new comlev1_bibj_ptracers |
282 |
|
o new ptracers.flow |
283 |
|
o made ptracers_forcing same as external_forcing_s |
284 |
|
o added verification for adjoint with ptracers |
285 |
|
- adm. grdchk fail so far |
286 |
|
- tlm. grdchk OK |
287 |
|
- checked tapelev/comlev recomputations: OK |
288 |
|
<<<checkpoint51b_pre |
289 |
|
|
290 |
|
checkpoint51a_post |
291 |
|
o added code for biogeochemistry package |
292 |
|
- new pkgs: dic, gchem |
293 |
|
- new subroutine in ptracers |
294 |
|
o modify code for biogeo packages |
295 |
|
- in model/src and pkg/ptracers |
296 |
|
|
297 |
|
checkpoint51 |
298 |
|
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
299 |
|
- autodiff, ctrl, exf, grdchk, seaice |
300 |
|
kept separate packages |
301 |
|
- cost, ecco, obcs |
302 |
|
o updating verification/internal_wave, verification/lab_sea |
303 |
|
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
304 |
|
|
305 |
|
checkpoint50i_post |
306 |
|
o Preparing next differentiable checkpoint and sync |
307 |
|
of MAIN vs. ecco-branch |
308 |
|
- 1st step: this one is differentiable |
309 |
|
- 2nd step: next(! not this) checkpoint will have updated packages |
310 |
|
from ecco-branch) |
311 |
|
|
312 |
|
checkpoint50h_post |
313 |
|
o new package "land": provide surface BC for AIM. |
314 |
|
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
315 |
|
o AIM: use true log-P extrapolation for near surface temp (= as in |
316 |
|
F.Molteni paper) ; update aim.5l_cs output. |
317 |
|
o New variable in PARM03 for more flexible pickups |
318 |
|
o somewhat cleaned package initialisation sequence for |
319 |
|
ctrl/ cost/ ecco/ in packages_... routines |
320 |
|
|
321 |
|
checkpoint50g_post |
322 |
|
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
323 |
|
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
324 |
|
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
325 |
|
made the default because of faster convergence than ADI |
326 |
|
|
327 |
|
checkpoint50f_post |
328 |
|
o exf totally restructured |
329 |
|
- replaced all exf_set_ routines by one generic exf_set_gen.F |
330 |
|
and made sure it's still differentiable |
331 |
|
- split exf_getffields.F into new exf_bulkformulae.F |
332 |
|
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
333 |
|
- updated adjoint/makefile and relevant verif. accordingly |
334 |
|
|
335 |
|
checkpoint50f_pre |
336 |
|
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
337 |
|
+ change Evap over land. (update aim.5l_cs output) |
338 |
|
o added missing .cvsignores and made uniform across expts |
339 |
|
o changed configuration of tidal_basin_2d expt |
340 |
|
o added pkg/debug functions for tracing code in fatal crashes |
341 |
|
o tidied pkg/monitor to use MONITOR_OPTIONS.h |
342 |
|
o new fn in pkg/monitor to stop model if solution grows too big |
343 |
|
o removed lots of single quotes from comments |
344 |
|
|
345 |
|
checkpoint50e_post |
346 |
|
o make KPP work with PTRACERS |
347 |
|
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
348 |
|
nearly a copy of kpp_transport_s |
349 |
|
- there is no analogue to SurfaceTendencyS, so I have to use |
350 |
|
gPtr(of the surface layer) instead |
351 |
|
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
352 |
|
checkpoint50e_pre |
353 |
|
|
354 |
|
checkpoint50d_post |
355 |
|
o change kpp output from multiple-record state files to single-record state |
356 |
|
files analogous to write_state.F |
357 |
|
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
358 |
|
analogous to the cg2d-related output. |
359 |
|
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
360 |
|
so that writing to internal file fn (with length 512) fails. |
361 |
|
checkpoint50d_pre |
362 |
|
|
363 |
|
checkpoint50c_post |
364 |
|
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
365 |
|
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
366 |
|
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
367 |
|
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
368 |
|
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
369 |
|
|
370 |
|
checkpoint50c_pre |
371 |
|
Merging from release1_p13: |
372 |
|
o bug fix for pkg/seaice dynamic solver |
373 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
374 |
|
|
375 |
|
checkpoint50b_post |
376 |
|
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
377 |
|
o in order to put the momForcing out of the Adams-Bashforth: |
378 |
|
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
379 |
|
to timestep.F |
380 |
|
o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays |
381 |
|
o re-generate output for highly sensitive test-exp: |
382 |
|
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
383 |
|
|
384 |
|
checkpoint50b_pre |
385 |
|
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
386 |
|
o corrected CPP option mismatch in exf_Bulk... functions for case |
387 |
|
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
388 |
|
|
389 |
|
checkpoint50a_post |
390 |
|
o Bug fix for merging between c50 and KPP. |
391 |
|
ikey was passed from thermodynamics to kpp_calc via |
392 |
|
common block rather than being recomputed in kpp_calc, |
393 |
|
in contradiction with new key itdkey. |
394 |
|
New key ikppkey created, and tamc.h headers updated. |
395 |
|
|
396 |
|
checkpoint50 |
397 |
|
- 2nd step of merge with ecco-branch: |
398 |
|
merge changes in ecco-branch back into main trunk |
399 |
|
- bug fix in find_alpha |
400 |
|
- more storing in gmredi_calc_tensor.F, kpp_routines.F |
401 |
|
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
402 |
|
- merged some sliced AD support routines |
403 |
|
|
404 |
|
checkpoint49 |
405 |
|
merged from ecco-branch: |
406 |
|
o exf: |
407 |
|
- Enable initialisation of forcing fields to constant |
408 |
|
(runtime) values. |
409 |
|
- in exf_getffields.F |
410 |
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
411 |
|
That also fixes wrong TAF-key computations for key_1, key_2 |
412 |
|
with bulf formulae. |
413 |
|
- exf_init.F modify #ifdef for exf_init_evap |
414 |
|
- exf_getffieldrec.F, ctrl_getrec.F |
415 |
|
The following INT-usages are not safe: |
416 |
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
417 |
|
fldcount = int(fldsecs/fldperiod) + 1 |
418 |
|
and were modified. |
419 |
|
o autodiff: checkpoint_lev... |
420 |
|
- updated storing for bulk formulae (some arrays were missing) |
421 |
|
- added state for seaice package |
422 |
|
- synchronized with main branch |
423 |
|
o DIVA: |
424 |
|
Modif.s in |
425 |
|
- the_main_loop.F |
426 |
|
- the_model_main.F |
427 |
|
and added cost_final_restore.F cost_final_store.F |
428 |
|
o With these changes, it is possible to fully separate |
429 |
|
the first forward run to compute the cost function (mdthe_main_loop) |
430 |
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
431 |
|
into separate model executions. |
432 |
|
This enables better tuning of DIVA to given queue sizes. |
433 |
|
o Loss of cost function value in consecutive DIVA runs is |
434 |
|
fixed by storing to 'costfinal' file. |
435 |
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
436 |
|
beginning/end of adjoint integration is accounted for. |
437 |
|
The current changes apply to TAF-1.4.26. |
438 |
|
TAF has one remaining bug, requiring one manual change |
439 |
|
(see MITgcm manual). |
440 |
|
o cal: synchronized between MAIN and ecco-branch |
441 |
|
|
442 |
|
checkpoint48i_post |
443 |
|
o Changes to restore differentiability of code w.r.t. previous tag |
444 |
|
(mostly adding new routines to make list and replacing |
445 |
|
pressure by totPhiHyd). |
446 |
|
o Updated and merged grdchk package |
447 |
|
- has both ADM and TLM checks |
448 |
|
- works for single- and multi-proc. |
449 |
|
- output cleaned |
450 |
|
- worked successfully for parallel DIVA |
451 |
|
o genmake: |
452 |
|
- Adding -platform=SP4 |
453 |
|
- Modif. for DEC Alpha (many don't have makedepend; use mkdep instead). |
454 |
|
o Modif. for DIVA: |
455 |
|
ctrl_unpack should not be called in intermediate DIVA interval. |
456 |
|
(similar thing would apply for active files such as |
457 |
|
tbar, sbar, psbar, which should not be reinitialised; |
458 |
|
only relevant for ecco-branch) |
459 |
|
|
460 |
|
checkpoint48h_post |
461 |
|
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
462 |
|
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
463 |
|
o Added SEAICE_initialHEFF to pkg/seaice |
464 |
|
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
465 |
|
|
466 |
|
checkpoint48g_post |
467 |
|
--- EOS: |
468 |
|
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
469 |
|
store total Potential in totPhyHyd for diagnostics & EOS. |
470 |
|
o fix restart and overlap Pb when using Z-coord and EOS funct. of P |
471 |
|
--- Pressure/geopotential gradient: |
472 |
|
o use Ro_surf & R_low instead of hFac in cal_phi_hyd: |
473 |
|
o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind |
474 |
|
( changes results of global_ocean_pressure ) |
475 |
|
o NLFS + z-coord.: add eta*Rho' contribution. |
476 |
|
o accurate phiHyd when using interface-W at the middle between 2 centers |
477 |
|
( changes results of ideal_2D_oce ) |
478 |
|
o includes r* 2nd term in potential gradient. |
479 |
|
|
480 |
|
checkpoint48f_post |
481 |
|
Merging from release1_p12: |
482 |
|
o Modifications for using pkg/exf with pkg/seaice |
483 |
|
- improved description of the various forcing configurations |
484 |
|
- added basic radiation bulk formulae to pkg/exf |
485 |
|
- units/sign fix for evap computation in exf_getffields.F |
486 |
|
- updated verification/global_with_exf/results/output.txt |
487 |
|
o Added pkg/sbo for computing IERS Special Bureau for the Oceans |
488 |
|
(SBO) core products, including oceanic mass, center-of-mass, |
489 |
|
angular, and bottom pressure (see pkg/sbo/README.sbo). |
490 |
|
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F |
491 |
|
to avoid negative values in shallow regions. |
492 |
|
- updated verification/natl_box/results/output.txt |
493 |
|
- updated verification/lab_sea/results/output.txt |
494 |
|
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F |
495 |
|
o Added useSingleCpuIO option (see PARAMS.h). |
496 |
|
o Updated useSingleCpuIO option in mdsio_writefield.F to |
497 |
|
work with multi-field files, e.g., for single-file pickup. |
498 |
|
o pkg/seaice: |
499 |
|
- bug fix in growth.F: QNET for no shortwave case |
500 |
|
- added HeffFile for specifying initial sea-ice thickness |
501 |
|
- changed SEAICE_EXTERNAL_FLUXES wind stress implementation |
502 |
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
503 |
|
kpp_transport_t.F, forward_step.F, and the_main_loop.F |
504 |
|
o pkg/seaice: |
505 |
|
- adjoint-friendly modifications |
506 |
|
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
507 |
|
|
508 |
|
checkpoint48e_post |
509 |
|
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
510 |
|
o dynamics: change definition of computational domain & adapt mom_fluxform |
511 |
|
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
512 |
|
o following exp works with Olx=Oly=2 (and pass through checkbounds option): |
513 |
|
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1 |
514 |
|
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5 |
515 |
|
global_ocean.90x40x15 global_with_exf global_ocean_pressure |
516 |
|
inverted_barometer solid-body.cs-32x32x1 |
517 |
|
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
518 |
|
|
519 |
|
checkpoint48d_post |
520 |
|
o in preparation for r*: |
521 |
|
a) use pre-computed gradient of hydrostatic potential: |
522 |
|
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
523 |
|
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd: |
524 |
|
=> affects results of glob_oce_pressure (different truncation error) |
525 |
|
update output.txt of ideal_2D_oce & global_ocean_pressure |
526 |
|
|
527 |
|
checkpoint48d_pre |
528 |
|
o in preparation for r*: |
529 |
|
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
530 |
|
pass the 2 comp. of the grad. as arguments to momentum S/R. |
531 |
|
but for the moment, only used if it does not change the results. |
532 |
|
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
533 |
|
|
534 |
|
checkpoint48c_post |
535 |
|
Modifications in treatment of initial flux forcing controls |
536 |
|
to avoid extra storing of flux fields. |
537 |
|
|
538 |
|
checkpoint48c_pre |
539 |
|
o Added tidal_basin_2d experiment (currently 1D!) |
540 |
|
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
541 |
|
|
542 |
|
checkpoint48b_post |
543 |
|
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
544 |
|
(modification to pressure gradient not yet implemented) |
545 |
|
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
546 |
|
(for U & V) that are used for vertical advection of momentum. |
547 |
|
|
548 |
|
checkpoint48a_post |
549 |
|
o In preparation for r*, use temp. array to compute vertical transport |
550 |
|
in flux-form momentum pkg. => change results of few test-exp. |
551 |
|
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
552 |
|
lab_sea, natl_box & plume_on_slope |
553 |
|
|
554 |
|
checkpoint48 |
555 |
|
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
556 |
|
|
557 |
|
checkpoint47j_post |
558 |
|
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
559 |
|
o moved adexch from forward_step to addummy_in_stepping |
560 |
|
o added exch in ctrl_map_... |
561 |
|
o aveFreq.=0. at end of cost_final to avoid overwrite in |
562 |
|
reverse checkpointing loop |
563 |
|
o Yet more changes in gmredi: |
564 |
|
* adgmredi_calc_tensor |
565 |
|
avoiding all recomputation of gmredi_slope_limit |
566 |
|
* adgmredi_x/y/rtransport |
567 |
|
added flag for excessive storing to avoid recomp. of |
568 |
|
u/v/rtans, dTdx/y/z |
569 |
|
-> this is not really necessary and very memory-consuming |
570 |
|
* adgmredi_slope_psi: |
571 |
|
consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff |
572 |
|
* gmredi_slope_limit |
573 |
|
re-activated full calculation of taperfct for case 'ac02' |
574 |
|
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
575 |
|
|
576 |
|
checkpoint47i_post |
577 |
|
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
578 |
|
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
579 |
|
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
580 |
|
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf) |
581 |
|
o gmredi: fix few bugs. |
582 |
|
|
583 |
|
checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48) |
584 |
|
This will be a good checkpoint to plug into the ecco-branch. |
585 |
|
o few modif.'s to get latest version adjointed |
586 |
|
(mainly kick out code in ini_linear_phisurf) |
587 |
|
o modif's to run adjoint with exactConserv |
588 |
|
o case GM_BOLUS_ADVEC should be cleaned |
589 |
|
S/R gmredi_slope_psi should be cleaned |
590 |
|
o verification/carbon now has exactConserv=.TRUE. |
591 |
|
|
592 |
|
checkpoint47g_post |
593 |
|
o time-average AIM output: becomes independent from statvars time-average |
594 |
|
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
595 |
|
o After TAF bug fix: |
596 |
|
Tested adjoint of gmredi package. |
597 |
|
Tests were done with checkpoint47 rather than with latest |
598 |
|
checkpoint47f_post since the latter is broken for the adjoint |
599 |
|
verification/carbon/ contains both ADM and TLM gradient checks. |
600 |
|
Here they are, before they get changed/lost/stolen. |
601 |
|
Mostly modif.'s to fix numerical sensitivities. |
602 |
|
Gradient checks OK for |
603 |
|
- GM_taper_scheme: |
604 |
|
* clipping |
605 |
|
* ac02 |
606 |
|
* linear |
607 |
|
* glw91 |
608 |
|
* dm95 |
609 |
|
* ldd97 |
610 |
|
- GMREDI_OPTIONS: |
611 |
|
* GM_VISBECK_VARIABLE_K |
612 |
|
* GM_NON_UNITY_DIAGONAL |
613 |
|
* GM_EXTRA_DIAGONAL |
614 |
|
* GM_BOLUS_ADVEC |
615 |
|
in conjunction with data.gmredi parameters to be checked in |
616 |
|
in a few minutes under verification/carbon/code/ |
617 |
|
|
618 |
|
checkpoint47f_post |
619 |
|
Merging from release1_p10: |
620 |
|
o modifications for using pkg/exf with pkg/seaice |
621 |
|
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
622 |
|
and SEAICE_EXTERNAL_FLUXES |
623 |
|
- pkg/exf CPP options EXF_READ_EVAP and |
624 |
|
EXF_NO_BULK_COMPUTATIONS |
625 |
|
- usage examples are Experiments 8 and 9 in |
626 |
|
verification/lab_sea/README |
627 |
|
- verification/lab_sea default experiment now uses |
628 |
|
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
629 |
|
|
630 |
|
checkpoint47e_post |
631 |
|
o created a tag prior to creating a branch |
632 |
|
|
633 |
|
checkpoint47d_post |
634 |
|
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
635 |
|
at the bottom boundary had an erroneous half slip boundary condition |
636 |
|
o added bottom drag and no slip boundary condition capabilities to |
637 |
|
oceanic pressure coordinates code |
638 |
|
o added new verification experiment global_ocean_pressure, this experiment is |
639 |
|
also described in the tutorial section of the manual |
640 |
|
checkpoint47d_pre |
641 |
|
|
642 |
|
checkpoint47c_post |
643 |
|
o Added a verification experiment for a global cubed-sphere ocean run |
644 |
|
- verification/global_ocean.cubed32x32x30 |
645 |
|
- uses pkg/therm_seaice and pkg/bulk_forcing |
646 |
|
|
647 |
|
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) |
648 |
|
o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) |
649 |
|
when using P-coordinate; only implemented for atmospheric config. |
650 |
|
o OCEANICP & realFreshWater: include P-E direct effect on wVel ; |
651 |
|
NOTES: requires option NONLIN_FRSURF to be "#define". |
652 |
|
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
653 |
|
|
654 |
|
checkpoint47b_post |
655 |
|
Merging from release1_p9: |
656 |
|
o pkg/seaice |
657 |
|
- removed GOTO's and added taf directives |
658 |
|
- double precision constants to reduce the g77 (Linux) |
659 |
|
to F77 (SGI) differences reported in release1_p8 |
660 |
|
o tools/genmake |
661 |
|
- added SGI options |
662 |
|
o verification/testscript |
663 |
|
- updated to that of checkpoint47a_post |
664 |
|
o verification/global_ocean.90x40x15/input/eedata |
665 |
|
- modified for SGI f77 compatibility |
666 |
|
o verification/lab_sea |
667 |
|
- added description of sea-ice model |
668 |
|
- added missing matlab routines |
669 |
|
- added test of thermodynamics parallelization |
670 |
|
|
671 |
|
checkpoint47a_post |
672 |
|
o new pkg: aim_v23 |
673 |
|
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
674 |
|
for now, keep the same surface forcing as before. |
675 |
|
- Part-Cell implemented into AIM; check that Heat & Water are conserved |
676 |
|
- aim.5l_cs: use new aim pkg (run 10yr & get better results than before) |
677 |
|
- aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg |
678 |
|
o add diagnostic of surface correction term in monitor output |
679 |
|
|
680 |
|
o bulk_force and therm_seaice |
681 |
|
- Two packages: bulk_force (Bulk forcing) |
682 |
|
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2 |
683 |
|
- Earlier integration from Stephaine Dutkiewicz |
684 |
|
and Patrick Heimbach. |
685 |
|
- Two ifdef statements for compile time, |
686 |
|
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
687 |
|
|
688 |
|
checkpoint47 |
689 |
|
differentiable version of checkpoint46n_post |
690 |
|
o bug fix in quasihydrostaticterms |
691 |
|
o * "clean" adjoint code (in terms of extensive recomputations) |
692 |
|
can now be obtained for all GMREDI options (i.e. for |
693 |
|
- GM_VISBECK_VARIABLE_K |
694 |
|
- GM_NON_UNITY_DIAGONAL |
695 |
|
- GM_EXTRA_DIAGONAL |
696 |
|
- GM_BOLUS_ADVEC ) |
697 |
|
* However, wrong gradient check problem remains unsolved. |
698 |
|
* New CPP options have been introduced for different |
699 |
|
tapering schemes |
700 |
|
o external_fields_load now part of differentiation list |
701 |
|
o pressure needs multiple storing; |
702 |
|
would be nice to have store_pressure at beginning or |
703 |
|
end of forward_step, e.g. by having phiHyd global (5-dim.) |
704 |
|
(NB: pressure is needed for certain cases in find_rho, |
705 |
|
which is also invoked through convective_adjustment). |
706 |
|
o recomputations in find_rho for cases |
707 |
|
'JMD95'/'UNESCO' or 'MDJWF' are OK. |
708 |
|
o #define ATMOSPHERIC_LOADING should be differentiable |
709 |
|
o ini_forcing shifted to begining of initialise_varia |
710 |
|
o Incorporating QNVS line search routines into MITgcm |
711 |
|
(this is separate code, and therefore not under pkg) |
712 |
|
lsopt/, optim/ |
713 |
|
o Updated verification/carbon/ |
714 |
|
- #define GM_VISBECK_VARIABLE_K |
715 |
|
- GM_taper_scheme = 'ldd97' |
716 |
|
|
717 |
|
checkpoint46n_post |
718 |
|
Merging from release1_p8: |
719 |
|
o verification/natl_box: |
720 |
|
updating new external_fields_load routine |
721 |
|
o New package: pkg/seaice |
722 |
|
Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle). |
723 |
|
The sea-ice code is based on Hibler (1979-1980). |
724 |
|
Two sea-ice dynamic solvers, ADI and LSR, are included. |
725 |
|
In addition to computing prognostic sea-ice variables and diagnosing |
726 |
|
the forcing/external data fields that drive the ocean model, |
727 |
|
SEAICE_MODEL also sets theta to the freezing point under sea-ice. |
728 |
|
The implied surface heat flux is then stored in variable |
729 |
|
surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and |
730 |
|
kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the |
731 |
|
non-local transport term. Because this call precedes model |
732 |
|
thermodynamics, temperature under sea-ice may not be "exactly" at |
733 |
|
the freezing point by the time theta is dumped or time-averaged. |
734 |
|
N.B.: fairly large differences in accuracy occur across |
735 |
|
different platforms/compilers; comparison between |
736 |
|
g77 (Linux) and F77 (SGI Origin 2000/MIPSpro) |
737 |
|
generated output gives: |
738 |
|
T S U V |
739 |
|
C D M c m s m s m s m s |
740 |
|
n p a R g m m e . m m e . m m e . m m e . |
741 |
|
f n k u 2 i a a d i a a d i a a d i a a d |
742 |
|
g d e n d n x n . n x n . n x n . n x n . |
743 |
|
|
744 |
|
Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea |
745 |
|
o GAD: |
746 |
|
- generated new common blocks to account for call of |
747 |
|
same gad routines with differing traceridentities |
748 |
|
(needed to modify tracerIdentity indices in GAD.h) |
749 |
|
- generated separate common blocks for case useCubedSphereExchange |
750 |
|
(Department of Futurology) |
751 |
|
- parameter lists to gmredi_?transport: added tracerIdentity |
752 |
|
- added new key indices to tamc.h |
753 |
|
o external_fields_load: |
754 |
|
- added this routine to TAF list |
755 |
|
- needed to make some common blocks global and additional storing |
756 |
|
along the same lines as exf package (checkpoint_lev?_directives.h) |
757 |
|
o exf: |
758 |
|
updated external forcing package |
759 |
|
- bug fixes carried over from ecco-branch |
760 |
|
(missing OBCS_OPTIONS.h in two routines) |
761 |
|
- enable easy to use "no forcing". |
762 |
|
- added exf I/O for atmospheric loading |
763 |
|
- added exf I/O for runoff data |
764 |
|
- transfered scaling between exf <-> MITgcm to exf namelist |
765 |
|
o Adding new verification experiment global_with_exf. |
766 |
|
This verification experiment is almost identical to the |
767 |
|
global_ocean.90x40x15 experiment, except that it uses |
768 |
|
the exf (and cal) package instead of the |
769 |
|
external_fields_load routine (cf README file). |
770 |
|
|
771 |
|
checkpoint46m_post |
772 |
|
o modified testscript to return -- when there are no lines of "%MON" output |
773 |
|
o added new flag "quasiHydrostatic" for QH mode |
774 |
|
and new routine quasihydrostaticterms() |
775 |
|
o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term) |
776 |
|
New routine: mom_u_coriolis_nh() |
777 |
|
o fixed sign of non-hydrostatic metric terms in u and v equations. |
778 |
|
Depend on correct sign of gravitySign. |
779 |
|
o added work.pc* to .cvsignore in aim directories using ifc |
780 |
|
o introduced flag for controllin non-hydrostatic metric terms |
781 |
|
o removed gravitySign from PARM04 |
782 |
|
o switched to g77/ifc from pgf77 in aim experiments |
783 |
|
|
784 |
|
checkpoint46l_post |
785 |
|
o made convective adjustment work with pressure coordinates: |
786 |
|
- changed the direction of k-loop in convective_adjustment.F for the |
787 |
|
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
788 |
|
- adjusted the reference pressure k-index in convective_adjustment.F |
789 |
|
- adjusted the convection condition in convect.F (in analogy to |
790 |
|
calc_ivdc.F) |
791 |
|
- convective_adjustment no longer computes anything on the halos |
792 |
|
- removed the warnings about negative salinity from find_rho.F and |
793 |
|
find_alpha.F; instead the new routine look_for_neg_salinity, called |
794 |
|
at the beginning of find_rho, find_alpha, and find_beta, does a |
795 |
|
check of the entire slice, if CPP-option |
796 |
|
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
797 |
|
checkpoint46l_pre |
798 |
|
|
799 |
|
checkpoint46k_post |
800 |
|
o fixed the verification/global_ocean.90x40x15 experiment: |
801 |
|
- new bathymetry (the world according to A., JMC, and M.) |
802 |
|
- new initial fields and forcing fields (*.bin files) |
803 |
|
- new POLY3.COEFFS (for the next release one should switch to a full |
804 |
|
equation of state: JMD95P or MDJWF) |
805 |
|
- fixed several errors and redundancies in the data file |
806 |
|
- experiment uses looped cells |
807 |
|
- added matlab directory with diagnostic scripts for plotting of output |
808 |
|
|
809 |
|
o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: |
810 |
|
- read AIM physics parameters from a file (data.aimphys) |
811 |
|
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
812 |
|
|
813 |
|
checkpoint46j_post |
814 |
|
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
815 |
|
o move wVel computation at the end of the time step, in S/R integr_continuity |
816 |
|
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
817 |
|
o update timeave pkg for wVel diagnostic. |
818 |
|
checkpoint46j_pre |
819 |
|
|
820 |
|
checkpoint46i_post |
821 |
|
o Clean up AIM package (and keep the results unchanged): |
822 |
|
include CPP_OPTION and use IMPLICT NONE in all routines ; |
823 |
|
declare all the variables _RL ; use _d 0 for all numerical constants. |
824 |
|
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
825 |
|
|
826 |
|
checkpoint46h_post |
827 |
|
o cleaned up the use of rhoNil and rhoConst. |
828 |
|
- rhoNil should only appear in the LINEAR equation of state, everywhere |
829 |
|
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
830 |
|
and the dynamical equations are all divided by rhoConst |
831 |
|
o introduced new parameter rhoConstFresh, a reference density of fresh |
832 |
|
water, to remove the fresh water flux's dependence on rhoNil. The default |
833 |
|
value is 999.8 kg/m^3 |
834 |
|
o cleanup up external_forcing.F and external_forcing_surf.F |
835 |
|
- can now be used by both OCEANIC and OCEANICP |
836 |
|
checkpoint46h_pre |
837 |
|
|
838 |
|
Added code to convert surface volume flux (fresh water) into |
839 |
|
a mass flux when using P coordinates in the ocean (OCEANICP). |
840 |
|
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
841 |
|
|
842 |
|
checkpoint46g_post |
843 |
|
o Include a new diagnostic variable phiHydLow for the ocean model |
844 |
|
- in z-coordinates, it is the bottom pressure anomaly |
845 |
|
- in p-coordinates, it is the sea surface elevation |
846 |
|
- in both cases, these variable have global drift, reflecting the mass |
847 |
|
drift in z-coordinates and the volume drift in p-coordinates |
848 |
|
- included time averaging for phiHydLow, be aware of the drift! |
849 |
|
o depth-dependent computation of Bo_surf for pressure coordinates |
850 |
|
in the ocean (buoyancyRelation='OCEANICP') |
851 |
|
- requires a new routine (FIND_RHO_SCALAR) to compute density with only |
852 |
|
Theta, Salinity, and Pressure in the parameter list. This routine is |
853 |
|
presently contained in find_rho.F. This routine does not give the |
854 |
|
correct density for 'POLY3', which would be a z-dependent reference |
855 |
|
density. |
856 |
|
o cleaned up find_rho |
857 |
|
- removed obsolete 'eqn' from the parameter list. |
858 |
|
o added two new verification experiments: gop and goz |
859 |
|
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
860 |
|
checkpoint46g_pre |
861 |
|
|
862 |
|
checkpoint46f_post |
863 |
|
o Enable tangent linear (forward mode) gradient checks: |
864 |
|
- extended active file handling to g_... files |
865 |
|
- added TANGENT_SIMULATION to theSimulationMode |
866 |
|
- extended grdchk package accordingly |
867 |
|
o added tangent linear setup in verification/carbon/code_ftl |
868 |
|
o added adjoint setup in verification/front_relax/code_ad |
869 |
|
|
870 |
|
checkpoint46e_post |
871 |
|
o Added new equation of state -> MDJWF |
872 |
|
- EOS of McDougall et al., 2002, JAOT, submitted |
873 |
|
- caveat: the equation of state is only valid for a smaller (more |
874 |
|
realistic?) range of values than JMD95P/Z and UNESCO |
875 |
|
- added masks to the calculation of pressure in store_pressure |
876 |
|
- added more check values for density in check_eos (ini_eos.F), some of |
877 |
|
the old check values are out of the range of the MDJWF-eos, so don't |
878 |
|
expect perfect matches for those |
879 |
|
checkpoint46e_pre |
880 |
|
|
881 |
|
checkpoint46d_post |
882 |
|
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
883 |
|
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
884 |
|
case of pressure coordinates. eosType='JMD95Z' in |
885 |
|
combination with buoyancyRelation='OCEANICP' now causes an error. |
886 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
887 |
|
in find_alpha/beta. |
888 |
|
checkpoint46d_pre |
889 |
|
|
890 |
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
891 |
|
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
892 |
|
|
893 |
|
checkpoint46c_post |
894 |
|
o Changes necessary for ocean in p-coordinates |
895 |
|
- Added new buoyancy relation = 'OCEANICP' |
896 |
|
- Added new parameters = gravitySign (this used to be contained inside |
897 |
|
the factor dRdZ which I added when we first switched to R coordinates). |
898 |
|
X GM/Redi is not compatible (yet) |
899 |
|
X bottom drag and no-slip need to be debugged. |
900 |
|
checkpoint46c_pre |
901 |
|
|
902 |
|
checkpoint46b_post |
903 |
|
o Added new equation of state -> JMD95Z and JMD95P |
904 |
|
- EOS of Jackett and McDougall, 1995, JAOT |
905 |
|
- moved all EOS parameters into EOS.h |
906 |
|
- new routines ini_eos.F, store_pressure.F |
907 |
|
o Added UNESCO EOS, but not recommended because it requires |
908 |
|
in-situ temperature (see JMD95) |
909 |
|
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
910 |
|
unesco.f to be used with POLY3 |
911 |
|
checkpoint46b_pre |
912 |
|
|
913 |
|
checkpoint46a_post |
914 |
|
o Added (atmospheric) pressure loading |
915 |
|
- new field in FFIELDS.h, etc... |
916 |
|
- new cpp flag ATMOSPHERIC_LOADING |
917 |
|
o Changed hFacC to _hFacC in calc_phi_hyd.F |
918 |
|
o Added SHORTWAVE_HEATING to some files for consistency |
919 |
|
checkpoint46a_pre |
920 |
|
|
921 |
|
checkpoint46 |
922 |
|
further merges from release1_p5 |
923 |
|
o new ctrl package |
924 |
|
- adopted from ECCO environment to enable optimization |
925 |
|
- added Eliassen Palm fluxes to controls |
926 |
|
o added Eliassen Palm flux controls to gradient check package |
927 |
|
o cost package |
928 |
|
- Compatible with new ctrl package |
929 |
|
- added Eliassen Palm cost hooks |
930 |
|
- modif's of existing cost functions |
931 |
|
o Adjoint-related bug fixes in kpp: |
932 |
|
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix |
933 |
|
- kpp_routines: store of Rib avoids partial recomputation bug of TAF. |
934 |
|
o autodiff package |
935 |
|
- flow directives: |
936 |
|
+ new for S/R do_the_model_io |
937 |
|
+ enhanced for S/R checkpoint |
938 |
|
+ new gmredi.flow |
939 |
|
- Introduced CPP option ALLOW_AUTODIFF_MONITOR to |
940 |
|
disable adcommon.h/g_common.h by default. |
941 |
|
- fixed problem for adjoint of global_max |
942 |
|
o modified verification/carbon/ |
943 |
|
o New setup for adjoint of global_ocean |
944 |
|
o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F) |
945 |
|
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
946 |
|
o incorporated hooks for sponge layer code (external_forcing.F) |
947 |
|
|
948 |
|
checkpoint45d_post |
949 |
|
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
950 |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
951 |
(affects plume_on_slope "cg2d" output) |
(affects plume_on_slope "cg2d" output) |
952 |
|
o add new parameter deltaTfreesurf for free-surface time stepping |
953 |
|
o exchange gT,gS when using staggerTimeStep & GM & Oly<4 |
954 |
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
955 |
o change phiMin in exp1 (to agree with documentation) |
o change phiMin in exp1 (to agree with documentation) |
956 |
o add new flags: |
o add new flags: |