Changeset 12832

Timestamp:

07/30/12 19:05:56 (13 years ago)

Author:

Eric.Larour

Message:

Almost done migrating objects to classes

Location:

issm/trunk-jpl

Files:

• externalpackages/ipython/install.sh (modified) (1 diff)
• externalpackages/python/install-2.7.2-macosx-lion.sh (modified) (2 diffs)
• externalpackages/python/patches/pyport.h.patch (modified) (1 diff)
• src/c/Container/DataSet.cpp (modified) (1 diff)
• src/c/Container/DataSet.h (modified) (1 diff)
• src/c/Makefile.am (modified) (7 diffs)
• src/c/classes/DofIndexing.cpp (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/classes/FemModel.h (modified) (1 diff)
• src/c/classes/Hook.cpp (modified) (1 diff)
• src/c/classes/Hook.h (modified) (1 diff)
• src/c/classes/IoModel.cpp (modified) (1 diff)
• src/c/classes/Patch.cpp (modified) (1 diff)
• src/c/classes/bamg/BamgQuadtree.h (modified) (1 diff)
• src/c/classes/bamg/bamgobjects.h (added)
• src/c/classes/classes.h (added)
• src/c/classes/dakota/DakotaPlugin.h (modified) (1 diff)
• src/c/classes/gauss/GaussPenta.cpp (modified) (1 diff)
• src/c/classes/gauss/GaussTria.cpp (modified) (1 diff)
• src/c/classes/gauss/gaussobjects.h (added)
• src/c/classes/kriging/GaussianVariogram.h (modified) (1 diff)
• src/c/classes/kriging/Observation.h (modified) (1 diff)
• src/c/classes/kriging/Variogram.h (modified) (1 diff)
• src/c/classes/kriging/krigingobjects.h (added)
• src/c/classes/matrix/ElementMatrix.cpp (modified) (1 diff)
• src/c/classes/matrix/ElementMatrix.h (modified) (1 diff)
• src/c/classes/matrix/ElementVector.cpp (modified) (1 diff)
• src/c/classes/matrix/ElementVector.h (modified) (1 diff)
• src/c/classes/matrix/Matrix.cpp (modified) (1 diff)
• src/c/classes/matrix/Vector.cpp (modified) (1 diff)
• src/c/classes/matrix/matrixobjects.h (added)
• src/c/classes/objects/Constraints/Constraint.h (modified) (1 diff)
• src/c/classes/objects/Constraints/SpcDynamic.cpp (modified) (1 diff)
• src/c/classes/objects/Constraints/SpcStatic.cpp (modified) (1 diff)
• src/c/classes/objects/Constraints/SpcTransient.cpp (modified) (1 diff)
• src/c/classes/objects/Contour.cpp (modified) (1 diff)
• src/c/classes/objects/Contour.h (modified) (1 diff)
• src/c/classes/objects/ElementResults/BoolElementResult.cpp (modified) (1 diff)
• src/c/classes/objects/ElementResults/BoolElementResult.h (modified) (1 diff)
• src/c/classes/objects/ElementResults/DoubleElementResult.cpp (modified) (1 diff)
• src/c/classes/objects/ElementResults/DoubleElementResult.h (modified) (1 diff)
• src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (modified) (1 diff)
• src/c/classes/objects/ElementResults/PentaP1ElementResult.h (modified) (1 diff)
• src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (modified) (1 diff)
• src/c/classes/objects/ElementResults/TriaP1ElementResult.h (modified) (1 diff)
• src/c/classes/objects/Elements/Element.h (modified) (1 diff)
• src/c/classes/objects/Elements/Penta.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/Penta.h (modified) (1 diff)
• src/c/classes/objects/Elements/PentaHook.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/PentaRef.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/Tria.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/Tria.h (modified) (1 diff)
• src/c/classes/objects/Elements/TriaHook.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/TriaRef.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/BoolExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/BoolExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleMatExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleVecExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/DoubleVecExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/IntExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/IntExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/PetscVecExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/PetscVecExternalResult.h (modified) (1 diff)
• src/c/classes/objects/ExternalResults/StringExternalResult.cpp (modified) (1 diff)
• src/c/classes/objects/ExternalResults/StringExternalResult.h (modified) (1 diff)
• src/c/classes/objects/Inputs/BoolInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/BoolInput.h (modified) (1 diff)
• src/c/classes/objects/Inputs/ControlInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/ControlInput.h (modified) (1 diff)
• src/c/classes/objects/Inputs/DatasetInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/DatasetInput.h (modified) (1 diff)
• src/c/classes/objects/Inputs/DoubleInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/DoubleInput.h (modified) (1 diff)
• src/c/classes/objects/Inputs/IntInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/IntInput.h (modified) (1 diff)
• src/c/classes/objects/Inputs/PentaP1Input.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/TransientInput.cpp (modified) (1 diff)
• src/c/classes/objects/Inputs/TriaP1Input.cpp (modified) (1 diff)
• src/c/classes/objects/KML/KMLFileReadUtils.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Attribute.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_ColorStyle.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Comment.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Container.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Document.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Feature.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_File.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Folder.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Geometry.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_GroundOverlay.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Icon.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_LatLonBox.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_LineString.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_LineStyle.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_LinearRing.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_MultiGeometry.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Object.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Overlay.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Placemark.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Point.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_PolyStyle.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Polygon.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Style.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_StyleSelector.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_SubStyle.h (modified) (1 diff)
• src/c/classes/objects/KML/KML_Unknown.h (modified) (1 diff)
• src/c/classes/objects/Loads/Friction.cpp (modified) (1 diff)
• src/c/classes/objects/Loads/Icefront.cpp (modified) (1 diff)
• src/c/classes/objects/Loads/Load.h (modified) (1 diff)
• src/c/classes/objects/Loads/Numericalflux.cpp (modified) (1 diff)
• src/c/classes/objects/Loads/Pengrid.cpp (modified) (1 diff)
• src/c/classes/objects/Loads/Penpair.cpp (modified) (1 diff)
• src/c/classes/objects/Loads/Riftfront.cpp (modified) (1 diff)
• src/c/classes/objects/Materials/Material.h (modified) (1 diff)
• src/c/classes/objects/Materials/Matice.cpp (modified) (1 diff)
• src/c/classes/objects/Materials/Matpar.cpp (modified) (1 diff)
• src/c/classes/objects/Node.cpp (modified) (1 diff)
• src/c/classes/objects/Node.h (modified) (2 diffs)
• src/c/classes/objects/Options/Option.cpp (modified) (1 diff)
• src/c/classes/objects/Options/Option.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionCell.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionCell.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionChar.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionChar.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionDouble.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionDouble.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionLogical.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionLogical.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionStruct.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionStruct.h (modified) (1 diff)
• src/c/classes/objects/Options/OptionUtilities.cpp (modified) (1 diff)
• src/c/classes/objects/Options/OptionUtilities.h (modified) (1 diff)
• src/c/classes/objects/Params/BoolParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/BoolParam.h (modified) (1 diff)
• src/c/classes/objects/Params/DoubleMatArrayParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/DoubleMatArrayParam.h (modified) (1 diff)
• src/c/classes/objects/Params/DoubleMatParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/DoubleMatParam.h (modified) (1 diff)
• src/c/classes/objects/Params/DoubleParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/DoubleParam.h (modified) (1 diff)
• src/c/classes/objects/Params/DoubleTransientMatParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/DoubleTransientMatParam.h (modified) (1 diff)
• src/c/classes/objects/Params/DoubleVecParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/DoubleVecParam.h (modified) (1 diff)
• src/c/classes/objects/Params/FileParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/FileParam.h (modified) (1 diff)
• src/c/classes/objects/Params/IntMatParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/IntMatParam.h (modified) (1 diff)
• src/c/classes/objects/Params/IntParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/IntParam.h (modified) (1 diff)
• src/c/classes/objects/Params/IntVecParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/IntVecParam.h (modified) (1 diff)
• src/c/classes/objects/Params/MatrixParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/MatrixParam.h (modified) (1 diff)
• src/c/classes/objects/Params/StringArrayParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/StringArrayParam.h (modified) (1 diff)
• src/c/classes/objects/Params/StringParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/StringParam.h (modified) (1 diff)
• src/c/classes/objects/Params/TransientParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/TransientParam.h (modified) (1 diff)
• src/c/classes/objects/Params/VectorParam.cpp (modified) (1 diff)
• src/c/classes/objects/Params/VectorParam.h (modified) (1 diff)
• src/c/classes/objects/Segment.cpp (modified) (1 diff)
• src/c/classes/objects/Vertex.cpp (modified) (1 diff)
• src/c/classes/objects/Vertex.h (modified) (1 diff)
• src/c/classes/objects/objects.h (added)
• src/c/io/Disk/diskio.h (modified) (1 diff)
• src/c/modules/AddExternalResultx/AddExternalResultx.cpp (modified) (1 diff)
• src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h (modified) (1 diff)
• src/c/modules/BamgConvertMeshx/BamgConvertMeshx.cpp (modified) (1 diff)
• src/c/modules/BamgConvertMeshx/BamgConvertMeshx.h (modified) (1 diff)
• src/c/modules/BamgTriangulatex/BamgTriangulatex.cpp (modified) (1 diff)
• src/c/modules/BamgTriangulatex/BamgTriangulatex.h (modified) (1 diff)
• src/c/modules/Bamgx/Bamgx.cpp (modified) (1 diff)
• src/c/modules/Bamgx/Bamgx.h (modified) (1 diff)
• src/c/modules/Chacox/Chacox.h (modified) (1 diff)
• src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h (modified) (1 diff)
• src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h (modified) (1 diff)
• src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h (modified) (1 diff)
• src/c/modules/ConstraintsStatex/ConstraintsStatex.h (modified) (1 diff)
• src/c/modules/ContourToMeshx/ContourToMeshx.h (modified) (1 diff)
• src/c/modules/ContourToNodesx/ContourToNodesx.h (modified) (1 diff)
• src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.h (modified) (1 diff)
• src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h (modified) (1 diff)
• src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.h (modified) (1 diff)
• src/c/modules/CostFunctionx/CostFunctionx.h (modified) (1 diff)
• src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.h (modified) (1 diff)
• src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h (modified) (1 diff)
• src/c/modules/DakotaResponsesx/DakotaResponsesx.h (modified) (1 diff)
• src/c/modules/Dakotax/Dakotax.h (modified) (1 diff)
• src/c/modules/Dakotax/SpawnCore.cpp (modified) (1 diff)
• src/c/modules/Dakotax/SpawnCoreParallel.cpp (modified) (1 diff)
• src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.h (modified) (1 diff)
• src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h (modified) (1 diff)
• src/c/modules/ElementResponsex/ElementResponsex.h (modified) (1 diff)
• src/c/modules/Exp2Kmlx/Exp2Kmlx.h (modified) (1 diff)
• src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (modified) (1 diff)
• src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (modified) (1 diff)
• src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (modified) (1 diff)
• src/c/modules/Gradjx/Gradjx.h (modified) (1 diff)
• src/c/modules/IceVolumex/IceVolumex.h (modified) (1 diff)
• src/c/modules/InputArtificialNoisex/InputArtificialNoisex.h (modified) (1 diff)
• src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (modified) (1 diff)
• src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (modified) (1 diff)
• src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h (modified) (1 diff)
• src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (modified) (1 diff)
• src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h (modified) (1 diff)
• src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h (modified) (1 diff)
• src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (modified) (1 diff)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (modified) (1 diff)
• src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.h (modified) (1 diff)
• src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (1 diff)
• src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h (modified) (1 diff)
• src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.h (modified) (1 diff)
• src/c/modules/KMLFileReadx/KMLFileReadx.h (modified) (1 diff)
• src/c/modules/KMLMeshWritex/KMLMeshWritex.h (modified) (1 diff)
• src/c/modules/KMLOverlayx/KMLOverlayx.h (modified) (1 diff)
• src/c/modules/Kml2Expx/Kml2Expx.h (modified) (1 diff)
• src/c/modules/Krigingx/Krigingx.cpp (modified) (1 diff)
• src/c/modules/Krigingx/Krigingx.h (modified) (1 diff)
• src/c/modules/Krigingx/pKrigingx.cpp (modified) (1 diff)
• src/c/modules/MassFluxx/MassFluxx.h (modified) (1 diff)
• src/c/modules/MaxAbsVxx/MaxAbsVxx.h (modified) (1 diff)
• src/c/modules/MaxAbsVyx/MaxAbsVyx.h (modified) (1 diff)
• src/c/modules/MaxAbsVzx/MaxAbsVzx.h (modified) (1 diff)
• src/c/modules/MaxVelx/MaxVelx.h (modified) (1 diff)
• src/c/modules/MaxVxx/MaxVxx.h (modified) (1 diff)
• src/c/modules/MaxVyx/MaxVyx.h (modified) (1 diff)
• src/c/modules/MaxVzx/MaxVzx.h (modified) (1 diff)
• src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h (modified) (1 diff)
• src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h (modified) (1 diff)
• src/c/modules/MinVelx/MinVelx.h (modified) (1 diff)
• src/c/modules/MinVxx/MinVxx.h (modified) (1 diff)
• src/c/modules/MinVyx/MinVyx.h (modified) (1 diff)
• src/c/modules/MinVzx/MinVzx.h (modified) (1 diff)
• src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/NodesPartitioning.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/SortDataSets.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/UpdateCounters.cpp (modified) (1 diff)
• src/c/modules/NodalValuex/NodalValuex.h (modified) (1 diff)
• src/c/modules/NodesDofx/NodesDofx.h (modified) (1 diff)
• src/c/modules/Orthx/Orthx.h (modified) (1 diff)
• src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.h (modified) (1 diff)
• src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.h (modified) (1 diff)
• src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.h (modified) (1 diff)
• src/c/modules/Reduceloadx/Reduceloadx.h (modified) (1 diff)
• src/c/modules/Reducevectorgtofx/Reducevectorgtofx.h (modified) (1 diff)
• src/c/modules/Reducevectorgtosx/Reducevectorgtosx.h (modified) (1 diff)
• src/c/modules/ResetConstraintsx/ResetConstraintsx.h (modified) (1 diff)
• src/c/modules/ResetCoordinateSystemx/ResetCoordinateSystemx.h (modified) (1 diff)
• src/c/modules/Responsex/Responsex.h (modified) (1 diff)
• src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h (modified) (1 diff)
• src/c/modules/Scotchx/Scotchx.h (modified) (1 diff)
• src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.h (modified) (1 diff)
• src/c/modules/Shp2Kmlx/Shp2Kmlx.h (modified) (1 diff)
• src/c/modules/SmbGradientsx/SmbGradientsx.h (modified) (1 diff)
• src/c/modules/SmearFunctionx/SmearFunctionx.h (modified) (1 diff)
• src/c/modules/Solverx/Solverx.h (modified) (1 diff)
• src/c/modules/SpcNodesx/SpcNodesx.h (modified) (1 diff)
• src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h (modified) (1 diff)
• src/c/modules/SurfaceAreax/SurfaceAreax.h (modified) (1 diff)
• src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h (modified) (1 diff)
• src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h (modified) (1 diff)
• src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h (modified) (1 diff)
• src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h (modified) (1 diff)
• src/c/modules/SystemMatricesx/SystemMatricesx.h (modified) (1 diff)
• src/c/modules/ThicknessAbsGradientx/ThicknessAbsGradientx.h (modified) (1 diff)
• src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h (modified) (1 diff)
• src/c/modules/TimeAdaptx/TimeAdaptx.h (modified) (1 diff)
• src/c/modules/TotalSmbx/TotalSmbx.h (modified) (1 diff)
• src/c/modules/TriMeshx/TriMeshx.h (modified) (1 diff)
• src/c/modules/TriaSearchx/TriaSearchx.cpp (modified) (1 diff)
• src/c/modules/TriaSearchx/TriaSearchx.h (modified) (1 diff)
• src/c/modules/UpdateConstraintsx/UpdateConstraintsx.h (modified) (1 diff)
• src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (modified) (1 diff)
• src/c/modules/VecMergex/VecMergex.h (modified) (1 diff)
• src/c/modules/VerticesDofx/VerticesDofx.h (modified) (1 diff)
• src/c/shared/Alloc/alloc.cpp (modified) (1 diff)
• src/c/shared/Alloc/alloc_module.cpp (modified) (1 diff)
• src/c/shared/Bamg/OppositeAngle.h (modified) (1 diff)
• src/c/shared/Bamg/det.h (modified) (1 diff)
• src/c/shared/Elements/elements.h (modified) (1 diff)
• src/c/shared/Exp/exp.h (modified) (1 diff)
• src/c/shared/Numerics/BrentSearch.cpp (modified) (1 diff)
• src/c/shared/Numerics/IsInputConverged.cpp (modified) (1 diff)
• src/c/shared/Numerics/OptimalSearch.cpp (modified) (1 diff)
• src/c/shared/Numerics/OptionsFromAnalysis.cpp (modified) (1 diff)
• src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp (modified) (1 diff)
• src/c/shared/Numerics/UnitConversion.cpp (modified) (1 diff)
• src/c/shared/Wrapper/wrappershared.h (modified) (1 diff)
• src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• src/c/solutions/AnalysisConfiguration.cpp (modified) (1 diff)
• src/c/solutions/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• src/c/solutions/ResetBoundaryConditions.cpp (modified) (1 diff)
• src/c/solutions/adjointbalancethickness_core.cpp (modified) (1 diff)
• src/c/solutions/adjointdiagnostic_core.cpp (modified) (1 diff)
• src/c/solutions/balancethickness_core.cpp (modified) (1 diff)
• src/c/solutions/bedslope_core.cpp (modified) (1 diff)
• src/c/solutions/control_core.cpp (modified) (1 diff)
• src/c/solutions/controlconvergence.cpp (modified) (1 diff)
• src/c/solutions/controltao_core.cpp (modified) (1 diff)
• src/c/solutions/convergence.cpp (modified) (1 diff)
• src/c/solutions/diagnostic_core.cpp (modified) (1 diff)
• src/c/solutions/enthalpy_core.cpp (modified) (1 diff)
• src/c/solutions/gradient_core.cpp (modified) (1 diff)
• src/c/solutions/hydrology_core.cpp (modified) (1 diff)
• src/c/solutions/hydrology_core_step.cpp (modified) (1 diff)
• src/c/solutions/objectivefunction.cpp (modified) (1 diff)
• src/c/solutions/prognostic_core.cpp (modified) (1 diff)
• src/c/solutions/solutions.h (modified) (1 diff)
• src/c/solutions/steadystate_core.cpp (modified) (1 diff)
• src/c/solutions/steadystateconvergence.cpp (modified) (1 diff)
• src/c/solutions/surfaceslope_core.cpp (modified) (1 diff)
• src/c/solutions/thermal_core.cpp (modified) (1 diff)
• src/c/solutions/transient_core.cpp (modified) (1 diff)
• src/c/solvers/solver_adjoint_linear.cpp (modified) (1 diff)
• src/c/solvers/solver_linear.cpp (modified) (1 diff)
• src/c/solvers/solver_newton.cpp (modified) (1 diff)
• src/c/solvers/solver_nonlinear.cpp (modified) (1 diff)
• src/c/solvers/solver_stokescoupling_nonlinear.cpp (modified) (1 diff)
• src/c/solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)
• src/c/solvers/solvers.h (modified) (1 diff)

