4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/seaice: add linear remapping scheme (Lipscomb 2001) to ITD model |
8 |
|
- this is a first version that includes many regularisations that may |
9 |
|
not all be necessary, to be sorted out, |
10 |
|
- turned on by runtime parameter SEAICEuseLinRemapITD (true by default) |
11 |
|
- change one verification experiment in seaice_itd to use and test new code |
12 |
|
- seaice_growth: catch a case where the argument of log can be zero |
13 |
|
or smaller (important for code stability) |
14 |
|
o model/src: |
15 |
|
- modify SOLVE_DIAGONAL_LOWMEMORY version of solve_tridiagonal.F |
16 |
|
& solve_pentadiagonal.F to enable to re-used inverse matrix for solving |
17 |
|
similar A.X'=Y' system (with same matrix A) in subsequent calls; |
18 |
|
switch based on errCode (In/Out) argument value; in calling routines, |
19 |
|
initialise errCode before first call. |
20 |
|
|
21 |
|
checkpoint66a (2016/10/18) |
22 |
|
o pkg/bling: |
23 |
|
- BLING package now loads in atmospheric pCO2 file using exf package routines |
24 |
|
Enable with #define USE_EXFCO2 in BLING_OPTIONS.h |
25 |
|
o model/src & pkg/ptracers: |
26 |
|
- with INCLUDE_IMPLVERTADV_CODE defined, also call MOM_U,V_IMPLICIT_R & |
27 |
|
GAD_IMPLICIT_R (instead of IMPLDIFF) when just implicitViscosity and |
28 |
|
implicitDiffusion (respectively) are used (even without momImplVertAdv |
29 |
|
or temp,salt,PTRACERS_ImplVertAdv). |
30 |
|
o model/src & generic_advdiff: |
31 |
|
- add parenthesis in main diagonal calculation of implicit vertical |
32 |
|
diffusion matrix (impldiff.F & gad_implicit_r.F). |
33 |
|
This affects results at machine truncation level; update output of many |
34 |
|
verification experiments (31 fwd ; 10 adm ; 8 tlm ; 3 oad). |
35 |
|
o pkg/mom_commom & generic_advdiff: |
36 |
|
- add deep atmosphere and anelastic scaling factor in implicit vertical |
37 |
|
advection routines (mom_u,v_implicit_r.F & gad*_impl*_r.F). |
38 |
|
o model/src: |
39 |
|
- remove few unnecessary temp array copies in solve_tridiagonal.F |
40 |
|
& solve_pentadiagonal.F |
41 |
|
|
42 |
|
checkpoint65z (2016/09/28) |
43 |
|
o pkg/seaice: fix multithreading for seaice_fgmres.F |
44 |
|
- remove unecessary variables from common blocks |
45 |
|
- use extra dimension MAX_NO_THREADS for all variables of the Krylov space |
46 |
|
basis, that are stored in commom blocks (including integer variable i1) |
47 |
|
- clean up code a little by removing commented lines that refer to |
48 |
|
original code |
49 |
|
- turn on multi-threaded test for experiment offline_exf_seaice.dyn_jfnk. |
50 |
|
o MITgcm manual: |
51 |
|
- add uptodate pkg/ecco documentation to the manual (section 8.1; ecco.tex), |
52 |
|
preliminary documentation for generic controls (8.3; ctrl.tex), |
53 |
|
a placeholder for smooth (8.4; smooth.tex), and comment out the deprecated |
54 |
|
ecco_costfunction.tex |
55 |
|
o pkg/ecco: |
56 |
|
- update and cleanup list of CCP options |
57 |
|
- re-assign gencost_mask to specify masks rather than gencost_errfile; 'c' |
58 |
|
is now always passed to cost_generic; gencost_mask is now MAX_LEN_FNAM |
59 |
|
- add checks that retired run-time options are not used, and in relation |
60 |
|
to gencost_mask and gencost_errfile |
61 |
|
- finish deprecating gencost_scalefile, gencost_smooth2Ddiffnbt, and |
62 |
|
gencost_nrecperiod |
63 |
|
- fix m_eta computation for virtual salt flux case |
64 |
|
- add m_horflux_vol case (selected via gencost_barfile) that computes |
65 |
|
transports via cost_gencost_boxmean (gencost_flag=-3) |
66 |
|
- use gencost_flag more systematically (i.e., avoid using gencost_name) |
67 |
|
for code switches (aside from physical variable selection) |
68 |
|
o pkg/seaice: make seaice_fgmres.F fit for multithreading; this first |
69 |
|
attempt appears to be a bit of a hack and my need some repair down the road |
70 |
|
o pkg/exf: |
71 |
|
- interpolation near South Pole: fix criteria on input field latitude. |
72 |
|
o pkg/icefront & pkg/exf: |
73 |
|
- move setting of icefront Sub-Glacial RunOff forcing (currently unused) |
74 |
|
from pkg/exf (read from data.exf) to pkg/icefront (read from data.icefront) |
75 |
|
o pkg/exf: |
76 |
|
- replace CPP option ALLOW_EXF_OUTPUT_INTERP with run-time parameter |
77 |
|
"exf_output_interp" (in namelist: EXF_NML_04); change output file name |
78 |
|
(add suffix "_out" instead of a prefix); keep same record number as in |
79 |
|
input file but always write record 1 first (to avoid a STOP in I/O S/R). |
80 |
|
Change output file content by writing interpolated field before applying |
81 |
|
land-sea mask (helpful for debug). |
82 |
|
- 2 compon. vector interpolation with rotation: apply scaling factor on |
83 |
|
each compon. (Eastward and Northward) just before rotation. |
84 |
|
o pkg/bling: |
85 |
|
- Cleaned package. Removed not needed code and comments. |
86 |
|
- adjoint example now works |
87 |
|
(MITgcm_contrib/verification_other/global_oce_biogeo_bling/code_ad) |
88 |
|
o pkg/ptracers: |
89 |
|
- add Bruno Deremble's code to complete the linear surface correction |
90 |
|
for tracer conservation; |
91 |
|
- enabled for individual ptracers by PTRACERS_linFSConserve(iTr)=.TRUE. |
92 |
|
|
93 |
|
checkpoint65y (2016/07/29) |
94 |
|
o pkg/debug (stats): |
95 |
|
- change GLOBAL_SUM to GLOBAL_SUM_TILE (result independent of tile to |
96 |
|
proc/thread mapping); |
97 |
|
- fix Min & Max for case where 1 thread has only empty tiles; |
98 |
|
- use RL variable to count number of wet grid points (with big domain, |
99 |
|
can be too large to fit into integer*4). |
100 |
|
o pkg/monitor: |
101 |
|
- use RL variable to count number of wet grid points (but used only for del2) |
102 |
|
- add new routine to compute Advective CFL within tracer time-stepping with |
103 |
|
writing delayed until next monitor output. |
104 |
|
o pkg/obcs: |
105 |
|
- fix bug in OBCS_BALANCE_FLOW (OBCS_balanceFacN misspelled OBCS_balanceFacW) |
106 |
|
o pkg/cal: |
107 |
|
- calandar-dump: treat case myTime < timePhase in the same way as in |
108 |
|
eesupp/src/diff_phase_multiple.F (when not using calandar-dump). |
109 |
|
o pkg/dic & seaice: |
110 |
|
- fix compilation of ocean component for coupled atm+ocn model with |
111 |
|
seaice dynamics & dic. |
112 |
|
|
113 |
|
checkpoint65x (2016/06/11) |
114 |
|
o add a license text file in main MITgcm tree. |
115 |
|
o added pkg/bling: |
116 |
|
- intermediate complexity biogeochemical model |
117 |
|
- see bling_description.txt for details |
118 |
|
- verification experiment is global_oce_biogeo_bling (for now, in |
119 |
|
Contrib/verification_other/); tested daily on baudelaire with gfortran. |
120 |
|
- add entry point in pkg/gchem for new pkg "bling". |
121 |
|
o pkg/seaice: fix tensile stength computation |
122 |
|
- replace global field tensileStrength by tensileStrFac |
123 |
|
- tensileStrFac can be computed once in S/R seaice_init_varia |
124 |
|
- fortunately that does not affect any verification results |
125 |
|
|
126 |
|
checkpoint65w (2016/05/12) |
127 |
|
o pkg/ctrl/ctrl.h: fix a comma in common block list, so that code compiles |
128 |
|
with ECCO_CTRL_DEPRECATED defined |
129 |
|
o verification/global_ocean.cs32x15: |
130 |
|
- change secondary test "viscA4" to also test "selectP_inEOS_Zc=3" |
131 |
|
with "selectNHfreeSurf=1". |
132 |
|
o model/src (non-hydrostatic free-surface): |
133 |
|
- More "natural" expression of NH free-surface term (case selectNHfreeSurf=1): |
134 |
|
was: tmpSurf/(1+tmpSurf); changed to: 1/(1+Gamma) with Gamma=1/tmpSurf. |
135 |
|
- Calculate surface vertical velocity after 2-D solver adjustment (accounts |
136 |
|
for EmPmR if RealFreshWaterFlux); used in RHS (cg3d_b) if exactConserv |
137 |
|
and used to compute dPhiNH (in post_cg3d.F) if selectNHfreeSurf=1. |
138 |
|
This fixes EmPmR contribution when selectNHfreeSurf=1 & RealFreshWaterFlux. |
139 |
|
- Update output (changes at machine truncation level) of verification exp: |
140 |
|
exp4 (11 digits for cg2d), global_ocean.cs32x15.viscA4 (11.d), |
141 |
|
short_surf_wave (13.d) and tutorial_deep_convection.smag3d (12.d). |
142 |
|
o pkg/seaice: ITD code |
143 |
|
- fix picking up from a single category model by initialising |
144 |
|
heff/area/hsnowITD = 0. in seaice_itd_pickup.F |
145 |
|
- split a long warning message in seaice_check_pickup.F into two lines, |
146 |
|
because NEC SX-ACE cannot deal with the long line. |
147 |
|
o model/src: |
148 |
|
- fix missing dPhiNH in pressure_for_eos.F (case: selectP_inEOS_Zc=3) |
149 |
|
o pkg/seaice: |
150 |
|
- add missing checks for SEAICE_ALLOW_KRYLOV and SEAICE_ALLOW_BOTTOMDRAG |
151 |
|
o pkg/seaice: |
152 |
|
- add basal stress as parameterisation for grounding ice |
153 |
|
following Lemieux et al. (2015) |
154 |
|
- turn on by setting new parameter SEAICEbasalDragK2 to a value |
155 |
|
larger than 0. Lemieux et al. (2015) recommend 15. |
156 |
|
- The adjoint complains with extra recomputations so there is also a |
157 |
|
new cpp-flag SEAICE_ALLOW_BOTTOMDRAG that is undefined by default in |
158 |
|
order to postpone the problem |
159 |
|
- compile the new code in lab_sea |
160 |
|
o verification/halfpipe_streamice: |
161 |
|
- update both TAF and OpenAD adm output (machine truncation differences) |
162 |
|
|
163 |
|
checkpoint65v (2016/04/08) |
164 |
|
o verification/advect_xz: |
165 |
|
- increase overlap size from 3 to 4 and add new secondary test for PQM |
166 |
|
advection scheme (with mono & wino limiter). |
167 |
|
- change main exp. to test PPM (with weno limiter) adv.scheme on Temp. |
168 |
|
o model/src: |
169 |
|
- new parameters "top_Pres" & "seaLev_Z" (replacing Ro_SeaLevel and recently |
170 |
|
added phi0Ref) to set vertical axis origin and phiRef origin; |
171 |
|
keep Ro_SeaLevel for backward compatibility (with a warning). |
172 |
|
According to coordinate and fluid type: |
173 |
|
OCN in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(1), @ the top) |
174 |
|
ATM in Z: top_Pres(Ref) (=rhoConst*PhiRef(1)), seaLev_Z (=rF(Nr+1) @ bottom) |
175 |
|
OCN in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(Nr+1)/g, @ the top) |
176 |
|
ATM in P: top_Pres (=rF(Nr+1)), seaLev_Z (= PhiRef(1)/g, @ the bottom) |
177 |
|
- remove Ro_SeaLevel from ATM experiment parameter files; |
178 |
|
- in tutorial_global_oce_in_p, remove Ro_SeaLevel and set top_Pres to the |
179 |
|
complement; update output.txt (changes at machine truncation level). |
180 |
|
o pkg/seaice/seaice_evp.F |
181 |
|
- simplify computation of deltaZ and zetaZ to simple averaging following |
182 |
|
Bouillon et al. (2013). This removes a lot of code, but also changes |
183 |
|
verification experiment lab_sea.hb87 -> updated |
184 |
|
|
185 |
|
checkpoint65u (2016/03/14) |
186 |
|
o pkg/generic_advdiff: |
187 |
|
- from Darren: add PPM and PQM advection schemes (number 40-42 and 50-52) |
188 |
|
with 2 types of limiter (see: Engwirda & Kelley, submit. to JCP); |
189 |
|
Note (from Darren): unlimited PPM/PQM scheme (40 & 50) are just for |
190 |
|
testing and not for actual use. |
191 |
|
o model/src: |
192 |
|
- add parameter "phi0Ref" to specify reference [pressure/geo] potential at |
193 |
|
origin r = rF(1); |
194 |
|
- add options (parameter selectP_inEOS_Zc) to select which pressure to use |
195 |
|
in EOS for height coordinate: enable to include NH Pressure or to use |
196 |
|
more accurate pressure vertical profile; options not linked to EOS type |
197 |
|
(as previously, e.g., JMD95P/JMD95Z) but set default according to EOS type; |
198 |
|
- start to implement variable gravity (along vertical): for now, only with |
199 |
|
z-coords (not even z*). |
200 |
|
- add Ideal Gas equation of state for height coordinate. |
201 |
|
- update OpenAD output (affected at machine truncation level) of exp: |
202 |
|
global_ocean.90x40x15, OpenAD (std) and tutorial_global_oce_biogeo. |
203 |
|
o pkg/exf: |
204 |
|
- add ALLOW_EXF_OUTPUT_INTERP cpp switch to output the result |
205 |
|
of exf interpolation (before any rescaling, rotation or interpolation |
206 |
|
to velocity point) for each field that gets loaded from file. This option |
207 |
|
identically mimics the input file organization (e.g. record numbers in year |
208 |
|
by year input files) besides the change in horizontal grid. |
209 |
|
- add rotateStressOnAgrid run-time switch so that wind stress fields |
210 |
|
can be provided on the A-grid in zonal/meridional direction and |
211 |
|
rotated on the fly. This only applies to the case when the exf |
212 |
|
interpolation is off and rotateStressOnAgrid is false by default. |
213 |
|
o model/src: |
214 |
|
- rename internal parameter "useDynP_inEos_Zc" to "storePhiHyd4Phys" (since |
215 |
|
it's also used with pkg/atm_phys) and add few more parameters (but still |
216 |
|
inactive, src code yet to come) |
217 |
|
|
218 |
|
checkpoint65t (2016/02/10) |
219 |
|
o pkg/atm_phys: |
220 |
|
- from Ruth Geen: add optical depth dependence on CO2 concentration. |
221 |
|
o model/src: |
222 |
|
- fix vertical inter/extra-polation of density factor rhoFacF (for anelastic) |
223 |
|
for the case setCenterDr=T (delRc set from "data"); add output of rhoFacC&F. |
224 |
|
Update output of exp. deep_anelastic (changes at truncation level). |
225 |
|
o tools: |
226 |
|
- add a hack in "remove_comments_sed" (used only with TAF) for recent |
227 |
|
version of OpenMPI (shipped with FC.23): comment out the new header |
228 |
|
file "mpif-sizeof.h" which causes problems to TAF. |
229 |
|
o pkg/seaice: |
230 |
|
- change the termination criterion so that maxits (SEAICElinearIterMax) |
231 |
|
has an effect |
232 |
|
- unify iteration parameters for implicit solvers (JFNK and Picard) |
233 |
|
SEAICEnonLinIterMax replaces SEAICEnewtonIterMax/NPSEUDOTIMESTEPS |
234 |
|
SEAICElinearIterMax replaces SEAICEkrylovIterMax/SOLV_MAX_ITER |
235 |
|
SEAICEpreLinIterMax replaces SOLV_MAX_ITER in preconditioner |
236 |
|
SEAICEpreNL_IterMax replaces NPSEUDOTIMESTEPS in preconditioner |
237 |
|
SEAICEnonLinTol replaces JFNKgamma_nonlin |
238 |
|
- remove S/R SEAICE_FGMRES_DRIVER and put content into S/R SEAICE_JFKN |
239 |
|
- add new Picard-Krylov solver, compile with SEAICE_ALLOW_KRYLOV and |
240 |
|
use with SEAICEuseKrylov |
241 |
|
o pkg/seaice/seaice_lsr.F |
242 |
|
fix small bug: replace zetaZ by zetaZloc in S/R seaice_lsr_rhsu/v; only |
243 |
|
relevant if SEAICEuseStrImpCpl=T, and even then it does not seem to have |
244 |
|
an effect. |
245 |
|
o pkg/seaice: add two new parameters |
246 |
|
- SEAICEuseLSR to simplify the logic in seaice_dynsolver (this |
247 |
|
parameter is not in any namelist) |
248 |
|
- SEAICEusrPicardAsPrecon to allow s/r seaice_lsr to be used as |
249 |
|
a preconditioner for the non-linear Newton iteration of the JFNK |
250 |
|
solver |
251 |
|
o pkg/seaice/seaice_lsr.F: replace 1./SEAICE_deltaTdyn with recip_deltaT, |
252 |
|
affects some experiments at truncation level: |
253 |
|
- global_ocean.cs32x15.icedyn (11 digits), |
254 |
|
- global_ocean.cs32x15.seaice (11 digits), |
255 |
|
- seaice_itd (12 digits), seaice_itd.lipscomb07 (12 digits) -> update |
256 |
|
- also update global_ocean.cs32x15 adjoint and tangent-linear results |
257 |
|
o pkg/salt_plume & pkg/thsice: |
258 |
|
- for coupled set-up with pkg/thsice in ATM and pkg/salt_plume in OCN, |
259 |
|
connect salt_plume flux to ATM-OCN coupling pkgs interface: |
260 |
|
a) in ATM: also cumulate salt-plume flux in S/R THSICE_SALT_PLUME (for |
261 |
|
export to coupler interface) even without compiling pkg/salt_plume ; |
262 |
|
b) in OCN: apply coupler salt-plume flux to pkg/salt_plume field |
263 |
|
(saltPlumeFlux) just before exch call, in S/R SALT_PLUME_DO_EXCH. |
264 |
|
o pkg/dic: |
265 |
|
- use the updated seaice fraction (from seaice pkgs) for DIC forcing |
266 |
|
instead of the previous time-step value ; done in new S/R DIC_FIELDS_UPDATE |
267 |
|
called from the top of dic_biotic_forcing.F (instead of in DIC_FIELDS_LOAD); |
268 |
|
- move also update with values from ATM-OCN Coupler in the same new S/R |
269 |
|
(previously done in ocn_apply_import.F). |
270 |
|
o tools/adjoint_options: |
271 |
|
- specify explicitly "-f77" or "-f90" in default ad-optfile since TAF (default) |
272 |
|
has been changed on Jan 14, 2016. |
273 |
|
o pkg/ggl90: |
274 |
|
- add alternative discretisation of vertical shear (off by default), to |
275 |
|
compute the mean (@ grid-cell center) of vertical shear compon instead of |
276 |
|
vertical shear of mean flow (@ grid-cell center). |
277 |
|
- add correct parenthesis in ALLOW_GGL90_SMOOTH code to get the same truncated |
278 |
|
results on adjacent faces of cubed-sphere grids; this fix the restart. |
279 |
|
o pkg/atm_compon_interf: |
280 |
|
- skip time-ave over cpl_atmSendFrq of Sea-Level Pressure (atmSLPr) and just |
281 |
|
pass last value, stored directly before export to CPL ; |
282 |
|
Note: this affects results of Coupled set-up where OCN uses useImportSLP=T |
283 |
|
- remove atmSLPr from pickup files (no longer needed for restart) |
284 |
|
|
285 |
|
checkpoint65s (2016/01/13) |
286 |
|
o eesupp & genmake2: |
287 |
|
- first check for Function ETIME and, if it fails, then check for subroutine |
288 |
|
ETIME and consistent output; use the appropriate version in timers.F |
289 |
|
o model/src: |
290 |
|
- to check restart test, add option to apply EXCH to U,V earlier, just before |
291 |
|
integr_continuity; turned off by default. |
292 |
|
o pkg/dic: |
293 |
|
- remove CPP option USE_ATMOSCO2 (not needed) |
294 |
|
o tools/tst_2+2: |
295 |
|
- try to ignore difference between +0 and -0 in binary file, causing test |
296 |
|
to fail for no good reason. |
297 |
|
o eesupp & genmake2: |
298 |
|
- put back modif from Jinxuan Zhu - change etime fct call to S/R call - |
299 |
|
but also check (in genmake2) that test runs and returns meaningful results. |
300 |
|
o coupler pkgs: |
301 |
|
Finish implementation of optionally-exchanged variable switches (started on |
302 |
|
Nov 12) with addition of few more exchanged fields, including 2-way exchange |
303 |
|
of pkg/thsice vars to allow to use seaice dynamics (from pkg/seaice) & seaice |
304 |
|
advection in OCN component; this requires sequential coupling. |
305 |
|
coupler (pkg/atm_ocn_coupler): |
306 |
|
- add argument msgUnit and iter number to CPL_SEND/RECV_ATM/OCN_FIELDS |
307 |
|
routines (useful for debug). |
308 |
|
- only export/import optionally exchanged fields (RunOff, seaice, Salt-Plume |
309 |
|
flux, DIC fields) if corresponding switch is ON. |
310 |
|
- add option to export RunOff to OCN (to use for DIC river input) |
311 |
|
- add 2-way thSIce vars exchange; check for consistent cpl_sequential setting. |
312 |
|
components (pkg/atm_ & ocn_compon_interf): |
313 |
|
- to save memory space in ATM & OCN comp: add some #ifdef ALLOW_${PKG} around |
314 |
|
optionally exchanged fields; add a check & stop in cpl_readparms.F. |
315 |
|
ATMCPL.h: ALLOW_LAND for RunOff, ALLOW_THSICE for seaice, ALLOW_AIM for CO2; |
316 |
|
OCNCPL.h: ALLOW_SALT_PLUME, ALLOW_DIC for DIC, ALLOW_THSICE for 2-W thsice. |
317 |
|
- rename: fracIce -> sIceFrac_cpl (<- match coupler var name) |
318 |
|
+ in ATM: fracIceTime -> sIceFracTime ; seaIceTime -> sIceMassTime. |
319 |
|
- add 2-way thSIce vars exchange ; add Salt-Plume flux ; add RunOff in OCN. |
320 |
|
- hold in common block coupler optionally-exchanged variable switch |
321 |
|
and set default "useImportXXX" accordingly; + check & stop if inconsistent. |
322 |
|
- add diagnostics for all imported fields from coupler (in both OCN & ATM); |
323 |
|
this is intended to replace the OCN cplFldtave.* output files (not updated |
324 |
|
to contain new additional exchanged fields). |
325 |
|
o pkg/dic: |
326 |
|
- fix an other bug (also from 2014/08/30) in dic_atmos.F, in dic_int1=3 code. |
327 |
|
o pkg/thsice: |
328 |
|
- when coupled to ATM (useCoupler) with thSIce_skipThermo=T, skip reading |
329 |
|
and writing of thsice pickup files. |
330 |
|
o pkg/atm_compon_interf: |
331 |
|
- move all field individual export-call out of cpl_export_import_data.F |
332 |
|
into new S/R ATM_EXPORT_FIELDS |
333 |
|
o pkg/atm_compon_interf: |
334 |
|
- store state variables (for now, only thSIce fields) just before beeing |
335 |
|
exported (in cpl_export_import_data.F, like on ocean side) instead of from |
336 |
|
atm_store_my_data.F like all exported fluxes. |
337 |
|
- new version of pickup_cpl: write field names into meta file and read meta |
338 |
|
file to find field postion in pickup. Also only write/read fields meeded for |
339 |
|
restart (same logic as main pickup file ; also using pickupStrictlyMatch) |
340 |
|
o pkg/dic: |
341 |
|
- fix bug (added on 2014/08/30) in dic_atmos.F for the case dic_int1= 2 or 3. |
342 |
|
o pkg/seaice: add new parameter SEAICEpressReplFac to choose between |
343 |
|
pressure replacement method (=1., default) or original Hibler (1979) (=0.) |
344 |
|
value can be from domain [0,1] to average between the two methods |
345 |
|
o pkg/atm_phys: |
346 |
|
- allow to provide 2-d map of albedo and mixed-layer depth from files (but |
347 |
|
hold fixed in time). |
348 |
|
|
349 |
|
checkpoint65r (2015/12/21) |
350 |
|
o pkg/seaice: |
351 |
|
fix bug in tridiagonal solvers for SEAICE_OLx/y>0, this affects the JFNK |
352 |
|
solver (offline.dyn_jfnk) and global_ocean.cs32x15.seaice -> updated |
353 |
|
o pkg/seaice: |
354 |
|
- fix a bug in computing areaS in (J-J -> J-1) that affects runs |
355 |
|
when SEAICEscaleSurfStress=.TRUE., |
356 |
|
- apply areaW and areaS in S/R seaice_calc_lhs |
357 |
|
o pkg/atm_phys: |
358 |
|
- add diagnostics for 3-D, Nr+1 levels diagnostics of radiative fluxes |
359 |
|
(shortwave & longwave, net & downward) and diagnostics of temp. tendency |
360 |
|
for individual contribution (convection, LSC cond, radiation) |
361 |
|
- add Ruth Geen etal, GRL 2016, radiation options (see paper supp. |
362 |
|
information); activated with: solar_exponent=0. and wv_exponent=-1. |
363 |
|
o pkg/ggl90: |
364 |
|
- within IDEMIX add upper limit for horizontal group velocity to |
365 |
|
avoid instability problems in the explicit horizontal diffusion term for |
366 |
|
long time steps or high resolution |
367 |
|
o pkg/diagnostics: |
368 |
|
- simplify setting of local-array size in diagstats_output.F: uses "numLevels" |
369 |
|
(from DIAGNOSTICS_SIZE.h) to allow to write out more than Nr levels. |
370 |
|
o testreport: |
371 |
|
- remove "-v" (verbose option) in default mpirun command. |
372 |
|
o pkg/seaice/seaice_growth: |
373 |
|
- catch potential division by zero in ITD code, does not change |
374 |
|
verification results |
375 |
|
o pkg/ecco: |
376 |
|
- retire old codes to the Attic. The calls to retired functions are |
377 |
|
left in a commented form in case they ever need to be re-activated. |
378 |
|
- ecco_check.F: issue warning if any old CPP option is |
379 |
|
defined that corresponds to retired codes -- then stop. |
380 |
|
o pkg/atm_compon_interf: |
381 |
|
- change seaice fraction (use for OCN dic surf.flux) stored and sent to |
382 |
|
coupler: use last time-step value instead of average over cplSendFrq_iter |
383 |
|
time-step, similar to what is done for seaIceMass. |
384 |
|
This will affect results (pkg/dic) of coupled ATM-OCN+dic set-up. |
385 |
|
o eesupp & genmake2: |
386 |
|
- from Jinxuan Zhu: change etime fct call to S/R call (fix gfortran ETIME); |
387 |
|
<= remove until a fix is found for some ifort version on ia32 machine. |
388 |
|
o pkg/seaice/seaice_evp: |
389 |
|
- refine residual computation |
390 |
|
|
391 |
|
checkpoint65q (2015/11/18) |
392 |
|
o pkg/seaice/seaice_evp: |
393 |
|
- fix residual computations so that they no longer affect the actual |
394 |
|
simulation code |
395 |
|
- fix seaice_readparams to be able to actually set new parameters |
396 |
|
SEAICEaEVPcStar and SEAICEaEVPalphaMin, also fix logic a little |
397 |
|
o model/src: |
398 |
|
- fix wrong truncation (single prec) from "FLOAT" function in expressions |
399 |
|
like: deltaT*FLOAT(myIter) when myIter is large: |
400 |
|
a) replaced by DFLOAT (if not seen by TAF); |
401 |
|
b) remove "FLOAT" and use implicit type conversion (if seen by TAF). |
402 |
|
o pkg/aim_v23: |
403 |
|
- write/read the expected CO2 pickups (from S/R AIM_DO_CO2): fix reading |
404 |
|
when pickupSuff is set ; do write rolling pickups + at the end of the run. |
405 |
|
o pkg/atm_ocn_coupler + ocn_compon_interf: |
406 |
|
- in prep for using pkg/seaice Dyn in coupled set-up, implement sequential |
407 |
|
coupling option-1: ATM -(cpl)-> OCN and then OCN -(cpl)-> ATM ; |
408 |
|
add corresponding call in DO_OCEANIC_PHYS. |
409 |
|
o coupler pkgs: |
410 |
|
Start a new way to set-up optionally-exchanged variables (previously, only |
411 |
|
there for exchange_DIC): switch on/off from 1 place, at run-time, in coupler |
412 |
|
data.cpl (new) instead of at compile time in ATMIDS.h & OCNIDS.h ; |
413 |
|
send switch to ATM & OCN compon before reading their own "data.cpl" (so that |
414 |
|
compononent param default can be set accordingly). |
415 |
|
Note: this new switch (cpl_exchange_[xxx]) is not a per variable switch |
416 |
|
but rather applies to a group a fields (going both ways like for DIC) |
417 |
|
and corresponds to an option of coupling config. |
418 |
|
coupler (pkg/atm_ocn_coupler): |
419 |
|
- change parameter file from "data" to "data.cpl" (in cpl_read_params.F), |
420 |
|
and read namelist directly (without eessup S/R calls) instead of |
421 |
|
in the very un-flexible old way, 1 param per line, in fixed order; |
422 |
|
- add error-counter to track errors (e.g., missing "data.cpl") and to stop |
423 |
|
cleanly in CPL_CHECK_CPLCONFIG |
424 |
|
- add new coupling-exchange selectors (some not yet active) including |
425 |
|
cpl_exchange_DIC (to set to 3 to replace atmCpl_exchange_DIC=T in ATMIDS.h |
426 |
|
and ocnCpl_exchange_DIC=T in OCNIDS.h); |
427 |
|
- add 2 new S/R (CPL_SEND_ATM/OCN_CPLPARMS) to send coupler-params to each |
428 |
|
component ; called directly from coupler.F, after comp. registrations; |
429 |
|
- rename few variable-ID names (in ATMIDS.h & OCNIDS.h): |
430 |
|
atm/ocnSeaIceName --> atm/ocnSIceMassName ; atm/ocnFCO2Name -> |
431 |
|
-> atm/ocnCO2FluxName ; atm/ocnWSpdName --> atm/ocnWindSpdName |
432 |
|
components (pkg/atm_ & ocn_compon_interf): |
433 |
|
- add ATM/OCN_CPL_OPTIONS.h in component pkgs and include the corresponding |
434 |
|
CPP header file in all pkg source files. |
435 |
|
- move checking of comp. configs out of cpl_exch_configs.F into new S/R |
436 |
|
ATM/OCN_CHECK_CPLCONFIG; |
437 |
|
- add error-counter to track errors (e.g., in "data.cpl") and to stop |
438 |
|
cleanly in ATM/OCN_CHECK_CPLCONFIG; |
439 |
|
- add new S/R CPL_IMPORT_CPLPARMS to import coupling-exchange selectors |
440 |
|
from coupler ; called from initialise_fixed.F, after PACKAGES_BOOT and |
441 |
|
before PACKAGES_READPARMS; |
442 |
|
verification/cpl_aim+ocn/: |
443 |
|
- update ATMIDS.h & OCNIDS.h (in shared_code) and use new parameter file |
444 |
|
"data.cpl" for coupler (in input_cpl). |
445 |
|
o eesupp/inc: |
446 |
|
- change the MPI-global-sum default (in CPP_EEOPTIONS.h) to: |
447 |
|
#define GLOBAL_SUM_ORDER_TILES (only affects MPI built of global_sum_tile.F) |
448 |
|
to always cumulate tile local-sum in the same order (still uses |
449 |
|
MPI_Allreduce like standard code). |
450 |
|
- in verification experiment code, remove local CPP_EEOPTIONS.h_mpi files |
451 |
|
that are now identical to standard version (in eesupp/inc). |
452 |
|
o pkg/shelfice: |
453 |
|
- add SHELFICETransCoeffTFile for initializing spatially varying |
454 |
|
heat and salt transfer coefficients |
455 |
|
o pkg/atm_compon_interf & ocn_compon_interf: |
456 |
|
- combine into 1 (new) S/R CPL_EXPORT_IMPORT_DATA the two previous |
457 |
|
S/R CPL_EXPORT_MY_DATA & CPL_IMPORT_EXTERNAL_DATA |
458 |
|
- move bi,bj loops inside S/R OCN_STORE_MY_DATA |
459 |
|
o pkg/atm_ocn_coupler: |
460 |
|
- initialise to zero ATMVARS.h & OCNVARS.h arrays. |
461 |
|
o pkg/rbcs: |
462 |
|
- select RBCS-mask for Temp & Salt the same way as for pTracer ; this allows |
463 |
|
to compile with maskLEN=1 when all tracers use the same RBCS-mask. |
464 |
|
- add a short report (to STDOUT) about RBCS-mask settings. |
465 |
|
|
466 |
|
checkpoint65p (2015/10/23) |
467 |
|
o pkg/seaice/seaice_evp.F: fix store directives and key computations, since |
468 |
|
there is no adjoint test for EVP, we don't know what it does to the adjoint |
469 |
|
solution, but at least there are no more recomputation warnings left |
470 |
|
o pkg/seaice/seaice_evp.F: slight modification of averaging so that EVP stands |
471 |
|
a chance of giving the same results as a fully converged VP (JFNK) solver |
472 |
|
o tools/adjoint_options/adjoint_diva: |
473 |
|
- fix bug (typo) in Tang-Linear FLAGS setting for MPI + DIVA |
474 |
|
o pkg/streamice: |
475 |
|
- spotted bug in streamice_driving_stress using dyG where should have been dxG |
476 |
|
o pkg/exf: |
477 |
|
- remove STOP statement that prevented to use wind or (wind-)stress |
478 |
|
interpolation for constant-in-time forcing fields (wind/stress period = 0). |
479 |
|
o pkg/seaice: |
480 |
|
- replace SEAICE_EVP_USE_ADAPTATION by run time parameters, requires |
481 |
|
5 additionals 2D fields and 6 new store directives |
482 |
|
- change logic in seaice_readparms.F: EVP code can now be turned on in |
483 |
|
various ways, setting SEAICE_deltaTev is no longer required, |
484 |
|
alternatively set SEAICE_evpAlpha/Beta, SEAICEuseEVPstar, SEAICEuseEVPrev, |
485 |
|
or SEAICEaEVPcoeff |
486 |
|
o pkg/shelfice/shelfice_thermodynamics.F |
487 |
|
- redefining uLoc/vLoc to u/v, instead of 2u/v |
488 |
|
o pkg/seaice/seaice_evp.F: introduce "adaptive EVP" by Madlen Kimmritz |
489 |
|
- this is an intermediate state of a truely converging EVP that has |
490 |
|
the potential of outperforming implicit VP methods, I do not recommend |
491 |
|
using it yet. |
492 |
|
- for now, "adaptive EVP" is turned on by setting SEAICE_EVP_USE_ADAPTATION |
493 |
|
and all parameters are hardwired |
494 |
|
- for convergence it still requires very smooth regularisations, that means, |
495 |
|
if SEAICE_DELTA_SMOOTHREG is defined, deltaCreg=deltaC+deltaMin, which is |
496 |
|
different from the VP case with deltaCreg=sqrt(deltaC**2+deltaMin**2); also |
497 |
|
specific averaging appears to be required, still subject to tuning |
498 |
|
- still needs cleaning and I need to turn parameter into runtime parameters |
499 |
|
- add code to compute and print residuals of iteration, compile with |
500 |
|
defining ALLOW_SEAICE_EVP_RESIDUAL to enable it |
501 |
|
o pkg/seaice/seaice_evp.F: fix a bug (factor of four in front of e12Csq) |
502 |
|
that entered with r1.54 on Sep04, 2015, -> update results |
503 |
|
|
504 |
|
checkpoint65o (2015/09/14) |
505 |
|
o pkg/mom_vecinv & mom_common: |
506 |
|
- add deep-atmosphere geometry factor in mom_calc_visc.F + in routines |
507 |
|
called from there. |
508 |
|
- add anelastic and deep-atmosphere geometry factor in pkg/mom_vecinv ; this |
509 |
|
allows to use Vector-Invariant form in deep atmos and anelastic formulation |
510 |
|
o pkg/seaice: introduce fast ice parameterisation following Itkin et al. (2015) |
511 |
|
and Koenig-Beatty+Holland (2012) |
512 |
|
- two new parameters SEAICE_tensilFac and SEAICE_tensilDepth |
513 |
|
- global 2D field tensileStrength, computed in seaice_calc_ice_strength |
514 |
|
- requires an extra input argument for S/R seaice_calc_viscosities |
515 |
|
- tensileStrength's depth dependence is different from Itkin et al. (2015) |
516 |
|
(to be changed and played with, for now exponential) |
517 |
|
o pkg/seaice: introduce new parameter SEAICEscaleSurfStress (default = .FALSE.) |
518 |
|
- if TRUE scale ice-ocean and ice-atmosphere stress acting on sea ice |
519 |
|
by AREA according to Connelly et al. (2004), JPO. |
520 |
|
- For EVP and the LSR solver, the implicit part of the drag term is |
521 |
|
the only non-zero term in the denominator when there is no ice (which |
522 |
|
prevented running the model with zero ice-ocean drag). If |
523 |
|
SEAICEscaleSurfStress = .TRUE., this results in a division by zero |
524 |
|
(or zero main diagonals BU/BV) which need to be caught. A practical |
525 |
|
consequence is that for open water, the momentum equation reduce |
526 |
|
to trivially 0 = 0 + 0 (for EVP). For LSR, BU/BV are reset to 1, if |
527 |
|
they happen to be zero, often leading to a non-zero solution over |
528 |
|
open water. |
529 |
|
o pkg/seaice: revise EVP code (seaice_evp.F) in preparation for a more |
530 |
|
efficient EVP method. |
531 |
|
- introduce area-weighted averages for e12 (analogously to |
532 |
|
seaice_calc_viscosities.F); this totally changes lab_sea.hb87 (2 digits |
533 |
|
remain, but also changing the order of terms in the previous average |
534 |
|
changed the results as much) -> update experiment |
535 |
|
- add SEAICE_DELTA_SMOOTHREG code |
536 |
|
- disentangle computation of zetaC/deltaC and zetaZ/deltaZ, also for |
537 |
|
TEM-code |
538 |
|
- adjust loop bounds so that only required fields are computed |
539 |
|
- add new averaging code for zetaZ/deltaZ (again similar to |
540 |
|
seaice_calc_viscosities.F), inactive by default for now (will change |
541 |
|
results again), but will replace old code eventually |
542 |
|
o eesupp/src: |
543 |
|
- add an other alternative for multi-proc GLOBAL_SUM (in global_sum_tile.F) |
544 |
|
to always cumulate tile local-sum in the same order |
545 |
|
(option #define GLOBAL_SUM_ORDER_TILES in CPP_EEOPTIONS.h). |
546 |
|
Still uses MPI_Allreduce (like standard code) but on array of tiles |
547 |
|
and should be faster than GLOBAL_SUM_SEND_RECV code. |
548 |
|
- switch almost all verification experiments that use GLOBAL_SUM_SEND_RECV |
549 |
|
(defined in CPP_EEOPTIONS.h_mpi) to GLOBAL_SUM_ORDER_TILES instead. |
550 |
|
- add CPP_EEOPTIONS.h_mpi with GLOBAL_SUM_ORDER_TILES defined in 14 more exp.: |
551 |
|
aim.5l_cs, cheapAML_box, deep_anelastic, dome, fizhi-cs-32x32x40, |
552 |
|
fizhi-cs-aqualev20, fizhi-gridalt-hs, global_ocean_ebm, matrix_example, |
553 |
|
natl_box, solid-body.cs-32x32x1, tutorial_advection_in_gyre, |
554 |
|
tutorial_baroclinic_gyre and tutorial_held_suarez_cs. |
555 |
|
|
556 |
|
checkpoint65n (2015/07/29) |
557 |
|
o pkg/thsice: |
558 |
|
- add a warning when used with pkg/aim but without updating SST |
559 |
|
(stepFwd_oceMxL=F & useCoupler=F & tauRelax_MxL<>-1 ). |
560 |
|
o pkg/offline: |
561 |
|
- change where Offline-Fields are loaded, from load_fields_driver.F to |
562 |
|
directly within FORWARD_STEP, just after updating iter number and time; |
563 |
|
- move setting of GM and KPP diffusivity out of OFFLINE_FIELDS_LOAD into new |
564 |
|
S/R OFFLINE_GET_DIFFUS that is called towards the end of DO_OCEANIC_PHYS; |
565 |
|
These changes allow: |
566 |
|
a) to recover exactly on-line results using deltaToffline=deltaTClock, |
567 |
|
tested (using offlineIter0= nIter0 -1 and offlineTimeOffset= -deltaT/2) |
568 |
|
both with Lin & Non-Lin Free-Surf, both with staggerTimeStep & synchronous |
569 |
|
time-step, both with GM & KPP files and with recomputing these fields; |
570 |
|
b) no needs to switch on staggerTimeStep anymore; |
571 |
|
c) simplify rescaling of offline horiz. velocity with Non-Lin Free-Surf. |
572 |
|
- update output of experiment tutorial_dic_adjoffline (only 3 digits left). |
573 |
|
o pkg/offline: |
574 |
|
- change (rarely used) offset-iteration parameter to an offset time (in s): |
575 |
|
can easily recover previous offset-iter effect by setting offset-time |
576 |
|
(offlineTimeOffset) to offset-iter x deltaToffline; |
577 |
|
- do not turn-off Temp & Salinity surface relaxation when using KPP (used |
578 |
|
in KPP as part of surface buoyancy forcing) in offline run. |
579 |
|
- fix ptracers KPP non-local term in the case where KPP is re-computed. |
580 |
|
o OpenAD |
581 |
|
- Adding preliminary ggl90 test to OpenAD verification. |
582 |
|
Config. with ggl90 currently diverges after 64 time steps |
583 |
|
so will need more work to become more stable |
584 |
|
- Adding preliminary kpp test to OpenAD verification. |
585 |
|
required small tweakes in kpp_routines.F |
586 |
|
- Merge and update from Krishna Narayanan's contrib area: |
587 |
|
* Add one variable for preliminary OpenAD DIVA |
588 |
|
* Add replacement time-stepping for OpenAD DIVA |
589 |
|
* genmake2 flag -diva (but only for OpenAD; preliminary) |
590 |
|
* required modifs for OAD_support |
591 |
|
successful preliminary test for tutorial_global_oce_biogeo/ |
592 |
|
o pkg/seaice: |
593 |
|
- initialise deltaC in seaice_lsr, cosmetic changes in seaice_lsr |
594 |
|
- add cpp-flag SEAICE_DELTA_SMOOTHREG for option of regularising |
595 |
|
delta with a smooth function in s/r seaice_calc_viscosity |
596 |
|
(no effect on EVP) |
597 |
|
- rename local suffix "sqr" into "sq" for more consistent variable names |
598 |
|
o pkg/seaice: |
599 |
|
add new parameter SEAICE_deltaMin that is used ***only*** |
600 |
|
for regularizing Delta (and nothing else, like the parameter |
601 |
|
which is also used for all sorts of things SEAICE_EPS). |
602 |
|
Defaults to SEAICE_EPS for backward compatibility only. |
603 |
|
o pkg/seaice: replace erroneously storing e12Csqr on the wrong tape with |
604 |
|
the wrong key by inialising it before use -> fixes a recomputation |
605 |
|
problem but does not fix the gradient |
606 |
|
o pkg/layers: |
607 |
|
- move resetting of flux arrays to outside the iLa loop |
608 |
|
(this caused layers_diapycnal to not work with more than one layer coord.) |
609 |
|
- fix bug in calculation of layers_recip_delta in layers_init_fixed.F |
610 |
|
o pkg/layers: |
611 |
|
- remove from common block 3D layers fields (used to diagnose transport |
612 |
|
in tracer coords) and declare them as local arrays in layers_calc.F |
613 |
|
o pkg/seaice: |
614 |
|
- Rename SEAICE_VECTORIZE_LSR_ZEBRA to SEAICE_LSR_ZEBRA and define it |
615 |
|
in lab_sea forward experiment (changes results -> updated) |
616 |
|
- update adjoint experiment lab_sea after cleaning up seaice_lsr_tridiagu/v |
617 |
|
o pkg/seaice: modify seaice_lsr.F in order to improve the gradient |
618 |
|
computations; for SEAICE_VECTORIZE_LSR |
619 |
|
- move the loops over which the tridiagonal solvers (seaice_lsr_tridiagu/v) |
620 |
|
sweep to the outside, |
621 |
|
- remove store directives and add "CADJ loop sequential" directives |
622 |
|
in analogy to model/src/solve_tridiagonal.F |
623 |
|
- replace many "#ifdef SEAICE_VECTORIZE_LSR_ZEBRA" by variable loop |
624 |
|
boundaries to yield more readable code. This has also the charming side |
625 |
|
effect that your can use SEAICE_VECTORIZE_LSR_ZEBRA without |
626 |
|
SEAICE_VECTORIZE_LSR (i.e. adjoint without recomputations in |
627 |
|
seaice_lsr_tridiagu/v now requires either of these flags, vectorization |
628 |
|
still requires SEAICE_VECTORIZE_LSR with SEAICE_VECTORIZE_LSR_ZEBRA as |
629 |
|
an additional option) |
630 |
|
The tridiagonal solvers are now completely analoguous to solve_tridiagonal.F |
631 |
|
but the adjoint gradients (which are affected by this change) still explode. |
632 |
|
o coupler (atm & ocn _compon_interf): |
633 |
|
- avoid using Exch2 IO mapping if not suitable. |
634 |
|
|
635 |
|
checkpoint65m (2015/06/15) |
636 |
|
o pkg/layers: |
637 |
|
- clean-up old parameters setting (from Sep 2012): |
638 |
|
+ remove old parameters setting from common block (declared locally); |
639 |
|
+ stop if any old parameter is mixed with new parameters; |
640 |
|
+ check for valid or consistent parameter setting (e.g., layers_name) |
641 |
|
- check that layers_bounds for Pot.Density are in the right range; |
642 |
|
this is supposed to catch un-updated setting after recently shifting |
643 |
|
potential density field "prho" by -1000 (now in "sigma" scale). |
644 |
|
o pkg/layers: |
645 |
|
- Added missing call to layers_fill for keeping track of tottend in |
646 |
|
pkg/diagnostics/diagnostics_fill_state.F |
647 |
|
o pkg/layers: |
648 |
|
- added CPP flux LAYERS_FINEGRID_DIAPYCNAL to disable fine-grid binning |
649 |
|
of diapycnal fluxes |
650 |
|
o pkg/layers: |
651 |
|
- reverted changes to interpolation to previous treatment; there |
652 |
|
was never actually a problem |
653 |
|
o pkg/layers: |
654 |
|
- fix interpolation of layers tracers in the presence of partial cells |
655 |
|
- add lots of new functionality to compute water mass transformation |
656 |
|
(enabled by CPP flag LAYERS_THERMODYNAMICS) |
657 |
|
- add new calls from main code (diags_oceanic_surf_flux.F, |
658 |
|
thermodynamics.F, impldiff.F) and gad to save the necessary fields |
659 |
|
for layers_thermodynamics calculations |
660 |
|
o pkg/ptracers: |
661 |
|
- add capability of stepping a passive tracer forward without advection |
662 |
|
by setting PTRACERS_advScheme to 0. |
663 |
|
o pkg/diagnostics: |
664 |
|
- add few (threads) _BARRIER around any update of "diag_pkgStatus". |
665 |
|
o pkg/layers: |
666 |
|
- shift potential density field "prho" by -1000 for density layer averaging so |
667 |
|
that it corresponds to usual "sigma" definition (i.e., rho(p=const)-1000); |
668 |
|
Note that density bin boundaries (layers_bounds in data.layers) have |
669 |
|
to be set accordingly (i.e., shifted, in sigma scale). |
670 |
|
o pkg/layers: |
671 |
|
- fix snap-shot output of layer thickness @ V.pt and output of pot.density |
672 |
|
- fix calculation of layer non-weighted velocity and layer probability |
673 |
|
- add diagnostics for pot.density used for layer averaging |
674 |
|
o pkg/seaice: |
675 |
|
- seaice_calc_viscosity.F: change computation of deltaC**2 to ensure |
676 |
|
positiveness, modify a few comments and improve variable names, |
677 |
|
- the changed computation of deltaC affects most seaice-related |
678 |
|
experiments at the truncation level. |
679 |
|
seaice_itd.thermo is affected by far the most, with |
680 |
|
only 7 digits of agreement remaining; update experiments. |
681 |
|
|
682 |
|
checkpoint65l (2015/05/04) |
683 |
|
o pkg/shelfice: |
684 |
|
- in shelfice_thermodynamics.F, if SHELFICEBoundaryLayer=.true., then set |
685 |
|
factor drKp1 to zero where it is negative (ie. do not use |
686 |
|
SHELFICEBoundaryLayer if hFacC>1) |
687 |
|
- the same for factor drLoc in shelfice_forcing.F |
688 |
|
o tools/genmake2: move FEXTRAFLAGS from FFLAGS to FOPTIM to avoid a problem |
689 |
|
with modules in ptracers, when using testreport option "-small_f" |
690 |
|
o pkg/seaice/seaice_growth.F (in case of SEAICE_ITD) |
691 |
|
- replace tmpscal1**1.36 by faster exp(1.36*log(tmpscal1)) |
692 |
|
o verification/testreport |
693 |
|
- add new option -small_f |
694 |
|
with this option testreport first makes the target small_f (*.f files) |
695 |
|
before running make (all). This is useful for explicit inlining when |
696 |
|
all sources need to be full available. |
697 |
|
o pkg/exf/exf_interp.F: |
698 |
|
remove previous changes related to reverse (decreasing) input grids latitude |
699 |
|
|
700 |
|
checkpoint65k (2015/04/01) |
701 |
|
o pkg/ecco: |
702 |
|
fix missing cosphi initialization; use eccoiter in place of optimcycle; |
703 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
704 |
|
instead of active read/write |
705 |
|
o pkg/ctrl: |
706 |
|
if autodiff is not compiled then use READ_REC_XY_RL/READ_REC_XYZ_RL |
707 |
|
instead of active read/write. |
708 |
|
o pkg/autodiff: make autodiff_readparms.F and autodiff_whtapeio_sync.F |
709 |
|
return if .NOT.useAUTODIFF |
710 |
|
o pkg/seaice: add CPP brackets (cost function related). |
711 |
|
o model/src: |
712 |
|
add useAUTODIFF run time switch. |
713 |
|
o pkg/exf/exf_interp.F: |
714 |
|
add code to allow input grids with latitude starting in the north (i.e. when |
715 |
|
j=1 corresponds to northern edge of field); modify global_with_exf to test |
716 |
|
this feature. |
717 |
|
o verification/testreport: |
718 |
|
- replace "grep -A3" with POSIX conformal sed command, because there are |
719 |
|
implementations of grep that cannot do contextual searches |
720 |
|
- replace "cat -n" by "nl" (two occurrences), because not all implementations |
721 |
|
of "cat" have the option "-n" |
722 |
|
o model/src: |
723 |
|
add new file gsw_teos10.F that contains 3 functions, more or less a copy |
724 |
|
of the gsw_toolbox.f90 of the TEOS-10 fortran interface, that are used to |
725 |
|
convert from conservative to potential temperature. For now they are not |
726 |
|
called anywhere. |
727 |
|
o pkg/ggl90: make "useIDEMIX" useful |
728 |
|
- re-organize code in s/r ggl90_calc a little to move computations that |
729 |
|
are different for idemix into separate loops (changes verification |
730 |
|
experiment idemix at truncation level, 12 digits remain -> updated) |
731 |
|
- requires 2 new 2D fields KappaM, verticalShear |
732 |
|
- make hFacI and recip_hFacI local 3D variables that are passed to |
733 |
|
s/r ggl90_idemix |
734 |
|
- fix and improve some comments |
735 |
|
|
736 |
|
checkpoint65j (2015/02/25) |
737 |
|
o pkg/openad |
738 |
|
- synchronize seawater.F with version in model/src: replace routine |
739 |
|
body of sw_temp by calling sw_ptmp and fix/add a few comments. |
740 |
|
o pkg/mnc: |
741 |
|
- change default value of pickup_read/write_mnc params to FALSE |
742 |
|
(since few features are missing in reading MNC pickup files). |
743 |
|
o model/src: |
744 |
|
- change default (background) vertical diffusivity for salt to be the |
745 |
|
temperature (background) vertical diffusivity. |
746 |
|
- change background vertical diffusivity in vertical mixing pkgs ggl90, |
747 |
|
kl10, my82 and pp81 from temperature diffusivity to salinity diffusivity. |
748 |
|
This makes ptracers default diffusivity (that uses salt diffKr) more |
749 |
|
consistent with vertical mixing schemes. |
750 |
|
o verification/testreport: |
751 |
|
- fix typo in "-pcls" option ; |
752 |
|
- put temp files in /tmp (instead of in local dir) |
753 |
|
- add option "-ncad" to use genmake2 new option "-nocat4ad" |
754 |
|
- allow to use "-j" option (for multi-procs make) for AD, OAD and TLM. |
755 |
|
o pkg/ggl90 (idemix code): |
756 |
|
- apply few fixes ; add some missing "_d 0" ; update output of exp. |
757 |
|
global_ocean.90x40x15.idemix |
758 |
|
o OpenAD |
759 |
|
- enable active file I/O and begin removal of work-around code |
760 |
|
for OpenAD for handling control variables (memory vs. active files) |
761 |
|
- new CPP options file OPENAD_OPTIONS.h |
762 |
|
- revert to genarr2d gradient check for hs94.1x64x5 |
763 |
|
- (genarr3d tested by tutorial_global_oce_biogeo, tutorial_tracer_adjsens) |
764 |
|
- gentim2d works for halfpipe_streamice but not yet hs94.1x64x5 |
765 |
|
o tools/genmake2: |
766 |
|
- add option for an alternative Makefile (from Martin) where multiple |
767 |
|
source files are sent to TAF (instead of all in one file). |
768 |
|
o pkg/ggl90: add IDEMIX (Olbers and Eden, 2013) |
769 |
|
- code provided by Carsten Eden as an extension of ggl90 |
770 |
|
- so far the code is turned on within ggl90 by setting a CPP-flag at |
771 |
|
compile time; a runtime flag implementation is not yet complete |
772 |
|
- tested in new verification experiment global_ocean.90x40x15.idemix |
773 |
|
o verification: |
774 |
|
- reduce length of the AD test run by half for experiments |
775 |
|
global_ocean.cs32x15 (std + thsice) and isomip |
776 |
|
- enable active file I/O for OpenAD, adjust verifications accordingly |
777 |
|
- halfpipe_streamice: change gradient check from genarr2d to gentim2d |
778 |
|
o verification/testreport: |
779 |
|
- fix two non-POSIX sed statements so that there are no error messages |
780 |
|
on Mac OS X |
781 |
|
- replace hostname -s with hostname | sed 's/\..*$//' |
782 |
|
o model/src/seawater.F: |
783 |
|
- simplify SW_TEMP to just calling SW_PTMP with P and PR exchanged |
784 |
|
(following the matlab code), which would have avoided the bug caught |
785 |
|
by Matt (see below) in the first place |
786 |
|
o pkg/shelfice: |
787 |
|
- implement alternative discretisation of quadratic drag (selectBotDragQuadr) |
788 |
|
and true distance in no-slip BC (bottomVisc_pCell) similar to bottom-drag. |
789 |
|
- fix sign of friction tendency (no-slip BC) and fix u,v drag for thin |
790 |
|
ice-shelf case (i.e., within surface level). |
791 |
|
- add config summary in shelfice_check.F |
792 |
|
- remove global variable recip_SHELFICElatentHeat and replace by a local |
793 |
|
variable recip_latentHeat |
794 |
|
- introduce diagnostics for friction velocity uStar (in case of |
795 |
|
SHELFICEuseGammaFrict) |
796 |
|
- change verification experiment isomip.htd: |
797 |
|
+ start from pickup (as input_ad at nIter0=8640) |
798 |
|
+ start from SHELFICEmassFile instead of SHELFICEloadAnomaly file |
799 |
|
+ test SHELFICEuseGammaFrict = .TRUE. |
800 |
|
+ test SHELFICEadvDiffHeatFlux = .TRUE. |
801 |
|
o model/src: |
802 |
|
- fix bug (Thanks to Matt) in function SW_TEMP (to convert Pot.Temp to |
803 |
|
in-situ Temp) and in routine SW_TEMP (in pkg/openad); |
804 |
|
update output of experiments global_with_exf.yearly and isomip (all 6). |
805 |
|
o pkg/shelfice: |
806 |
|
- change setting of kTopC to also be zero where there is no ice-shelf. |
807 |
|
- zero out surface forcing arrays (for now, for T & S + EmPmR) where |
808 |
|
ice-shelf is. |
809 |
|
- first attempt to get RealFreshWaterFlux effects: for now, only without |
810 |
|
SHELFICEboundaryLayer ; not consistent if using synchronous time-stepping. |
811 |
|
o pkg/seaice: add the option to prescribe a fixed thickness PDF |
812 |
|
for thermodynamic calculations |
813 |
|
- because of divisions of the type 7/7 not exactly equal to 1, this change |
814 |
|
affects results of some verification experiments by up to 4 digits: |
815 |
|
global_ocean.cs32x15.seaice, lab_sea, lab_sea.fd, lab_sea.salt_plume, |
816 |
|
seaice_obcs, seaice_obcs.seaiceSponge, seaice_obcs.tides |
817 |
|
adjoint: lab_sea, lab_sea.noseaicedyn |
818 |
|
-> updated |
819 |
|
|
820 |
|
checkpoint65i (2015/01/23) |
821 |
|
o model/src: |
822 |
|
- change units of frictionHeating field from W to W/m^2 |
823 |
|
- fix bug in frictional heating from stratospheric drag in |
824 |
|
S/R ATM_PHYS_TENDENCY_APPLY_V |
825 |
|
- with synchronous time-stepping: move resetting to zero of frictionHeating |
826 |
|
field from load_fields_driver.F to thermodynamics.F ; |
827 |
|
- add diagnostics for frictional heating. |
828 |
|
o model/src & gmredi K3D: |
829 |
|
- add frictionHeating field to pickup-files (for synchronous time-stepping) |
830 |
|
- move ALLOW_EDDYPSI block out of DYNVARS.h and merge it into FFIELDS.h |
831 |
|
- rename uMean,vMean --> uEulerMean,vEulerMean (+ change diagnostics name |
832 |
|
and name in pickup file). |
833 |
|
- fix arguments of few DIAGNOSTICS_FILL calls in gmredi_k3d.F |
834 |
|
o model/src: |
835 |
|
- move (from ini_forcing.F) initialisation of all arrays in header file |
836 |
|
FFIELDS.h into new S/R ini_ffields.F ; this fix broken restart |
837 |
|
(since Nov 2012) with option selectAddFluid=1. |
838 |
|
o pkg/shelfice: |
839 |
|
- change units (+ document) of newly added field "shelfIceMassDynTendency" |
840 |
|
- upgrade from _RS to _RL shelficeMass & shelficeLoadAnomaly arrays. |
841 |
|
o pkg/obcs: re-organize obcs_calc_stevens.F to prepare for passive tracers |
842 |
|
o pkg/seaice: two new runtime parameters: |
843 |
|
- SEAICE_cStar replaces the hard wired "20" in the strength formulation, |
844 |
|
long overdue |
845 |
|
- SEAICE_tensilFac: preparation for Koenig-Beatty+Holland (2012) |
846 |
|
parameterization of tensil stress for fast ice (does not do anything yet) |
847 |
|
o pkg/seaice/seaice_check.F: left over from restricted addtive Schwarz method |
848 |
|
for LSR: move checking overlaps out of JFNK-if-block |
849 |
|
o pkg/atm_phys: |
850 |
|
- move copy of grid and dynamical fields out of atm_phys_driver.F into |
851 |
|
new S/R ATM_PHYS_DYN2PHYS. |
852 |
|
- fix level height for Linear Free-Surf case (to be consistent with |
853 |
|
fixed-in-time pressure levels). |
854 |
|
o pkg/mom_common (bottomdrag): |
855 |
|
- average bottomDragFld (ALLOW_BOTTOMDRAG_CONTROL) from grid-cell center |
856 |
|
to correct location (U & V point) in S/R MOM_U/V_BOTTOMDRAG; |
857 |
|
update output (adm & tlm) of experiment global_ocean.90x40x15.bottomdrag. |
858 |
|
o pkg/shelfice (u/v_drag): |
859 |
|
- add one argument (the other velocity component) to S/R SHELFICE_U/V_DRAG; |
860 |
|
- use SHELFICEDragLinear & SHELFICEDragQuadratic in shelfice_v_drag.F |
861 |
|
(now similar to shelfice_u_drag.F) |
862 |
|
- remove condition on bottomDragTerms when calling SHELFICE_U/V_DRAG |
863 |
|
from mom_vecinv.F (similar to mom_fluxform calls). |
864 |
|
o pkg/mom_common (bottomdrag): |
865 |
|
- add one argument (the other velocity component) to S/R MOM_U/V_BOTTOMDRAG; |
866 |
|
- add options for alternative discretisation of velocity norm in quadratic |
867 |
|
bottom drag: averaging of grid-cell-center KE to U.point and V.point |
868 |
|
(selectBotDragQuadr=0, original code) can produce noisy patterns; this |
869 |
|
improves when averaging only the other component (e.g. vVel for U bottom |
870 |
|
drag) using wet-point method (selectBotDragQuadr=2) or not (=1). |
871 |
|
- add options (bottomVisc_pCell) to account for partial-cell in bottom |
872 |
|
friction (no-slip BC) thus getting the true distance from the bottom; |
873 |
|
off by default since this also reduces model stability (explicit bottom |
874 |
|
friction). Changes produce different machine truncation with linear-drag |
875 |
|
+ no-slip BC: update output of experiments exp4.stevens (10 digits) and |
876 |
|
front_relax (bvp & mxl, 10 & 11 digits). |
877 |
|
o model/src & mom pkgs: |
878 |
|
- add one more level to vertical viscosity local arrays (Nr+1, previously Nr) |
879 |
|
since no-slip bottom BC uses viscosity @ k+1 to update velocity @ level k |
880 |
|
- for now and until vertical mixing scheme are updated to fill up level Nr+1, |
881 |
|
just copy level Nr value to level Nr+1. |
882 |
|
o doc: |
883 |
|
- add notes form Abhisek Chakraborty on how to close Heat & Salt budgets. |
884 |
|
o pkg/shelfice: |
885 |
|
- shelfice_init_varia.F, shelfice_init_fixed.F, shelfice_readparms.F, |
886 |
|
SHELFICE.h: move array shelficemass to init_varia, initialise |
887 |
|
from array shelficemassinit, which is set in init_fixed and |
888 |
|
has option to be set from file; introduce array |
889 |
|
shelficeMassDynTend array, set thru file in init_fixed |
890 |
|
- NEW FILE: shelfice_step_icemass.F: update shelficemass from either |
891 |
|
shelfIceFreshWaterFlux and shelficeMassDynTend or H_streamice in |
892 |
|
pkg/streamice |
893 |
|
- shelfice_thermodynamics.F: call shelfice_step_icemass if |
894 |
|
SHELFICEMassStepping = .true. |
895 |
|
- shelfice_ad_diff.list: add new subroutine shelfice_step_icemass.f |
896 |
|
|
897 |
|
checkpoint65h (2014/12/17) |
898 |
|
o verification/global_ocean.90x40x15, global_ocean_ebm: |
899 |
|
- update to generic controls. |
900 |
|
o pkg/ctrl: |
901 |
|
- ctrl_map_ini_genarr.F: test for igen>0 |
902 |
|
- ctrl_init_variables.F: add call to CTRL_MAP_INI_GENTIM2D. |
903 |
|
- move gentim2d part of ctrl_map_ini_genarr.F to |
904 |
|
new separate routine : ctrl_map_ini_gentim2d.F |
905 |
|
- ctrl_cost_driver.F,ctrl_init.F ctrl_map_ini_genarr.F: |
906 |
|
add time variable weights and cyclic controls (time mean, |
907 |
|
seasonal cycle, etc) capabilities to gentim2d |
908 |
|
o pkg/ecco: |
909 |
|
- move reading of error, conversion to weights from |
910 |
|
ecco_cost_init_fixed.F to ecco_toolbox.F (ecco_readwei) |
911 |
|
o global_oce_llc90, cs32: |
912 |
|
- activte sbo. |
913 |
|
- CTRL_SIZE.h : add maxCtrlProc. |
914 |
|
- activate the new genctrl capabilities. |
915 |
|
- update following reorganization of global_oce_input_fields.tar.gz |
916 |
|
o pkg/ctrl/ctrl_ad_diff.list: |
917 |
|
- add missing ctrl_init_rec.f |
918 |
|
o tools/OAD_support/keepOriginal: |
919 |
|
- add ctrl_init_rec.F |
920 |
|
o model/src/the_main_loop.F, pkg/ctrl/ctrl_map_ini_genarr.F: |
921 |
|
- avoid recomputations of xx_gentim2d_dummy. |
922 |
|
o momentum diagnostics: |
923 |
|
- move filling of diagnostics Um_Diss & Vm_Diss from mom_fluxform.F and |
924 |
|
mom_vecinv.F to timestep.F (to include Smag-3D contribution). |
925 |
|
o pkg/seaice/seaice_lsr.F: |
926 |
|
- fix computation of BU/BV, make sure they are non-zero, only necessary |
927 |
|
for cubed sphere exchanges and SEAICE_OLx/y>0. |
928 |
|
This makes calling s/r fill_cs_corner_rl obsolete (removed). |
929 |
|
o verification/global_ocean.cs32x15/input.seaice |
930 |
|
- add test for strong implicit coupling and restricted addtive Schwarz |
931 |
|
methods for LSR |
932 |
|
- update results/output.seaice.txt |
933 |
|
o verification/tutorial_global_oce_biogeo: |
934 |
|
- AD & OAD set-up: switch off ALLOW_OLD_VIRTUALFLUX (like in fwd set-up) |
935 |
|
and set PTRACERS_EvPrRn(1,2) to zero (for DIC & ALK); |
936 |
|
update output_adm,_oadm,_tlm.txt |
937 |
|
o pkg/dic: |
938 |
|
- change default to "#undef ALLOW_OLD_VIRTUALFLUX" in DIC_OPTIONS.h |
939 |
|
- add a stop when ALLOW_OLD_VIRTUALFLUX is defined and PTRACERS_EvPrRn |
940 |
|
for tracer 1 & 2 is set (to avoid double counting of dilution effect). |
941 |
|
o verification/tutorial_global_oce_biogeo: |
942 |
|
- AD & OAD set-up: do not set PTRACERS_EvPrRn for tracer 1 & 2 since |
943 |
|
dilution is already added by pkg/dic ALLOW_OLD_VIRTUALFLUX ; |
944 |
|
update output_adm,_oadm,_tlm.txt |
945 |
|
o eesupp/src: |
946 |
|
- add fill_cs_corner_rl.F (_RL-copy of fill_cs_corner_rs.F) |
947 |
|
and call it in seaice_lsr when using nonzero SEAICE_OLx/y |
948 |
|
o pkg/seaice: introduce strongly implicit coupling, intended for stabilizing |
949 |
|
LSR (following Hutchings et al. 2004) |
950 |
|
- introduce zetaZ as a global variable (requires adjustments in |
951 |
|
seaice_evp.F and seaice_jfnk.F) and compute analoguously to etaZ |
952 |
|
in seaice_calc_viscosities.F |
953 |
|
- new flag SEAICEuseStrImpCpl (default off) |
954 |
|
- add new terms zetaZ*du/dy and zetaZ*dv/dx on both sides of the |
955 |
|
momentum equations |
956 |
|
- JFNK-solver (preconditioner) adjusted to allow using this method |
957 |
|
(where it does not have any positive effect) |
958 |
|
o pkg/seaice |
959 |
|
- add overlap for restrictive additive Schwartz method also to LSR, but |
960 |
|
turn it off by default (because it only seems to work for non-cubed |
961 |
|
sphere/llc topologies) |
962 |
|
o pkg/autodiff |
963 |
|
- add extra exchanges in addummy_in_steppging also for mnc output |
964 |
|
o pkg/seaice: |
965 |
|
- add extra exchanges before dumping adjoint fields in seaice_ad_dump.F |
966 |
|
to avoid stripes in the adjoint output (similar to addummy_in_stepping.F) |
967 |
|
o pkg/obcs: |
968 |
|
- add option to specify domain-connected piece Id along OB though files |
969 |
|
(for now, only used to diagnose PhiVel; default =1 -> global correction) |
970 |
|
- modify obcs_diag_balance.F to process each connected-part separately; |
971 |
|
exclude OB where Id = 0 but keep the full divergence there (-> constant |
972 |
|
Psi along this portion of OB and all inflow derived from grad(Phi)) |
973 |
|
- add example of OB-conect files in verification/so_box_biogeo/input. |
974 |
|
o pkg/diagnostics: |
975 |
|
- improve treatment of Open-Boundaries in Velocity-Potential calculation: |
976 |
|
a) use non zero matrix element across OB and solve for Phi 1 grid point |
977 |
|
outside OB (i.e, where tracer OBCS are applied). |
978 |
|
b) global imbalance of inFlow/outFlow across OB: instead of modifying |
979 |
|
velocity across OB, spread it uniformly along the OB in the RHS. |
980 |
|
|
981 |
|
checkpoint65g (2014/11/19) |
982 |
|
o pkg/diagnostcis: |
983 |
|
- add preconditioner off-diagonal factor (diagCG_pcOffDFac) as run-time param |
984 |
|
o pkg/my82,pp81,kl10: |
985 |
|
- fix ALLOW_3D_DIFFKR implementation (previously had no effect): use 3-D |
986 |
|
field diffKr as background diffusivity to set minimum diffusivity value. |
987 |
|
o pkg/seaice: |
988 |
|
- add new parameter SEAICEuseEVPrev (for revisited EVP by |
989 |
|
Bouillon et al 2013) |
990 |
|
- add SEAICE_evpAlpha/Beta to namelist |
991 |
|
- modify seaice_evp code to able to use SEAICEuseEVPrev. These changes |
992 |
|
involve trivial re-ordering of divisions/multiplications that should not |
993 |
|
have any effects, but ... they do change the results of lab_sea.hb87 so |
994 |
|
that only 2 digits of agreement remain, in line with the general |
995 |
|
instability/fragility of the evp-code. For now, I do not care and just |
996 |
|
update the verification experiment |
997 |
|
o pkg/ctrl : add generic pre-processing (xx_genarr2d_preproc etc) |
998 |
|
- remove xx_genarr2d_numsmooth etc |
999 |
|
- use xx_genarr2d_preproc etc instead |
1000 |
|
- carry out smooth_correl2D at initialization stage rather than during |
1001 |
|
time stepping. |
1002 |
|
- get smoothOpNb from xx_gentim2d_preproc |
1003 |
|
o global_oce_cs32 : |
1004 |
|
- add test of generic ecco capabilities. |
1005 |
|
o pkg/exf/exf_getsurfacefluxes.F : |
1006 |
|
- add to tmpUE/tmpVN rather than re-initializing them (conventional behavior). |
1007 |
|
o pkg/ctrl,ecco : |
1008 |
|
- omit un-necessary arguments to ctrl_cost_gen.F unless ECCO_CTRL_DEPRECATED |
1009 |
|
is defined. |
1010 |
|
o pkg/seaice: add diagnostics for Delta (deformation parameter) |
1011 |
|
o model/src: |
1012 |
|
- when ALLOW_3D_DIFFKR is defined, add a Warning if any of the vertical |
1013 |
|
diffusivity (background) is specified but ignored. |
1014 |
|
o verification: |
1015 |
|
- in testreport, convert hostname to lower case for default output dir name |
1016 |
|
o model, pkg : add useCTRL, useECCO parameters (on/off run time switch). |
1017 |
|
o pkg/dic: add modifications from Hajoon: |
1018 |
|
- add iron sedimentation flux function of the flux of PO4 out of bottom layer |
1019 |
|
- light attenuation: add self-shading effect by climatological Chlorophyll |
1020 |
|
(read from file). |
1021 |
|
o pkg/seaice/seaice_preconditioner.F : fix cpp flags, so that code also |
1022 |
|
compiles when SEAICE_ALLOW_DYNAMICS is undefined |
1023 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now use separate |
1024 |
|
AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h, ECCO_OPTIONS.h rather than |
1025 |
|
ECCO_CPPOPTIONS.h (i.e. replacing the deprecated, circumvoluted, |
1026 |
|
approach where CPP_OPTIONS.h includes an omnipotent |
1027 |
|
ECCO_CPPOPTIONS.h that superseeds pkgs '_OPTIONS.h'). |
1028 |
|
o pkg/ctrl/ctrl_map_ini_genarr.F : include GMREDI_OPTIONS.h where |
1029 |
|
ALLOW_3D_KAPGM, ALLOW_3D_KAPREDI (to be added later) belong. |
1030 |
|
o pkg/seaice/SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF |
1031 |
|
to avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included |
1032 |
|
(it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...) |
1033 |
|
o model/src, pkg/smooth, profiles, salt_plume, seaice, exf, ecco, ctrl : |
1034 |
|
add ECCO_OPTIONS.h, AUTODIFF_OPTIONS.h, CTRL_OPTIONS.h when needed |
1035 |
|
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h |
1036 |
|
- AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h |
1037 |
|
- CTRL_OPTIONS.h is needed when including ctrl.h, optim.h, etc |
1038 |
|
o pkg/ctrl,ecco,exf : |
1039 |
|
- remove variables associated with NON-generic costs, |
1040 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
1041 |
|
- remove NON-generic NON-obcs controls, |
1042 |
|
unless ECCO_CTRL_DEPRECATED is defined. |
1043 |
|
o pkg/ctrl : added ctrl_local_params.h |
1044 |
|
o pkg/ecco : added ecco_local_params.h |
1045 |
|
o verification : added ECCO_CTRL_DEPRECATED to most as and oad |
1046 |
|
experiments, which will progressively be removed once the |
1047 |
|
experiments are revised to use only generic controls/costs. |
1048 |
|
|
1049 |
|
checkpoint65f (2014/10/13) |
1050 |
|
o pkg/ctrl, ecco, seaice : minor changes in headers |
1051 |
|
o global_oce_llc90,cs32 : ecco_v4 verification exps now test generic |
1052 |
|
cost function and control capabilities added since checkpoint65c. |
1053 |
|
o pkg/ctrl: regroup all obcs ctrl variables in CTRL_OBCS.h. |
1054 |
|
o pkg/ecco: increase modularity and improve logic |
1055 |
|
- ecco_toolbox.F (new) : basic operations that are often used, |
1056 |
|
including ecco_zero, ecco_cp, ecco_cprsrl, ecco_diffmsk, |
1057 |
|
ecco_addcost, ecco_add, ecco_div, ecco_readbar. |
1058 |
|
- cost_gencal.F (new) : determine filnames and records. |
1059 |
|
- cost_genread.F, cost_generic.F : condense code using ecco_toolbox. |
1060 |
|
- cost_generic.F : use spzeroloc rather than hard-coded -9999, |
1061 |
|
and exploit the above functions leading to more compact code. |
1062 |
|
- cost_genread.F : rm un-necessary arguments, re-arrange args order. |
1063 |
|
- ecco_check.F, ecco_readparms.F : bring logic up to date (using_tpj, |
1064 |
|
using_ers, using_gfo, using_mdt is now only defined within gencost) |
1065 |
|
o pkg/ecco: extend generic cost capabilities |
1066 |
|
- pkg/ecco : added 3D gencost (ALLOW_GENCOST3D), added gencost |
1067 |
|
capabilities via gencost_preproc (+ _c,_i,_r related params), |
1068 |
|
gencost_posproc (+ _c,_i,_r related params), gencost_nrecperiod, |
1069 |
|
gencost_outputlevel arguments to cost_generic |
1070 |
|
- pkg/ecco/cost_genread.F (new) : interface between cost_generic |
1071 |
|
and active_read, making room for gencost_preproc to take effect. |
1072 |
|
Added preproc code ('climmon') to replace GENERIC_BAR_MONTH. |
1073 |
|
- pkg/ecco/cost_generic.F : |
1074 |
|
compute and store misfit maks*(model-data) in localdif that is |
1075 |
|
then used in cost and for output, output misfit if outlev.GT.0 |
1076 |
|
- pkg/ecco/cost_averagesfields.F : depend on gencost_barskip |
1077 |
|
rather gencost_barfile for deciding whether to write barfile |
1078 |
|
- pkg/ecco/ecco_cost_driver.F : extract call to cost_profiles from cost_hyd |
1079 |
|
- pkg/ecco/ecco_cost_init_fixed.F : extract gencost weights from |
1080 |
|
ecco_cost_weights, re-activate ecco_summary, determine gencost_barskip |
1081 |
|
- pkg/ecco/ecco_summary.F : report gencost variables |
1082 |
|
- pkg/ecco/cost_gencost_customize.F : treat case of scatterometer costs |
1083 |
|
o pkg/sea/SEAICE_OPTIONS.h : add ALLOW_COST_ICE, ALLOW_SEAICE_COST_SMR_AREA |
1084 |
|
o pkg/ecco: internal re-organization |
1085 |
|
- resolve un-necessary dependancies within pkg/ecco and to pkg/ctrl |
1086 |
|
(rm includes of optim.h and ctrl.h, replace optimcycle with eccoiter, |
1087 |
|
mv relevant variables definition from ecco_cost.h to ecco.h, |
1088 |
|
make sure gencost routines only include ecco.h) |
1089 |
|
- throughout : add missing CCP switches, rm unused variables, |
1090 |
|
and rm un-necessary CPP switches |
1091 |
|
- throughout gencost routines : replace modelstartdate with |
1092 |
|
gencost_startdate when needed |
1093 |
|
- cost_bp_read.F : use arguments, instead of common blocs |
1094 |
|
so that it can be used also by (new) cost_gencost_bpv4.F |
1095 |
|
- ecco_init_varia.F : initialize RHOsumGlob_0, VOLsumGlob_0 |
1096 |
|
- ecco_phys.F : compute etanFull |
1097 |
|
- ecco_readparms.F : rename using_topex as using_tpj, add |
1098 |
|
bpv4-grace to gencost list, initialize added parameters |
1099 |
|
- ecco_summary.F : include SIZE.h needed for augmented ecco.h |
1100 |
|
|
1101 |
|
checkpoint65e (2014/09/28) |
1102 |
|
o pkg/obcs: |
1103 |
|
- replaced the just-added CPP options with run-time variables |
1104 |
|
(see pkg/obcs/OBCS_PARAMS.h for details) |
1105 |
|
o pkg/obcs: |
1106 |
|
- add additional CPP options for sponge boundary layers |
1107 |
|
(see pkg/obcs/OBCS_OPTIONS.h for details) |
1108 |
|
o pkg/atm_phys: |
1109 |
|
- implement simple (obliquity only, assuming circular planet orbit) |
1110 |
|
seasonal cycle for incoming insolation ; used when run-time parameter |
1111 |
|
"select_incSW" is set to 1 ; by default (=0), uses old unchanged formula. |
1112 |
|
o pkg/exf, pkg/ecco, pkg/ctrl: |
1113 |
|
- add ctrlUseGen and .NOT.ctrlUseGen exclusive brackets |
1114 |
|
- activate gentim2d for xx_atemp,xx_aqh,xx_swdown,xx_lwdown,xx_precip |
1115 |
|
- implement gentim2d for xx_tauu, xx_tauv |
1116 |
|
o pkg/ctrl, pkg/ecco : |
1117 |
|
- fix and complement the generic controls implementation |
1118 |
|
o pkg/exf/exf_getclim.F, exf_getffields.F, exf_getsurfacefluxes.F, |
1119 |
|
pkg/shelfice/shelfice_thermodynamics.F, |
1120 |
|
verification/hs94.1x64x5/code_ad/ctrl_map_gentim2d.F, |
1121 |
|
verification/hs94.1x64x5/code_oad/ctrl_map_gentim2d.F : |
1122 |
|
- add weight in CTRL_GET_GEN calls |
1123 |
o pkg/ctrl : |
o pkg/ctrl : |
1124 |
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F, |
- ctrl_get_gen.F : add weight as input parameter, and apply |
1125 |
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F) |
it directly rather than using smooth_correl2Dw (to be retired). |
1126 |
- re-activate ctrl_summary (call in ctrl_init.F) |
- ctrl_map_gentim2d.F : add wgentim2d in CTRL_GET_GEN call |
|
o pkg/ctrl/ctrl_cost_gen.F : |
|
|
- rename ctrl_cost_gen2d input parameters {wmean_gen,wgen,genmask} |
|
|
as {xx_gen_wmean,xx_gen_weight,xx_gen_mask} |
|
|
- add ctrl_cost_gen3d for ARR3D (ctrl_cost_gen2d is for ARR2D,TIM2D) |
|
|
o pkg/ctrl/CTRL_GENARR.h : |
|
|
- add objf_genarr2d, num_genarr2d, mult_genarr2d |
|
|
- add objf_genarr3d, num_genarr3d, mult_genarr3d |
|
|
- add wgenarr2d, wgenarr3d |
|
|
o pkg/ctrl/ctrl_readparms.F : |
|
|
- add mult_genarr2d,mult_genarr3d in namelist |
|
|
o pkg/ctrl_map_ini_genarr.F : |
|
|
- bug fixes |
|
|
o pkg/ctrl/ctrl_cost_driver.F : |
|
|
- remove un-necessary cal.h, fix CCP brackets, remove un-necessary |
|
|
myiter, mytime, add return |
|
|
o pkg/ctrl/ctrl_cost_gen.F : |
|
|
- fix CCP brackets, remove un-necessary myiter, mytime |
|
|
o pkg/ecco : |
|
|
- remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) |
|
|
- remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) |
|
|
- update cost_forcing_gen calls in cost_forcing.F |
|
|
- update cost_genctrl call in ecco_cost_driver.F |
|
|
- update ecco_ad_diff.list accordingly |
|
1127 |
o pkg/ctrl : |
o pkg/ctrl : |
1128 |
- add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F) |
- introduce run time switch ctrlUseGen (in ctrl.h, ctrl_check.F, |
1129 |
- add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F) |
ctrl_init_variables.F, ctrl_readparms.F, ctrl_summary.F) |
1130 |
- update ctrl_ad_diff.list accordingly |
- re-activate ctrl_summary (call in ctrl_init.F) |
1131 |
|
o pkg/ctrl/ctrl_cost_gen.F : |
1132 |
|
- fix CCP brackets, remove un-necessary myiter, mytime |
1133 |
|
o pkg/ecco, pkg/ctrl : |
1134 |
|
- remove cost_genctrl.F (now pkg/ctrl/ctrl_cost_driver.F) |
1135 |
|
- remove cost_forcing_gen.F (now pkg/ctrl/ctrl_cost_gen2d.F) |
1136 |
|
- add ctrl_cost_driver.F (replaces pkg/ecco/cost_genctrl.F) |
1137 |
|
- add ctrl_cost_gen2d.F (replaces pkg/ecco/cost_forcing_gen.F) |
1138 |
|
|
1139 |
checkpoint65d (2014/09/15) |
checkpoint65d (2014/09/15) |
1140 |
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F : |
o pkg/ctrl/CTRL_GENARR.h, ctrl_readparms.F : |
1409 |
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 |
1410 |
this experiment): |
this experiment): |
1411 |
> size mitgcmuv_ad |
> size mitgcmuv_ad |
1412 |
text data bss dec hex |
text data bss dec hex |
1413 |
5100659 1216 220458952 225560827 d71c8fb |
5100659 1216 220458952 225560827 d71c8fb |
1414 |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
5339425 1200 1868783272 1874123897 6fb4dc79 (SEAICE_LSR_ADJOINT_ITER) |
1415 |
but only a moderate increase of 36% for global_ocean.cs32x15: |
but only a moderate increase of 36% for global_ocean.cs32x15: |
1416 |
text data bss dec hex |
text data bss dec hex |