Changeset 14996

Timestamp:

05/09/13 23:26:42 (12 years ago)

Author:

Eric.Larour

Message:

CHG: integrated Container/ directory into src/c/classes/objects directory. No reason to have the containers
and the objects that they contain defined in different places.

Location:

issm/trunk-jpl/src

Files:

• c/Container (deleted)
• c/Makefile.am (modified) (11 diffs)
• c/analyses/controlconvergence.cpp (modified) (1 diff)
• c/analyses/dakota_core.cpp (modified) (1 diff)
• c/analyses/steadystateconvergence.cpp (modified) (1 diff)
• c/classes/FemModel.cpp (modified) (1 diff)
• c/classes/Hook.cpp (modified) (1 diff)
• c/classes/IoModel.cpp (modified) (1 diff)
• c/classes/Patch.cpp (modified) (1 diff)
• c/classes/classes.h (modified) (1 diff)
• c/classes/kriging/ExponentialVariogram.cpp (modified) (1 diff)
• c/classes/kriging/GaussianVariogram.cpp (modified) (1 diff)
• c/classes/kriging/Observations.cpp (added)
• c/classes/kriging/Observations.h (added)
• c/classes/kriging/PowerVariogram.cpp (modified) (1 diff)
• c/classes/kriging/SphericalVariogram.cpp (modified) (1 diff)
• c/classes/kriging/krigingobjects.h (modified) (1 diff)
• c/classes/matrix/ElementMatrix.cpp (modified) (1 diff)
• c/classes/matrix/ElementVector.cpp (modified) (1 diff)
• c/classes/objects/Bucket.h (modified) (1 diff)
• c/classes/objects/Constraints/Constraints.cpp (added)
• c/classes/objects/Constraints/Constraints.h (added)
• c/classes/objects/Constraints/SpcDynamic.cpp (modified) (1 diff)
• c/classes/objects/Constraints/SpcStatic.cpp (modified) (1 diff)
• c/classes/objects/Constraints/SpcTransient.cpp (modified) (1 diff)
• c/classes/objects/DataSet.cpp (added)
• c/classes/objects/DataSet.h (added)
• c/classes/objects/DependentObject.cpp (modified) (1 diff)
• c/classes/objects/ElementResults/BoolElementResult.cpp (modified) (1 diff)
• c/classes/objects/ElementResults/DoubleElementResult.cpp (modified) (1 diff)
• c/classes/objects/ElementResults/PentaP1ElementResult.cpp (modified) (1 diff)
• c/classes/objects/ElementResults/TriaP1ElementResult.cpp (modified) (1 diff)
• c/classes/objects/Elements/Element.h (modified) (1 diff)
• c/classes/objects/Elements/Elements.cpp (added)
• c/classes/objects/Elements/Elements.h (added)
• c/classes/objects/Elements/Penta.cpp (modified) (1 diff)
• c/classes/objects/Elements/PentaHook.cpp (modified) (1 diff)
• c/classes/objects/Elements/PentaRef.cpp (modified) (1 diff)
• c/classes/objects/Elements/Tria.cpp (modified) (1 diff)
• c/classes/objects/Elements/Tria.h (modified) (1 diff)
• c/classes/objects/Elements/TriaHook.cpp (modified) (1 diff)
• c/classes/objects/Elements/TriaRef.cpp (modified) (1 diff)
• c/classes/objects/ExternalResults/Results.cpp (added)
• c/classes/objects/ExternalResults/Results.h (added)
• c/classes/objects/IndependentObject.cpp (modified) (1 diff)
• c/classes/objects/Inputs/BoolInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/ControlInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/DatasetInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/DoubleInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/Input.h (modified) (1 diff)
• c/classes/objects/Inputs/Inputs.cpp (added)
• c/classes/objects/Inputs/Inputs.h (added)
• c/classes/objects/Inputs/IntInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/PentaP1Input.cpp (modified) (1 diff)
• c/classes/objects/Inputs/TransientInput.cpp (modified) (1 diff)
• c/classes/objects/Inputs/TriaP1Input.cpp (modified) (1 diff)
• c/classes/objects/KML/KMLFileReadUtils.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Attribute.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_ColorStyle.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Comment.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Container.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Document.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Feature.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_File.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Folder.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Geometry.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_GroundOverlay.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Icon.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_LatLonBox.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_LineString.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_LineStyle.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_LinearRing.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_MultiGeometry.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Object.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Overlay.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Placemark.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Point.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_PolyStyle.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Polygon.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Style.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_StyleSelector.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_SubStyle.cpp (modified) (1 diff)
• c/classes/objects/KML/KML_Unknown.cpp (modified) (1 diff)
• c/classes/objects/Loads/Friction.cpp (modified) (1 diff)
• c/classes/objects/Loads/Icefront.cpp (modified) (1 diff)
• c/classes/objects/Loads/Loads.cpp (added)
• c/classes/objects/Loads/Loads.h (added)
• c/classes/objects/Loads/Numericalflux.cpp (modified) (1 diff)
• c/classes/objects/Loads/Pengrid.cpp (modified) (1 diff)
• c/classes/objects/Loads/Penpair.cpp (modified) (1 diff)
• c/classes/objects/Materials/Matdamageice.cpp (modified) (1 diff)
• c/classes/objects/Materials/Material.h (modified) (1 diff)
• c/classes/objects/Materials/Materials.cpp (added)
• c/classes/objects/Materials/Materials.h (added)
• c/classes/objects/Materials/Matice.cpp (modified) (1 diff)
• c/classes/objects/Materials/Matice.h (modified) (1 diff)
• c/classes/objects/Node.cpp (modified) (1 diff)
• c/classes/objects/Nodes.cpp (added)
• c/classes/objects/Nodes.h (added)
• c/classes/objects/Options/OptionUtilities.cpp (modified) (1 diff)
• c/classes/objects/Options/Options.cpp (added)
• c/classes/objects/Options/Options.h (added)
• c/classes/objects/Params/BoolParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DataSetParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DoubleMatArrayParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DoubleMatParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DoubleParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DoubleTransientMatParam.cpp (modified) (1 diff)
• c/classes/objects/Params/DoubleVecParam.cpp (modified) (1 diff)
• c/classes/objects/Params/FileParam.cpp (modified) (1 diff)
• c/classes/objects/Params/IntMatParam.cpp (modified) (1 diff)
• c/classes/objects/Params/IntParam.cpp (modified) (1 diff)
• c/classes/objects/Params/IntVecParam.cpp (modified) (1 diff)
• c/classes/objects/Params/MatrixParam.cpp (modified) (1 diff)
• c/classes/objects/Params/Parameters.cpp (added)
• c/classes/objects/Params/Parameters.h (added)
• c/classes/objects/Params/StringArrayParam.cpp (modified) (1 diff)
• c/classes/objects/Params/StringParam.cpp (modified) (1 diff)
• c/classes/objects/Params/TransientParam.cpp (modified) (1 diff)
• c/classes/objects/Params/VectorParam.cpp (modified) (1 diff)
• c/classes/objects/Profiler.cpp (modified) (1 diff)
• c/classes/objects/Vertex.cpp (modified) (1 diff)
• c/classes/objects/Vertices.cpp (added)
• c/classes/objects/Vertices.h (added)
• c/classes/objects/objects.h (modified) (7 diffs)
• c/main/issm.h (modified) (1 diff)
• c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (modified) (1 diff)
• c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h (modified) (1 diff)
• c/modules/Chacox/Chacox.h (modified) (1 diff)
• c/modules/ComputeBasalStressx/ComputeBasalStressx.h (modified) (1 diff)
• c/modules/ComputeStrainRatex/ComputeStrainRatex.h (modified) (1 diff)
• c/modules/ConfigureObjectsx/ConfigureObjectsx.h (modified) (1 diff)
• c/modules/ConstraintsStatex/ConstraintsStateLocal.h (modified) (1 diff)
• c/modules/ConstraintsStatex/ConstraintsStatex.h (modified) (1 diff)
• c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h (modified) (1 diff)
• c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h (modified) (1 diff)
• c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h (modified) (1 diff)
• c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h (modified) (1 diff)
• c/modules/Delta18oParameterizationx/Delta18oParameterizationx.h (modified) (1 diff)
• c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h (modified) (1 diff)
• c/modules/EdgeDetectionx/EdgeDetectionx.h (modified) (1 diff)
• c/modules/Exp2Kmlx/Exp2Kmlx.h (modified) (1 diff)
• c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (modified) (1 diff)
• c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (modified) (1 diff)
• c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (modified) (1 diff)
• c/modules/GiaDeflectionCorex/GiaDeflectionCorex.h (modified) (1 diff)
• c/modules/Gradjx/Gradjx.h (modified) (1 diff)
• c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (1 diff)
• c/modules/InputArtificialNoisex/InputArtificialNoisex.h (modified) (1 diff)
• c/modules/InputControlUpdatex/InputControlUpdatex.h (modified) (1 diff)
• c/modules/InputConvergencex/InputConvergencex.h (modified) (1 diff)
• c/modules/InputDuplicatex/InputDuplicatex.h (modified) (1 diff)
• c/modules/InputScalex/InputScalex.h (modified) (1 diff)
• c/modules/InputToResultx/InputToResultx.h (modified) (1 diff)
• c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (modified) (1 diff)
• c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (modified) (1 diff)
• c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h (modified) (1 diff)
• c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (modified) (1 diff)
• c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h (modified) (1 diff)
• c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h (modified) (1 diff)
• c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (1 diff)
• c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h (modified) (1 diff)
• c/modules/KMLFileReadx/KMLFileReadx.h (modified) (1 diff)
• c/modules/KMLMeshWritex/KMLMeshWritex.h (modified) (1 diff)
• c/modules/KMLOverlayx/KMLOverlayx.h (modified) (1 diff)
• c/modules/Kml2Expx/Kml2Expx.h (modified) (1 diff)
• c/modules/Krigingx/Krigingx.cpp (modified) (1 diff)
• c/modules/Krigingx/pKrigingx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ModelProcessorx.h (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)
• c/modules/NodalValuex/NodalValuex.h (modified) (1 diff)
• c/modules/NodesDofx/NodesDofx.h (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.h (modified) (1 diff)
• c/modules/OutputRiftsx/OutputRiftsx.h (modified) (1 diff)
• c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h (modified) (1 diff)
• c/modules/PositiveDegreeDayx/PositiveDegreeDayx.h (modified) (1 diff)
• c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h (modified) (1 diff)
• c/modules/Reducevectorgtofx/Reducevectorgtofx.h (modified) (1 diff)
• c/modules/Reducevectorgtosx/Reducevectorgtosx.h (modified) (1 diff)
• c/modules/ResetConstraintsx/ResetConstraintsx.h (modified) (1 diff)
• c/modules/ResetCoordinateSystemx/ResetCoordinateSystemx.h (modified) (1 diff)
• c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h (modified) (1 diff)
• c/modules/Scotchx/Scotchx.h (modified) (1 diff)
• c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h (modified) (1 diff)
• c/modules/Shp2Expx/Shp2Expx.h (modified) (1 diff)
• c/modules/Shp2Kmlx/Shp2Kmlx.h (modified) (1 diff)
• c/modules/SmbGradientsx/SmbGradientsx.h (modified) (1 diff)
• c/modules/SpcNodesx/SpcNodesx.h (modified) (1 diff)
• c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h (modified) (1 diff)
• c/modules/SurfaceAreax/SurfaceAreax.h (modified) (1 diff)
• c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h (modified) (1 diff)
• c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h (modified) (1 diff)
• c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h (modified) (1 diff)
• c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h (modified) (1 diff)
• c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h (modified) (1 diff)
• c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h (modified) (1 diff)
• c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h (modified) (1 diff)
• c/modules/TriMeshx/TriMeshx.h (modified) (1 diff)
• c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (modified) (1 diff)
• c/modules/VecMergex/VecMergex.h (modified) (1 diff)
• c/modules/VertexCoordinatesx/VertexCoordinatesx.h (modified) (1 diff)
• c/modules/VerticesDofx/VerticesDofx.h (modified) (1 diff)
• c/toolkits/gsl/DenseGslSolve.cpp (modified) (1 diff)
• c/toolkits/issm/IssmMpiDenseMat.h (modified) (1 diff)
• wrappers/AverageFilter/AverageFilter.h (modified) (1 diff)
• wrappers/BamgConvertMesh/BamgConvertMesh.h (modified) (1 diff)
• wrappers/BamgMesher/BamgMesher.h (modified) (1 diff)
• wrappers/BamgTriangulate/BamgTriangulate.h (modified) (1 diff)
• wrappers/Chaco/Chaco.h (modified) (1 diff)
• wrappers/ContourToMesh/ContourToMesh.h (modified) (1 diff)
• wrappers/ContourToNodes/ContourToNodes.h (modified) (1 diff)
• wrappers/EdgeDetection/EdgeDetection.h (modified) (1 diff)
• wrappers/ElementConnectivity/ElementConnectivity.h (modified) (1 diff)
• wrappers/Exp2Kml/Exp2Kml.h (modified) (1 diff)
• wrappers/ExpSimplify/ExpSimplify.h (modified) (1 diff)
• wrappers/HoleFiller/HoleFiller.h (modified) (1 diff)
• wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)
• wrappers/InterpFromMesh2d/InterpFromMesh2d.h (modified) (1 diff)
• wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h (modified) (1 diff)
• wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (modified) (1 diff)
• wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (modified) (1 diff)
• wrappers/KMLFileRead/KMLFileRead.h (modified) (1 diff)
• wrappers/KMLMeshWrite/KMLMeshWrite.h (modified) (1 diff)
• wrappers/KMLOverlay/KMLOverlay.h (modified) (1 diff)
• wrappers/Kml2Exp/Kml2Exp.h (modified) (1 diff)
• wrappers/Ll2xy/Ll2xy.h (modified) (1 diff)
• wrappers/MeshPartition/MeshPartition.h (modified) (1 diff)
• wrappers/MeshProfileIntersection/MeshProfileIntersection.h (modified) (1 diff)
• wrappers/NodeConnectivity/NodeConnectivity.h (modified) (1 diff)
• wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h (modified) (1 diff)
• wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (modified) (1 diff)
• wrappers/Scotch/Scotch.h (modified) (1 diff)
• wrappers/Shp2Exp/Shp2Exp.h (modified) (1 diff)
• wrappers/Shp2Kml/Shp2Kml.h (modified) (1 diff)
• wrappers/TriMesh/TriMesh.h (modified) (1 diff)
• wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h (modified) (1 diff)
• wrappers/TriaSearch/TriaSearch.h (modified) (1 diff)
• wrappers/Xy2ll/Xy2ll.h (modified) (1 diff)
• wrappers/matlab/io/FetchMatlabData.cpp (modified) (1 diff)
• wrappers/matlab/io/matlabio.h (modified) (1 diff)
• wrappers/python/io/WritePythonData.cpp (modified) (1 diff)
• wrappers/python/io/pythonio.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -47 +47 @@
                                         ./classes/IoModel.h\
                                         ./classes/IoModel.cpp\