issm/trunk-jpl/externalpackages/ipython/install.sh

@@ -3 +3 @@
 #Some cleanup
 rm -rf src
-rm -rf install
 rm -rf ipython-0.12
-mkdir src install
+mkdir src 
 
 #Download from ISSM server

issm/trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh

@@ -22 +22 @@
  --enable-framework="$ISSM_DIR/externalpackages/python/install/Library/Frameworks" 
 
-#obsolete? 
-#./configure --prefix="$ISSM_DIR/externalpackages/python/install" --enable-framework="$ISSM_DIR/externalpackages/python/install"
 
 #make
@@ -37 +35 @@
 ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
 
-#Patch pyport.h:
-cd include
-patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch
+#Some modifications to be done in case version is 2.7
+if [[ $version == "2.7.2" ]]; then 
+        cd ../install
+        #get rid of bin, because it's just a copy of Library/Frameworks/Python.framework/Versions/2.7/bin, and will not reflect new changes being made
+        rm -rf bin
+        ln -s Library/Frameworks/Python.framework/Headers include
+        ln -s Library/Frameworks/Python.framework/Versions/2.7/lib lib
+        ln -s Library/Frameworks/Python.framework/Versions/2.7/bin bin
+
+        #Patch pyport.h:
+        cd include
+        patch pyport.h $ISSM_DIR/externalpackages/python/patches/pyport.h.patch
+fi

