~reducedmodelling/fluidity/ROM_Non-intrusive-ann

« back to all changes in this revision

Viewing changes to spatialindex-1.5/autom4te.cache/requests

  • Committer: skramer
  • Date: 2010-11-16 15:37:38 UTC
  • Revision ID: svn-v4:5bf5533e-7014-46e3-b1bb-cce4b9d03719:trunk:2477
Changing the storage of vector_field from vfield%val(dim)%ptr(node) to vfield%val(dim,node).

This was a long desired and discussed change that should improve cache performance and will allow vector fields of more than 3 dimension (internally no vtk support). Just realised it could be done with a few simple seds.

Most important changes need:
- removal of wrap_field() for vector_fields.
- this required some surgery in vtk_write_fields, a horrible piece of code in any case
- traffic and mesh_movement were using wrap_field and now have to do a few more copies.
- halo_update() requires a contiguous buffer in memory, so a copy is now done for halo_update(vfield)
- the wrapped python vector fields available in python_state diagnostics had to be rewired to account for the new storage. This actually simplifies the wrapping a lot.

I realise this is a big commit which might give some trouble when merging in big changes (from for example a branch). The following little script I used might be handy for this. You might only want to apply it to files you have modified. Make sure you back up your entire local checkout before applying any of these:

#/bin/sh
FILES=*/*.F90 */tests/*.F90
# replace any %val(1)%ptr(2) where 2 contains a pair of ()
sed -i 's!%val(\([A-Za-z0-9%_\+\* -]*\))%ptr(\([^)]*([^)]*)[^)]*\))!%val(\1,\2)!g' ${FILES}
# replace any %val(1)%ptr(2) where 2 contains no closing )
sed -i 's!%val(\([A-Za-z0-9%_\+\* -]*\))%ptr(\([^)]*\))!%val(\1,\2)!g' ${FILES}
# replace any %val(1)%ptr not followed by (
sed -i 's!%val(\([A-Za-z0-9%_\+\* -]*\))%ptr!%val(\1,:)!g' ${FILES}
# now svn revert femtools/Sparse_Tools.F90
# as it gives false positives for dcsr_matrices
# luckily it doesn't use vector_fields, so we can just revert


Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# This file was generated by Autom4te Wed Jul 29 06:45:47 UTC 2009.
 
1
# This file was generated by Autom4te Thu Aug  5 21:29:16 UTC 2010.
2
2
# It contains the lists of macros which have been traced.
3
3
# It can be safely removed.
4
4
 
11
11
                      ],
12
12
                      [
13
13
                        '/usr/share/autoconf/autoconf/autoconf.m4f',
14
 
                        '/usr/share/aclocal/argz.m4',
15
 
                        '/usr/share/aclocal/libtool.m4',
16
 
                        '/usr/share/aclocal/ltdl.m4',
17
 
                        '/usr/share/aclocal/ltoptions.m4',
18
 
                        '/usr/share/aclocal/ltsugar.m4',
19
 
                        '/usr/share/aclocal/ltversion.m4',
20
 
                        '/usr/share/aclocal/lt~obsolete.m4',
21
 
                        '/usr/share/aclocal-1.11/amversion.m4',
22
 
                        '/usr/share/aclocal-1.11/auxdir.m4',
23
 
                        '/usr/share/aclocal-1.11/cond.m4',
24
 
                        '/usr/share/aclocal-1.11/depend.m4',
25
 
                        '/usr/share/aclocal-1.11/depout.m4',
26
 
                        '/usr/share/aclocal-1.11/init.m4',
27
 
                        '/usr/share/aclocal-1.11/install-sh.m4',
28
 
                        '/usr/share/aclocal-1.11/lead-dot.m4',
29
 
                        '/usr/share/aclocal-1.11/make.m4',
30
 
                        '/usr/share/aclocal-1.11/missing.m4',
31
 
                        '/usr/share/aclocal-1.11/mkdirp.m4',
32
 
                        '/usr/share/aclocal-1.11/options.m4',
33
 
                        '/usr/share/aclocal-1.11/runlog.m4',
34
 
                        '/usr/share/aclocal-1.11/sanity.m4',
35
 
                        '/usr/share/aclocal-1.11/silent.m4',
36
 
                        '/usr/share/aclocal-1.11/strip.m4',
37
 
                        '/usr/share/aclocal-1.11/substnot.m4',
38
 
                        '/usr/share/aclocal-1.11/tar.m4',
39
 
                        'configure.ac'
40
 
                      ],
41
 
                      {
42
 
                        'AM_ENABLE_STATIC' => 1,
43
 
                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
44
 
                        '_LT_AC_SHELL_INIT' => 1,
45
 
                        'AC_DEFUN' => 1,
46
 
                        'AC_PROG_LIBTOOL' => 1,
47
 
                        '_LT_AC_LANG_CXX_CONFIG' => 1,
48
 
                        'AM_PROG_MKDIR_P' => 1,
49
 
                        'AM_AUTOMAKE_VERSION' => 1,
50
 
                        'AM_SUBST_NOTMAKE' => 1,
51
 
                        'AM_MISSING_PROG' => 1,
52
 
                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
53
 
                        '_LT_AC_LANG_C_CONFIG' => 1,
54
 
                        'AM_PROG_INSTALL_STRIP' => 1,
55
 
                        '_m4_warn' => 1,
56
 
                        'AC_LIBTOOL_OBJDIR' => 1,
57
 
                        'gl_FUNC_ARGZ' => 1,
58
 
                        'LTOBSOLETE_VERSION' => 1,
59
 
                        'AM_SANITY_CHECK' => 1,
60
 
                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
61
 
                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
62
 
                        'LT_LIB_M' => 1,
63
 
                        '_LT_AC_CHECK_DLFCN' => 1,
64
 
                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
65
 
                        'LTSUGAR_VERSION' => 1,
66
 
                        '_LT_PROG_LTMAIN' => 1,
67
 
                        '_AM_PROG_TAR' => 1,
68
 
                        'LT_SYS_SYMBOL_USCORE' => 1,
69
 
                        'AC_LIBTOOL_GCJ' => 1,
70
 
                        'LT_FUNC_DLSYM_USCORE' => 1,
71
 
                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
72
 
                        '_LT_AC_LANG_F77' => 1,
73
 
                        'AC_LIBTOOL_CONFIG' => 1,
74
 
                        '_AM_SUBST_NOTMAKE' => 1,
75
 
                        'AC_LTDL_DLLIB' => 1,
76
 
                        '_AM_AUTOCONF_VERSION' => 1,
77
 
                        'AM_DISABLE_SHARED' => 1,
78
 
                        '_LTDL_SETUP' => 1,
79
 
                        'AM_PROG_LIBTOOL' => 1,
80
 
                        '_LT_AC_LANG_CXX' => 1,
81
 
                        'AM_PROG_LD' => 1,
82
 
                        '_LT_AC_FILE_LTDLL_C' => 1,
83
 
                        'AC_LIB_LTDL' => 1,
84
 
                        'AU_DEFUN' => 1,
85
 
                        'AC_PROG_NM' => 1,
86
 
                        'AC_LIBTOOL_DLOPEN' => 1,
87
 
                        'AC_PROG_LD' => 1,
88
 
                        'AC_PROG_LD_GNU' => 1,
89
 
                        'AC_ENABLE_FAST_INSTALL' => 1,
90
 
                        'AC_LIBTOOL_FC' => 1,
91
 
                        'LTDL_CONVENIENCE' => 1,
92
 
                        '_AM_SET_OPTION' => 1,
93
 
                        'AC_LTDL_PREOPEN' => 1,
94
 
                        '_LT_LINKER_BOILERPLATE' => 1,
95
 
                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
96
 
                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
97
 
                        'gl_PREREQ_ARGZ' => 1,
98
 
                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
99
 
                        'LT_SUPPORTED_TAG' => 1,
100
 
                        'LT_PROG_RC' => 1,
101
 
                        'LT_SYS_MODULE_EXT' => 1,
102
 
                        'AC_DEFUN_ONCE' => 1,
103
 
                        '_LT_AC_LANG_GCJ' => 1,
104
 
                        'AC_LTDL_OBJDIR' => 1,
105
 
                        '_LT_PATH_TOOL_PREFIX' => 1,
106
 
                        'AC_LIBTOOL_RC' => 1,
107
 
                        'AM_SILENT_RULES' => 1,
108
 
                        'AC_DISABLE_FAST_INSTALL' => 1,
109
 
                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
110
 
                        'include' => 1,
111
 
                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
112
 
                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
113
 
                        'LT_AC_PROG_SED' => 1,
114
 
                        'AM_ENABLE_SHARED' => 1,
115
 
                        'LTDL_INSTALLABLE' => 1,
116
 
                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
117
 
                        'AC_ENABLE_SHARED' => 1,
118
 
                        'AC_ENABLE_STATIC' => 1,
119
 
                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
120
 
                        '_LT_AC_TAGVAR' => 1,
121
 
                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
122
 
                        'AM_CONDITIONAL' => 1,
123
 
                        'LT_LIB_DLLOAD' => 1,
124
 
                        'LTVERSION_VERSION' => 1,
125
 
                        'LTDL_INIT' => 1,
126
 
                        'm4_include' => 1,
127
 
                        'AM_PROG_INSTALL_SH' => 1,
128
 
                        'AC_PROG_EGREP' => 1,
129
 
                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
130
 
                        'AC_PATH_MAGIC' => 1,
131
 
                        'AC_LTDL_SYSSEARCHPATH' => 1,
132
 
                        'AM_MAKE_INCLUDE' => 1,
133
 
                        '_LT_AC_TAGCONFIG' => 1,
134
 
                        'LT_CMD_MAX_LEN' => 1,
135
 
                        'm4_pattern_forbid' => 1,
136
 
                        '_LT_LINKER_OPTION' => 1,
137
 
                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
138
 
                        'AC_DISABLE_SHARED' => 1,
139
 
                        '_LT_COMPILER_BOILERPLATE' => 1,
140
 
                        'AC_LIBTOOL_WIN32_DLL' => 1,
141
 
                        'AC_LIBTOOL_SETUP' => 1,
142
 
                        'AC_PROG_LD_RELOAD_FLAG' => 1,
143
 
                        'AC_LTDL_DLSYM_USCORE' => 1,
144
 
                        'AM_MISSING_HAS_RUN' => 1,
145
 
                        'LT_LANG' => 1,
146
 
                        'LT_SYS_DLSEARCH_PATH' => 1,
147
 
                        'LT_CONFIG_LTDL_DIR' => 1,
148
 
                        'LT_OUTPUT' => 1,
149
 
                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
150
 
                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
151
 
                        'AC_WITH_LTDL' => 1,
152
 
                        'AC_LIBTOOL_LINKER_OPTION' => 1,
153
 
                        'LT_AC_PROG_RC' => 1,
154
 
                        'AC_LIBTOOL_CXX' => 1,
155
 
                        'LT_INIT' => 1,
156
 
                        'LT_AC_PROG_GCJ' => 1,
157
 
                        'LT_SYS_DLOPEN_SELF' => 1,
158
 
                        'AM_DEP_TRACK' => 1,
159
 
                        'AM_DISABLE_STATIC' => 1,
160
 
                        '_AC_PROG_LIBTOOL' => 1,
161
 
                        '_AM_IF_OPTION' => 1,
162
 
                        'AC_PATH_TOOL_PREFIX' => 1,
163
 
                        'm4_pattern_allow' => 1,
164
 
                        'AC_LIBTOOL_F77' => 1,
165
 
                        'AM_SET_LEADING_DOT' => 1,
166
 
                        'LT_AC_PROG_EGREP' => 1,
167
 
                        '_AM_DEPENDENCIES' => 1,
168
 
                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
169
 
                        'LTOPTIONS_VERSION' => 1,
170
 
                        '_LT_AC_SYS_COMPILER' => 1,
171
 
                        'AM_PROG_NM' => 1,
172
 
                        'AC_LIBLTDL_CONVENIENCE' => 1,
173
 
                        'AC_DEPLIBS_CHECK_METHOD' => 1,
174
 
                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
175
 
                        'AC_LIBLTDL_INSTALLABLE' => 1,
176
 
                        'AC_LTDL_ENABLE_INSTALL' => 1,
177
 
                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
178
 
                        'LT_PROG_GCJ' => 1,
179
 
                        'AM_INIT_AUTOMAKE' => 1,
180
 
                        'AC_DISABLE_STATIC' => 1,
181
 
                        'LT_PATH_NM' => 1,
182
 
                        'AC_LTDL_SHLIBEXT' => 1,
183
 
                        '_LT_AC_LOCK' => 1,
184
 
                        '_LT_AC_LANG_RC_CONFIG' => 1,
185
 
                        'LT_SYS_MODULE_PATH' => 1,
186
 
                        'LT_WITH_LTDL' => 1,
187
 
                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
188
 
                        'AC_LTDL_SHLIBPATH' => 1,
189
 
                        'AM_AUX_DIR_EXPAND' => 1,
190
 
                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
191
 
                        '_LT_AC_LANG_F77_CONFIG' => 1,
192
 
                        '_AM_SET_OPTIONS' => 1,
193
 
                        '_LT_COMPILER_OPTION' => 1,
194
 
                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
195
 
                        'AM_RUN_LOG' => 1,
196
 
                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
197
 
                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
198
 
                        'AC_LIBTOOL_PICMODE' => 1,
199
 
                        'AC_CHECK_LIBM' => 1,
200
 
                        'LT_PATH_LD' => 1,
201
 
                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
202
 
                        '_AM_MANGLE_OPTION' => 1,
203
 
                        'AC_LTDL_SYMBOL_USCORE' => 1,
204
 
                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
205
 
                        'AM_SET_DEPDIR' => 1,
206
 
                        '_LT_CC_BASENAME' => 1,
207
 
                        '_LT_LIBOBJ' => 1
208
 
                      }
209
 
                    ], 'Autom4te::Request' ),
210
 
             bless( [
211
 
                      '1',
212
 
                      1,
213
 
                      [
214
 
                        '/usr/share/autoconf'
215
 
                      ],
216
 
                      [
217
 
                        '/usr/share/autoconf/autoconf/autoconf.m4f',
218
14
                        'aclocal.m4',
219
15
                        'configure.ac'
220
16
                      ],
221
17
                      {
222
 
                        '_LT_AC_TAGCONFIG' => 1,
223
18
                        'AM_PROG_F77_C_O' => 1,
 
19
                        '_LT_AC_TAGCONFIG' => 1,
 
20
                        'm4_pattern_forbid' => 1,
224
21
                        'AC_INIT' => 1,
225
 
                        'm4_pattern_forbid' => 1,
226
22
                        'AC_CANONICAL_TARGET' => 1,
227
23
                        '_AM_COND_IF' => 1,
228
24
                        'AC_CONFIG_LIBOBJ_DIR' => 1,
236
32
                        'LT_CONFIG_LTDL_DIR' => 1,
237
33
                        'AC_CONFIG_LINKS' => 1,
238
34
                        'AC_REQUIRE_AUX_FILE' => 1,
 
35
                        'LT_SUPPORTED_TAG' => 1,
239
36
                        'm4_sinclude' => 1,
240
 
                        'LT_SUPPORTED_TAG' => 1,
241
37
                        'AM_MAINTAINER_MODE' => 1,
242
38
                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
243
39
                        '_m4_warn' => 1,
246
42
                        'AM_ENABLE_MULTILIB' => 1,
247
43
                        'AM_SILENT_RULES' => 1,
248
44
                        'AC_CONFIG_FILES' => 1,
 
45
                        'include' => 1,
249
46
                        'LT_INIT' => 1,
250
 
                        'include' => 1,
251
47
                        'AM_GNU_GETTEXT' => 1,
252
48
                        'AC_LIBSOURCE' => 1,
253
49
                        'AC_CANONICAL_BUILD' => 1,
257
53
                        'AC_CONFIG_AUX_DIR' => 1,
258
54
                        '_AM_SUBST_NOTMAKE' => 1,
259
55
                        'AM_PROG_CC_C_O' => 1,
 
56
                        'm4_pattern_allow' => 1,
260
57
                        'sinclude' => 1,
261
 
                        'm4_pattern_allow' => 1,
262
58
                        'AM_CONDITIONAL' => 1,
263
59
                        'AC_CANONICAL_SYSTEM' => 1,
264
60
                        'AC_CONFIG_HEADERS' => 1,