source: issm/oecreview/Archive/11991-12009/ISSM-11996-11997.diff@ 12325

Last change on this file since 12325 was 12325, checked in by Eric.Larour, 13 years ago

11990 to 12321 oec compliance
File size: 12.4 KB
RevLine 
[12325]1Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am
2===================================================================
3--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11996)
4+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/Makefile.am (revision 11997)
5@@ -2,41 +2,19 @@
6 EXEEXT=$(WRAPPEREXT)
7 #Bin programs {{{1
8
9-if NOSERIAL
10-bin_PROGRAMS =
11-else
12+if MODULES
13 if MATLAB
14-bin_PROGRAMS = AverageFilter\
15- AddExternalResult\
16+bin_PROGRAMS = AverageFilter\
17 BamgMesher\
18 BamgConvertMesh\
19 BamgTriangulate\
20 Chaco\
21- ComputeBasalStress\
22- ConfigureObjects \
23- ControlOptimization\
24- ControlInputGetGradient\
25- ControlInputScaleGradient\
26- ControlInputSetGradient\
27 ContourToMesh \
28 ContourToNodes \
29- CostFunction \
30- CreateNodalConstraints\
31- CreateJacobianMatrix\
32- Echo\
33 ElementConnectivity\
34 EnumToString\
35 StringToEnum\
36- InputControlUpdate \
37- InputConvergence\
38- GetSolutionFromInputs\
39- GetVectorFromInputs\
40- Gradj\
41- GroundinglineMigration\
42 HoleFiller \
43- InputDuplicate\
44- InputScale\
45- InputToResult\
46 InternalFront\
47 InterpFromGridToMesh \
48 InterpFromMeshToMesh2d \
49@@ -50,93 +28,50 @@
50 Ll2xy \
51 Exp2Kml \
52 Kml2Exp \
53- Mergesolutionfromftog\
54 MeshPartition\
55 MeshProfileIntersection\
56- ModelProcessor \
57- NodeConnectivity\
58- NodesDof\
59- Orth\
60- OutputResults\
61- ParsePetscOptions\
62- ConstraintsState\
63 PointCloudFindNeighbors\
64 PropagateFlagsFromConnectivity\
65- ProcessParams\
66- Reduceload\
67- Reducevectorgtos\
68- Reducevectorgtof\
69- Response\
70- ResetCoordinateSystem\
71 Scotch\
72- Solver\
73- SparseToVector\
74- SpcNodes\
75 Shp2Kml\
76- UpdateConstraints\
77- SurfaceArea\
78- SystemMatrices\
79- TimeAdapt\
80 TriaSearch\
81 TriMesh\
82 TriMeshRifts\
83 TriMeshNoDensity\
84 TriMeshProcessRifts\
85- TriMeshRefine\
86- InputUpdateFromConstant\
87- InputUpdateFromSolution\
88- InputUpdateFromVector\
89- UpdateVertexPositions\
90- UpdateDynamicConstraints\
91- VerticesDof
92+ TriMeshRefine
93 endif
94 if PYTHON
95 bin_PROGRAMS = TriMesh
96 endif
97 endif
98 #}}}
99-#Dakota programs {{{1
100-if NOSERIAL
101-bin_PROGRAMS +=
102-else
103-if DAKOTA
104-if MATLAB
105-bin_PROGRAMS += DakotaResponses\
106- Dakota\
107- InputUpdateFromDakota
108-endif
109-endif
110-endif
111-#}}}
112 #Flags and libraries {{{1
113-LDADD = ../c/libISSM.a $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
114+LDADD = ../c/libISSMCore.a ../c/libISSMModules.a $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
115
116-#Initialize
117-AM_CXXFLAGS = -D_SERIAL_
118+#Triangle library
119+AM_CXXFLAGS = -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
120
121 if MATLAB
122-AM_LDFLAGS = $(MEXLINK)
123+AM_LDFLAGS = $(MEXLINK)
124 AM_CXXFLAGS += -DMATLAB -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
125-LDADD += $(MEXLIB)
126+LDADD += $(MEXLIB) ../c/libISSMMatlab.a
127
128 endif
129
130 if PYTHON
131 AM_LDFLAGS = $(PYTHONLINK)
132-AM_CXXFLAGS+= -DNPY_NO_DEPRECATED_API
133-LDADD += $(BOOSTLIB) $(PYTHONLIB)
134+AM_CXXFLAGS += -DNPY_NO_DEPRECATED_API
135+LDADD += $(BOOSTLIB) $(PYTHONLIB) ../c/libISSMPython.a
136 endif
137
138
139-#Triangle library
140-AM_CXXFLAGS += -DTRILIBRARY -DANSI_DECLARATORS -DNO_TIMER
141-
142 #Optimization flags:
143 AM_CXXFLAGS += $(CXXOPTFLAGS)
144 #}}}
145 #Bin sources {{{1
146-AddExternalResult_SOURCES = AddExternalResult/AddExternalResult.cpp\
147- AddExternalResult/AddExternalResult.h
148+AverageFilter_SOURCES = AverageFilter/AverageFilter.cpp\
149+ AverageFilter/AverageFilter.h
150
151 BamgMesher_SOURCES = BamgMesher/BamgMesher.cpp\
152 BamgMesher/BamgMesher.h
153@@ -150,48 +85,12 @@
154 Chaco_SOURCES = Chaco/Chaco.cpp\
155 Chaco/Chaco.h
156
157-ComputeBasalStress_SOURCES = ComputeBasalStress/ComputeBasalStress.cpp\
158- ComputeBasalStress/ComputeBasalStress.h
159-
160-ConfigureObjects_SOURCES = ConfigureObjects/ConfigureObjects.cpp\
161- ConfigureObjects/ConfigureObjects.h
162-
163 ContourToMesh_SOURCES = ContourToMesh/ContourToMesh.cpp\
164 ContourToMesh/ContourToMesh.h
165
166 ContourToNodes_SOURCES = ContourToNodes/ContourToNodes.cpp\
167 ContourToNodes/ContourToNodes.h
168
169-ControlOptimization_SOURCES = ControlOptimization/ControlOptimization.cpp\
170- ControlOptimization/ControlOptimization.h
171-
172-ControlInputGetGradient_SOURCES = ControlInputGetGradient/ControlInputGetGradient.cpp\
173- ControlInputGetGradient/ControlInputGetGradient.h
174-
175-ControlInputScaleGradient_SOURCES = ControlInputScaleGradient/ControlInputScaleGradient.cpp\
176- ControlInputScaleGradient/ControlInputScaleGradient.h
177-
178-ControlInputSetGradient_SOURCES = ControlInputSetGradient/ControlInputSetGradient.cpp\
179- ControlInputSetGradient/ControlInputSetGradient.h
180-
181-InputControlUpdate_SOURCES = InputControlUpdate/InputControlUpdate.cpp\
182- InputControlUpdate/InputControlUpdate.h
183-
184-InputConvergence_SOURCES = InputConvergence/InputConvergence.cpp\
185- InputConvergence/InputConvergence.h
186-
187-CostFunction_SOURCES = CostFunction/CostFunction.cpp \
188- CostFunction/CostFunction.h
189-
190-CreateNodalConstraints_SOURCES = CreateNodalConstraints/CreateNodalConstraints.cpp \
191- CreateNodalConstraints/CreateNodalConstraints.h
192-
193-NodesDof_SOURCES = NodesDof/NodesDof.cpp\
194- NodesDof/NodesDof.h
195-
196-Echo_SOURCES = Echo/Echo.cpp\
197- Echo/Echo.h
198-
199 ElementConnectivity_SOURCES = ElementConnectivity/ElementConnectivity.cpp\
200 ElementConnectivity/ElementConnectivity.h
201
202@@ -201,30 +100,9 @@
203 StringToEnum_SOURCES = StringToEnum/StringToEnum.cpp\
204 StringToEnum/StringToEnum.h
205
206-GetSolutionFromInputs_SOURCES = GetSolutionFromInputs/GetSolutionFromInputs.cpp\
207- GetSolutionFromInputs/GetSolutionFromInputs.h
208-
209-GetVectorFromInputs_SOURCES = GetVectorFromInputs/GetVectorFromInputs.cpp\
210- GetVectorFromInputs/GetVectorFromInputs.h
211-
212-Gradj_SOURCES = Gradj/Gradj.cpp\
213- Gradj/Gradj.h
214-
215-GroundinglineMigration_SOURCES = GroundinglineMigration/GroundinglineMigration.cpp\
216- GroundinglineMigration/GroundinglineMigration.h
217-
218 HoleFiller_SOURCES = HoleFiller/HoleFiller.cpp\
219 HoleFiller/HoleFiller.h
220
221-InputDuplicate_SOURCES = InputDuplicate/InputDuplicate.cpp\
222- InputDuplicate/InputDuplicate.h
223-
224-InputScale_SOURCES = InputScale/InputScale.cpp\
225- InputScale/InputScale.h
226-
227-InputToResult_SOURCES = InputToResult/InputToResult.cpp\
228- InputToResult/InputToResult.h
229-
230 InternalFront_SOURCES = InternalFront/InternalFront.cpp\
231 InternalFront/InternalFront.h
232
233@@ -264,88 +142,24 @@
234 Kml2Exp_SOURCES = Kml2Exp/Kml2Exp.cpp\
235 Kml2Exp/Kml2Exp.h
236
237-AverageFilter_SOURCES = AverageFilter/AverageFilter.cpp\
238- AverageFilter/AverageFilter.h
239-
240-Mergesolutionfromftog_SOURCES = Mergesolutionfromftog/Mergesolutionfromftog.cpp\
241- Mergesolutionfromftog/Mergesolutionfromftog.h
242-
243 MeshPartition_SOURCES = MeshPartition/MeshPartition.cpp\
244 MeshPartition/MeshPartition.h
245
246 MeshProfileIntersection_SOURCES = MeshProfileIntersection/MeshProfileIntersection.cpp\
247 MeshProfileIntersection/MeshProfileIntersection.h
248
249-ModelProcessor_SOURCES = ModelProcessor/ModelProcessor.cpp \
250- ModelProcessor/ModelProcessor.h
251-
252-NodeConnectivity_SOURCES = NodeConnectivity/NodeConnectivity.cpp\
253- NodeConnectivity/NodeConnectivity.h
254-
255-Orth_SOURCES = Orth/Orth.cpp\
256- Orth/Orth.h
257-
258-OutputResults_SOURCES = OutputResults/OutputResults.cpp\
259- OutputResults/OutputResults.h
260-
261-ConstraintsState_SOURCES = ConstraintsState/ConstraintsState.cpp\
262- ConstraintsState/ConstraintsState.h
263-
264 PointCloudFindNeighbors_SOURCES = PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
265 PointCloudFindNeighbors/PointCloudFindNeighbors.h
266
267-ProcessParams_SOURCES = ProcessParams/ProcessParams.cpp\
268- ProcessParams/ProcessParams.h
269-
270 PropagateFlagsFromConnectivity_SOURCES = PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
271 PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
272
273-Reduceload_SOURCES = Reduceload/Reduceload.cpp\
274- Reduceload/Reduceload.h
275-
276-Reducevectorgtos_SOURCES = Reducevectorgtos/Reducevectorgtos.cpp\
277- Reducevectorgtos/Reducevectorgtos.h
278-
279-Reducevectorgtof_SOURCES = Reducevectorgtof/Reducevectorgtof.cpp\
280- Reducevectorgtof/Reducevectorgtof.h
281-
282-Response_SOURCES = Response/Response.cpp\
283- Response/Response.h
284-
285-ResetCoordinateSystem_SOURCES = ResetCoordinateSystem/ResetCoordinateSystem.cpp\
286- ResetCoordinateSystem/ResetCoordinateSystem.h
287-
288 Scotch_SOURCES = Scotch/Scotch.cpp\
289 Scotch/Scotch.h
290
291-Solver_SOURCES = Solver/Solver.cpp\
292- Solver/Solver.h
293-
294-SparseToVector_SOURCES = SparseToVector/SparseToVector.cpp\
295- SparseToVector/SparseToVector.h
296-
297-SpcNodes_SOURCES = SpcNodes/SpcNodes.cpp\
298- SpcNodes/SpcNodes.h
299-
300 Shp2Kml_SOURCES = Shp2Kml/Shp2Kml.cpp\
301 Shp2Kml/Shp2Kml.h
302
303-UpdateConstraints_SOURCES = UpdateConstraints/UpdateConstraints.cpp\
304- UpdateConstraints/UpdateConstraints.h
305-
306-SystemMatrices_SOURCES = SystemMatrices/SystemMatrices.cpp\
307- SystemMatrices/SystemMatrices.h
308-
309-
310-CreateJacobianMatrix_SOURCES = CreateJacobianMatrix/CreateJacobianMatrix.cpp\
311- CreateJacobianMatrix/CreateJacobianMatrix.h
312-
313-SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\
314- SurfaceArea/SurfaceArea.h
315-
316-TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\
317- TimeAdapt/TimeAdapt.h
318-
319 TriaSearch_SOURCES = TriaSearch/TriaSearch.cpp\
320 TriaSearch/TriaSearch.h
321
322@@ -364,33 +178,4 @@
323 TriMeshRefine_SOURCES = TriMeshRefine/TriMeshRefine.cpp\
324 TriMeshRefine/TriMeshRefine.h
325
326-InputUpdateFromConstant_SOURCES = InputUpdateFromConstant/InputUpdateFromConstant.cpp\
327- InputUpdateFromConstant/InputUpdateFromConstant.h
328-
329-InputUpdateFromSolution_SOURCES = InputUpdateFromSolution/InputUpdateFromSolution.cpp\
330- InputUpdateFromSolution/InputUpdateFromSolution.h
331-
332-InputUpdateFromVector_SOURCES = InputUpdateFromVector/InputUpdateFromVector.cpp\
333- InputUpdateFromVector/InputUpdateFromVector.h
334-
335-UpdateVertexPositions_SOURCES = UpdateVertexPositions/UpdateVertexPositions.cpp\
336- UpdateVertexPositions/UpdateVertexPositions.h
337-
338-UpdateDynamicConstraints_SOURCES = UpdateDynamicConstraints/UpdateDynamicConstraints.cpp\
339- UpdateDynamicConstraints/UpdateDynamicConstraints.h
340-
341-ParsePetscOptions_SOURCES = ParsePetscOptions/ParsePetscOptions.cpp\
342- ParsePetscOptions/ParsePetscOptions.h
343-
344-VerticesDof_SOURCES = VerticesDof/VerticesDof.cpp\
345- VerticesDof/VerticesDof.h
346-
347 #}}}
348-#Dakota sources {{{1
349-DakotaResponses_SOURCES = DakotaResponses/DakotaResponses.cpp\
350- DakotaResponses/DakotaResponses.h
351-Dakota_SOURCES = Dakota/Dakota.cpp\
352- Dakota/Dakota.h
353-InputUpdateFromDakota_SOURCES = InputUpdateFromDakota/InputUpdateFromDakota.cpp\
354- InputUpdateFromDakota/InputUpdateFromDakota.h
355-#}}}
356Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/TriMesh/TriMesh.h
357===================================================================
358--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/TriMesh/TriMesh.h (revision 11996)
359+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/mex/TriMesh/TriMesh.h (revision 11997)
360@@ -17,6 +17,7 @@
361 #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
362 #endif
363
364+/*Header files: */
365 #include "../../c/include/globals.h"
366 #include "../../c/toolkits/toolkits.h"
367 #include "../../c/include/include.h"
368@@ -31,21 +32,19 @@
369 #define DOMAINOUTLINE (mxArray *)prhs[0]
370 #define AREA (mxArray *)prhs[1]
371 #define ORDER (mxArray *)prhs[2]
372-
373 /* serial output macros: */
374 #define INDEX (mxArray**)&plhs[0]
375 #define X (mxArray**)&plhs[1]
376 #define Y (mxArray**)&plhs[2]
377 #define SEGMENTS (mxArray**)&plhs[3]
378 #define SEGMENTMARKERLIST (mxArray**)&plhs[4]
379-
380 #endif
381+
382 #ifdef _HAVE_PYTHON_
383 /* serial input macros: */
384 #define DOMAINOUTLINE PyTuple_GetItem(args,0)
385 #define AREA PyTuple_GetItem(args,1)
386 #define ORDER PyTuple_GetItem(args,2)
387-
388 /* serial output macros: */
389 #define INDEX output,0
390 #define X output,1
391@@ -54,9 +53,6 @@
392 #define SEGMENTMARKERLIST output,4
393 #endif
394
395-/* local prototypes: */
396-void TriMeshUsage(void);
397-
398 #undef __FUNCT__
399 #define __FUNCT__ "TriMesh"
400
401@@ -66,4 +62,7 @@
402 #undef NRHS
403 #define NRHS 3
404
405+/* local prototypes: */
406+void TriMeshUsage(void);
407+
408 #endif /* _TRIMESH_H */
Note: See TracBrowser for help on using the repository browser.