issm/trunk-jpl/externalpackages/python/patches/pyport.h.patch

@@ -1 @@
-Index: Include/pyport.h
-===================================================================
---- Include/pyport.h (revision 933)
-+++ Include/pyport.h (working copy)
-@@ -514,22 +514,40 @@
-#if __FreeBSD_version > 500039
-#include <ctype.h>
-#include <wctype.h>
-+/* If the source file #includes <cctype> before "Python.h" then
-+ * these macros will not be defined at this point and we
-+ * should not define them either.
-+ */
-+#ifdef isalnum
-#undef isalnum
-#define isalnum(c) iswalnum(btowc(c))
-+#endif
-+#ifdef isalpha
-#undef isalpha
-#define isalpha(c) iswalpha(btowc(c))
-+#endif
-+#ifdef islower
-#undef islower
-#define islower(c) iswlower(btowc(c))
-+#endif
-+#ifdef isspace
-#undef isspace
-#define isspace(c) iswspace(btowc(c))
-+#endif
-+#ifdef isupper
-#undef isupper
-#define isupper(c) iswupper(btowc(c))
-+#endif
-+#ifdef tolower
-#undef tolower
-#define tolower(c) towlower(btowc(c))
-+#endif
-+#ifdef toupper
-#undef toupper
-#define toupper(c) towupper(btowc(c))
-#endif
-#endif
-+#endif
+680a681
+> #ifdef isalnum
+682a684,685
+> #endif
+> #ifdef isalpha
+684a688,689
+> #endif
+> #ifdef islower
+686a692,693
+> #endif
+> #ifdef isspace
+688a696,697
+> #endif
+> #ifdef isupper
+690a700,701
+> #endif
+> #ifdef tolower
+692a704,705
+> #endif
+> #ifdef toupper
+695a709
+> #endif

issm/trunk-jpl/src/c/Container/DataSet.cpp

@@ -18 +18 @@
 
 #include "./DataSet.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/Container/DataSet.h

@@ -7 +7 @@
 
 #include <vector>
-#include "../objects/Object.h"
+#include "../classes/objects/Object.h"
 #include "../toolkits/toolkits.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

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

@@ -28 +28 @@
                                         ./include/types.h\
                                         ./include/include.h\
