1 |
jmc |
1.651 |
$Header: /u/gcmpack/MITgcm/doc/tag-index,v 1.650 2006/04/19 19:43:10 gforget Exp $ |
2 |
jmc |
1.475 |
$Name: $ |
3 |
cnh |
1.1 |
|
4 |
|
|
Notes on tags used in MITgcmUV |
5 |
|
|
============================== |
6 |
jmc |
1.643 |
|
7 |
jmc |
1.651 |
o upgrade simple test-experiment to tutorial example: |
8 |
|
|
step.1: duplicate the experiment and (step.2) will remove the old copy. |
9 |
|
|
tutorial_barotropic_gyre <- copy of exp0 (R1:barotropic_gyre_in_a_box) |
10 |
|
|
tutorial_baroclinic_gyre <- copy of exp1 (R1:baroclinic_gyre_on_a_sphere) |
11 |
|
|
tutorial_global_oce_latlon <- empty for now (R1:global_ocean_circulation) |
12 |
|
|
tutorial_global_oce_biogeo <- copy of dic_example |
13 |
|
|
tutorial_deep_convection <- almost like exp5 (R1:nonhydrostatic_deep_convection) |
14 |
|
|
tutorial_plume_on_slope <- copy of plume_on_slope |
15 |
|
|
tutorial_tracer_adjsens <- copy of carbon (R1:tracer_adjoint_sensitivity) |
16 |
|
|
tutorial_global_oce_optim <- empty for now (David ?) |
17 |
|
|
tutorial_global_oce_in_p <- copy of global_ocean_pressure |
18 |
|
|
some tutorials (R1) were already checked-in under tutorial_examples in release1_branch |
19 |
|
|
|
20 |
gforget |
1.650 |
o correct a sign problem in cost_scat.F |
21 |
mlosch |
1.649 |
o obcs and ptracers: fix boundary conditions for advections schemes |
22 |
|
|
with larger stencil |
23 |
heimbach |
1.648 |
o thsice adjoint: start |
24 |
mlosch |
1.647 |
o mom_vecinv: add ISOTROPIC_COS_SCALING flags to mom_vi_hdissip for |
25 |
|
|
completeness |
26 |
mlosch |
1.646 |
o mom_fluxform: fixing the mutual use of ISOTROPIC_COS_SCALING |
27 |
|
|
and COSINEMETH_III, add comments in default CPP_OPTIONS.h |
28 |
heimbach |
1.645 |
o ptracers adjoint: |
29 |
|
|
* avoid extensive recomputatations |
30 |
|
|
* fix missing re-init. of gptr (missed by TAF) |
31 |
mlosch |
1.644 |
o obcs: add a flag (OBCSprintDiags, defaults is true) that allows |
32 |
|
|
me to turn off the excessive output to STDOUT that this package produces |
33 |
jmc |
1.643 |
o move NH metric terms & 3.D Coriolis S/R to pkg/mom_common |
34 |
|
|
and add those terms in Vector-Invariant formulation. |
35 |
gforget |
1.642 |
o in ctrl pkg, if ALLOW_CAL, use monthly mean controls |
36 |
|
|
if the control period (xx_hfluxperiod etc) is 0 |
37 |
|
|
o in profiles pkg, clean routines and fix details |
38 |
|
|
o in ecco pkg, reading ssh data: |
39 |
|
|
fix problem in case the model does not start at iter0=0 |
40 |
mlosch |
1.640 |
o fix mnc-pickup/restart for ptracers |
41 |
heimbach |
1.641 |
o new package prifiles: |
42 |
|
|
code to compute profile-based cost by Gael Forget |
43 |
heimbach |
1.639 |
(modifs in ecco, ctrl, autodiff) |
44 |
heimbach |
1.641 |
o Benign bug fix in initialization (spotted by M. Mazloff) of |
45 |
|
|
ctrl_set_globfld_xz.F ctrl_set_globfld_yz.F |
46 |
heimbach |
1.639 |
|
47 |
heimbach |
1.638 |
checkpoint58c_post |
48 |
|
|
o adjoint: finish NLFS adjoint and provide reference output in |
49 |
|
|
verification/global_ocean.90x40x15/results_ad_nlfs |
50 |
mlosch |
1.637 |
o seaice: add an EVP solver following Hunke and Dukowicz (1997) and the |
51 |
|
|
documentation of CICE. Turn on by defining SEAICE_ALLOW_EVP in |
52 |
|
|
SEAICE_OPTIONS.h and SEAICEuseEVP=.true. in data.seaice. Works only |
53 |
|
|
with SEAICE_CGRID defined. |
54 |
jmc |
1.636 |
o move calendarDumps from "data" to "data.cal" and clean-up the code |
55 |
|
|
with a simple call to pkg/cal S/R: CAL_TIME2WRITE |
56 |
|
|
o add useEXF & useCAL flags (for now, set in hard-coded way) |
57 |
jmc |
1.635 |
o add S/R to compute NH-metrics terms & Coriolis f' in vertical momentum |
58 |
|
|
(were missing in NH mode, and wrong in quasihydrostatic mode). |
59 |
|
|
waiting for Chris updated version of calc_gw to add those CALLs. |
60 |
|
|
o fix bug in quasihydrostatic S/R ; |
61 |
|
|
add a test for this option: global_ocean.90x40x15.qshyd |
62 |
jmc |
1.634 |
o new S/R "SET_PARMS": set parameters that might depend on the use of some pkgs. |
63 |
|
|
(called from INITIALISE_FIXED, after INI_PARMS & PACKAGES_READPARAMS) |
64 |
|
|
o add on/off flag useOffLine for package OFFLINE |
65 |
mlosch |
1.630 |
o seaice: |
66 |
|
|
- modify advection so that it works also on the C-grid |
67 |
|
|
- extend loop ranges in seaice_lsr and seaice_dynsolver; fixes |
68 |
|
|
problem in multi-tile runs with C-grid |
69 |
mlosch |
1.633 |
- add flags for clipping ice velocities and/or masking solver forcing |
70 |
mlosch |
1.631 |
- fix drag (ocean on ice) formulation and a bug that caused noise in the |
71 |
|
|
C-grid solver |
72 |
mlosch |
1.632 |
- added a few comments to seaice_diffusion.F |
73 |
|
|
- separate C-grid and B-grid versions more cleanly (UVM and seaiceMaskU/V |
74 |
|
|
are now exclusive) |
75 |
|
|
- add a new ocean-ice stress coupling method (Hibler and Bryan, 1987) which |
76 |
|
|
required re-ordering the code a little: |
77 |
|
|
+ make DAIRN global variable (defined in SEAICE) |
78 |
|
|
+ move computation of the viscosities eta and zeta into a new separate |
79 |
|
|
routine (because I need to recompute them in seaice_ocean_stress.F) |
80 |
mlosch |
1.629 |
|
81 |
jmc |
1.628 |
checkpoint58b_post |
82 |
jmc |
1.627 |
o AIM+thSIce: fix sign of Short-Wave through the Ice ; |
83 |
|
|
update output.txt of exp. aim.5l_cs.thSI |
84 |
edhill |
1.626 |
o various mnc cleanups and improvements: |
85 |
|
|
+ shrink lookup tables by factor of ~4 |
86 |
|
|
+ better error reporting when running out of lookup space |
87 |
|
|
+ able to handle longer path/file names (up to 500 chars) |
88 |
heimbach |
1.625 |
o adjoint: |
89 |
|
|
- Another overhaul of store dirs. for NLFS to eliminate "hidden" recomputations. |
90 |
|
|
- TBD: "hidden" mom_vecinv recomp. in dynamics |
91 |
jmc |
1.624 |
o change forcing_In_AB to affects both T,S forcing and Momentum forcing |
92 |
|
|
(allow to differentiate between forcing components using new integer flags: |
93 |
|
|
momForcingOutAB=1/0 & tracForcingOutAB=1/0) |
94 |
|
|
and add new flag to put Dissipation tendency out of Adams-Bashforth. |
95 |
heimbach |
1.623 |
o ecco |
96 |
|
|
- enable trend removal from SSH anomaly obs. |
97 |
|
|
o adjoint |
98 |
|
|
- a fix for PmEpR when #undef EXACT_CONSERV |
99 |
|
|
- fix of "hidden" recomp. in thermodynamics (no TAF warnings) |
100 |
|
|
- try to fix "hidden" recomp. in forward_step for NLFS |
101 |
|
|
(NLFS seems broken sometimes after I checked it in) |
102 |
mlosch |
1.622 |
o seaice: |
103 |
|
|
- add c-grid version of the dynamic solver: |
104 |
|
|
+ three new routines that are the c-grid substitute lsr, dynsolver |
105 |
|
|
and ostres |
106 |
|
|
+ put a few fields that were local to dynsolver into global common |
107 |
|
|
blocks, so that I can move the computation of stresses etc into |
108 |
|
|
seaice_lsr (saves coding but may break the adjoint). |
109 |
|
|
- replace more hardwired parameters by runtime parameters |
110 |
|
|
- add ice masks that mask the rhs of the implicit solvers where there |
111 |
|
|
is no ice (commented out in seaice_dynsolver, because i am not sure |
112 |
|
|
if this works properly), eventually this should replace the clipping |
113 |
|
|
of ice velocities in seaice_dynsolver to +/-40cm/s. |
114 |
edhill |
1.621 |
o remove the BUILD_INFO.h include from CPP_EEOPTIONS.h and explicitly |
115 |
|
|
include it only where its needed |
116 |
mlosch |
1.620 |
o move balancing of fluxes before the call of external_forcing_surf |
117 |
mlosch |
1.619 |
o seaice: |
118 |
|
|
- correct units of turning angles (now they are really in degrees) |
119 |
|
|
- move computation of GWATX/Y out of main routine into dynsolver |
120 |
|
|
- initialize GWATX/Y in seaice_init |
121 |
jmc |
1.618 |
o Apply mask on Fresh-Water flux (needed for SSH forcing). |
122 |
mlosch |
1.619 |
update output.txt of exp. global_ocean_ebm & cpl_aim+ocn (affects cg2d residual) |
123 |
mlosch |
1.617 |
o seaice: add runtime flags for turning angles (default to zero) |
124 |
heimbach |
1.616 |
o Adding runtime parameter to exf/, ctrl/, to remove on-the-fly global mean |
125 |
|
|
and trend from exf forcing and ctrl control adjustments |
126 |
|
|
o fix variable aliasing in gad_calc_rhs that cannot be handled by TAF |
127 |
|
|
(since checkpoint57x_post) |
128 |
jmc |
1.615 |
o change the default rotation period to 86164.s = the Earth rotation |
129 |
jmc |
1.614 |
o 1rst implementation of Implicit IGW using the 3-D solver (use3Dsolver=T) |
130 |
|
|
and based on a reference stratification. Tested within hs94.cs-32x32x5. |
131 |
mlosch |
1.613 |
o seaice advection: add code for choosing between the default (2nd order |
132 |
|
|
central differences) and multiDim advection schemes provided by |
133 |
|
|
pkg/generic_advdiff |
134 |
mlosch |
1.611 |
o seaice: |
135 |
|
|
- removed all references to SEAICE_GRID.h fields from |
136 |
|
|
dynsolver, advect, diffus, lsr, without changing the results of lab_sea |
137 |
|
|
(cubed-sphere configuration will change a little) |
138 |
|
|
- grid computations in seaice_init are obsolete now. |
139 |
|
|
- cleaned up code a little so that is easier to read (hopefully). |
140 |
mlosch |
1.613 |
- added new (better?) discretizations of default advection and diffusion |
141 |
|
|
(turn on with SEAICEuseFluxForm) |
142 |
|
|
- replace 1 in 3d global fields by kSurface in growth.F |
143 |
mlosch |
1.611 |
|
144 |
mlosch |
1.610 |
checkpoint58a_post |
145 |
mlosch |
1.612 |
o seaice: |
146 |
|
|
- bug fix in advect.F |
147 |
mlosch |
1.608 |
o shelfice: |
148 |
|
|
- separate shelfice load anomaly from pload (breaks with time |
149 |
|
|
dependent forcing), => introduce constant field shelficeLoadAnomaly. |
150 |
|
|
Its default is 0., but it may be computed more cleverly from (unknown) |
151 |
|
|
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be |
152 |
|
|
done offline. A good approximation of the pressure load anomaly is |
153 |
|
|
necessary to avoid large initial adjustment processes underneath |
154 |
|
|
deep-reaching shelfice. |
155 |
mlosch |
1.609 |
- small fix in ISOMIP shelfice_thermodynamics |
156 |
|
|
- add more sophisticated thermodynamics of Hellmer (1989), this is |
157 |
|
|
now the default |
158 |
|
|
- give a few constants more intuitive names |
159 |
mlosch |
1.607 |
o add code to balance EmPmP and Qnet at the end of do_ocean_physics. Useful |
160 |
|
|
if bulk formulae are used in long integration (especially EmPmR). Turn |
161 |
|
|
on with balanceEmPmR = .true. or balanceQnet = .true. in data, PARM01 |
162 |
|
|
if balancePrintMean, the imbalance that is substracted is printed to |
163 |
|
|
STDOUT. |
164 |
jmc |
1.606 |
o fix bug (typo) in obcs_apply_eta.F |
165 |
mlosch |
1.605 |
o add a new package shelfice which enables us to model the circulation |
166 |
|
|
underneath shelf-ice with draughts of hundreds of meters. |
167 |
|
|
- works |
168 |
|
|
- to do: + include improved thermodynamics |
169 |
|
|
+ check whether kSurfC (from model/inc/SURFACE.h) can be used |
170 |
|
|
instead of new field kTopC |
171 |
|
|
+ can we use topoFile, Ro_surf and existing code in ini_depth.F |
172 |
|
|
instead of new field R_shelfIce and new code in ini_depth.F |
173 |
|
|
and ini_mask_etc.F? |
174 |
mlosch |
1.608 |
+ adjust vertical mixing schemes? |
175 |
mlosch |
1.604 |
o seaice pkg: |
176 |
|
|
- add a cpp-flag to include a simple formula for a salinity dependent |
177 |
|
|
freezing point of sea water at the surface |
178 |
|
|
- change the contents of SEAICE_TEST_ICE_STRESS_1 so that zonal and |
179 |
|
|
meridional stresses are now different (and hopefully correct) |
180 |
jmc |
1.602 |
o AIM pkg: change threshold on large-scale condensation to conserve Heat. |
181 |
|
|
update results of aim.5l_LatLon test ; fix title & units of AIM diagnostics |
182 |
|
|
and change 3 diagnostics names (OSR,OSRCLR,KM -> TSR,TSRCLR,DRAG) |
183 |
jmc |
1.601 |
o pkg/diagnostics: add options and parameters for regional-statistics |
184 |
|
|
diagnostics ; define regions by reading a region-mask from a file |
185 |
|
|
(might add other options later) |
186 |
jmc |
1.600 |
o pkg/bulk_force: |
187 |
|
|
- add option and parameters to use AIM surface-flux formulae. |
188 |
|
|
- Change loading part: S/R BULKF_FIELDS_LOAD only take care of bulkf_fields ; |
189 |
|
|
others forcing fields (defined in PARM05, parameter file "data") are loaded |
190 |
|
|
from S/R EXTERNAL_FIELDS_LOAD, as usually (with useBulkforce = T or F). |
191 |
|
|
- initialise all bulkf_fields in bulkf_init.F ; do in-lining of exf_bulkcdn.F |
192 |
|
|
- use the right EXCH call for uwind,vwind (to work on CS-grid). |
193 |
|
|
- re-arrange header files (move parameters from BULKF.h to BULKF_PARAMS.h) |
194 |
|
|
and parameters (note: calcWindStress replaces .NOT.readwindstress). |
195 |
|
|
- cleaner interface with pkg/thSIce (new S/R THSICE_GET_PRECIP). |
196 |
|
|
|
197 |
jmc |
1.599 |
checkpoint58 |
198 |
edhill |
1.598 |
o add "--embed-source" option to genmake2 which, when the supporting |
199 |
|
|
tools can be compiled (as determined by genmake2) will turn on the |
200 |
|
|
embed_files package which then embeds the entire MITgcm source code |
201 |
|
|
(*.[fFhc] + Makefile) used for the build within the executable |
202 |
|
|
- requested by CNH but off by default |
203 |
|
|
- adds a paltry <9MB to the mitgcmuv executable in most cases |
204 |
|
|
- only writes the output when useEMBEDSRC in eedata is true |
205 |
heimbach |
1.597 |
o clean up 3-dim. relaxation codes: |
206 |
|
|
* Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec |
207 |
|
|
* Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) |
208 |
|
|
* Thanks to Tom Haine for testing! |
209 |
|
|
|
210 |
jmc |
1.596 |
checkpoint57z_post |
211 |
jmc |
1.593 |
o make CG3D solver compatible with Free-surface at k > 1 (p-coordinate): |
212 |
|
|
affects output (@ truncation level) of exp. plume_on_slope ; updated. |
213 |
mlosch |
1.592 |
o fix the pickup behavior for obcs in combination with ptracers |
214 |
|
|
o fix a bug in ptracers_external_fields_load |
215 |
|
|
o no AB-2 at the first iteration for Gw (consistent with Gu,Gv,Gt,Gs ...) |
216 |
|
|
affects results of NH experiments (but all our NH tests have Gw[it=1]==0 !!) |
217 |
|
|
o transfered surface NH pressure to eta field (if exactConserv). |
218 |
jmc |
1.589 |
o gmredi: fix bugs in slope tapering ldd97 (depthZ had the wrong sign) |
219 |
|
|
and update lab_sea output.txt file. |
220 |
heimbach |
1.590 |
o completing 3-dim. relaxation code: additional term |
221 |
|
|
1/tau*( theta(i,j,k) - thetaStar(i,j,k) ) |
222 |
|
|
in S/R EXTERNAL_FORCING_T (file external_forcing.F) |
223 |
|
|
* At compile time, in "EXF_OPTIONS.h" set |
224 |
|
|
#define ALLOW_CLIMTEMP_RELAXATION |
225 |
|
|
#define ALLOW_CLIMSALT_RELAXATION |
226 |
|
|
* At runtime in "data", under &PARM03 set (e.g., units in seconds) |
227 |
|
|
tauThetaClimRelax3Dim = 15552000.0, |
228 |
|
|
tauSaltClimRelax3Dim = 15552000.0, |
229 |
|
|
* 3 cases: |
230 |
|
|
1) Use a constant-in-time 3-dim. field |
231 |
|
|
2) Provide 12 3-dim. fields corresponding to Jan., ... , Dec. |
232 |
|
|
3) Real-time relax. to time-evolving prescribed field |
233 |
heimbach |
1.595 |
o Adding Laplacian-type smoothness constraint on |
234 |
|
|
initial and boundary (forcing) controls (ic, bc) |
235 |
|
|
* enable at compile-time via |
236 |
|
|
ALLOW_SMOOTH_IC_COST_CONTRIBUTION, ALLOW_SMOOTH_BC_COST_CONTRIBUTION |
237 |
|
|
* enable at run-time via mult_smooth_ic = 1, mult_smooth_bc = 1 |
238 |
heimbach |
1.594 |
* Absolute scale somewhat unclear so far |
239 |
|
|
* no area weighting was included since no other cost term does so far |
240 |
jmc |
1.589 |
|
241 |
heimbach |
1.588 |
checkpoint57y_post |
242 |
|
|
First step for a NLFS adjoint |
243 |
|
|
o initially suppress rStar (new flag DISABLE_RSTAR_CODE) |
244 |
|
|
o new init. routines for calc_r_star, calc_surf_dr |
245 |
|
|
o still need to deal with ini_masks_etc |
246 |
|
|
o testreport seemed happy |
247 |
heimbach |
1.587 |
checkpoint57y_pre |
248 |
|
|
|
249 |
jmc |
1.586 |
o obcs: always reset wVel & eta (to zero or prescribe it) at the OBs. |
250 |
stephd |
1.585 |
o add new package rbcs (for relaxing ptracers at boundaries/depth/surface etc) |
251 |
stephd |
1.584 |
o add new offset feature to offline pkg (plus minor cleanup) |
252 |
|
|
o cfc fixes for final year of integration |
253 |
|
|
o clean up GCHEM_OPTIONS.h/DIC_OPTIONS.h (all options should |
254 |
|
|
be in GCHEM_OPTIONS). |
255 |
|
|
|
256 |
jmc |
1.583 |
checkpoint57x_post |
257 |
|
|
o fix testreport Pb in multiple test experiment. |
258 |
edhill |
1.582 |
o cleanup our namelist syntax in verification: |
259 |
|
|
- make it more F95 standards compliant (some work still needed) |
260 |
|
|
- allows the vast majority of our tests to work with gfortran |
261 |
jmc |
1.580 |
o Non-Hydrostatic: |
262 |
|
|
- put all NH variables (formerly in DYNVARS.h & GW.h) in NH_VARS.h |
263 |
|
|
- fix exchange calls for CS-grid using the new EXCH_S3D_RL. |
264 |
jmc |
1.579 |
o Allow to apply AB on T,S rather than on AB(gT,gS): |
265 |
|
|
- implemented within #ifdef ALLOW_ADAMSBASHFORTH_3 |
266 |
|
|
- use the same arrays (gtNm,gsNm) to hold tracer field at previous |
267 |
|
|
time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)). |
268 |
|
|
- need a "clever" read_pickup to restart from the other AB formulation |
269 |
jmc |
1.578 |
o move local commom bloc /GlobalLo/ (used for singleCpuIO) in EESUPPORT.h |
270 |
|
|
o remove some unused variables (reduces number of compiler warnings) |
271 |
heimbach |
1.581 |
o adjoint |
272 |
|
|
* Disable useVariableViscosity for adjoint for time being |
273 |
|
|
(there are a number of extensive recomputations) |
274 |
|
|
* Initialize certain variables needed for adjoint |
275 |
jmc |
1.578 |
|
276 |
jmc |
1.577 |
checkpoint57w_post |
277 |
jmc |
1.576 |
o pkg/mdsio: use MAX_LEN_FNAM (instead of hard coded 80) for file-names |
278 |
|
|
fix the singleCpuIO RS version of MDSWRITEFIELD |
279 |
|
|
and add a WARNING if using globalFiles=T with multi-processors. |
280 |
jmc |
1.575 |
o write grid-file(s) in only one format (MDS or MNC): default=MNC (if |
281 |
|
|
using MNC); can force MDS output by setting writegrid_mnc=F in data.mnc |
282 |
jmc |
1.576 |
o tracer advection scheme: |
283 |
jmc |
1.574 |
add DST-2 (=Lax-Wendroff) & 1rst order upwind schemes (the way to get |
284 |
|
|
those 2 schemes before, changing GAD_FLUX_LIMITER.h + to recompile, |
285 |
|
|
was not very convenient). |
286 |
|
|
add implicit version for DST-3 & DST3_Flux_Limit vertical advection; |
287 |
|
|
(further tests needed for the implicit DST & Flux-Limiter schemes). |
288 |
mlosch |
1.573 |
o PTRACERS: added namelist parameter PTRACERS_ref in analogy to tRef |
289 |
|
|
and sRef for convenience, handy, when you want to initialize |
290 |
|
|
ptracers in a large domain with a constant non-zero value. Also, |
291 |
|
|
untangle ptracers_init.F a little. |
292 |
|
|
|
293 |
jmc |
1.572 |
checkpoint57v_post |
294 |
|
|
o change dome exp. to use variable viscosity in side-drag terms. |
295 |
edhill |
1.570 |
o remove all the files from the cfc_offline test since they are now |
296 |
|
|
incorporated into tutorial_cfc_offline which has been producing |
297 |
|
|
identical results for a few days of testing |
298 |
jmc |
1.571 |
o add new parameter: sideDragFactor to enable half-slip-side BC |
299 |
|
|
and change side-drag S/R to use viscosity from mom_calc_visc |
300 |
|
|
(can switch back by setting sideDragFactor=0.); affects results at |
301 |
|
|
truncation level; regenerate output for exp.: global_ocean.cs32x10(x3), |
302 |
|
|
global_ocean_ebm, global_ocean_pressure, matrix_example & MLAdjust(x5). |
303 |
jmc |
1.569 |
o vorticity & strain are now computed without masking, to account for |
304 |
|
|
no-slip-side BC in variable viscosity calculation ; mask is applied |
305 |
|
|
anyway later on, before computing advection/coriolis terms. |
306 |
mlosch |
1.573 |
o modify exp4 to test new obcs support for reading from external files |
307 |
mlosch |
1.568 |
and for passive tracers |
308 |
mlosch |
1.567 |
o fix behavior of ptracers_monitor when monitor output is written to a |
309 |
|
|
netcdf-file; still not independent of monitor.F (writes in the same |
310 |
|
|
file). |
311 |
jmc |
1.566 |
o change default value of tRef (put a uniform, meaningful value for ocean |
312 |
|
|
& atmos) and initialize sRef (was missing, as Martin mentioned). |
313 |
baylor |
1.565 |
o Redefine viscC?Leith*. Change the coefficients of Leith viscosity |
314 |
|
|
to be proportional to enstrophy dissipation length. Thus, |
315 |
|
|
viscC?leith?_new=pi*(viscC?leith?_old)^(1/3) |
316 |
|
|
This is now consistent with Smagorinsky and with the manual. |
317 |
|
|
|
318 |
mlosch |
1.564 |
checkpoint57u_post |
319 |
mlosch |
1.562 |
o OBCS and PTRACERS: add open boundary support for passive tracers |
320 |
|
|
- either use homogenous (pseudo) v.Neumann conditions or prescribe |
321 |
|
|
OB-values from file; this is not different from the way theta and salinity |
322 |
|
|
are treated |
323 |
|
|
- however, Orlanski-radiation conditions are not supported, and the model |
324 |
|
|
will stop if you use pTracers and Orlanski at the same time. |
325 |
|
|
- beefed up the rountine obcs_external_fields_load: now only those open |
326 |
|
|
boundary values are overwritten with values from files for which there |
327 |
|
|
are really files, otherwise the OB-fields remain untouched. This makes |
328 |
|
|
it possible to use different OBs at different ends of the domain (as |
329 |
|
|
with EXF) |
330 |
jmc |
1.561 |
o reduce number of exch calls in shap_filt (s2). |
331 |
jmc |
1.560 |
o CS-grid: fix divergence contribution to Leith viscosity. Affects (@ |
332 |
|
|
truncation level) 4/5 MLAdjust test results (11&12 digits match). |
333 |
|
|
|
334 |
jmc |
1.559 |
checkpoint57t_post |
335 |
jmc |
1.558 |
o test biharmonic viscosity + no-slip with exp: global_ocean.cs32x15.viscA4 |
336 |
|
|
o finish adding brackets (coriolis S/R, vecinv) in multi-terms sum to get |
337 |
|
|
same truncation, independent of the face number: affects affects several |
338 |
|
|
test. exp.: Update global_ocean.cs32x15 (+.thsice) & MLAdjust (all 5). |
339 |
jmc |
1.557 |
o fix bug in mom_v_sidedrag (biharmonic viscosity was counted 2 times); |
340 |
jmc |
1.558 |
note that biharmonic viscosity + no-slip was not tested in any experiment. |
341 |
jmc |
1.556 |
o fix bug in non-linear free-surf side-drag ; generate new output for |
342 |
|
|
global_ocean.cs32x15(+.thsice) & global_ocean_pressure. |
343 |
edhill |
1.555 |
o make mnc honor the writeBinaryPrec flag for most kinds of output |
344 |
edhill |
1.554 |
o eesupp: split EEPARAMS into EESIZE/EEPARAMS and add a vector global sum |
345 |
jmc |
1.553 |
o minor change in averaging W (mom_vi_?_vertshear.F) that affects truncation |
346 |
|
|
error; update output from global_ocean.cs32x15(+.thsice) & MLAdjust (all 5). |
347 |
jmc |
1.552 |
o add brackets in multi-terms sum to get same truncation, independent of |
348 |
|
|
the face number (manage to get exactly same value of gU,gV at the cs-edge) |
349 |
|
|
affects several test. exp. Update global_ocean.cs32x15 (+.thsice). |
350 |
baylor |
1.551 |
o Clean, new version of mom_calc_visc. Adds a new feature, viscAhRemax |
351 |
|
|
and viscA4Remax, which allow one to limit the minimum viscosity by specifying |
352 |
|
|
a maximum grid-scale Reynolds number. Also, changes all length calculations |
353 |
|
|
in the case of grid anisotropy to geometric mean of dx**2 and dy**2. |
354 |
|
|
Suggested values of viscosity parameters found in mom_calc_visc. |
355 |
|
|
Many new viscosity diagnostics available. |
356 |
jmc |
1.550 |
|
357 |
|
|
checkpoint57s_post |
358 |
baylor |
1.549 |
o Add clearing-house for viscosity calculations, mom_calc_visc and |
359 |
|
|
correct numerous bugs in LeithD and Smagorinsky discretizations. |
360 |
|
|
mom_calc_visc now allows for Smagorinsky, Leith and LeithD to be |
361 |
|
|
used simultaneously, and to be used in mom_vecinv and mom_fluxform. |
362 |
|
|
Mom_vecinv can be used with standard viscous calculation (mom_vi_hdissip.F) |
363 |
|
|
and with Strain-Tension viscous term calculation (mom_hdissip.F). |
364 |
|
|
The Strain-Tension form is now called with useStrainTensonVisc=.true. |
365 |
|
|
ViscAhStrain and viscAhTension are now retired. |
366 |
jmc |
1.550 |
o diagnostics "VISCAHD" & "VISCA4D" replace "VISCAH" & "VISCA4". |
367 |
edhill |
1.547 |
o In response to JMC's bug report, genmake2 now ignores any soft-links |
368 |
|
|
that it finds in the *current* directory when searching for files. |
369 |
|
|
Soft-links found in any other source directories will still work as |
370 |
|
|
they did before. |
371 |
edhill |
1.546 |
o add HAVE_SETRLSTK define and useSETRLSTK flag (eedata) which calls |
372 |
|
|
a C routine to unlimit the stack size |
373 |
edhill |
1.545 |
o mnc-ify pkg/aim snapshot vars |
374 |
edhill |
1.544 |
o mnc-ify pkg/land as requested by Daniel |
375 |
edhill |
1.543 |
o various changes to mnc including: |
376 |
|
|
- all files use the new "BASENAME[[.ITER].{t|f}NUM].nc" format |
377 |
|
|
- output can now be grouped so that all files within a group |
378 |
|
|
change the ITER portion of their names in lock-step together |
379 |
|
|
- can now read ("global") PER-FACE (in addition to PER-TILE) files |
380 |
|
|
and works with both EXCH1 and EXCH2 (but needs more testing) |
381 |
|
|
- writing works for all verification test cases w/ g77 on Linux |
382 |
|
|
|
383 |
jmc |
1.542 |
checkpoint57r_post |
384 |
edhill |
1.541 |
o make MNC variable initialization happen earlier |
385 |
jmc |
1.540 |
o add diagnostics for (almost) each term of the momentum Eq. |
386 |
jmc |
1.537 |
o remove SST,SSS,UVEL_k2,VVEL_k2 diagnostics. |
387 |
jmc |
1.536 |
o move pkg timeave out of pkg-groups "oceanic" & "atmospheric" (pkg/pkg_groups) |
388 |
|
|
o remove MINIMAL_TAVE_OUTPUT option ; |
389 |
|
|
add "dumpInitAndLast" to replace "nodumps" (and MINIMAL_TAVE_OUTPUT). |
390 |
jmc |
1.535 |
o move some basic S/R (used elsewhere in the code) from pkg/mdsio to eesupp/src |
391 |
|
|
allows to compile without pkg/mdsio (& test successfully hs94.1x64x5) |
392 |
heimbach |
1.538 |
o add MNC output for adjoint of EXF (adexf), SEAICE (adseaice) |
393 |
|
|
o add time-dependent SST, SSS control |
394 |
heimbach |
1.539 |
o cost terms in ecco/ modularized (new cost_generic.F) |
395 |
|
|
o cost_averages routines are modularized (new cost_averagesgeneric.F) |
396 |
|
|
o new infrastructure for seaice model vs. obs misfits in seaice/ |
397 |
|
|
* driver from the_main_loop.F is seaice_cost_driver.F |
398 |
|
|
* first term is AREA vs. SMR observation misfit (ALLOW_SEAICE_COST_SMR_AREA) |
399 |
|
|
* gradient check in Exp. 6a of natl_box_adjoint/ |
400 |
|
|
o natl_box_adjoint input_seaice for Lab. Sea now available online via wget |
401 |
|
|
(see README file) |
402 |
jmc |
1.535 |
|
403 |
heimbach |
1.534 |
checkpoint57q_post |
404 |
jmc |
1.533 |
o fix initialisation Pb in calc_gw (get NANs in exp5 with g77) |
405 |
edhill |
1.531 |
o fix annoying months-old bug in mnc/mdsio output for seaice pkg |
406 |
|
|
- bug was reported by Jean-Michel and Ian Fenty |
407 |
jmc |
1.532 |
o fix initialization Pb in AIM-Ocean coupled model (aim_sice2aim.F) |
408 |
|
|
update exp. cpl_aim+ocn output. |
409 |
heimbach |
1.530 |
o Implement 4-level checkpointing: AUTODIFF_4_LEVEL_CHECKPOINT |
410 |
|
|
Needed for high-res. runs with large global files |
411 |
|
|
to be able to limit tapelev size |
412 |
|
|
o Changed some tests for adjoint: |
413 |
|
|
* carbon/ now tests AUTODIFF_2_LEVEL_CHECKPOINT |
414 |
|
|
* natl_box_adjoint/code_bulk/ tests AUTODIFF_4_LEVEL_CHECKPOINT |
415 |
|
|
* global_ocean.90x40x15/ back to default 3-level checkpointing |
416 |
heimbach |
1.534 |
o Modifications to enable scripted COMMON to MODULE conversion |
417 |
|
|
* verification/OpenAD/code/ has necessary scripts and description; |
418 |
|
|
* converts, compiles and runs successfully; |
419 |
heimbach |
1.530 |
|
420 |
jmc |
1.529 |
checkpoint57p_post |
421 |
|
|
o reading of delXfile & delYfile moved from ini_parms.F to ini_grid.F |
422 |
|
|
o move ${PKG}_MNC_INIT from ${PKG}_READ_PARAMS to ${PKG}_INIT_FIXED |
423 |
|
|
(already the case for some pkgs, including recent MNC_init, e.g. thsice) |
424 |
|
|
o call CALC_GW from DYNAMICS (instead of from FORWARD_STEP) |
425 |
jmc |
1.527 |
o Dissipation & phiHyd gradient are always added to gU,gV in timestep.F |
426 |
|
|
(was already the case for dissipation with mom_vecinv, |
427 |
|
|
and also the case for grad.PhiHyd when staggered-timeStep) |
428 |
|
|
This will allow to put dissipation out-off the AB time-stepping. |
429 |
|
|
Unfortunately, affects truncation error. Update output of exp. that "fails" |
430 |
|
|
(cg2d matching number) and leave the others for later: front_relax(10), |
431 |
|
|
global_ocean_pressure(10),ideal_2D_oce(10),internal_wave(9),lab_sea(12), |
432 |
|
|
matrix_example(7!),natl_box(12),plume_on_slope(11),vermix(12x3,11x2). |
433 |
|
|
|
434 |
heimbach |
1.526 |
checkpoint57o_post |
435 |
edhill |
1.525 |
o fix MNC/MDSIO flags in PTRACERS so that (1) it works, and |
436 |
|
|
(2) its ready to be documented during the 20050801 DocFest |
437 |
edhill |
1.524 |
o MNC-ify the gmredi package -- tested and works w/ and w/o mnc |
438 |
|
|
for ideal_2D_oce and lab_sea on linux_ia32_g77 |
439 |
heimbach |
1.526 |
o set to #undef CTRL_SET_OLD_MAXCVARS_30 |
440 |
|
|
in global1x1_tot/code_seaice_adj to access indices 32, 33 |
441 |
|
|
(worth another tag) |
442 |
edhill |
1.524 |
|
443 |
heimbach |
1.523 |
checkpoint57n_post |
444 |
heimbach |
1.521 |
o adding precip control xx_precip 32 |
445 |
|
|
o adding swflux control xx_swflux 33 |
446 |
heimbach |
1.522 |
o Replacing 10 forcing penalty cost routines by 1 generic. |
447 |
|
|
o Implementing partitioning in time-mean and variable adjustment |
448 |
|
|
for atmos. state. |
449 |
|
|
o Time-mean constant error is now read in data.ecco (instead of hard-coded) |
450 |
heimbach |
1.519 |
o in natl_box_adjoint: |
451 |
heimbach |
1.522 |
* updated exp 1 to 10 |
452 |
|
|
(but does not have time-mean vs. variable split results yet) |
453 |
heimbach |
1.523 |
o updated global1x1/*_seaice_adj/ |
454 |
|
|
to incorporate latest changes |
455 |
heimbach |
1.520 |
o enable useSingleCpuIO for mdsio vector routines |
456 |
|
|
(applies in particular to tapelev I/O) |
457 |
|
|
o removed inefficient K-loop in all active_file*control*.F |
458 |
heimbach |
1.518 |
|
459 |
heimbach |
1.517 |
checkpoint57m_post |
460 |
jmc |
1.516 |
o re-arrange exp. adjustment.cs-32x32x1 (adjust_nlfs.cs-32x32x1 merge into) |
461 |
|
|
and advect_cs (use EXCH-2 and standard cs-32 grid files). |
462 |
jmc |
1.515 |
o pkg/exch2: filling of face-corner halo regions is optional |
463 |
|
|
(ifdef W2_FILL_NULL_REGIONS) and is turned off by default. |
464 |
|
|
|
465 |
jmc |
1.514 |
checkpoint57l_post |
466 |
|
|
tag before updating tutorials (pre-release-2) |
467 |
jmc |
1.513 |
o add cos & sin of grid-direction orientation angle (curvilinear grid only, |
468 |
|
|
for output and interpolation of input fields onto model grid) |
469 |
|
|
o fix radius in mom_v_metric_cylinder.F (wrong by dy/2). |
470 |
|
|
Affects results of exp. rotating_tank ; update output.txt. |
471 |
jmc |
1.511 |
o pkg/diagnostics: 2 new S/R to fill a diagnostics using a scaling factor |
472 |
jmc |
1.512 |
and taking the square quantity and/or using a fraction-weight field. |
473 |
jmc |
1.511 |
o fix aim_diagnostics_init.F mate numbers. |
474 |
|
|
o add mnc output capability to diagnostics/diagstat and update |
475 |
edhill |
1.510 |
our cvsignore files for the ACSII output generated |
476 |
|
|
|
477 |
heimbach |
1.509 |
checkpoint57k_post |
478 |
|
|
o lab_sea now uses diagnostics package and provides a suite of |
479 |
|
|
new EXF diagnostics output. |
480 |
|
|
|
481 |
heimbach |
1.508 |
checkpoint57j_post |
482 |
|
|
o exf |
483 |
|
|
* bug fix in exf_bulkformulae for psimh (spotted by Eliyahu Biton): |
484 |
|
|
Bracket missing in eqn. for psimh (eqn. 7 of Large & Pond, 1982); |
485 |
|
|
terms -2*ATAN(x) + pi/2 were added to both stable and unstable case. |
486 |
|
|
* extended diagnostics output |
487 |
|
|
- now includes all EXF variables |
488 |
|
|
- hs, hl moved to common block |
489 |
|
|
- separate S/R for diagnostics, called after ctrl vector is added |
490 |
|
|
- name changed for EXFsw -> EXFswnet, EXFlw -> EXFlwnet |
491 |
|
|
- EXFqnet contains true Qnet (i.e. includes qsw) |
492 |
|
|
* updated verif. lab_sea, global_with_exf |
493 |
|
|
* Rearranging hflux (exf_mapfields -> exf_getforcing) |
494 |
|
|
to ensure that diagnostics sees a true EXFqnet |
495 |
jmc |
1.507 |
o add matlab scripts for CS-grid vectors (in utils/cs_grid) |
496 |
jmc |
1.506 |
o diagnostics pkg: change pointers so that 1 diagnostic can be used |
497 |
|
|
several times with different frequencies. |
498 |
edhill |
1.505 |
o mnc-ify the thsice package as requested by Daniel Enderton |
499 |
|
|
- the monitor--MNC output needs work |
500 |
|
|
- many attributes need to be added (most are currently blank) |
501 |
|
|
o mnc-ify theaim_v23 package as requested by Daniel Enderton |
502 |
|
|
- many attributes need to be added (most are currently blank) |
503 |
jmc |
1.503 |
o remove "groundAtK1" & "rkFac" (replaced by usingPCoords & -rkSign) |
504 |
jmc |
1.502 |
o add Sadourny like discretization to the 4th.O vorticity advection scheme |
505 |
jmc |
1.500 |
o fix bug in rStar code (calc_r_star.F) when used with topo/bathy. |
506 |
jmc |
1.501 |
update output.txt from: aim.5l_cs (& .thSI), cpl_aim+ocn, |
507 |
|
|
fizhi-gridalt-hs and global_ocean.cs32x15 (& .thsice). |
508 |
jmc |
1.499 |
o fix few little things to avoid floating error with -ftrapuv (ifort v9) |
509 |
|
|
(ini_spherical_polar_grid.F, calc_r_star.F, monitor/mon_surfcor.F) |
510 |
|
|
|
511 |
jmc |
1.498 |
checkpoint57i_post |
512 |
molod |
1.497 |
o Diagnostics package was changed: diagnostic allocation is now deactivated |
513 |
|
|
by setting an empty file name in the namelist (used to be by setting 0 frequency) |
514 |
jmc |
1.496 |
o momentum advection (VI form) options: activate 4th.O vorticity Coriolis ; |
515 |
|
|
add 1rst Order upwind vertical Shear. |
516 |
edhill |
1.495 |
o add a quick fix for A/B checkpointing in OFFLINE mode |
517 |
edhill |
1.494 |
o add IGNORE_TIME define and -ignore_time option to genmake2 as an |
518 |
|
|
end-run around the C/Fortran linking horror in eesup/src/timers.F |
519 |
adcroft |
1.493 |
o added pkg/runclock: allows user to terminate run based on wall clock |
520 |
|
|
o added non-hydrostatic scaling parameter: nh_am2 |
521 |
mlosch |
1.492 |
o pkg/my82: futile attempt to make results compiler-independent by adding |
522 |
|
|
some "_d 0", etc. no effect. |
523 |
edhill |
1.491 |
o for mnc output, fill the 'T' coordinate var with myTime and create a |
524 |
|
|
separate 'iter' variable for iteration count |
525 |
jmc |
1.489 |
o pkg/diagnostics: |
526 |
jmc |
1.490 |
add new capability: output of Global/Regional & per-level statistics ; |
527 |
|
|
tested against monitor output (including land & thSIce) on various exp. |
528 |
|
|
o make seaice-pkg I/O type flags (MNC/MDS) more standard. |
529 |
jmc |
1.489 |
|
530 |
jmc |
1.488 |
checkpoint57h_done |
531 |
|
|
tag after changing user customized files (DIAGNOSTICS_SIZE.h, |
532 |
|
|
data.diagnostics, data.gchem, data.ptracers) is done. |
533 |
|
|
|
534 |
jmc |
1.487 |
o pkg/diagnostics: prepare for Global/Regional statistics. |
535 |
|
|
add 2nd namelist in data.diagnostics and update DIAGNOSTICS_SIZE.h |
536 |
jmc |
1.486 |
o remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE |
537 |
|
|
and rename it: DIFFERENT_MULTIPLE |
538 |
|
|
|
539 |
jmc |
1.485 |
checkpoint57h_post |
540 |
|
|
o move tIter0 from data.gchem to PTRACERS_Iter0 in data.ptracers |
541 |
jmc |
1.484 |
o pkg/diagnostics: change output frequency, now in seconds (instead |
542 |
|
|
of Nb of iterations). This requires to change data.diagnostics. |
543 |
jmc |
1.483 |
checkpoint57h_pre |
544 |
|
|
|
545 |
edhill |
1.482 |
o in mnc, let the user create the output dir if both mnc_outdir_date |
546 |
|
|
and mnc_outdir_num are false |
547 |
edhill |
1.481 |
o add fflags() to pkg/diagnostics which allows one to specify, on a |
548 |
|
|
per-file basis, the file precision [default behavior is unchanged] |
549 |
dimitri |
1.480 |
o added diagnostics to pkg/kpp, including computation of mixed layer |
550 |
|
|
depth based on a temperature/density criterion |
551 |
|
|
o updated verification/natl_box to test the new pkg/kpp diagnostics |
552 |
jmc |
1.479 |
o bugs fixed (with useAbsVorticity=T & with useJamartMomAdv=T) |
553 |
jmc |
1.478 |
o test AB-3 code with 4th.Order advection scheme (advect_xy/input.ab3_c4) |
554 |
edhill |
1.477 |
o fix mnc flags in pkg/seaice so that they are "owned" by seaice, |
555 |
|
|
not mnc -- this mistake was found by JMC and is now corrected |
556 |
|
|
|
557 |
jmc |
1.476 |
checkpoint57g_post |
558 |
|
|
o add Adams-Bashforth 3rd Order time stepping: |
559 |
|
|
- default remains AB-2 (#undef ALLOW_ADAMSBASHFORTH_3) |
560 |
|
|
- not yet implemented with NH, CD_Scheme, pTracers, MNC_pickup ... |
561 |
jmc |
1.475 |
checkpoint57g_pre |
562 |
|
|
|
563 |
heimbach |
1.472 |
o make lambda[Theta,Salt]ClimRelax spatially varying |
564 |
|
|
(default remains spatially uniform constant based on tau) |
565 |
heimbach |
1.473 |
o added new control variables |
566 |
|
|
* init. uVel, vVel, etanN |
567 |
|
|
* lambda[Theta,Salt]ClimRelax |
568 |
|
|
o separate masks used for ctrl_pack/unpack 'from write_grid' output |
569 |
|
|
(suggested by G. Forget) |
570 |
heimbach |
1.472 |
|
571 |
jmc |
1.471 |
checkpoint57f_post |
572 |
|
|
o add parameter "baseTime" = model base time = time at iteration zero |
573 |
|
|
new function DIFF_BASE_MULTIPLE (replace DIFFERENT_MULTIPLE) to |
574 |
|
|
account for baseTime shift |
575 |
|
|
o move Coriolis arrays from PARAMS.h to GRID.h |
576 |
jmc |
1.470 |
checkpoint57f_pre |
577 |
|
|
|
578 |
edhill |
1.468 |
o mnc-ifying the seaice package |
579 |
adcroft |
1.467 |
o introduced an alternative length scale calculation for use in the limiting |
580 |
|
|
maximum viscosity (off by default, see mom_vi_hdissip.F for details) |
581 |
heimbach |
1.466 |
o S/R ptracers_calc_diff: argument list bug for CALL KPP_CALC_DIFF_S |
582 |
baylor |
1.465 |
o added modified Leith scheme with viscosity proportional to grad(Hdiv) |
583 |
|
|
as well as grad(vort3). Made it compatible with both approximate form |
584 |
|
|
for the cubed sphere and full form of these gradients. Added flag |
585 |
|
|
useFullLeith to select between approximate and full form. |
586 |
jmc |
1.464 |
o add "d0" in getcon.F to reduce differences between compilers/platforms |
587 |
|
|
update output.txt of exp. fizhi-gridalt-hs |
588 |
jmc |
1.463 |
o change port_rand funtion to allow to set the seed. |
589 |
edhill |
1.462 |
o fix obscure MNC bug involving conversion between reals and integers |
590 |
|
|
- it caused no problems with certain (eg. gcc, ifc) compilers but the |
591 |
|
|
new version is now more standards-compliant |
592 |
heimbach |
1.469 |
o adjoint-related modifications |
593 |
|
|
* gad_dst3_adv_?: to be able to use advscheme=30 in adjoint |
594 |
|
|
* gad_calc_rhs: fool adjoint, revert to advscheme=30 in reverse when using 33 |
595 |
|
|
* mom_vi_hdissip: to be able to use Leith scheme in adjoint |
596 |
edhill |
1.462 |
|
597 |
heimbach |
1.461 |
checkpoint57e_post |
598 |
|
|
o Adding eddy stress controls a la Ferreira et al. |
599 |
jmc |
1.474 |
checkpoint57e_pre (actually was tagged: eckpoint57e_pre) |
600 |
heimbach |
1.460 |
|
601 |
jmc |
1.459 |
o fizhi pkg: fix AtoC and CtoA when called with same input & output array |
602 |
|
|
update output.txt of exp. fizhi-gridalt-hs |
603 |
edhill |
1.458 |
o add more "Z" dimensions and associated coordinate vars to MNC |
604 |
dimitri |
1.457 |
o pkg/exf: added twoDigitYear capability for option useExfYearlyFields |
605 |
dimitri |
1.456 |
o parameter calendarDumps: when set, approximate months (30-31 days) and years |
606 |
|
|
(360-372 days) for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq, |
607 |
|
|
KPP_taveFreq, and freq in pkg/diagnostics are converted to exact calendar |
608 |
|
|
months and years. Requires pkg/cal. |
609 |
edhill |
1.455 |
o diagnostics: add pickup functionality |
610 |
|
|
- off by default for backwards compatibility |
611 |
|
|
- current version only uses MDSIO -- MNC will be added |
612 |
jmc |
1.454 |
o allow to use pkg diagnostics for LAND pkg output & Shapiro Tendencies. |
613 |
jmc |
1.452 |
o pkg/shap_filt: fix for multi-tiles per face (CS-grid with EXCH2) |
614 |
|
|
|
615 |
jmc |
1.451 |
checkpoint57d_post |
616 |
|
|
o pkg/thsice used in the ocean: fix tile Pb related to sIceLoad forcing |
617 |
edhill |
1.450 |
o modify verification/ideal_2D_oce so that it tests the creation of mnc |
618 |
|
|
output from the diagnostics package |
619 |
jmc |
1.449 |
o temporary fix in EXCH2_UV: add a 3rd call to fix the 24.tiles CS-grid set-up |
620 |
edhill |
1.448 |
o make genmake2 more portable by using ".$FS" instead of ".f" for more |
621 |
|
|
of the test compilations (eg. IBM xlf on Mac OSX w/HFS filesys) |
622 |
edhill |
1.447 |
o add coordinate variables to the MNC output from the diagnostics package |
623 |
jmc |
1.446 |
o change MNC-flags default value: true when useMNC=TRUE |
624 |
edhill |
1.444 |
o add a "readgrid_mnc" flag to MNC and give model/src/ini_curvilinear_grid.F |
625 |
|
|
the ability (off by default) to read the grid information using MNC |
626 |
jmc |
1.445 |
o lab_sea: use LSR_ERROR=1.E-12 for testing ; update output.txt |
627 |
jmc |
1.443 |
o diagnostics: fix a bug (sub-set of levels); keep full precision when averaging |
628 |
jmc |
1.442 |
o do snap-shot diagnostics at the middle of the time-interval (instead of |
629 |
|
|
at the end). |
630 |
jmc |
1.441 |
o update exp. aim.5l_cs (use default LAND_OPTIONS.h file) and add |
631 |
|
|
new test for AIM with thSIce + slab-ocean |
632 |
jmc |
1.440 |
o cpl_aim+ocn test: update output (optfile & default GMREDI_OPTIONS.h) |
633 |
jmc |
1.439 |
o move state variable diagnostics to the beginning of the time step ; |
634 |
|
|
(note: still needs some work specially for snap-shot diagnostics) |
635 |
|
|
duplicate & replace UVELVVEL diagnostics with UV_VEL_C & UV_VEL_Z |
636 |
|
|
|
637 |
jmc |
1.438 |
checkpoint57c_post |
638 |
|
|
o Change testing option (-ieee) to get closer agreement between g77 & ifort |
639 |
|
|
o generate new output.txt files on faulks with g77 & the new -ieee option |
640 |
jmc |
1.437 |
checkpoint57c_pre |
641 |
|
|
|
642 |
|
|
o add "_d 0" in freeze ; change some "FLOAT" to "DFLOAT" and went back (TAF); |
643 |
jmc |
1.436 |
update output.txt of exp. global_ocean.90x40x15 |
644 |
jmc |
1.435 |
o fix in ini_eos.F (one "_d 0" was missing): now g77 & ifc give much closer |
645 |
|
|
results; update global_ocean_pressure & global_ocean.cs32x15 output.txt |
646 |
jmc |
1.432 |
o add saltFlux(+File) forcing capability with periodicExternalForcing |
647 |
jmc |
1.431 |
o allow to use pkg diagnostics for GM-Redi & ThSIce output |
648 |
|
|
o diagnostics_fill: fill in up to sNx+1 or sNy+1 (if U,V or Z pt) for mnc. |
649 |
edhill |
1.430 |
o improvements for the MNC output from DIAGNOSTICS: |
650 |
|
|
- correct handling of the unlimitied dimension |
651 |
|
|
- all dims now have associated coordinate variables |
652 |
|
|
- variables located at U, V, and Corner ("Z") points are now written |
653 |
|
|
with the correct horzontal dimensions (eg. 'Xp1', 'Yp1') so that |
654 |
|
|
*all* data points are output |
655 |
dimitri |
1.429 |
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice |
656 |
dimitri |
1.428 |
o added pkg/seaice/seaice_monitor.F |
657 |
dimitri |
1.427 |
o mdsio_readfield.F can now read files visible only to master MPI process. |
658 |
dimitri |
1.426 |
o pkg/seaice: some test code for ice-modified ocean stress |
659 |
dimitri |
1.425 |
o exf_getffields interpolation defaults to bilinear for all scalar forcing |
660 |
|
|
fields (remains bicubic for wind velocity and stress). This avoids, e.g., |
661 |
|
|
spurious negative numbers for precipitation and humidity. Will cause |
662 |
|
|
some small numerical differences for integrations using pkg/exf/exf_interp.F. |
663 |
heimbach |
1.434 |
o pkg/ctrl/ |
664 |
|
|
* Add ctrlvec diagnostics in pack/unpack for nondimensional I/O |
665 |
|
|
May be enabled via doPackDiag |
666 |
|
|
* introduce z-scaling of |
667 |
|
|
+ gradient (doZscalePack) and |
668 |
|
|
+ control (doZscaleUnpack) |
669 |
|
|
o pkg/mdsio/ |
670 |
|
|
* enable useSingleCpuIO for state estimation (ctrl_pack/unpack) mdsio_gl.F |
671 |
|
|
* N.B.: leave tiled I/O for tapelev (i.e. mds...vector) |
672 |
dimitri |
1.425 |
|
673 |
jmc |
1.424 |
checkpoint57b_post |
674 |
|
|
o simplify options in diagnostics_fill arguments (remove weird combinations) |
675 |
edhill |
1.423 |
o fix MNC coordinate variables so that they now contain per-face index |
676 |
|
|
values (instead of xC,xG,yC,yG values) when run with EXCH2 since, in |
677 |
|
|
general, EXCH2 grids are only aligned to a "local" coordinate system |
678 |
jmc |
1.422 |
o test diagnostics pkg in dic_example (no output) and ideal_2D_oce (with ouput) |
679 |
|
|
o Implement instantaneous output within pkg diagnostics: |
680 |
|
|
setting a negative frequency in data.diagnostics produces |
681 |
|
|
"snap-shot" output (as opposed to time-average if freq > 0) |
682 |
jmc |
1.421 |
o move out off EQUIVALENCE all diagnostics that fizhi does not use ; |
683 |
|
|
NOTE: change ptracer diagnostics name: use 2 characters to work with |
684 |
|
|
more than 9 tracers. Add also diagnostics of advect & diffus flux. |
685 |
edhill |
1.420 |
o more CF compliance: convert all MNC 'iter' variables to 'T' so that it |
686 |
|
|
becomes the coordinate variable for the 'T' dimension |
687 |
edhill |
1.419 |
o add CF-style coordinate variables to MNC |
688 |
|
|
- just a first cut: numbers are meaningless on the cubesphere and |
689 |
|
|
missing along the T axis but otherwise it works! |
690 |
dimitri |
1.418 |
o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX |
691 |
jmc |
1.417 |
o pkg/thSIce: read initial state from 6 files ; allow monitor to use MNC. |
692 |
jmc |
1.416 |
o add diagnostics of advective & diffusive flux for T & S (pTracers coming soon) |
693 |
|
|
this is based directly on what the model compute, so that the content of |
694 |
|
|
each diagnostics might be affected by switching options (e.g., implicitDiffusion) |
695 |
|
|
o small changes for diagnostics (gad_biharm_?.F, arguments of S/R impldiff.F) |
696 |
mlosch |
1.415 |
o clean up build options files for SunOS, in particular |
697 |
|
|
- remove -traditional from xmakedepend |
698 |
|
|
- change -xarch=v9 to -xarch=native for f77 |
699 |
|
|
- restore use of make (not gmake) |
700 |
|
|
- add CC=gcc if using g77 |
701 |
edhill |
1.413 |
o changes per discussion of AM, JMC, & EH3 today: |
702 |
|
|
- move redundant "grid" variables out of "state" -- in preparation of |
703 |
|
|
creating proper CF-style coordinate variables and in recognition |
704 |
|
|
that any/all grid variables can be easily copied (eg. w/NCO) from |
705 |
|
|
the grid files into any of the other NetCDF files |
706 |
|
|
- *always* output grid variables with MDSIO (this will eventually be |
707 |
|
|
changed) |
708 |
|
|
- output MNC grid file if useMNC is true |
709 |
edhill |
1.412 |
o every instance of _END_MASTER() has been found and replaced with |
710 |
|
|
_END_MASTER( myThid ) in order to satisfy certain picky Sun |
711 |
|
|
preprocessors |
712 |
jmc |
1.411 |
o re-arrange diagnostics pkg initialisation: |
713 |
|
|
- allow each package to extend the available diagnostics list |
714 |
|
|
- add some checking and fix small problems (multi-threaded, ...) |
715 |
|
|
- new S/R diagnostics_fill (replace fill_diagnostics): |
716 |
|
|
look through the short list of active diag. (instead of the long list) |
717 |
|
|
create function DIAGNOSTICS_IS_ON to tell if a diagnostics is active |
718 |
edhill |
1.381 |
|
719 |
heimbach |
1.410 |
checkpoint57a_post |
720 |
|
|
o this set of changes restores TAMC compatibility |
721 |
|
|
tested for global_ocean.90x40x15 adjoint on trough |
722 |
|
|
(what a pain) |
723 |
|
|
|
724 |
heimbach |
1.409 |
checkpoint57a_pre |
725 |
|
|
o some modifs in tools/build_options for sunos |
726 |
|
|
o call ctrl_pack for ctrl at end for optimcycle=0 |
727 |
|
|
|
728 |
jmc |
1.408 |
checkpoint57 |
729 |
mlosch |
1.406 |
o add horizontal bi-harmonic viscosity for vertical velocity |
730 |
|
|
- new parameter viscA4W (defaults to viscA4) |
731 |
|
|
- affects only non-hydrostatic code |
732 |
|
|
- to be done: no-slip lateral boundary conditions |
733 |
dimitri |
1.405 |
o switch back to "sflux = sflux - runoff" in exf_getforcing.F |
734 |
jmc |
1.404 |
o implement Implicit Vertical advection for pTracers |
735 |
jmc |
1.401 |
o depth convergence accelerator: replace deltaTtracer by dTtracerLev(k) |
736 |
jmc |
1.402 |
(implemented also for implicit vertical diffusion & advection) |
737 |
mlosch |
1.400 |
o OBCS: extend application of tracer open boundary conditions |
738 |
|
|
to a strip beyond the boundary of width Olx/Oly |
739 |
heimbach |
1.403 |
o add call monitor to TAF set of required calls (flow directives) |
740 |
|
|
and include in natl_box_adjoint |
741 |
|
|
o untangle a few ifdefs related to cost, ctrl, autodiff |
742 |
|
|
untangel a few ALLOW_ECCO_OPTIMIZATION |
743 |
heimbach |
1.407 |
o Apply Cooper & Haines representative estimates also at sub-surface (k=Nr) |
744 |
|
|
(theta2, salt2 in ecco_cost_weights) |
745 |
mlosch |
1.400 |
|
746 |
mlosch |
1.399 |
checkpoint56c_post |
747 |
|
|
o OBCS as control variables |
748 |
|
|
- update ctrl_ad_diff.list, obcs_ad_diff.list |
749 |
|
|
- remove balance of obcs controls from default |
750 |
|
|
- fix index bug nobcs in ctrl_init |
751 |
|
|
- fix dummy fields filen in ctrl_pack |
752 |
|
|
- add dummy weights for obcs |
753 |
|
|
o lsopt: comment out fort.94 output |
754 |
|
|
o optim: |
755 |
|
|
- remove unnecessary header files |
756 |
|
|
- adjusted namelists |
757 |
|
|
- add xerbla.F to Makefile |
758 |
|
|
o exf: |
759 |
|
|
- multiple modifications of exf_check_range |
760 |
|
|
- unit change in exf_init_runoff from [m/year] to [m/s] |
761 |
|
|
o mdsio: |
762 |
|
|
- i/o-vector change debugLevel from debLevA to debLevB |
763 |
|
|
|
764 |
mlosch |
1.398 |
checkpoint56b_post |
765 |
mlosch |
1.397 |
o collect all ptracers output in an new routine (PTRACERS_OUTPUT) that |
766 |
|
|
is called from DO_THE_MODEL_IO |
767 |
|
|
- rename PTRACERS_STATV_WRITE to PTRACERS_WRITE_TIMEAVE |
768 |
|
|
- introduce new parameter PTRACERS_dumpFreq (defaults to dumpFreq) |
769 |
|
|
- clean up PTRACERS_WRITE_TIMEAVE a little |
770 |
mlosch |
1.396 |
o add another verification experiment that tests both the cfc-pkg and |
771 |
|
|
the gchem-pkg with GCHEM_SEPARATE_FORCING undefined, that is with |
772 |
|
|
reactive tendencies treated inline with regular timestepping |
773 |
mlosch |
1.395 |
o testreport previously did a lousy job of comparing small numbers, so |
774 |
|
|
we (Ed and Martin) changed the way the cut-off of 1.e-12 is |
775 |
|
|
implemented in the little c-progam tmp_cmpnum.c which is embedded in |
776 |
|
|
testreport. |
777 |
|
|
o ptracers_monitor: bug fix for MPI |
778 |
|
|
|
779 |
mlosch |
1.394 |
checkpoint56a_post |
780 |
|
|
o GCHEM: finish reorganizating the package |
781 |
|
|
- forward_step calls GCHEM_CALC_TENDENDY, which computes gchemTendency |
782 |
|
|
(introduces another 3D-array for each passive tracer, but only if |
783 |
|
|
GCHEM_SEPARATE_FORCING is undefined. For GCHEM_SEPARATE_FORCING |
784 |
|
|
gchemTendency is not needed because the timestep is done separately) |
785 |
|
|
- gchemTendency is added to gPtr in GCHEM_ADD_TENDENCY |
786 |
|
|
- GCHEM is now---more or less cleanly---separate from PTRACERS |
787 |
|
|
- to bo done: handling of surfaceForcingPtr that is needed for KPP not |
788 |
|
|
so clear to me how that should be done in a general way. |
789 |
|
|
o CFC: improve formatting of output in CFC_ATMOS |
790 |
|
|
o PTRACERS: |
791 |
|
|
- rename GCHEM_MONITOR to PTRACERS_MONITOR and call it from MONITOR, so |
792 |
|
|
that ALL experiments with ptracers enable can be checked. This makes |
793 |
|
|
GCHEM_MONITOR obsolete. |
794 |
|
|
- include a runtime parameter PTRACERS_monitorFreq that defaults to |
795 |
|
|
monitorFreq |
796 |
|
|
- set default PTRACERS_write_mdsio to false if PTRACERS_write_mnc is true |
797 |
edhill |
1.393 |
o add PTRACERS (PTR0[1-5]) to testreport output |
798 |
heimbach |
1.391 |
o exf_check_range: |
799 |
|
|
* default changed to .TRUE. |
800 |
|
|
* will check values for niter0 if debLevA, every timestep if debLevB |
801 |
|
|
* STOP in exf_check_range if 'out of range' |
802 |
|
|
* range chosen generous to allow for potential extema |
803 |
|
|
TBD: a version with stricter range |
804 |
|
|
permitted range would be runtime parameters |
805 |
jmc |
1.390 |
o GMredi: |
806 |
|
|
- fix ldd97 slope limit ; extend valid domain of Psi-Bolus ; |
807 |
|
|
- change S/R GRAD_SIGMA to be valid in the overlap on CS-grid. |
808 |
|
|
- change the default GMREDI_OPTIONS.h: compile everything except Visbeck |
809 |
mlosch |
1.388 |
o GCHEM: |
810 |
|
|
- move call to GCHEM_FORCING_SEP, so that it is now called before |
811 |
|
|
the blocking exchanges to avoid computing halos in GCHEM_FORCING_SEP |
812 |
|
|
- introduced a useGCHEM runtime flag and applied it everywhere. |
813 |
mlosch |
1.392 |
- renamed PTRACERS_SEPARATE_FORCING to GCHEM_SEPARATE_FORCING; |
814 |
|
|
this flag is now only visible within GCHEM-pkg routines. |
815 |
|
|
- moved gchem_forcing_int temporarily into ptracers_forcing, this will |
816 |
|
|
be replaced by a 3D array that is computed before thermodynamics; for |
817 |
|
|
this, the tracer ID iTracer had to be included into the parameter list |
818 |
|
|
of ptracers_forcing |
819 |
mlosch |
1.394 |
- set up forward_step to call gchem_forcing, that will replace |
820 |
mlosch |
1.392 |
gchem_forcing_int in ptracers_forcing |
821 |
|
|
- cleaning up |
822 |
jmc |
1.389 |
o small cleaning of exch2: remove files that are also in eesupp/src |
823 |
mlosch |
1.387 |
|
824 |
heimbach |
1.386 |
checkpoint56 |
825 |
jmc |
1.385 |
o AIM: read land-Fraction earlier (from ini-fixed) and monitor land at nIter0 |
826 |
edhill |
1.384 |
o mnc: cleanup "full" files--fixes out-of-memory problem |
827 |
heimbach |
1.386 |
o ECCO-GODAE |
828 |
|
|
* model/, pkg/, code/, input/ now complete w.r.t. ECCO-GODAE production setup |
829 |
|
|
* fully merged and updated from SIO code |
830 |
|
|
windstress sign change affects |
831 |
|
|
- exf_inscal_[u/v]stress |
832 |
|
|
- sign of xx_tau[u/v] adjustments |
833 |
|
|
- signs in cost_scat |
834 |
|
|
* ctrl_get_gen: avoid update of tau[u/v] for first few days |
835 |
|
|
* natl_box_adjoint updated and compressed |
836 |
|
|
* 2-level checkpoint switch added |
837 |
|
|
(tested in EXP. 1 of natl_box_adjoint) |
838 |
|
|
* new switch doInitXX to avoid init. of xx_... in optimcycle=0 |
839 |
|
|
o SVD |
840 |
|
|
* first complete, non-hacked version for SVD calculations |
841 |
|
|
* all interfaces clean w.r.t to handling of xx_..., adxx_..., g_xx_... |
842 |
|
|
performed via direct access files admtlm_vector.it???? |
843 |
|
|
(via ctrl_[un]pack) |
844 |
|
|
* optimcycle is used for ARPACK iteration counter |
845 |
|
|
(note: adxx_... is iterated, rather than xx_...; latter is constant!) |
846 |
|
|
* EV problem ok w.r.t. L2-norm in tangent space; need to check other norms |
847 |
|
|
and add linear transforms where necessary |
848 |
|
|
* controls are initial/final SST, SSS (can be extended; need to check |
849 |
|
|
ctrl_set_[un]pack_xyz.F according to ctrl_set_[un]pack_xy.F |
850 |
|
|
o mdsio: filename info to both stderr, stdout |
851 |
|
|
o exf: exf_inscal_runoff: separated default conversion [m/year] -> [m/sec] |
852 |
|
|
from sign change |
853 |
edhill |
1.384 |
|
854 |
jmc |
1.383 |
checkpoint55j_post |
855 |
jmc |
1.382 |
o isolate dissipation tendency (allow to keep it out off AB) in V.I form. |
856 |
|
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
857 |
edhill |
1.381 |
o add consistent build directories and .cvsignore files to verification |
858 |
dimitri |
1.380 |
o added viscA4GridMin and viscA4GridMax for more control on biharmonic viscosity |
859 |
edhill |
1.379 |
o make all subroutines 30 or less characters in length for certain older |
860 |
|
|
compilers to work (a thorough search only turns up two routines in |
861 |
|
|
pkg/ptracers) |
862 |
jmc |
1.378 |
o allow (vecinv only) a different horiz. viscosity for Divergence and Vorticity; |
863 |
|
|
affects (truncation level) output.txt of global_ocean.cs32x15(&.thsice) |
864 |
|
|
|
865 |
jmc |
1.377 |
checkpoint55i_post |
866 |
jmc |
1.376 |
o change arrays for total vertical diffusivity (2.D if explicit, |
867 |
|
|
3.D if implicit) ; each ptracer uses its own background value. |
868 |
edhill |
1.375 |
o added mnc/NetCDF output capability to ocn_compon_interf |
869 |
|
|
- added bits to verification/cpl_aim+ocn so that it can run on |
870 |
|
|
ITRDA and other clusters without the mpirun "-wd" option |
871 |
afe |
1.374 |
o fixed wayward endif in mom_fluxform.F that messed up cyclindrical |
872 |
|
|
configuration |
873 |
edhill |
1.373 |
o give MNC the ability to create additional files rather than |
874 |
|
|
exceeding a specified file size limit "MNC_MAX_FILESIZE" |
875 |
|
|
- the default is just less than 2GB which is a practical limit |
876 |
|
|
on many systems |
877 |
jmc |
1.372 |
o Compute the non-local term using either KPP vertical diffusivity (=default) |
878 |
|
|
or the total vertical diffusivity (when KPP_ghatUseTotalDiffus=T) |
879 |
jmc |
1.349 |
|
880 |
jmc |
1.371 |
checkpoint55h_post |
881 |
|
|
o add verification test "vermix" |
882 |
edhill |
1.370 |
o remove all the *_ioinc flags and replace with the single global |
883 |
|
|
outputTypesInclusive flag |
884 |
jmc |
1.369 |
o allow to set a vertical profile of vertical diffusivity for T & S |
885 |
jmc |
1.371 |
o call PACKAGE_BOOT & PACKAGES_READPARMS just after INI_PARMS |
886 |
|
|
o useMNC moved from data.mnc to data.pkg |
887 |
jmc |
1.369 |
|
888 |
heimbach |
1.368 |
checkpoint55g_post |
889 |
|
|
o Renaming carbon AD experiments to comply with testreport conventions |
890 |
|
|
o Updating adjoint of Held-Suarez hs94.1x64x5 |
891 |
|
|
o Fixing directives for non-ECCO forward_step, after ECCO directives |
892 |
|
|
have been fixed to avoid recomp. of do_oceanic_phys |
893 |
|
|
Works well for global_ocean.90x40x15, |
894 |
|
|
but recomp. issue remains for carbon |
895 |
|
|
o Updating adjoint output for natl_box_adjoint after |
896 |
|
|
pkg/ecco has been modified (see taga c55d_post) |
897 |
|
|
|
898 |
edhill |
1.367 |
checkpoint55f_post |
899 |
|
|
o rename to timeave_init_fixed |
900 |
|
|
|
901 |
heimbach |
1.366 |
checkpoint55e_post |
902 |
|
|
o some delicate re-shuffle of store directives to avoid one |
903 |
|
|
extra call of do_oceanic_physics |
904 |
|
|
affects ecco_the_main_loop.F, do_oceanic_physics.F |
905 |
|
|
checkpoint_lev1_directives.h |
906 |
|
|
o NB: this may break global_ocean adjoint temporarily, |
907 |
|
|
but it is clear how to fix it. Will do later, need this now. |
908 |
|
|
|
909 |
heimbach |
1.365 |
checkpoint55d_post |
910 |
|
|
o ECCO specific cost function terms (up-to-date with 1x1 runs) |
911 |
|
|
o ecco_cost_weights is modified to 1x1 runs |
912 |
|
|
o modifs to allow observations to be read in as |
913 |
|
|
single file or yearly files |
914 |
|
|
o enable to read exf forcing fields as either |
915 |
|
|
single file or yearly files (flag useExfYearlyFields) |
916 |
|
|
checkpoint55d_pre |
917 |
|
|
|
918 |
|
|
o switch between 2-level and 3-level checkpointing |
919 |
edhill |
1.364 |
o add ability of MNC to write local and "partial" (eg. 2D slices where |
920 |
|
|
the full 3D field is never actually stored) arrays to NetCDF files |
921 |
|
|
with the correct (that is, the complete multi-dimensional) set of |
922 |
|
|
array indicies |
923 |
|
|
- used in mom_vecinv() to write the diagFreq output |
924 |
|
|
- tested (demonstrated) in verification/aim.5l_cs |
925 |
edhill |
1.363 |
o further mnc-ification |
926 |
|
|
- add verification/lab_sea to the list with mnc setups |
927 |
|
|
- fix undefined mnc v-names in cd_code |
928 |
|
|
- add kpp to mnc output (both snapshot and timeave) |
929 |
mlosch |
1.362 |
o non-hydrostatic code |
930 |
|
|
- added horizontal viscosity parameter viscAhW for w, that replaces viscAh |
931 |
|
|
in calc_gw.F |
932 |
|
|
- defaults to viscAh |
933 |
|
|
- this is useful, when I want to use viscAh=0 (e.g., only biharmonic |
934 |
|
|
friction or Leith) in non-hydrostatic mode, as long as there is |
935 |
|
|
no biharmonic friction and/or Leigth or equivalent for vertical velocity. |
936 |
heimbach |
1.360 |
o pkg/cost |
937 |
|
|
extend simple cost functions to treat time mean quantities |
938 |
|
|
(T,U,V) via cost_accumulate_state from cost_tile |
939 |
jmc |
1.358 |
o multidimAdvection on CS-grid: implement the full 3 pass ; overlap needs to |
940 |
|
|
be 2 times larger than the minimum size the advection scheme requires. |
941 |
|
|
now get a perfect conservation of salt in advect_cs test-exp (updated) |
942 |
mlosch |
1.356 |
o GGL90 (Gaspar's TKE mixed layer) |
943 |
|
|
- add horizontal diffusion of TKE, requires exchanges in |
944 |
|
|
do_fields_blocking_exchanges, horizontal diffusivity is zero by |
945 |
|
|
default. In OPA there is no horizontal diffusion of TKE but the |
946 |
|
|
mixing coefficients are computed from a horizontal average of TKE of |
947 |
|
|
6 points or so. I think that diffusion has a little more physical |
948 |
|
|
justification. |
949 |
|
|
- clean up ggl90_calc in the hope of reducing memory usage (this hope |
950 |
|
|
was in vain) |
951 |
|
|
- mask tke-variable in ggl90_init |
952 |
jmc |
1.355 |
o fix mask Pb in multidimAdvection on CS-grid (still a small Pb with ipass) |
953 |
|
|
o fix biharmonic diffusion on CS-grid. |
954 |
mlosch |
1.354 |
o more obcs stuff |
955 |
|
|
- added obcs_external_fields_load as an alternative to the EXF-pkg option |
956 |
|
|
for reading boundary values. This routine is called from |
957 |
|
|
obcs_prescribe_read |
958 |
|
|
- updated obcs_check |
959 |
mlosch |
1.357 |
- changed sponge layer relaxation parameter units for days to seconds |
960 |
|
|
- turned off sponge layer by default |
961 |
heimbach |
1.359 |
- changed argument list of OBCS_CALC to myTime+deltaTclock |
962 |
mlosch |
1.361 |
- fixed about 35 bugs in obcs_external_fields_load |
963 |
mlosch |
1.354 |
|
964 |
heimbach |
1.353 |
checkpoint55c_post |
965 |
heimbach |
1.352 |
o obcs stuff |
966 |
|
|
- new runtime flags useOBCSprescribe, useOBCSbalance |
967 |
|
|
- re-arranged obcs_calc |
968 |
|
|
- moved exf_getobcs to obcs_prescibe_read |
969 |
|
|
obcs_prescibe_read is called after ORLANSKI stuff |
970 |
|
|
and independent of it (executable can contain all). |
971 |
|
|
- updated obcs_check |
972 |
heimbach |
1.353 |
- added exchanges for U,V,gU,gV for useOBCSprescribe=.TRUE. |
973 |
|
|
These may be necessary only if tangential velocities are |
974 |
|
|
prescribed at OB, not sure, needs testing. |
975 |
edhill |
1.351 |
o make the MNC_CW_ADD_VATTR_* subroutines all take scalar arguments |
976 |
|
|
which simplifies the calls and passes the ifc check-bounds test |
977 |
|
|
|
978 |
jmc |
1.350 |
checkpoint55b_post |
979 |
|
|
o add a 2D scalar, Z location, exchange_2 routine. |
980 |
jmc |
1.349 |
o EXCH_UV for CS-grid: add one u,v in the corner-halo region, allows |
981 |
|
|
to compute vorticity on a wider stencil [e.g., vort3(0,1)&(1,0)] |
982 |
|
|
affects advect_cs results (for the wrong reason): update output.txt |
983 |
jmc |
1.348 |
o use a more standard discretization for biharmonic viscosity ; |
984 |
|
|
(original version still available with #define MOM_VI_ORIGINAL_VISCA4 ) |
985 |
|
|
affects results of dome set-up: update output.txt |
986 |
|
|
o fix gad_advection.F (CubedSphere part), back to version 1.23 |
987 |
|
|
o fix bug in mom_vi_del2uv.F (CubedSphere part). |
988 |
mlosch |
1.341 |
|
989 |
heimbach |
1.347 |
checkpoint55a_post |
990 |
|
|
o merged code to |
991 |
|
|
* prescribe/read time-dependent open boundaries |
992 |
|
|
(works in conjunction with exf, cal) |
993 |
|
|
* sponge layer code for open boundaries |
994 |
|
|
* each boundary N/S/E/W now has its own CPP option |
995 |
|
|
(healthy for the adjoint) |
996 |
|
|
|
997 |
heimbach |
1.346 |
checkpoint55 |
998 |
|
|
o up-to-date adjoint of previous breaks |
999 |
|
|
- natl_box_adjoint: problem for exp 12, 13: cost = 0. needs fix |
1000 |
|
|
- global_ocean_ebm: adjoint still needs fix (TLM ok) |
1001 |
|
|
- global_ocean.90x40x15: extended GMREDI_OPTIONS.h |
1002 |
|
|
- carbon: * remove tr1-related adjoint verification |
1003 |
|
|
* add ptracer as control variable |
1004 |
|
|
o remove all tr1-related code (ALLOW_PASSIVE_TRACER) |
1005 |
|
|
(adjoint stuff still has some tr1 'names', but all use ptracer arrays) |
1006 |
|
|
|
1007 |
heimbach |
1.345 |
checkpoint54f_post |
1008 |
|
|
o in verification/carbin/ remove experiment related to |
1009 |
|
|
ALLOW_PASSIVE_TRACER (array tr1 etc) |
1010 |
|
|
code_ad/ input_ad/ results_ad |
1011 |
|
|
|
1012 |
mlosch |
1.344 |
o add two new packages |
1013 |
|
|
- ggl90, TKE-model of Gaspar et al. (1990), Blanke+Delecluse (1993) |
1014 |
|
|
+ subject to optimization (memory) |
1015 |
|
|
- opps, OPPS (ocean penetrative plume scheme) of Paluszkiewicz+Romea (1997) |
1016 |
|
|
+ subject to reordering (many GOTOs in the original code) |
1017 |
|
|
+ so far opps is called for every (i,j) point, and then operates in |
1018 |
|
|
the vertical; one may want to reorder the scheme in order operate in |
1019 |
|
|
horizontal slabs at the cost of (a lot of) memory, at least ten new 3D |
1020 |
|
|
fields) |
1021 |
edhill |
1.343 |
o overhaul of IO so that we now have flags for MDSIO and/or MNC |
1022 |
|
|
- all verification tests compile and run with linux_ia32_g77 |
1023 |
|
|
- defaults are compatible with current input files--nothing |
1024 |
|
|
should change if you were not previously using MNC |
1025 |
|
|
- MNC output has been added in numerous places (eg. timeave) |
1026 |
|
|
but there are still a few writes not yet do-able with MNC |
1027 |
|
|
(this is in progress) |
1028 |
|
|
- flags now allow for either/or/both use of MDSIO and MNC and |
1029 |
|
|
documentation will soon follow |
1030 |
|
|
- numerous small formatting cleanups for ProTeX |
1031 |
edhill |
1.342 |
o add version info (via BUILD_INFO.h) to MNC and stdout |
1032 |
|
|
|
1033 |
mlosch |
1.341 |
checkpoint54e_post |
1034 |
|
|
o add two new packages |
1035 |
|
|
- pp81 (Packanowski and Philander, 1981), Richardson number and |
1036 |
|
|
stratification dependent mixing |
1037 |
|
|
- my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme |
1038 |
|
|
- these scheme operate in a similar manner as KPP (without ghat, of |
1039 |
|
|
course), however there is only one diffusivity that is used for both |
1040 |
|
|
temperature and salinity (and passive tracers)ç |
1041 |
stephd |
1.340 |
o add offline package |
1042 |
edhill |
1.339 |
o add "verification/dic_example" which contains a dic-gchem-ptracer setup |
1043 |
|
|
provided by Stephanie Dutkiewicz |
1044 |
edhill |
1.338 |
o genmake2: add ability to search for C compilers and cleanup test output |
1045 |
|
|
- fixes recent SX-6 problems and should help with others (eg. HP-UX) |
1046 |
|
|
|
1047 |
jmc |
1.337 |
checkpoint54d_post |
1048 |
adcroft |
1.336 |
o data.diagnostics: if levels() is unspecified then ALL levels are diagnosed |
1049 |
jmc |
1.337 |
o bug fix in pkg/cal/cal_addtime.F for TheCalendar='model' day count is wrong, |
1050 |
|
|
leading to additional shift by 5 days each year of integration |
1051 |
|
|
(i.e. leading to considerable offset over the years) |
1052 |
jmc |
1.335 |
o update global_ocean.cs32x15/thsice: use z* + RealFW + staggerTimeStep |
1053 |
|
|
o start with no AB and no initial filtering (staggerTimeStep): |
1054 |
|
|
change the results of test-exp: hs94.128x64x5, hs94.1x64x5 & hs94.cs-32x32x5 |
1055 |
|
|
o move ocean specific S/R calls from forward_step.F to do_oceanic_phys.F |
1056 |
|
|
(external loading & cpl import/export stay in forward_step.F) |
1057 |
|
|
o update coupling interface to work with new staggerTimeStep |
1058 |
|
|
o change MDSIO ptracers_pickup. |
1059 |
jmc |
1.334 |
o fix a bug in Flux deriv. vs Ts (pkg/aim_v23/phy_suflux_sice.F); |
1060 |
edhill |
1.333 |
o genmake2 fixes so netcdf now works on halem ("osf1_alpha_*") |
1061 |
jmc |
1.334 |
o bugs fixed in kpp_calc.F (ustarY) and external_forcing.F (Qsw & Partial-cell) |
1062 |
edhill |
1.333 |
|
1063 |
jmc |
1.332 |
checkpoint54c_post |
1064 |
jmc |
1.331 |
o replace surfaceTendency U,V,S,T,Tice,Ptr by surfaceForcing U,V,S,T,Tice,Ptr |
1065 |
|
|
this affects (truncation error) output.txt of test-exp: |
1066 |
|
|
global_ocean_ebm,_pressure,.cs32x15(&.thsice), lab_sea & natl_box |
1067 |
|
|
o pkg/kpp: replace pMask by maskC to reduce memory size (one 3.D array) |
1068 |
jmc |
1.330 |
o change Qnet to always be the net heat flux, (+upward). |
1069 |
|
|
affects (truncation error) output of natl_box exp.: updated |
1070 |
jmc |
1.329 |
o define the max number of passive tracers in PTRACERS_SIZE.h |
1071 |
|
|
o start to test mnc routinely in exp0 |
1072 |
|
|
o add sea-ice loading (sIceLoad) as a new forcing field. |
1073 |
|
|
|
1074 |
jmc |
1.328 |
checkpoint54b_post |
1075 |
edhill |
1.327 |
o add testreport "-j JOBS" option for parallel builds (tested and pretty |
1076 |
|
|
impressive on Altix and Opteron systems) |
1077 |
edhill |
1.326 |
o diagnostics can now write NetCDF files through the mnc package |
1078 |
jmc |
1.325 |
o staggerTimeStep & NLFS: update pkg aim_v23 & thsice; update aim.5l_cs output |
1079 |
jmc |
1.324 |
o staggerTimeStep & multi-Dim-Advec: Exch(U,V) added |
1080 |
jmc |
1.323 |
o staggerTimeStep & NLFS: rescale T & S surface tendencies. |
1081 |
|
|
affects (truncation error) output of lab_sea & natl_box exp.: updated |
1082 |
|
|
o change pickup _cd & _ptracers (old pickup restart: usePickupBeforeC54=.T.) |
1083 |
|
|
|
1084 |
jmc |
1.322 |
checkpoint54a_post |
1085 |
|
|
o re-write staggerTimeStep: step fwd U,V and then T,S (reverse the order). |
1086 |
|
|
o change pickup file (to restart from old pickup, set usePickupBeforeC54=.T.) |
1087 |
|
|
o get a perfect restart when using RealFreshWaterFlux + NLFS (not finished) |
1088 |
|
|
o update output of all exp. that use staggerTimeStep (except hs94.cs & 2D) |
1089 |
|
|
+ internal_wave (shift in writing cg2d_ini_res) |
1090 |
jmc |
1.321 |
checkpoint54a_pre |
1091 |
|
|
|
1092 |
dimitri |
1.320 |
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice |
1093 |
|
|
- modified verification/lab_sea and natl_box_adjoint accordingly |
1094 |
|
|
|
1095 |
heimbach |
1.319 |
checkpoint54 |
1096 |
heimbach |
1.318 |
checkpoint53g_post |
1097 |
jmc |
1.317 |
o prepare splitting of thermodynamics: store convect.counter in common block |
1098 |
jmc |
1.316 |
o store d.etaH/dt (instead of Div.hV) in common ; affects (truncation error) |
1099 |
|
|
output of: global_ocean.cs32x15, global_ocean_pressure & internal_wave |
1100 |
dimitri |
1.315 |
o cnh's modifs to gad_advection.F for cube-sphere multi-dim advection |
1101 |
jmc |
1.314 |
o new parameter "nShapS": allow to treat differently S from T (nShapT) |
1102 |
|
|
o separate Vert.Advec.Scheme from horizontal Advec.Scheme (T & S) |
1103 |
heimbach |
1.318 |
o restore adjointability |
1104 |
jmc |
1.314 |
|
1105 |
jmc |
1.313 |
checkpoint53f_post |
1106 |
|
|
o modifications that affect AIM experiment results (update output.txt): |
1107 |
|
|
- no advection of S at top interface Nr (pkg/generic_advdiff) |
1108 |
|
|
- air surf. temp: use lower value between T0 & T1 (phy_suflux_prep.F) |
1109 |
jmc |
1.312 |
o AIM pkg: |
1110 |
|
|
- include stability function into surf.Flux derivative relative to Tsurf |
1111 |
|
|
- calculate clear-sky radiation & surface temp. change (for diagnostics) |
1112 |
jmc |
1.313 |
|
1113 |
afe |
1.311 |
checkpoint53e_post |
1114 |
|
|
o merged cylindrical coord configuration |
1115 |
|
|
o added rotating_tank experiment |
1116 |
afe |
1.310 |
checkpoint53e_pre |
1117 |
|
|
|
1118 |
jmc |
1.309 |
checkpoint53d_post |
1119 |
jmc |
1.308 |
o faulks upgraded: re-generate output.txt that have changed: |
1120 |
|
|
global_ocean.cs32x15(.thsice), global_ocean_ebm, lab_sea, natl_box |
1121 |
adcroft |
1.307 |
o Added Bryan and Lewis, 1979, vertical diffusivity profile |
1122 |
jmc |
1.306 |
o pkg/land: fix problem in land_impl_temp.F when Ts arround freezing. |
1123 |
adcroft |
1.305 |
o added Sadourny discretization of Coriolis |
1124 |
|
|
- moved some PARAMETERS from mom_*_coriolis.F to PARAMS.h |
1125 |
|
|
- re-enabled use of omega3 (useAbsVorticity) |
1126 |
adcroft |
1.304 |
o added Leith (Phys. Fluids, 1968, 10, 1409-1416) variable viscosity for |
1127 |
jmc |
1.309 |
vector-invariant equations |
1128 |
adcroft |
1.304 |
- note: does *NOT* yet use same variable visc. for no-slip BC's. |
1129 |
mlosch |
1.303 |
o recoded the lateral boundary conditions for non-hydrostatic w, this time |
1130 |
|
|
hopefully without new bugs |
1131 |
|
|
- still to do: biharmonic friction for non-hydrostatic w |
1132 |
adcroft |
1.302 |
o bug fix for mom_*_sidedrag: rA -> rAs,rAw |
1133 |
|
|
o regenerated output for global_ocean_ebm (using -ieee) |
1134 |
adcroft |
1.301 |
o fix mom_common/mom_*_sidedrag.F to recover numeric output prior to creation |
1135 |
|
|
of mom_common/ |
1136 |
|
|
- simple re-arrangement of instructions within computing loop |
1137 |
|
|
checkpoint53d_pre |
1138 |
mlosch |
1.297 |
|
1139 |
heimbach |
1.300 |
checkpoint53c_post |
1140 |
jmc |
1.299 |
o new version of coupler for AIM+thSIce and Ocean models |
1141 |
|
|
- new fields (SSS,h_MixLayer ...) are exchanged through the coupler |
1142 |
|
|
- land: change Evaporation of snow |
1143 |
|
|
- aim with thSIce: fix bug in snow-precip. |
1144 |
mlosch |
1.297 |
o changes to calc_gw.F |
1145 |
|
|
- bug fix for w^2 term near the bottom boundary |
1146 |
|
|
- (hopefully) improve the lateral slip boundary condtions for use with |
1147 |
|
|
partial/looped cells |
1148 |
|
|
- because the bug fix changes two verification experiments anyway (exp5 |
1149 |
|
|
and plume on slope), change the lateral boundary condition from half slip |
1150 |
|
|
to the value of no_slip_sides |
1151 |
heimbach |
1.298 |
o ebm package wasnt quite up to the parallel task. Fixed that. |
1152 |
heimbach |
1.300 |
o Adjoint of EBM package + verification |
1153 |
|
|
* TLM OK |
1154 |
|
|
* ADM not sufficient accuracy yet (needs further testing) |
1155 |
heimbach |
1.295 |
|
1156 |
heimbach |
1.296 |
checkpoint53b_post |
1157 |
|
|
o Commiting new energy balance model to repository |
1158 |
|
|
* package is pkg/ebm |
1159 |
|
|
* verif. is verification/global_ocean_ebm |
1160 |
|
|
* references are in ebm_driver.F |
1161 |
|
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
1162 |
|
|
C Global thermohaline circulation. Part I: |
1163 |
|
|
C Sensitivity to atmospheric moisture transport. |
1164 |
|
|
C J. Climate 12(1), 71-82 |
1165 |
|
|
C * X. Wang, P. Stone and J. Marotzke, 1999: |
1166 |
|
|
C Global thermohaline circulation. Part II: |
1167 |
|
|
C Sensitivity with interactive transport. |
1168 |
|
|
C J. Climate 12(1), 83-91 |
1169 |
|
|
C * M. Nakamura, P. Stone and J. Marotzke, 1994: |
1170 |
|
|
C Destabilization of the thermohaline circulation |
1171 |
|
|
C by atmospheric eddy transports. |
1172 |
|
|
C J. Climate 7(12), 1870-1882 |
1173 |
|
|
o Will need long integration testing. |
1174 |
heimbach |
1.295 |
checkpoint53b_pre |
1175 |
dimitri |
1.292 |
|
1176 |
adcroft |
1.294 |
o created pkg/mom_common in preparation for variable viscosity code |
1177 |
|
|
o renamed and split ini_mnc_io |
1178 |
jmc |
1.293 |
o pkg/land: only liquid water can diffuse or run-off |
1179 |
|
|
o AIM using land: soil wetness availability account for snow |
1180 |
dimitri |
1.292 |
o added printMapIncludesZeros to EEPARMS namelist |
1181 |
heimbach |
1.290 |
|
1182 |
|
|
checkpoint53a_post |
1183 |
|
|
o restore TAMC compatiility for exf_constants.h |
1184 |
|
|
(no usage of _d in .h) |
1185 |
|
|
o Additional storing in KPP in an attempt to fix |
1186 |
|
|
TAMC problem with adjoint of KPP code. |
1187 |
|
|
(no success...) |
1188 |
|
|
Identical code works fine with TAF. |
1189 |
dimitri |
1.291 |
o Fixed verification/natl_box_adjoint experiments. |
1190 |
|
|
Initial conditions for Experiments 4 and 5 are now |
1191 |
|
|
set to "SEAICE_initialHEFF=0", which is more reasonable, |
1192 |
|
|
and hence gives results closer to that of Experiment 2. |
1193 |
|
|
Experiment 6 requires "SEAICE_initialHEFF=1" and is working once again. |
1194 |
cnh |
1.289 |
|
1195 |
|
|
checkpoint53 |
1196 |
|
|
o stable checkpoint with up to date adjoint |
1197 |
|
|
TLM tests only run for 1st grdchk at the moment. Its unclear if |
1198 |
|
|
this is a code problem or a problem with resetting code for g_ |
1199 |
|
|
variables that is being autogenerated wrong. |
1200 |
|
|
Otherwise: |
1201 |
|
|
o code is testing well on Linux (P4 and AMD), SGI Alitix and Irix. |
1202 |
|
|
o IBM and HPQ tests could not be run because NCAR (IBM) and NCCS (HPQ) |
1203 |
|
|
are both still in chaos following their security messes. |
1204 |
jmc |
1.279 |
|
1205 |
edhill |
1.288 |
checkpoint52n_post |
1206 |
|
|
o various build (mostly genmake2) changes including: |
1207 |
|
|
- ability to build/run more easily within Cygwin and MacOS X |
1208 |
|
|
- more complicated Makefiles with a stronger dependence on Gnu Make |
1209 |
dimitri |
1.285 |
o pkg/seaice modifications |
1210 |
dimitri |
1.287 |
- added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost |
1211 |
|
|
of pkg/seaice. For time being, SEAICE_deltaTtherm = deltaTtracer |
1212 |
|
|
and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm |
1213 |
dimitri |
1.285 |
- changed proxy for geostrophic velocity and updated |
1214 |
dimitri |
1.286 |
verification/lab_sea/results/* accordingly |
1215 |
dimitri |
1.285 |
- removed ADI dynamic solver from pkg/seaice |
1216 |
|
|
- replaced all occurrences of 1/CSTICE or 1/CSUICE |
1217 |
|
|
they caused a segmentation fault under certain circumstances |
1218 |
mlosch |
1.283 |
- removed unused field WATR |
1219 |
mlosch |
1.282 |
o bug fix in exf-package: |
1220 |
|
|
- u/vwind are defined at tracer/pressure points. The values of u/vwindmask |
1221 |
|
|
now reflect that. |
1222 |
mlosch |
1.281 |
o small fixes in the cal-package: |
1223 |
|
|
- set reference date to first of January for the 'model'-calendar |
1224 |
|
|
- failing of cal_CheckDate in cal_FullDate now actually results in a |
1225 |
|
|
warning |
1226 |
mlosch |
1.280 |
o small modifications in exf-package to increase flexibility: |
1227 |
|
|
- change climtempfreeze from a constant to a runtime parameter that |
1228 |
|
|
is specified in data.exf_clim (default = -1.9) |
1229 |
|
|
- introduce runtime parameter windstressmax (default = 2.0) that is |
1230 |
|
|
specified in data.exf |
1231 |
jmc |
1.279 |
o fix in pkg/thsice: |
1232 |
|
|
- update Evap (Tsf changes) to be consistent with Latent heat flux |
1233 |
|
|
- maintain snow precipitation unchanged (even if Tsf >=0). |
1234 |
|
|
both affect global_ocean.cs32x15/(.thsice) results ; update output.txt.thsice |
1235 |
edhill |
1.272 |
|
1236 |
jmc |
1.278 |
checkpoint52m_post |
1237 |
mlosch |
1.277 |
o commented out call to cal_GetMonthsRec in swfrac.F and added some comments; |
1238 |
|
|
this does not change any of the results, because myIter=0 in swfrac always |
1239 |
|
|
lead to jwtype=2 (the default anyway), but the call makes little sense |
1240 |
|
|
as a default |
1241 |
jmc |
1.276 |
o no SHORTWAVE HEATING lost at the bottom; affects lab_sea output; updated |
1242 |
jmc |
1.275 |
o re-work pkg/thsice interface with ocean & bulk_force pkg to allow |
1243 |
|
|
atmospheric model (AIM) to use it ; add a "slab ocean" component. |
1244 |
|
|
o pkg/aim_v23 : add interface to call thermodynamic sea-ice (thsice) |
1245 |
|
|
o update global_ocean.cs32x15/output (.thsice) after changes in pkg/thsice |
1246 |
dimitri |
1.274 |
o extending useSingleCpuIO option to work with new exch2 I/O format |
1247 |
|
|
- old-style, missing-tile I/O is still accessible by defining CPP |
1248 |
|
|
option MISSING_TILE_IO in pkg/mdsio/MDSIO_OPTIONS.h |
1249 |
edhill |
1.273 |
o monitor package can write to NetCDF files and/or STDOUT |
1250 |
|
|
o fix re-definition bug in MNC_GRID_INIT_ALL() |
1251 |
edhill |
1.272 |
o doc/api_reference added |
1252 |
|
|
- a framework for building an API Reference Manual using all |
1253 |
|
|
the "protex" comments embedded in the code |
1254 |
|
|
- see pkg/generic_advdiff, pkg/mnc for examples |
1255 |
edhill |
1.269 |
o MNC: |
1256 |
|
|
- make myThid the last argument for all subroutines |
1257 |
|
|
- new default for the grid files: NO halos |
1258 |
edhill |
1.270 |
- add useMNC and other run-time flags |
1259 |
|
|
- separate per-file-group handling of the unlimited dimension |
1260 |
|
|
- early initialization of MNC w/ flags read at the eeboot stage |
1261 |
|
|
and lookup tables set in initialize_fixed |
1262 |
|
|
- write all MNC output to a freshly-created directory |
1263 |
jmc |
1.268 |
o thermodynamics sea-ice (thsice) is now tested with testreport. |
1264 |
|
|
o test exp. advect_cs: use the standard cs32 grid ; update output. |
1265 |
heimbach |
1.271 |
o Added functionality to grdchk: |
1266 |
|
|
pick global i,j,k position (or nearest wet) where to perform check. |
1267 |
jmc |
1.266 |
|
1268 |
jmc |
1.267 |
checkpoint52l_post |
1269 |
|
|
o new land formulation: |
1270 |
|
|
a) use ground enthalpy as prognostic variable to ensure exact |
1271 |
|
|
energy conservation. |
1272 |
|
|
b) account for water temperature and for latent heat of freezing |
1273 |
|
|
in all processes (rain, run-off, ground storage) |
1274 |
|
|
c) compute surface and ground temperature implicitly. |
1275 |
|
|
o aim_v23 modification for new land model: |
1276 |
|
|
a) Treat separately land / ocean / sea-ice surface fluxes |
1277 |
|
|
to allow implicit computation of land & sea-ice surface temp. |
1278 |
|
|
b) add snow precipitation. |
1279 |
jmc |
1.266 |
checkpoint52l_pre |
1280 |
|
|
|
1281 |
jmc |
1.265 |
o fix problem (when 1 tile is empty) in min/max monitor. |
1282 |
|
|
o fix bug in timeAve (u,vZetatave in common block) |
1283 |
dimitri |
1.264 |
o no restoring terms under ice for pkg/seaice |
1284 |
dimitri |
1.263 |
o moved SEAICE_DO_DIAGS to S/R do_the_model_io |
1285 |
|
|
o bug fix for pkg/seaice pickups |
1286 |
edhill |
1.262 |
o change MNC call locations and add coordinate attributes |
1287 |
jmc |
1.260 |
o mask vorticity at the corner ; affects global_ocean.cs output |
1288 |
|
|
o fix ini_curvilinear_grid ; test CS experiments with mpi |
1289 |
jmc |
1.259 |
o aim.5l_cs: modify sea-ice fraction input file ; update output |
1290 |
heimbach |
1.261 |
o exf: Adding simple range check routine for exf fields after read |
1291 |
adcroft |
1.256 |
|
1292 |
heimbach |
1.257 |
checkpoint52k_post |
1293 |
adcroft |
1.256 |
o removed top-level directory "diags" |
1294 |
|
|
- we migrated these functions to pkg/timeave a long time ago |
1295 |
|
|
o fixed bug introduced in pkg/monitor |
1296 |
heimbach |
1.257 |
o accuracy ctrlprec = 32 insuffient for gradient checks using |
1297 |
|
|
averaged fields (I/O via cost_averages) |
1298 |
|
|
-> use ctrl.h in active_file*.F to control I/O precision. |
1299 |
|
|
o paramter list of CALL ADTHE_MAIN_LOOP |
1300 |
|
|
o added initial do_the_model_io to ecco |
1301 |
|
|
o set all ...Freq to zero after cost_final |
1302 |
|
|
taveFreq, dumpFreq, pChkptFreq |
1303 |
heimbach |
1.258 |
o MAIN and ECCO differentiability restored |
1304 |
heimbach |
1.255 |
|
1305 |
|
|
checkpoint52j_post |
1306 |
|
|
o fix nchklev in tamc.h for global_ocean... |
1307 |
|
|
o Bringing flow and store directives up-to-date |
1308 |
|
|
o Really weird thing! |
1309 |
|
|
call do_the_model_io from the_main_loop with parameters |
1310 |
|
|
starttime, niter0, instead of mytime, myiter, screws up the adjoint: |
1311 |
|
|
TAF places a faulty re-call of initialise_varia |
1312 |
|
|
after cost_final call which should not be there! |
1313 |
|
|
checkpoint52j_pre |
1314 |
jmc |
1.253 |
|
1315 |
afe |
1.254 |
o tweaked pkg/mdsio/mdsio_readfield.F to have more useful logic and |
1316 |
|
|
error messages |
1317 |
jmc |
1.253 |
o fix errorMessageUnit problem. remove old version of mdsio from eesup/src |
1318 |
afe |
1.252 |
o modified pkg/mdsio/mdsio_readfield.F -- commented out diskspace-eating |
1319 |
|
|
debug output |
1320 |
afe |
1.251 |
o modfied mdsio_writefield.F to handle non-global files under exch2 |
1321 |
jmc |
1.250 |
o update AIM Cubed-Sphere exp (aim.5l_cs): |
1322 |
|
|
use land, p*, and Franco.M forcing fields with fractional land-sea mask. |
1323 |
|
|
o update AIM Equatorial Channel exp: |
1324 |
|
|
use standard aim_v23 pkg and change the SST fields to be more realistic. |
1325 |
afe |
1.248 |
o globalFile now works with exch2 |
1326 |
afe |
1.247 |
o merged mom_vi_calc_relvort3.F, mom_vi_del2uv.F and |
1327 |
jmc |
1.253 |
mon_vort3.F to make exch2 friendly with >1 tile per cube face |
1328 |
dimitri |
1.249 |
o limit timeave output for hi-res integrations |
1329 |
adcroft |
1.245 |
|
1330 |
|
|
checkpoint52i_post |
1331 |
|
|
o removed CPP_EEOPTIONS.h from verification/*/code |
1332 |
|
|
o updated the tiling for global_ocean_pressure |
1333 |
|
|
checkpoint52i_pre |
1334 |
jmc |
1.246 |
|
1335 |
|
|
o update aim.5l_LatLon using the standard aim_v23 pkg (instead of |
1336 |
|
|
the old pkg/aim). |
1337 |
afe |
1.239 |
|
1338 |
dimitri |
1.244 |
checkpoint52h_pre |
1339 |
afe |
1.243 |
o shortened offending lines in exch2_send_rx?.template |
1340 |
afe |
1.242 |
o modified W2_EXCH2_TOPOLOGY.h to reflect current topology generator |
1341 |
edhill |
1.240 |
o genmake2: add build & execute test for NetCDF code |
1342 |
afe |
1.239 |
o modded aim.5l_cs and global_ocean.cs32x15 to use exch2, removed |
1343 |
|
|
old grid files, moved CPP_EEMACROS.h to pkg/exch2 |
1344 |
dimitri |
1.238 |
o added useSingleCPUIO flag to monitor.F and mon_out.F |
1345 |
dimitri |
1.241 |
o added temporary hack for sea-ice dynamics on the cube: |
1346 |
|
|
metric terms are ignored and it is assumed that |
1347 |
|
|
there is no sea-ice on cube faces 1, 2, 4, and 5. |
1348 |
dimitri |
1.238 |
|
1349 |
|
|
checkpoint52f_post |
1350 |
afe |
1.236 |
o added exch2 cube routines to pkg/exch2 |
1351 |
|
|
o modified hs94.cs-32x32x5 to use it |
1352 |
|
|
o added new grid files to hs94.cs-32x32x5 |
1353 |
dimitri |
1.238 |
checkpoint52f_pre |
1354 |
dimitri |
1.228 |
|
1355 |
jmc |
1.235 |
checkpoint52e_post |
1356 |
jmc |
1.234 |
o first attempt to solve vertical advection (momemtum & T,S) Implicitly |
1357 |
|
|
for now, only implemented with Lax-Wendroff (tracer) and VectInv (mom) |
1358 |
jmc |
1.235 |
o step.1 : rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F) |
1359 |
|
|
to work with implicit vertical advection and AB ; |
1360 |
|
|
o Implic. vert. advect. implemented with flux-limiter, c2, u3 and c4 scheme. |
1361 |
|
|
o update output (gad_calc_rhs.F changes affect truncation error) of exp: |
1362 |
|
|
front_relax, global_ocean .cs32x15 & _pressure, internal_wave, lab_sea, natl_box |
1363 |
jmc |
1.233 |
checkpoint52e_pre |
1364 |
|
|
|
1365 |
|
|
o fix bug in impldiff when Nr=1 or Nr=2. |
1366 |
jmc |
1.232 |
o change the albedo in pkg/thsice (as GISS model); update output_thsice.txt |
1367 |
|
|
o little changes (fftpack, aim/phy_suflux ...) to pass the "checkbounds" test. |
1368 |
jmc |
1.229 |
o fix deltaTfreesurf in update_cg2d.F (left from c45d_post): affects 2 |
1369 |
|
|
ocean exp. that use NLFS: global_ocean.cs32x15 & global_ocean_pressure |
1370 |
dimitri |
1.228 |
o added exf_offset_atemp for Celsius to Kelvin conversion of atemp |
1371 |
dimitri |
1.231 |
o eesupp/inc/EEPARAMS.h: MAX_NO_PROCS=1024 |
1372 |
|
|
o pkg/cal/cal_toseconds.F fix for long (>60 years) integrations |
1373 |
jmc |
1.220 |
|
1374 |
jmc |
1.226 |
checkpoint52d_post |
1375 |
adcroft |
1.230 |
o re-tiled many expts to allow comparison in multi-processor mode |
1376 |
|
|
- updated output accordingly |
1377 |
|
|
- changed hs94.128x64x5 to use intial T from file rather than use the |
1378 |
|
|
random number generator |
1379 |
molod |
1.227 |
o add infrastructure in model routines for fizhi and gridalt packages |
1380 |
jmc |
1.220 |
o change global_ocean.cs32x15 because of Pb with GM on CS-grid. |
1381 |
dimitri |
1.222 |
o changes to permit hi-res, cubed-sphere, configuration |
1382 |
|
|
- added useSingleCpuIO capability to mdsio_readfield.F and exf_interp.F |
1383 |
|
|
- added "#undef ALLOW_USE_MPI" support to eesupp/src/scatter_2d.F |
1384 |
|
|
- added pkg/exf/exf_set_uv.F for on-the-fly interpolation and rotation |
1385 |
|
|
of surface winds for the cube |
1386 |
|
|
(A verification experiment, based on global_ocean.cs32x15, but with |
1387 |
|
|
pkg/seaice turned on and with on-the-fly interpolation from the NCEP |
1388 |
|
|
Gaussian grid is described in MITgcm_contrib/high_res_cube/README_ice, |
1389 |
|
|
complete with example surface forcing files and matlab scripts to look |
1390 |
|
|
at the output and compare it with that of global_ocean.cs32x15.) |
1391 |
jmc |
1.223 |
o packages pickup: $PKG_write_pickup called from packages_write_pickup ; |
1392 |
|
|
but call to $PKG_read_pickup remains in $PKG_ini_vars: change CD_code |
1393 |
|
|
to conform to the common rule. |
1394 |
jmc |
1.224 |
o check-in the first version of the coupler + interfaces for multi-components |
1395 |
|
|
set-up (Chris's version, adapted to work on cubed-sphere grid); use MPI. |
1396 |
|
|
- imply modification in eesupp (MPI_COMM_MODEL < MPI_COMM_WORLD). |
1397 |
|
|
- atmosphere: use pkg aim_v23 ; no sea-ice for now. |
1398 |
|
|
- ocean and atmos. share the same horizontal grid (no interpolation). |
1399 |
|
|
- exchanges between component and coupler is done in forward_step |
1400 |
jmc |
1.225 |
o new verification experiment, cpl_aim+ocn: |
1401 |
|
|
coupled ocean - AIM atmosphere on cs32 grid. |
1402 |
jmc |
1.217 |
|
1403 |
dimitri |
1.219 |
checkpoint52d_pre |
1404 |
jmc |
1.217 |
o surface flux time-av diagnostic modified for NLFS & RealFreshWater |
1405 |
jmc |
1.218 |
o add call to AIM pendant S/R in external_forcing & external_fields_load.F |
1406 |
heimbach |
1.213 |
|
1407 |
heimbach |
1.216 |
checkpoint52c_post |
1408 |
heimbach |
1.213 |
o Fixing OPTIONS files for use of exf: |
1409 |
|
|
- ALLOW_ECCO not needed |
1410 |
|
|
- ECCO_CPPOPTIONS.h should not be included from |
1411 |
|
|
EXF_OPTIONS.h/CAL_OPTIONS.h, but from CPP_OPTIONS.h |
1412 |
|
|
as has been the case in the past |
1413 |
|
|
- All cal/exf related options are currently set in |
1414 |
|
|
single header file. Should remain so until we |
1415 |
|
|
agree on a consistent new policy. |
1416 |
heimbach |
1.214 |
o Removed all CPP options for cal package. |
1417 |
|
|
cal has no more CPP options. |
1418 |
heimbach |
1.215 |
o modified STOREs in GAD_ADVECTION |
1419 |
|
|
o corrected key comp. for passkey |
1420 |
heimbach |
1.210 |
|
1421 |
jmc |
1.212 |
checkpoint52b_post |
1422 |
|
|
o new version: "thsice" of thermodynamic sea-ice pkg: |
1423 |
|
|
- only 1 call from "forward_step"; conserve energy, fresh-water & salt. |
1424 |
|
|
- modify fluxes but do not change theta directly; |
1425 |
|
|
- light cleaning of bulk_force pkg (still needed with thsice). |
1426 |
|
|
- add forcing fields + data files in global_ocean.cs32x15/inp_thsice |
1427 |
|
|
+ output_thsice.txt to test thsice & bulk_force pkgs. |
1428 |
|
|
o put back grid & coriolis monitor output. |
1429 |
jmc |
1.211 |
checkpoint52b_pre |
1430 |
|
|
|
1431 |
|
|
o call "do_the_model_io" at the beginning (=> dump initial state) |
1432 |
|
|
o use rhoConstFresh to define convertEmP2rUnit (was done only in ocean-P) |
1433 |
heimbach |
1.210 |
o sort out interplay between tamc.h and PTRACERS_OPTIONS.h |
1434 |
|
|
(need info on NUMBER_OF_PTRACERS) |
1435 |
|
|
o missing PTRACERS headers in some routines |
1436 |
|
|
o default tamc.h in pkg/autodiff supposed to crash |
1437 |
|
|
to ensure proper customization |
1438 |
dimitri |
1.206 |
|
1439 |
heimbach |
1.209 |
checkpoint52a_post |
1440 |
jmc |
1.208 |
o modifications to make FREEZE (_SURFACE) flux visible to pkg/kpp |
1441 |
dimitri |
1.207 |
- moved surfaceTendencyTice from pkg/seaice to main code |
1442 |
jmc |
1.208 |
- subroutine FREEZE_SURFACE now limits only surface temperature |
1443 |
|
|
and is called in FORWARD_STEP (if allowFreezing=.TRUE.) |
1444 |
|
|
=> new output.txt for global_ocean.cs32x15 & global_with_exf |
1445 |
|
|
- keep the old version of FREEZE for backward compatibility; |
1446 |
|
|
global_ocean.90x40x15 left unchanged using useOldFreezing=.TRUE. |
1447 |
heimbach |
1.209 |
- corresponding modifs for TAF directives |
1448 |
dimitri |
1.207 |
o added surface flux output variables to TIMEAVE_STATVARS |
1449 |
|
|
o time-averaged output for pkg/ptracers |
1450 |
heimbach |
1.209 |
o fix problem with ECCO-related divided adjoint |
1451 |
|
|
snapshot file was missing some ad-variables, |
1452 |
|
|
but no warning issued by TAF |
1453 |
dimitri |
1.206 |
|
1454 |
dimitri |
1.207 |
checkpoint52a_pre |
1455 |
dimitri |
1.206 |
o some bug fixes for #undef REAL4_IS_SLOW |
1456 |
heimbach |
1.205 |
|
1457 |
|
|
checkpoint52 = ecco_c52_e35 |
1458 |
|
|
o after testing adjoints of checkpoint51u_post |
1459 |
edhill |
1.203 |
|
1460 |
heimbach |
1.204 |
checkpoint51u_post |
1461 |
|
|
o this is the post-merge tag of the ecco-branch |
1462 |
|
|
(needs another clean checkout and re-testing) |
1463 |
|
|
o various natl_box_adjoint configs and results |
1464 |
|
|
but no input fields |
1465 |
|
|
o obcs adjoint not yet merged! |
1466 |
|
|
o adding ECCO global 1x1 and 2x2 degree configs |
1467 |
|
|
o updated/extended some store directives for seaice |
1468 |
|
|
o pkg/ecco now containes ecco-specific part of cost function |
1469 |
|
|
o top level routines the_main_loop, forward_step |
1470 |
|
|
supersede those in model/src/ |
1471 |
|
|
previous input data.cost now in data.ecco |
1472 |
|
|
(new namelist ecco_cost_nml) |
1473 |
|
|
o in ctrl/ cleaned some cross-dependencies and updated CPP options |
1474 |
|
|
|
1475 |
|
|
checkpoint51t_post |
1476 |
|
|
o this is the pre-merge tag of the ecco-branch |
1477 |
|
|
|
1478 |
edhill |
1.203 |
checkpoint51s_post |
1479 |
|
|
o cleanup: removed various obsolete #define-s |
1480 |
heimbach |
1.204 |
o pkg/grdchk |
1481 |
|
|
- renamed 'ph-grd 3' to 'grad-res' |
1482 |
|
|
- merged from ecco-branch |
1483 |
|
|
(remaining bug fixes for obcs gradient checks) |
1484 |
|
|
- additional high-precision output for testreport |
1485 |
|
|
(grep for 'precision_grdchk_result') |
1486 |
edhill |
1.202 |
|
1487 |
|
|
checkpoint51r_post |
1488 |
|
|
o cleaned up or removed CPP_OPTIONS.h files |
1489 |
|
|
o updated results for some of the tests to reflect the new |
1490 |
|
|
optfiles (-ieee: -O0 instead of -O3) |
1491 |
heimbach |
1.201 |
|
1492 |
|
|
checkpoint51q_post |
1493 |
|
|
o cd_code: |
1494 |
|
|
- moved cd_scheme.F -> cd_code_scheme.F |
1495 |
|
|
- separate read_checkpoint from cd_code_ini_vars.F |
1496 |
|
|
- separated cd_code part from write_checkpoint |
1497 |
|
|
- updated AD_SOURCE, generated .flow |
1498 |
|
|
- added CD_CODE_VARS.h to the_main_loop |
1499 |
|
|
- Moving cd_code specific store dir.s to pkg/cd_code |
1500 |
|
|
o ctrl package totally restructured |
1501 |
|
|
- pack/unpack now optional and decoupled from |
1502 |
|
|
xx_/adxx_ I/O |
1503 |
|
|
- ctrl_pack/unpack cleaned |
1504 |
|
|
(new routines ctrl_init_ctrlvar.F, pkg/ctrl/ctrl_init_wet.F) |
1505 |
|
|
- confined inclusion of AD_CONFIG.h to where necessary. |
1506 |
|
|
o genmake2: changed AD dependencies from SRCFILES to AD_FILES |
1507 |
edhill |
1.198 |
|
1508 |
edhill |
1.200 |
checkpoint51p_post |
1509 |
edhill |
1.198 |
o create initial cd_code package |
1510 |
edhill |
1.199 |
- WARNING: the initialization of fields within packages |
1511 |
|
|
is broken because INI_FIELDS (where READ_CHECKPOINT is |
1512 |
|
|
called) is called *before* PACKAGES_INIT_VARIABLES. |
1513 |
|
|
This seems to be backwards since |
1514 |
|
|
1) its important to initially zero the entire field including |
1515 |
|
|
the "halo" region |
1516 |
|
|
2) zeroing needs to be done *before* reading pickup info |
1517 |
|
|
and the pickup call might or might not happen in any |
1518 |
|
|
particular run |
1519 |
|
|
- this needs an overhaul for R2 |
1520 |
edhill |
1.198 |
o cleanup verification/*/code/GMREDI_OPTIONS.h |
1521 |
|
|
o cleanup testreport |
1522 |
heimbach |
1.196 |
|
1523 |
|
|
checkpoint51o_post |
1524 |
|
|
o bringing AD-related verif's up to date with genmake2 |
1525 |
|
|
- carbon/ |
1526 |
|
|
- global_ocean.90x40x15/ |
1527 |
|
|
- hs.94.1x64x5/ |
1528 |
|
|
- (front_relax/ ) |
1529 |
|
|
o (more) consistent directory structure for AD-related verif.'s |
1530 |
|
|
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK |
1531 |
|
|
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF |
1532 |
|
|
o bug fix in find_alpha.F for MDJWF: |
1533 |
|
|
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for |
1534 |
|
|
change rho -> rho-rhoConst |
1535 |
|
|
- replace call find_rho to find_rhonum |
1536 |
|
|
o initialisation of rFlx extended to full array (required by TAF) |
1537 |
|
|
and shifted to thermodynamics |
1538 |
|
|
o removed PTRACERS.h in ptracers routine |
1539 |
|
|
o added surfacetendencyPtr to S/R parameter list pracers_forcing |
1540 |
|
|
o Correcting initialisations for fVerU, fVerV. |
1541 |
|
|
o helping TAF to recognize dependency on kUp for |
1542 |
|
|
fVerU, fVerV |
1543 |
|
|
o Replacing delZ by delR in pkg/ctrl/ |
1544 |
|
|
checkpoint51o_pre |
1545 |
dimitri |
1.192 |
|
1546 |
edhill |
1.195 |
o undid all of cp51 pending some cleanups and discussion |
1547 |
heimbach |
1.197 |
o added the [#include "AD_CONFIG.h"] statement to all files that need |
1548 |
|
|
it for adjoint/tl #defines |
1549 |
|
|
o re-worked the build logic in genmake2 to support AD_CONFIG.h |
1550 |
|
|
o removed tools/genmake since it no longer works |
1551 |
dimitri |
1.194 |
|
1552 |
|
|
checkpoint51n_post |
1553 |
|
|
o modifications to make FREEZE flux visible to pkg/kpp |
1554 |
|
|
- moved surfaceTendencyTice from pkg/seaice to main code |
1555 |
|
|
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP |
1556 |
|
|
- subroutine FREEZE now limits only surface temperature |
1557 |
|
|
(this means new output.txt for global_ocean.90x40x15, |
1558 |
|
|
global_ocean.cs32x15, and global_with_exf) |
1559 |
|
|
o added surface flux output variables to TIMEAVE_STATVARS |
1560 |
|
|
|
1561 |
|
|
checkpoint51n_pre |
1562 |
dimitri |
1.192 |
o added "#undef ALLOW_USE_MPI" support to eesupp/src/gather_2d.F |
1563 |
edhill |
1.193 |
o added [#include "AD_CONFIG.h"] to all files that use the following |
1564 |
|
|
defines: |
1565 |
|
|
- ALLOW_ADJOINT_RUN |
1566 |
|
|
- ALLOW_TANGENTLINEAR_RUN |
1567 |
|
|
- ALLOW_ECCO_OPTIMIZATION |
1568 |
edhill |
1.190 |
|
1569 |
edhill |
1.191 |
checkpoint51m_post |
1570 |
edhill |
1.190 |
o incorporating changes to get TAMC/TAF working in genmake2 |
1571 |
|
|
- added new TAMC/TAF targets to the Makefile |
1572 |
|
|
- various cleanups related to package handling |
1573 |
edhill |
1.191 |
- these changes should have no impact on the forward model |
1574 |
dimitri |
1.189 |
|
1575 |
|
|
checkpoint51l_post |
1576 |
|
|
o changes to pkg/cal and pkg/exf that allow and speed-up long integrations |
1577 |
|
|
- faster algorithm for cal_addtime.F |
1578 |
|
|
- higher precision arithmetic, where needed |
1579 |
|
|
- pkg/exf *startdate variables changed from calendar date to |
1580 |
|
|
model integration time |
1581 |
|
|
|
1582 |
|
|
checkpoint51l_pre |
1583 |
jmc |
1.188 |
o add salt flux to forcing fields (used when salty sea-ice forms or melts) |
1584 |
|
|
o enable to apply restoring on S & T only in a latitude band. |
1585 |
|
|
o update output (external_forcing_surf modif. change truncation errors) |
1586 |
|
|
global_ocean.cs32x15, global_ocean_pressure, lab_sea, natl_box |
1587 |
edhill |
1.186 |
|
1588 |
jmc |
1.187 |
checkpoint51k_post |
1589 |
|
|
o change default to: useNHMTerms=.FALSE. |
1590 |
|
|
- new output.txt for atmos. exp (NHMTerms were wrong but now turned off): |
1591 |
|
|
adjustment.128x64x1, aim.5l_Eq_Ch, aim.5l_LatLon, hs94.128x64x5, hs94.1x64x5 |
1592 |
|
|
- new output.txt for idealized oceanic exp (NHMTerms are now turned off): |
1593 |
|
|
exp1, ideal_2D_oce |
1594 |
|
|
- change data file of oceanic exp (leave the results unchanged for now) |
1595 |
|
|
exp2, global_ocean[90x40x15,pressure,with_exf], lab_sea, natl_box |
1596 |
|
|
o set gravitySign automatically according to the vertical coordinate used |
1597 |
|
|
(and change sign: back to "logical" value: +1 when R increases downward) |
1598 |
edhill |
1.186 |
o added an include barrier to the default CPP_OPTIONS.h and |
1599 |
|
|
removed the #include "PACKAGES_CONFIG.h" from it |
1600 |
jmc |
1.187 |
o fix a bug in mom_fluxform (from chk51j_post) |
1601 |
heimbach |
1.185 |
|
1602 |
|
|
checkpoint51j_post |
1603 |
|
|
o Added some AD-related initialisations in mom_vecinv/ mom_fluxform/ |
1604 |
|
|
o adjusted some flow directives (dynamics, thermodynamics) |
1605 |
|
|
o added cubed-sphere case to test cost function |
1606 |
|
|
o heckpoint_lev?_directives.h now include |
1607 |
|
|
pkg-specific directives, whenever those are enabled. |
1608 |
|
|
o Moving pkg-specific flow directives to corresponding pkg |
1609 |
|
|
Moving pkg-specific differentiation list to corresponding pkg |
1610 |
|
|
Moving pkg-specific checkpoint-lev storing to corresponding pkg |
1611 |
|
|
---> conventions are |
1612 |
|
|
- pkg_ad.flow |
1613 |
|
|
- pkg_ad_diff.list |
1614 |
|
|
- pkg_ad_check_lev?_dir.h |
1615 |
stephd |
1.181 |
|
1616 |
edhill |
1.184 |
checkpoint51i_post |
1617 |
|
|
o merge of the branch-genmake2 |
1618 |
|
|
- knowingly breaks the older genmake |
1619 |
|
|
- automatic generation of all ALLOW_${PKG_NAME} defines |
1620 |
|
|
- new testreport supersedes older testscript |
1621 |
|
|
o large number of package inclusion and header cleanups |
1622 |
|
|
checkpoint51i_pre |
1623 |
|
|
|
1624 |
edhill |
1.183 |
o new output for adjoin of global ocean vector invariant |
1625 |
|
|
o fix for checkpoint of thermodynamic seaice and bulk_force |
1626 |
|
|
o Steph gchem various cleanups |
1627 |
|
|
|
1628 |
stephd |
1.181 |
checkpoint 51h_pre |
1629 |
edhill |
1.183 |
o fixed some single quotes |
1630 |
stephd |
1.181 |
o modify gchem pkg to be more versatile |
1631 |
|
|
o modifications to clean up dic pkg |
1632 |
|
|
o add pkg/cfc |
1633 |
heimbach |
1.182 |
|
1634 |
|
|
checkpoint51g_post |
1635 |
|
|
o provide links for ARPACK and ADM*TLM |
1636 |
|
|
o start removing verification/vero/ |
1637 |
|
|
o update AD-related stuff |
1638 |
|
|
(in particular some IF-statements in model/src/ routines) |
1639 |
|
|
o adding to verification/global_ocean.90x40x15/ adjoint of |
1640 |
|
|
vector invariant setup |
1641 |
dimitri |
1.177 |
|
1642 |
heimbach |
1.180 |
checkpoint51f_post |
1643 |
jmc |
1.179 |
o update advect_xz/output.txt (left from chekpoint50f_pre, ini_vel modif) |
1644 |
dimitri |
1.178 |
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation |
1645 |
dimitri |
1.177 |
of tracer Green's fucntions for ocean inversion project. |
1646 |
dimitri |
1.175 |
|
1647 |
dimitri |
1.176 |
checkpoint51f_pre |
1648 |
dimitri |
1.175 |
o Added on-the-fly spatial interpolation capability |
1649 |
|
|
"USE_EXF_INTERPOLATION" to pkg/exf. |
1650 |
dimitri |
1.176 |
- This is a temporary Cartesian-grid hack until |
1651 |
dimitri |
1.175 |
the super-duper ESMF coupler becomes available. |
1652 |
dimitri |
1.176 |
- See verification/global_with_exf/README for usage example. |
1653 |
|
|
- Removed obsolete EXFwindOnBgrid and SEAICEwindOnCgrid |
1654 |
|
|
flags and modified pkg/seaice accordingly. |
1655 |
dimitri |
1.175 |
o Bug fix to pkg/ptracers, pkg/generic_advdiff/gad_calc_rhs.F, |
1656 |
|
|
and pkg/kpp/kpp_transport_ptr.F for dealing with tracer |
1657 |
|
|
non-local transport term. |
1658 |
heimbach |
1.172 |
|
1659 |
jmc |
1.174 |
checkpoint51e_post |
1660 |
|
|
o pkg/mom_vecinv: |
1661 |
|
|
- changes related to hFac: use S/R from aim.5l_cs/code (coriolis & vort.advec) |
1662 |
|
|
- add time-ave diagnostic of vorticity advection. |
1663 |
|
|
o add diagnostic (instantaneous) of Shapiro Filter effect for T,S & UV. |
1664 |
|
|
o atmospheric geopotential: - include water vapor effect; |
1665 |
|
|
- use p^kappa in p* scaling. |
1666 |
jmc |
1.173 |
o land pkg: read initial state from files. |
1667 |
|
|
o AIM : add stratospheric drag in the upper level |
1668 |
|
|
|
1669 |
heimbach |
1.172 |
checkpoint51d_post |
1670 |
jmc |
1.173 |
o change function ILNBLNK (=> last non-blank char.) to return zero |
1671 |
|
|
(instead of the string length) when the string. char is empty |
1672 |
jmc |
1.171 |
o fix bug in dxV,dyU definition of cubed-sphere grid (ini_curvilinear_grid) |
1673 |
heimbach |
1.172 |
o modif's to restore TAMC compatibility |
1674 |
|
|
- avoid "_d" constructs in PARAMETER declarations |
1675 |
|
|
- avoid interrupting lines by comment lines |
1676 |
|
|
o Use cluster local disks for purely local I/O |
1677 |
|
|
vs. globally visible disks needed for ctrl stuff |
1678 |
|
|
(merged from ecco-branch) |
1679 |
|
|
- new active_file_loc... and mdsio_..._loc routines |
1680 |
|
|
- affected packages: autodiff, ctrl, grdchk, mdsio |
1681 |
heimbach |
1.169 |
|
1682 |
heimbach |
1.170 |
checkpoint51c_post |
1683 |
|
|
o introducing integer flag debugLevel |
1684 |
|
|
- debLevZero: suppress all output |
1685 |
|
|
- debLevA: standard |
1686 |
|
|
- debLevB: equivalent to current debugMode=.TRUE. |
1687 |
|
|
o introducing pathname variable mdsioLocalDir for mdsio |
1688 |
|
|
that can be specified at runtime |
1689 |
|
|
(relevant for cluster I/O to local disk) |
1690 |
|
|
` |
1691 |
heimbach |
1.169 |
>>>checkpoint51b_post |
1692 |
|
|
adjoint of ptracers |
1693 |
|
|
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM |
1694 |
|
|
o extended state in checkpoint_lev?, etc. |
1695 |
|
|
o alternative ctrl/cost with tr1 or ptracer |
1696 |
|
|
o new comlev1_bibj_ptracers |
1697 |
|
|
o new ptracers.flow |
1698 |
|
|
o made ptracers_forcing same as external_forcing_s |
1699 |
|
|
o added verification for adjoint with ptracers |
1700 |
|
|
- adm. grdchk fail so far |
1701 |
|
|
- tlm. grdchk OK |
1702 |
|
|
- checked tapelev/comlev recomputations: OK |
1703 |
|
|
<<<checkpoint51b_pre |
1704 |
stephd |
1.168 |
|
1705 |
|
|
checkpoint51a_post |
1706 |
|
|
o added code for biogeochemistry package |
1707 |
|
|
- new pkgs: dic, gchem |
1708 |
|
|
- new subroutine in ptracers |
1709 |
|
|
o modify code for biogeo packages |
1710 |
|
|
- in model/src and pkg/ptracers |
1711 |
heimbach |
1.166 |
|
1712 |
|
|
checkpoint51 |
1713 |
|
|
o merged improved packages from ecco-branch (ecco_c51_e34) to MAIN |
1714 |
|
|
- autodiff, ctrl, exf, grdchk, seaice |
1715 |
|
|
kept separate packages |
1716 |
|
|
- cost, ecco, obcs |
1717 |
heimbach |
1.167 |
o updating verification/internal_wave, verification/lab_sea |
1718 |
|
|
(all verif's pass on faulks.lcs.mit.edu RH7.3, g77) |
1719 |
heimbach |
1.165 |
|
1720 |
|
|
checkpoint50i_post |
1721 |
|
|
o Preparing next differentiable checkpoint and sync |
1722 |
|
|
of MAIN vs. ecco-branch |
1723 |
|
|
- 1st step: this one is differentiable |
1724 |
|
|
- 2nd step: next(! not this) checkpoint will have updated packages |
1725 |
|
|
from ecco-branch) |
1726 |
jmc |
1.161 |
|
1727 |
heimbach |
1.164 |
checkpoint50h_post |
1728 |
jmc |
1.163 |
o new package "land": provide surface BC for AIM. |
1729 |
|
|
o pkg/ptracers: apply exchange to all tracers after reading a pickup. |
1730 |
jmc |
1.161 |
o AIM: use true log-P extrapolation for near surface temp (= as in |
1731 |
|
|
F.Molteni paper) ; update aim.5l_cs output. |
1732 |
adcroft |
1.162 |
o New variable in PARM03 for more flexible pickups |
1733 |
heimbach |
1.164 |
o somewhat cleaned package initialisation sequence for |
1734 |
|
|
ctrl/ cost/ ecco/ in packages_... routines |
1735 |
dimitri |
1.160 |
|
1736 |
|
|
checkpoint50g_post |
1737 |
|
|
o merged with release1_p17 (pkg/seaice and verification/lab_sea) |
1738 |
|
|
- added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics |
1739 |
|
|
- LSR sea-ice dynamic solver moved to SouthWest B-grid location and |
1740 |
|
|
made the default because of faster convergence than ADI |
1741 |
heimbach |
1.159 |
|
1742 |
|
|
checkpoint50f_post |
1743 |
|
|
o exf totally restructured |
1744 |
|
|
- replaced all exf_set_ routines by one generic exf_set_gen.F |
1745 |
|
|
and made sure it's still differentiable |
1746 |
|
|
- split exf_getffields.F into new exf_bulkformulae.F |
1747 |
|
|
- exf_inscal_/exf_outscal_ suffixes consistent with field names |
1748 |
|
|
- updated adjoint/makefile and relevant verif. accordingly |
1749 |
adcroft |
1.156 |
|
1750 |
heimbach |
1.158 |
checkpoint50f_pre |
1751 |
jmc |
1.157 |
o AIM: near surface temp evaluated from Pot.Temp: fixed for Part Cell ; |
1752 |
|
|
+ change Evap over land. (update aim.5l_cs output) |
1753 |
adcroft |
1.156 |
o added missing .cvsignores and made uniform across expts |
1754 |
|
|
o changed configuration of tidal_basin_2d expt |
1755 |
|
|
o added pkg/debug functions for tracing code in fatal crashes |
1756 |
|
|
o tidied pkg/monitor to use MONITOR_OPTIONS.h |
1757 |
|
|
o new fn in pkg/monitor to stop model if solution grows too big |
1758 |
|
|
o removed lots of single quotes from comments |
1759 |
|
|
|
1760 |
mlosch |
1.155 |
checkpoint50e_post |
1761 |
|
|
o make KPP work with PTRACERS |
1762 |
|
|
- fix gad_calc_rhs to call new routine kpp_transport_ptr, which is |
1763 |
|
|
nearly a copy of kpp_transport_s |
1764 |
|
|
- there is no analogue to SurfaceTendencyS, so I have to use |
1765 |
|
|
gPtr(of the surface layer) instead |
1766 |
|
|
o add a new platform SunFire+mpi (SunFire 15000) to genmake |
1767 |
|
|
checkpoint50e_pre |
1768 |
|
|
|
1769 |
|
|
checkpoint50d_post |
1770 |
mlosch |
1.154 |
o change kpp output from multiple-record state files to single-record state |
1771 |
|
|
files analogous to write_state.F |
1772 |
|
|
o reduce the output frequency of cg3d-related stuff to the monitor frequency, |
1773 |
|
|
analogous to the cg2d-related output. |
1774 |
mlosch |
1.155 |
o fix small problem with in ptracers_write_checkpoint.F: len(suff)=512, |
1775 |
|
|
so that writing to internal file fn (with length 512) fails. |
1776 |
mlosch |
1.154 |
checkpoint50d_pre |
1777 |
jmc |
1.151 |
|
1778 |
jmc |
1.153 |
checkpoint50c_post |
1779 |
|
|
o fix problem in ini_procs.F when using MPI (was there since checkpoint48f) |
1780 |
jmc |
1.152 |
o add monitor diagnostic of vorticity (mon_vort3.F) and potential energy. |
1781 |
jmc |
1.151 |
o add time-average diagnostic of U*V and vertical diffusive flux for theta. |
1782 |
|
|
o bug fixed in convective adjustment diagnostic (multi-tile set-up). |
1783 |
|
|
o 4th Order Adv scheme: return to previous (c40pre7) masking near boundaries. |
1784 |
dimitri |
1.150 |
|
1785 |
|
|
checkpoint50c_pre |
1786 |
|
|
Merging from release1_p13: |
1787 |
|
|
o bug fix for pkg/seaice dynamic solver |
1788 |
|
|
o Added SEAICE_initialHEFF to pkg/seaice |
1789 |
jmc |
1.149 |
|
1790 |
|
|
checkpoint50b_post |
1791 |
|
|
o store u*,v* in gU,V instead of in guNm1,gvNm1 |
1792 |
|
|
o in order to put the momForcing out of the Adams-Bashforth: |
1793 |
|
|
move forcing & CD-scheme calls from mom_fluxform & mom_vecinv |
1794 |
|
|
to timestep.F |
1795 |
|
|
o new flag "useCDscheme" (default=F); replace guCD,gvCD by local arrays |
1796 |
|
|
o re-generate output for highly sensitive test-exp: |
1797 |
|
|
global_ocean_pressure, ideal_2D_oce, lab_sea, natl_box |
1798 |
heimbach |
1.146 |
|
1799 |
jmc |
1.148 |
checkpoint50b_pre |
1800 |
jmc |
1.147 |
o restore the use of momAdvection & useCoriolis flags (mom_vecinv) |
1801 |
heimbach |
1.146 |
o corrected CPP option mismatch in exf_Bulk... functions for case |
1802 |
|
|
#define ALLOW_ATM_WIND && #undef ALLOW_ATM_TEMP |
1803 |
heimbach |
1.145 |
|
1804 |
|
|
checkpoint50a_post |
1805 |
|
|
o Bug fix for merging between c50 and KPP. |
1806 |
|
|
ikey was passed from thermodynamics to kpp_calc via |
1807 |
|
|
common block rather than being recomputed in kpp_calc, |
1808 |
|
|
in contradiction with new key itdkey. |
1809 |
|
|
New key ikppkey created, and tamc.h headers updated. |
1810 |
heimbach |
1.143 |
|
1811 |
heimbach |
1.144 |
checkpoint50 |
1812 |
|
|
- 2nd step of merge with ecco-branch: |
1813 |
|
|
merge changes in ecco-branch back into main trunk |
1814 |
|
|
- bug fix in find_alpha |
1815 |
|
|
- more storing in gmredi_calc_tensor.F, kpp_routines.F |
1816 |
|
|
- avoid iterative loop in ini_pressure for ALLOW_AUTODIFF_TAMC |
1817 |
|
|
- merged some sliced AD support routines |
1818 |
|
|
|
1819 |
heimbach |
1.143 |
checkpoint49 |
1820 |
|
|
merged from ecco-branch: |
1821 |
|
|
o exf: |
1822 |
|
|
- Enable initialisation of forcing fields to constant |
1823 |
|
|
(runtime) values. |
1824 |
|
|
- in exf_getffields.F |
1825 |
|
|
Reduce i-/j-loop to interior domain, discarding overlaps. |
1826 |
|
|
That also fixes wrong TAF-key computations for key_1, key_2 |
1827 |
|
|
with bulf formulae. |
1828 |
|
|
- exf_init.F modify #ifdef for exf_init_evap |
1829 |
|
|
- exf_getffieldrec.F, ctrl_getrec.F |
1830 |
|
|
The following INT-usages are not safe: |
1831 |
|
|
fldsecs = int(fldsecs/fldperiod)*fldperiod |
1832 |
|
|
fldcount = int(fldsecs/fldperiod) + 1 |
1833 |
|
|
and were modified. |
1834 |
|
|
o autodiff: checkpoint_lev... |
1835 |
|
|
- updated storing for bulk formulae (some arrays were missing) |
1836 |
|
|
- added state for seaice package |
1837 |
|
|
- synchronized with main branch |
1838 |
|
|
o DIVA: |
1839 |
|
|
Modif.s in |
1840 |
heimbach |
1.144 |
- the_main_loop.F |
1841 |
|
|
- the_model_main.F |
1842 |
heimbach |
1.143 |
and added cost_final_restore.F cost_final_store.F |
1843 |
|
|
o With these changes, it is possible to fully separate |
1844 |
|
|
the first forward run to compute the cost function (mdthe_main_loop) |
1845 |
|
|
and adjoint runs over individual DIVA intervals (adthe_main_loop) |
1846 |
|
|
into separate model executions. |
1847 |
|
|
This enables better tuning of DIVA to given queue sizes. |
1848 |
|
|
o Loss of cost function value in consecutive DIVA runs is |
1849 |
|
|
fixed by storing to 'costfinal' file. |
1850 |
|
|
o Appropriate call of ctrl_unpack/_pack,grdchk_main at |
1851 |
|
|
beginning/end of adjoint integration is accounted for. |
1852 |
|
|
The current changes apply to TAF-1.4.26. |
1853 |
|
|
TAF has one remaining bug, requiring one manual change |
1854 |
|
|
(see MITgcm manual). |
1855 |
|
|
o cal: synchronized between MAIN and ecco-branch |
1856 |
heimbach |
1.141 |
|
1857 |
heimbach |
1.142 |
checkpoint48i_post |
1858 |
heimbach |
1.141 |
o Changes to restore differentiability of code w.r.t. previous tag |
1859 |
|
|
(mostly adding new routines to make list and replacing |
1860 |
|
|
pressure by totPhiHyd). |
1861 |
|
|
o Updated and merged grdchk package |
1862 |
|
|
- has both ADM and TLM checks |
1863 |
|
|
- works for single- and multi-proc. |
1864 |
|
|
- output cleaned |
1865 |
|
|
- worked successfully for parallel DIVA |
1866 |
|
|
o genmake: |
1867 |
|
|
- Adding -platform=SP4 |
1868 |
|
|
- Modif. for DEC Alpha (many don't have makedepend; use mkdep instead). |
1869 |
|
|
o Modif. for DIVA: |
1870 |
|
|
ctrl_unpack should not be called in intermediate DIVA interval. |
1871 |
|
|
(similar thing would apply for active files such as |
1872 |
|
|
tbar, sbar, psbar, which should not be reinitialised; |
1873 |
|
|
only relevant for ecco-branch) |
1874 |
dimitri |
1.136 |
|
1875 |
heimbach |
1.140 |
checkpoint48h_post |
1876 |
jmc |
1.137 |
o improve "ini_p_ground" when using finite difference form for calc_phi_hyd |
1877 |
dimitri |
1.136 |
o Added net flux to downward flux conversion to pkg/exf/exf_getffields.F |
1878 |
|
|
o Added SEAICE_initialHEFF to pkg/seaice |
1879 |
dimitri |
1.139 |
o ecco_the_model_main.F: SEAICE_WRITE_PICKUP must precede WRITE_CHECKPOINT |
1880 |
jmc |
1.135 |
|
1881 |
|
|
checkpoint48g_post |
1882 |
|
|
--- EOS: |
1883 |
|
|
o compute locally the pressure for use in EOS: UNESCO, JMD95P, MDJWF |
1884 |
|
|
store total Potential in totPhyHyd for diagnostics & EOS. |
1885 |
|
|
o fix restart and overlap Pb when using Z-coord and EOS funct. of P |
1886 |
|
|
--- Pressure/geopotential gradient: |
1887 |
|
|
o use Ro_surf & R_low instead of hFac in cal_phi_hyd: |
1888 |
|
|
o NLFS + p-coord.: eta*Alpha' is not longer lagging 1.time-step behind |
1889 |
|
|
( changes results of global_ocean_pressure ) |
1890 |
|
|
o NLFS + z-coord.: add eta*Rho' contribution. |
1891 |
|
|
o accurate phiHyd when using interface-W at the middle between 2 centers |
1892 |
|
|
( changes results of ideal_2D_oce ) |
1893 |
|
|
o includes r* 2nd term in potential gradient. |
1894 |
dimitri |
1.134 |
|
1895 |
|
|
checkpoint48f_post |
1896 |
|
|
Merging from release1_p12: |
1897 |
|
|
o Modifications for using pkg/exf with pkg/seaice |
1898 |
|
|
- improved description of the various forcing configurations |
1899 |
|
|
- added basic radiation bulk formulae to pkg/exf |
1900 |
|
|
- units/sign fix for evap computation in exf_getffields.F |
1901 |
|
|
- updated verification/global_with_exf/results/output.txt |
1902 |
|
|
o Added pkg/sbo for computing IERS Special Bureau for the Oceans |
1903 |
|
|
(SBO) core products, including oceanic mass, center-of-mass, |
1904 |
|
|
angular, and bottom pressure (see pkg/sbo/README.sbo). |
1905 |
|
|
o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F |
1906 |
|
|
to avoid negative values in shallow regions. |
1907 |
|
|
- updated verification/natl_box/results/output.txt |
1908 |
|
|
- updated verification/lab_sea/results/output.txt |
1909 |
|
|
o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F |
1910 |
|
|
o Added useSingleCpuIO option (see PARAMS.h). |
1911 |
|
|
o Updated useSingleCpuIO option in mdsio_writefield.F to |
1912 |
|
|
work with multi-field files, e.g., for single-file pickup. |
1913 |
|
|
o pkg/seaice: |
1914 |
|
|
- bug fix in growth.F: QNET for no shortwave case |
1915 |
|
|
- added HeffFile for specifying initial sea-ice thickness |
1916 |
|
|
- changed SEAICE_EXTERNAL_FLUXES wind stress implementation |
1917 |
|
|
o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, |
1918 |
|
|
kpp_transport_t.F, forward_step.F, and the_main_loop.F |
1919 |
|
|
o pkg/seaice: |
1920 |
|
|
- adjoint-friendly modifications |
1921 |
|
|
- added a SEAICE_WRITE_PICKUP at end of the_model_main.F |
1922 |
jmc |
1.131 |
|
1923 |
jmc |
1.133 |
checkpoint48e_post |
1924 |
jmc |
1.131 |
o New S/R for diagnostic of bottom pressure (phi0surf was missing in c48d_post) |
1925 |
jmc |
1.132 |
o dynamics: change definition of computational domain & adapt mom_fluxform |
1926 |
|
|
accordingly ; when viscA4=0, allows to run the dynamics with Olx=Oly=2. |
1927 |
|
|
o following exp works with Olx=Oly=2 (and pass through checkbounds option): |
1928 |
|
|
adjust_nlfs.cs-32x32x1 adjustment.128x64x1 adjustment.cs-32x32x1 |
1929 |
jmc |
1.133 |
exp0 exp1 exp2 exp4 exp5 hs94.cs-32x32x5 hs94.128x64x5 hs94.1x64x5 |
1930 |
jmc |
1.132 |
global_ocean.90x40x15 global_with_exf global_ocean_pressure |
1931 |
|
|
inverted_barometer solid-body.cs-32x32x1 |
1932 |
|
|
(high order AdvScheme and/or multiDimAd works with Olx=Oly=2 ? not sure) |
1933 |
jmc |
1.130 |
|
1934 |
|
|
checkpoint48d_post |
1935 |
|
|
o in preparation for r*: |
1936 |
|
|
a) use pre-computed gradient of hydrostatic potential: |
1937 |
|
|
changes in timestep.F & mom_cdscheme.F affects results of ideal_2D_oce |
1938 |
|
|
b) move phi0surf from calc_phi_hyd to calc_grad_phi_hyd: |
1939 |
|
|
=> affects results of glob_oce_pressure (different truncation error) |
1940 |
|
|
update output.txt of ideal_2D_oce & global_ocean_pressure |
1941 |
jmc |
1.129 |
|
1942 |
|
|
checkpoint48d_pre |
1943 |
|
|
o in preparation for r*: |
1944 |
|
|
new S/R (calc_grad_phi_hyd.F) to compute Hydrostatic potential gradient. |
1945 |
|
|
pass the 2 comp. of the grad. as arguments to momentum S/R. |
1946 |
|
|
but for the moment, only used if it does not change the results. |
1947 |
|
|
o add finite volume form of calc_phi_hyd for buoyancyRelation OCEANIC & OCEANICP |
1948 |
jmc |
1.126 |
|
1949 |
heimbach |
1.128 |
checkpoint48c_post |
1950 |
|
|
Modifications in treatment of initial flux forcing controls |
1951 |
|
|
to avoid extra storing of flux fields. |
1952 |
|
|
|
1953 |
|
|
checkpoint48c_pre |
1954 |
adcroft |
1.127 |
o Added tidal_basin_2d experiment (currently 1D!) |
1955 |
jmc |
1.126 |
o can use r* Coordinate with OBC (but Orlanski Rad. BC not yet implemented) |
1956 |
jmc |
1.124 |
|
1957 |
jmc |
1.125 |
checkpoint48b_post |
1958 |
jmc |
1.124 |
o r* coordinate added in #ifdef NONLIN_FRSURF block. |
1959 |
|
|
(modification to pressure gradient not yet implemented) |
1960 |
|
|
o mom_fluxform: new S/R mom_calc_rtrans.F computes vertical transports |
1961 |
|
|
(for U & V) that are used for vertical advection of momentum. |
1962 |
jmc |
1.123 |
|
1963 |
|
|
checkpoint48a_post |
1964 |
|
|
o In preparation for r*, use temp. array to compute vertical transport |
1965 |
|
|
in flux-form momentum pkg. => change results of few test-exp. |
1966 |
|
|
Update output of: exp4, exp5, front_relax, global_ocean_pressure, |
1967 |
|
|
lab_sea, natl_box & plume_on_slope |
1968 |
jmc |
1.122 |
|
1969 |
|
|
checkpoint48 |
1970 |
|
|
o fix small bug that was causing lot of warning (TIMER_STOP 'UPDATE_CG2D') |
1971 |
heimbach |
1.121 |
|
1972 |
|
|
checkpoint47j_post |
1973 |
jmc |
1.120 |
o add new exp. (ideal_2D_oce) to test "exotic" parameters and options. |
1974 |
heimbach |
1.121 |
o moved adexch from forward_step to addummy_in_stepping |
1975 |
|
|
o added exch in ctrl_map_... |
1976 |
|
|
o aveFreq.=0. at end of cost_final to avoid overwrite in |
1977 |
|
|
reverse checkpointing loop |
1978 |
|
|
o Yet more changes in gmredi: |
1979 |
|
|
* adgmredi_calc_tensor |
1980 |
|
|
avoiding all recomputation of gmredi_slope_limit |
1981 |
|
|
* adgmredi_x/y/rtransport |
1982 |
|
|
added flag for excessive storing to avoid recomp. of |
1983 |
|
|
u/v/rtans, dTdx/y/z |
1984 |
|
|
-> this is not really necessary and very memory-consuming |
1985 |
|
|
* adgmredi_slope_psi: |
1986 |
|
|
consistency with gmredi_slope_limit in treatment of GM_slopeSqCutoff |
1987 |
|
|
* gmredi_slope_limit |
1988 |
|
|
re-activated full calculation of taperfct for case 'ac02' |
1989 |
|
|
o updating verification/ adjoints of carbon, global_ocean.90x40x15 |
1990 |
heimbach |
1.116 |
|
1991 |
jmc |
1.119 |
checkpoint47i_post |
1992 |
|
|
o GM_EXCLUDE_() replace GM_TAPER_(): by default, all the code is compiled. |
1993 |
|
|
o add GM_Small_Number & GM_slopeSqCutoff as run-time parameters (data.gmredi) |
1994 |
|
|
default values = 1.D-12 & 1.D+48 (=> give same results as checkpoint47f_post) |
1995 |
|
|
o cg2dTargetResWunit: define tolerance using deltaTmom (and not deltaTfreesurf) |
1996 |
|
|
o gmredi: fix few bugs. |
1997 |
|
|
|
1998 |
adcroft |
1.118 |
checkpoint47h_post (duplicate tag for PH's c48 tag, in order to move c48) |
1999 |
heimbach |
1.116 |
This will be a good checkpoint to plug into the ecco-branch. |
2000 |
|
|
o few modif.'s to get latest version adjointed |
2001 |
|
|
(mainly kick out code in ini_linear_phisurf) |
2002 |
|
|
o modif's to run adjoint with exactConserv |
2003 |
|
|
o case GM_BOLUS_ADVEC should be cleaned |
2004 |
|
|
S/R gmredi_slope_psi should be cleaned |
2005 |
|
|
o verification/carbon now has exactConserv=.TRUE. |
2006 |
jmc |
1.114 |
|
2007 |
heimbach |
1.115 |
checkpoint47g_post |
2008 |
jmc |
1.114 |
o time-average AIM output: becomes independent from statvars time-average |
2009 |
|
|
(can be used with #undef ALLOW_TIMEAVE) ; add new variables (e.g., RH) |
2010 |
heimbach |
1.115 |
o After TAF bug fix: |
2011 |
|
|
Tested adjoint of gmredi package. |
2012 |
|
|
Tests were done with checkpoint47 rather than with latest |
2013 |
|
|
checkpoint47f_post since the latter is broken for the adjoint |
2014 |
|
|
verification/carbon/ contains both ADM and TLM gradient checks. |
2015 |
|
|
Here they are, before they get changed/lost/stolen. |
2016 |
|
|
Mostly modif.'s to fix numerical sensitivities. |
2017 |
|
|
Gradient checks OK for |
2018 |
|
|
- GM_taper_scheme: |
2019 |
|
|
* clipping |
2020 |
|
|
* ac02 |
2021 |
|
|
* linear |
2022 |
|
|
* glw91 |
2023 |
|
|
* dm95 |
2024 |
|
|
* ldd97 |
2025 |
|
|
- GMREDI_OPTIONS: |
2026 |
|
|
* GM_VISBECK_VARIABLE_K |
2027 |
|
|
* GM_NON_UNITY_DIAGONAL |
2028 |
|
|
* GM_EXTRA_DIAGONAL |
2029 |
|
|
* GM_BOLUS_ADVEC |
2030 |
|
|
in conjunction with data.gmredi parameters to be checked in |
2031 |
|
|
in a few minutes under verification/carbon/code/ |
2032 |
cheisey |
1.112 |
|
2033 |
dimitri |
1.113 |
checkpoint47f_post |
2034 |
|
|
Merging from release1_p10: |
2035 |
|
|
o modifications for using pkg/exf with pkg/seaice |
2036 |
|
|
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING |
2037 |
|
|
and SEAICE_EXTERNAL_FLUXES |
2038 |
|
|
- pkg/exf CPP options EXF_READ_EVAP and |
2039 |
|
|
EXF_NO_BULK_COMPUTATIONS |
2040 |
|
|
- usage examples are Experiments 8 and 9 in |
2041 |
|
|
verification/lab_sea/README |
2042 |
|
|
- verification/lab_sea default experiment now uses |
2043 |
|
|
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf |
2044 |
|
|
|
2045 |
cheisey |
1.112 |
checkpoint47e_post |
2046 |
|
|
o created a tag prior to creating a branch |
2047 |
|
|
|
2048 |
mlosch |
1.111 |
checkpoint47d_post |
2049 |
|
|
o fixed bug in the oceanic pressure coordinates code: vertical viscosity |
2050 |
|
|
at the bottom boundary had an erroneous half slip boundary condition |
2051 |
|
|
o added bottom drag and no slip boundary condition capabilities to |
2052 |
|
|
oceanic pressure coordinates code |
2053 |
|
|
o added new verification experiment global_ocean_pressure, this experiment is |
2054 |
|
|
also described in the tutorial section of the manual |
2055 |
|
|
checkpoint47d_pre |
2056 |
cheisey |
1.110 |
|
2057 |
|
|
checkpoint47c_post |
2058 |
|
|
o Added a verification experiment for a global cubed-sphere ocean run |
2059 |
|
|
- verification/global_ocean.cubed32x32x30 |
2060 |
|
|
- uses pkg/therm_seaice and pkg/bulk_forcing |
2061 |
jmc |
1.109 |
|
2062 |
|
|
o allow to run AIM physics with SPEEDY input files (from Franco Molteni) |
2063 |
|
|
o allow a more accurate definition of Ro_Surf (selectFindRoSurf=1) |
2064 |
|
|
when using P-coordinate; only implemented for atmospheric config. |
2065 |
|
|
o OCEANICP & realFreshWater: include P-E direct effect on wVel ; |
2066 |
|
|
NOTES: requires option NONLIN_FRSURF to be "#define". |
2067 |
|
|
o update advect_xz/results/output.txt (left from checkpoint44g_post) |
2068 |
dimitri |
1.108 |
|
2069 |
|
|
checkpoint47b_post |
2070 |
|
|
Merging from release1_p9: |
2071 |
|
|
o pkg/seaice |
2072 |
|
|
- removed GOTO's and added taf directives |
2073 |
|
|
- double precision constants to reduce the g77 (Linux) |
2074 |
|
|
to F77 (SGI) differences reported in release1_p8 |
2075 |
|
|
o tools/genmake |
2076 |
|
|
- added SGI options |
2077 |
|
|
o verification/testscript |
2078 |
|
|
- updated to that of checkpoint47a_post |
2079 |
|
|
o verification/global_ocean.90x40x15/input/eedata |
2080 |
|
|
- modified for SGI f77 compatibility |
2081 |
|
|
o verification/lab_sea |
2082 |
|
|
- added description of sea-ice model |
2083 |
|
|
- added missing matlab routines |
2084 |
|
|
- added test of thermodynamics parallelization |
2085 |
jmc |
1.105 |
|
2086 |
jmc |
1.106 |
checkpoint47a_post |
2087 |
jmc |
1.105 |
o new pkg: aim_v23 |
2088 |
|
|
= F. Molteni atmos.physics (SPEEDY, ver23) adapted to MITgcm. |
2089 |
|
|
for now, keep the same surface forcing as before. |
2090 |
|
|
- Part-Cell implemented into AIM; check that Heat & Water are conserved |
2091 |
|
|
- aim.5l_cs: use new aim pkg (run 10yr & get better results than before) |
2092 |
|
|
- aim.5l_LatLon & aim.5l_Equatorial_Channel are still using old aim pkg |
2093 |
|
|
o add diagnostic of surface correction term in monitor output |
2094 |
jmc |
1.106 |
|
2095 |
|
|
o bulk_force and therm_seaice |
2096 |
cheisey |
1.107 |
- Two packages: bulk_force (Bulk forcing) |
2097 |
|
|
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2 |
2098 |
|
|
- Earlier integration from Stephaine Dutkiewicz |
2099 |
|
|
and Patrick Heimbach. |
2100 |
|
|
- Two ifdef statements for compile time, |
2101 |
|
|
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE |
2102 |
heimbach |
1.104 |
|
2103 |
|
|
checkpoint47 |
2104 |
|
|
differentiable version of checkpoint46n_post |
2105 |
|
|
o bug fix in quasihydrostaticterms |
2106 |
|
|
o * "clean" adjoint code (in terms of extensive recomputations) |
2107 |
|
|
can now be obtained for all GMREDI options (i.e. for |
2108 |
|
|
- GM_VISBECK_VARIABLE_K |
2109 |
|
|
- GM_NON_UNITY_DIAGONAL |
2110 |
|
|
- GM_EXTRA_DIAGONAL |
2111 |
|
|
- GM_BOLUS_ADVEC ) |
2112 |
|
|
* However, wrong gradient check problem remains unsolved. |
2113 |
|
|
* New CPP options have been introduced for different |
2114 |
|
|
tapering schemes |
2115 |
|
|
o external_fields_load now part of differentiation list |
2116 |
|
|
o pressure needs multiple storing; |
2117 |
|
|
would be nice to have store_pressure at beginning or |
2118 |
|
|
end of forward_step, e.g. by having phiHyd global (5-dim.) |
2119 |
|
|
(NB: pressure is needed for certain cases in find_rho, |
2120 |
|
|
which is also invoked through convective_adjustment). |
2121 |
|
|
o recomputations in find_rho for cases |
2122 |
|
|
'JMD95'/'UNESCO' or 'MDJWF' are OK. |
2123 |
|
|
o #define ATMOSPHERIC_LOADING should be differentiable |
2124 |
|
|
o ini_forcing shifted to begining of initialise_varia |
2125 |
|
|
o Incorporating QNVS line search routines into MITgcm |
2126 |
|
|
(this is separate code, and therefore not under pkg) |
2127 |
|
|
lsopt/, optim/ |
2128 |
|
|
o Updated verification/carbon/ |
2129 |
|
|
- #define GM_VISBECK_VARIABLE_K |
2130 |
|
|
- GM_taper_scheme = 'ldd97' |
2131 |
heimbach |
1.103 |
|
2132 |
|
|
checkpoint46n_post |
2133 |
|
|
Merging from release1_p8: |
2134 |
|
|
o verification/natl_box: |
2135 |
|
|
updating new external_fields_load routine |
2136 |
|
|
o New package: pkg/seaice |
2137 |
|
|
Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle). |
2138 |
|
|
The sea-ice code is based on Hibler (1979-1980). |
2139 |
|
|
Two sea-ice dynamic solvers, ADI and LSR, are included. |
2140 |
|
|
In addition to computing prognostic sea-ice variables and diagnosing |
2141 |
|
|
the forcing/external data fields that drive the ocean model, |
2142 |
|
|
SEAICE_MODEL also sets theta to the freezing point under sea-ice. |
2143 |
|
|
The implied surface heat flux is then stored in variable |
2144 |
|
|
surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and |
2145 |
|
|
kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the |
2146 |
|
|
non-local transport term. Because this call precedes model |
2147 |
|
|
thermodynamics, temperature under sea-ice may not be "exactly" at |
2148 |
|
|
the freezing point by the time theta is dumped or time-averaged. |
2149 |
|
|
N.B.: fairly large differences in accuracy occur across |
2150 |
|
|
different platforms/compilers; comparison between |
2151 |
|
|
g77 (Linux) and F77 (SGI Origin 2000/MIPSpro) |
2152 |
|
|
generated output gives: |
2153 |
|
|
T S U V |
2154 |
|
|
C D M c m s m s m s m s |
2155 |
|
|
n p a R g m m e . m m e . m m e . m m e . |
2156 |
|
|
f n k u 2 i a a d i a a d i a a d i a a d |
2157 |
|
|
g d e n d n x n . n x n . n x n . n x n . |
2158 |
|
|
|
2159 |
|
|
Y Y Y Y 5 5 7 7 7 8 10 9 6 6 6 6 7 5 7 5 7 FAIL lab_sea |
2160 |
|
|
o GAD: |
2161 |
|
|
- generated new common blocks to account for call of |
2162 |
|
|
same gad routines with differing traceridentities |
2163 |
|
|
(needed to modify tracerIdentity indices in GAD.h) |
2164 |
|
|
- generated separate common blocks for case useCubedSphereExchange |
2165 |
|
|
(Department of Futurology) |
2166 |
|
|
- parameter lists to gmredi_?transport: added tracerIdentity |
2167 |
|
|
- added new key indices to tamc.h |
2168 |
|
|
o external_fields_load: |
2169 |
|
|
- added this routine to TAF list |
2170 |
|
|
- needed to make some common blocks global and additional storing |
2171 |
|
|
along the same lines as exf package (checkpoint_lev?_directives.h) |
2172 |
|
|
o exf: |
2173 |
|
|
updated external forcing package |
2174 |
|
|
- bug fixes carried over from ecco-branch |
2175 |
|
|
(missing OBCS_OPTIONS.h in two routines) |
2176 |
|
|
- enable easy to use "no forcing". |
2177 |
|
|
- added exf I/O for atmospheric loading |
2178 |
|
|
- added exf I/O for runoff data |
2179 |
|
|
- transfered scaling between exf <-> MITgcm to exf namelist |
2180 |
|
|
o Adding new verification experiment global_with_exf. |
2181 |
|
|
This verification experiment is almost identical to the |
2182 |
|
|
global_ocean.90x40x15 experiment, except that it uses |
2183 |
|
|
the exf (and cal) package instead of the |
2184 |
|
|
external_fields_load routine (cf README file). |
2185 |
adcroft |
1.94 |
|
2186 |
adcroft |
1.102 |
checkpoint46m_post |
2187 |
adcroft |
1.101 |
o modified testscript to return -- when there are no lines of "%MON" output |
2188 |
adcroft |
1.100 |
o added new flag "quasiHydrostatic" for QH mode |
2189 |
|
|
and new routine quasihydrostaticterms() |
2190 |
adcroft |
1.99 |
o added 2*Omega*Cos(phi)*W to u equations (non-hydrostatic Coriolis term) |
2191 |
|
|
New routine: mom_u_coriolis_nh() |
2192 |
adcroft |
1.98 |
o fixed sign of non-hydrostatic metric terms in u and v equations. |
2193 |
|
|
Depend on correct sign of gravitySign. |
2194 |
adcroft |
1.97 |
o added work.pc* to .cvsignore in aim directories using ifc |
2195 |
adcroft |
1.96 |
o introduced flag for controllin non-hydrostatic metric terms |
2196 |
adcroft |
1.95 |
o removed gravitySign from PARM04 |
2197 |
adcroft |
1.94 |
o switched to g77/ifc from pgf77 in aim experiments |
2198 |
mlosch |
1.93 |
|
2199 |
|
|
checkpoint46l_post |
2200 |
|
|
o made convective adjustment work with pressure coordinates: |
2201 |
|
|
- changed the direction of k-loop in convective_adjustment.F for the |
2202 |
|
|
case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) |
2203 |
|
|
- adjusted the reference pressure k-index in convective_adjustment.F |
2204 |
|
|
- adjusted the convection condition in convect.F (in analogy to |
2205 |
|
|
calc_ivdc.F) |
2206 |
|
|
- convective_adjustment no longer computes anything on the halos |
2207 |
|
|
- removed the warnings about negative salinity from find_rho.F and |
2208 |
|
|
find_alpha.F; instead the new routine look_for_neg_salinity, called |
2209 |
|
|
at the beginning of find_rho, find_alpha, and find_beta, does a |
2210 |
|
|
check of the entire slice, if CPP-option |
2211 |
|
|
CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined |
2212 |
|
|
checkpoint46l_pre |
2213 |
mlosch |
1.91 |
|
2214 |
mlosch |
1.92 |
checkpoint46k_post |
2215 |
mlosch |
1.91 |
o fixed the verification/global_ocean.90x40x15 experiment: |
2216 |
|
|
- new bathymetry (the world according to A., JMC, and M.) |
2217 |
|
|
- new initial fields and forcing fields (*.bin files) |
2218 |
|
|
- new POLY3.COEFFS (for the next release one should switch to a full |
2219 |
|
|
equation of state: JMD95P or MDJWF) |
2220 |
|
|
- fixed several errors and redundancies in the data file |
2221 |
|
|
- experiment uses looped cells |
2222 |
|
|
- added matlab directory with diagnostic scripts for plotting of output |
2223 |
jmc |
1.90 |
|
2224 |
|
|
o S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F: |
2225 |
|
|
- read AIM physics parameters from a file (data.aimphys) |
2226 |
|
|
- set defaults values = F.Molteni paper (Clim.Dyn., 2002) |
2227 |
jmc |
1.89 |
|
2228 |
|
|
checkpoint46j_post |
2229 |
|
|
o split calc_exact_eta in 2 S/R : integr_continuity & update_etaH |
2230 |
|
|
o move wVel computation at the end of the time step, in S/R integr_continuity |
2231 |
|
|
o create specific S/R to exchange T,S before DYNAMICS (for stagger time step) |
2232 |
|
|
o update timeave pkg for wVel diagnostic. |
2233 |
|
|
checkpoint46j_pre |
2234 |
mlosch |
1.87 |
|
2235 |
jmc |
1.88 |
checkpoint46i_post |
2236 |
|
|
o Clean up AIM package (and keep the results unchanged): |
2237 |
|
|
include CPP_OPTION and use IMPLICT NONE in all routines ; |
2238 |
|
|
declare all the variables _RL ; use _d 0 for all numerical constants. |
2239 |
|
|
use ifdef ALLOW_AIM everywhere. And now AIM can be used with g77 ! |
2240 |
mlosch |
1.87 |
|
2241 |
|
|
checkpoint46h_post |
2242 |
|
|
o cleaned up the use of rhoNil and rhoConst. |
2243 |
|
|
- rhoNil should only appear in the LINEAR equation of state, everywhere |
2244 |
|
|
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst |
2245 |
|
|
and the dynamical equations are all divided by rhoConst |
2246 |
|
|
o introduced new parameter rhoConstFresh, a reference density of fresh |
2247 |
|
|
water, to remove the fresh water flux's dependence on rhoNil. The default |
2248 |
|
|
value is 999.8 kg/m^3 |
2249 |
|
|
o cleanup up external_forcing.F and external_forcing_surf.F |
2250 |
|
|
- can now be used by both OCEANIC and OCEANICP |
2251 |
|
|
checkpoint46h_pre |
2252 |
|
|
|
2253 |
|
|
Added code to convert surface volume flux (fresh water) into |
2254 |
|
|
a mass flux when using P coordinates in the ocean (OCEANICP). |
2255 |
|
|
Note: It assumes you have set rho0=rhoConst=density of fresh water. |
2256 |
mlosch |
1.86 |
|
2257 |
|
|
checkpoint46g_post |
2258 |
|
|
o Include a new diagnostic variable phiHydLow for the ocean model |
2259 |
|
|
- in z-coordinates, it is the bottom pressure anomaly |
2260 |
|
|
- in p-coordinates, it is the sea surface elevation |
2261 |
|
|
- in both cases, these variable have global drift, reflecting the mass |
2262 |
|
|
drift in z-coordinates and the volume drift in p-coordinates |
2263 |
|
|
- included time averaging for phiHydLow, be aware of the drift! |
2264 |
|
|
o depth-dependent computation of Bo_surf for pressure coordinates |
2265 |
|
|
in the ocean (buoyancyRelation='OCEANICP') |
2266 |
|
|
- requires a new routine (FIND_RHO_SCALAR) to compute density with only |
2267 |
|
|
Theta, Salinity, and Pressure in the parameter list. This routine is |
2268 |
|
|
presently contained in find_rho.F. This routine does not give the |
2269 |
|
|
correct density for 'POLY3', which would be a z-dependent reference |
2270 |
|
|
density. |
2271 |
|
|
o cleaned up find_rho |
2272 |
|
|
- removed obsolete 'eqn' from the parameter list. |
2273 |
|
|
o added two new verification experiments: gop and goz |
2274 |
|
|
(4x4 degree global ocean, 15 layers in pressure and height coordinates) |
2275 |
|
|
checkpoint46g_pre |
2276 |
heimbach |
1.85 |
|
2277 |
|
|
checkpoint46f_post |
2278 |
|
|
o Enable tangent linear (forward mode) gradient checks: |
2279 |
|
|
- extended active file handling to g_... files |
2280 |
|
|
- added TANGENT_SIMULATION to theSimulationMode |
2281 |
|
|
- extended grdchk package accordingly |
2282 |
|
|
o added tangent linear setup in verification/carbon/code_ftl |
2283 |
|
|
o added adjoint setup in verification/front_relax/code_ad |
2284 |
mlosch |
1.82 |
|
2285 |
cnh |
1.84 |
checkpoint46e_post |
2286 |
mlosch |
1.83 |
o Added new equation of state -> MDJWF |
2287 |
|
|
- EOS of McDougall et al., 2002, JAOT, submitted |
2288 |
|
|
- caveat: the equation of state is only valid for a smaller (more |
2289 |
|
|
realistic?) range of values than JMD95P/Z and UNESCO |
2290 |
|
|
- added masks to the calculation of pressure in store_pressure |
2291 |
|
|
- added more check values for density in check_eos (ini_eos.F), some of |
2292 |
|
|
the old check values are out of the range of the MDJWF-eos, so don't |
2293 |
|
|
expect perfect matches for those |
2294 |
cnh |
1.84 |
checkpoint46e_pre |
2295 |
mlosch |
1.83 |
|
2296 |
mlosch |
1.82 |
checkpoint46d_post |
2297 |
|
|
o fixed store_pressure to work with both buoyancy relation = 'OCEANIC' and |
2298 |
|
|
'OCEANICP', also initialised field pressure correctly in ini_eos in the |
2299 |
|
|
case of pressure coordinates. eosType='JMD95Z' in |
2300 |
|
|
combination with buoyancyRelation='OCEANICP' now causes an error. |
2301 |
|
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
2302 |
|
|
in find_alpha/beta. |
2303 |
|
|
checkpoint46d_pre |
2304 |
|
|
|
2305 |
|
|
o Changed p = pressure(i,j,k,bi,bj) to p = pressure(i,j,kRef,bi,bj) |
2306 |
|
|
so that JMD95Z and JMD95P give approptiate static stability in find_rho. |
2307 |
adcroft |
1.81 |
|
2308 |
|
|
checkpoint46c_post |
2309 |
|
|
o Changes necessary for ocean in p-coordinates |
2310 |
|
|
- Added new buoyancy relation = 'OCEANICP' |
2311 |
|
|
- Added new parameters = gravitySign (this used to be contained inside |
2312 |
|
|
the factor dRdZ which I added when we first switched to R coordinates). |
2313 |
|
|
X GM/Redi is not compatible (yet) |
2314 |
|
|
X bottom drag and no-slip need to be debugged. |
2315 |
|
|
checkpoint46c_pre |
2316 |
mlosch |
1.80 |
|
2317 |
|
|
checkpoint46b_post |
2318 |
|
|
o Added new equation of state -> JMD95Z and JMD95P |
2319 |
mlosch |
1.83 |
- EOS of Jackett and McDougall, 1995, JAOT |
2320 |
mlosch |
1.80 |
- moved all EOS parameters into EOS.h |
2321 |
|
|
- new routines ini_eos.F, store_pressure.F |
2322 |
|
|
o Added UNESCO EOS, but not recommended because it requires |
2323 |
|
|
in-situ temperature (see JMD95) |
2324 |
|
|
o Modified formatting for knudsen2.f in utils/knudsen2 and added |
2325 |
|
|
unesco.f to be used with POLY3 |
2326 |
|
|
checkpoint46b_pre |
2327 |
mlosch |
1.79 |
|
2328 |
|
|
checkpoint46a_post |
2329 |
|
|
o Added (atmospheric) pressure loading |
2330 |
|
|
- new field in FFIELDS.h, etc... |
2331 |
|
|
- new cpp flag ATMOSPHERIC_LOADING |
2332 |
|
|
o Changed hFacC to _hFacC in calc_phi_hyd.F |
2333 |
|
|
o Added SHORTWAVE_HEATING to some files for consistency |
2334 |
|
|
checkpoint46a_pre |
2335 |
heimbach |
1.78 |
|
2336 |
|
|
checkpoint46 |
2337 |
|
|
further merges from release1_p5 |
2338 |
|
|
o new ctrl package |
2339 |
|
|
- adopted from ECCO environment to enable optimization |
2340 |
|
|
- added Eliassen Palm fluxes to controls |
2341 |
|
|
o added Eliassen Palm flux controls to gradient check package |
2342 |
|
|
o cost package |
2343 |
|
|
- Compatible with new ctrl package |
2344 |
|
|
- added Eliassen Palm cost hooks |
2345 |
|
|
- modif's of existing cost functions |
2346 |
|
|
o Adjoint-related bug fixes in kpp: |
2347 |
|
|
- kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix |
2348 |
|
|
- kpp_routines: store of Rib avoids partial recomputation bug of TAF. |
2349 |
|
|
o autodiff package |
2350 |
|
|
- flow directives: |
2351 |
|
|
+ new for S/R do_the_model_io |
2352 |
|
|
+ enhanced for S/R checkpoint |
2353 |
|
|
+ new gmredi.flow |
2354 |
|
|
- Introduced CPP option ALLOW_AUTODIFF_MONITOR to |
2355 |
|
|
disable adcommon.h/g_common.h by default. |
2356 |
|
|
- fixed problem for adjoint of global_max |
2357 |
|
|
o modified verification/carbon/ |
2358 |
|
|
o New setup for adjoint of global_ocean |
2359 |
|
|
o added hooks for Eliassen Palm fluxes (dynamics.F, ini_fields.F) |
2360 |
|
|
o cleaned TAF keys iikey, idkey (dynamics.F, thermodynamics.F) |
2361 |
|
|
o incorporated hooks for sponge layer code (external_forcing.F) |
2362 |
|
|
|
2363 |
jmc |
1.77 |
checkpoint45d_post |
2364 |
|
|
o import 2 fixes from release1_p5 (CG2D.h & packages_readparms.F) |
2365 |
jmc |
1.76 |
o use recip_dx*,recip_dy* instead of /dx*,/dy* in orlanski_E,W,N,S |
2366 |
|
|
(affects plume_on_slope "cg2d" output) |
2367 |
jmc |
1.77 |
o add new parameter deltaTfreesurf for free-surface time stepping |
2368 |
|
|
o exchange gT,gS when using staggerTimeStep & GM & Oly<4 |
2369 |
jmc |
1.75 |
o NONLIN_FRSURF: rescale gNm1 to get a better conservation with A-B |
2370 |
jmc |
1.74 |
o change phiMin in exp1 (to agree with documentation) |
2371 |
|
|
o add new flags: |
2372 |
|
|
- T,S forcing inside/outside Adams-Bashforth |
2373 |
|
|
- turn off temp,salt advection and/or forcing |
2374 |
|
|
- for each tracer, define internal flag for multiDimAdvection & A-B |
2375 |
|
|
o monitor: change definition of KE to check conservation of Energy |
2376 |
heimbach |
1.73 |
|
2377 |
|
|
checkpoint45c_post |
2378 |
|
|
o Removed f90 comments ("!") |
2379 |
|
|
o Modified initialisations to enable exf package for MITgcm |
2380 |
|
|
(without invoking ECCO_PACKAGE). |
2381 |
|
|
o modifications to gradient check package (Martin Losch) |
2382 |
|
|
- enable centered differences |
2383 |
|
|
- modified format of standard output |
2384 |
heimbach |
1.72 |
|
2385 |
|
|
checkpoint45b_post |
2386 |
|
|
o cleaned exchange calls in cg2d |
2387 |
|
|
o Included CPP option ALLOW_AUTODIFF_MONITOR in forward_step |
2388 |
|
|
o included CPP option SINGLE_LAYER_MODE in thermodynamics |
2389 |
|
|
to configure barotropic setup (Martin Losch) |
2390 |
|
|
o moved some initialisations within bi,bj loop in dynamics |
2391 |
|
|
(TAF flow dependency) |
2392 |
|
|
o in initialise_varia, moved call packages_init_variables |
2393 |
|
|
before convective_adjustment_init |
2394 |
|
|
(corresponding adjustment of TAF tape initialisation). |
2395 |
|
|
o in calc_diffusivity/calc_viscosity extended domain to full overlap. |
2396 |
jmc |
1.70 |
|
2397 |
jmc |
1.71 |
checkpoint45a_post |
2398 |
|
|
o compute Rho over the whole domain (extend iMin,jMin indices) |
2399 |
|
|
o specific exchange for X-slice domain (case Ny=1) |
2400 |
jmc |
1.70 |
o argument futureIter of S/R obcs_calc missing in exp4 & internal_wave /code |
2401 |
|
|
o solve_for_pressure : set cg2d_x to zero where OBCS are applied |
2402 |
jmc |
1.67 |
|
2403 |
heimbach |
1.69 |
checkpoint44h_post = checkpoint45 |
2404 |
|
|
o Fix to restore differentiability: |
2405 |
|
|
place at which packages_init_variables is called in |
2406 |
|
|
initialise_varia is crucial for reverse control flow. |
2407 |
|
|
o modifications in GMRedi to enable stable adjoint |
2408 |
|
|
(corresponding modif's in thermodynamics, dynamics) |
2409 |
|
|
o added missing hook for sponge layer code in external_forcing |
2410 |
|
|
o modified test cost functions |
2411 |
|
|
o storing in gad_advection (plus removal of write(0,*)! |
2412 |
|
|
o missing headers TR1.h added in convective_adjustment routines |
2413 |
|
|
o errorMessageUnit set non-equal zero in eeboot |
2414 |
|
|
(conflict on some platforms, e.g. IBM SP3) |
2415 |
|
|
o modified carbon verif. |
2416 |
|
|
|
2417 |
|
|
checkpoint44h_pre |
2418 |
jmc |
1.68 |
o vertical grid option: allow to put the Interface at the middle between |
2419 |
|
|
2 cell-centers ; replace delZ in pkg/kpp by drF. |
2420 |
jmc |
1.67 |
o GM Advective form: Tracers are advected using the residual transport (= |
2421 |
|
|
Euler+GM-bolus); set param GM_AdvSeparate=T to return to previous form. |
2422 |
jmc |
1.66 |
|
2423 |
|
|
checkpoint44g_post |
2424 |
|
|
o fix surface correction term in multiDimAdvection (affects plume_on_slope |
2425 |
|
|
results) ; ifdef missing in thermodynamics.F |
2426 |
adcroft |
1.65 |
|
2427 |
|
|
checkpoint44f_pre,checkpoint44f_post |
2428 |
|
|
o added PTRACERS package |
2429 |
|
|
This allows an arbitrary number of passive tracers to be integrated |
2430 |
|
|
forward simultaneously with the dynamicaly model. |
2431 |
|
|
+ Implemented so far: |
2432 |
|
|
- basic forward algorithm (time-stepping, advection, diffusion, convection) |
2433 |
|
|
- I/O and checkpointing |
2434 |
|
|
- GM/Redi *but* using the GM/Redi coefficient of Salt |
2435 |
|
|
+ Not implemented so far: |
2436 |
|
|
- KPP |
2437 |
|
|
- OBCS |
2438 |
|
|
+ No specific example supplied (yet) but global_ocean.90x40x15 has the |
2439 |
|
|
necessary data.ptracer file. Simply use -enable=ptracers and uncomment |
2440 |
|
|
line in data.pkg. |
2441 |
|
|
+ This package is disabled by default since it increases storage. |
2442 |
|
|
|
2443 |
jmc |
1.60 |
|
2444 |
adcroft |
1.64 |
o testscript: added -cleanup option |
2445 |
jmc |
1.63 |
o Shap_filt: a) new shap_filt S/R to use no-slip BC with S2 filter |
2446 |
|
|
b) enable to filter 2D fields. |
2447 |
adcroft |
1.62 |
|
2448 |
|
|
checkpoint44e_pre,post |
2449 |
|
|
o re-wrote convective adjustment to use pre-calculated weights |
2450 |
|
|
Affects: model/src/convective_adjustment.F, convective_adjustment_ini.F |
2451 |
|
|
Adds: model/src/convective_weights.F, convectively_mixtracer.F |
2452 |
|
|
Original calls to convect() still in place. |
2453 |
heimbach |
1.61 |
|
2454 |
|
|
chkpt44d_pre,post |
2455 |
|
|
o added missing EXCLUDE_MONITOR flags |
2456 |
|
|
o changed "e" to "_d" in gmredi_slope_limit, gmredi_slope_psi |
2457 |
|
|
(incompatible typ in MIN/MAX expressions caused problems |
2458 |
|
|
on IBM SP3) |
2459 |
|
|
o in genmake added variable MAKEDEPEND |
2460 |
|
|
plus resetting for case SunOS |
2461 |
|
|
o added timer_stats.c routine for IBM SP3 |
2462 |
|
|
o removed variables in dynamics |
2463 |
|
|
!!! I forgot to create tag chkpt44d_pre !!! |
2464 |
|
|
!!! But chkpt44d_pre = chkpt44c_post !!! |
2465 |
jmc |
1.63 |
|
2466 |
|
|
o real fresh water flux implemented with non-linear free-surface. |
2467 |
heimbach |
1.58 |
|
2468 |
jmc |
1.59 |
chkpt44c_pre,post |
2469 |
|
|
o few fix (mask in shap_s2, EmPmR in external_field_load, |
2470 |
|
|
USE_NATURAL_BCS in solve_for_P); |
2471 |
|
|
o add arguments myIter & myTime to S/R obcs_calc & solve_for_P |
2472 |
|
|
|
2473 |
heimbach |
1.58 |
checkpoint44b_pre/_post |
2474 |
|
|
o merge of relevant stuff from the ecco-branch: |
2475 |
|
|
- genmake: removed $S64 overwrite for case SunOS |
2476 |
|
|
- pkg/exf: update and corrections for field swapping and obcs |
2477 |
|
|
- pkg/ecco: parameter lists for the_model_main, the_main_loop |
2478 |
|
|
harmonized between ECCO and MITgcm |
2479 |
|
|
- pkg/autodiff: added flow directives for obcs, mdsio_gl_slice |
2480 |
|
|
updated checkpointing_lev... lists for obcs |
2481 |
|
|
- model/src: minor changes in forward_step, plot_field |
2482 |
|
|
added directive for divided adjoint in the_main_loop |
2483 |
|
|
- pkg/mdsio: added mdsio_gl_slice |
2484 |
jmc |
1.57 |
|
2485 |
|
|
o check parameters & config (chkpt44a_pre,post) |
2486 |
jmc |
1.56 |
o OBC and NonLin_FrSurf. |
2487 |
|
|
|
2488 |
heimbach |
1.55 |
checkpoint44 |
2489 |
jmc |
1.54 |
o fix bug in mom_vi_del2uv |
2490 |
jmc |
1.56 |
o select when filters are applied ; add options to zonal_filter (data.zonfilt) |
2491 |
|
|
o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection) |
2492 |
|
|
o update AIM experiments (NCEP input files) |
2493 |
|
|
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf) |
2494 |
heimbach |
1.55 |
o added some stuff for AD |
2495 |
adcroft |
1.53 |
|
2496 |
|
|
checkpoint43 |
2497 |
|
|
o added two new advection tests |
2498 |
|
|
o added global 4x4 degree ocean test |
2499 |
|
|
o added test of H&S94 with free surface on cube |
2500 |
|
|
o some final mods for gradient check, adjoint,... |
2501 |
heimbach |
1.52 |
|
2502 |
|
|
checkpoint42 |
2503 |
|
|
Fixed AD-related problems: |
2504 |
|
|
o Store directives up-to-date with re-arranged Adams-Bashforth |
2505 |
|
|
(mainly thermodynamics.F) |
2506 |
|
|
o New store directives for multi-dim. advection schemes |
2507 |
|
|
* new CPP flag ALLOW_MULTI_DIM_ADVECTION |
2508 |
|
|
* new common block and key passkey |
2509 |
|
|
(mainly gad_advection.F) |
2510 |
|
|
o Modified store directives for split of dynamics/thermodynamics |
2511 |
|
|
for the case ALLOW_KPP |
2512 |
|
|
o Cleaned argument list for timestep_tracer.F |
2513 |
adcroft |
1.51 |
|
2514 |
|
|
checkpoint41 |
2515 |
|
|
o re-formatted/added comments in prologues of key subroutines |
2516 |
|
|
to work with protex |
2517 |
heimbach |
1.47 |
|
2518 |
adcroft |
1.50 |
checkpoint40 |
2519 |
|
|
o moved calc_gs, calc_gt and calc_tr1 back to model/src |
2520 |
|
|
o added FLT (floats) package from Arne along with demo. experiment |
2521 |
|
|
o re-arranged Adams-Bashforth scheme for tracers to allow easier |
2522 |
|
|
implementation of forward-in-time forcing terms |
2523 |
|
|
o more mods for non-linear free-surface including new variable |
2524 |
|
|
o modified multi-dim method to work on cube |
2525 |
|
|
o bug fix in KPP (from DM) |
2526 |
|
|
|
2527 |
adcroft |
1.49 |
checkpoint40pre9 |
2528 |
|
|
o added DST advection schemes |
2529 |
|
|
o fix MPI bug on SGI's |
2530 |
|
|
o modifications for non-linear free-surface |
2531 |
|
|
o fixed conditionals for fixed flow/passive tracer only mode |
2532 |
|
|
o added tension/strain form of stress tensor |
2533 |
|
|
o changes to commenting of arguments for TAF/TAMC |
2534 |
|
|
o added/updated many matlab scripts |
2535 |
adcroft |
1.50 |
o added multi-dimensional advection method for tracers |
2536 |
adcroft |
1.49 |
|
2537 |
adcroft |
1.48 |
checkpoint40pre8 |
2538 |
heimbach |
1.47 |
o new package rw/ |
2539 |
|
|
Added method for dumping intermediate local arrays: |
2540 |
|
|
mdsio_writetile - same as mdsio_writefield except works from inside |
2541 |
|
|
bi,bj loop |
2542 |
|
|
mdsio_writelocal - same as mdsio_writetile except works for local |
2543 |
|
|
arrays |
2544 |
|
|
write_local_r? - higher-level wrapper for mdsio_writelocal |
2545 |
|
|
Controlled by diagFreq. Defaults to zero (ie. no dumps) |
2546 |
|
|
Example given at end of mom_vecinv.F that dumps some local arrays. |
2547 |
|
|
o replaced calc_mom_rhs.F by mom_fluxform.F/mom_vecinc.F to |
2548 |
|
|
control flux-form versus vector invariant code. |
2549 |
|
|
Switch is runtime flag vectorInvariantMomentum (defaults to false) |
2550 |
|
|
or genmake -DISABLE ... |
2551 |
|
|
o TAMC-related update to cope with mom_fluxform.F/mom_vecinc.F |
2552 |
|
|
(additional storing is now needed for case vecinv; |
2553 |
|
|
currently nothing implemented to switch this storing off |
2554 |
|
|
in case fluxform is used since no CPP flag available). |
2555 |
heimbach |
1.46 |
|
2556 |
|
|
checkpoint40pre7 |
2557 |
|
|
o bug fix in dynamics.F |
2558 |
|
|
calc_viscosity called before k=1,Nr loop. |
2559 |
|
|
o added some #ifdef's ALLOW_PASSIVE_TRACER |
2560 |
|
|
o cleaned initialisations in ctrl_map_ini |
2561 |
|
|
related to TAF |
2562 |
heimbach |
1.45 |
|
2563 |
|
|
checkpoint40pre6 |
2564 |
|
|
o split dynamics into thermodynamics & dynamics |
2565 |
|
|
o corresponding split of calc_diffusivity into |
2566 |
|
|
calc_diffusivity, calc_viscosity |
2567 |
|
|
(kpp_calc_diff, kpp_calc_visc). |
2568 |
|
|
o Added diffkr, kapgm to control variables |
2569 |
|
|
o bug fix in gmredi_slope_limit for ldd97 |
2570 |
adcroft |
1.44 |
|
2571 |
|
|
checkpoint40pre5 |
2572 |
|
|
o proper initialization of Adams-Bashforth time stepping |
2573 |
|
|
+ uses forward step for very first step of model (iter=0) |
2574 |
|
|
o re-generated *all* output since almost all output is modified by this |
2575 |
|
|
change (sorry but we've been putting this one off for about 2 years) |
2576 |
|
|
+ natl_box, aim.5l_Equatorial_Channel and aim.5l_zon-ave were |
2577 |
|
|
*not* regenerated since they are already out of date and I don't |
2578 |
|
|
want to create the impression that they are suddenly working. |
2579 |
|
|
o removed KAP stuff for DEC's |
2580 |
|
|
o modified/added many .cvsignore files in */code and */input |
2581 |
|
|
o added new expt "solid-body.cs-32x32x1" |
2582 |
|
|
+ this uses an alternative form of ini_curvilinear_grid.F which |
2583 |
|
|
is not necessarily any better than the current one... |
2584 |
heimbach |
1.43 |
|
2585 |
|
|
checkpoint40pre4 |
2586 |
|
|
o added re-initialisations of utrans,vtrans,rtrans in |
2587 |
|
|
calc_common_factors which are crucial for TAF. |
2588 |
|
|
o extended iMin,jMin range for calc_common_factors, |
2589 |
|
|
calc_diffusivity |
2590 |
|
|
o added option ALLOW_PASSIVE_TRACER |
2591 |
|
|
o a few minor updates and fixes |
2592 |
|
|
|
2593 |
heimbach |
1.42 |
checkpoint40pre3 |
2594 |
|
|
o created calc_gtr1.F for gad package |
2595 |
|
|
o split the_main_loop and re-introduced forward_step |
2596 |
|
|
o some recomputations of nIter0 for TAMC |
2597 |
|
|
|
2598 |
heimbach |
1.41 |
checkpoint40pre2 |
2599 |
|
|
o Updated to latest branch of AJA, JMC |
2600 |
|
|
o Added gradient check package |
2601 |
|
|
o Added routines for passive tracer handling |
2602 |
|
|
o Added carbon sequestration sensitivity experiment |
2603 |
|
|
|
2604 |
heimbach |
1.39 |
checkpoint39 |
2605 |
|
|
o Modifications and fixes to support TAMC |
2606 |
|
|
(mainly missing or wrong directives) |
2607 |
|
|
o Corrected common blocks when fooling TAMC to produce adjoint I/O |
2608 |
|
|
in addummy_in_stepping |
2609 |
|
|
o Updated verification/vero/ (bug fixes in code/, correct pickups in input/) |
2610 |
|
|
o Enabled "sliced" (xz-,yz-) exchanges, needed for obcs. |
2611 |
|
|
o Included following packages: |
2612 |
|
|
cal: calendar |
2613 |
|
|
exf: external forcing |
2614 |
|
|
ecco: essential routines to control use of cal, exf |
2615 |
|
|
(NB: this is not the full ECCO environment) |
2616 |
heimbach |
1.40 |
o disabled some packages by default in genmake |
2617 |
heimbach |
1.39 |
|
2618 |
heimbach |
1.38 |
checkpoint38 |
2619 |
|
|
o see notes_c37_adj.txt |
2620 |
|
|
o corrected wrong layer index in external_forcing_t |
2621 |
|
|
o replaced the_main_loop/forward_step by the_main_loop |
2622 |
|
|
o removed forceoutput from write_state |
2623 |
|
|
(replaced criteria for initial/final state) |
2624 |
|
|
o added runtime flag for pre-C35 pickups: usePickupBeforeC35 |
2625 |
jmc |
1.36 |
|
2626 |
jmc |
1.37 |
checkpoint37 |
2627 |
|
|
o mdsio.F routine split and packaged in pkg/mdsio |
2628 |
|
|
(mdsio.F and mdsio_gl.F still exist in eesupp/src but are not |
2629 |
|
|
used unless genmake -disable=mdsio) |
2630 |
|
|
o allow a more precise surface-geopotential gradient for the atmosphere |
2631 |
|
|
taking into account the change in space of Alpha (=1/rho) at the surface. |
2632 |
|
|
o variable "etaN" (replace cg2d_x) is the surface R-anomaly [r unit] |
2633 |
|
|
(ocean: sea surface height [m] / atmos: surface pressure anomaly [Pa]) |
2634 |
|
|
o Change units: Phi_Hydrostatic (=phiHyd), Phi_Surface(=cg2d_x) and |
2635 |
|
|
Phi_NonHydrostatic (=cg3d_x), all have now the dimension of a potential |
2636 |
|
|
[m2/s2] (pressure/rhoConst in the ocean ; Geo-Potential in the atmosphere). |
2637 |
|
|
o Time-Average diagnostics defined as a pseudo package "timeave". |
2638 |
|
|
o pickup files : old pickup (before c35) did not work with new code (c35 |
2639 |
|
|
and after) unless activating 2 commented lines in initialise-varia. |
2640 |
|
|
o Non-Hydrostatic pickup file Pb fixed. |
2641 |
|
|
o bug with Rigid-lid version (since c35) fixed. |
2642 |
|
|
|
2643 |
jmc |
1.36 |
checkpoint36 |
2644 |
jmc |
1.37 |
o implement Crank-Nickelson barotropic time-stepping |
2645 |
jmc |
1.36 |
o recover Time-Average diagnostics |
2646 |
|
|
o fix Pb in checkpoint (PR#19) |
2647 |
|
|
o AIM become a standard package ; clean unused CPP_kees |
2648 |
jmc |
1.35 |
|
2649 |
|
|
checkpoint35 |
2650 |
|
|
o subtantial rewrite of dynamics.f |
2651 |
|
|
o allows staggered time-stepping |
2652 |
|
|
o packaged obcs, aim (Atmospheric Physics), zonal_filt, shap_filt |
2653 |
|
|
o added bottom drag (linear + quadratic) |
2654 |
heimbach |
1.33 |
|
2655 |
|
|
checkpoint34 |
2656 |
|
|
o Modified exchange routines for correct reverse simulation. |
2657 |
|
|
o Added verification output to comply with bug fix in impldiff.F |
2658 |
|
|
as of c33 (exp2, natl_box). |
2659 |
|
|
o Corrected store directives in dynamics.F |
2660 |
|
|
o Corrected array boundaries in impldiff.F |
2661 |
|
|
o Corrected array dimensions in gmredi. |
2662 |
|
|
Added temporary scalars to avoid storage by TAMC (gmredi, kpp). |
2663 |
heimbach |
1.34 |
o Added routine GLOBAL_SUM_INT to global_sum.F |
2664 |
heimbach |
1.33 |
o Added mdsio_gl.F for ECCO purposes. |
2665 |
adcroft |
1.32 |
|
2666 |
|
|
checkpoint33 |
2667 |
|
|
o Fixed bug in lower BC in impldiff.F |
2668 |
|
|
o Fixed confusion about units of forcing arrays in FFIELDS.h |
2669 |
|
|
namely Fu,Fv,Qnet,Qsw,EmPmR: |
2670 |
|
|
- Removed verification/natl_box/code/external_fields_scale.F |
2671 |
|
|
(did not differ from that in model/src) |
2672 |
|
|
- Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units |
2673 |
|
|
(see FFIELDS.h for description) |
2674 |
|
|
- Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F, |
2675 |
|
|
kpp_calc.F and kpp_transport_t.F |
2676 |
|
|
- Removed model/src/external_fields_scale.F and calls to it |
2677 |
|
|
- verification/natl_box uses flux data with "atmospheric" sign so |
2678 |
|
|
a special version of external_fields_load.F is used to |
2679 |
|
|
change the data as it's read in. This way, the arrays |
2680 |
|
|
have the right units and signs at all times tha a user could |
2681 |
|
|
possibly use them. |
2682 |
|
|
o Corrected genmake to delete a temporary file during configuration |
2683 |
heimbach |
1.31 |
|
2684 |
|
|
checkpoint32 |
2685 |
|
|
o Scaling of forcing fields moved from external_forcing.F to |
2686 |
|
|
external_fields_scale.F, called directly after loading fields. |
2687 |
|
|
o Surface relaxation terms added to surface tendency fields in |
2688 |
|
|
extra subroutine. |
2689 |
|
|
o impldiff.F changed to avoid storing by TAMC of huge intermediate |
2690 |
|
|
fields. |
2691 |
|
|
o Changes in GMRedi to comply with packaging structure. |
2692 |
|
|
o Modifications and bug fixes in KPP package. |
2693 |
|
|
o Verification experiment for KPP added (verification/nat_box/) |
2694 |
heimbach |
1.30 |
|
2695 |
|
|
checkpoint31 |
2696 |
|
|
o Packages interface brought in line with defined standard |
2697 |
|
|
-> new routines packages_...F |
2698 |
|
|
-> changes in initialise_fixed.F, initialise_varia.F |
2699 |
|
|
-> enables initialisation interface for ECCO package |
2700 |
|
|
o Rescaling of external forcing fields immediately after read |
2701 |
|
|
(removed from external_forcing.F) |
2702 |
|
|
-> new: surface_fields_scale.F |
2703 |
|
|
-> affects ini_foorcing.F, external_fields_load.F |
2704 |
|
|
o Computation of surface tendencies before tendency updates. |
2705 |
|
|
-> new: external_forcing_surf.F |
2706 |
|
|
o Change of variable names useGMRedi, useKPP, useECCO |
2707 |
|
|
o Further changes in dynamics.F, impldiff.F for TAMC |
2708 |
|
|
o Tested for experiments 0, 2, 4. |
2709 |
|
|
- not yet tested for GMRedi. |
2710 |
|
|
- not yet tested for KPP. |
2711 |
adcroft |
1.29 |
|
2712 |
|
|
checkpoint30 |
2713 |
|
|
o Updates for OBCs |
2714 |
|
|
o New experiment for test OBCs (internal_wave) |
2715 |
|
|
o New output.txt in verification/exp4/results/ |
2716 |
|
|
o Updates for KPP: calculation of viscosity corrected, new variables |
2717 |
|
|
kpp_dumpFreq and kpp_taveFreq |
2718 |
|
|
o CPP'd calls to system routines for TARGET_CRAY_VECTOR (P.H.) |
2719 |
|
|
and entry for T90 in genmake |
2720 |
adcroft |
1.28 |
|
2721 |
|
|
checkpoint29 |
2722 |
|
|
o packaged KPP and GM/Redi |
2723 |
heimbach |
1.27 |
|
2724 |
|
|
checkpoint28 |
2725 |
|
|
o Corrected initialization of hFacMin for difference vertical coordinates |
2726 |
|
|
o Modified calculation of partial cell thickness to more robust algorithm |
2727 |
|
|
o config_summary.F: replaced write_1D_... by write_0D_... |
2728 |
|
|
read_write.F: added subroutines write_0D_... |
2729 |
|
|
o routines calc_common_factors, calc_gs, calc_gt, calc_phi_hyd, find_rho: |
2730 |
|
|
included some initialisations required for TAMC. |
2731 |
|
|
o routine calc_isoslopes: modified sqrt computation to make it |
2732 |
|
|
differentiable for zero argument. |
2733 |
|
|
o routines dynamics, impldiff: |
2734 |
|
|
included store directives and tape key computations required for TAMC. |
2735 |
|
|
o ALL TAMC related changes are between ifdef ALLOW_AUTODIFF_TAMC |
2736 |
adcroft |
1.26 |
|
2737 |
|
|
checkpoint27 |
2738 |
|
|
o fixed calc_isoslopes() to so that cancellation of terms in tensor |
2739 |
|
|
formulation works properly with variable resolution. |
2740 |
|
|
o restructured the calling tree between the_model_main() and dynamics() |
2741 |
|
|
o split initialise() into initialise_fixed() and initialise_varia() |
2742 |
|
|
o introduced initialization file pSurfInitFile for free surface (cg2d_x) |
2743 |
|
|
in new routine ini_psurf() |
2744 |
adcroft |
1.25 |
|
2745 |
|
|
checkpoint26 |
2746 |
|
|
o moved some #ifdef in optional routines to encompass everything |
2747 |
|
|
except the argument declarations. This was using up some memory. |
2748 |
|
|
o fixed macros like _ADT to work with both versions of Linux cpp |
2749 |
|
|
o cleaned up some unused and uninitialized variables |
2750 |
|
|
(helps when debugging with strict compile options) |
2751 |
|
|
o split up CPP_EEOPTIONS.h into options and macros |
2752 |
|
|
(macros are now in eesupp/inc/CPP_EEMACROS.h) |
2753 |
|
|
o patch for 2 processor JAM mode |
2754 |
adcroft |
1.24 |
|
2755 |
|
|
checkpoint25 |
2756 |
|
|
o updates for OBCs and NH |
2757 |
|
|
o dramatically reduced memory usage |
2758 |
|
|
o added "JAM" routines for use on Artic network |
2759 |
|
|
o parameterization of convection by implicit vertical diffusion |
2760 |
|
|
o added a diagnostic of convective index |
2761 |
|
|
o moved call to calc_divg_hat() from dynamics() to solve_for_pressure() |
2762 |
|
|
(this is was partly for OBCs and NH but also in anticipation of |
2763 |
|
|
an explicit free-surface option) |
2764 |
|
|
o initial state input files for U and V |
2765 |
adcroft |
1.23 |
|
2766 |
|
|
checkpoint24 |
2767 |
|
|
o Removed some spurious "REAL"s |
2768 |
|
|
o Updated KPP to latest version from JPL |
2769 |
|
|
o Added a COS(latitude) in horizontal viscosity |
2770 |
adcroft |
1.22 |
|
2771 |
|
|
checkpoint23 |
2772 |
|
|
o Added del^4 diffusion for salt and temperature |
2773 |
|
|
o Multiple minor fixes (implicit none's, arguments to global_sum, etc.) |
2774 |
adcroft |
1.21 |
|
2775 |
|
|
checkpoint22 |
2776 |
|
|
o Made many small changes: implicit none, format(i5), etc... |
2777 |
|
|
o Introduced KPP mixing scheme (compiles and runs but *not* tested) |
2778 |
adcroft |
1.20 |
|
2779 |
|
|
checkpoint21 |
2780 |
|
|
o Introduced new I/O package that supports direct-access records (mdsio.F) |
2781 |
|
|
o Split-up mid-level I/O routines |
2782 |
|
|
o Updated input data for experiments 0,1,2,4 and 5 |
2783 |
|
|
o Finally removed the genmake.* scripts (everyone seems happy with genmake) |
2784 |
adcroft |
1.18 |
|
2785 |
adcroft |
1.19 |
checkpoint20 |
2786 |
|
|
o Tidied up open-boundaries some more |
2787 |
|
|
o Added non-hydrostatic code |
2788 |
|
|
o Fixed some input data |
2789 |
|
|
o Modified MPI start-up to work in "coupled" context. |
2790 |
|
|
|
2791 |
adcroft |
1.18 |
checkpoint19 |
2792 |
|
|
o Tidied up directory structure for verification experiments. |
2793 |
|
|
o Added new code for open boundaries. |
2794 |
|
|
o Corrected advective terms near boundaries. |
2795 |
|
|
o Added CPP flag for "old UV" geometry and corrected spherical geometry. |
2796 |
|
|
o Implemented free-slip/no-slip BCs and del^4 dissipation. |
2797 |
adcroft |
1.19 |
o Split default parameters out of ini_parms.F into set_defaults.F. |
2798 |
cnh |
1.17 |
|
2799 |
|
|
checkpoint18 |
2800 |
|
|
o Further changes for optional code generation with |
2801 |
|
|
CPP - ugh! |
2802 |
cnh |
1.16 |
|
2803 |
|
|
checkpoint17 |
2804 |
|
|
o Beginning to incorporating modularity |
2805 |
|
|
for supporting atmos. and ocean configs. |
2806 |
|
|
o Small changes for TAMC complinace |
2807 |
|
|
o New ultra simple test case. Barotropic box |
2808 |
|
|
configuration "exp0". |
2809 |
cnh |
1.15 |
|
2810 |
|
|
checkpoint16 |
2811 |
|
|
o Minor changes to exchange routines to support |
2812 |
|
|
accumulation in reverse mode. Adjoint of an |
2813 |
|
|
assignment is an addition. |
2814 |
|
|
o Changes to support compilation by TAMC (LR(1) |
2815 |
|
|
syntax) and by g77 under Linux ( 72 character |
2816 |
|
|
limit ). |
2817 |
cnh |
1.14 |
|
2818 |
|
|
checkpoint15 |
2819 |
|
|
Rewrote exchange routines to allow |
2820 |
|
|
o General tile <-> tile connectivity. |
2821 |
|
|
o TAMC reverse mode flag ( is this really needed? ) |
2822 |
|
|
o Variable width overlap and exchange region widths. |
2823 |
|
|
o Hooks for sharing data via DMA, Arctic, Memory Channel, |
2824 |
|
|
shmput/shmget, VIA, SYSV shmem and every other cool |
2825 |
|
|
communication method. |
2826 |
cnh |
1.13 |
|
2827 |
|
|
checkpoint14 |
2828 |
|
|
Consistent isomorphism chages made. These allow dynamical core |
2829 |
|
|
to support both pressure and meters as a vertical coordinate. |
2830 |
cnh |
1.12 |
|
2831 |
|
|
checkpoint13 |
2832 |
|
|
Release which corrects global_max problem and a couple |
2833 |
|
|
of KGM time-averaging diagnostic errors. Also contains |
2834 |
|
|
a double-gyre experiment setup as well as the baseline |
2835 |
|
|
4 degree global template. The double gyre template is |
2836 |
|
|
organised to allow it to be applied automatically to |
2837 |
|
|
the baseline configuration. |
2838 |
adcroft |
1.11 |
|
2839 |
|
|
branch-point-rdot |
2840 |
|
|
A few tidy-ups have been made bt the real point of this |
2841 |
|
|
check-point (excuse the pun) is to allow a branch to be |
2842 |
|
|
made for the purposes of adding the rDot alterations. |
2843 |
|
|
I don't want to commit the rDot to the main-trunk until |
2844 |
|
|
we've actually tested it... |
2845 |
cnh |
1.10 |
|
2846 |
|
|
checkpoint12 |
2847 |
|
|
Tidy up and added generic genmake script (formerly |
2848 |
|
|
configure script). |
2849 |
|
|
Released to testers. |
2850 |
adcroft |
1.9 |
|
2851 |
|
|
checkpoint11 |
2852 |
|
|
Re-arranged initialise() and introduced ini_vertical_grid() |
2853 |
|
|
and ini_masks_etc(). |
2854 |
adcroft |
1.8 |
|
2855 |
|
|
checkpoint10 |
2856 |
|
|
Introduced the configure script. |
2857 |
|
|
Separated out the diags package. |
2858 |
|
|
Added template for writing time-averages of tile/intermediate quantities. |
2859 |
|
|
Updated SIZE.h in exp2 and made the data big-endian. |
2860 |
adcroft |
1.7 |
|
2861 |
|
|
checkpoint9 |
2862 |
|
|
MPI fix. Filename changes (meta/data). salbin*y stuff. |
2863 |
|
|
General tidy-up. |
2864 |
|
|
SST.bin SSS.bin added to verification/exp2 |
2865 |
adcroft |
1.6 |
|
2866 |
|
|
checkpoint8 |
2867 |
|
|
Inludes time-dependant forcing and time-averaging. |
2868 |
|
|
Works at 4x4 and 2.8125x2.8125 global |
2869 |
|
|
|
2870 |
|
|
checkpoint7-4degree-ref |
2871 |
|
|
Branch from checkpoint7. Released for application to |
2872 |
|
|
global modeling and general modeling - process studies, regional |
2873 |
|
|
model etc.. |
2874 |
|
|
Configured for verification/exp2 - 4 degree global, two process. |
2875 |
cnh |
1.5 |
|
2876 |
|
|
checkpoint7 |
2877 |
|
|
Created by cnh |
2878 |
|
|
Simple 4 degree global simulation |
2879 |
|
|
configuration. |
2880 |
|
|
Includes climatological wind, |
2881 |
|
|
hydrography, bathymetry etc |
2882 |
|
|
Does not include Heat Flux and E-P |
2883 |
cnh |
1.4 |
|
2884 |
|
|
checkpoint6 |
2885 |
|
|
Created by cnh |
2886 |
|
|
merged checkpoint5 with CD and |
2887 |
|
|
spherical polar code. |
2888 |
|
|
Still some problems with GM Redi |
2889 |
|
|
abd full topography. |
2890 |
cnh |
1.3 |
|
2891 |
|
|
checkpoint5 |
2892 |
|
|
Created by AJA |
2893 |
|
|
contains updates to GM Redi |
2894 |
|
|
and reordered timestepping loop |
2895 |
|
|
for Implicit Diffusion. |
2896 |
cnh |
1.2 |
|
2897 |
|
|
checkpoint4 |
2898 |
|
|
Created by cnh |
2899 |
|
|
Contains memory saving macros ( _rdxc etc..) for when |
2900 |
|
|
grid variations are limited. |
2901 |
|
|
Contains polynomial coeffs for EOS and knudsen program |
2902 |
|
|
for generation. |
2903 |
|
|
|
2904 |
cnh |
1.1 |
checkpoint3 |
2905 |
|
|
Created by cnh |
2906 |
|
|
Added extra flags for runtime options |
2907 |
|
|
Added this file |
2908 |
|
|
Added implicit free-surface |
2909 |
|
|
Added pre-conditioner |
2910 |
|
|
Put compare01 into repository ( compare01/... ) |
2911 |
|
|
Put data and eedata into repository ( verification/exp1 ) |
2912 |
|
|
|
2913 |
|
|
checkpoint2 |
2914 |
|
|
Created by AJA |
2915 |
|
|
Added GM/Redi |
2916 |
|
|
|
2917 |
|
|
checkpoint1 |
2918 |
|
|
Created by AJA |
2919 |
|
|
Restructured kloop in dynamics.F |
2920 |
|
|
Added non-linear EOS |
2921 |
|
|
|
2922 |
cnh |
1.2 |
baseline |
2923 |
|
|
Original checked in code |
2924 |
cnh |
1.1 |
|