+                                        ./classes/objects/DataSet.h\
+                                        ./classes/objects/DataSet.cpp\
+                                        ./classes/objects/Nodes.h\
+                                        ./classes/objects/Nodes.cpp\
+                                        ./classes/objects/Vertices.h\
+                                        ./classes/objects/Vertices.cpp\
                                         ./classes/objects/Bucket.h\
                                         ./classes/objects/Node.h\
@@ -67 +73 @@
                                         ./classes/objects/ElementResults/BoolElementResult.h\
                                         ./classes/objects/ElementResults/BoolElementResult.cpp\
+                                        ./classes/objects/ExternalResults/Results.h\
+                                        ./classes/objects/ExternalResults/Results.cpp\
                                         ./classes/objects/ExternalResults/ExternalResult.h\
                                         ./classes/objects/ExternalResults/GenericExternalResult.h\
+                                        ./classes/objects/Elements/Elements.h\
+                                        ./classes/objects/Elements/Elements.cpp\
                                         ./classes/objects/Elements/Tria.h\
                                         ./classes/objects/Elements/Tria.cpp\
@@ -75 +85 @@
                                         ./classes/objects/Elements/TriaRef.h\
                                         ./classes/objects/Elements/TriaRef.cpp\
+                                        ./classes/objects/Inputs/Inputs.h\
+                                        ./classes/objects/Inputs/Inputs.cpp\
                                         ./classes/objects/Inputs/Input.h\
                                         ./classes/objects/Inputs/InputLocal.h\