-                                        ./objects/objects.h\
-                                        ./objects/Object.h\
-                                        ./objects/Gauss/GaussTria.h\
-                                        ./objects/Gauss/GaussTria.cpp\
-                                        ./objects/Update.h\
-                                        ./objects/Element.h\
-                                        ./objects/FemModel.h\
-                                        ./objects/FemModel.cpp\
-                                        ./objects/Material.h\
-                                        ./objects/Load.h\
-                                        ./objects/Contour.h\
-                                        ./objects/Contour.cpp\
-                                        ./objects/OptArgs.h\
-                                        ./objects/OptPars.h\
-                                        ./objects/Loads/Friction.h\
-                                        ./objects/Loads/Friction.cpp\
-                                        ./objects/Inputs/TransientInput.h\
-                                        ./objects/Inputs/TransientInput.cpp\
-                                        ./objects/Constraints/SpcTransient.cpp\
-                                        ./objects/Constraints/SpcTransient.h\
-                                        ./objects/DofIndexing.h\
-                                        ./objects/DofIndexing.cpp\
-                                        ./objects/IoModel.h\
-                                        ./objects/IoModel.cpp\
-                                        ./objects/Node.h\
-                                        ./objects/Node.cpp\
-                                        ./objects/Segment.h\
-                                        ./objects/Segment.cpp\
-                                        ./objects/Vertex.h\
-                                        ./objects/Vertex.cpp\
-                                        ./objects/Hook.h\
-                                        ./objects/Hook.cpp\
-                                        ./objects/Patch.h\
-                                        ./objects/Patch.cpp\
-                                        ./objects/ElementResults/ElementResultLocal.h\
-                                        ./objects/ElementResults/DoubleElementResult.h\
-                                        ./objects/ElementResults/DoubleElementResult.cpp\
-                                        ./objects/ElementResults/TriaP1ElementResult.h\
-                                        ./objects/ElementResults/TriaP1ElementResult.cpp\
-                                        ./objects/ElementResults/BoolElementResult.h\
-                                        ./objects/ElementResults/BoolElementResult.cpp\
-                                        ./objects/ExternalResults/ExternalResult.h\
-                                        ./objects/ExternalResults/BoolExternalResult.h\
-                                        ./objects/ExternalResults/BoolExternalResult.cpp\
-                                        ./objects/ExternalResults/DoubleExternalResult.h\
-                                        ./objects/ExternalResults/DoubleExternalResult.cpp\
-                                        ./objects/ExternalResults/DoubleVecExternalResult.h\
-                                        ./objects/ExternalResults/DoubleVecExternalResult.cpp\
-                                        ./objects/ExternalResults/DoubleMatExternalResult.h\
-                                        ./objects/ExternalResults/DoubleMatExternalResult.cpp\
-                                        ./objects/ExternalResults/IntExternalResult.h\
-                                        ./objects/ExternalResults/IntExternalResult.cpp\
-                                        ./objects/ExternalResults/StringExternalResult.h\
-                                        ./objects/ExternalResults/StringExternalResult.cpp\
-                                        ./objects/Elements/Tria.h\
-                                        ./objects/Elements/Tria.cpp\
-                                        ./objects/Elements/TriaHook.h\
-                                        ./objects/Elements/TriaHook.cpp\
-                                        ./objects/Elements/TriaRef.h\
-                                        ./objects/Elements/TriaRef.cpp\
-                                        ./objects/Inputs/Input.h\
-                                        ./objects/Inputs/InputLocal.h\
-                                        ./objects/Inputs/TriaP1Input.h\
-                                        ./objects/Inputs/TriaP1Input.cpp\
-                                        ./objects/Inputs/BoolInput.h\
-                                        ./objects/Inputs/BoolInput.cpp\
-                                        ./objects/Inputs/IntInput.h\
-                                        ./objects/Inputs/IntInput.cpp\
-                                        ./objects/Inputs/DoubleInput.h\
-                                        ./objects/Inputs/DoubleInput.cpp\
-                                        ./objects/Inputs/DatasetInput.h\
-                                        ./objects/Inputs/DatasetInput.cpp\
-                                        ./objects/Materials/Matice.h\
-                                        ./objects/Materials/Matice.cpp\
-                                        ./objects/Materials/Matpar.h\
-                                        ./objects/Materials/Matpar.cpp\
-                                        ./objects/Constraints/Constraint.h\
-                                        ./objects/Constraints/SpcStatic.cpp\
-                                        ./objects/Constraints/SpcStatic.h\
-                                        ./objects/Constraints/SpcDynamic.cpp\
-                                        ./objects/Constraints/SpcDynamic.h\
-                                        ./objects/Loads/Penpair.cpp\
-                                        ./objects/Loads/Penpair.h\
-                                        ./objects/Loads/Pengrid.cpp\
-                                        ./objects/Loads/Pengrid.h\
-                                        ./objects/Loads/Icefront.cpp\
-                                        ./objects/Loads/Icefront.h\
-                                        ./objects/Loads/Numericalflux.cpp\
-                                        ./objects/Loads/Numericalflux.h\
-                                        ./objects/Numerics/ElementMatrix.h\
-                                        ./objects/Numerics/ElementMatrix.cpp\
-                                        ./objects/Numerics/ElementVector.h\
-                                        ./objects/Numerics/ElementVector.cpp\
-                                        ./objects/Numerics/Matrix.h\
-                                        ./objects/Numerics/Matrix.cpp\
-                                        ./objects/Numerics/Vector.h\
-                                        ./objects/Numerics/Vector.cpp\
-                                        ./objects/Params/Param.h\
-                                        ./objects/Params/BoolParam.cpp\
-                                        ./objects/Params/BoolParam.h\
-                                        ./objects/Params/IntParam.cpp\
-                                        ./objects/Params/IntParam.h\
-                                        ./objects/Params/IntVecParam.cpp\
-                                        ./objects/Params/IntVecParam.h\
-                                        ./objects/Params/IntMatParam.cpp\
-                                        ./objects/Params/IntMatParam.h\
-                                        ./objects/Params/DoubleParam.cpp\
-                                        ./objects/Params/DoubleParam.h\
-                                        ./objects/Params/FileParam.cpp\
-                                        ./objects/Params/FileParam.h\
-                                        ./objects/Params/StringArrayParam.cpp\
-                                        ./objects/Params/StringArrayParam.h\
-                                        ./objects/Params/DoubleMatParam.cpp\
-                                        ./objects/Params/DoubleMatParam.h\
-                                        ./objects/Params/DoubleTransientMatParam.cpp\
-                                        ./objects/Params/DoubleTransientMatParam.h\
-                                        ./objects/Params/DoubleMatArrayParam.cpp\
-                                        ./objects/Params/DoubleMatArrayParam.h\
-                                        ./objects/Params/DoubleVecParam.cpp\
-                                        ./objects/Params/DoubleVecParam.h\
-                                        ./objects/Params/StringParam.cpp\
-                                        ./objects/Params/StringParam.h\
-                                        ./objects/Params/MatrixParam.h\
-                                        ./objects/Params/MatrixParam.cpp\
-                                        ./objects/Params/VectorParam.h\
-                                        ./objects/Params/VectorParam.cpp\
-                                        ./objects/Params/TransientParam.h\
-                                        ./objects/Params/TransientParam.cpp\
+                                        ./classes/classes.h\
+                                        ./classes/objects.h\
+                                        ./classes/objects/Object.h\
+                                        ./classes/gauss/GaussTria.h\
+                                        ./classes/gauss/GaussTria.cpp\
+                                        ./classes/objects/Update.h\
+                                        ./classes/objects/Element.h\
+                                        ./classes/FemModel.h\
+                                        ./classes/FemModel.cpp\
+                                        ./classes/objects/Material.h\
+                                        ./classes/objects/Load.h\
+                                        ./classes/objects/Contour.h\
+                                        ./classes/objects/Contour.cpp\
+                                        ./classes/objects/OptArgs.h\
+                                        ./classes/objects/OptPars.h\
+                                        ./classes/objects/Loads/Friction.h\
+                                        ./classes/objects/Loads/Friction.cpp\
+                                        ./classes/objects/Inputs/TransientInput.h\
+                                        ./classes/objects/Inputs/TransientInput.cpp\
+                                        ./classes/objects/Constraints/SpcTransient.cpp\
+                                        ./classes/objects/Constraints/SpcTransient.h\
+                                        ./classes/DofIndexing.h\
+                                        ./classes/DofIndexing.cpp\
+                                        ./classes/IoModel.h\
+                                        ./classes/IoModel.cpp\
+                                        ./classes/objects/Node.h\
+                                        ./classes/objects/Node.cpp\
+                                        ./classes/objects/Segment.h\
+                                        ./classes/objects/Segment.cpp\
+                                        ./classes/objects/Vertex.h\
+                                        ./classes/objects/Vertex.cpp\
+                                        ./classes/Hook.h\
+                                        ./classes/Hook.cpp\
+                                        ./classes/Patch.h\
+                                        ./classes/Patch.cpp\
+                                        ./classes/objects/ElementResults/ElementResultLocal.h\
+                                        ./classes/objects/ElementResults/DoubleElementResult.h\
+                                        ./classes/objects/ElementResults/DoubleElementResult.cpp\
+                                        ./classes/objects/ElementResults/TriaP1ElementResult.h\
+                                        ./classes/objects/ElementResults/TriaP1ElementResult.cpp\
+                                        ./classes/objects/ElementResults/BoolElementResult.h\
+                                        ./classes/objects/ElementResults/BoolElementResult.cpp\
+                                        ./classes/objects/ExternalResults/ExternalResult.h\
+                                        ./classes/objects/ExternalResults/BoolExternalResult.h\
+                                        ./classes/objects/ExternalResults/BoolExternalResult.cpp\
+                                        ./classes/objects/ExternalResults/DoubleExternalResult.h\
+                                        ./classes/objects/ExternalResults/DoubleExternalResult.cpp\
+                                        ./classes/objects/ExternalResults/DoubleVecExternalResult.h\
+                                        ./classes/objects/ExternalResults/DoubleVecExternalResult.cpp\
+                                        ./classes/objects/ExternalResults/DoubleMatExternalResult.h\
+                                        ./classes/objects/ExternalResults/DoubleMatExternalResult.cpp\
+                                        ./classes/objects/ExternalResults/IntExternalResult.h\
+                                        ./classes/objects/ExternalResults/IntExternalResult.cpp\
+                                        ./classes/objects/ExternalResults/StringExternalResult.h\
+                                        ./classes/objects/ExternalResults/StringExternalResult.cpp\
+                                        ./classes/objects/Elements/Tria.h\
+                                        ./classes/objects/Elements/Tria.cpp\
+                                        ./classes/objects/Elements/TriaHook.h\
+                                        ./classes/objects/Elements/TriaHook.cpp\
+                                        ./classes/objects/Elements/TriaRef.h\
+                                        ./classes/objects/Elements/TriaRef.cpp\
+                                        ./classes/objects/Inputs/Input.h\
+                                        ./classes/objects/Inputs/InputLocal.h\
+                                        ./classes/objects/Inputs/TriaP1Input.h\
+                                        ./classes/objects/Inputs/TriaP1Input.cpp\
+                                        ./classes/objects/Inputs/BoolInput.h\
+                                        ./classes/objects/Inputs/BoolInput.cpp\
+                                        ./classes/objects/Inputs/IntInput.h\
+                                        ./classes/objects/Inputs/IntInput.cpp\
+                                        ./classes/objects/Inputs/DoubleInput.h\
+                                        ./classes/objects/Inputs/DoubleInput.cpp\
+                                        ./classes/objects/Inputs/DatasetInput.h\
+                                        ./classes/objects/Inputs/DatasetInput.cpp\
+                                        ./classes/objects/Materials/Matice.h\
+                                        ./classes/objects/Materials/Matice.cpp\
+                                        ./classes/objects/Materials/Matpar.h\
+                                        ./classes/objects/Materials/Matpar.cpp\
+                                        ./classes/objects/Constraints/Constraint.h\
+                                        ./classes/objects/Constraints/SpcStatic.cpp\
+                                        ./classes/objects/Constraints/SpcStatic.h\
+                                        ./classes/objects/Constraints/SpcDynamic.cpp\
+                                        ./classes/objects/Constraints/SpcDynamic.h\
+                                        ./classes/objects/Loads/Penpair.cpp\
+                                        ./classes/objects/Loads/Penpair.h\
+                                        ./classes/objects/Loads/Pengrid.cpp\
+                                        ./classes/objects/Loads/Pengrid.h\
+                                        ./classes/objects/Loads/Icefront.cpp\
+                                        ./classes/objects/Loads/Icefront.h\
+                                        ./classes/objects/Loads/Numericalflux.cpp\
+                                        ./classes/objects/Loads/Numericalflux.h\
+                                        ./classes/matrix/matrixobjects.h\
+                                        ./classes/matrix/ElementMatrix.h\
+                                        ./classes/matrix/ElementMatrix.cpp\
+                                        ./classes/matrix/ElementVector.h\
+                                        ./classes/matrix/ElementVector.cpp\
+                                        ./classes/matrix/Matrix.h\
+                                        ./classes/matrix/Matrix.cpp\
+                                        ./classes/matrix/Vector.h\
+                                        ./classes/matrix/Vector.cpp\
+                                        ./classes/objects/Params/Param.h\
+                                        ./classes/objects/Params/BoolParam.cpp\
+                                        ./classes/objects/Params/BoolParam.h\
+                                        ./classes/objects/Params/IntParam.cpp\
+                                        ./classes/objects/Params/IntParam.h\
+                                        ./classes/objects/Params/IntVecParam.cpp\
+                                        ./classes/objects/Params/IntVecParam.h\
+                                        ./classes/objects/Params/IntMatParam.cpp\
+                                        ./classes/objects/Params/IntMatParam.h\
+                                        ./classes/objects/Params/DoubleParam.cpp\
+                                        ./classes/objects/Params/DoubleParam.h\
+                                        ./classes/objects/Params/FileParam.cpp\
+                                        ./classes/objects/Params/FileParam.h\
+                                        ./classes/objects/Params/StringArrayParam.cpp\
+                                        ./classes/objects/Params/StringArrayParam.h\
+                                        ./classes/objects/Params/DoubleMatParam.cpp\
+                                        ./classes/objects/Params/DoubleMatParam.h\
+                                        ./classes/objects/Params/DoubleTransientMatParam.cpp\
+                                        ./classes/objects/Params/DoubleTransientMatParam.h\
+                                        ./classes/objects/Params/DoubleMatArrayParam.cpp\
+                                        ./classes/objects/Params/DoubleMatArrayParam.h\
+                                        ./classes/objects/Params/DoubleVecParam.cpp\
+                                        ./classes/objects/Params/DoubleVecParam.h\
+                                        ./classes/objects/Params/StringParam.cpp\
+                                        ./classes/objects/Params/StringParam.h\
+                                        ./classes/objects/Params/MatrixParam.h\
+                                        ./classes/objects/Params/MatrixParam.cpp\
+                                        ./classes/objects/Params/VectorParam.h\
+                                        ./classes/objects/Params/VectorParam.cpp\
+                                        ./classes/objects/Params/TransientParam.h\
+                                        ./classes/objects/Params/TransientParam.cpp\
                                         ./Container/Container.h\
                                         ./Container/Constraints.h\
