Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 19046) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 19047) @@ -15,190 +15,88 @@ #Core sources #Core sources{{{ -issm_sources = ./datastructures/DataSet.h\ - ./datastructures/DataSet.cpp\ - ./datastructures/Object.h\ - ./datastructures/datastructures.h\ - ./classes/classes.h\ - ./classes/gauss/Gauss.h\ - ./classes/gauss/GaussSeg.h\ +issm_sources = ./datastructures/DataSet.cpp\ ./classes/gauss/GaussSeg.cpp\ - ./classes/gauss/GaussTria.h\ ./classes/gauss/GaussTria.cpp\ - ./classes/gauss/GaussTetra.h\ ./classes/gauss/GaussTetra.cpp\ - ./classes/gauss/GaussPenta.h\ ./classes/gauss/GaussPenta.cpp\ - ./classes/Update.h\ - ./classes/FemModel.h\ ./classes/FemModel.cpp\ - ./classes/Material.h\ - ./classes/Load.h\ - ./classes/Contour.h\ - ./classes/Loads/Friction.h\ ./classes/Loads/Friction.cpp\ - ./classes/Inputs/TransientInput.h\ ./classes/Inputs/TransientInput.cpp\ ./classes/Constraints/SpcTransient.cpp\ - ./classes/Constraints/SpcTransient.h\ - ./classes/IndependentObject.h\ ./classes/IndependentObject.cpp\ - ./classes/DependentObject.h\ ./classes/DependentObject.cpp\ - ./classes/DofIndexing.h\ ./classes/DofIndexing.cpp\ - ./classes/IoModel.h\ ./classes/IoModel.cpp\ - ./classes/Contours.h\ ./classes/Contours.cpp\ - ./classes/Nodes.h\ ./classes/Nodes.cpp\ - ./classes/Vertices.h\ ./classes/Vertices.cpp\ - ./classes/Node.h\ ./classes/Node.cpp\ - ./classes/Segment.h\ - ./classes/Vertex.h\ ./classes/Vertex.cpp\ - ./classes/Hook.h\ ./classes/Hook.cpp\ - ./classes/ExternalResults/Results.h\ ./classes/ExternalResults/Results.cpp\ - ./classes/ExternalResults/ExternalResult.h\ - ./classes/ExternalResults/GenericExternalResult.h\ - ./classes/Elements/Element.h\ ./classes/Elements/Element.cpp\ - ./classes/Elements/Elements.h\ ./classes/Elements/Elements.cpp\ - ./classes/Elements/ElementHook.h\ ./classes/Elements/ElementHook.cpp\ - ./classes/Elements/Seg.h\ ./classes/Elements/Seg.cpp\ - ./classes/Elements/SegRef.h\ ./classes/Elements/SegRef.cpp\ - ./classes/Elements/Tria.h\ ./classes/Elements/Tria.cpp\ - ./classes/Elements/TriaRef.h\ ./classes/Elements/TriaRef.cpp\ - ./classes/Elements/Tetra.h\ ./classes/Elements/Tetra.cpp\ - ./classes/Elements/TetraRef.h\ ./classes/Elements/TetraRef.cpp\ - ./classes/Elements/Penta.h\ ./classes/Elements/Penta.cpp\ - ./classes/Elements/PentaRef.h\ ./classes/Elements/PentaRef.cpp\ - ./classes/Inputs/Inputs.h\ ./classes/Inputs/Inputs.cpp\ - ./classes/Inputs/Input.h\ - ./classes/Inputs/InputLocal.h\ - ./classes/Inputs/SegInput.h\ ./classes/Inputs/SegInput.cpp\ - ./classes/Inputs/TriaInput.h\ ./classes/Inputs/TriaInput.cpp\ - ./classes/Inputs/BoolInput.h\ ./classes/Inputs/BoolInput.cpp\ - ./classes/Inputs/IntInput.h\ ./classes/Inputs/IntInput.cpp\ - ./classes/Inputs/DoubleInput.h\ ./classes/Inputs/DoubleInput.cpp\ - ./classes/Inputs/DatasetInput.h\ ./classes/Inputs/DatasetInput.cpp\ - ./classes/Materials/Materials.h\ ./classes/Materials/Materials.cpp\ - ./classes/Materials/Matice.h\ ./classes/Materials/Matice.cpp\ - ./classes/Materials/Matseaice.h\ ./classes/Materials/Matseaice.cpp\ - ./classes/Materials/Matpar.h\ ./classes/Materials/Matpar.cpp\ - ./classes/Constraints/Constraints.h\ ./classes/Constraints/Constraints.cpp\ - ./classes/Constraints/Constraint.h\ ./classes/Constraints/SpcStatic.cpp\ - ./classes/Constraints/SpcStatic.h\ ./classes/Constraints/SpcDynamic.cpp\ - ./classes/Constraints/SpcDynamic.h\ - ./classes/Loads/Loads.h\ ./classes/Loads/Loads.cpp\ ./classes/Loads/Penpair.cpp\ - ./classes/Loads/Penpair.h\ ./classes/Loads/Pengrid.cpp\ - ./classes/Loads/Pengrid.h\ ./classes/Loads/Numericalflux.cpp\ - ./classes/Loads/Numericalflux.h\ - ./classes/matrix/matrixobjects.h\ - ./classes/matrix/ElementMatrix.h\ ./classes/matrix/ElementMatrix.cpp\ - ./classes/matrix/ElementVector.h\ ./classes/matrix/ElementVector.cpp\ - ./classes/Params/Parameters.h\ ./classes/Params/Parameters.cpp\ - ./classes/Params/Param.h\ - ./classes/Params/GenericParam.h\ ./classes/Params/BoolParam.cpp\ - ./classes/Params/BoolParam.h\ ./classes/Params/IntParam.cpp\ - ./classes/Params/IntParam.h\ ./classes/Params/IntVecParam.cpp\ - ./classes/Params/IntVecParam.h\ ./classes/Params/IntMatParam.cpp\ - ./classes/Params/IntMatParam.h\ ./classes/Params/DoubleParam.cpp\ - ./classes/Params/DoubleParam.h\ ./classes/Params/FileParam.cpp\ - ./classes/Params/FileParam.h\ ./classes/Params/StringArrayParam.cpp\ - ./classes/Params/StringArrayParam.h\ ./classes/Params/DoubleMatParam.cpp\ - ./classes/Params/DoubleMatParam.h\ ./classes/Params/DoubleTransientMatParam.cpp\ - ./classes/Params/DoubleTransientMatParam.h\ ./classes/Params/DoubleMatArrayParam.cpp\ - ./classes/Params/DoubleMatArrayParam.h\ ./classes/Params/DoubleVecParam.cpp\ - ./classes/Params/DoubleVecParam.h\ ./classes/Params/StringParam.cpp\ - ./classes/Params/StringParam.h\ - ./classes/Params/MatrixParam.h\ ./classes/Params/MatrixParam.cpp\ - ./classes/Params/VectorParam.h\ ./classes/Params/VectorParam.cpp\ - ./classes/Params/TransientParam.h\ ./classes/Params/TransientParam.cpp\ - ./classes/Params/DataSetParam.h\ ./classes/Params/DataSetParam.cpp\ - ./classes/Profiler.h\ ./classes/Profiler.cpp\ - ./shared/shared.h\ - ./shared/MemOps/MemOps.h\ ./shared/MemOps/MemOps.cpp\ - ./shared/Matrix/matrix.h\ ./shared/Matrix/MatrixUtils.cpp\ - ./shared/io/io.h\ - ./shared/io/Disk/diskio.h\ ./shared/io/Disk/pfopen.cpp\ ./shared/io/Disk/pfclose.cpp\ ./shared/io/Disk/WriteLockFile.cpp\ ./shared/io/Print/PrintfFunction.cpp\ - ./shared/io/Print/Print.h\ - ./shared/io/Comm/IssmComm.h\ ./shared/io/Comm/IssmComm.cpp\ ./shared/LatLong/Ll2xyx.cpp\ ./shared/LatLong/Xy2llx.cpp\ - ./shared/FSanalyticals/fsanalyticals.h\ ./shared/FSanalyticals/fsanalyticals.cpp\ - ./shared/Enum/Enum.h\ - ./shared/Enum/EnumDefinitions.h\ ./shared/Enum/EnumToStringx.cpp\ ./shared/Enum/StringToEnumx.cpp\ - ./shared/Numerics/numerics.h\ - ./shared/Numerics/types.h\ - ./shared/Numerics/constants.h\ - ./shared/Numerics/Verbosity.h\ ./shared/Numerics/Verbosity.cpp\ - ./shared/Numerics/GaussPoints.h\ ./shared/Numerics/GaussPoints.cpp\ ./shared/Numerics/cross.cpp\ - ./shared/Numerics/isnan.h\ ./shared/Numerics/isnan.cpp\ ./shared/Numerics/cubic.cpp\ @@ -206,10 +104,6 @@ ./shared/Numerics/extrema.cpp\ ./shared/Numerics/XZvectorsToCoordinateSystem.cpp\ - ./shared/Numerics/OptPars.h\ - ./shared/Exceptions/exceptions.h\ ./shared/Exceptions/Exceptions.cpp\ ./shared/Sorting/binary_search.cpp\ - ./shared/Sorting/sorting.h\ - ./shared/Elements/elements.h\ ./shared/Elements/Cuffey.cpp\ ./shared/Elements/StressIntensityIntegralWeight.cpp\ @@ -222,39 +116,13 @@ ./shared/Elements/ComputeMungsmTemperaturePrecipitation.cpp\ ./shared/Elements/DrainageFunctionWaterfraction.cpp\ - ./shared/String/sharedstring.h\ ./shared/String/DescriptorIndex.cpp\ - ./toolkits/metis/metisincludes.h\ - ./toolkits/issm/issmtoolkit.h\ - ./toolkits/issm/IssmToolkitUtils.h\ ./toolkits/issm/IssmToolkitUtils.cpp\ - ./toolkits/issm/IssmAbsMat.h\ - ./toolkits/issm/IssmAbsVec.h\ - ./toolkits/issm/IssmDenseMat.h\ - ./toolkits/issm/IssmMat.h\ - ./toolkits/issm/IssmSeqVec.h\ - ./toolkits/issm/IssmVec.h\ - ./toolkits/issm/IssmSolver.h\ ./toolkits/issm/IssmSolver.cpp\ - ./toolkits/issm/SparseRow.h\ - ./toolkits/issm/Bucket.h\ - ./toolkits/mpi/issmmpi.h\ ./toolkits/mpi/issmmpi.cpp\ - ./toolkits/mpi/commops/commops.h\ ./toolkits/mpi/commops/DetermineLocalSize.cpp\ ./toolkits/mpi/commops/DetermineGlobalSize.cpp\ ./toolkits/mpi/commops/DetermineRowRankFromLocalSize.cpp\ ./toolkits/mpi/commops/GetOwnershipBoundariesFromRange.cpp\ - ./toolkits/adolc/adolcincludes.h\ - ./toolkits/adolc/AdolcEdf.h\ - ./toolkits/ToolkitOptions.h\ ./toolkits/ToolkitOptions.cpp\ - ./toolkits/triangle/triangleincludes.h\ - ./toolkits/objects/toolkitobjects.h\ - ./toolkits/objects/Matrix.h\ - ./toolkits/objects/Vector.h\ - ./toolkits/objects/Solver.h\ - ./toolkitsenums.h\ - ./toolkits.h\ - ./modules/ModelProcessorx/ModelProcessorx.h\ ./modules/ModelProcessorx/ModelProcessorx.cpp\ ./modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp\ @@ -270,76 +138,39 @@ ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\ ./modules/ModelProcessorx/CreateNodes.cpp\ - ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h\ ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp\ - ./modules/NodesDofx/NodesDofx.h\ ./modules/NodesDofx/NodesDofx.cpp\ - ./modules/NodalValuex/NodalValuex.h\ ./modules/NodalValuex/NodalValuex.cpp\ - ./modules/VerticesDofx/VerticesDofx.h\ ./modules/VerticesDofx/VerticesDofx.cpp\ - ./modules/VertexCoordinatesx/VertexCoordinatesx.h\ ./modules/VertexCoordinatesx/VertexCoordinatesx.cpp\ - ./modules/OutputResultsx/OutputResultsx.h\ ./modules/OutputResultsx/OutputResultsx.cpp\ - ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h\ ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp\ - ./modules/InputDuplicatex/InputDuplicatex.h\ ./modules/InputDuplicatex/InputDuplicatex.cpp\ - ./modules/InputExtrudex/InputExtrudex.h\ ./modules/InputExtrudex/InputExtrudex.cpp\ - ./modules/InputScalex/InputScalex.h\ ./modules/InputScalex/InputScalex.cpp\ - ./modules/SurfaceAreax/SurfaceAreax.h\ ./modules/SurfaceAreax/SurfaceAreax.cpp\ - ./modules/AllocateSystemMatricesx/AllocateSystemMatricesx.h\ ./modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp\ - ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h\ ./modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp\ - ./modules/SystemMatricesx/SystemMatricesx.h\ ./modules/SystemMatricesx/SystemMatricesx.cpp\ - ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h\ ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp\ - ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h\ ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp\ - ./modules/IoModelToConstraintsx/IoModelToConstraintsx.h\ ./modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp\ - ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h\ ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp\ - ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\ ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\ - ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h\ ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp\ - ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\ - ./modules/GetVectorFromInputsx/GetVectorFromInputsx.h\ ./modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp\ - ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\ ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\ - ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h\ ./modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp\ - ./modules/ConfigureObjectsx/ConfigureObjectsx.h\ ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\ - ./modules/SpcNodesx/SpcNodesx.h\ ./modules/SpcNodesx/SpcNodesx.cpp\ - ./modules/SurfaceMassBalancex/SurfaceMassBalancex.h\ ./modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp\ - ./modules/MeshPartitionx/MeshPartitionx.h\ ./modules/Reducevectorgtofx/Reducevectorgtofx.cpp\ - ./modules/Reducevectorgtofx/Reducevectorgtofx.h\ - ./modules/Reduceloadx/Reduceloadx.h\ ./modules/Reduceloadx/Reduceloadx.cpp\ ./modules/ConstraintsStatex/ConstraintsStatex.cpp\ - ./modules/ConstraintsStatex/ConstraintsStatex.h\ - ./modules/ConstraintsStatex/ConstraintsStateLocal.h\ - ./modules/ResetConstraintsx/ResetConstraintsx.h\ ./modules/ResetConstraintsx/ResetConstraintsx.cpp\ - ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.h\ ./modules/ResetFSBasalBoundaryConditionx/ResetFSBasalBoundaryConditionx.cpp\ ./modules/Solverx/Solverx.cpp\ - ./modules/Solverx/Solverx.h\ ./modules/VecMergex/VecMergex.cpp\ - ./modules/VecMergex/VecMergex.h\ ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\ - ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\ ./cores/ProcessArguments.cpp\ ./cores/ResetBoundaryConditions.cpp\ @@ -350,7 +181,5 @@ ./main/EnvironmentInit.cpp\ ./main/EnvironmentFinalize.cpp\ - ./analyses/EnumToAnalysis.h\ ./analyses/EnumToAnalysis.cpp\ - ./analyses/Analysis.h\ ./solutionsequences/solutionsequence_la.cpp\ ./solutionsequences/solutionsequence_la_theta.cpp\ @@ -360,12 +189,7 @@ ./solutionsequences/solutionsequence_fct.cpp\ ./solutionsequences/convergence.cpp\ - ./classes/Options/Options.h\ ./classes/Options/Options.cpp\ - ./classes/Options/Option.h\ - ./classes/Options/GenericOption.h\ ./classes/Options/OptionUtilities.cpp\ - ./classes/Options/OptionUtilities.h\ ./classes/RiftStruct.cpp\ - ./classes/RiftStruct.h\ ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \ ./cores/transient_core.cpp\ @@ -378,38 +202,21 @@ ./solutionsequences/solutionsequence_thermal_nonlinear.cpp\ ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\ - ./modules/ControlInputSetGradientx/ControlInputSetGradientx.h\ ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp\ - ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h\ ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp\ - ./modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h\ ./modules/ModelProcessorx/Control/CreateParametersControl.cpp\ ./modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp\ - ./modules/InputControlUpdatex/InputControlUpdatex.h\ ./modules/InputControlUpdatex/InputControlUpdatex.cpp\ - ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h\ ./modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp\ - ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h\ ./modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp\ - ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h\ ./modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp\ - ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h\ ./modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp\ - ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h\ ./modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp\ - ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h\ ./modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp\ - ./modules/Gradjx/Gradjx.h\ ./modules/Gradjx/Gradjx.cpp\ ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp\ - ./modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h\ ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp\ - ./modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h\ ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp\ - ./modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h\ ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\ - ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\ ./modules/RheologyBAbsGradientx/RheologyBAbsGradientx.cpp\ - ./modules/RheologyBAbsGradientx/RheologyBAbsGradientx.h\ - ./classes/Inputs/ControlInput.h\ ./classes/Inputs/ControlInput.cpp\ ./shared/Numerics/BrentSearch.cpp\ @@ -440,29 +247,18 @@ ./classes/Loads/Riftfront.cpp\ ./modules/ConstraintsStatex/RiftConstraintsState.cpp\ - ./classes/Massfluxatgate.h \ - ./classes/Misfit.h \ - ./classes/Masscon.h \ ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\ - ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\ ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\ - ./classes/Inputs/PentaInput.h\ ./classes/Inputs/PentaInput.cpp\ - ./classes/Inputs/TetraInput.h\ - ./classes/Inputs/TetraInput.cpp\ - #}}} + ./classes/Inputs/TetraInput.cpp +#}}} #DAKOTA sources {{{ if DAKOTA -issm_sources += ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ - ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ - ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\ +issm_sources += ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\ - ./modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h\ ./modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp\ ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ - ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\ ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\ ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp\ ./cores/dakota_core.cpp\ - ./cores/DakotaSpawnCore.h\ ./cores/DakotaSpawnCore.cpp endif @@ -470,69 +266,32 @@ #BAMG sources {{{ if BAMG -issm_sources += ./bamg/bamgobjects.h\ - ./bamg/BamgGeom.h\ - ./bamg/BamgGeom.cpp\ - ./bamg/BamgMesh.h\ +issm_sources += ./bamg/BamgGeom.cpp\ ./bamg/BamgMesh.cpp\ - ./bamg/BamgOpts.h\ ./bamg/BamgOpts.cpp\ - ./bamg/CrackedEdge.h\ ./bamg/CrackedEdge.cpp\ - ./bamg/Curve.h\ ./bamg/Curve.cpp\ - ./bamg/Direction.h\ ./bamg/Direction.cpp\ - ./bamg/DoubleAndInt.h\ - ./bamg/Edge.h\ ./bamg/Edge.cpp\ - ./bamg/GeomEdge.h\ ./bamg/GeomEdge.cpp\ - ./bamg/GeomSubDomain.h\ ./bamg/GeomSubDomain.cpp\ - ./bamg/GeomVertex.h\ ./bamg/GeomVertex.cpp\ ./bamg/Geometry.cpp\ - ./bamg/Geometry.h\ ./bamg/ListofIntersectionTriangles.cpp\ - ./bamg/ListofIntersectionTriangles.h\ ./bamg/EigenMetric.cpp\ ./bamg/Metric.cpp\ - ./bamg/Metric.h\ ./bamg/BamgQuadtree.cpp\ - ./bamg/BamgQuadtree.h\ - ./bamg/R2.h\ ./bamg/SetOfE4.cpp\ - ./bamg/SetOfE4.h\ - ./bamg/SubDomain.h\ ./bamg/SubDomain.cpp\ - ./bamg/AdjacentTriangle.h\ ./bamg/AdjacentTriangle.cpp\ ./bamg/Triangle.cpp\ - ./bamg/det.h \ - ./bamg/Triangle.h\ ./bamg/BamgVertex.cpp\ - ./bamg/BamgVertex.h\ - ./bamg/VertexOnEdge.h\ ./bamg/VertexOnEdge.cpp\ - ./bamg/VertexOnGeom.h\ ./bamg/VertexOnGeom.cpp\ - ./bamg/VertexOnVertex.h\ ./bamg/VertexOnVertex.cpp\ ./bamg/Mesh.cpp\ - ./bamg/Mesh.h\ - ./shared/Bamg/Abs.h \ - ./shared/Bamg/BigPrimeNumber.h\ ./shared/Bamg/BigPrimeNumber.cpp\ - ./shared/Bamg/BinaryRand.h \ - ./shared/Bamg/Exchange.h \ - ./shared/Bamg/extrema.h \ - ./shared/Bamg/HeapSort.h \ - ./shared/Bamg/OppositeAngle.h \ ./modules/Bamgx/Bamgx.cpp\ - ./modules/Bamgx/Bamgx.h\ ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\ - ./modules/BamgConvertMeshx/BamgConvertMeshx.h\ - ./modules/BamgTriangulatex/BamgTriangulatex.cpp\ - ./modules/BamgTriangulatex/BamgTriangulatex.h + ./modules/BamgTriangulatex/BamgTriangulatex.cpp endif #}}} @@ -541,6 +300,4 @@ issm_sources += ./toolkits/petsc\ ./toolkits/petsc/patches\ - ./toolkits/petsc/patches/SolverEnum.h\ - ./toolkits/petsc/patches/petscpatches.h\ ./toolkits/petsc/patches/VecToMPISerial.cpp\ ./toolkits/petsc/patches/MatToSerial.cpp\ @@ -557,26 +314,17 @@ ./toolkits/petsc/patches/ISSMToPetscInsertMode.cpp\ ./toolkits/petsc/patches/ISSMToPetscNormMode.cpp\ - ./toolkits/petsc/objects/petscobjects.h\ - ./toolkits/petsc/objects/PetscMat.h\ ./toolkits/petsc/objects/PetscMat.cpp\ - ./toolkits/petsc/objects/PetscVec.h\ ./toolkits/petsc/objects/PetscVec.cpp\ - ./toolkits/petsc/objects/PetscSolver.cpp\ - ./toolkits/petsc/objects/PetscSolver.h\ - ./toolkits/petsc/petscincludes.h + ./toolkits/petsc/objects/PetscSolver.cpp endif #}}} #Mumps sources {{{ if MUMPS -issm_sources += ./toolkits/mumps\ - ./toolkits/mumps/mumpsincludes.h\ - ./toolkits/mumps/MumpsSolve.cpp +issm_sources += ./toolkits/mumps/MumpsSolve.cpp endif #}}} #Gsl sources {{{ if GSL -issm_sources += ./toolkits/gsl\ - ./toolkits/gsl/gslincludes.h\ - ./toolkits/gsl/DenseGslSolve.cpp +issm_sources += ./toolkits/gsl/DenseGslSolve.cpp endif #}}} @@ -677,4 +425,5 @@ if LEVELSET issm_sources += ./analyses/LevelsetAnalysis.cpp +issm_sources += ./modules/Calvingx/Calvingx.cpp endif if EXTRAPOLATION @@ -699,14 +448,7 @@ endif #}}} -#Mpi sources {{{ -if MPI -issm_sources += ./toolkits/issm/IssmMpiDenseMat.h\ - ./toolkits/issm/IssmMpiVec.h -endif -#}}} #Metis sources {{{ if METIS -issm_sources += ./toolkits/metis/patches/metispatches.h\ - ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp +issm_sources += ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp endif #}}} @@ -717,79 +459,42 @@ #}}} #Kml sources {{{ -kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\ - ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ - ./modules/Kml2Expx/Kml2Expx.h\ +kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ ./modules/Kml2Expx/Kml2Expx.cpp\ - ./modules/Shp2Kmlx/Shp2Kmlx.h\ ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ - ./modules/KMLFileReadx/KMLFileReadx.h\ ./modules/KMLFileReadx/KMLFileReadx.cpp\ - ./modules/KMLMeshWritex/KMLMeshWritex.h\ ./modules/KMLMeshWritex/KMLMeshWritex.cpp\ - ./modules/KMLOverlayx/KMLOverlayx.h\ ./modules/KMLOverlayx/KMLOverlayx.cpp\ - ./kml/kmlobjects.h\ ./kml/KML_Attribute.cpp\ - ./kml/KML_Attribute.h\ ./kml/KML_Comment.cpp\ - ./kml/KML_Comment.h\ ./kml/KML_ColorStyle.cpp\ - ./kml/KML_ColorStyle.h\ ./kml/KML_Container.cpp\ - ./kml/KML_Container.h\ ./kml/KML_Document.cpp\ - ./kml/KML_Document.h\ ./kml/KML_Feature.cpp\ - ./kml/KML_Feature.h\ ./kml/KML_File.cpp\ - ./kml/KML_File.h\ ./kml/KML_Folder.cpp\ - ./kml/KML_Folder.h\ ./kml/KML_Geometry.cpp\ - ./kml/KML_Geometry.h\ ./kml/KML_GroundOverlay.cpp\ - ./kml/KML_GroundOverlay.h\ ./kml/KML_Icon.cpp\ - ./kml/KML_Icon.h\ ./kml/KML_LatLonBox.cpp\ - ./kml/KML_LatLonBox.h\ ./kml/KML_LinearRing.cpp\ - ./kml/KML_LinearRing.h\ ./kml/KML_LineString.cpp\ - ./kml/KML_LineString.h\ ./kml/KML_LineStyle.cpp\ - ./kml/KML_LineStyle.h\ ./kml/KML_MultiGeometry.cpp\ - ./kml/KML_MultiGeometry.h\ ./kml/KML_Object.cpp\ - ./kml/KML_Object.h\ ./kml/KML_Overlay.cpp\ - ./kml/KML_Overlay.h\ ./kml/KML_Point.cpp\ - ./kml/KML_Point.h\ ./kml/KML_Placemark.cpp\ - ./kml/KML_Placemark.h\ ./kml/KML_Polygon.cpp\ - ./kml/KML_Polygon.h\ ./kml/KML_PolyStyle.cpp\ - ./kml/KML_PolyStyle.h\ ./kml/KML_Style.cpp\ - ./kml/KML_Style.h\ ./kml/KML_StyleSelector.cpp\ - ./kml/KML_StyleSelector.h\ ./kml/KML_SubStyle.cpp\ - ./kml/KML_SubStyle.h\ ./kml/KML_Unknown.cpp\ - ./kml/KML_Unknown.h\ - ./kml/KMLFileReadUtils.cpp\ - ./kml/KMLFileReadUtils.h + ./kml/KMLFileReadUtils.cpp #}}} #Modules sources{{{ -modules_sources= ./shared/Threads/issm_threads.h\ - ./shared/Threads/LaunchThread.cpp\ +modules_sources= ./shared/Threads/LaunchThread.cpp\ ./shared/Threads/PartitionRange.cpp\ - ./shared/Exp/exp.h\ ./shared/Exp/exp.cpp\ - ./shared/TriMesh/trimesh.h\ ./shared/TriMesh/AssociateSegmentToElement.cpp\ ./shared/TriMesh/GridInsideHole.cpp\ @@ -797,43 +502,26 @@ ./shared/TriMesh/SplitMeshForRifts.cpp\ ./shared/TriMesh/TriMeshUtils.cpp\ - ./modules/TriaSearchx/TriaSearchx.h\ ./modules/TriaSearchx/TriaSearchx.cpp\ - ./modules/TriMeshx/TriMeshx.h\ ./modules/TriMeshx/TriMeshx.cpp\ - ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.h\ ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.cpp\ - ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h\ ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp\ ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp\ ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp\ - ./modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h\ ./modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp\ ./modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp\ - ./modules/InterpFromMesh2dx/InterpFromMesh2dx.h\ ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\ - ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h\ ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\ - ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h\ ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\ - ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.h\ ./modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp\ - ./modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h\ ./modules/ContourToMeshx/ContourToMeshx.cpp\ ./modules/ContourToMeshx/ContourToMeshxt.cpp\ - ./modules/ContourToMeshx/ContourToMeshx.h\ ./modules/ExpToLevelSetx/ExpToLevelSetx.cpp\ ./modules/ExpToLevelSetx/ExpToLevelSetxt.cpp\ - ./modules/ExpToLevelSetx/ExpToLevelSetx.h\ ./modules/ContourToNodesx/ContourToNodesx.cpp\ - ./modules/ContourToNodesx/ContourToNodesx.h\ ./modules/NodeConnectivityx/NodeConnectivityx.cpp\ - ./modules/NodeConnectivityx/NodeConnectivityx.h\ ./modules/ElementConnectivityx/ElementConnectivityx.cpp\ - ./modules/ElementConnectivityx/ElementConnectivityx.h\ - ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\ - ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h + ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp if CHACO -modules_sources+= ./modules/Chacox/Chacox.h\ - ./modules/Chacox/Chacox.cpp\ +modules_sources+= ./modules/Chacox/Chacox.cpp\ ./modules/Chacox/input_parse.cpp\ ./modules/Chacox/chaco_seconds.cpp\ @@ -841,6 +529,5 @@ endif if SCOTCH -modules_sources+= ./modules/Scotchx/Scotchx.cpp\ - ./modules/Scotchx/Scotchx.h +modules_sources+= ./modules/Scotchx/Scotchx.cpp endif #}}} @@ -849,25 +536,15 @@ #Kriging sources {{{ if KRIGING -issm_sources +=./classes/kriging/Observations.h\ - ./classes/kriging/Observations.cpp\ - ./classes/kriging/Variogram.h \ - ./classes/kriging/GaussianVariogram.h\ +issm_sources += ./classes/kriging/Observations.cpp\ ./classes/kriging/GaussianVariogram.cpp\ - ./classes/kriging/ExponentialVariogram.h\ ./classes/kriging/ExponentialVariogram.cpp\ - ./classes/kriging/SphericalVariogram.h\ ./classes/kriging/SphericalVariogram.cpp\ - ./classes/kriging/PowerVariogram.h\ ./classes/kriging/PowerVariogram.cpp\ - ./classes/kriging/Quadtree.h\ ./classes/kriging/Quadtree.cpp\ - ./classes/kriging/Covertree.h\ ./classes/kriging/Covertree.cpp\ - ./classes/kriging/Observation.h\ ./classes/kriging/Observation.cpp\ ./modules/Krigingx/pKrigingx.cpp modules_sources +=./modules/Krigingx/Krigingx.cpp\ - ./modules/Krigingx/Krigingx.h\ ./modules/Krigingx/pKrigingx.cpp endif @@ -948,10 +625,10 @@ endif -issm_SOURCES = main/issm.h main/globals.h main/issm.cpp +issm_SOURCES = main/issm.cpp issm_CXXFLAGS= -fPIC if KRIGING bin_PROGRAMS += kriging -kriging_SOURCES = main/issm.h main/globals.h main/kriging.cpp +kriging_SOURCES = main/kriging.cpp kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) endif Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 19046) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 19047) @@ -25,5 +25,5 @@ bool time_adapt=false; int output_frequency; - int domaintype,groundingline_migration,calvinglaw; + int domaintype,groundingline_migration; int numoutputs = 0; Analysis *analysis = NULL; @@ -54,5 +54,4 @@ femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); femmodel->parameters->FindParam(&iscalving,TransientIscalvingEnum); - femmodel->parameters->FindParam(&calvinglaw,CalvingLawEnum); if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum); @@ -103,28 +102,5 @@ if(islevelset){ - if(iscalving){ - switch(calvinglaw){ - case DefaultCalvingEnum: - break; - case CalvingLevermannEnum: - if(VerboseSolution()) _printf0_(" computing Levermann's calving rate\n"); - femmodel->StrainRateparallelx(); - femmodel->StrainRateperpendicularx(); - femmodel->CalvingRateLevermannx(); - break; - case CalvingPiEnum: - if(VerboseSolution()) _printf0_(" computing Pi's calving rate\n"); - femmodel->StrainRateparallelx(); - femmodel->DeviatoricStressx(); - femmodel->CalvingRatePix(); - break; - case CalvingDevEnum: - femmodel->CalvingRateDevx(); - femmodel->ElementOperationx(&Element::CalvingRateDev); - break; - default: - _error_("Caving law "<parameters->FindParam(&calvinglaw,CalvingLawEnum); + + /*Calculate calving rate*/ + switch(calvinglaw){ + case DefaultCalvingEnum: + break; + case CalvingLevermannEnum: + if(VerboseModule()) _printf0_(" computing Levermann's calving rate\n"); + femmodel->StrainRateparallelx(); + femmodel->StrainRateperpendicularx(); + femmodel->CalvingRateLevermannx(); + break; + case CalvingPiEnum: + if(VerboseModule()) _printf0_(" computing Pi's calving rate\n"); + femmodel->StrainRateparallelx(); + femmodel->DeviatoricStressx(); + femmodel->CalvingRatePix(); + break; + case CalvingDevEnum: + femmodel->CalvingRateDevx(); + femmodel->ElementOperationx(&Element::CalvingRateDev); + break; + default: + _error_("Caving law "<