@@ -87 +99 @@
                                         ./classes/objects/Inputs/DatasetInput.h\
                                         ./classes/objects/Inputs/DatasetInput.cpp\
+                                        ./classes/objects/Materials/Materials.h\
+                                        ./classes/objects/Materials/Materials.cpp\
                                         ./classes/objects/Materials/Matice.h\
                                         ./classes/objects/Materials/Matice.cpp\
@@ -93 +107 @@
                                         ./classes/objects/Materials/Matpar.h\
                                         ./classes/objects/Materials/Matpar.cpp\
+                                        ./classes/objects/Constraints/Constraints.h\
+                                        ./classes/objects/Constraints/Constraints.cpp\
                                         ./classes/objects/Constraints/Constraint.h\
                                         ./classes/objects/Constraints/SpcStatic.cpp\
@@ -98 +114 @@
                                         ./classes/objects/Constraints/SpcDynamic.cpp\
                                         ./classes/objects/Constraints/SpcDynamic.h\
+                                        ./classes/objects/Loads/Loads.h\
+                                        ./classes/objects/Loads/Loads.cpp\
                                         ./classes/objects/Loads/Penpair.cpp\
                                         ./classes/objects/Loads/Penpair.h\
@@ -115 +133 @@
                                         ./classes/toolkits/Vector.h\
                                         ./classes/toolkits/Solver.h\
