4 |
Notes on tags used in MITgcmUV |
Notes on tags used in MITgcmUV |
5 |
============================== |
============================== |
6 |
|
|
7 |
|
o pkg/thsice: |
8 |
|
- vectorize thsice_solve4temp and thsice_get_exf. |
9 |
|
Problem: thsice_solve4temp has an unvectorizable statement that |
10 |
|
might also be problematic for TAF |
11 |
|
- thsice_get_exf: add the ALLOW_BULK_LARGEYEAGER04 CPP-flag. This |
12 |
|
does not change the verifcation experiment, but will change all |
13 |
|
experiments that have this flag undefined (not tested in verification); |
14 |
|
a little reorganization to save a few 2D fields and recomputations |
15 |
|
o pkg/obcs: add support for exch2 |
16 |
|
- the position of the boundary and prescribed values are specified using |
17 |
|
a global domain with exch2 facets stacked |
18 |
|
- in x for N,S boundaries (like W2_mapIO=-1) |
19 |
|
- in y for E,W boundaries (so E,W boundaries do not overlap) |
20 |
|
o pkg/mdsio: add support for writing global sections with exch2 |
21 |
|
file layout is as for obcs described above: |
22 |
|
- for x-z sections, facets are stacked in x (like W2_mapIO=-1) |
23 |
|
- for y-z sections, facets are stacked in y |
24 |
|
o pkg/thsice: |
25 |
|
- change a few routines for better vectorization: thsice_albedo.F, |
26 |
|
thsice_step_temp.F, and in thsice_calc_thickn.F. Results are |
27 |
|
not affected, but in particular the latter routine has changed |
28 |
|
dramatically (not necessarily easier to read now). |
29 |
|
- re-arrange calculation in THSICE_SOLVE4TEMP: move outside of i,j loops |
30 |
|
iteration loop and call to S/R THSICE_GET_BULKF & THSICE_GET_EXF. |
31 |
|
o verification/lab_sea: |
32 |
|
- overhaul of the forward model experiments. The main motivation |
33 |
|
for this revision is that lab_sea has proven quite fragile (when |
34 |
|
changing the sea-ice code, and switching platforms) to a point |
35 |
|
when failures were very hard to attribute to specific code problems. |
36 |
|
- the suspected reason for this fragility is noise amplification by evp so, |
37 |
|
to start with, we decided to replace evp with lsr in the main experiment. |
38 |
|
- the input.lsr experiment thus became obsolete and was removed. |
39 |
|
- it was replaced with the input.fd experiment that uses an |
40 |
|
analytical "free drift" solution as the ice velocity field. |
41 |
|
- Taken together, input (lsr), input.fd (free drift) and input.hb87 (evp) |
42 |
|
will hopefully allow us to discriminate problems due to dynamic solvers |
43 |
|
from problems due to the thermodynamic code. input.salt_plume (lsr) allows |
44 |
|
us to test additional options, along with the salt plume package. |
45 |
|
- Finally a pickup was generated (at the end of a one year run) to |
46 |
|
make the tests more representative of an actual model run. Previously |
47 |
|
the tests starting point was a 1m thickness of ice everywhere. |
48 |
|
o pkg/seaice: |
49 |
|
- introducing S\R seaice_freedrift.F that compute the |
50 |
|
analytical solution to an approximate ice momentum |
51 |
|
equation (i.e. the simple stress/coriolis balance). |
52 |
|
- define SEAICE_ALLOW_FREEDRIFT to trigger the computation |
53 |
|
of the free drift velocity field, and enable its use. |
54 |
|
To actually use the free drift solution as the model ice |
55 |
|
velocity field set SEAICEuseFREEDRIFT to .TRUE. in data.seaice. |
56 |
|
o move "useOASIS" from PARAMS.h to EEPARAMS.h and read it from "eedata" |
57 |
|
|
58 |
|
checkpoint62l (2010/10/04) |
59 |
|
o pkg/seaice: |
60 |
|
-fix the USE_ORIGINAL_SBI version (for variable freezing point); |
61 |
|
-use "celsius2K" in SEAICE_VARIABLE_FREEZING_POINT and in new |
62 |
|
version (with USE_ORIGINAL_SBI undef); |
63 |
|
o add hooks for new packages OASIS, the package will follow |
64 |
|
(hooks exclude the seaice pkg for now) |
65 |
|
o pkg/autodiff: ALLOW_AUTODIFF_WHTAPEIO |
66 |
|
Option to use mdsio_read_whalos.F/mdsio_write_whalos.F, |
67 |
|
rather than mdsio_readvector.F/mdsio_writevector.F, within |
68 |
|
adread_adwrite.F to read/write adjoint-related tapes to disk. |
69 |
|
o eesupp and pkg/mdsio: ALLOW_WHIO |
70 |
|
Option to write/read 2D fields to files including tiles halos. |
71 |
|
The main purpose is for adjoint related "tape I/O". |
72 |
|
The secondary purpose is for debugging phases. |
73 |
|
A word on those rather specifically intended purposes. |
74 |
|
The code was meant to be stripped down to the bare minimum. |
75 |
|
Typically, there is a unique and basic mapping to the global |
76 |
|
buffer (tile by tile, then proc by proc, then level by level), and |
77 |
|
byteswaps and meta-files are omitted. Indeed the (*_WH*) code is not |
78 |
|
meant to generate user friendly outputs of various shapes and forms. |
79 |
|
Rather it is intended, for the knowledgeabale developers, |
80 |
|
to be largely independent of the many mdsio options, to allow |
81 |
|
outputs of tiles+halos in debugging phases and in adjoint runs, |
82 |
|
and to allow some flexibility in tuning (adoint) I/O depending on each |
83 |
|
file system behavior. With regard to tuning, most of the potential knobs |
84 |
|
(to leave files open, to allocate the I/O indep. of usesinglecpuio, |
85 |
|
to specify directories, to specify the typical size of I/O calls, etc.) |
86 |
|
are not yet included, and will be added if they prove useful. |
87 |
|
o pkg/seaice: |
88 |
|
fix uninitialised arrays in USE_ORIGINAL_SBI version of seaice_solve4temp.F |
89 |
|
o pkg/seaice: |
90 |
|
new S/R seaice_solve4temp.F: this is the merged version of Ian Fenty |
91 |
|
code (seaice_budget_ice_if.F) which enable to recover old standard |
92 |
|
code (seaice_budget_ice.F) when option USE_ORIGINAL_SBI is defined. |
93 |
|
temporary: add "#define USE_ORIGINAL_SBI" at the top of seaice_solve4temp.F. |
94 |
|
o model/src (rStar): |
95 |
|
use simple average (not area weighted) of rStarFac at U,V point when using |
96 |
|
vectorInvariant and selectKEscheme=1,3 (consistent with mom. vertical advection) |
97 |
|
update output of exp. fizhi-cs-32x32x40 and fizhi-cs-aqualev20. |
98 |
|
|
99 |
|
checkpoint62k (2010/09/17) |
100 |
|
o adjoint |
101 |
|
* changed verification/global_ocean.cs32x15 ; adjoint now tests |
102 |
|
Adams-Bashforth 3 + NLFS + RSTAR |
103 |
|
* some more modifs required for ECCO-GODAE v4 |
104 |
|
o pkg/seaice |
105 |
|
add SEAICE_AGE_VOL option to use volume instead of area for |
106 |
|
integrating SEAICE_AGE |
107 |
|
o model/src: |
108 |
|
first check-in of sigma & hybrid-sigma coordinate code ; also includes |
109 |
|
non-linear free-surface parts ; but pressure-gradient not yet coded. |
110 |
|
o pkg/ptracers: |
111 |
|
option for ptracer to convert Salt Relax into additional EmP. |
112 |
|
tested in exp. global_ocean.90x40x15.dwnslp (update output) |
113 |
|
|
114 |
|
checkpoint62j (2010/08/25) |
115 |
|
o pkg/ggl90: |
116 |
|
other minor changes: remove 3-D temp array gTKE (+ add argument myIter) |
117 |
|
o pkg/dic: car_flux.F, phos_flux.F |
118 |
|
- reduce number of exp-calls in order to improve performance |
119 |
|
- clean up a little (replace fields by their macros, etc., fix |
120 |
|
typo in CPP-flag) |
121 |
|
o pkg/ggl90: minor changes |
122 |
|
- GGL90diffKrS was removed --> always use GGL90diffKr |
123 |
|
- GGL90viscAr was removed --> replaced with GGL90viscArU, GGL90viscArV |
124 |
|
- hack of mxlMaxFlag=2 --> ensure mixing between first and second level |
125 |
|
(commented out for now) |
126 |
|
- change in max/min operations to ensure that smoothing is ok |
127 |
|
- smoothing of GGL90viscAr was moved to ggl90_calc.F (as done for GGL90diffKr) |
128 |
|
- always use diffKrNrT as background profile (i.e. never use diffKr field) |
129 |
|
o pkg/cfc: bug fix, AREA(i,j,1,bi,bj) -> AREA(i,j,bi,bj) |
130 |
|
o pkg/dic: |
131 |
|
- model/src/impldiff.F: if TARGET_NEC_SX, extend loop ranges for better |
132 |
|
vectorization |
133 |
|
- small bug fix in insol for the unlikely case of a cartesian grid |
134 |
|
- towards vectorizing the dic package: bio_export.F, car_flux.F, phos_flux.F |
135 |
|
+ now vectorize, which also removes adjoint recomputations; |
136 |
|
+ replace integer maksp1 by _RL maskp1 |
137 |
|
+ replace a**x by exp(x*log(a)) in phos_flux.F for speed |
138 |
|
|
139 |
|
checkpoint62i (2010/07/21) |
140 |
|
o pkg/flt: |
141 |
|
- with OBCS: stop floats which enter the OB region |
142 |
|
o model/src: |
143 |
|
- use tempVertAdvScheme & saltVertAdvScheme (instead of horizontal ones) |
144 |
|
for implicit vertical advection. |
145 |
|
o pkg/seaice: |
146 |
|
- account for melting in seaice age evolution. |
147 |
|
- remove double counting of seaice ridging effect on seaice age. |
148 |
|
|
149 |
|
checkpoint62h (2010/06/18) |
150 |
|
o pkg/exch2: |
151 |
|
- remove exch2_*xy_rx files: call was replaced with exch2_*3d_rx(myNz=1). |
152 |
|
o tools/genmake2 |
153 |
|
- remove "-pdefault" option: redundant with the use of "packages.conf"; |
154 |
|
- remove file pkg/pkg_default : set the default as a pkg group |
155 |
|
("default_pkg_list") defined in pkg/pkg_groups; |
156 |
|
- fix for case pkg/pkg_depend is missing (was hanging before); |
157 |
|
- add option "-pgroups" to specify a different pkg_groups than the default. |
158 |
|
o verification/adjustment.cs-32x32x1: |
159 |
|
add a "minimal" set-up test (code_min & input_min) which only compiles |
160 |
|
eesupp/src and the 2 pkgs (exch2 & debug) which don't need model/src & inc. |
161 |
|
o tools/genmake2 |
162 |
|
- extend pkg_depend rules to model & eesupp (e.g., if model depend on [pkg])) |
163 |
|
- fix details of checking for mnc & profile pkg when NetCDF is unavailable. |
164 |
|
o pkg/exf: merge exf_bulk_largeyeager04 into exf_bulkformulae because these |
165 |
|
files are nearly the same anyway. |
166 |
|
Step 1: make exf_bulkformulae look like exf_bulk_largeyeager04: |
167 |
|
- redefinition of tau(i,i) (by a factor of ustar) |
168 |
|
- 1./exf(Const/T) -> exf(-Const/T) (big change in the results) |
169 |
|
- replace rhonil by rhoConstFresh in computation of evap (bug fix) |
170 |
|
- replace u/vstress=tau*rd*ws*cw by tau*rd*u/vwind (changes results) |
171 |
|
- replace |
172 |
|
rd(i,j)= rdn(i,j)/(exf_one - rdn(i,j)/karman*psimh ) |
173 |
|
shn = sh(i,j,bi,bj)*rd(i,j)/rdn(i,j) |
174 |
|
by |
175 |
|
shn = sh(i,j,bi,bj)/(exf_one - rdn(i,j)/karman*psimh ) |
176 |
|
(changes results) |
177 |
|
-> exf_bulkformulae v1.22, |
178 |
|
update verification experiments lab_sea, offline_exf_seaice, seaice_obcs |
179 |
|
(lab_sea: output.hb87.txt 1.11, output.lsr.txt 1.25, output.salt_plume.txt 1.13, |
180 |
|
output.txt 1.63 |
181 |
|
offline_exf_seaice: output.seaicetd.txt 1.7 |
182 |
|
seaice_obcs: output.txt 1.10) |
183 |
|
Step 2: do the actual merge and remove exf_bulk_largeyeager04.F |
184 |
|
-> exf_bulkformulae v1.23, |
185 |
|
unfortunately requires updating lab_sea.salt_plume (6 matching digits), |
186 |
|
and global_ocean.cs32x15.icedyn (only 11 matching digits) |
187 |
|
Also update output_adm of exp. lab_sea (all 4) and offline_exf_seaice. |
188 |
|
o adjoint of exch-1: |
189 |
|
- pass high-level EXCH S/R through TAF (eesupp/src/exch_ad_diff.list) |
190 |
|
(note: was already like this when using EXCH-2) and remove flow dir |
191 |
|
and hand-written AD version of high-level EXCH S/R (pkg/autodiff); |
192 |
|
- provide flow-dir for low-level exch1 S/R (eesupp/src/exch1_ad.flow); |
193 |
|
- update pkg/exch2 diff list. |
194 |
|
|
195 |
|
checkpoint62g (2010/05/19) |
196 |
|
o eesupp/src (exch-1): |
197 |
|
- split exch_rx.F into Forward S/R (exch1_rx.F) and Adjoint S/R (exch1_rx_ad.F) |
198 |
|
and remove argument "simulationMode"; same thing for all exch_*rx_cube.F |
199 |
|
(renamed to exch1_*rx_cube.F). |
200 |
|
- change accordingly exch_*_rx.template and AD version in pkg/autodiff |
201 |
|
to call new exch1 S/R ; update Makefile and .cvsignore. |
202 |
|
- replace call to exch2_xy_rx S/R with exch2_*3d_rx(myNz=1) (will remove |
203 |
|
exch2_xy_rx later) |
204 |
|
Note: after updating your code, need to run "make clean" in eesupp/src |
205 |
|
o test experiment bottom_ctrl_5x5: |
206 |
|
new output_adm.txt with fewer grdchk & less monitor output. |
207 |
|
o model/src: |
208 |
|
remove the call to ini_cori in initialise_varia.F (just keep the usual one |
209 |
|
in initialise_fixed.F). More consistent with coriolis & horizontal grid |
210 |
|
beeing treated in the same way (ini_grid is not called a 2nd time). |
211 |
|
o pkg/exf: |
212 |
|
- rewrite exf_bulk_largeyeager04.F for better vectorization, changes |
213 |
|
global_ocean.cs32x15/input.icedyn (11 digits of agreement), updated |
214 |
|
- fix adjoint (used worked for ALLOW_ATM_WIND defined, works for this now) |
215 |
|
- cosmetic changes to exf_bulkformulae.F to make it look more like |
216 |
|
exf_bulk_largeyeager04.F |
217 |
|
o eesupp/src (exch-1): |
218 |
|
- Fix AD EXCH code for 2-D domain special cases (Nx=1 or Ny=1). |
219 |
|
- Separate buffer filling and MPI sending: allow EXCH-1 to work for local |
220 |
|
array (non-shared) when using MPI+MTH. Also reduces number of BARRIER |
221 |
|
(even without using MPI). |
222 |
|
- Message mode: move RecvAck setting (indicator of buffer being ready) |
223 |
|
from send_put to recv_get S/R (was useless before, but not sure if |
224 |
|
it's much more useful now); |
225 |
|
- Switch the order of sync: MPI-proc 1rst and then threads; |
226 |
|
- take out spin-waiting code (#undef EXCH_USE_SPINNING), use BARRIER instead. |
227 |
|
- fix AD code for communication mode ='get' (but not used). |
228 |
|
o model/src: |
229 |
|
initialise dPhiHydX,dPhiHydY inside calc_grad_phi_hyd.F (so that TAF does |
230 |
|
not drop it in S/R mddynamics, producing NaN in hs94.1x64x5 AD-test exp). |
231 |
|
o utils/matlab/rdmnc.m: adapt to be able to use the generic matlab netcdf API |
232 |
|
o pkg/ctrl: require a specific set of control variables and exf-flags for |
233 |
|
adjoint of seaice (stop in ctrl_check.F if conditions are not satisfied) |
234 |
|
o model/src: |
235 |
|
a) 1rst version of a new driver S/R to turn-off output freq and flags after the |
236 |
|
1rst forward sweep, to avoid over-writing output files during recomputations |
237 |
|
recomputations (& grdchk); called from cost_final.F (& ctrl_init_ctrlvar.F ?) |
238 |
|
b) 2nd version: |
239 |
|
- add specific pkg S/R for seaice & ptracers (called from S/R TURNOFF_MODEL_IO); |
240 |
|
- switch-off more output flags (exf_monFreq, chkPtFreq, dumpInitAndLast, |
241 |
|
writePickupAtEnd) + seaice & ptracers output; |
242 |
|
- do not switch off MNC flags (otherwise, won't get admonitor netcdf file) |
243 |
|
o model/src: |
244 |
|
- new S/R rotate_uv2en_rl (..._rs) that rotates vector fields. |
245 |
|
o pkg/exch2: |
246 |
|
- remove "simulationMode" from arg. list of S/R EXCH2_RX1,2_CUBE ; |
247 |
|
- add argument "signOption" to EXCH2_RX1_CUBE (will be needed for SM exch). |
248 |
|
o pkg/autodiff & exch2: |
249 |
|
process exch_uv_agrid_3d_rx.f & exch2_uv_agrid_3d_rx.f through TAF |
250 |
|
(for now, only if ALLOW_EXCH2 is defined). |
251 |
|
o pkg/autodiff: |
252 |
|
- include PACKAGES_CONFIG.h in exch*ad.flow & exch*ad.F |
253 |
|
(not supposed to be in CPP_OPTIONS.h) to get ALLOW_EXCH2 defined correctly. |
254 |
|
+ clean-up comments (_RS is not always real*4) |
255 |
|
- fix bug in ADEXCH_UV_3D_RX (without EXCH2, was calling the forward exch S/R) |
256 |
|
- add a stop in ADEXCH_UV_AGRID_3D_RX if trying to use it with EXCH2: |
257 |
|
was calling a forward exch2, which is wrong ; used in SEAICE & EXF pkgs. |
258 |
|
o testreport (AD-tests): |
259 |
|
no longer link files from dir "../input" (1rst link files from |
260 |
|
"../input_ad.[xx]" if secondary test "xx" and then from "../input_ad") |
261 |
|
|
262 |
|
checkpoint62f (2010/04/29) |
263 |
o model/src/the_main_loop.F: |
o model/src/the_main_loop.F: |
264 |
adjust store directives for seaice evp and multicategory according to |
adjust store directives for seaice evp and multicategory according to |
265 |
pkg/ecco/the_main_loop.F |
pkg/ecco/the_main_loop.F |
266 |
o adjoint: |
o adjoint: |
267 |
global_sum_ad was incomplete (noted many times by many people ;) |
global_sum_ad was incomplete (noted many times by many people ;) |
268 |
nice description by Jean U. as follows: |
nice description by Jean U. as follows: |
269 |
* allreduce(var) in global_sum.F can be interpreted as |
* allreduce(var) in global_sum.F can be interpreted as |
270 |
reduce(sum) followed by broadcast of sum. |
reduce(sum) followed by broadcast of sum. |
271 |
* The adjoint of that is |
* The adjoint of that is |
272 |
sum(adjoint) followed by broadcast(summed adjoint value) |
sum(adjoint) followed by broadcast(summed adjoint value) |
273 |
or in other words, allreduce(sum, adjoint vars) |
or in other words, allreduce(sum, adjoint vars) |
274 |
We were missing the sum(adjoint)! |
We were missing the sum(adjoint)! |
275 |
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |
Benign, except(!) for "global" scalars appearing in tile loops (bi,bj) |