Index: /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 14999) @@ -12,5 +12,4 @@ #include "./AverageOntoPartitionx.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" #include "../../toolkits/toolkits.h" Index: /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ComputeBasalStressx( Vector** psigma,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ComputeStrainRatex( Vector** peps,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 14999) @@ -6,8 +6,6 @@ #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../classes/classes.h" -#include "../../shared/Enum/Enum.h" int ConfigureObjectsx( Elements* elements, Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14999) @@ -6,7 +6,5 @@ #include "./ConstraintsStateLocal.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ConstraintsStatex(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "./ConstraintsStateLocal.h" -#include "../../shared/Enum/Enum.h" -#include "../../shared/io/io.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ControlInputGetGradientx( Vector** pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* norm_list,int step){ Index: /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ControlInputSetGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* gradient){ Index: /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void CreateNodalConstraintsx( Vector** pys, Nodes* nodes,int configuration_type){ Index: /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./Delta18oParameterizationx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void Delta18oParameterizationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void DragCoefficientAbsGradientx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){ Index: /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14999) @@ -6,7 +6,5 @@ #include "./EdgeDetectionx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp (revision 14999) @@ -12,5 +12,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" int hascommondedge(int* element1,int* element2); Index: /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./Exp2Kmlx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../Xy2llx/Xy2llx.h" Index: /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void GetSolutionFromInputsx( Vector** psolution, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void GetVectorFromControlInputsx(Vector** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){ Index: /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void GetVectorFromInputsx( Vector** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ Index: /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (revision 14999) @@ -10,5 +10,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h" Index: /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void Gradjx(Vector** pgradient,IssmDouble** pnorm_list, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 14999) @@ -4,7 +4,5 @@ #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../../classes/classes.h" #include "./GroundinglineMigrationx.h" Index: /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputArtificialNoisex( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int enum_name,IssmDouble min,IssmDouble max){ Index: /issm/trunk-jpl/src/c/modules/InputControlUpdatex/InputControlUpdatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputControlUpdatex/InputControlUpdatex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputControlUpdatex/InputControlUpdatex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputControlUpdatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,IssmDouble scalar,bool save_parameter){ Index: /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp (revision 14999) @@ -4,8 +4,6 @@ #include "./InputConvergencex.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" bool InputConvergencex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int* enums, int num_enums, int* criterionenums, IssmDouble* criterionvalues,int num_criterionenums){ Index: /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int original_enum, int new_enum){ Index: /issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../toolkits/toolkits.h" #include "../../classes/classes.h" -#include "../../shared/Enum/Enum.h" void InputScalex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type, IssmDouble scale_factor){ Index: /issm/trunk-jpl/src/c/modules/InputToResultx/InputToResultx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputToResultx/InputToResultx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputToResultx/InputToResultx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputToResultx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int enum_type){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool constant, int name){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h" #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h" Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h" Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* solution){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* vector, int name, int type){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* vector, int name, int type){ Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (revision 14998) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (revision 14999) @@ -8,5 +8,5 @@ #include "../../classes/objects/objects.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" +#include "../../shared/shared.h" /*threading: */ Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./IoModelToConstraintsx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type){ Index: /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 14999) @@ -4,7 +4,5 @@ #include "./KMLFileReadx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" KML_Object* KMLFileReadx(FILE* fid){ Index: /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 14999) @@ -4,7 +4,5 @@ #include "./KMLMeshWritex.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void KMLMeshWritex(int* ierror,char* name,char* notes,int* elem,int melem,int nelem,int* nodecon,int mncon,int nncon,double* lat, double* lng,int* part,double* data, int mdata, int ndata,double* cmap, int mcmap, int ncmap,FILE* fid){ Index: /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 14999) @@ -4,7 +4,5 @@ #include "./KMLOverlayx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void KMLOverlayx(int* ierror, Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./Kml2Expx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../Ll2xyx/Ll2xyx.h" #include "../KMLFileReadx/KMLFileReadx.h" Index: /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 14998) +++ /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 14999) @@ -6,5 +6,5 @@ #define _MESHPARTITIONX_H -#include "../../shared/Enum/Enum.h" +#include "../../shared/shared.h" /* local prototypes: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/classes.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 14999) @@ -1,5 +1,3 @@ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/classes.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 14999) @@ -2,7 +2,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 14999) @@ -11,5 +11,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../toolkits/toolkits.h" -#include "../../shared/io/io.h" -#include "../../shared/Enum/Enum.h" #include "../../classes/objects/objects.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14999) @@ -10,9 +10,7 @@ #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../../classes/objects/objects.h" #include "../../shared/shared.h" #include "../MeshPartitionx/MeshPartitionx.h" -#include "../../shared/io/io.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14999) @@ -4,8 +4,6 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" -#include "../../../shared/io/io.h" #include "../../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14999) @@ -9,6 +9,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 14999) @@ -5,5 +5,4 @@ #include "../../shared/shared.h" #include "../../classes/classes.h" -#include "../../shared/Enum/Enum.h" void DistributeNumDofs(DofIndexing* index,int analysis_type,IssmDouble* vertices_type){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 14999) @@ -12,6 +12,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" -#include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (revision 14999) @@ -2,7 +2,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" -#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" -#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" -#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14999) @@ -11,6 +11,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" -#include "../../shared/Enum/Enum.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 14999) @@ -12,6 +12,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" -#include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14999) @@ -1,5 +1,3 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" -#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 14999) @@ -4,8 +4,6 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" -#include "../../../shared/io/io.h" #include "../../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp (revision 14999) @@ -11,5 +11,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 14999) @@ -2,7 +2,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 14999) @@ -3,7 +3,5 @@ */ -#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 14999) @@ -3,6 +3,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 14999) @@ -4,6 +4,4 @@ #include "../../../toolkits/toolkits.h" -#include "../../../shared/io/io.h" -#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp (revision 14999) @@ -11,5 +11,4 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../shared/Enum/Enum.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void NodalValuex( IssmDouble* pnodalvalue, int natureofdataenum,Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,bool process_units){ Index: /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 14999) @@ -15,5 +15,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void NodeConnectivityx(int** pconnectivity,int* pwidth,int* elements, int nels, int nods){ Index: /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void NodesDofx(Nodes* nodes, Parameters* parameters,int configuration_type){ Index: /issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp (revision 14999) @@ -8,5 +8,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void OutputRiftsx( Vec* priftproperties, Loads* loads, int numrifts){ Index: /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (revision 14999) @@ -14,8 +14,6 @@ #include "./ParseToolkitsOptionsx.h" -#include "../../shared/io/io.h" #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ParseToolkitsOptionsx(Parameters* parameters,FILE* fid){ Index: /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./PositiveDegreeDayx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void PositiveDegreeDayx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./ResetConstraintsx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../ConstraintsStatex/ConstraintsStatex.h" Index: /issm/trunk-jpl/src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void RheologyBbarAbsGradientx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){ Index: /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* vector){ Index: /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (revision 14999) @@ -7,7 +7,5 @@ #include "../Xy2llx/Xy2llx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" int Shp2Expx(char* filshp,char* filexp){ Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 14999) @@ -6,7 +6,5 @@ #include "../Xy2llx/Xy2llx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" int Shp2Kmlx(char* filshp,char* filkml, Index: /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 14999) @@ -5,7 +5,5 @@ #include "./SmbGradientsx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SmbGradientsx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SpcNodesx(Nodes* nodes,Constraints* constraints,Parameters* parameters, int analysis_type){ Index: /issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SurfaceAbsVelMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units,int weight_index){ Index: /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h" Index: /issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" #include "../SurfaceAreax/SurfaceAreax.h" Index: /issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SurfaceLogVelMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units,int weight_index){ Index: /issm/trunk-jpl/src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SurfaceLogVxVyMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units,int weight_index){ Index: /issm/trunk-jpl/src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void SurfaceRelVelMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units,int weight_index){ Index: /issm/trunk-jpl/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ThicknessAbsMisfitx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){ Index: /issm/trunk-jpl/src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ThicknessAcrossGradientx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){ Index: /issm/trunk-jpl/src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void ThicknessAlongGradientx( IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units, int weight_index){ Index: /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 14999) @@ -6,7 +6,5 @@ #include "./TriMeshx.h" #include "../../shared/shared.h" -#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" /*ANSI_DECLARATORS needed to call triangle library: */ #if defined(_HAVE_TRIANGLE_) Index: /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vector* yg){ Index: /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp (revision 14999) @@ -7,5 +7,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void VecMergex(Vector* ug, Vector* uf, Nodes* nodes, Parameters* parameters, int SetEnum){ Index: /issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.cpp (revision 14999) @@ -8,5 +8,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void VertexCoordinatesx( IssmDouble** px, IssmDouble** py, IssmDouble** pz, Vertices* vertices) { Index: /issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.cpp (revision 14998) +++ /issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.cpp (revision 14999) @@ -6,5 +6,4 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../shared/Enum/Enum.h" void VerticesDofx( Vertices* vertices, Parameters* parameters) {