5 |
============================== |
============================== |
6 |
|
|
7 |
o tools/genmake2: |
o tools/genmake2: |
8 |
|
- add similar dependences for target EXE_AD & EXE_FTL as we have for EXECUTABLE |
9 |
|
(added by Alistair in version 1.51 for building without make depend); |
10 |
|
- remove Header files list (H_SRC_FILES) from the dependence of targets |
11 |
|
ad_input_code.f & ftl_input_code.f (not clear why it was added in the first |
12 |
|
place in version 1.23): this save going through staf when unrelated header |
13 |
|
file has been modified. |
14 |
|
Note: for an intermediate target (e.g., ad_input_code.f or adtaf) without |
15 |
|
"make depend" step, still need to do "make links" before "make adtaf". |
16 |
|
o eesupp/src (+ few pkg src files) & genmake2: |
17 |
|
- finish to remove ALWAYS_USE_MPI in source code that TAF does not see; |
18 |
|
- no longer set ALWAYS_USE_MPI in Makefile (was done by genmake2). |
19 |
|
- improve genmake2 checking for ALLOW_${PKG} in CPP_OPTIONS.h files (distinguish |
20 |
|
upper/lower case ; account for space between "#" and undef/define) |
21 |
|
o pkg/flt (with exch2): |
22 |
|
- cleaning: fix so that it compiles; move remaining MPI calls out of flt_exch2.F; |
23 |
|
- simplify threads synchronisation; fix (many issues) multi-threaded with MPI. |
24 |
|
|
25 |
|
checkpoint63s (2012/09/05) |
26 |
|
o pkg/ecco: |
27 |
|
- remove #ifdef ALLOW_SMOOTH_CORREL3D brackets. |
28 |
|
- add more relevant #ifdef ALLOW_SMOOTH ones. |
29 |
|
- sort out useAtmWind, useSMOOTH, ctrlSmoothCorrel2D. |
30 |
|
o pkg/ctrl: |
31 |
|
- CTRL_OPTIONS.h : document CPPs related to smoothing; ALLOW_SMOOTH_CORREL2D/3D, |
32 |
|
ALLOW_CTRL_SMOOTH, ALLOW_SMOOTH_CTRL2D, ALLOW_SMOOTH_CTRL3D. |
33 |
|
- ctrl.h : document run time params doInitXX, doMainPack, doMainUnpack, doPackDiag, |
34 |
|
doSinglePrecTapelev (audodiff param!), ctrlSmoothCorrel2D (new) and |
35 |
|
ctrlSmoothCorrel3D (new). |
36 |
|
The added ctrlSmoothCorrel2D/3D replace the old ALLOW_SMOOTH_CORREL2D/3D CPP. |
37 |
|
- ctrl_readparms.F : initialise ctrlSmoothCorrel2D/3D and read from namelist. |
38 |
|
- ctrl_init.F ctrl_pack.F ctrl_unpack.F : switch off ustress/vstress |
39 |
|
controls when useAtmWind, and vice versa. |
40 |
|
- ctrl_map_ini_ecco.F : UVEL0, VVEL0, edtaux, edtauy cannot be smoothed as tracers. |
41 |
|
- ctrl_get_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL2D with |
42 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel2D, IF useSMOOTH. |
43 |
|
- ctrl_map_ini_gen.F : replace #ifdef ALLOW_SMOOTH_CORREL3D with |
44 |
|
#ifdef ALLOW_SMOOTH, IF ctrlSmoothCorrel3D, IF useSMOOTH. |
45 |
|
- ctrl_set_pack_xy[z].F, ctrl_set_unpack_xy[z].F: |
46 |
|
replace ALLOW_SMOOTH_CORREL2D/3D brackets with ctrlSmoothCorrel2D/3D. |
47 |
|
o pkg/smooth: |
48 |
|
- remove un-necessary includes. |
49 |
|
- remove ALLOW_SMOOTH*D and ALLOW_SMOOTH_CORREL*D brakets. |
50 |
|
Those CPP options were never defined, and not necessary. |
51 |
|
o model/src: |
52 |
|
- fix CPP brackets in ini_mixing.F (GM_background_K belongs to gmredi). |
53 |
|
- standard treatment of useSMOOTH. |
54 |
|
o pkg/autodiff: |
55 |
|
- add LOGICAL useGGL90inAdMode, useGGL90inFwdMode, useSALT_PLUMEinAdMode, |
56 |
|
useSALT_PLUMEInFwdMode allowing to switch off ggl90 and salt_plume adjoint. |
57 |
|
o pkg/exch2: |
58 |
|
- add "if usingMPI" where it was missing (in exch2_rx?_cube*.template) |
59 |
|
+ start to remove ALWAYS_USE_MPI in source code that TAF does not see. |
60 |
|
- make new S/R W2_MAP_PROCS out of w2_eeboot.F to setup exch2 CommonFlag |
61 |
|
and tiles to process mapping. |
62 |
|
- re-arrange 3 header files (W2_EXCH2_PARAMS.h, _BUFFER.h & _TOPOLOGY.h) |
63 |
|
moving /EXCH2_FILLVAL_RX/ & /W2_EXCH2_COMMFLAG/ to W2_EXCH2_TOPOLOGY.h; |
64 |
|
rename "exch2_tProc" to "W2_tileProc" and move seting of e2FillValue_RX |
65 |
|
from w2_eeboot.F to w2_readparms.F. |
66 |
|
o eesupp/src: |
67 |
|
- set exchNeedsMemsync & exchUsesBarrier according to "usingMPI" (instead of |
68 |
|
ALWAYS_USE_MPI) + moved from ini_communication_patterns.F to eeset_parms.F; |
69 |
|
also move setting of exchCollectStatistics from exch_init.F to eeset_parms.F |
70 |
|
- in eedie.F and all_proc_die.F, always call MPI_FINALIZE when ALLOW_USE_MPI |
71 |
|
is defined (remove condition on usingMPI) to match cases where MPI_INIT |
72 |
|
has been called. |
73 |
|
- fix bug I put in previous modif of exch_sm_3d_rx.template (not much used); |
74 |
|
- change default (non-MPI) value of myPid (from 1 to 0) to match MPI settings |
75 |
|
(so that on 1 proc, get same myPid independently of usingMPI) |
76 |
|
- add a stop if multi-procs but usingMPI=F ; stop also if usingMPI=T and |
77 |
|
useCubedSphereExchange with EXCH-1 (safer). |
78 |
|
- add "if usingMPI" where it was missing (+ start to remove ALWAYS_USE_MPI). |
79 |
|
o pkg/ggl90: |
80 |
|
- fix bug in filling corner mask array "mskCor" (FILL_CS_CORNER_TR_RL call) |
81 |
|
used in ALLOW_GGL90_SMOOTH code. |
82 |
|
o pkg/flt: |
83 |
|
- fix typo in FLT_WITHOUT_Y_PERIODICITY (the effect was to ignore stopping |
84 |
|
floats at the Southern end of the domain). |
85 |
|
o eesupp/inc: |
86 |
|
- add a list of CPP-options which can be set by Makefile (DEF_IN_MAKEFILE.h); |
87 |
|
but not used (and not to be used) anywhere, just for documentation. |
88 |
|
o pkg/autodiff, exf, ptracers & seaice (AD & TL output): |
89 |
|
- comment out the very nasty "writeBinaryPrec = writeStatePrec" line, since: |
90 |
|
a) can damage previously written records in any other multi-record files. |
91 |
|
b) if needed, can easily do it cleanly, by calling S/R WRITE_REC_3D_RL/S. |
92 |
|
o tools/genmake2: |
93 |
- define variable MAKE within Makefile and use it in place of 'make'; |
- define variable MAKE within Makefile and use it in place of 'make'; |
94 |
- update AD_CONFIG.h (if needed) before building any of the executable |
- update AD_CONFIG.h (if needed) before building any of the executable |
95 |
(forward, adjoint or tangent-lin); this involves a 2nd invocation of make; |
(forward, adjoint or tangent-lin); this involves a 2nd invocation of make; |
96 |
and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h; |
and add the usual #ifndef/#define AD_CONFIG_H in AD_CONFIG.h; |
97 |
- always print usual warning comment 'this file is automatically generated' |
- always print usual warning comment 'this file is automatically generated' |
98 |
from script convert_cpp_cmd2defines (+ remove this warning from genmake2). |
from script convert_cpp_cmd2defines (+ remove this warning from genmake2). |
99 |
|
o pkg/cheapaml: |
100 |
|
- updated to correspond to the code used in accepted paper (Nico Wienders). |
101 |
o pkg/exf: |
o pkg/exf: |
102 |
added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. |
added run time switch useAtmWind to replace ALLOW_ATM_WIND cpp switch. |
103 |
ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) |
ALLOW_ATM_WIND now just sets the useAtmWind default (see exf_readparms.F) |