@@ -345 +347 @@
                                         ./solvers/solver_nonlinear.cpp\
                                         ./solvers/solver_newton.cpp\
-                                        ./objects/Options/Option.cpp\
-                                        ./objects/Options/Option.h\
-                                        ./objects/Options/OptionDouble.cpp\
-                                        ./objects/Options/OptionDouble.h\
-                                        ./objects/Options/OptionChar.cpp\
-                                        ./objects/Options/OptionChar.h\
-                                        ./objects/Options/OptionUtilities.cpp\
-                                        ./objects/Options/OptionUtilities.h
+                                        ./classes/objects/Options/Option.cpp\
+                                        ./classes/objects/Options/Option.h\
+                                        ./classes/objects/Options/OptionDouble.cpp\
+                                        ./classes/objects/Options/OptionDouble.h\
+                                        ./classes/objects/Options/OptionChar.cpp\
+                                        ./classes/objects/Options/OptionChar.h\
+                                        ./classes/objects/Options/OptionUtilities.cpp\
+                                        ./classes/objects/Options/OptionUtilities.h\
+                                        ./classes/objects/Options/OptionLogical.cpp\
+                                        ./classes/objects/Options/OptionLogical.h\
+                                        ./classes/objects/Options/OptionStruct.cpp\
+                                        ./classes/objects/Options/OptionStruct.h\
+                                        ./classes/objects/Options/OptionCell.cpp\
+                                        ./classes/objects/Options/OptionCell.h
 
 #}}}
@@ -453 +461 @@
                                           ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp\
                                           ./modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h\
-                                          ./objects/Inputs/ControlInput.h\
-                                          ./objects/Inputs/ControlInput.cpp\
+                                          ./classes/objects/Inputs/ControlInput.h\
+                                          ./classes/objects/Inputs/ControlInput.cpp\
                                           ./shared/Numerics/BrentSearch.cpp\
                                           ./shared/Numerics/OptimalSearch.cpp \
@@ -554 +562 @@
 #}}}
 #Rifts sources  {{{
-rifts_sources = ./objects/Loads/Riftfront.cpp\
-                                    ./objects/Loads/Riftfront.h\
+rifts_sources = ./classes/objects/Loads/Riftfront.cpp\
+                                    ./classes/objects/Loads/Riftfront.h\
                                     ./modules/ConstraintsStatex/RiftConstraintsState.cpp
 #}}}
 #3D sources  {{{
-threed_sources = ./objects/Gauss/GaussPenta.h\
-                                     ./objects/Gauss/GaussPenta.cpp\
-                                     ./objects/ElementResults/PentaP1ElementResult.h\
-                                     ./objects/ElementResults/PentaP1ElementResult.cpp\
-                                     ./objects/Inputs/PentaP1Input.h\
-                                     ./objects/Inputs/PentaP1Input.cpp\
-                                     ./objects/Elements/Penta.h\
-                                     ./objects/Elements/Penta.cpp\
-                                     ./objects/Elements/PentaHook.h\
-                                     ./objects/Elements/PentaHook.cpp\
-                                     ./objects/Elements/PentaRef.h\
-                                     ./objects/Elements/PentaRef.cpp
+threed_sources = ./classes/gauss/GaussPenta.h\
+                                     ./classes/gauss/GaussPenta.cpp\
+                                     ./classes/objects/ElementResults/PentaP1ElementResult.h\
+                                     ./classes/objects/ElementResults/PentaP1ElementResult.cpp\
+                                     ./classes/objects/Inputs/PentaP1Input.h\
+                                     ./classes/objects/Inputs/PentaP1Input.cpp\
+                                     ./classes/objects/Elements/Penta.h\
+                                     ./classes/objects/Elements/Penta.cpp\
+                                     ./classes/objects/Elements/PentaHook.h\
+                                     ./classes/objects/Elements/PentaHook.cpp\
+                                     ./classes/objects/Elements/PentaRef.h\
+                                     ./classes/objects/Elements/PentaRef.cpp
 #}}}
 #Bamg sources  {{{
