Index: /issm/trunk/src/c/Container/Constraints.h =================================================================== --- /issm/trunk/src/c/Container/Constraints.h (revision 4236) +++ /issm/trunk/src/c/Container/Constraints.h (revision 4236) @@ -0,0 +1,39 @@ +/*!\file: Constraints.h + * \brief prototypes for Constraints.h + */ + +#ifndef _CONTAINER_CONSTRAINTS_H_ +#define _CONTAINER_CONSTRAINTS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + + +class Constraints: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Constraints(); + Constraints(int enum_type); + ~Constraints(); + /*}}}*/ + /*numerics: {{{1*/ + int NumberOfLocalRgbs(int analysis_type); + int NumberOfConstraints(void); + void SetupSpcs(Nodes* nodes,Vec yg,int analysis_type); + void SetupMpcs(Mat Rmg,Nodes* nodes,int analysis_type); + /*}}}*/ + +}; + + +#endif //ifndef _CONSTRAINTS_H_ + Index: /issm/trunk/src/c/Container/Container.h =================================================================== --- /issm/trunk/src/c/Container/Container.h (revision 4236) +++ /issm/trunk/src/c/Container/Container.h (revision 4236) @@ -0,0 +1,20 @@ +/*!\file: Container.h + * \brief prototypes for all containers used in ISSM + */ + +#ifndef _CONTAINER_CONTAINER_H_ +#define _CONTAINER_CONTAINER_H_ + +#include "./DataSet.h" +#include "./Constraints.h" +#include "./Elements.h" +#include "./Inputs.h" +#include "./Loads.h" +#include "./Materials.h" +#include "./Nodes.h" +#include "./Parameters.h" +#include "./Results.h" +#include "./Vertices.h" + +#endif //ifndef _CONTAINER_H_ + Index: /issm/trunk/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk/src/c/Container/DataSet.cpp (revision 4235) +++ /issm/trunk/src/c/Container/DataSet.cpp (revision 4236) @@ -533,5 +533,5 @@ /*}}}*/ /*FUNCTION DataSet::Configure{{{1*/ -void DataSet::Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ +void DataSet::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ vector::iterator object; Index: /issm/trunk/src/c/Container/DataSet.h =================================================================== --- /issm/trunk/src/c/Container/DataSet.h (revision 4235) +++ /issm/trunk/src/c/Container/DataSet.h (revision 4236) @@ -3,6 +3,6 @@ */ -#ifndef _DATASET_H_ -#define _DATASET_H_ +#ifndef _CONTAINER_DATASET_H_ +#define _CONTAINER_DATASET_H_ #include @@ -12,16 +12,13 @@ /*forward declarations */ -class Constraints; + + +class Elements; +class Loads; +class Nodes; +class Vertices; class Materials; class Parameters; -class Elements; -class Vertices; -class Loads; -class Nodes; -class DataSet; -class Inputs; - -/********************************************************DATASET************************************************/ class DataSet{ @@ -56,5 +53,5 @@ int Size(); void clear(); - void Configure(Elements* elements,Loads* loads, DataSet* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); + void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); Object* GetObjectByOffset(int offset); Object* GetObjectById(int* poffset,int eid); @@ -72,227 +69,3 @@ DataSet* DataSetDemarshallRaw(char** pmarshalled_dataset); - -/********************************************************INPUT************************************************/ - -class Input; -class Node; - -class Inputs: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Inputs(); - Inputs(int enum_type); - ~Inputs(); - /*}}}*/ - /*numerics: {{{1*/ - int AddInput(Input* in_input); - Input* GetInput(int enum_name); - Inputs* SpawnTriaInputs(int* indices); - Inputs* SpawnBeamInputs(int* indices); - Inputs* SpawnSingInputs(int index ); - - void GetParameterValue(bool* pvalue,int enum_type); - void GetParameterValue(int* pvalue,int enum_type); - void GetParameterValue(double* pvalue,int enum_type); - void GetParameterValue(double* pvalue,Node* node,int enum_type); - void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord,int enum_type); - void GetParameterValue(double* pvalue,double* gauss,int enum_type); - void GetParameterValue(double* pvalue,double* gauss,int enum_type,double defaultvalue); - void GetParameterAverage(double* pvalue, int enum_type); - - void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type); - void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type,double* defaultvalues); - - void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss,int enum_type); - void GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum); - void GetStrainRate3d(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum,int vzenum); - void GetStrainRate3dPattyn(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum); - - void ChangeEnum(int enumtype,int new_enumtype); - - /*}}}*/ - -}; - - -/********************************************************NODES************************************************/ - -class Nodes: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Nodes(); - Nodes(int enum_type); - ~Nodes(); - /*}}}*/ - /*numerics: {{{1*/ - void DistributeDofs(int numberofnodes,int numdofspernode,int analysis_type); - void FlagClones(int numberofnodes,int analysis_type); - void FlagNodeSets(Vec pv_g, Vec pv_m, Vec pv_n, Vec pv_f, Vec pv_s,int analysis_type); - int NumberOfDofs(int analysis_type); - int NumberOfNodes(int analysis_type); - int NumberOfNodes(void); - void Ranks(int* ranks,int analysis_type); - /*}}}*/ - -}; - - -/********************************************************VERTICES************************************************/ - -class Vertices: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Vertices(); - Vertices(int enum_type); - ~Vertices(); - /*}}}*/ - /*numerics: {{{1*/ - void CreatePartitioningVector(Vec* ppartition,int numobjects); - void DistributeDofs(int numberofnodes,int numdofspernode); - void FlagClones(int numberofnodes); - int NumberOfVertices(void); - void Ranks(int* ranks); - /*}}}*/ - -}; - - -/********************************************************LOADS************************************************/ - -class Loads: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Loads(); - Loads(int enum_type); - ~Loads(); - /*}}}*/ - /*numerics: {{{1*/ - int MeltingIsPresent(); - void MeltingConstraints(int* pconverged, int* pnum_unstable_constraints); - int NumberOfLoads(void); - void OutputRifts(Vec riftproperties); - /*}}}*/ - -}; - -/********************************************************ELEMENTS************************************************/ - -class Elements: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Elements(); - Elements(int enum_type); - ~Elements(); - /*}}}*/ - /*numerics: {{{1*/ - /*}}}*/ - -}; - -/********************************************************CONSTRAINTS************************************************/ - -class Constraints: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Constraints(); - Constraints(int enum_type); - ~Constraints(); - /*}}}*/ - /*numerics: {{{1*/ - int NumberOfLocalRgbs(int analysis_type); - int NumberOfConstraints(void); - void SetupSpcs(Nodes* nodes,Vec yg,int analysis_type); - void SetupMpcs(Mat Rmg,Nodes* nodes,int analysis_type); - /*}}}*/ - -}; - -/********************************************************MATERIALS************************************************/ - -class Materials: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Materials(); - Materials(int enum_type); - ~Materials(); - /*}}}*/ - /*numerics: {{{1*/ - /*}}}*/ - -}; - - -/********************************************************PARAMETERS************************************************/ - -class Parameters: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Parameters(); - Parameters(int enum_type); - ~Parameters(); - /*}}}*/ - /*numerics: {{{1*/ - int FindParam(bool* pinteger,int enum_type); - int FindParam(int* pinteger,int enum_type); - int FindParam(double* pscalar, int enum_type); - int FindParam(char** pstring,int enum_type); - int FindParam(char*** pstringarray,int* pM,int enum_type); - int FindParam(double** pdoublearray,int* pM,int enum_type); - int FindParam(double** pdoublearray,int* pM,int* pN,int enum_type); - int FindParam(Vec* pvec,int enum_type); - int FindParam(Mat* pmat,int enum_type); - - void SetParam(bool boolean,int enum_type); - void SetParam(int integer,int enum_type); - void SetParam(double scalar, int enum_type); - void SetParam(char* string,int enum_type); - void SetParam(char** stringarray,int M,int enum_type); - void SetParam(double* doublearray,int M,int enum_type); - void SetParam(double* doublearray,int M,int N,int enum_type); - void SetParam(Vec vec,int enum_type); - void SetParam(Mat mat,int enum_type); - - Object* FindParamObject(int enum_type); - /*}}}*/ - -}; - - -/********************************************************RESULTS************************************************/ - -class Results: public DataSet{ - - public: - - /*constructors, destructors: {{{1*/ - Results(); - Results(int enum_type); - ~Results(); - /*}}}*/ - /*numerics: {{{1*/ - Results* SpawnTriaResults(int* indices); - Results* SpawnBeamResults(int* indices); - Results* SpawnSingResults(int index ); - /*}}}*/ - -}; - - - #endif Index: /issm/trunk/src/c/Container/Elements.h =================================================================== --- /issm/trunk/src/c/Container/Elements.h (revision 4236) +++ /issm/trunk/src/c/Container/Elements.h (revision 4236) @@ -0,0 +1,36 @@ +/*!\file: Elements.h + * \brief prototypes for Elements.h + */ + +#ifndef _CONTAINER_ELEMENTS_H_ +#define _CONTAINER_ELEMENTS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + + +class Elements: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Elements(); + Elements(int enum_type); + ~Elements(); + /*}}}*/ + /*numerics: {{{1*/ + /*}}}*/ + +}; + + + +#endif //ifndef _ELEMENTS_H_ + Index: /issm/trunk/src/c/Container/Inputs.h =================================================================== --- /issm/trunk/src/c/Container/Inputs.h (revision 4236) +++ /issm/trunk/src/c/Container/Inputs.h (revision 4236) @@ -0,0 +1,61 @@ +/*!\file: Inputs.h + * \brief prototypes for Inputs.h + */ + +#ifndef _CONTAINER_INPUTS_H_ +#define _CONTAINER_INPUTS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Input; +class Node; + +class Inputs: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Inputs(); + Inputs(int enum_type); + ~Inputs(); + + /*}}}*/ + /*numerics: {{{1*/ + int AddInput(Input* in_input); + Input* GetInput(int enum_name); + Inputs* SpawnTriaInputs(int* indices); + Inputs* SpawnBeamInputs(int* indices); + Inputs* SpawnSingInputs(int index ); + + void GetParameterValue(bool* pvalue,int enum_type); + void GetParameterValue(int* pvalue,int enum_type); + void GetParameterValue(double* pvalue,int enum_type); + void GetParameterValue(double* pvalue,Node* node,int enum_type); + void GetParameterValue(double* pvalue,Node* node1,Node* node2,double gauss_coord,int enum_type); + void GetParameterValue(double* pvalue,double* gauss,int enum_type); + void GetParameterValue(double* pvalue,double* gauss,int enum_type,double defaultvalue); + void GetParameterAverage(double* pvalue, int enum_type); + + void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type); + void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type,double* defaultvalues); + + void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss,int enum_type); + void GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum); + void GetStrainRate3d(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum,int vzenum); + void GetStrainRate3dPattyn(double* epsilon,double* xyz_list, double* gauss, int vxenum, int vyenum); + + void ChangeEnum(int enumtype,int new_enumtype); + + /*}}}*/ + +}; + + + +#endif //ifndef _INPUTS_H_ Index: /issm/trunk/src/c/Container/Loads.h =================================================================== --- /issm/trunk/src/c/Container/Loads.h (revision 4236) +++ /issm/trunk/src/c/Container/Loads.h (revision 4236) @@ -0,0 +1,39 @@ +/*!\file: Loads.h + * \brief prototypes for Loads.h + */ + +#ifndef _CONTAINER_LOADS_H_ +#define _CONTAINER_LOADS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + +class Loads: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Loads(); + Loads(int enum_type); + ~Loads(); + /*}}}*/ + /*numerics: {{{1*/ + int MeltingIsPresent(); + void MeltingConstraints(int* pconverged, int* pnum_unstable_constraints); + int NumberOfLoads(void); + void OutputRifts(Vec riftproperties); + /*}}}*/ + +}; + + + +#endif //ifndef _LOADS_H_ + Index: /issm/trunk/src/c/Container/Materials.h =================================================================== --- /issm/trunk/src/c/Container/Materials.h (revision 4236) +++ /issm/trunk/src/c/Container/Materials.h (revision 4236) @@ -0,0 +1,33 @@ +/*!\file: Materials.h + * \brief prototypes for Materials.h + */ + +#ifndef _CONTAINER_MATERIALS_H_ +#define _CONTAINER_MATERIALS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + +class Materials: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Materials(); + Materials(int enum_type); + ~Materials(); + /*}}}*/ + /*numerics: {{{1*/ + /*}}}*/ + +}; + +#endif //ifndef _MATERIALS_H_ + Index: /issm/trunk/src/c/Container/Nodes.h =================================================================== --- /issm/trunk/src/c/Container/Nodes.h (revision 4236) +++ /issm/trunk/src/c/Container/Nodes.h (revision 4236) @@ -0,0 +1,35 @@ +/*!\file: Nodes.h + * \brief prototypes for Nodes.h + */ + +#ifndef _CONTAINER_NODES_H_ +#define _CONTAINER_NODES_H_ + +#include "./DataSet.h" + +/*forward declarations */ +class Nodes: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Nodes(); + Nodes(int enum_type); + ~Nodes(); + /*}}}*/ + /*numerics: {{{1*/ + void DistributeDofs(int numberofnodes,int numdofspernode,int analysis_type); + void FlagClones(int numberofnodes,int analysis_type); + void FlagNodeSets(Vec pv_g, Vec pv_m, Vec pv_n, Vec pv_f, Vec pv_s,int analysis_type); + int NumberOfDofs(int analysis_type); + int NumberOfNodes(int analysis_type); + int NumberOfNodes(void); + void Ranks(int* ranks,int analysis_type); + /*}}}*/ + +}; + + + +#endif //ifndef _NODES_H_ + Index: /issm/trunk/src/c/Container/Parameters.h =================================================================== --- /issm/trunk/src/c/Container/Parameters.h (revision 4236) +++ /issm/trunk/src/c/Container/Parameters.h (revision 4236) @@ -0,0 +1,56 @@ +/*!\file: Parameters.h + * \brief prototypes for Parameters.h + */ + +#ifndef _CONTAINER_PARAMETERS_H_ +#define _CONTAINER_PARAMETERS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + +class Parameters: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Parameters(); + Parameters(int enum_type); + ~Parameters(); + /*}}}*/ + /*numerics: {{{1*/ + int FindParam(bool* pinteger,int enum_type); + int FindParam(int* pinteger,int enum_type); + int FindParam(double* pscalar, int enum_type); + int FindParam(char** pstring,int enum_type); + int FindParam(char*** pstringarray,int* pM,int enum_type); + int FindParam(double** pdoublearray,int* pM,int enum_type); + int FindParam(double** pdoublearray,int* pM,int* pN,int enum_type); + int FindParam(Vec* pvec,int enum_type); + int FindParam(Mat* pmat,int enum_type); + + void SetParam(bool boolean,int enum_type); + void SetParam(int integer,int enum_type); + void SetParam(double scalar, int enum_type); + void SetParam(char* string,int enum_type); + void SetParam(char** stringarray,int M,int enum_type); + void SetParam(double* doublearray,int M,int enum_type); + void SetParam(double* doublearray,int M,int N,int enum_type); + void SetParam(Vec vec,int enum_type); + void SetParam(Mat mat,int enum_type); + + Object* FindParamObject(int enum_type); + /*}}}*/ + +}; + + + +#endif //ifndef _PARAMETERS_H_ + Index: /issm/trunk/src/c/Container/Results.h =================================================================== --- /issm/trunk/src/c/Container/Results.h (revision 4236) +++ /issm/trunk/src/c/Container/Results.h (revision 4236) @@ -0,0 +1,38 @@ +/*!\file: Results.h + * \brief prototypes for Results.h + */ + +#ifndef _CONTAINER_RESULTS_H_ +#define _CONTAINER_RESULTS_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + +class Results: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Results(); + Results(int enum_type); + ~Results(); + /*}}}*/ + /*numerics: {{{1*/ + Results* SpawnTriaResults(int* indices); + Results* SpawnBeamResults(int* indices); + Results* SpawnSingResults(int index ); + /*}}}*/ + +}; + + + +#endif //ifndef _RESULTS_H_ + Index: /issm/trunk/src/c/Container/Vertices.h =================================================================== --- /issm/trunk/src/c/Container/Vertices.h (revision 4236) +++ /issm/trunk/src/c/Container/Vertices.h (revision 4236) @@ -0,0 +1,40 @@ +/*!\file: Vertices.h + * \brief prototypes for Vertices.h + */ + +#ifndef _CONTAINER_VERTICES_H_ +#define _CONTAINER_VERTICES_H_ + +/*forward declarations */ +class Materials; +class Parameters; +class Elements; +class Vertices; +class Loads; +class Nodes; +class DataSet; +class Inputs; + +class Vertices: public DataSet{ + + public: + + /*constructors, destructors: {{{1*/ + Vertices(); + Vertices(int enum_type); + ~Vertices(); + /*}}}*/ + /*numerics: {{{1*/ + void CreatePartitioningVector(Vec* ppartition,int numobjects); + void DistributeDofs(int numberofnodes,int numdofspernode); + void FlagClones(int numberofnodes); + int NumberOfVertices(void); + void Ranks(int* ranks); + /*}}}*/ + +}; + + + +#endif //ifndef _VERTICES_H_ + Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 4235) +++ /issm/trunk/src/c/Makefile.am (revision 4236) @@ -199,15 +199,25 @@ ./objects/NodeSets.cpp\ ./objects/NodeSets.h\ - ./DataSet/DataSet.h\ - ./DataSet/DataSet.cpp\ - ./DataSet/Parameters.cpp\ - ./DataSet/Inputs.cpp\ - ./DataSet/Results.cpp\ - ./DataSet/Nodes.cpp\ - ./DataSet/Vertices.cpp\ - ./DataSet/Loads.cpp\ - ./DataSet/Elements.cpp\ - ./DataSet/Constraints.cpp\ - ./DataSet/Materials.cpp\ + ./Container/Container.h\ + ./Container/Constraints.h\ + ./Container/Constraints.cpp\ + ./Container/DataSet.h\ + ./Container/DataSet.cpp\ + ./Container/Elements.h\ + ./Container/Elements.cpp\ + ./Container/Inputs.h\ + ./Container/Inputs.cpp\ + ./Container/Loads.h\ + ./Container/Loads.cpp\ + ./Container/Materials.h\ + ./Container/Materials.cpp\ + ./Container/Nodes.h\ + ./Container/Nodes.cpp\ + ./Container/Parameters.h\ + ./Container/Parameters.cpp\ + ./Container/Results.h\ + ./Container/Results.cpp\ + ./Container/Vertices.h\ + ./Container/Vertices.cpp\ ./shared/shared.h\ ./shared/Alloc/alloc.h\ @@ -731,15 +741,25 @@ ./objects/NodeSets.cpp\ ./objects/NodeSets.h\ - ./DataSet/DataSet.h\ - ./DataSet/DataSet.cpp\ - ./DataSet/Parameters.cpp\ - ./DataSet/Inputs.cpp\ - ./DataSet/Results.cpp\ - ./DataSet/Nodes.cpp\ - ./DataSet/Vertices.cpp\ - ./DataSet/Loads.cpp\ - ./DataSet/Elements.cpp\ - ./DataSet/Constraints.cpp\ - ./DataSet/Materials.cpp\ + ./Container/Container.h\ + ./Container/Constraints.h\ + ./Container/Constraints.cpp\ + ./Container/DataSet.h\ + ./Container/DataSet.cpp\ + ./Container/Elements.h\ + ./Container/Elements.cpp\ + ./Container/Inputs.h\ + ./Container/Inputs.cpp\ + ./Container/Loads.h\ + ./Container/Loads.cpp\ + ./Container/Materials.h\ + ./Container/Materials.cpp\ + ./Container/Nodes.h\ + ./Container/Nodes.cpp\ + ./Container/Parameters.h\ + ./Container/Parameters.cpp\ + ./Container/Results.h\ + ./Container/Results.cpp\ + ./Container/Vertices.h\ + ./Container/Vertices.cpp\ ./shared/shared.h\ ./shared/Threads/issm_threads.h\ Index: /issm/trunk/src/c/io/io.h =================================================================== --- /issm/trunk/src/c/io/io.h (revision 4235) +++ /issm/trunk/src/c/io/io.h (revision 4236) @@ -7,5 +7,5 @@ #include "../objects/objects.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../include/include.h" Index: /issm/trunk/src/c/issm.h =================================================================== --- /issm/trunk/src/c/issm.h (revision 4235) +++ /issm/trunk/src/c/issm.h (revision 4236) @@ -9,5 +9,5 @@ #include "./shared/shared.h" #include "./objecs/objects.h" -#include "./DataSet/DataSet.h" +#include "./Container/Container.h" #include "./EnumDefinitions/EnumDefinitions.h" #include "./toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/BuildNodeSetsx/BuildNodeSetsx.h =================================================================== --- /issm/trunk/src/c/modules/BuildNodeSetsx/BuildNodeSetsx.h (revision 4235) +++ /issm/trunk/src/c/modules/BuildNodeSetsx/BuildNodeSetsx.h (revision 4236) @@ -6,5 +6,5 @@ #define _BUILDNODESETSX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h =================================================================== --- /issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h (revision 4235) +++ /issm/trunk/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.h =================================================================== --- /issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.h (revision 4235) +++ /issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.h (revision 4236) @@ -6,5 +6,5 @@ #define _COMPUTEPRESSUREX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h =================================================================== --- /issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h (revision 4235) +++ /issm/trunk/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h =================================================================== --- /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h (revision 4235) +++ /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.h (revision 4236) @@ -6,5 +6,5 @@ #define _CONFIGUREOBJECTSX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.h =================================================================== --- /issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.h (revision 4235) +++ /issm/trunk/src/c/modules/CostFunctionx/CostFunctionx.h (revision 4236) @@ -6,5 +6,5 @@ #define _COSTFUNCTIONX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/Dux/Dux.h =================================================================== --- /issm/trunk/src/c/modules/Dux/Dux.h (revision 4235) +++ /issm/trunk/src/c/modules/Dux/Dux.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h =================================================================== --- /issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h (revision 4235) +++ /issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h (revision 4236) @@ -6,5 +6,5 @@ #define _FIELDAVERAGEVERTICESX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.h =================================================================== --- /issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.h (revision 4235) +++ /issm/trunk/src/c/modules/FieldDepthAveragex/FieldDepthAveragex.h (revision 4236) @@ -6,5 +6,5 @@ #define _FIELDDEPTHAVERAGEX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h =================================================================== --- /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (revision 4235) +++ /issm/trunk/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h =================================================================== --- /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (revision 4235) +++ /issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (revision 4236) @@ -6,5 +6,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/Gradjx/Gradjx.h =================================================================== --- /issm/trunk/src/c/modules/Gradjx/Gradjx.h (revision 4235) +++ /issm/trunk/src/c/modules/Gradjx/Gradjx.h (revision 4236) @@ -6,5 +6,5 @@ #define _GRADJX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/InputAXPYx/InputAXPYx.h =================================================================== --- /issm/trunk/src/c/modules/InputAXPYx/InputAXPYx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputAXPYx/InputAXPYx.h (revision 4236) @@ -6,5 +6,5 @@ #define _AXPYINPUTX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.h =================================================================== --- /issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputControlConstrainx/InputControlConstrainx.h (revision 4236) @@ -6,5 +6,5 @@ #define _CONTROLCONTRAININPUTX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.h =================================================================== --- /issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.h (revision 4235) +++ /issm/trunk/src/c/modules/InputConvergencex/InputConvergencex.h (revision 4236) @@ -5,5 +5,5 @@ #define _INPUTCONVERGENCEX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h =================================================================== --- /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h (revision 4235) +++ /issm/trunk/src/c/modules/InputDepthAveragex/InputDepthAveragex.h (revision 4236) @@ -6,5 +6,5 @@ #define _DEPTHAVERAGEINPUTX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.h =================================================================== --- /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.h (revision 4235) +++ /issm/trunk/src/c/modules/InputDuplicatex/InputDuplicatex.h (revision 4236) @@ -6,5 +6,5 @@ #define _INPUTDUPLICATEX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputExtrudex/InputExtrudex.h =================================================================== --- /issm/trunk/src/c/modules/InputExtrudex/InputExtrudex.h (revision 4235) +++ /issm/trunk/src/c/modules/InputExtrudex/InputExtrudex.h (revision 4236) @@ -6,5 +6,5 @@ #define _INPUTEXTRUDEX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputScalex/InputScalex.h =================================================================== --- /issm/trunk/src/c/modules/InputScalex/InputScalex.h (revision 4235) +++ /issm/trunk/src/c/modules/InputScalex/InputScalex.h (revision 4236) @@ -6,5 +6,5 @@ #define _SCALEINPUTX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputToResultx/InputToResultx.h =================================================================== --- /issm/trunk/src/c/modules/InputToResultx/InputToResultx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputToResultx/InputToResultx.h (revision 4236) @@ -6,5 +6,5 @@ #define _INPUTTORESULTX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (revision 4235) +++ /issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" void InputUpdateFromDakotax(FemModel* femmodel,double* variables,char** variables_descriptors,int numvariables); Index: /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h =================================================================== --- /issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h (revision 4235) +++ /issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/MassFluxx/MassFluxx.h =================================================================== --- /issm/trunk/src/c/modules/MassFluxx/MassFluxx.h (revision 4235) +++ /issm/trunk/src/c/modules/MassFluxx/MassFluxx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MASSFLUXX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxAbsVxx/MaxAbsVxx.h =================================================================== --- /issm/trunk/src/c/modules/MaxAbsVxx/MaxAbsVxx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxAbsVxx/MaxAbsVxx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXABSVXX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxAbsVyx/MaxAbsVyx.h =================================================================== --- /issm/trunk/src/c/modules/MaxAbsVyx/MaxAbsVyx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxAbsVyx/MaxAbsVyx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXABSVYX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxAbsVzx/MaxAbsVzx.h =================================================================== --- /issm/trunk/src/c/modules/MaxAbsVzx/MaxAbsVzx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxAbsVzx/MaxAbsVzx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXABSVZX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxVelx/MaxVelx.h =================================================================== --- /issm/trunk/src/c/modules/MaxVelx/MaxVelx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxVelx/MaxVelx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXVELX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxVxx/MaxVxx.h =================================================================== --- /issm/trunk/src/c/modules/MaxVxx/MaxVxx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxVxx/MaxVxx.h (revision 4236) @@ -5,5 +5,5 @@ #define _MAXVXX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxVyx/MaxVyx.h =================================================================== --- /issm/trunk/src/c/modules/MaxVyx/MaxVyx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxVyx/MaxVyx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXVYX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MaxVzx/MaxVzx.h =================================================================== --- /issm/trunk/src/c/modules/MaxVzx/MaxVzx.h (revision 4235) +++ /issm/trunk/src/c/modules/MaxVzx/MaxVzx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MAXVZX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MinVelx/MinVelx.h =================================================================== --- /issm/trunk/src/c/modules/MinVelx/MinVelx.h (revision 4235) +++ /issm/trunk/src/c/modules/MinVelx/MinVelx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MINVELX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MinVxx/MinVxx.h =================================================================== --- /issm/trunk/src/c/modules/MinVxx/MinVxx.h (revision 4235) +++ /issm/trunk/src/c/modules/MinVxx/MinVxx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MINVX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MinVyx/MinVyx.h =================================================================== --- /issm/trunk/src/c/modules/MinVyx/MinVyx.h (revision 4235) +++ /issm/trunk/src/c/modules/MinVyx/MinVyx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MINVYX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/MinVzx/MinVzx.h =================================================================== --- /issm/trunk/src/c/modules/MinVzx/MinVzx.h (revision 4235) +++ /issm/trunk/src/c/modules/MinVzx/MinVzx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MINVZX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/Misfitx/Misfitx.h =================================================================== --- /issm/trunk/src/c/modules/Misfitx/Misfitx.h (revision 4235) +++ /issm/trunk/src/c/modules/Misfitx/Misfitx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MISFITX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateNodesBalancedthickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateNodesBalancedthickness.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateNodesBalancedthickness.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateNodesBalancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateNodesBalancedthickness2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateNodesBalancedthickness2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/UpdateElementsBalancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/UpdateElementsBalancedthickness2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/UpdateElementsBalancedthickness2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateNodesBalancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateNodesBalancedvelocities.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateNodesBalancedvelocities.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/UpdateElementsBalancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/UpdateElementsBalancedvelocities.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/UpdateElementsBalancedvelocities.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../toolkits/toolkits.h" #include "../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../../objects/objects.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../include/include.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/UpdateElementsPrognostic2.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/UpdateElementsPrognostic2.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/UpdateElementsPrognostic2.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateLoadsSlopeCompute.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateNodesSlopeCompute.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/UpdateElementsSlopeCompute.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../io/io.h" #include "../../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 4236) @@ -2,5 +2,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 4235) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 4236) @@ -3,5 +3,5 @@ */ -#include "../../../DataSet/DataSet.h" +#include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" #include "../../../io/io.h" Index: /issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.h =================================================================== --- /issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.h (revision 4235) +++ /issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.h (revision 4236) @@ -6,5 +6,5 @@ #define _MPCNODESX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/NodesDofx/NodesDofx.h =================================================================== --- /issm/trunk/src/c/modules/NodesDofx/NodesDofx.h (revision 4235) +++ /issm/trunk/src/c/modules/NodesDofx/NodesDofx.h (revision 4236) @@ -6,5 +6,5 @@ #define _NODESDOFX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp =================================================================== --- /issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp (revision 4235) +++ /issm/trunk/src/c/modules/OutputResultsx/ElementResultsToPatch.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "stdio.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../io/io.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 4235) +++ /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 4236) @@ -12,5 +12,5 @@ #include "stdio.h" #include "./OutputResultsx.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../io/io.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h =================================================================== --- /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h (revision 4235) +++ /issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h (revision 4236) @@ -12,5 +12,5 @@ #endif -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #ifdef _SERIAL_ Index: /issm/trunk/src/c/modules/OutputRiftsx/OutputRiftsx.h =================================================================== --- /issm/trunk/src/c/modules/OutputRiftsx/OutputRiftsx.h (revision 4235) +++ /issm/trunk/src/c/modules/OutputRiftsx/OutputRiftsx.h (revision 4236) @@ -6,5 +6,5 @@ #define _OUTPUTRIFTSX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.h =================================================================== --- /issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.h (revision 4235) +++ /issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.h (revision 4236) @@ -6,5 +6,5 @@ #define _PENALTYCONSTRAINTSX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.h =================================================================== --- /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.h (revision 4235) +++ /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.h (revision 4236) @@ -8,5 +8,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" int RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints); Index: /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h =================================================================== --- /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h (revision 4235) +++ /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h (revision 4236) @@ -6,5 +6,5 @@ #define _PENALTYSYSTEMMATRICESX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h =================================================================== --- /issm/trunk/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h (revision 4235) +++ /issm/trunk/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h (revision 4236) @@ -5,5 +5,5 @@ #define _PROPAGATEFLAGSFROMCONNECTIVITYX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/Qmux/DakotaFree.cpp =================================================================== --- /issm/trunk/src/c/modules/Qmux/DakotaFree.cpp (revision 4235) +++ /issm/trunk/src/c/modules/Qmux/DakotaFree.cpp (revision 4236) @@ -10,5 +10,5 @@ #endif -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../shared/shared.h" #include "../../include/include.h" Index: /issm/trunk/src/c/modules/Qmux/DakotaResponses.cpp =================================================================== --- /issm/trunk/src/c/modules/Qmux/DakotaResponses.cpp (revision 4235) +++ /issm/trunk/src/c/modules/Qmux/DakotaResponses.cpp (revision 4236) @@ -9,5 +9,5 @@ #endif -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../shared/shared.h" #include "../../include/include.h" Index: /issm/trunk/src/c/modules/Qmux/Qmux.h =================================================================== --- /issm/trunk/src/c/modules/Qmux/Qmux.h (revision 4235) +++ /issm/trunk/src/c/modules/Qmux/Qmux.h (revision 4236) @@ -6,5 +6,5 @@ #define _QMUX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.h =================================================================== --- /issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.h (revision 4235) +++ /issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../toolkits/toolkits.h" Index: /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h =================================================================== --- /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h (revision 4235) +++ /issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h =================================================================== --- /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h (revision 4235) +++ /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.h (revision 4236) @@ -6,5 +6,5 @@ #define _SYSTEMMATRICESX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.cpp =================================================================== --- /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.cpp (revision 4235) +++ /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.cpp (revision 4236) @@ -8,5 +8,5 @@ #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" void UpdateGeometryx( Elements* elements, Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters){ Index: /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.h =================================================================== --- /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.h (revision 4235) +++ /issm/trunk/src/c/modules/UpdateGeometryx/UpdateGeometryx.h (revision 4236) @@ -6,5 +6,5 @@ #define _UPDATEGEOMETRYX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h =================================================================== --- /issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h (revision 4235) +++ /issm/trunk/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h (revision 4236) @@ -6,5 +6,5 @@ #define _UPDATEVERTEXPOSITIONSXX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/VecExtrudex/VecExtrudex.h =================================================================== --- /issm/trunk/src/c/modules/VecExtrudex/VecExtrudex.h (revision 4235) +++ /issm/trunk/src/c/modules/VecExtrudex/VecExtrudex.h (revision 4236) @@ -6,5 +6,5 @@ #define _VECEXTRUDEX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /* local prototypes: */ Index: /issm/trunk/src/c/modules/VerticesDofx/VerticesDofx.h =================================================================== --- /issm/trunk/src/c/modules/VerticesDofx/VerticesDofx.h (revision 4235) +++ /issm/trunk/src/c/modules/VerticesDofx/VerticesDofx.h (revision 4236) @@ -6,5 +6,5 @@ #define _VERTICESDOFX_H -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" Index: /issm/trunk/src/c/objects/Constraints/Rgb.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/Rgb.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Constraints/Rgb.cpp (revision 4236) @@ -13,5 +13,5 @@ #include #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../shared/shared.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Constraints/Spc.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/Spc.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Constraints/Spc.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../shared/shared.h" #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../objects.h" Index: /issm/trunk/src/c/objects/DofIndexing.cpp =================================================================== --- /issm/trunk/src/c/objects/DofIndexing.cpp (revision 4235) +++ /issm/trunk/src/c/objects/DofIndexing.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../EnumDefinitions/EnumDefinitions.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../include/include.h" Index: /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp (revision 4236) @@ -11,5 +11,5 @@ #endif -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../objects/objects.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 4236) @@ -15,5 +15,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Elements/Beam.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4236) @@ -17,5 +17,5 @@ #include "../../shared/shared.h" #include "../../include/include.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/PentaHook.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/PentaHook.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/PentaHook.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/Sing.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/TriaHook.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/TriaHook.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/TriaHook.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/TriaRef.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/TriaRef.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Elements/TriaRef.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 4235) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/FemModel.cpp =================================================================== --- /issm/trunk/src/c/objects/FemModel.cpp (revision 4235) +++ /issm/trunk/src/c/objects/FemModel.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "stdio.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../modules/ModelProcessorx/ModelProcessorx.h" #include "./objects.h" Index: /issm/trunk/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk/src/c/objects/Hook.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Hook.cpp (revision 4236) @@ -13,5 +13,5 @@ #include #include "./objects.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../shared/shared.h" Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Loads/Friction.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Friction.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Loads/Friction.cpp (revision 4236) @@ -14,4 +14,5 @@ #include #include "../objects.h" +#include "../../Container/Container.h" #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" Index: /issm/trunk/src/c/objects/Loads/Load.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Load.h (revision 4235) +++ /issm/trunk/src/c/objects/Loads/Load.h (revision 4236) @@ -15,5 +15,5 @@ #include "../Object.h" #include "../../toolkits/toolkits.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../include/include.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" /*Object constructors and destructor*/ Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Node.cpp (revision 4236) @@ -13,5 +13,5 @@ #include #include "./objects.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../shared/shared.h" Index: /issm/trunk/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4236) @@ -14,5 +14,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/PetscVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4236) @@ -16,5 +16,5 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../shared/shared.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" /*}}}*/ Index: /issm/trunk/src/c/objects/Patch.cpp =================================================================== --- /issm/trunk/src/c/objects/Patch.cpp (revision 4235) +++ /issm/trunk/src/c/objects/Patch.cpp (revision 4236) @@ -13,5 +13,5 @@ #include #include "./objects.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/shared/Elements/ResolvePointers.cpp =================================================================== --- /issm/trunk/src/c/shared/Elements/ResolvePointers.cpp (revision 4235) +++ /issm/trunk/src/c/shared/Elements/ResolvePointers.cpp (revision 4236) @@ -10,5 +10,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" #include "../../include/include.h" #include "../Exceptions/exceptions.h" Index: /issm/trunk/src/c/shared/Elements/elements.h =================================================================== --- /issm/trunk/src/c/shared/Elements/elements.h (revision 4235) +++ /issm/trunk/src/c/shared/Elements/elements.h (revision 4236) @@ -7,5 +7,5 @@ #include "../../objects/objects.h" -#include "../../DataSet/DataSet.h" +#include "../../Container/Container.h" void ResolvePointers(Object** objects,int* object_ids,int* object_offsets,int num_objects,DataSet* dataset); Index: /issm/trunk/src/c/solutions/balancedthickness.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/balancedthickness.cpp (revision 4236) @@ -10,5 +10,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/balancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness2.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/balancedthickness2.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/balancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedvelocities.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/balancedvelocities.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/bedslope.cpp =================================================================== --- /issm/trunk/src/c/solutions/bedslope.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/bedslope.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/controlconvergence.cpp =================================================================== --- /issm/trunk/src/c/solutions/controlconvergence.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/controlconvergence.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/diagnostic.cpp =================================================================== --- /issm/trunk/src/c/solutions/diagnostic.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/diagnostic.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/prognostic.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/prognostic.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/prognostic2.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic2.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/prognostic2.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/steadystate.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystate.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/steadystate.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/steadystateconvergence.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystateconvergence.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/steadystateconvergence.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/surfaceslope.cpp =================================================================== --- /issm/trunk/src/c/solutions/surfaceslope.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/surfaceslope.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/thermal.cpp =================================================================== --- /issm/trunk/src/c/solutions/thermal.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/thermal.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/transient2d.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient2d.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/transient2d.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/transient3d.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient3d.cpp (revision 4235) +++ /issm/trunk/src/c/solutions/transient3d.cpp (revision 4236) @@ -11,5 +11,5 @@ #include "../objects/objects.h" #include "../shared/shared.h" -#include "../DataSet/DataSet.h" +#include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" Index: /issm/trunk/src/mex/AverageFilter/AverageFilter.h =================================================================== --- /issm/trunk/src/mex/AverageFilter/AverageFilter.h (revision 4235) +++ /issm/trunk/src/mex/AverageFilter/AverageFilter.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Bamg/Bamg.h =================================================================== --- /issm/trunk/src/mex/Bamg/Bamg.h (revision 4235) +++ /issm/trunk/src/mex/Bamg/Bamg.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h =================================================================== --- /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h (revision 4235) +++ /issm/trunk/src/mex/BamgConvertMesh/BamgConvertMesh.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h =================================================================== --- /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h (revision 4235) +++ /issm/trunk/src/mex/BuildNodeSets/BuildNodeSets.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h =================================================================== --- /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h (revision 4235) +++ /issm/trunk/src/mex/ComputeBasalStress/ComputeBasalStress.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ComputePressure/ComputePressure.h =================================================================== --- /issm/trunk/src/mex/ComputePressure/ComputePressure.h (revision 4235) +++ /issm/trunk/src/mex/ComputePressure/ComputePressure.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h =================================================================== --- /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h (revision 4235) +++ /issm/trunk/src/mex/ConfigureObjects/ConfigureObjects.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h =================================================================== --- /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h (revision 4235) +++ /issm/trunk/src/mex/ContourToMesh/ContourToMesh.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h =================================================================== --- /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h (revision 4235) +++ /issm/trunk/src/mex/ContourToNodes/ContourToNodes.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h =================================================================== --- /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h (revision 4235) +++ /issm/trunk/src/mex/ControlOptimization/ControlOptimization.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/CostFunction/CostFunction.h =================================================================== --- /issm/trunk/src/mex/CostFunction/CostFunction.h (revision 4235) +++ /issm/trunk/src/mex/CostFunction/CostFunction.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Du/Du.h =================================================================== --- /issm/trunk/src/mex/Du/Du.h (revision 4235) +++ /issm/trunk/src/mex/Du/Du.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Echo/Echo.h =================================================================== --- /issm/trunk/src/mex/Echo/Echo.h (revision 4235) +++ /issm/trunk/src/mex/Echo/Echo.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h =================================================================== --- /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h (revision 4235) +++ /issm/trunk/src/mex/ElementConnectivity/ElementConnectivity.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h =================================================================== --- /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h (revision 4235) +++ /issm/trunk/src/mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h =================================================================== --- /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h (revision 4235) +++ /issm/trunk/src/mex/FieldDepthAverage/FieldDepthAverage.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h =================================================================== --- /issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h (revision 4235) +++ /issm/trunk/src/mex/GetSolutionFromInputs/GetSolutionFromInputs.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Gradj/Gradj.h =================================================================== --- /issm/trunk/src/mex/Gradj/Gradj.h (revision 4235) +++ /issm/trunk/src/mex/Gradj/Gradj.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/HoleFiller/HoleFiller.h =================================================================== --- /issm/trunk/src/mex/HoleFiller/HoleFiller.h (revision 4235) +++ /issm/trunk/src/mex/HoleFiller/HoleFiller.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputControlConstrain/InputControlConstrain.h =================================================================== --- /issm/trunk/src/mex/InputControlConstrain/InputControlConstrain.h (revision 4235) +++ /issm/trunk/src/mex/InputControlConstrain/InputControlConstrain.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h =================================================================== --- /issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h (revision 4235) +++ /issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/InputDuplicate/InputDuplicate.h =================================================================== --- /issm/trunk/src/mex/InputDuplicate/InputDuplicate.h (revision 4235) +++ /issm/trunk/src/mex/InputDuplicate/InputDuplicate.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputExtrude/InputExtrude.h =================================================================== --- /issm/trunk/src/mex/InputExtrude/InputExtrude.h (revision 4235) +++ /issm/trunk/src/mex/InputExtrude/InputExtrude.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputScale/InputScale.h =================================================================== --- /issm/trunk/src/mex/InputScale/InputScale.h (revision 4235) +++ /issm/trunk/src/mex/InputScale/InputScale.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputToResult/InputToResult.h =================================================================== --- /issm/trunk/src/mex/InputToResult/InputToResult.h (revision 4235) +++ /issm/trunk/src/mex/InputToResult/InputToResult.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h =================================================================== --- /issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h (revision 4235) +++ /issm/trunk/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h =================================================================== --- /issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h (revision 4235) +++ /issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.h =================================================================== --- /issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.h (revision 4235) +++ /issm/trunk/src/mex/InputUpdateFromVector/InputUpdateFromVector.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h =================================================================== --- /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h (revision 4235) +++ /issm/trunk/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h =================================================================== --- /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h (revision 4235) +++ /issm/trunk/src/mex/InterpFromMeshToGrid/InterpFromMeshToGrid.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h =================================================================== --- /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (revision 4235) +++ /issm/trunk/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h =================================================================== --- /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (revision 4235) +++ /issm/trunk/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/MassFlux/MassFlux.h =================================================================== --- /issm/trunk/src/mex/MassFlux/MassFlux.h (revision 4235) +++ /issm/trunk/src/mex/MassFlux/MassFlux.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h =================================================================== --- /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h (revision 4235) +++ /issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/MeshPartition/MeshPartition.h =================================================================== --- /issm/trunk/src/mex/MeshPartition/MeshPartition.h (revision 4235) +++ /issm/trunk/src/mex/MeshPartition/MeshPartition.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Misfit/Misfit.h =================================================================== --- /issm/trunk/src/mex/Misfit/Misfit.h (revision 4235) +++ /issm/trunk/src/mex/Misfit/Misfit.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h =================================================================== --- /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h (revision 4235) +++ /issm/trunk/src/mex/ModelProcessor/ModelProcessor.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/MpcNodes/MpcNodes.h =================================================================== --- /issm/trunk/src/mex/MpcNodes/MpcNodes.h (revision 4235) +++ /issm/trunk/src/mex/MpcNodes/MpcNodes.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h =================================================================== --- /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h (revision 4235) +++ /issm/trunk/src/mex/NodeConnectivity/NodeConnectivity.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/NodesDof/NodesDof.h =================================================================== --- /issm/trunk/src/mex/NodesDof/NodesDof.h (revision 4235) +++ /issm/trunk/src/mex/NodesDof/NodesDof.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h =================================================================== --- /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h (revision 4235) +++ /issm/trunk/src/mex/NormalizeConstraints/NormalizeConstraints.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Orth/Orth.h =================================================================== --- /issm/trunk/src/mex/Orth/Orth.h (revision 4235) +++ /issm/trunk/src/mex/Orth/Orth.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/OutputResults/OutputResults.h =================================================================== --- /issm/trunk/src/mex/OutputResults/OutputResults.h (revision 4235) +++ /issm/trunk/src/mex/OutputResults/OutputResults.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/OutputRifts/OutputRifts.h =================================================================== --- /issm/trunk/src/mex/OutputRifts/OutputRifts.h (revision 4235) +++ /issm/trunk/src/mex/OutputRifts/OutputRifts.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h =================================================================== --- /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h (revision 4235) +++ /issm/trunk/src/mex/ParameterOutput/ParameterOutput.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h =================================================================== --- /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h (revision 4235) +++ /issm/trunk/src/mex/PenaltyConstraints/PenaltyConstraints.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h =================================================================== --- /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h (revision 4235) +++ /issm/trunk/src/mex/PenaltySystemMatrices/PenaltySystemMatrices.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/ProcessParams/ProcessParams.h =================================================================== --- /issm/trunk/src/mex/ProcessParams/ProcessParams.h (revision 4235) +++ /issm/trunk/src/mex/ProcessParams/ProcessParams.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h =================================================================== --- /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (revision 4235) +++ /issm/trunk/src/mex/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Qmu/Qmu.h =================================================================== --- /issm/trunk/src/mex/Qmu/Qmu.h (revision 4235) +++ /issm/trunk/src/mex/Qmu/Qmu.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h =================================================================== --- /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h (revision 4235) +++ /issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h =================================================================== --- /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h (revision 4235) +++ /issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h =================================================================== --- /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h (revision 4235) +++ /issm/trunk/src/mex/Reducevectorgtof/Reducevectorgtof.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h =================================================================== --- /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h (revision 4235) +++ /issm/trunk/src/mex/Reducevectorgtos/Reducevectorgtos.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/SetStructureField/SetStructureField.h =================================================================== --- /issm/trunk/src/mex/SetStructureField/SetStructureField.h (revision 4235) +++ /issm/trunk/src/mex/SetStructureField/SetStructureField.h (revision 4236) @@ -14,5 +14,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/Solver/Solver.h =================================================================== --- /issm/trunk/src/mex/Solver/Solver.h (revision 4235) +++ /issm/trunk/src/mex/Solver/Solver.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/SpcNodes/SpcNodes.h =================================================================== --- /issm/trunk/src/mex/SpcNodes/SpcNodes.h (revision 4235) +++ /issm/trunk/src/mex/SpcNodes/SpcNodes.h (revision 4236) @@ -12,5 +12,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h =================================================================== --- /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h (revision 4235) +++ /issm/trunk/src/mex/SystemMatrices/SystemMatrices.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/Test/Test.h =================================================================== --- /issm/trunk/src/mex/Test/Test.h (revision 4235) +++ /issm/trunk/src/mex/Test/Test.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/TriMesh/TriMesh.h =================================================================== --- /issm/trunk/src/mex/TriMesh/TriMesh.h (revision 4235) +++ /issm/trunk/src/mex/TriMesh/TriMesh.h (revision 4236) @@ -11,5 +11,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h =================================================================== --- /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h (revision 4235) +++ /issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.h (revision 4236) @@ -11,5 +11,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h =================================================================== --- /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h (revision 4235) +++ /issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.h (revision 4236) @@ -11,5 +11,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h =================================================================== --- /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h (revision 4235) +++ /issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.h (revision 4236) @@ -11,5 +11,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" Index: /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h =================================================================== --- /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h (revision 4235) +++ /issm/trunk/src/mex/UpdateGeometry/UpdateGeometry.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h =================================================================== --- /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h (revision 4235) +++ /issm/trunk/src/mex/UpdateVertexPositions/UpdateVertexPositions.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/mex/VerticesDof/VerticesDof.h =================================================================== --- /issm/trunk/src/mex/VerticesDof/VerticesDof.h (revision 4235) +++ /issm/trunk/src/mex/VerticesDof/VerticesDof.h (revision 4236) @@ -10,5 +10,5 @@ #include "../../c/modules/modules.h" -#include "../../c/DataSet/DataSet.h" +#include "../../c/Container/Container.h" #include "../../c/shared/shared.h"