+                                        ./classes/objects/Params/Parameters.h\
+                                        ./classes/objects/Params/Parameters.cpp\
                                         ./classes/objects/Params/Param.h\
                                         ./classes/objects/Params/GenericParam.h\
@@ -151 +171 @@
                                         ./classes/objects/Profiler.h\
                                         ./classes/objects/Profiler.cpp\
-                                        ./Container/Container.h\
-                                        ./Container/Constraints.h\
-                                        ./Container/Constraints.cpp\
-                                        ./Container/DataSet.h\
-                                        ./Container/DataSet.cpp\
-                                        ./Container/Elements.h\
-                                        ./Container/Elements.cpp\
-                                        ./Container/Inputs.h\
-                                        ./Container/Inputs.cpp\
-                                        ./Container/Loads.h\
-                                        ./Container/Loads.cpp\
-                                        ./Container/Materials.h\
-                                        ./Container/Materials.cpp\
-                                        ./Container/Nodes.h\
-                                        ./Container/Nodes.cpp\
-                                        ./Container/Options.h\
-                                        ./Container/Options.cpp\
-                                        ./Container/Parameters.h\
-                                        ./Container/Parameters.cpp\
-                                        ./Container/Results.h\
-                                        ./Container/Results.cpp\
-                                        ./Container/Vertices.h\
-                                        ./Container/Vertices.cpp\
                                         ./shared/shared.h\
                                         ./shared/MemOps/MemOps.h\