-bamg_sources =  ./objects/Bamg/BamgGeom.h\
-                                ./objects/Bamg/BamgGeom.cpp\
-                                ./objects/Bamg/BamgMesh.h\
-                                ./objects/Bamg/BamgMesh.cpp\
-                                ./objects/Bamg/BamgOpts.h\
-                                ./objects/Bamg/BamgOpts.cpp\
-                                ./objects/Bamg/CrackedEdge.h\
-                                ./objects/Bamg/CrackedEdge.cpp\
-                                ./objects/Bamg/Curve.h\
-                                ./objects/Bamg/Curve.cpp\
-                                ./objects/Bamg/Direction.h\
-                                ./objects/Bamg/Direction.cpp\
-                                ./objects/Bamg/DoubleAndInt.h\
-                                ./objects/Bamg/Edge.h\
-                                ./objects/Bamg/Edge.cpp\
-                                ./objects/Bamg/GeomEdge.h\
-                                ./objects/Bamg/GeomEdge.cpp\
-                                ./objects/Bamg/GeomSubDomain.h\
-                                ./objects/Bamg/GeomSubDomain.cpp\
-                                ./objects/Bamg/GeomVertex.h\
-                                ./objects/Bamg/GeomVertex.cpp\
-                                ./objects/Bamg/Geometry.cpp\
-                                ./objects/Bamg/Geometry.h\
-                                ./objects/Bamg/ListofIntersectionTriangles.cpp\
-                                ./objects/Bamg/ListofIntersectionTriangles.h\
-                                ./objects/Bamg/EigenMetric.cpp\
-                                ./objects/Bamg/Metric.cpp\
-                                ./objects/Bamg/Metric.h\
-                                ./objects/Bamg/BamgQuadtree.cpp\
-                                ./objects/Bamg/BamgQuadtree.h\
-                                ./objects/Bamg/R2.h\
-                                ./objects/Bamg/SetOfE4.cpp\
-                                ./objects/Bamg/SetOfE4.h\
-                                ./objects/Bamg/SubDomain.h\
-                                ./objects/Bamg/SubDomain.cpp\
-                                ./objects/Bamg/AdjacentTriangle.h\
-                                ./objects/Bamg/AdjacentTriangle.cpp\
-                                ./objects/Bamg/Triangle.cpp\
-                                ./objects/Bamg/Triangle.h\
-                                ./objects/Bamg/BamgVertex.cpp\
-                                ./objects/Bamg/BamgVertex.h\
-                                ./objects/Bamg/VertexOnEdge.h\
-                                ./objects/Bamg/VertexOnEdge.cpp\
-                                ./objects/Bamg/VertexOnGeom.h\
-                                ./objects/Bamg/VertexOnGeom.cpp\
-                                ./objects/Bamg/VertexOnVertex.h\
-                                ./objects/Bamg/VertexOnVertex.cpp\
-                                ./objects/Bamg/Mesh.cpp\
-                                ./objects/Bamg/Mesh.h\
+bamg_sources =  ./classes/bamg/bamgobjects.h\
+                                ./classes/bamg/BamgGeom.h\
+                                ./classes/bamg/BamgGeom.cpp\
+                                ./classes/bamg/BamgMesh.h\
+                                ./classes/bamg/BamgMesh.cpp\
+                                ./classes/bamg/BamgOpts.h\
+                                ./classes/bamg/BamgOpts.cpp\
+                                ./classes/bamg/CrackedEdge.h\
+                                ./classes/bamg/CrackedEdge.cpp\
+                                ./classes/bamg/Curve.h\
+                                ./classes/bamg/Curve.cpp\
+                                ./classes/bamg/Direction.h\
+                                ./classes/bamg/Direction.cpp\
+                                ./classes/bamg/DoubleAndInt.h\
+                                ./classes/bamg/Edge.h\
+                                ./classes/bamg/Edge.cpp\
+                                ./classes/bamg/GeomEdge.h\
+                                ./classes/bamg/GeomEdge.cpp\
+                                ./classes/bamg/GeomSubDomain.h\
+                                ./classes/bamg/GeomSubDomain.cpp\
+                                ./classes/bamg/GeomVertex.h\
+                                ./classes/bamg/GeomVertex.cpp\
+                                ./classes/bamg/Geometry.cpp\
+                                ./classes/bamg/Geometry.h\
+                                ./classes/bamg/ListofIntersectionTriangles.cpp\
+                                ./classes/bamg/ListofIntersectionTriangles.h\
+                                ./classes/bamg/EigenMetric.cpp\
+                                ./classes/bamg/Metric.cpp\
+                                ./classes/bamg/Metric.h\
+                                ./classes/bamg/BamgQuadtree.cpp\
+                                ./classes/bamg/BamgQuadtree.h\
+                                ./classes/bamg/R2.h\
+                                ./classes/bamg/SetOfE4.cpp\
+                                ./classes/bamg/SetOfE4.h\
+                                ./classes/bamg/SubDomain.h\
+                                ./classes/bamg/SubDomain.cpp\
+                                ./classes/bamg/AdjacentTriangle.h\
+                                ./classes/bamg/AdjacentTriangle.cpp\
+                                ./classes/bamg/Triangle.cpp\
+                                ./classes/bamg/Triangle.h\
+                                ./classes/bamg/BamgVertex.cpp\
+                                ./classes/bamg/BamgVertex.h\
+                                ./classes/bamg/VertexOnEdge.h\
+                                ./classes/bamg/VertexOnEdge.cpp\
+                                ./classes/bamg/VertexOnGeom.h\
+                                ./classes/bamg/VertexOnGeom.cpp\
+                                ./classes/bamg/VertexOnVertex.h\
+                                ./classes/bamg/VertexOnVertex.cpp\
+                                ./classes/bamg/Mesh.cpp\
+                                ./classes/bamg/Mesh.h\
                                 ./shared/Bamg/Abs.h \
                                 ./shared/Bamg/BigPrimeNumber.h\
@@ -641 +650 @@
 kriging_sources = ./Container/Observations.h\
                                                 ./Container/Observations.cpp\
-                                                ./objects/Kriging/Variogram.h \
-                                                ./objects/Kriging/GaussianVariogram.h\
-                                                ./objects/Kriging/GaussianVariogram.cpp\
-                                                ./objects/Kriging/ExponentialVariogram.h\
-                                                ./objects/Kriging/ExponentialVariogram.cpp\
-                                                ./objects/Kriging/SphericalVariogram.h\
-                                                ./objects/Kriging/SphericalVariogram.cpp\
-                                                ./objects/Kriging/PowerVariogram.h\
-                                                ./objects/Kriging/PowerVariogram.cpp\
-                                                ./objects/Kriging/Quadtree.h\
-                                                ./objects/Kriging/Quadtree.cpp\
-                                                ./objects/Kriging/Observation.h\
-                                                ./objects/Kriging/Observation.cpp\
+                                                ./classes/kriging/Variogram.h \
+                                                ./classes/kriging/GaussianVariogram.h\
+                                                ./classes/kriging/GaussianVariogram.cpp\
+                                                ./classes/kriging/ExponentialVariogram.h\
+                                                ./classes/kriging/ExponentialVariogram.cpp\
+                                                ./classes/kriging/SphericalVariogram.h\
+                                                ./classes/kriging/SphericalVariogram.cpp\
+                                                ./classes/kriging/PowerVariogram.h\
+                                                ./classes/kriging/PowerVariogram.cpp\
+                                                ./classes/kriging/Quadtree.h\
+                                                ./classes/kriging/Quadtree.cpp\
+                                                ./classes/kriging/Observation.h\
+                                                ./classes/kriging/Observation.cpp\
                                                 ./modules/Krigingx/Krigingx.cpp\
                                                 ./modules/Krigingx/Krigingx.h
@@ -660 +669 @@
 pkriging_sources = ./Container/Observations.h\
                                                 ./Container/Observations.cpp\
-                                                ./objects/Kriging/Variogram.h \
-                                                ./objects/Kriging/GaussianVariogram.h\
-                                                ./objects/Kriging/GaussianVariogram.cpp\
-                                                ./objects/Kriging/ExponentialVariogram.h\
-                                                ./objects/Kriging/ExponentialVariogram.cpp\
-                                                ./objects/Kriging/SphericalVariogram.h\
-                                                ./objects/Kriging/SphericalVariogram.cpp\
-                                                ./objects/Kriging/PowerVariogram.h\
-                                                ./objects/Kriging/PowerVariogram.cpp\
-                                                ./objects/Kriging/Quadtree.h\
-                                                ./objects/Kriging/Quadtree.cpp\
-                                                ./objects/Kriging/Observation.h\
-                                                ./objects/Kriging/Observation.cpp\
+                                                ./classes/kriging/Variogram.h \
+                                                ./classes/kriging/GaussianVariogram.h\
+                                                ./classes/kriging/GaussianVariogram.cpp\
+                                                ./classes/kriging/ExponentialVariogram.h\
+                                                ./classes/kriging/ExponentialVariogram.cpp\
+                                                ./classes/kriging/SphericalVariogram.h\
+                                                ./classes/kriging/SphericalVariogram.cpp\
+                                                ./classes/kriging/PowerVariogram.h\
+                                                ./classes/kriging/PowerVariogram.cpp\
+                                                ./classes/kriging/Quadtree.h\
+                                                ./classes/kriging/Quadtree.cpp\
+                                                ./classes/kriging/Observation.h\
+                                                ./classes/kriging/Observation.cpp\
                                                 ./modules/Krigingx/pKrigingx.cpp\
                                                 ./modules/Krigingx/Krigingx.h
@@ -826 +835 @@
 #}}}
 #Modules sources{{{
-module_sources= ./objects/Options/Option.cpp\
-                        ./objects/Options/Option.h\
-                        ./objects/Options/OptionDouble.cpp\
-                        ./objects/Options/OptionDouble.h\
-                        ./objects/Options/OptionLogical.cpp\
-                        ./objects/Options/OptionLogical.h\
-                        ./objects/Options/OptionChar.cpp\
-                        ./objects/Options/OptionChar.h\
-                        ./objects/Options/OptionStruct.cpp\
-                        ./objects/Options/OptionStruct.h\
-                        ./objects/Options/OptionCell.cpp\
-                        ./objects/Options/OptionCell.h\
-                        ./objects/Options/OptionUtilities.cpp\
-                        ./objects/Options/OptionUtilities.h\
-                        ./shared/Alloc/alloc_module.h\
+module_sources= ./shared/Alloc/alloc_module.h\
                         ./shared/Alloc/alloc_module.cpp\
                         ./shared/Threads/issm_threads.h\

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

