source: issm/oecreview/Archive/18296-19100/ISSM-19046-19047.diff

Last change on this file was 19102, checked in by Mathieu Morlighem, 10 years ago

NEW: added 18296-19100
File size: 51.9 KB
RevLine 
[19102]1Index: ../trunk-jpl/src/c/modules/modules.h
2===================================================================
3--- ../trunk-jpl/src/c/modules/modules.h (revision 19046)
4+++ ../trunk-jpl/src/c/modules/modules.h (revision 19047)
5@@ -11,6 +11,7 @@
6 #include "./Bamgx/Bamgx.h"
7 #include "./BamgConvertMeshx/BamgConvertMeshx.h"
8 #include "./BamgTriangulatex/BamgTriangulatex.h"
9+#include "./Calvingx/Calvingx.h"
10 #include "./Chacox/Chacox.h"
11 #include "./ConfigureObjectsx/ConfigureObjectsx.h"
12 #include "./ContourToMeshx/ContourToMeshx.h"
13Index: ../trunk-jpl/src/c/modules/Calvingx/Calvingx.h
14===================================================================
15--- ../trunk-jpl/src/c/modules/Calvingx/Calvingx.h (revision 0)
16+++ ../trunk-jpl/src/c/modules/Calvingx/Calvingx.h (revision 19047)
17@@ -0,0 +1,10 @@
18+#ifndef _CALVINGX_H
19+#define _CALVINGX_H
20+
21+#include "../../classes/classes.h"
22+#include "../../analyses/analyses.h"
23+
24+/* local prototypes: */
25+void Calvingx(FemModel* femmodel);
26+
27+#endif
28Index: ../trunk-jpl/src/c/modules/Calvingx/Calvingx.cpp
29===================================================================
30--- ../trunk-jpl/src/c/modules/Calvingx/Calvingx.cpp (revision 0)
31+++ ../trunk-jpl/src/c/modules/Calvingx/Calvingx.cpp (revision 19047)
32@@ -0,0 +1,38 @@
33+/*!\file Calvingx
34+ * \brief: compute inverse method gradient
35+ */
36+
37+#include "./Calvingx.h"
38+#include "../../shared/shared.h"
39+#include "../../toolkits/toolkits.h"
40+
41+void Calvingx(FemModel* femmodel){
42+
43+ /*Recover Calving law Enum*/
44+ int calvinglaw;
45+ femmodel->parameters->FindParam(&calvinglaw,CalvingLawEnum);
46+
47+ /*Calculate calving rate*/
48+ switch(calvinglaw){
49+ case DefaultCalvingEnum:
50+ break;
51+ case CalvingLevermannEnum:
52+ if(VerboseModule()) _printf0_(" computing Levermann's calving rate\n");
53+ femmodel->StrainRateparallelx();
54+ femmodel->StrainRateperpendicularx();
55+ femmodel->CalvingRateLevermannx();
56+ break;
57+ case CalvingPiEnum:
58+ if(VerboseModule()) _printf0_(" computing Pi's calving rate\n");
59+ femmodel->StrainRateparallelx();
60+ femmodel->DeviatoricStressx();
61+ femmodel->CalvingRatePix();
62+ break;
63+ case CalvingDevEnum:
64+ femmodel->CalvingRateDevx();
65+ femmodel->ElementOperationx(&Element::CalvingRateDev);
66+ break;
67+ default:
68+ _error_("Caving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
69+ }
70+}
71Index: ../trunk-jpl/src/c/modules/Calvingx
72===================================================================
73--- ../trunk-jpl/src/c/modules/Calvingx (revision 19046)
74+++ ../trunk-jpl/src/c/modules/Calvingx (revision 19047)
75
76Property changes on: ../trunk-jpl/src/c/modules/Calvingx
77___________________________________________________________________
78Added: svn:ignore
79## -0,0 +1,2 ##
80+.deps
81+.dirstamp
82Index: ../trunk-jpl/src/c/modules/ExpToLevelSetx
83===================================================================
84--- ../trunk-jpl/src/c/modules/ExpToLevelSetx (revision 19046)
85+++ ../trunk-jpl/src/c/modules/ExpToLevelSetx (revision 19047)
86
87Property changes on: ../trunk-jpl/src/c/modules/ExpToLevelSetx
88___________________________________________________________________
89Modified: svn:ignore
90## -1 +1,2 ##
91 .deps
92+.dirstamp
93Index: ../trunk-jpl/src/c/modules
94===================================================================
95--- ../trunk-jpl/src/c/modules (revision 19046)
96+++ ../trunk-jpl/src/c/modules (revision 19047)
97
98Property changes on: ../trunk-jpl/src/c/modules
99___________________________________________________________________
100Added: svn:ignore
101## -0,0 +1 ##
102+.deps
103Index: ../trunk-jpl/src/c/Makefile.am
104===================================================================
105--- ../trunk-jpl/src/c/Makefile.am (revision 19046)
106+++ ../trunk-jpl/src/c/Makefile.am (revision 19047)
107@@ -14,203 +14,97 @@
108
109 #Core sources
110 #Core sources{{{
111-issm_sources = ./datastructures/DataSet.h\
112- ./datastructures/DataSet.cpp\
113- ./datastructures/Object.h\
114- ./datastructures/datastructures.h\
115- ./classes/classes.h\
116- ./classes/gauss/Gauss.h\
117- ./classes/gauss/GaussSeg.h\
118+issm_sources = ./datastructures/DataSet.cpp\
119 ./classes/gauss/GaussSeg.cpp\
120- ./classes/gauss/GaussTria.h\
121 ./classes/gauss/GaussTria.cpp\
122- ./classes/gauss/GaussTetra.h\
123 ./classes/gauss/GaussTetra.cpp\
124- ./classes/gauss/GaussPenta.h\
125 ./classes/gauss/GaussPenta.cpp\
126- ./classes/Update.h\
127- ./classes/FemModel.h\
128 ./classes/FemModel.cpp\
129- ./classes/Material.h\
130- ./classes/Load.h\
131- ./classes/Contour.h\
132- ./classes/Loads/Friction.h\
133 ./classes/Loads/Friction.cpp\
134- ./classes/Inputs/TransientInput.h\
135 ./classes/Inputs/TransientInput.cpp\
136 ./classes/Constraints/SpcTransient.cpp\
137- ./classes/Constraints/SpcTransient.h\
138- ./classes/IndependentObject.h\
139 ./classes/IndependentObject.cpp\
140- ./classes/DependentObject.h\
141 ./classes/DependentObject.cpp\
142- ./classes/DofIndexing.h\
143 ./classes/DofIndexing.cpp\
144- ./classes/IoModel.h\
145 ./classes/IoModel.cpp\
146- ./classes/Contours.h\
147 ./classes/Contours.cpp\
148- ./classes/Nodes.h\
149 ./classes/Nodes.cpp\
150- ./classes/Vertices.h\
151 ./classes/Vertices.cpp\
152- ./classes/Node.h\
153 ./classes/Node.cpp\
154- ./classes/Segment.h\
155- ./classes/Vertex.h\
156 ./classes/Vertex.cpp\
157- ./classes/Hook.h\
158 ./classes/Hook.cpp\
159- ./classes/ExternalResults/Results.h\
160 ./classes/ExternalResults/Results.cpp\
161- ./classes/ExternalResults/ExternalResult.h\
162- ./classes/ExternalResults/GenericExternalResult.h\
163- ./classes/Elements/Element.h\
164 ./classes/Elements/Element.cpp\
165- ./classes/Elements/Elements.h\
166 ./classes/Elements/Elements.cpp\
167- ./classes/Elements/ElementHook.h\
168 ./classes/Elements/ElementHook.cpp\
169- ./classes/Elements/Seg.h\
170 ./classes/Elements/Seg.cpp\
171- ./classes/Elements/SegRef.h\
172 ./classes/Elements/SegRef.cpp\
173- ./classes/Elements/Tria.h\
174 ./classes/Elements/Tria.cpp\
175- ./classes/Elements/TriaRef.h\
176 ./classes/Elements/TriaRef.cpp\
177- ./classes/Elements/Tetra.h\
178 ./classes/Elements/Tetra.cpp\
179- ./classes/Elements/TetraRef.h\
180 ./classes/Elements/TetraRef.cpp\
181- ./classes/Elements/Penta.h\
182 ./classes/Elements/Penta.cpp\
183- ./classes/Elements/PentaRef.h\
184 ./classes/Elements/PentaRef.cpp\
185- ./classes/Inputs/Inputs.h\
186 ./classes/Inputs/Inputs.cpp\
187- ./classes/Inputs/Input.h\
188- ./classes/Inputs/InputLocal.h\
189- ./classes/Inputs/SegInput.h\
190 ./classes/Inputs/SegInput.cpp\
191- ./classes/Inputs/TriaInput.h\
192 ./classes/Inputs/TriaInput.cpp\
193- ./classes/Inputs/BoolInput.h\
194 ./classes/Inputs/BoolInput.cpp\
195- ./classes/Inputs/IntInput.h\
196 ./classes/Inputs/IntInput.cpp\
197- ./classes/Inputs/DoubleInput.h\
198 ./classes/Inputs/DoubleInput.cpp\
199- ./classes/Inputs/DatasetInput.h\
200 ./classes/Inputs/DatasetInput.cpp\
201- ./classes/Materials/Materials.h\
202 ./classes/Materials/Materials.cpp\
203- ./classes/Materials/Matice.h\
204 ./classes/Materials/Matice.cpp\
205- ./classes/Materials/Matseaice.h\
206 ./classes/Materials/Matseaice.cpp\
207- ./classes/Materials/Matpar.h\
208 ./classes/Materials/Matpar.cpp\
209- ./classes/Constraints/Constraints.h\
210 ./classes/Constraints/Constraints.cpp\
211- ./classes/Constraints/Constraint.h\
212 ./classes/Constraints/SpcStatic.cpp\
213- ./classes/Constraints/SpcStatic.h\
214 ./classes/Constraints/SpcDynamic.cpp\
215- ./classes/Constraints/SpcDynamic.h\
216- ./classes/Loads/Loads.h\
217 ./classes/Loads/Loads.cpp\
218 ./classes/Loads/Penpair.cpp\
219- ./classes/Loads/Penpair.h\
220 ./classes/Loads/Pengrid.cpp\
221- ./classes/Loads/Pengrid.h\
222 ./classes/Loads/Numericalflux.cpp\
223- ./classes/Loads/Numericalflux.h\
224- ./classes/matrix/matrixobjects.h\
225- ./classes/matrix/ElementMatrix.h\
226 ./classes/matrix/ElementMatrix.cpp\
227- ./classes/matrix/ElementVector.h\
228 ./classes/matrix/ElementVector.cpp\
229- ./classes/Params/Parameters.h\
230 ./classes/Params/Parameters.cpp\
231- ./classes/Params/Param.h\
232- ./classes/Params/GenericParam.h\
233 ./classes/Params/BoolParam.cpp\
234- ./classes/Params/BoolParam.h\
235 ./classes/Params/IntParam.cpp\
236- ./classes/Params/IntParam.h\
237 ./classes/Params/IntVecParam.cpp\
238- ./classes/Params/IntVecParam.h\
239 ./classes/Params/IntMatParam.cpp\
240- ./classes/Params/IntMatParam.h\
241 ./classes/Params/DoubleParam.cpp\
242- ./classes/Params/DoubleParam.h\
243 ./classes/Params/FileParam.cpp\
244- ./classes/Params/FileParam.h\
245 ./classes/Params/StringArrayParam.cpp\
246- ./classes/Params/StringArrayParam.h\
247 ./classes/Params/DoubleMatParam.cpp\
248- ./classes/Params/DoubleMatParam.h\
249 ./classes/Params/DoubleTransientMatParam.cpp\
250- ./classes/Params/DoubleTransientMatParam.h\
251 ./classes/Params/DoubleMatArrayParam.cpp\
252- ./classes/Params/DoubleMatArrayParam.h\
253 ./classes/Params/DoubleVecParam.cpp\
254- ./classes/Params/DoubleVecParam.h\
255 ./classes/Params/StringParam.cpp\
256- ./classes/Params/StringParam.h\
257- ./classes/Params/MatrixParam.h\
258 ./classes/Params/MatrixParam.cpp\
259- ./classes/Params/VectorParam.h\
260 ./classes/Params/VectorParam.cpp\
261- ./classes/Params/TransientParam.h\
262 ./classes/Params/TransientParam.cpp\
263- ./classes/Params/DataSetParam.h\
264 ./classes/Params/DataSetParam.cpp\
265- ./classes/Profiler.h\
266 ./classes/Profiler.cpp\
267- ./shared/shared.h\
268- ./shared/MemOps/MemOps.h\
269 ./shared/MemOps/MemOps.cpp\
270- ./shared/Matrix/matrix.h\
271 ./shared/Matrix/MatrixUtils.cpp\
272- ./shared/io/io.h\
273- ./shared/io/Disk/diskio.h\
274 ./shared/io/Disk/pfopen.cpp\
275 ./shared/io/Disk/pfclose.cpp\
276 ./shared/io/Disk/WriteLockFile.cpp\
277 ./shared/io/Print/PrintfFunction.cpp\
278- ./shared/io/Print/Print.h\
279- ./shared/io/Comm/IssmComm.h\
280 ./shared/io/Comm/IssmComm.cpp\
281 ./shared/LatLong/Ll2xyx.cpp\
282 ./shared/LatLong/Xy2llx.cpp\
283- ./shared/FSanalyticals/fsanalyticals.h\
284 ./shared/FSanalyticals/fsanalyticals.cpp\
285- ./shared/Enum/Enum.h\
286- ./shared/Enum/EnumDefinitions.h\
287 ./shared/Enum/EnumToStringx.cpp\
288 ./shared/Enum/StringToEnumx.cpp\
289- ./shared/Numerics/numerics.h\
290- ./shared/Numerics/types.h\
291- ./shared/Numerics/constants.h\
292- ./shared/Numerics/Verbosity.h\
293 ./shared/Numerics/Verbosity.cpp\
294- ./shared/Numerics/GaussPoints.h\
295 ./shared/Numerics/GaussPoints.cpp\
296 ./shared/Numerics/cross.cpp\
297- ./shared/Numerics/isnan.h\
298 ./shared/Numerics/isnan.cpp\
299 ./shared/Numerics/cubic.cpp\
300 ./shared/Numerics/NewtonSolveDnorm.cpp\
301 ./shared/Numerics/extrema.cpp\
302 ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\
303- ./shared/Numerics/OptPars.h\
304- ./shared/Exceptions/exceptions.h\
305 ./shared/Exceptions/Exceptions.cpp\
306 ./shared/Sorting/binary_search.cpp\
307- ./shared/Sorting/sorting.h\
308- ./shared/Elements/elements.h\
309 ./shared/Elements/Cuffey.cpp\
310 ./shared/Elements/StressIntensityIntegralWeight.cpp\
311 ./shared/Elements/Paterson.cpp\
312@@ -221,41 +115,15 @@
313 ./shared/Elements/ComputeDelta18oTemperaturePrecipitation.cpp\
314 ./shared/Elements/ComputeMungsmTemperaturePrecipitation.cpp\
315 ./shared/Elements/DrainageFunctionWaterfraction.cpp\
316- ./shared/String/sharedstring.h\
317 ./shared/String/DescriptorIndex.cpp\
318- ./toolkits/metis/metisincludes.h\
319- ./toolkits/issm/issmtoolkit.h\
320- ./toolkits/issm/IssmToolkitUtils.h\
321 ./toolkits/issm/IssmToolkitUtils.cpp\
322- ./toolkits/issm/IssmAbsMat.h\
323- ./toolkits/issm/IssmAbsVec.h\
324- ./toolkits/issm/IssmDenseMat.h\
325- ./toolkits/issm/IssmMat.h\
326- ./toolkits/issm/IssmSeqVec.h\
327- ./toolkits/issm/IssmVec.h\
328- ./toolkits/issm/IssmSolver.h\
329 ./toolkits/issm/IssmSolver.cpp\
330- ./toolkits/issm/SparseRow.h\
331- ./toolkits/issm/Bucket.h\
332- ./toolkits/mpi/issmmpi.h\
333 ./toolkits/mpi/issmmpi.cpp\
334- ./toolkits/mpi/commops/commops.h\
335 ./toolkits/mpi/commops/DetermineLocalSize.cpp\
336 ./toolkits/mpi/commops/DetermineGlobalSize.cpp\
337 ./toolkits/mpi/commops/DetermineRowRankFromLocalSize.cpp\
338 ./toolkits/mpi/commops/GetOwnershipBoundariesFromRange.cpp\
339- ./toolkits/adolc/adolcincludes.h\
340- ./toolkits/adolc/AdolcEdf.h\
341- ./toolkits/ToolkitOptions.h\
342 ./toolkits/ToolkitOptions.cpp\
343- ./toolkits/triangle/triangleincludes.h\
344- ./toolkits/objects/toolkitobjects.h\
345- ./toolkits/objects/Matrix.h\
346- ./toolkits/objects/Vector.h\
347- ./toolkits/objects/Solver.h\
348- ./toolkitsenums.h\
349- ./toolkits.h\
350- ./modules/ModelProcessorx/ModelProcessorx.h\
351 ./modules/ModelProcessorx/ModelProcessorx.cpp\
352 ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp\
353 ./modules/ModelProcessorx/NodesPartitioning.cpp\
354@@ -269,78 +137,41 @@
355 ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
356 ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\
357 ./modules/ModelProcessorx/CreateNodes.cpp\
358- ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h\
359 ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp\
360- ./modules/NodesDofx/NodesDofx.h\
361 ./modules/NodesDofx/NodesDofx.cpp\
362- ./modules/NodalValuex/NodalValuex.h\
363 ./modules/NodalValuex/NodalValuex.cpp\
364- ./modules/VerticesDofx/VerticesDofx.h\
365 ./modules/VerticesDofx/VerticesDofx.cpp\
366- ./modules/VertexCoordinatesx/VertexCoordinatesx.h\
367 ./modules/VertexCoordinatesx/VertexCoordinatesx.cpp\
368- ./modules/OutputResultsx/OutputResultsx.h\
369 ./modules/OutputResultsx/OutputResultsx.cpp\
370- ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h\
371 ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp\
372- ./modules/InputDuplicatex/InputDuplicatex.h\
373 ./modules/InputDuplicatex/InputDuplicatex.cpp\
374- ./modules/InputExtrudex/InputExtrudex.h\
375 ./modules/InputExtrudex/InputExtrudex.cpp\
376- ./modules/InputScalex/InputScalex.h\
377 ./modules/InputScalex/InputScalex.cpp\
378- ./modules/SurfaceAreax/SurfaceAreax.h\
379 ./modules/SurfaceAreax/SurfaceAreax.cpp\
380- ./modules/AllocateSystemMatricesx/AllocateSystemMatricesx.h\
381 ./modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp\
382- ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h\
383 ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp\
384- ./modules/SystemMatricesx/SystemMatricesx.h\
385 ./modules/SystemMatricesx/SystemMatricesx.cpp\
386- ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h\
387 ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp\
388- ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h\
389 ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp\
390- ./modules/IoModelToConstraintsx/IoModelToConstraintsx.h\
391 ./modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp\
392- ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h\
393 ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp\
394- ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\
395 ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\
396- ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h\
397 ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp\
398- ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\
399 ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\
400- ./modules/GetVectorFromInputsx/GetVectorFromInputsx.h\
401 ./modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp\
402- ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\
403 ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\
404- ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h\
405 ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp\
406- ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
407 ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\
408- ./modules/SpcNodesx/SpcNodesx.h\
409 ./modules/SpcNodesx/SpcNodesx.cpp\
410- ./modules/SurfaceMassBalancex/SurfaceMassBalancex.h\
411 ./modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp\
412- ./modules/MeshPartitionx/MeshPartitionx.h\
413 ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\
414- ./modules/Reducevectorgtofx/Reducevectorgtofx.h\
415- ./modules/Reduceloadx/Reduceloadx.h\
416 ./modules/Reduceloadx/Reduceloadx.cpp\
417 ./modules/ConstraintsStatex/ConstraintsStatex.cpp\
418- ./modules/ConstraintsStatex/ConstraintsStatex.h\
419- ./modules/ConstraintsStatex/ConstraintsStateLocal.h\
420- ./modules/ResetConstraintsx/ResetConstraintsx.h\
421 ./modules/ResetConstraintsx/ResetConstraintsx.cpp\
422- ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h\
423 ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp\
424 ./modules/Solverx/Solverx.cpp\
425- ./modules/Solverx/Solverx.h\
426 ./modules/VecMergex/VecMergex.cpp\
427- ./modules/VecMergex/VecMergex.h\
428 ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
429- ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\
430 ./cores/ProcessArguments.cpp\
431 ./cores/ResetBoundaryConditions.cpp\
432 ./cores/WrapperCorePointerFromSolutionEnum.cpp\
433@@ -349,9 +180,7 @@
434 ./cores/adgradient_core.cpp\
435 ./main/EnvironmentInit.cpp\
436 ./main/EnvironmentFinalize.cpp\
437- ./analyses/EnumToAnalysis.h\
438 ./analyses/EnumToAnalysis.cpp\
439- ./analyses/Analysis.h\
440 ./solutionsequences/solutionsequence_la.cpp\
441 ./solutionsequences/solutionsequence_la_theta.cpp\
442 ./solutionsequences/solutionsequence_linear.cpp\
443@@ -359,14 +188,9 @@
444 ./solutionsequences/solutionsequence_newton.cpp\
445 ./solutionsequences/solutionsequence_fct.cpp\
446 ./solutionsequences/convergence.cpp\
447- ./classes/Options/Options.h\
448 ./classes/Options/Options.cpp\
449- ./classes/Options/Option.h\
450- ./classes/Options/GenericOption.h\
451 ./classes/Options/OptionUtilities.cpp\
452- ./classes/Options/OptionUtilities.h\
453 ./classes/RiftStruct.cpp\
454- ./classes/RiftStruct.h\
455 ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \
456 ./cores/transient_core.cpp\
457 ./cores/steadystate_core.cpp\
458@@ -377,40 +201,23 @@
459 ./cores/thermal_core.cpp\
460 ./solutionsequences/solutionsequence_thermal_nonlinear.cpp\
461 ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\
462- ./modules/ControlInputSetGradientx/ControlInputSetGradientx.h\
463 ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp\
464- ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h\
465 ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp\
466- ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h\
467 ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\
468 ./modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp\
469- ./modules/InputControlUpdatex/InputControlUpdatex.h\
470 ./modules/InputControlUpdatex/InputControlUpdatex.cpp\
471- ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h\
472 ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp\
473- ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h\
474 ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp\
475- ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h\
476 ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp\
477- ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h\
478 ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp\
479- ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h\
480 ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp\
481- ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h\
482 ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp\
483- ./modules/Gradjx/Gradjx.h\
484 ./modules/Gradjx/Gradjx.cpp\
485 ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp\
486- ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h\
487 ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp\
488- ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h\
489 ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp\
490- ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h\
491 ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
492- ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
493 ./modules/RheologyBAbsGradientx/RheologyBAbsGradientx.cpp\
494- ./modules/RheologyBAbsGradientx/RheologyBAbsGradientx.h\
495- ./classes/Inputs/ControlInput.h\
496 ./classes/Inputs/ControlInput.cpp\
497 ./shared/Numerics/BrentSearch.cpp\
498 ./cores/control_core.cpp\
499@@ -439,109 +246,59 @@
500 ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\
501 ./classes/Loads/Riftfront.cpp\
502 ./modules/ConstraintsStatex/RiftConstraintsState.cpp\
503- ./classes/Massfluxatgate.h \
504- ./classes/Misfit.h \
505- ./classes/Masscon.h \
506 ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\
507- ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\
508 ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\
509- ./classes/Inputs/PentaInput.h\
510 ./classes/Inputs/PentaInput.cpp\
511- ./classes/Inputs/TetraInput.h\
512- ./classes/Inputs/TetraInput.cpp\
513- #}}}
514+ ./classes/Inputs/TetraInput.cpp
515+#}}}
516 #DAKOTA sources {{{
517 if DAKOTA
518-issm_sources += ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
519- ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
520- ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\
521+issm_sources += ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
522 ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\
523- ./modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h\
524 ./modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp\
525 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
526- ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
527 ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
528 ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp\
529 ./cores/dakota_core.cpp\
530- ./cores/DakotaSpawnCore.h\
531 ./cores/DakotaSpawnCore.cpp
532 endif
533 #}}}
534 #BAMG sources {{{
535 if BAMG
536-issm_sources += ./bamg/bamgobjects.h\
537- ./bamg/BamgGeom.h\
538- ./bamg/BamgGeom.cpp\
539- ./bamg/BamgMesh.h\
540+issm_sources += ./bamg/BamgGeom.cpp\
541 ./bamg/BamgMesh.cpp\
542- ./bamg/BamgOpts.h\
543 ./bamg/BamgOpts.cpp\
544- ./bamg/CrackedEdge.h\
545 ./bamg/CrackedEdge.cpp\
546- ./bamg/Curve.h\
547 ./bamg/Curve.cpp\
548- ./bamg/Direction.h\
549 ./bamg/Direction.cpp\
550- ./bamg/DoubleAndInt.h\
551- ./bamg/Edge.h\
552 ./bamg/Edge.cpp\
553- ./bamg/GeomEdge.h\
554 ./bamg/GeomEdge.cpp\
555- ./bamg/GeomSubDomain.h\
556 ./bamg/GeomSubDomain.cpp\
557- ./bamg/GeomVertex.h\
558 ./bamg/GeomVertex.cpp\
559 ./bamg/Geometry.cpp\
560- ./bamg/Geometry.h\
561 ./bamg/ListofIntersectionTriangles.cpp\
562- ./bamg/ListofIntersectionTriangles.h\
563 ./bamg/EigenMetric.cpp\
564 ./bamg/Metric.cpp\
565- ./bamg/Metric.h\
566 ./bamg/BamgQuadtree.cpp\
567- ./bamg/BamgQuadtree.h\
568- ./bamg/R2.h\
569 ./bamg/SetOfE4.cpp\
570- ./bamg/SetOfE4.h\
571- ./bamg/SubDomain.h\
572 ./bamg/SubDomain.cpp\
573- ./bamg/AdjacentTriangle.h\
574 ./bamg/AdjacentTriangle.cpp\
575 ./bamg/Triangle.cpp\
576- ./bamg/det.h \
577- ./bamg/Triangle.h\
578 ./bamg/BamgVertex.cpp\
579- ./bamg/BamgVertex.h\
580- ./bamg/VertexOnEdge.h\
581 ./bamg/VertexOnEdge.cpp\
582- ./bamg/VertexOnGeom.h\
583 ./bamg/VertexOnGeom.cpp\
584- ./bamg/VertexOnVertex.h\
585 ./bamg/VertexOnVertex.cpp\
586 ./bamg/Mesh.cpp\
587- ./bamg/Mesh.h\
588- ./shared/Bamg/Abs.h \
589- ./shared/Bamg/BigPrimeNumber.h\
590 ./shared/Bamg/BigPrimeNumber.cpp\
591- ./shared/Bamg/BinaryRand.h \
592- ./shared/Bamg/Exchange.h \
593- ./shared/Bamg/extrema.h \
594- ./shared/Bamg/HeapSort.h \
595- ./shared/Bamg/OppositeAngle.h \
596 ./modules/Bamgx/Bamgx.cpp\
597- ./modules/Bamgx/Bamgx.h\
598 ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
599- ./modules/BamgConvertMeshx/BamgConvertMeshx.h\
600- ./modules/BamgTriangulatex/BamgTriangulatex.cpp\
601- ./modules/BamgTriangulatex/BamgTriangulatex.h
602+ ./modules/BamgTriangulatex/BamgTriangulatex.cpp
603 endif
604 #}}}
605 #Petsc sources {{{
606 if PETSC
607 issm_sources += ./toolkits/petsc\
608 ./toolkits/petsc/patches\
609- ./toolkits/petsc/patches/SolverEnum.h\
610- ./toolkits/petsc/patches/petscpatches.h\
611 ./toolkits/petsc/patches/VecToMPISerial.cpp\
612 ./toolkits/petsc/patches/MatToSerial.cpp\
613 ./toolkits/petsc/patches/VecMerge.cpp\
614@@ -556,28 +313,19 @@
615 ./toolkits/petsc/patches/ISSMToPetscMatrixType.cpp\
616 ./toolkits/petsc/patches/ISSMToPetscInsertMode.cpp\
617 ./toolkits/petsc/patches/ISSMToPetscNormMode.cpp\
618- ./toolkits/petsc/objects/petscobjects.h\
619- ./toolkits/petsc/objects/PetscMat.h\
620 ./toolkits/petsc/objects/PetscMat.cpp\
621- ./toolkits/petsc/objects/PetscVec.h\
622 ./toolkits/petsc/objects/PetscVec.cpp\
623- ./toolkits/petsc/objects/PetscSolver.cpp\
624- ./toolkits/petsc/objects/PetscSolver.h\
625- ./toolkits/petsc/petscincludes.h
626+ ./toolkits/petsc/objects/PetscSolver.cpp
627 endif
628 #}}}
629 #Mumps sources {{{
630 if MUMPS
631-issm_sources += ./toolkits/mumps\
632- ./toolkits/mumps/mumpsincludes.h\
633- ./toolkits/mumps/MumpsSolve.cpp
634+issm_sources += ./toolkits/mumps/MumpsSolve.cpp
635 endif
636 #}}}
637 #Gsl sources {{{
638 if GSL
639-issm_sources += ./toolkits/gsl\
640- ./toolkits/gsl/gslincludes.h\
641- ./toolkits/gsl/DenseGslSolve.cpp
642+issm_sources += ./toolkits/gsl/DenseGslSolve.cpp
643 endif
644 #}}}
645 #proj.4 sources {{{
646@@ -676,6 +424,7 @@
647 endif
648 if LEVELSET
649 issm_sources += ./analyses/LevelsetAnalysis.cpp
650+issm_sources += ./modules/Calvingx/Calvingx.cpp
651 endif
652 if EXTRAPOLATION
653 issm_sources += ./analyses/ExtrapolationAnalysis.cpp
654@@ -698,16 +447,9 @@
655 ./modules/GiaDeflectionCorex/what0.f
656 endif
657 #}}}
658-#Mpi sources {{{
659-if MPI
660-issm_sources += ./toolkits/issm/IssmMpiDenseMat.h\
661- ./toolkits/issm/IssmMpiVec.h
662-endif
663-#}}}
664 #Metis sources {{{
665 if METIS
666-issm_sources += ./toolkits/metis/patches/metispatches.h\
667- ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
668+issm_sources += ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
669 endif
670 #}}}
671
672@@ -716,159 +458,94 @@
673
674 #}}}
675 #Kml sources {{{
676-kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\
677- ./modules/Exp2Kmlx/Exp2Kmlx.cpp\
678- ./modules/Kml2Expx/Kml2Expx.h\
679+kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.cpp\
680 ./modules/Kml2Expx/Kml2Expx.cpp\
681- ./modules/Shp2Kmlx/Shp2Kmlx.h\
682 ./modules/Shp2Kmlx/Shp2Kmlx.cpp\
683- ./modules/KMLFileReadx/KMLFileReadx.h\
684 ./modules/KMLFileReadx/KMLFileReadx.cpp\
685- ./modules/KMLMeshWritex/KMLMeshWritex.h\
686 ./modules/KMLMeshWritex/KMLMeshWritex.cpp\
687- ./modules/KMLOverlayx/KMLOverlayx.h\
688 ./modules/KMLOverlayx/KMLOverlayx.cpp\
689- ./kml/kmlobjects.h\
690 ./kml/KML_Attribute.cpp\
691- ./kml/KML_Attribute.h\
692 ./kml/KML_Comment.cpp\
693- ./kml/KML_Comment.h\
694 ./kml/KML_ColorStyle.cpp\
695- ./kml/KML_ColorStyle.h\
696 ./kml/KML_Container.cpp\
697- ./kml/KML_Container.h\
698 ./kml/KML_Document.cpp\
699- ./kml/KML_Document.h\
700 ./kml/KML_Feature.cpp\
701- ./kml/KML_Feature.h\
702 ./kml/KML_File.cpp\
703- ./kml/KML_File.h\
704 ./kml/KML_Folder.cpp\
705- ./kml/KML_Folder.h\
706 ./kml/KML_Geometry.cpp\
707- ./kml/KML_Geometry.h\
708 ./kml/KML_GroundOverlay.cpp\
709- ./kml/KML_GroundOverlay.h\
710 ./kml/KML_Icon.cpp\
711- ./kml/KML_Icon.h\
712 ./kml/KML_LatLonBox.cpp\
713- ./kml/KML_LatLonBox.h\
714 ./kml/KML_LinearRing.cpp\
715- ./kml/KML_LinearRing.h\
716 ./kml/KML_LineString.cpp\
717- ./kml/KML_LineString.h\
718 ./kml/KML_LineStyle.cpp\
719- ./kml/KML_LineStyle.h\
720 ./kml/KML_MultiGeometry.cpp\
721- ./kml/KML_MultiGeometry.h\
722 ./kml/KML_Object.cpp\
723- ./kml/KML_Object.h\
724 ./kml/KML_Overlay.cpp\
725- ./kml/KML_Overlay.h\
726 ./kml/KML_Point.cpp\
727- ./kml/KML_Point.h\
728 ./kml/KML_Placemark.cpp\
729- ./kml/KML_Placemark.h\
730 ./kml/KML_Polygon.cpp\
731- ./kml/KML_Polygon.h\
732 ./kml/KML_PolyStyle.cpp\
733- ./kml/KML_PolyStyle.h\
734 ./kml/KML_Style.cpp\
735- ./kml/KML_Style.h\
736 ./kml/KML_StyleSelector.cpp\
737- ./kml/KML_StyleSelector.h\
738 ./kml/KML_SubStyle.cpp\
739- ./kml/KML_SubStyle.h\
740 ./kml/KML_Unknown.cpp\
741- ./kml/KML_Unknown.h\
742- ./kml/KMLFileReadUtils.cpp\
743- ./kml/KMLFileReadUtils.h
744+ ./kml/KMLFileReadUtils.cpp
745 #}}}
746 #Modules sources{{{
747-modules_sources= ./shared/Threads/issm_threads.h\
748- ./shared/Threads/LaunchThread.cpp\
749+modules_sources= ./shared/Threads/LaunchThread.cpp\
750 ./shared/Threads/PartitionRange.cpp\
751- ./shared/Exp/exp.h\
752 ./shared/Exp/exp.cpp\
753- ./shared/TriMesh/trimesh.h\
754 ./shared/TriMesh/AssociateSegmentToElement.cpp\
755 ./shared/TriMesh/GridInsideHole.cpp\
756 ./shared/TriMesh/OrderSegments.cpp\
757 ./shared/TriMesh/SplitMeshForRifts.cpp\
758 ./shared/TriMesh/TriMeshUtils.cpp\
759- ./modules/TriaSearchx/TriaSearchx.h\
760 ./modules/TriaSearchx/TriaSearchx.cpp\
761- ./modules/TriMeshx/TriMeshx.h\
762 ./modules/TriMeshx/TriMeshx.cpp\
763- ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.h\
764 ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.cpp\
765- ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h\
766 ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp\
767 ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp\
768 ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\
769- ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h\
770 ./modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp\
771 ./modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp\
772- ./modules/InterpFromMesh2dx/InterpFromMesh2dx.h\
773 ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
774- ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\
775 ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
776- ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\
777 ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
778- ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h\
779 ./modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp\
780- ./modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h\
781 ./modules/ContourToMeshx/ContourToMeshx.cpp\
782 ./modules/ContourToMeshx/ContourToMeshxt.cpp\
783- ./modules/ContourToMeshx/ContourToMeshx.h\
784 ./modules/ExpToLevelSetx/ExpToLevelSetx.cpp\
785 ./modules/ExpToLevelSetx/ExpToLevelSetxt.cpp\
786- ./modules/ExpToLevelSetx/ExpToLevelSetx.h\
787 ./modules/ContourToNodesx/ContourToNodesx.cpp\
788- ./modules/ContourToNodesx/ContourToNodesx.h\
789 ./modules/NodeConnectivityx/NodeConnectivityx.cpp\
790- ./modules/NodeConnectivityx/NodeConnectivityx.h\
791 ./modules/ElementConnectivityx/ElementConnectivityx.cpp\
792- ./modules/ElementConnectivityx/ElementConnectivityx.h\
793- ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\
794- ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h
795+ ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp
796 if CHACO
797-modules_sources+= ./modules/Chacox/Chacox.h\
798- ./modules/Chacox/Chacox.cpp\
799+modules_sources+= ./modules/Chacox/Chacox.cpp\
800 ./modules/Chacox/input_parse.cpp\
801 ./modules/Chacox/chaco_seconds.cpp\
802 ./modules/Chacox/user_params.cpp
803 endif
804 if SCOTCH
805-modules_sources+= ./modules/Scotchx/Scotchx.cpp\
806- ./modules/Scotchx/Scotchx.h
807+modules_sources+= ./modules/Scotchx/Scotchx.cpp
808 endif
809 #}}}
810
811 #kriging (WRAPPER and executable)
812 #Kriging sources {{{
813 if KRIGING
814-issm_sources +=./classes/kriging/Observations.h\
815- ./classes/kriging/Observations.cpp\
816- ./classes/kriging/Variogram.h \
817- ./classes/kriging/GaussianVariogram.h\
818+issm_sources += ./classes/kriging/Observations.cpp\
819 ./classes/kriging/GaussianVariogram.cpp\
820- ./classes/kriging/ExponentialVariogram.h\
821 ./classes/kriging/ExponentialVariogram.cpp\
822- ./classes/kriging/SphericalVariogram.h\
823 ./classes/kriging/SphericalVariogram.cpp\
824- ./classes/kriging/PowerVariogram.h\
825 ./classes/kriging/PowerVariogram.cpp\
826- ./classes/kriging/Quadtree.h\
827 ./classes/kriging/Quadtree.cpp\
828- ./classes/kriging/Covertree.h\
829 ./classes/kriging/Covertree.cpp\
830- ./classes/kriging/Observation.h\
831 ./classes/kriging/Observation.cpp\
832 ./modules/Krigingx/pKrigingx.cpp
833
834 modules_sources +=./modules/Krigingx/Krigingx.cpp\
835- ./modules/Krigingx/Krigingx.h\
836 ./modules/Krigingx/pKrigingx.cpp
837 endif
838 #}}}
839@@ -947,12 +624,12 @@
840 LDADD += $(FLIBS) $(FORTRANLIB)
841 endif
842
843-issm_SOURCES = main/issm.h main/globals.h main/issm.cpp
844+issm_SOURCES = main/issm.cpp
845 issm_CXXFLAGS= -fPIC
846
847 if KRIGING
848 bin_PROGRAMS += kriging
849-kriging_SOURCES = main/issm.h main/globals.h main/kriging.cpp
850+kriging_SOURCES = main/kriging.cpp
851 kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS)
852 endif
853 #}}}
854Index: ../trunk-jpl/src/c/cores/transient_core.cpp
855===================================================================
856--- ../trunk-jpl/src/c/cores/transient_core.cpp (revision 19046)
857+++ ../trunk-jpl/src/c/cores/transient_core.cpp (revision 19047)
858@@ -24,7 +24,7 @@
859 bool save_results,dakota_analysis;
860 bool time_adapt=false;
861 int output_frequency;
862- int domaintype,groundingline_migration,calvinglaw;
863+ int domaintype,groundingline_migration;
864 int numoutputs = 0;
865 Analysis *analysis = NULL;
866 char** requested_outputs = NULL;
867@@ -53,7 +53,6 @@
868 femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum);
869 femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
870 femmodel->parameters->FindParam(&iscalving,TransientIscalvingEnum);
871- femmodel->parameters->FindParam(&calvinglaw,CalvingLawEnum);
872 if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
873 femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
874 if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
875@@ -102,30 +101,7 @@
876 }
877
878 if(islevelset){
879- if(iscalving){
880- switch(calvinglaw){
881- case DefaultCalvingEnum:
882- break;
883- case CalvingLevermannEnum:
884- if(VerboseSolution()) _printf0_(" computing Levermann's calving rate\n");
885- femmodel->StrainRateparallelx();
886- femmodel->StrainRateperpendicularx();
887- femmodel->CalvingRateLevermannx();
888- break;
889- case CalvingPiEnum:
890- if(VerboseSolution()) _printf0_(" computing Pi's calving rate\n");
891- femmodel->StrainRateparallelx();
892- femmodel->DeviatoricStressx();
893- femmodel->CalvingRatePix();
894- break;
895- case CalvingDevEnum:
896- femmodel->CalvingRateDevx();
897- femmodel->ElementOperationx(&Element::CalvingRateDev);
898- break;
899- default:
900- _error_("Caving law "<<EnumToStringx(calvinglaw)<<" not supported yet");
901- }
902- }
903+ if(iscalving) Calvingx(femmodel);
904 if(VerboseSolution()) _printf0_(" computing levelset transport\n");
905 /* smoothen slope of lsf for computation of normal on ice domain*/
906 levelsetfunctionslope_core(femmodel);
907Index: ../trunk-jpl/src/c
908===================================================================
909--- ../trunk-jpl/src/c (revision 19046)
910+++ ../trunk-jpl/src/c (revision 19047)
911
912Property changes on: ../trunk-jpl/src/c
913___________________________________________________________________
914Modified: svn:ignore
915## -15,6 +15,6 ##
916 g++results
917 probe.results
918 stXXXX*
919-.deps
920-.dirstamp
921+*.deps
922+*.dirstamp
923 .libs
924Index: ../trunk-jpl/src/wrappers/python/Makefile.am
925===================================================================
926--- ../trunk-jpl/src/wrappers/python/Makefile.am (revision 19046)
927+++ ../trunk-jpl/src/wrappers/python/Makefile.am (revision 19047)
928@@ -1,5 +1,5 @@
929 AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @AMPIINCL@
930-#AUTOMAKE_OPTIONS = subdir-objects
931+AUTOMAKE_OPTIONS = subdir-objects
932
933 EXEEXT=$(PYTHONWRAPPEREXT)
934
935@@ -9,9 +9,7 @@
936 #python io{{{
937 lib_LTLIBRARIES = libISSMPython.la
938
939-io_sources= ./include/pythonincludes.h\
940- ./io/pythonio.h\
941- ./io/WritePythonData.cpp\
942+io_sources= ./io/WritePythonData.cpp\
943 ./io/CheckNumPythonArguments.cpp\
944 ./io/FetchPythonData.cpp
945
946@@ -91,67 +89,51 @@
947 AM_CXXFLAGS += $(CXXOPTFLAGS)
948 #}}}
949 #Bin sources {{{
950-BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
951- ../BamgConvertMesh/BamgConvertMesh.h
952+BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
953 BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
954
955-BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
956- ../BamgMesher/BamgMesher.h
957+BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
958 BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
959
960-ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
961- ../ContourToMesh/ContourToMesh.h
962+ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
963 ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
964
965-ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
966- ../ContourToNodes/ContourToNodes.h
967+ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
968 ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
969
970-ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
971- ../ElementConnectivity/ElementConnectivity.h
972+ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
973 ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
974
975-EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
976- ../EnumToString/EnumToString.h
977+EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp
978 EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
979
980-InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
981- ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
982+InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
983 InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
984
985-InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
986- ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
987+InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
988 InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
989
990-InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
991- ../InterpFromGridToMesh/InterpFromGridToMesh.h
992+InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
993 InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
994
995-InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
996- ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
997+InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
998 InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
999
1000-IssmConfig_la_SOURCES = ../IssmConfig/IssmConfig.cpp\
1001- ../IssmConfig/IssmConfig.h
1002+IssmConfig_la_SOURCES = ../IssmConfig/IssmConfig.cpp
1003 IssmConfig_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
1004
1005-MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
1006- ../MeshProfileIntersection/MeshProfileIntersection.h
1007+MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
1008 MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1009
1010-NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
1011- ../NodeConnectivity/NodeConnectivity.h
1012+NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
1013 NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1014
1015-StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
1016- ../StringToEnum/StringToEnum.h
1017+StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp
1018 StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1019
1020-TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
1021- ../TriMesh/TriMesh.h
1022+TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp
1023 TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB) $(PROJ4LIB)
1024
1025-TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
1026- ../TriMeshProcessRifts/TriMeshProcessRifts.h
1027+TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp
1028 TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1029 #}}}
1030Index: ../trunk-jpl/src/wrappers/M1qn3
1031===================================================================
1032--- ../trunk-jpl/src/wrappers/M1qn3 (revision 19046)
1033+++ ../trunk-jpl/src/wrappers/M1qn3 (revision 19047)
1034
1035Property changes on: ../trunk-jpl/src/wrappers/M1qn3
1036___________________________________________________________________
1037Modified: svn:ignore
1038## -1 +1,2 ##
1039 .deps
1040+.dirstamp
1041Index: ../trunk-jpl/src/wrappers/matlab/Makefile.am
1042===================================================================
1043--- ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 19046)
1044+++ ../trunk-jpl/src/wrappers/matlab/Makefile.am (revision 19047)
1045@@ -9,9 +9,7 @@
1046 #matlab io{{{
1047 lib_LTLIBRARIES = libISSMMatlab.la
1048
1049-io_sources= ./include/matlabincludes.h\
1050- ./io/matlabio.h\
1051- ./io/CheckNumMatlabArguments.cpp\
1052+io_sources= ./io/CheckNumMatlabArguments.cpp\
1053 ./io/WriteMatlabData.cpp\
1054 ./io/FetchMatlabData.cpp
1055
1056@@ -122,152 +120,115 @@
1057 libISSMApi_la_LDFLAGS = -static
1058 endif
1059
1060-BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
1061- ../BamgMesher/BamgMesher.h
1062+BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp
1063 BamgMesher_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1064
1065-BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
1066- ../BamgConvertMesh/BamgConvertMesh.h
1067+BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp
1068 BamgConvertMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1069
1070-BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
1071- ../BamgTriangulate/BamgTriangulate.h
1072+BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp
1073 BamgTriangulate_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1074
1075-Chaco_la_SOURCES = ../Chaco/Chaco.cpp\
1076- ../Chaco/Chaco.h
1077+Chaco_la_SOURCES = ../Chaco/Chaco.cpp
1078 Chaco_la_LIBADD = ${deps} $(MPILIB) $(CHACOLIB) $(GSLLIB) $(PROJ4LIB) $(PETSCLIB)
1079
1080-ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
1081- ../ContourToMesh/ContourToMesh.h
1082+ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp
1083 ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1084
1085-ExpToLevelSet_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp\
1086- ../ExpToLevelSet/ExpToLevelSet.h
1087+ExpToLevelSet_la_SOURCES = ../ExpToLevelSet/ExpToLevelSet.cpp
1088 ExpToLevelSet_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1089
1090
1091-ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
1092- ../ContourToNodes/ContourToNodes.h
1093+ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp
1094 ContourToNodes_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1095
1096-ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
1097- ../ElementConnectivity/ElementConnectivity.h
1098+ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp
1099 ElementConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1100
1101-EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
1102- ../EnumToString/EnumToString.h
1103+EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp
1104 EnumToString_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1105
1106-StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
1107- ../StringToEnum/StringToEnum.h
1108+StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp
1109 StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1110
1111-InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
1112- ../InterpFromGridToMesh/InterpFromGridToMesh.h
1113+InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
1114 InterpFromGridToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1115
1116-InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
1117- ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
1118+InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
1119 InterpFromMeshToMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1120
1121-InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
1122- ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
1123+InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp
1124 InterpFromMeshToMesh3d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1125
1126-InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
1127- ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
1128+InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp
1129 InterpFromMeshToGrid_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1130
1131-InterpFromMesh2d_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
1132- ../InterpFromMesh2d/InterpFromMesh2d.h
1133+InterpFromMesh2d_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp
1134 InterpFromMesh2d_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1135
1136-IssmConfig_la_SOURCES = ../IssmConfig/IssmConfig.cpp\
1137- ../IssmConfig/IssmConfig.h
1138+IssmConfig_la_SOURCES = ../IssmConfig/IssmConfig.cpp
1139 IssmConfig_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
1140
1141-KMLFileRead_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
1142- ../KMLFileRead/KMLFileRead.h
1143+KMLFileRead_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp
1144 KMLFileRead_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1145
1146-KMLMeshWrite_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
1147- ../KMLMeshWrite/KMLMeshWrite.h
1148+KMLMeshWrite_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp
1149 KMLMeshWrite_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1150
1151-KMLOverlay_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
1152- ../KMLOverlay/KMLOverlay.h
1153+KMLOverlay_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp
1154 KMLOverlay_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1155
1156-Xy2ll_la_SOURCES = ../Xy2ll/Xy2ll.cpp\
1157- ../Xy2ll/Xy2ll.h
1158+Xy2ll_la_SOURCES = ../Xy2ll/Xy2ll.cpp
1159 Xy2ll_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1160
1161-Ll2xy_la_SOURCES = ../Ll2xy/Ll2xy.cpp\
1162- ../Ll2xy/Ll2xy.h
1163+Ll2xy_la_SOURCES = ../Ll2xy/Ll2xy.cpp
1164 Ll2xy_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1165
1166-ExpSimplify_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp\
1167- ../ExpSimplify/ExpSimplify.h
1168+ExpSimplify_la_SOURCES = ../ExpSimplify/ExpSimplify.cpp
1169 ExpSimplify_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1170
1171-Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
1172- ../Exp2Kml/Exp2Kml.h
1173+Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp
1174 Exp2Kml_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1175
1176-Kml2Exp_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
1177- ../Kml2Exp/Kml2Exp.h
1178+Kml2Exp_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp
1179 Kml2Exp_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1180
1181-Kriging_la_SOURCES = ../Kriging/Kriging.cpp\
1182- ../Kriging/Kriging.h
1183+Kriging_la_SOURCES = ../Kriging/Kriging.cpp
1184 Kriging_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1185
1186-MeshPartition_la_SOURCES = ../MeshPartition/MeshPartition.cpp\
1187- ../MeshPartition/MeshPartition.h
1188+MeshPartition_la_SOURCES = ../MeshPartition/MeshPartition.cpp
1189 MeshPartition_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(METISLIB) $(GSLLIB) $(PROJ4LIB)
1190
1191-M1qn3_la_SOURCES = ../M1qn3/M1qn3.cpp\
1192- ../M1qn3/M1qn3.h
1193+M1qn3_la_SOURCES = ../M1qn3/M1qn3.cpp
1194 M1qn3_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(METISLIB) $(M1QN3LIB) $(GSLLIB) $(PROJ4LIB)
1195
1196-MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
1197- ../MeshProfileIntersection/MeshProfileIntersection.h
1198+MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp
1199 MeshProfileIntersection_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1200
1201-NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
1202- ../NodeConnectivity/NodeConnectivity.h
1203+NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp
1204 NodeConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1205
1206-PointCloudFindNeighbors_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
1207- ../PointCloudFindNeighbors/PointCloudFindNeighbors.h
1208+PointCloudFindNeighbors_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp
1209 PointCloudFindNeighbors_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(MULTITHREADINGLIB) $(GSLLIB) $(PROJ4LIB)
1210
1211-PropagateFlagsFromConnectivity_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
1212- ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
1213+PropagateFlagsFromConnectivity_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
1214 PropagateFlagsFromConnectivity_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1215
1216-Scotch_la_SOURCES = ../Scotch/Scotch.cpp\
1217- ../Scotch/Scotch.h
1218+Scotch_la_SOURCES = ../Scotch/Scotch.cpp
1219 Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB) $(BLASLAPACKLIB)
1220
1221-ShpRead_la_SOURCES = ../ShpRead/ShpRead.cpp\
1222- ../ShpRead/ShpRead.h
1223+ShpRead_la_SOURCES = ../ShpRead/ShpRead.cpp
1224 ShpRead_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1225
1226-Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
1227- ../Shp2Kml/Shp2Kml.h
1228+Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp
1229 Shp2Kml_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1230
1231-TriaSearch_la_SOURCES = ../TriaSearch/TriaSearch.cpp\
1232- ../TriaSearch/TriaSearch.h
1233+TriaSearch_la_SOURCES = ../TriaSearch/TriaSearch.cpp
1234 TriaSearch_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1235
1236-TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
1237- ../TriMesh/TriMesh.h
1238+TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp
1239 TriMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB) $(PROJ4LIB)
1240
1241-TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
1242- ../TriMeshProcessRifts/TriMeshProcessRifts.h
1243+TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp
1244 TriMeshProcessRifts_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
1245 #}}}
1246Index: ../trunk-jpl/src/wrappers/ExpToLevelSet
1247===================================================================
1248--- ../trunk-jpl/src/wrappers/ExpToLevelSet (revision 19046)
1249+++ ../trunk-jpl/src/wrappers/ExpToLevelSet (revision 19047)
1250
1251Property changes on: ../trunk-jpl/src/wrappers/ExpToLevelSet
1252___________________________________________________________________
1253Modified: svn:ignore
1254## -1 +1,2 ##
1255 .deps
1256+.dirstamp
1257Index: ../trunk-jpl/src/wrappers
1258===================================================================
1259--- ../trunk-jpl/src/wrappers (revision 19046)
1260+++ ../trunk-jpl/src/wrappers (revision 19047)
1261
1262Property changes on: ../trunk-jpl/src/wrappers
1263___________________________________________________________________
1264Modified: svn:ignore
1265## -15,3 +15,4 ##
1266 *.mexw32.manifest
1267 *.mexw32.map
1268 *.exe.manifest
1269+.dirstamp
Note: See TracBrowser for help on using the repository browser.