@@ -334 +331 @@
                                         ./solutionsequences/solutionsequence_nonlinear.cpp\
                                         ./solutionsequences/solutionsequence_newton.cpp\
+                                        ./classes/objects/Options/Options.h\
+                                        ./classes/objects/Options/Options.cpp\
                                         ./classes/objects/Options/Option.h\
                                         ./classes/objects/Options/GenericOption.h\
@@ -614 +613 @@
 #}}}
 #Kriging sources  {{{
-kriging_sources = ./Container/Observations.h\
-                                                ./Container/Observations.cpp\
+kriging_sources = ./classes/kriging/Observations.h\
+                                                ./classes/kriging/Observations.cpp\
                                                 ./classes/kriging/Variogram.h \
                                                 ./classes/kriging/GaussianVariogram.h\
@@ -633 +632 @@
 
 #For parallel kriging, only difference is ./modules/Krigingx/pKrigingx.cpp with no multithreading
-pkriging_sources = ./Container/Observations.h\
-                                                ./Container/Observations.cpp\
+pkriging_sources = ./classes/kriging/Observations.h\
+                                                ./classes/kriging/Observations.cpp\
                                                 ./classes/kriging/Variogram.h \
                                                 ./classes/kriging/GaussianVariogram.h\

issm/trunk-jpl/src/c/analyses/controlconvergence.cpp

@@ -11 +11 @@
 #include "../classes/objects/objects.h"
 #include "../shared/io/io.h"
-#include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"

issm/trunk-jpl/src/c/analyses/dakota_core.cpp

@@ -38 +38 @@
 #include "../toolkits/toolkits.h"
 #include "../shared/Enum/Enum.h"
-#include "../classes/dakota/DakotaPlugin.h"
-#include "../classes/FemModel.h"
-#include "../Container/Parameters.h"
+#include "../classes/classes.h"
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.

issm/trunk-jpl/src/c/analyses/steadystateconvergence.cpp

@@ -10 +10 @@
 #include "./analyses.h"
 #include "../classes/objects/objects.h"
-#include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -10 +10 @@
 
 #include <stdio.h>
-#include "../Container/Container.h"
 #include "../analyses/analyses.h"
 #include "../shared/io/io.h"

issm/trunk-jpl/src/c/classes/Hook.cpp

@@ -12 +12 @@
 #include <string.h>
 #include "./classes.h"
-#include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../shared/shared.h"

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -17 +17 @@
 #include "./classes.h"
 #include "../shared/io/io.h"
-#include "../Container/Parameters.h"
-#include "../Container/Elements.h"
 #include "../shared/shared.h"
 

issm/trunk-jpl/src/c/classes/Patch.cpp

@@ -14 +14 @@
 #include <math.h>
 #include "./classes.h"
-#include "../Container/Container.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
 #include "../shared/shared.h"
 

issm/trunk-jpl/src/c/classes/classes.h

@@ -24 +24 @@
 #include "./kriging/krigingobjects.h"
 
+/*dakota:*/
+#include "./dakota/DakotaPlugin.h"
+
 /*diverse: */
 #include "./Hook.h"

issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

@@ -13 +13 @@
 #include "../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 
 /*ExponentialVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

@@ -13 +13 @@
 #include "../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 
 /*GaussianVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

@@ -13 +13 @@
 #include "../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 
 /*PowerVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

@@ -13 +13 @@
 #include "../objects/objects.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 
 /*SphericalVariogram constructors and destructor*/

issm/trunk-jpl/src/c/classes/kriging/krigingobjects.h

@@ -14 +14 @@
 #include "./Quadtree.h"
 #include "./Observation.h"
+#include "./Observations.h"
 
 #endif

issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp

@@ -15 +15 @@
 #include "../classes.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp

@@ -15 +15 @@
 #include "../classes.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Bucket.h

@@ -10 +10 @@
 #include "./Object.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../Container/DataSet.h"
+#include "../../classes/objects/DataSet.h"
 #include "../../toolkits/toolkitsenums.h"
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp

@@ -13 +13 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/Enum/Enum.h"
-#include "../../../Container/Container.h"
 #include "../objects.h"
 

issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp

@@ -13 +13 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/Enum/Enum.h"
-#include "../../../Container/Container.h"
 #include "../objects.h"
 

issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp

@@ -13 +13 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/Enum/Enum.h"
-#include "../../../Container/Container.h"
 #include "../objects.h"
 

issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp

@@ -14 +14 @@
 #include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 
 /*DependentObject constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp

@@ -15 +15 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*BoolElementResult constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp

@@ -15 +15 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*DoubleElementResult constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp

@@ -15 +15 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*PentaP1ElementResult constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp

@@ -15 +15 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*TriaP1ElementResult constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Elements/Element.h

@@ -16 +16 @@
 class Parameters;
 class Patch;
+class Elements;
+class Loads;
+class Node;
+class Nodes;
+class Vertices;
+class Materials;
 template <class doublematrix> class Matrix;
 template <class doubletype> class Vector;

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -15 +15 @@
 #include "../../classes.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -15 +15 @@
 #include "../../classes.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 #ifdef _HAVE_GIA_
 #include "../../../modules/GiaDeflectionCorex/GiaDeflectionCorex.h"

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -19 +19 @@
 class ElementMatrix;
 class ElementVector;
+class Vertex;
 
 #include "../../../shared/Exceptions/exceptions.h"

issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp

@@ -14 +14 @@
 #include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"
-#include "../../Container/Container.h"
 #include "../IoModel.h"
 

issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*BoolInput constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*ControlInput constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*DoubleInput constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Inputs/Input.h

@@ -15 +15 @@
 class GaussPenta;
 template <class doubletype> class Vector;
+#include "../../../shared/shared.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*IntInput constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*PentaP1Input constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*TriaP1Input constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 #include "../../../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 #include "../../../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 #include "../../../modules/Ll2xyx/Ll2xyx.h"
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../../shared/io/io.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../../classes.h"
-#include "../../../Container/Container.h"
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"

issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Inputs.h"
-#include "../../../Container/Parameters.h"
 /*}}}*/ 
 

issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp

@@ -16 +16 @@
 #include "../../../shared/shared.h"
 #include "../../classes.h"
-#include "../../../Container/Inputs.h"
-#include "../../../Container/Parameters.h"
 /*}}}*/ 
 

issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Parameters.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Inputs.h"
-#include "../../../Container/Parameters.h"
 
 /*Matdamageice constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Materials/Material.h

@@ -12 +12 @@
 #include "../Object.h"
 #include "../../Update.h"
+class Elements;
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../classes.h"
-#include "../../../shared/Enum/Enum.h"
+#include "./Matice.h"
+#include "./Materials.h"
+#include "../Inputs/Input.h"
+#include "../Inputs/Inputs.h"
+#include "../Inputs/TriaP1Input.h"
+#include "../Inputs/PentaP1Input.h"
+#include "../Inputs/ControlInput.h"
+#include "../Elements/Element.h"
+#include "../Elements/Tria.h"
+#include "../Elements/Penta.h"
+#include "../Params/Parameters.h"
+#include "../../Hook.h"
+#include "../Node.h"
+#include "../../IoModel.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Inputs.h"
-#include "../../../Container/Parameters.h"
 
 /*Matice constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Materials/Matice.h

@@ -9 +9 @@
 /*{{{*/
 #include "./Material.h"
+#include "../../Hook.h"
 class IoModel;
+                
+class Elements;
+class Loads;
+class Nodes;
+class Vertices;
+class Materials;
+class Parameters;
+
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Node.cpp

@@ -13 +13 @@
 #include <string.h>
 #include "./objects.h"
-#include "../../Container/Container.h"
 #include "../../shared/Enum/Enum.h"
 #include "../../shared/shared.h"

issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.cpp

@@ -15 +15 @@
 #include "../objects.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp

@@ -14 +14 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 
 /*DoubleParam constructors and destructor*/

issm/trunk-jpl/src/c/classes/objects/Params/DoubleTransientMatParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp

@@ -16 +16 @@
 #include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp

@@ -14 +14 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../../shared/Enum/Enum.h"
 #include "../../../shared/shared.h"
-#include "../../../Container/Container.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/Profiler.cpp

@@ -11 +11 @@
 
 #include "./Profiler.h"
+#include "./Params/Parameters.h"
 #include "./Params/DoubleParam.h"
-#include "../../Container/Parameters.h"
 #include "../../toolkits/toolkits.h"
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Vertex.cpp

@@ -13 +13 @@
 #include "../classes.h"
 #include "../../shared/shared.h"
-#include "../../Container/Parameters.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/objects.h

@@ -8 +8 @@
 /*Abstract classes: */
 #include "./Object.h"
+#include "./DataSet.h"
 
 /*Objects: */
 #include "./Contour.h"
+#include "./Vertices.h"
 #include "./Vertex.h"
+#include "./Nodes.h"
 #include "./Node.h"
 #include "./Profiler.h"
@@ -20 +23 @@
 
 /*Constraints: */
+#include "./Constraints/Constraints.h"
 #include "./Constraints/Constraint.h"
 #include "./Constraints/SpcStatic.h"
@@ -26 +30 @@
 
 /*Loads: */
+#include "./Loads/Loads.h"
 #include "./Loads/Load.h"
 #include "./Loads/Friction.h"
@@ -35 +40 @@
 
 /*Elements: */
+#include "./Elements/Elements.h"
 #include "./Elements/Element.h"
 #include "./Elements/Penta.h"
