Changeset 15067

Timestamp:

05/21/13 22:04:36 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved DataSet.h and Object.h into a directory called datastructures/
This should be our first building block which along shared/ will be used by every
other library we build. Not sure whether to make it into a library for now.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• bamg/BamgQuadtree.cpp (modified) (1 diff)
• bamg/BamgQuadtree.h (modified) (1 diff)
• bamg/Curve.h (modified) (1 diff)
• bamg/Edge.cpp (modified) (1 diff)
• bamg/Edge.h (modified) (1 diff)
• bamg/EigenMetric.cpp (modified) (1 diff)
• bamg/GeomEdge.cpp (modified) (1 diff)
• bamg/GeomVertex.cpp (modified) (1 diff)
• bamg/Metric.cpp (modified) (1 diff)
• bamg/Metric.h (modified) (1 diff)
• classes/Bucket.h (modified) (1 diff)
• classes/Constraints/Constraint.h (modified) (1 diff)
• classes/Constraints/Constraints.h (modified) (1 diff)
• classes/Constraints/SpcDynamic.h (modified) (1 diff)
• classes/Constraints/SpcStatic.h (modified) (1 diff)
• classes/Constraints/SpcTransient.h (modified) (1 diff)
• classes/Contour.h (modified) (1 diff)
• classes/Contours.h (modified) (1 diff)
• classes/DataSet.h (deleted)
• classes/DependentObject.h (modified) (1 diff)
• classes/ElementResults/ElementResult.h (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Elements.h (modified) (1 diff)
• classes/ExternalResults/ExternalResult.h (modified) (1 diff)
• classes/ExternalResults/Results.h (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• classes/Hook.h (modified) (1 diff)
• classes/IndependentObject.h (modified) (1 diff)
• classes/Inputs/Input.h (modified) (2 diffs)
• classes/Inputs/Inputs.h (modified) (1 diff)
• classes/KML/KMLFileReadUtils.h (modified) (1 diff)
• classes/KML/KML_Attribute.h (modified) (1 diff)
• classes/KML/KML_Comment.h (modified) (1 diff)
• classes/KML/KML_Feature.h (modified) (1 diff)
• classes/KML/KML_Geometry.h (modified) (1 diff)
• classes/KML/KML_Icon.h (modified) (1 diff)
• classes/KML/KML_LatLonBox.h (modified) (1 diff)
• classes/KML/KML_Object.h (modified) (1 diff)
• classes/KML/KML_StyleSelector.h (modified) (1 diff)
• classes/KML/KML_SubStyle.h (modified) (1 diff)
• classes/KML/KML_Unknown.h (modified) (1 diff)
• classes/Loads/Load.h (modified) (1 diff)
• classes/Loads/Loads.h (modified) (1 diff)
• classes/Materials/Material.h (modified) (1 diff)
• classes/Materials/Materials.h (modified) (1 diff)
• classes/Node.h (modified) (1 diff)
• classes/Nodes.h (modified) (1 diff)
• classes/Object.h (deleted)
• classes/Options/GenericOption.h (modified) (1 diff)
• classes/Options/Option.h (modified) (1 diff)
• classes/Options/Options.cpp (modified) (1 diff)
• classes/Options/Options.h (modified) (1 diff)
• classes/Params/Param.h (modified) (1 diff)
• classes/Params/Parameters.h (modified) (1 diff)
• classes/Profiler.h (modified) (1 diff)
• classes/Segment.h (modified) (1 diff)
• classes/Vertices.h (modified) (1 diff)
• classes/classes.h (modified) (1 diff)
• classes/kriging/Observation.h (modified) (1 diff)
• classes/kriging/Observations.cpp (modified) (1 diff)
• classes/kriging/Observations.h (modified) (1 diff)
• classes/kriging/Variogram.h (modified) (1 diff)
• classes/matrix/ElementMatrix.h (modified) (1 diff)
• classes/matrix/ElementVector.h (modified) (1 diff)
• datastructures (added)
• datastructures/DataSet.cpp (moved) (moved from issm/trunk-jpl/src/c/classes/DataSet.cpp ) (1 diff)
• datastructures/DataSet.h (added)
• datastructures/Object.h (added)
• toolkits/issm/IssmMpiDenseMat.h (modified) (1 diff)

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

@@ -21 +21 @@
 core_sources = ./main/issm.h\
                            ./main/globals.h\
+                           ./datastructures/DataSet.h\
+                                        ./datastructures/DataSet.cpp\
+                                        ./datastructures/Object.h\
+                                        ./datastructures/datastructures.h\
                                         ./classes/classes.h\
-                                        ./classes/Object.h\
                                         ./classes/gauss/GaussTria.h\
                                         ./classes/gauss/GaussTria.cpp\
@@ -46 +49 @@
                                         ./classes/IoModel.h\
                                         ./classes/IoModel.cpp\
-                                        ./classes/DataSet.h\
-                                        ./classes/DataSet.cpp\
                                         ./classes/Contours.h\
                                         ./classes/Contours.cpp\

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -4 +4 @@
 
 #include "./bamgobjects.h"
-#include "../classes/DataSet.h"
+#include "../datastructures/datastructures.h"
 
 namespace bamg {

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

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

issm/trunk-jpl/src/c/bamg/Curve.h

@@ -2 +2 @@
 #define _CURVE_H_
 
-#include "../shared/Bamg/shared.h"
+#include "../shared/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Edge.cpp

@@ -7 +7 @@
 #include "Mesh.h"
 #include "Geometry.h"
-#include "../shared/io/Print/Print.h"
+#include "../shared/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Edge.h

@@ -3 +3 @@
 
 #include "./BamgVertex.h"
-#include "../shared/Exceptions/exceptions.h"
+#include "../shared/shared.h"
 #include "./GeomEdge.h"
 

issm/trunk-jpl/src/c/bamg/EigenMetric.cpp

@@ -5 +5 @@
 
 #include "Metric.h"
-#include "../shared/io/Print/Print.h"
+#include "../shared/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/GeomEdge.cpp

@@ -3 +3 @@
 #include <cmath>
 
-#include "../shared/Exceptions/exceptions.h"
+#include "../shared/shared.h"
 
 #include "GeomEdge.h"

issm/trunk-jpl/src/c/bamg/GeomVertex.cpp

@@ -5 +5 @@
 
 #include "GeomVertex.h"
-#include "../shared/Exceptions/exceptions.h"
+#include "../shared/shared.h"
 
 namespace bamg {

issm/trunk-jpl/src/c/bamg/Metric.cpp

@@ -4 +4 @@
 
 #include "Metric.h"
-#include "../shared/Exceptions/exceptions.h"
-#include "../shared/io/Print/Print.h"
+#include "../shared/shared.h"
 
 using namespace std;

issm/trunk-jpl/src/c/bamg/Metric.h

@@ -3 +3 @@
 
 #include "./include.h"
-#include "../shared/Bamg/shared.h"
+#include "../shared/shared.h"
 #include "R2.h"
 #include <math.h>

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./DataSet.h"
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/MemOps/MemOps.h"
 #include "../toolkits/toolkitsenums.h"

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

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

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

@@ -3 +3 @@
 
 /*forward declarations */
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 

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

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

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

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

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

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

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../shared/Exceptions/exceptions.h"
-#include "../shared/MemOps/MemOps.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
-#include "./Object.h"
+#include "../shared/shared.h"
+#include "../datastructures/datastructures.h"
 /*}}}*/
 

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

@@ -5 +5 @@
 #define  _CONTAINER_CONTOURS_H_
 
-#include "./DataSet.h"
+#include "../datastructures/datastructures.h"
+#include "./Contour.h"
 
 class Contours: public DataSet{

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

@@ -7 +7 @@
 
 /*{{{*/
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 /*}}}*/

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

@@ -7 +7 @@
 
 /*Headers:*/
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 class Patch;
 class Parameters;

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

@@ -10 +10 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../Update.h"
 

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

@@ -3 +3 @@
 
 /*forward declarations */
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 class Materials;
 class Parameters;

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

@@ -15 +15 @@
 #endif
 
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../Node.h"
 /*}}}*/

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

@@ -2 +2 @@
 #define  _CONTAINER_RESULTS_H_
 
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 
 /*forward declarations */

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
 #include "../toolkits/toolkits.h"
 class DataSet;

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

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

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

@@ -7 +7 @@
 
 /*{{{*/
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 /*}}}*/

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
+#include "../../shared/shared.h"
 class Node;
 class ElementResult;
@@ -15 +16 @@
 class GaussPenta;
 template <class doubletype> class Vector;
-#include "../../shared/shared.h"
 /*}}}*/
 

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

@@ -6 +6 @@
 class Input;
 
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/Enum/Enum.h"
-#include "../Object.h"
+#include "../../shared/shared.h"
+#include "../../datastructures/datastructures.h"
 class DataSet;
 /*}}}*/

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/Enum/Enum.h"
-#include "../Object.h"
+#include "../../shared/shared.h"
+#include "../../datastructures/datastructures.h"
 class DataSet;
 /*}}}*/

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

@@ -13 +13 @@
 /*Headers:*/
 /*{{{*/
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/Enum/Enum.h"
+#include "../../shared/shared.h"
 #include "./KML_Object.h"
 class KML_Style;

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

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

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

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

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

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

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

@@ -7 +7 @@
 
 /*Headers:{{{*/
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/Enum/Enum.h"
-#include "../Object.h"
-class DataSet;
+#include "../../shared/shared.h"
+#include "../../datastructures/datastructures.h"
 /*}}}*/
 

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

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

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

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

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

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

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

@@ -20 +20 @@
 class Parameters;
 
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../Update.h"
 

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

@@ -3 +3 @@
 
 /*forward declarations */
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 class Materials;
 class Parameters;

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

@@ -10 +10 @@
 class Inputs;
 template <class doubletype> class Vector;
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../Update.h"
 class Elements;

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

@@ -3 +3 @@
 
 /*forward declarations */
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 class Parameters;
 class Elements;

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 #include "./DofIndexing.h"

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

@@ -2 +2 @@
 #define  _CONTAINER_NODES_H_
 
-#include "./DataSet.h"
+#include "../datastructures/datastructures.h"
 class Parameters;
 class Elements;

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

@@ -15 +15 @@
 #include <cstring>
 #include "../../shared/shared.h"
+#include "../../datastructures/datastructures.h"
 #include "./OptionUtilities.h"
-#include "../Object.h"
 /*}}}*/
 

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

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

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

@@ -15 +15 @@
 #include <cstring>
 
-#include "../DataSet.h"
 #include "./Options.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 /*}}}*/

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

@@ -4 +4 @@
 /*forward declarations */
 class Option;
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "./GenericOption.h"
 

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

@@ -15 +15 @@
 #endif
 
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../Node.h"
 /*}}}*/

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

@@ -6 +6 @@
 template <class doublematrix> class Matrix;
 template <class doubletype> class Vector;
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 /*}}}*/

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

@@ -8 +8 @@
 /*Headers:*/
 /*{{{*/
-#include "./Object.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/Numerics/constants.h"
 /*}}}*/

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

@@ -3 +3 @@
 
 /*forward declarations */
-#include "./DataSet.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 

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

@@ -5 +5 @@
 #ifndef _ALL_CLASSES_H_
 #define _ALL_CLASSES_H_
-
-/*Abstract classes: */
-#include "./Object.h"
-#include "./DataSet.h"
 
 /*Objects: */

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

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

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

@@ -16 +16 @@
 #include <iostream>
 
-#include "../DataSet.h"
 #include "../Options/Options.h"
 #include "./Observations.h"
 #include "./Observation.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 

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

@@ -5 +5 @@
 class Variogram;
 class Options;
-#include "../DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "../../shared/shared.h"
 

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

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

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../../toolkits/toolkits.h"
-#include "../../shared/Enum/Enum.h"
+#include "../../shared/shared.h"
 class Node;
 template <class doublematrix> class Matrix;

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

@@ -11 +11 @@
 /*Headers:*/
 /*{{{*/
-#include "../Object.h"
+#include "../../datastructures/datastructures.h"
 #include "../../toolkits/toolkits.h"
-#include "../../shared/Enum/Enum.h"
+#include "../../shared/shared.h"
 class Node;
 template <class doubletype> class Vector;

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

@@ -17 +17 @@
 #include <iostream>
 
-#include "./DataSet.h"
+#include "../datastructures/datastructures.h"
 #include "../shared/shared.h"
 

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

@@ -19 +19 @@
 
 #include "../../shared/shared.h"
-#include "../../classes/DataSet.h"
+#include "../../datastructures/datastructures.h"
 #include "../../classes/Bucket.h"
 #include "../mumps/mumpsincludes.h"