source: issm/oecreview/Archive/14312-15392/ISSM-14914-14915.diff

Last change on this file was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 15.4 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/c/solutions/solutions.h
2===================================================================
3--- ../trunk-jpl/src/c/solutions/solutions.h (revision 14914)
4+++ ../trunk-jpl/src/c/solutions/solutions.h (revision 14915)
5@@ -13,7 +13,7 @@
6 template <class doubletype> class Vector;
7
8 #include "../io/Comm/Comm.h"
9-#include "../include/types.h"
10+#include "../shared/Numerics/types.h"
11
12 /*cores: */
13 void adjointdiagnostic_core(FemModel* femmodel);
14Index: ../trunk-jpl/src/c/Container/Observations.h
15===================================================================
16--- ../trunk-jpl/src/c/Container/Observations.h (revision 14914)
17+++ ../trunk-jpl/src/c/Container/Observations.h (revision 14915)
18@@ -4,7 +4,7 @@
19 class Quadtree;
20 class Variogram;
21 class Options;
22-#include "../include/types.h"
23+#include "../shared/Numerics/types.h"
24
25 /*!\brief Declaration of Observations class.
26 *
27Index: ../trunk-jpl/src/c/Container/Inputs.h
28===================================================================
29--- ../trunk-jpl/src/c/Container/Inputs.h (revision 14914)
30+++ ../trunk-jpl/src/c/Container/Inputs.h (revision 14915)
31@@ -13,7 +13,7 @@
32 class Node;
33 class GaussTria;
34 class GaussPenta;
35-#include "../include/types.h"
36+#include "../shared/Numerics/types.h"
37
38 /*! \brief Declaration of Inputs class.
39 *
40Index: ../trunk-jpl/src/c/include/types.h
41===================================================================
42--- ../trunk-jpl/src/c/include/types.h (revision 14914)
43+++ ../trunk-jpl/src/c/include/types.h (revision 14915)
44@@ -1,38 +0,0 @@
45-/*!\file: types.h
46- * \brief prototypes for types.h
47- */
48-
49-#ifndef _TYPES_H_
50-#define _TYPES_H_
51-
52-#ifdef HAVE_CONFIG_H
53- #include <config.h>
54-#else
55-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
56-#endif
57-
58-#include <stdio.h>
59-
60-/*here are our abstracted types: inspired on petsc */
61-#if ISSM_USE_64BIT_INDICES == 1
62-typedef long long IssmInt;
63-//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
64-#else
65-typedef int IssmInt;
66-//#define MPIU_INT MPI_INT already defined in petsc
67-#endif
68-
69-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
70-#include "adolc/adolc.h"
71-// for active variables
72-typedef adouble IssmDouble;
73-// for passive variables
74-typedef double IssmPDouble;
75-#else
76-// see above
77-typedef double IssmDouble;
78-// see above
79-typedef IssmDouble IssmPDouble;
80-#endif
81-
82-#endif //ifndef _TYPES_H_
83Index: ../trunk-jpl/src/c/include/globals.h
84===================================================================
85--- ../trunk-jpl/src/c/include/globals.h (revision 14914)
86+++ ../trunk-jpl/src/c/include/globals.h (revision 14915)
87@@ -5,7 +5,6 @@
88 #ifndef _GLOBALS_H_
89 #define _GLOBALS_H_
90
91-#include "./types.h"
92 #include "../io/Comm/Comm.h"
93 #include "../classes/ToolkitOptions.h"
94
95Index: ../trunk-jpl/src/c/include/include.h
96===================================================================
97--- ../trunk-jpl/src/c/include/include.h (revision 14914)
98+++ ../trunk-jpl/src/c/include/include.h (revision 14915)
99@@ -6,6 +6,5 @@
100 #define _INCLUDEGLOBAL_H_
101
102 #include "./typedefs.h"
103-#include "./types.h"
104
105 #endif //ifndef _INCLUDE_H_
106Index: ../trunk-jpl/src/c/shared/Matrix/matrix.h
107===================================================================
108--- ../trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14914)
109+++ ../trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14915)
110@@ -5,7 +5,7 @@
111 #ifndef _MATRIXUTILS_H_
112 #define _MATRIXUTILS_H_
113
114-#include "../../include/include.h"
115+#include "../../shared/Numerics/types.h"
116
117 int TripleMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd);
118 int MatrixMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc );
119Index: ../trunk-jpl/src/c/shared/Numerics/extrema.cpp
120===================================================================
121--- ../trunk-jpl/src/c/shared/Numerics/extrema.cpp (revision 14914)
122+++ ../trunk-jpl/src/c/shared/Numerics/extrema.cpp (revision 14915)
123@@ -8,7 +8,7 @@
124 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
125 #endif
126
127-#include "../../include/include.h"
128+#include "../../shared/Numerics/types.h"
129
130 IssmDouble min(IssmDouble a,IssmDouble b){
131 if (a<b)return a;
132Index: ../trunk-jpl/src/c/shared/Numerics/types.h
133===================================================================
134--- ../trunk-jpl/src/c/shared/Numerics/types.h (revision 0)
135+++ ../trunk-jpl/src/c/shared/Numerics/types.h (revision 14915)
136@@ -0,0 +1,38 @@
137+/*!\file: types.h
138+ * \brief prototypes for types.h
139+ */
140+
141+#ifndef _TYPES_H_
142+#define _TYPES_H_
143+
144+#ifdef HAVE_CONFIG_H
145+ #include <config.h>
146+#else
147+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
148+#endif
149+
150+#include <stdio.h>
151+
152+/*here are our abstracted types: inspired on petsc */
153+#if ISSM_USE_64BIT_INDICES == 1
154+typedef long long IssmInt;
155+//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
156+#else
157+typedef int IssmInt;
158+//#define MPIU_INT MPI_INT already defined in petsc
159+#endif
160+
161+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
162+#include "adolc/adolc.h"
163+// for active variables
164+typedef adouble IssmDouble;
165+// for passive variables
166+typedef double IssmPDouble;
167+#else
168+// see above
169+typedef double IssmDouble;
170+// see above
171+typedef IssmDouble IssmPDouble;
172+#endif
173+
174+#endif //ifndef _TYPES_H_
175Index: ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h
176===================================================================
177--- ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h (revision 14914)
178+++ ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h (revision 14915)
179@@ -2,7 +2,7 @@
180 * \brief
181 */
182
183-#include "../../include/types.h"
184+#include "../../shared/Numerics/types.h"
185 #ifndef _GAUSSPOINTS_H
186 #define _GAUSSPOINTS_H
187
188Index: ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp
189===================================================================
190--- ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp (revision 14914)
191+++ ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp (revision 14915)
192@@ -1,6 +1,7 @@
193 #include "../MemOps/MemOps.h"
194 #include "../../include/include.h"
195 #include "../Exceptions/exceptions.h"
196+#include "../Numerics/types.h"
197 #include "./isnan.h"
198 #include <math.h>
199
200Index: ../trunk-jpl/src/c/shared/Numerics/cross.cpp
201===================================================================
202--- ../trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 14914)
203+++ ../trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 14915)
204@@ -8,7 +8,7 @@
205 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
206 #endif
207
208-#include "../../include/include.h"
209+#include "../../shared/Numerics/types.h"
210
211 void cross(IssmDouble* result,IssmDouble* vector1,IssmDouble* vector2){
212
213Index: ../trunk-jpl/src/c/shared/Numerics/numerics.h
214===================================================================
215--- ../trunk-jpl/src/c/shared/Numerics/numerics.h (revision 14914)
216+++ ../trunk-jpl/src/c/shared/Numerics/numerics.h (revision 14915)
217@@ -9,6 +9,7 @@
218 #include "./GaussPoints.h"
219 #include "./isnan.h"
220 #include "./recast.h"
221+#include "./types.h"
222
223 class Input;
224 class Parameters;
225Index: ../trunk-jpl/src/c/shared/Elements/Paterson.cpp
226===================================================================
227--- ../trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 14914)
228+++ ../trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 14915)
229@@ -6,7 +6,7 @@
230
231 #include <math.h>
232
233-#include "../../include/include.h"
234+#include "../../shared/Numerics/types.h"
235
236 IssmDouble Paterson(IssmDouble temperature){
237
238Index: ../trunk-jpl/src/c/io/Comm/IssmComm.cpp
239===================================================================
240--- ../trunk-jpl/src/c/io/Comm/IssmComm.cpp (revision 14914)
241+++ ../trunk-jpl/src/c/io/Comm/IssmComm.cpp (revision 14915)
242@@ -9,7 +9,7 @@
243 #endif
244
245 #include "./IssmComm.h"
246-#include "../../include/types.h"
247+#include "../../shared/Numerics/types.h"
248 #include "../../shared/Exceptions/exceptions.h"
249
250 void IssmComm::SetComm(COMM incomm){ /*{{{*/
251Index: ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp
252===================================================================
253--- ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14914)
254+++ ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14915)
255@@ -9,7 +9,7 @@
256 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
257 #endif
258
259-#include "../../include/types.h"
260+#include "../../shared/Numerics/types.h"
261 #include "../../shared/MemOps/MemOps.h"
262 #include "../../shared/Exceptions/exceptions.h"
263 #include "../../io/Comm/Comm.h"
264Index: ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h
265===================================================================
266--- ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h (revision 14914)
267+++ ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h (revision 14915)
268@@ -12,7 +12,7 @@
269 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
270 #endif
271
272-#include "../../include/types.h"
273+#include "../../shared/Numerics/types.h"
274 /*}}}*/
275
276 template <class doubletype> class IssmVec;
277Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp
278===================================================================
279--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14914)
280+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14915)
281@@ -5,7 +5,7 @@
282 #include <stdio.h>
283 #include <math.h>
284 #include "../../../shared/shared.h"
285-#include "../../../include/types.h"
286+#include "../../../shared/Numerics/types.h"
287
288 int DetermineLocalSize(int global_size,COMM comm){
289
290Index: ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h
291===================================================================
292--- ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14914)
293+++ ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14915)
294@@ -5,7 +5,7 @@
295 #ifndef MPI_PATCHES_H_
296 #define MPI_PATCHES_H_
297
298-#include "../../../include/types.h"
299+#include "../../../shared/Numerics/types.h"
300
301 int DetermineLocalSize(int global_size,COMM comm);
302 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm);
303Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp
304===================================================================
305--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp (revision 14914)
306+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp (revision 14915)
307@@ -5,7 +5,7 @@
308 #include <stdio.h>
309 #include <math.h>
310 #include "../../../shared/shared.h"
311-#include "../../../include/types.h"
312+#include "../../../shared/Numerics/types.h"
313
314 int DetermineGlobalSize(int local_size,COMM comm){
315
316Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp
317===================================================================
318--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp (revision 14914)
319+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp (revision 14915)
320@@ -7,7 +7,7 @@
321 #include <stdio.h>
322 #include <math.h>
323 #include "../../../shared/shared.h"
324-#include "../../../include/types.h"
325+#include "../../../shared/Numerics/types.h"
326
327 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){
328
329Index: ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h
330===================================================================
331--- ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h (revision 14914)
332+++ ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h (revision 14915)
333@@ -13,7 +13,7 @@
334 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
335 #endif
336
337-#include "../../include/types.h"
338+#include "../../shared/Numerics/types.h"
339
340 /*}}}*/
341
342Index: ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h
343===================================================================
344--- ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h (revision 14914)
345+++ ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h (revision 14915)
346@@ -16,7 +16,7 @@
347 #endif
348
349 #include "../petscincludes.h"
350-#include "../../../include/include.h"
351+#include "../../../shared/Numerics/types.h"
352
353 /*}}}*/
354 class PetscVec;
355Index: ../trunk-jpl/src/c/Makefile.am
356===================================================================
357--- ../trunk-jpl/src/c/Makefile.am (revision 14914)
358+++ ../trunk-jpl/src/c/Makefile.am (revision 14915)
359@@ -21,7 +21,6 @@
360 core_sources = ./issm.h\
361 ./issm-binding.h\
362 ./include/typedefs.h\
363- ./include/types.h\
364 ./include/include.h\
365 ./classes/classes.h\
366 ./classes/objects.h\
367@@ -183,6 +182,7 @@
368 ./shared/Matrix/matrix.h\
369 ./shared/Matrix/MatrixUtils.cpp\
370 ./shared/Numerics/numerics.h\
371+ ./shared/Numerics/types.h\
372 ./shared/Numerics/Verbosity.h\
373 ./shared/Numerics/Verbosity.cpp\
374 ./shared/Numerics/IsInputConverged.cpp\
375Index: ../trunk-jpl/src/c/classes/DofIndexing.cpp
376===================================================================
377--- ../trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14914)
378+++ ../trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14915)
379@@ -11,7 +11,7 @@
380 #include <string.h>
381
382 #include "./DofIndexing.h"
383-#include "../include/types.h"
384+#include "../shared/Numerics/types.h"
385 #include "../include/typedefs.h"
386 #include "../io/Print/Print.h"
387 #include "../shared/Exceptions/exceptions.h"
388Index: ../trunk-jpl/src/c/classes/gauss/GaussPenta.h
389===================================================================
390--- ../trunk-jpl/src/c/classes/gauss/GaussPenta.h (revision 14914)
391+++ ../trunk-jpl/src/c/classes/gauss/GaussPenta.h (revision 14915)
392@@ -6,7 +6,7 @@
393 #define _GAUSSPENTA_H_
394
395 /*Headers:*/
396-#include "../../include/types.h"
397+#include "../../shared/Numerics/types.h"
398 class GaussTria;
399
400 class GaussPenta{
401Index: ../trunk-jpl/src/c/classes/gauss/GaussTria.h
402===================================================================
403--- ../trunk-jpl/src/c/classes/gauss/GaussTria.h (revision 14914)
404+++ ../trunk-jpl/src/c/classes/gauss/GaussTria.h (revision 14915)
405@@ -6,7 +6,7 @@
406 #define _GAUSSTRIA_H_
407
408 /*Headers:*/
409-#include "../../include/types.h"
410+#include "../../shared/Numerics/types.h"
411
412 class GaussTria{
413
414Index: ../trunk-jpl/src/c/classes/ToolkitOptions.cpp
415===================================================================
416--- ../trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14914)
417+++ ../trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14915)
418@@ -10,7 +10,7 @@
419
420 #include <string.h>
421 #include "./ToolkitOptions.h"
422-#include "../include/types.h"
423+#include "../shared/Numerics/types.h"
424 #include "../shared/Exceptions/exceptions.h"
425 #include "../shared/MemOps/MemOps.h"
426
427Index: ../trunk-jpl/src/c/classes/DofIndexing.h
428===================================================================
429--- ../trunk-jpl/src/c/classes/DofIndexing.h (revision 14914)
430+++ ../trunk-jpl/src/c/classes/DofIndexing.h (revision 14915)
431@@ -5,7 +5,7 @@
432 #ifndef _DOFINDEXING_H_
433 #define _DOFINDEXING_H_
434
435-#include "../include/types.h"
436+#include "../shared/Numerics/types.h"
437
438 class DofIndexing{
439
440Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp
441===================================================================
442--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14914)
443+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14915)
444@@ -24,7 +24,7 @@
445 #include <string>
446
447 /*ISSM includes: */
448-#include "../../include/types.h"
449+#include "../../shared/Numerics/types.h"
450 #include "../../shared/MemOps/MemOps.h"
451 #include "../../solutions/DakotaSpawnCore.h"
452
Note: See TracBrowser for help on using the repository browser.