@@ -10 +10 @@
 
 #include <stdio.h>
-#include "./objects.h"
+#include "./classes.h"
 #include <string.h>
 #include "../EnumDefinitions/EnumDefinitions.h"

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

@@ -14 +14 @@
 #include "../modules/ModelProcessorx/ModelProcessorx.h"
 #include "../io/io.h"
-#include "./objects.h"
+#include "./classes.h"
 #include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "./objects/Object.h"
 #include "../toolkits/toolkits.h"
 class DataSet;
 class Parameters;
 class NodeSets;
+class Nodes;
+class Vertices;
+class Results;
+class Constraints;
+class Loads;
+class Materials;
 /*}}}*/
 

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

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

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "./objects/Object.h"
 class DataSet;
 /*}}}*/

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

@@ -15 +15 @@
 #include <stdarg.h>
 
-#include "./objects.h"
+#include "./classes.h"
 #include "../io/io.h"
 #include "./Container/Parameters.h"

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

@@ -13 +13 @@
 #include <string.h>
 #include <math.h>
-#include "./objects.h"
+#include "./classes.h"
 #include "../Container/Container.h"
 #include "../io/io.h"

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

@@ -4 +4 @@
 
 #include "./include.h"
+class DataSet;
 
 namespace bamg {

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

@@ -13 +13 @@
 
 #include "DirectApplicInterface.H"
-#include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../../toolkits/toolkits.h"
+#include "../../objects/objects.h"
 
 /*}}}*/

issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp

@@ -3 +3 @@
  */
 
-/*Include files: {{{*/
-#include "./../objects.h"
-/*}}}*/
+#include "./gaussobjects.h"
 
 /*GaussPenta constructors and destructors:*/

issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

@@ -3 +3 @@
  */
 
-/*Include files: {{{*/
-#include "./../objects.h"
-/*}}}*/
+#include "./gaussobjects.h"
 
 /*GaussTria constructors and destructors:*/

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

@@ -8 +8 @@
 /*Headers:*/
 #include "./Variogram.h"
+class Options;
 
 class GaussianVariogram: public Variogram{

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

@@ -6 +6 @@
 #define _OBSERVATION_H_
 
-#include "../Object.h"
+#include "../objects/Object.h"
 
 class Observation: public Object{

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

@@ -6 +6 @@
 #define _VARIOGRAM_H_
 
-#include "../Object.h"
+#include "../objects/Object.h"
 
 class Variogram: public Object{

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

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

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../objects/Object.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 class Node;
+class Matrix;
 /*}}}*/
 

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

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

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../objects/Object.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 class Node;
+class Vector;
 /*}}}*/
 

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

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

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

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

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

@@ -13 +13 @@
 class Nodes;
 #include "../Object.h"
-#include "../../toolkits/toolkits.h"
+#include "../../../toolkits/toolkits.h"
 /*}}}*/
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../Container/Container.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../Container/Container.h"
 #include "../objects.h"
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../Container/Container.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../Container/Container.h"
 #include "../objects.h"
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../Container/Container.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../Container/Container.h"
 #include "../objects.h"
 

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

@@ -11 +11 @@
 #include <string.h>
 #include "./objects.h"
-#include "../include/include.h"
-#include "../io/io.h"
+#include "../../include/include.h"
+#include "../../io/io.h"
 
 /*Contour constructors and destructors:*/

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

@@ -9 +9 @@
 /*{{{*/
 #include "./Object.h"
-#include "../shared/Exceptions/exceptions.h"
-#include "../toolkits/toolkits.h"
-#include "../include/include.h"
+#include "../../shared/Exceptions/exceptions.h"
+#include "../../toolkits/toolkits.h"
+#include "../../include/include.h"
 /*}}}*/
 

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

@@ -12 +12 @@
 #include <string.h>
 #include "./ElementResultLocal.h"
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*BoolElementResult constructors and destructor*/

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

@@ -11 +11 @@
 /*{{{*/
 #include "../Inputs/Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class Parameters;
 /*}}}*/

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

@@ -12 +12 @@
 #include <string.h>
 #include "./ElementResultLocal.h"
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*DoubleElementResult constructors and destructor*/

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

@@ -11 +11 @@
 /*{{{*/
 #include "../Inputs/Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class Parameters;
 /*}}}*/

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

@@ -12 +12 @@
 #include <string.h>
 #include "./ElementResultLocal.h"
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*PentaP1ElementResult constructors and destructor*/

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

@@ -11 +11 @@
 /*{{{*/
 #include "../Inputs/Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -12 +12 @@
 #include <string.h>
 #include "./ElementResultLocal.h"
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*TriaP1ElementResult constructors and destructor*/

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

@@ -10 +10 @@
 /*{{{*/
 #include "../Inputs/Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -19 +19 @@
 class Vector;
 
-#include "../../toolkits/toolkits.h"
+#include "../../../toolkits/toolkits.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../Container/Container.h"
+#include "../../classes.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../Container/Container.h"
 /*}}}*/
 

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

@@ -22 +22 @@
 class ElementVector;
 
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -20 +20 @@
 class ElementVector;
 
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/ExternalResults/BoolExternalResult.cpp

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

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

@@ -17 +17 @@
 
 #include "./ExternalResult.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/ExternalResults/DoubleExternalResult.cpp

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

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

@@ -18 +18 @@
 
 #include "./ExternalResult.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/ExternalResults/DoubleMatExternalResult.cpp

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

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

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

issm/trunk-jpl/src/c/classes/objects/ExternalResults/DoubleVecExternalResult.cpp

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

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

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

issm/trunk-jpl/src/c/classes/objects/ExternalResults/IntExternalResult.cpp

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

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

@@ -17 +17 @@
 
 #include "./ExternalResult.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/ExternalResults/PetscVecExternalResult.cpp

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

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

@@ -17 +17 @@
 
 #include "./ExternalResult.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

issm/trunk-jpl/src/c/classes/objects/ExternalResults/StringExternalResult.cpp

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

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

@@ -17 +17 @@
 
 #include "./ExternalResult.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*BoolInput constructors and destructor*/

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

@@ -10 +10 @@
 /*{{{*/
 #include "./Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class GaussTria;
 /*}}}*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*ControlInput constructors and destructor*/

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

@@ -10 +10 @@
 /*{{{*/
 #include "./Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class GaussTria;
 /*}}}*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -10 +10 @@
 /*{{{*/
 #include "./Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class GaussTria;
 /*}}}*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*DoubleInput constructors and destructor*/

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

@@ -10 +10 @@
 /*{{{*/
 #include "./Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class GaussTria;
 /*}}}*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*IntInput constructors and destructor*/

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

@@ -10 +10 @@
 /*{{{*/
 #include "./Input.h"
-#include "../../include/include.h"
+#include "../../../include/include.h"
 class GaussTria;
 /*}}}*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*PentaP1Input constructors and destructor*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 /*}}}*/
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*TriaP1Input constructors and destructor*/

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "../Object.h"

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "../Object.h"

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_SubStyle.h"

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "../Object.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Feature.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Container.h"

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

@@ -13 +13 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Feature.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Container.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Overlay.h"

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

@@ -14 +14 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Geometry.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_ColorStyle.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Geometry.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Geometry.h"

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "../Object.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Feature.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Feature.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Geometry.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_ColorStyle.h"

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Geometry.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_StyleSelector.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./KML_Object.h"

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../Container/Container.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../Container/Container.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
 /*}}}*/ 
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
 /*}}}*/ 
 

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

@@ -16 +16 @@
 
 #include "../Object.h"
-#include "../../toolkits/toolkits.h"
-#include "../../Container/Container.h"
+#include "../../../toolkits/toolkits.h"
+#include "../../../Container/Container.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../objects.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../classes.h"
 /*}}}*/ 
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
 /*}}}*/
         

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/shared.h"
 /*}}}*/
 

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

@@ -13 +13 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../modules/ModelProcessorx/ModelProcessorx.h"
-#include "../objects.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../modules/ModelProcessorx/ModelProcessorx.h"
+#include "../../classes.h"
 /*}}}*/
 

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

@@ -11 +11 @@
 class Object;
 #include "../Object.h"
-#include "../../toolkits/toolkits.h"
+#include "../../../toolkits/toolkits.h"
 /*}}}*/
 

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
+#include "../../classes.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
                 
 /*Matice constructors and destructor*/

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

@@ -11 +11 @@
 #include <stdio.h>
 #include <string.h>
-#include "../objects.h"
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../classes.h"
+#include "../../../shared/shared.h"
+#include "../../../include/include.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
                 
 /*Matpar constructors and destructor*/

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

@@ -13 +13 @@
 #include <string.h>
 #include "./objects.h"
-#include "../Container/Container.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "../shared/shared.h"
-#include "../include/include.h"
-#include "../modules/modules.h"
+#include "../../Container/Container.h"
+#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../shared/shared.h"
+#include "../../include/include.h"
+#include "../../modules/modules.h"
 /*}}}*/
 

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

@@ -9 +9 @@
 /*{{{*/
 #include "./Object.h"
-#include "../shared/shared.h"
+#include "../../shared/shared.h"
+#include "../DofIndexing.h"
 class  Inputs;
 class  Hook;
-class  DofIndexing;
 class  IoModel;
 class  DataSet;
@@ -18 +18 @@
 class  Vector;
 class  Matrix;
-#include "./Update.h"
+#include "../Update.h"
 /*}}}*/
 

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "../Object.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../include/include.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../include/include.h"
+#include "../../../shared/Exceptions/exceptions.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
 
 #include "./Option.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -12 +12 @@
 #include <string.h>
 #include "../objects.h"
-#include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../shared/shared.h"
-#include "../../Container/Container.h"
-#include "../../include/include.h"
+#include "../../../EnumDefinitions/EnumDefinitions.h"
+#include "../../../shared/shared.h"
+#include "../../../Container/Container.h"
+#include "../../../include/include.h"
 
 /*DoubleParam constructors and destructor*/

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11 +11 @@
 
 #include <string.h>
-#include "./objects.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
-#include "../shared/shared.h"
-#include "../include/include.h"
+#include "../classes.h"
+#include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../shared/shared.h"
+#include "../../include/include.h"
 /*}}}*/
 

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "../classes.h"
 class IoModel;
 class Vector;
 class Parameters;
-#include "../shared/Exceptions/exceptions.h"
-#include "../toolkits/toolkits.h"
-#include "../include/include.h"
+#include "../../shared/Exceptions/exceptions.h"
+#include "../../toolkits/toolkits.h"
+#include "../../include/include.h"
 
 /*}}}*/

issm/trunk-jpl/src/c/io/Disk/diskio.h

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

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

@@ -7 +7 @@
 #include "../../Container/Container.h"
 #include "../../io/io.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
                 
 void AddExternalResultx( DataSet* results, int enumtype, double value){

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

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

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

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

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

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

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

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

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

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

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

@@ -3 +3 @@
  */
 #include "./Bamgx.h"
-#include "../../objects/objects.h"
+#include "../../classes/bamg/bamgobjects.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

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

@@ -6 +6 @@
 #define _BAMGX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/bamg/bamgobjects.h"
 
 /* local prototypes: */

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

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

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

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

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

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

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

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

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

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

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

@@ -8 +8 @@
 
 #include "../../shared/shared.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 /*threading: */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

issm/trunk-jpl/src/c/modules/Dakotax/SpawnCore.cpp

@@ -10 +10 @@
 
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp

@@ -26 +26 @@
 
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6 +6 @@
 #define _INTERPFROMGRIDTOMESHX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

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

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

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

@@ -6 +6 @@
 #define _INTERPFROMMESH2DX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../toolkits/toolkits.h"
 

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

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

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

@@ -7 +7 @@
 
 #include "../../toolkits/toolkits.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 int InterpFromMeshToMesh3dx( Vector** pdata_prime,double* index_data, double* x_data, double* y_data, double* z_data, int nods_data,int nels_data, double* data, int data_length, double* x_prime, double* y_prime, double* z_prime, int nods_prime,double default_value);

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6 +6 @@
 #define _KRIGINGX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../toolkits/toolkits.h"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4 +4 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/classes.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -7 +7 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

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

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -9 +9 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

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

@@ -7 +7 @@
 #include "../../io/io.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../MeshPartitionx/MeshPartitionx.h"

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

@@ -13 +13 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../MeshPartitionx/MeshPartitionx.h"

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

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../io/io.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -10 +10 @@
 
 #include <string.h>
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

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

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

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../modules/modules.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../io/io.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -7 +7 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

@@ -8 +8 @@
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../include/include.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -9 +9 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../io/io.h"

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

@@ -10 +10 @@
 
 #include <string.h>
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

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

@@ -4 +4 @@
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../io/io.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../io/io.h"

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -9 +9 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

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

@@ -7 +7 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"

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

@@ -6 +6 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../../include/include.h"

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

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

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

@@ -8 +8 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -8 +8 @@
 #include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../objects/objects.h"
+#include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"
 #include "../../MeshPartitionx/MeshPartitionx.h"

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

@@ -9 +9 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

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

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

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

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

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

@@ -6 +6 @@
 #define _ORTHX_H
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -20 +20 @@
 
 #include "../../Container/Container.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 #ifdef _HAVE_SCOTCH_ //only works if scotch library has been compiled in.

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

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

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

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

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

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

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

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

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

@@ -12 +12 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 /* local prototypes: */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7 +7 @@
 
 #include "../../Container/Container.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vector* yg);

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

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

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

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

issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp

@@ -25 +25 @@
 #include "../Exceptions/exceptions.h"
 #include "../../include/include.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 void* xmalloc(int size){

issm/trunk-jpl/src/c/shared/Alloc/alloc_module.cpp

@@ -15 +15 @@
 #include "../Exceptions/exceptions.h"
 #include "../../include/include.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 void xdelete_module(Matrix** pv){

issm/trunk-jpl/src/c/shared/Bamg/OppositeAngle.h

@@ -2 +2 @@
 #define _OPPOSITEANGLE_H_
 
-#include "../../objects/Bamg/include.h"
+#include "../../classes/bamg/include.h"
 
 /*Return the opposite angle modulo 2 Pi*/

issm/trunk-jpl/src/c/shared/Bamg/det.h

@@ -2 +2 @@
 #define _BAMGDET_H_
 
-#include "../../objects/Bamg/include.h"
+#include "../../classes/bamg/include.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/shared/Elements/elements.h

@@ -6 +6 @@
 #define  _SHARED_ELEMENTS_H_
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../Container/Container.h"
 class ElementMatrix;

issm/trunk-jpl/src/c/shared/Exp/exp.h

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

issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp

@@ -10 +10 @@
 
 #include "./numerics.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../include/include.h"
 #include "../../io/io.h"

issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp

@@ -12 +12 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 void IsInputConverged(IssmDouble* peps, Input** new_inputs,Input** old_inputs,int num_inputs,int criterion_enum){

issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp

@@ -10 +10 @@
 
 #include "./numerics.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../io/io.h"
 #include "../../include/include.h"

issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp

@@ -11 +11 @@
 #include <cstring>
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../Container/Parameters.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp

@@ -9 +9 @@
 #endif
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../Container/Parameters.h"
 #include "../../toolkits/toolkits.h"

issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

@@ -11 +11 @@
 
 #include "../../Container/Container.h"
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../shared/shared.h"

issm/trunk-jpl/src/c/shared/Wrapper/wrappershared.h

@@ -6 +6 @@
 #define _WRAPPER_SHARED_H_
 
-#include "../../objects/objects.h"
+#include "../../classes/objects/objects.h"
 
 int ModuleBoot(void);

issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp

@@ -10 +10 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp

@@ -10 +10 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp

@@ -10 +10 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp

@@ -3 +3 @@
  */ 
 
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../modules/modules.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp

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

issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp

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

issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp

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

issm/trunk-jpl/src/c/solutions/bedslope_core.cpp

@@ -5 +5 @@
 #include "./solutions.h"
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/control_core.cpp

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

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

@@ -8 +8 @@
 #endif
 
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/solutions/controltao_core.cpp

@@ -4 +4 @@
 #include <config.h>
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/solutions/convergence.cpp

@@ -3 +3 @@
  */ 
 
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../modules/modules.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp

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

issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/gradient_core.cpp

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

issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

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

issm/trunk-jpl/src/c/solutions/hydrology_core_step.cpp

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

issm/trunk-jpl/src/c/solutions/objectivefunction.cpp

@@ -11 +11 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../shared/shared.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

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

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

@@ -6 +6 @@
 #define SOLUTIONS_H_
 
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 

issm/trunk-jpl/src/c/solutions/steadystate_core.cpp

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

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

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

issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp

@@ -5 +5 @@
 #include "./solutions.h"
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solutions/thermal_core.cpp

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

issm/trunk-jpl/src/c/solutions/transient_core.cpp

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

issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../modules/modules.h"

issm/trunk-jpl/src/c/solvers/solver_linear.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../modules/modules.h"

issm/trunk-jpl/src/c/solvers/solver_newton.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../io/io.h"

issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -4 +4 @@
 
 #include "../toolkits/toolkits.h"
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"
 #include "../EnumDefinitions/EnumDefinitions.h"

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

@@ -6 +6 @@
 #define SOLVERS_H_
 
-#include "../objects/objects.h"
+#include "../classes/objects/objects.h"
 #include "../io/io.h"