@@ -74 +80 @@
 /*Option parsing objects: */
 #include "./Options/Option.h"
+#include "./Options/Options.h"
 #include "./Options/GenericOption.h"
 #include "./Options/OptionUtilities.h"
 
 /*Inputs: */
+#include "./Inputs/Inputs.h"
 #include "./Inputs/Input.h"
 #include "./Inputs/BoolInput.h"
@@ -96 +104 @@
 
 /*ExternalResults: */
+#include "./ExternalResults/Results.h"
 #include "./ExternalResults/ExternalResult.h"
 #include "./ExternalResults/GenericExternalResult.h"
 
 /*Materials: */
+#include "./Materials/Materials.h"
 #include "./Materials/Material.h"
 #include "./Materials/Matice.h"
@@ -117 +127 @@
 #include "./Params/IntMatParam.h"
 #include "./Params/FileParam.h"
+#include "./Params/Parameters.h"
 #include "./Params/Param.h"
 #include "./Params/MatrixParam.h"

issm/trunk-jpl/src/c/main/issm.h

@@ -15 +15 @@
 #include "../shared/shared.h"
 #include "../classes/classes.h"
-#include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

@@ -11 +11 @@
 
 #include "./AverageOntoPartitionx.h"
-#include "../../Container/Container.h"    
 #include "../../shared/shared.h"
 #include "../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 void AverageOntoPartitionx(double** average, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response);

issm/trunk-jpl/src/c/modules/Chacox/Chacox.h

@@ -32 +32 @@
 #endif
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h

@@ -6 +6 @@
 #define _CONFIGUREOBJECTSX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h

@@ -6 +6 @@
 #define _CONSTRAINTSSTATELOCAL_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.h

@@ -6 +6 @@
 #define _CONSTRAINTSSTATEX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 void    ControlInputGetGradientx( Vector<IssmDouble>** pgradient, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);

issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 void    ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,IssmDouble* norm_list,int step);

issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 void    ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,double* gradient);

issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h

@@ -5 +5 @@
 #define _CREATENODALCONSTRAINTSX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.h

@@ -6 +6 @@
 #define _DELTA18OPARAMETERIZATIONX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h

@@ -6 +6 @@
 #define _DRAGCOEFFABSGRADX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.h

@@ -7 +7 @@
 
 #include <string.h>
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.h

@@ -7 +7 @@
 
 #include <float.h>    /*  DBL_MAX  */
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.h

@@ -7 +7 @@
 
 #include "../../classes/classes.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.h

@@ -6 +6 @@
 #define _GRADJX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 #include "../../shared/Enum/Enum.h"
-#include "../../Container/Container.h"
 #include "../../classes/classes.h"
 #include "./GroundinglineMigrationx.h"

issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputControlUpdatex/InputControlUpdatex.h

@@ -6 +6 @@
 #define _INPUTCONTROLUPDATEX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.h

@@ -5 +5 @@
 #define _INPUTCONVERGENCEX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.h

@@ -6 +6 @@
 #define _INPUTDUPLICATEX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.h

@@ -6 +6 @@
 #define _SCALEINPUTX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputToResultx/InputToResultx.h

@@ -6 +6 @@
 #define _INPUTTORESULTX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 void  InputUpdateFromDakotax(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials*  materials,Parameters* parameters,double* variables,char* *variables_descriptors,int numvariables);

issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 using namespace bamg;

issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h

@@ -5 +5 @@
 #define _IOMODEL_TO_CONSTRAINTS_H_
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.h

@@ -7 +7 @@
 
 #include <float.h>    /*  DBL_MAX  */
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.h

@@ -7 +7 @@
 
 #include <float.h>    /*  DBL_MAX  */
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.h

@@ -7 +7 @@
 
 #include <float.h>    /*  DBL_MAX  */
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.h

@@ -7 +7 @@
 
 #include <float.h>    /*  DBL_MAX  */
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

@@ -6 +6 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
-#include "../../classes/objects/objects.h"
-#include "../../Container/Observations.h"
+#include "../../classes/classes.h"
 #include "../modules.h"
 #ifdef _HAVE_GSL_

issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 #include "../../shared/io/io.h"
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

@@ -1 @@
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -3 +3 @@
  */
 
-#include "../../Container/Container.h"
 #include "../../toolkits/toolkits.h"
 #include "../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -9 +9 @@
 #endif
 
-#include "../../Container/Container.h"
 #include "../../toolkits/toolkits.h"
 #include "../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -8 +8 @@
 #endif
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp

@@ -3 +3 @@
  */ 
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -12 +12 @@
 #include "../../shared/shared.h"
 #include "../../shared/io/io.h"
-#include "../../Container/Container.h"
 #include "../../shared/Enum/Enum.h"
 #include "./ModelProcessorx.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -8 +8 @@
 #define RIFTINFOSIZE 12
 
