Changeset 15000

Timestamp:

05/10/13 00:13:29 (12 years ago)

Author:

Eric.Larour

Message:

CHG: modules should be including src/c/classes/classes.h, not src/c/classes/objects/objects.h

Location:

issm/trunk-jpl

Files:

• externalpackages/matlab/install.sh (modified) (1 diff)
• src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.h (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/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/CreateNodalConstraintsx/CreateNodalConstraintsx.h (modified) (1 diff)
• src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.h (modified) (1 diff)
• src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h (modified) (1 diff)
• src/c/modules/EdgeDetectionx/EdgeDetectionx.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/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.h (modified) (1 diff)
• src/c/modules/Krigingx/pKrigingx.cpp (modified) (1 diff)
• src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h (modified) (1 diff)
• src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.h (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/Gia/CreateConstraintsGia.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.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/ParseToolkitsOptionsx/ParseToolkitsOptionsx.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/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/Shp2Expx/Shp2Expx.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/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/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h (modified) (1 diff)
• src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h (modified) (1 diff)
• src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.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/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h (modified) (1 diff)
• src/c/modules/VecMergex/VecMergex.h (modified) (1 diff)
• src/c/modules/VertexCoordinatesx/VertexCoordinatesx.h (modified) (1 diff)
• src/c/modules/VerticesDofx/VerticesDofx.h (modified) (1 diff)

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

@@ -1 +1 @@
 #!/bin/bash
-set -eu
-
-if [ ! -h install ];
-then
-        echo "  ****************************************************************"
-        echo "  *                                                              *"
-        echo "  * you need create a symbolic link from matlab's root directory *"
-        echo "  *                                                              *"
-        echo "  * First, you need to locate matlab's root directory            *"
-        echo "  * The easiest way to find it is to launch matlab and run the   *"
-        echo "  * following command: matlabroot                                *"
-        echo "  * Then, create a symbolic link using the command 'ln -s ' the  *"
-        echo "  * target directory should be named 'install'                   *"
-        echo "  *                                                              *"
-        echo "  * Examples:                                                    *"
-        echo "  *    ln -s /usr/local/matlab712/ install                       *"
-        echo "  *    ln -s /Applications/MATLAB_R2012a.app/ install            *"
-        echo "  *                                                              *"
-        echo "  * run ./install.sh again to check that the link is correct     *"
-        echo "  *                                                              *"
-        echo "  ****************************************************************"
-else
-
-        #Read link
-        DIR=$(readlink install)
-        if [ -d $DIR ]
-        then
-                echo "Symbolic link correctly set"
-        else
-                rm -rf install
-                echo "Incorrect symbolic link:"
-                echo "provided target ($DIR) does not exist or is not a directory"
-        fi
-fi
+rm -rf install
+ln -s /usr/local/matlab714/ install

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6 +6 @@
 #define _CONSTRAINTSSTATELOCAL_H
 
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 
 /*melting: */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7 +7 @@
 
 #include "../../toolkits/toolkits.h"
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 
 int InterpFromMeshToMesh3dx(IssmSeqVec<IssmPDouble>** 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17 +17 @@
 #include <stdio.h>
 #include <string.h>
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.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 "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 
 /* local prototypes: */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6 +6 @@
 #define _UPDATEDYNAMICCONSTRAINTSXX_H
 
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 
 void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vector<IssmDouble>* yg);

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

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

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

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

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

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