-#include "../../Container/Container.h"
 #include "../../classes/classes.h"
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -1 @@
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/Enum/Enum.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../shared/io/io.h"
 #include "../../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -2 +2 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -3 +3 @@
  */
 
-#include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../shared/io/io.h"

issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.h

@@ -6 +6 @@
 #define _NODALVALUEX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.h

@@ -6 +6 @@
 #define _NODESDOFX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -12 +12 @@
 #include <stdio.h>
 #include "./OutputResultsx.h"
-#include "../../Container/Container.h"
 #include "../../shared/io/io.h"
 #include "../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h

@@ -12 +12 @@
 #endif
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads,  Materials* materials, Parameters* parameters, Results* results);

issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.h

@@ -6 +6 @@
 #define _OUTPUTRIFTSX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h

@@ -6 +6 @@
 #define _PARSEPETSCOPTIONSX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.h

@@ -6 +6 @@
 #define _POSITIVEDEGREEDAYX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h

@@ -5 +5 @@
 #define _PROPAGATEFLAGSFROMCONNECTIVITYX_H
 
-#include "../../Container/Container.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.h

@@ -8 +8 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Parameters.h"
-#include "../../Container/Nodes.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/Reducevectorgtosx/Reducevectorgtosx.h

@@ -8 +8 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h

@@ -6 +6 @@
 #define _RESETCONSTRAINTSX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ResetCoordinateSystemx/ResetCoordinateSystemx.h

@@ -6 +6 @@
 #define _RESETCOORDINATESYSTEMX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h

@@ -6 +6 @@
 #define _RHEOLOGYBBARGRADIENTX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.h

@@ -17 +17 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h

@@ -6 +6 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.h

@@ -18 +18 @@
 #endif
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.h

@@ -18 +18 @@
 #endif
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.h

@@ -6 +6 @@
 #define _SMBGRADIENTSX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 #include "../../toolkits/toolkits.h"
 

issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h

@@ -6 +6 @@
 #define _SURFACEABSVELMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.h

@@ -7 +7 @@
 
 #include "../../classes/objects/objects.h"
-#include "../../Container/Container.h"
 
 /* local prototypes: */

issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h

@@ -6 +6 @@
 #define _SURFACEAVERAGEVELMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h

@@ -6 +6 @@
 #define _SURFACELOGVELMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h

@@ -6 +6 @@
 #define _SURFACELOGVXVYMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h

@@ -6 +6 @@
 #define _SURFACERELVELMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h

@@ -6 +6 @@
 #define _THICKNESSABSMISFITX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h

@@ -6 +6 @@
 #define _THICKNESSACROSSGRADIENT_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h

@@ -6 +6 @@
 #define _THICKNESSALONGGRADIENT_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.h

@@ -7 +7 @@
 
 #include <string.h>
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h

@@ -6 +6 @@
 #define _UPDATEDYNAMICCONSTRAINTSXX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.h

@@ -6 +6 @@
 #define _VECMERGEX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.h

@@ -5 +5 @@
 #define _VERTEX_COORDINATESX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.h

@@ -6 +6 @@
 #define _VERTICESDOFX_H
 
-#include "../../Container/Container.h"
 #include "../../classes/objects/objects.h"
 

issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp

@@ -13 +13 @@
 #include "../../classes/classes.h"
 #include "../../shared/io/io.h"
-#include "../../Container/Parameters.h"
 
 #ifdef _HAVE_GSL_

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

@@ -20 +20 @@
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../Container/DataSet.h"
 #include "../../shared/io/Comm/Comm.h"
+#include "../../classes/objects/DataSet.h"
 #include "../../classes/objects/Bucket.h"
 #include "../mumps/mumpsincludes.h"

issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Chaco/Chaco.h

@@ -24 +24 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h

@@ -22 +22 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h

@@ -22 +22 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h

@@ -22 +22 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

@@ -22 +22 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h

@@ -25 +25 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Scotch/Scotch.h

@@ -12 +12 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
     

issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h

@@ -22 +22 @@
 #include "../../c/toolkits/toolkits.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/io/io.h"

issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/TriaSearch/TriaSearch.h

@@ -19 +19 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.h

@@ -20 +20 @@
 #include "../../c/main/globals.h"
 #include "../../c/modules/modules.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

@@ -10 +10 @@
 
 #include "./matlabio.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -14 +14 @@
 #include "../include/matlabincludes.h"
 #include "../../c/classes/classes.h"
-#include "../../c/Container/Container.h"
 #include "../../c/toolkits/toolkits.h"
 

issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp

@@ -13 +13 @@
 
 #include "./pythonio.h"
-#include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
 #include "../../c/shared/Enum/Enum.h"

issm/trunk-jpl/src/wrappers/python/io/pythonio.h

@@ -14 +14 @@
 #include "../include/pythonincludes.h"
 #include "../../c/classes/classes.h"
-#include "../../c/Container/Container.h"
 
 void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);