Index: /issm/trunk-jpl/src/c/Container/Constraints.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Constraints.h (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Constraints.h (revision 14960) @@ -12,5 +12,5 @@ class Inputs; -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" /*! \brief Declaration of Constraints class. Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 14960) @@ -21,5 +21,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" using namespace std; Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "./Parameters.h" #include "../classes/classes.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "../classes/objects/Inputs/Input.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" using namespace std; Index: /issm/trunk-jpl/src/c/Container/Loads.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 14960) @@ -18,5 +18,5 @@ #include "./DataSet.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/Loads/Load.h" Index: /issm/trunk-jpl/src/c/Container/Materials.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Materials.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Materials.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./Materials.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/Materials/Material.h" Index: /issm/trunk-jpl/src/c/Container/Nodes.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./Nodes.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/Node.h" Index: /issm/trunk-jpl/src/c/Container/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 14960) @@ -21,5 +21,5 @@ #include "../Container/Container.h" #include "../classes/classes.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/io/io.h" Index: /issm/trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Options.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Options.cpp (revision 14960) @@ -20,5 +20,5 @@ #include "../classes/classes.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/io/io.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 14960) @@ -18,5 +18,5 @@ #include "./DataSet.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/Container/Results.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Results.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Results.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "./Parameters.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/ExternalResults/ExternalResult.h" #include "../classes/objects/ElementResults/ElementResult.h" Index: /issm/trunk-jpl/src/c/Container/Vertices.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 14960) @@ -18,5 +18,5 @@ #include "./DataSet.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/objects/Vertex.h" Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 14959) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 14960) @@ -191,8 +191,8 @@ ./shared/io/Comm/IssmComm.h\ ./shared/io/Comm/IssmComm.cpp\ + ./shared/Enum/Enum.h\ + ./shared/Enum/EnumDefinitions.h\ ./shared/Enum/EnumToStringx.cpp\ - ./shared/Enum/EnumToStringx.h\ ./shared/Enum/StringToEnumx.cpp\ - ./shared/Enum/StringToEnumx.h\ ./shared/Numerics/numerics.h\ ./shared/Numerics/types.h\ @@ -240,5 +240,4 @@ ./toolkitsenums.h\ ./toolkits.h\ - ./EnumDefinitions/EnumDefinitions.h\ ./modules/ModelProcessorx/ModelProcessorx.h\ ./modules/ModelProcessorx/ModelProcessorx.cpp\ Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14960) @@ -17,5 +17,5 @@ #include "../shared/Exceptions/exceptions.h" #include "../shared/MemOps/MemOps.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" /*DofIndexing constructors and destructor*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "../shared/io/io.h" #include "./classes.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" /*module includes: {{{*/ Index: /issm/trunk-jpl/src/c/classes/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./classes.h" #include "../Container/Container.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/IoModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/IoModel.h (revision 14960) @@ -8,5 +8,5 @@ #define _IOMODEL_H -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" class Parameters; Index: /issm/trunk-jpl/src/c/classes/Patch.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 14960) @@ -16,5 +16,5 @@ #include "../Container/Container.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/RiftStruct.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/RiftStruct.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/RiftStruct.cpp (revision 14960) @@ -4,5 +4,5 @@ #include "./classes.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../objects/objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../objects/objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../objects/objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../objects/objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h =================================================================== --- /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.h (revision 14960) @@ -13,5 +13,5 @@ #include "../objects/Object.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" class Node; template class Matrix; Index: /issm/trunk-jpl/src/c/classes/matrix/ElementVector.h =================================================================== --- /issm/trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/matrix/ElementVector.h (revision 14960) @@ -13,5 +13,5 @@ #include "../objects/Object.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" class Node; template class Vector; Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../../shared/shared.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../Container/Container.h" #include "../objects.h" Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../../shared/shared.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../Container/Container.h" #include "../objects.h" Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../../shared/shared.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../Container/Container.h" #include "../objects.h" Index: /issm/trunk-jpl/src/c/classes/objects/Contour.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Contour.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Contour.h (revision 14960) @@ -11,5 +11,5 @@ #include "../../shared/MemOps/MemOps.h" #include "../../shared/io/io.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "./Object.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "./objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" #include "../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./ElementResultLocal.h" #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./ElementResultLocal.h" #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./ElementResultLocal.h" #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "./ElementResultLocal.h" #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h (revision 14960) @@ -23,5 +23,5 @@ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h (revision 14960) @@ -21,5 +21,5 @@ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 14960) @@ -17,5 +17,5 @@ #include "../../../shared/Exceptions/exceptions.h" #include "../../../shared/Numerics/recast.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/io/Comm/Comm.h" #include "./ExternalResult.h" Index: /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "./objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" #include "../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 14960) @@ -12,5 +12,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_SubStyle.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Feature.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 14960) @@ -14,5 +14,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Feature.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Overlay.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 14960) @@ -15,5 +15,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Geometry.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_ColorStyle.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Geometry.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Geometry.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Feature.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Feature.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Geometry.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_ColorStyle.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 14960) @@ -11,5 +11,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Geometry.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_StyleSelector.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h (revision 14960) @@ -9,5 +9,5 @@ /*{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./KML_Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp (revision 14960) @@ -15,5 +15,5 @@ #include "../../classes.h" #include "../../../Container/Container.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 14960) @@ -13,5 +13,5 @@ #include #include -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../classes.h" Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 14960) @@ -13,5 +13,5 @@ #include #include -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../modules/ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../../classes.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../../classes.h" #include "../../../shared/shared.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" /*Matpar constructors and destructor*/ Index: /issm/trunk-jpl/src/c/classes/objects/Node.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Node.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Node.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "./objects.h" #include "../../Container/Container.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" #include "../../modules/ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 14960) @@ -18,5 +18,5 @@ #include "../../../shared/MemOps/MemOps.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./OptionUtilities.h" Index: /issm/trunk-jpl/src/c/classes/objects/Options/Option.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Options/Option.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Options/Option.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.h (revision 14960) @@ -8,5 +8,5 @@ /*Headers:{{{*/ #include "../../../shared/Exceptions/exceptions.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "./Option.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleTransientMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleTransientMatParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleTransientMatParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/GenericParam.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/GenericParam.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/GenericParam.h (revision 14960) @@ -17,5 +17,5 @@ #include "./Param.h" #include "../../../shared/shared.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" /** Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 14960) @@ -14,5 +14,5 @@ #include #include "../objects.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/shared.h" #include "../../../Container/Container.h" Index: /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 14960) @@ -12,5 +12,5 @@ #include #include "../classes.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h =================================================================== --- /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h (revision 14960) @@ -16,5 +16,5 @@ #include #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/toolkits/Vector.h =================================================================== --- /issm/trunk-jpl/src/c/classes/toolkits/Vector.h (revision 14959) +++ /issm/trunk-jpl/src/c/classes/toolkits/Vector.h (revision 14960) @@ -16,5 +16,5 @@ #include #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/main/issm.h =================================================================== --- /issm/trunk-jpl/src/c/main/issm.h (revision 14959) +++ /issm/trunk-jpl/src/c/main/issm.h (revision 14960) @@ -16,5 +16,5 @@ #include "../classes/classes.h" #include "../Container/Container.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../toolkits/toolkits.h" #include "../solutions/solutions.h" Index: /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../../Container/Container.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 14960) @@ -9,5 +9,5 @@ #include "../../toolkits/toolkits.h" #include "../../classes/classes.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 14960) @@ -4,5 +4,5 @@ #include "./ConstraintsStateLocal.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (revision 14960) @@ -10,5 +10,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../Container/Container.h" #include "../../classes/classes.h" Index: /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/InputArtificialNoisex/InputArtificialNoisex.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputControlUpdatex/InputControlUpdatex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputScalex/InputScalex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../toolkits/toolkits.h" #include "../../classes/classes.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputToResultx/InputToResultx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../classes/classes.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.h (revision 14960) @@ -8,5 +8,5 @@ #include "../../classes/objects/objects.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" /*threading: */ Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 14960) @@ -6,5 +6,5 @@ #define _MESHPARTITIONX_H -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 14960) @@ -2,5 +2,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 14960) @@ -11,5 +11,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../toolkits/toolkits.h" #include "../../shared/io/io.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14960) @@ -11,5 +11,5 @@ #include "../../Container/Container.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../classes/objects/objects.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14960) @@ -11,5 +11,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../shared/shared.h" #include "../../classes/classes.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../../shared/io/io.h" #include "../../Container/Container.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14960) @@ -1,5 +1,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp (revision 14960) @@ -11,5 +11,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../shared/io/io.h" -#include "../../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp (revision 14960) @@ -11,5 +11,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 14960) @@ -15,5 +15,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/OutputRiftsx/OutputRiftsx.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (revision 14960) @@ -17,5 +17,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (revision 14960) @@ -9,5 +9,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/ThicknessAlongGradientx/ThicknessAlongGradientx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.cpp (revision 14960) @@ -8,5 +8,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.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 14959) +++ /issm/trunk-jpl/src/c/modules/VerticesDofx/VerticesDofx.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" void VerticesDofx( Vertices* vertices, Parameters* parameters) { Index: /issm/trunk-jpl/src/c/shared/Enum/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/CMakeLists.txt (revision 14960) +++ /issm/trunk-jpl/src/c/shared/Enum/CMakeLists.txt (revision 14960) @@ -0,0 +1,5 @@ +# Subdirectories {{{ +# }}} +# Include Directory {{{ +include_directories(AFTER $ENV{ISSM_DIR}/src/c/EnumDefinitions) +# }}} Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 14960) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 14960) @@ -0,0 +1,599 @@ +/* + * \file EnumDefinitions.h: + * \brief: enum functions for our objects + */ + +#ifndef _ENUM_DEFINITIONS_ +#define _ENUM_DEFINITIONS_ + +enum definitions{ + /*Model fields {{{*/ + AutodiffIsautodiffEnum, + AutodiffNumDependentsEnum, + AutodiffNumDependentObjectsEnum, + AutodiffDependentObjectNamesEnum, + AutodiffDependentObjectTypesEnum, + AutodiffDependentObjectIndicesEnum, + AutodiffDependentObjectsEnum, + AutodiffNumIndependentsEnum, + AutodiffNumIndependentObjectsEnum, + AutodiffIndependentObjectNamesEnum, + AutodiffIndependentObjectTypesEnum, + AutodiffIndependentObjectsEnum, + AutodiffJacobianEnum, + AutodiffXpEnum, + AutodiffDriverEnum, + AutodiffFosForwardIndexEnum, + AutodiffFovForwardIndicesEnum, + AutodiffFosReverseIndexEnum, + AutodiffMassFluxSegmentsPresentEnum, + AutodiffKeepEnum, + BalancethicknessSpcthicknessEnum, + BalancethicknessStabilizationEnum, + BalancethicknessThickeningRateEnum, + BasalforcingsGeothermalfluxEnum, + BasalforcingsMeltingRateCorrectionEnum, + BasalforcingsMeltingRateEnum, + BathymetryEnum, + BedEnum, + ConstantsGEnum, + ConstantsReferencetemperatureEnum, + ConstantsYtsEnum, + DependentObjectEnum, + DiagnosticAbstolEnum, + DiagnosticIcefrontEnum, + DiagnosticIsnewtonEnum, + DiagnosticMaxiterEnum, + DiagnosticNumRequestedOutputsEnum, + DiagnosticPenaltyFactorEnum, + DiagnosticReferentialEnum, + DiagnosticReltolEnum, + DiagnosticRequestedOutputsEnum, + DiagnosticRestolEnum, + DiagnosticRiftPenaltyLockEnum, + DiagnosticRiftPenaltyThresholdEnum, + DiagnosticShelfDampeningEnum, + DiagnosticSpcvxEnum, + DiagnosticSpcvyEnum, + DiagnosticSpcvzEnum, + DiagnosticStokesreconditioningEnum, + DiagnosticVertexPairingEnum, + DiagnosticViscosityOvershootEnum, + LoadingforceXEnum, + LoadingforceYEnum, + LoadingforceZEnum, + FlowequationBordermacayealEnum, + FlowequationBorderpattynEnum, + FlowequationBorderstokesEnum, + FlowequationElementEquationEnum, + FlowequationIshutterEnum, + FlowequationIsl1l2Enum, + FlowequationIsmacayealpattynEnum, + FlowequationIsstokesEnum, + FlowequationVertexEquationEnum, + FrictionCoefficientEnum, + FrictionPEnum, + FrictionQEnum, + GeometryHydrostaticRatioEnum, + HydrologyModelEnum, + HydrologyshreveEnum, + HydrologyshreveCREnum, + HydrologyshreveKnEnum, + HydrologyshreveNEnum, + HydrologyshrevePEnum, + HydrologyshreveQEnum, + HydrologyshreveSpcwatercolumnEnum, + HydrologyshreveStabilizationEnum, + HydrologydcEnum, + SedimentHeadEnum, + SedimentHeadResidualEnum, + EplHeadEnum, + HydrologydcSpcsedimentHeadEnum, + HydrologydcSedimentCompressibilityEnum, + HydrologydcSedimentPorosityEnum, + HydrologydcSedimentThicknessEnum, + HydrologydcSedimentTransmitivityEnum, + HydrologydcWaterCompressibilityEnum, + HydrologydcSpceplHeadEnum, + HydrologydcEplCompressibilityEnum, + HydrologydcEplPorosityEnum, + HydrologydcEplThicknessEnum, + HydrologydcEplTransmitivityEnum, + HydrologydcIsefficientlayerEnum, + HydrologydcSedimentlimitFlagEnum, + HydrologydcSedimentlimitEnum, + HydrologydcPenaltyFactorEnum, + HydrologyLayerEnum, + HydrologySedimentEnum, + HydrologyEfficientEnum, + HydrologySedimentKmaxEnum, + IndependentObjectEnum, + InversionControlParametersEnum, + InversionCostFunctionThresholdEnum, + InversionCostFunctionsCoefficientsEnum, + InversionCostFunctionsEnum, + InversionGradientOnlyEnum, + InversionGradientScalingEnum, + InversionIscontrolEnum, + InversionTaoEnum, + InversionIncompleteAdjointEnum, + InversionMaxParametersEnum, + InversionMaxiterPerStepEnum, + InversionMinParametersEnum, + InversionNstepsEnum, + InversionNumControlParametersEnum, + InversionNumCostFunctionsEnum, + InversionStepThresholdEnum, + InversionThicknessObsEnum, + InversionVelObsEnum, + InversionVxObsEnum, + InversionVyObsEnum, + InversionVzObsEnum, + MaskElementonfloatingiceEnum, + MaskElementongroundediceEnum, + MaskElementonwaterEnum, + MaskVertexonfloatingiceEnum, + MaskVertexongroundediceEnum, + MaskVertexonwaterEnum, + MaterialsBetaEnum, + MaterialsHeatcapacityEnum, + MaterialsLatentheatEnum, + MaterialsMeltingpointEnum, + MaterialsMixedLayerCapacityEnum, + MaterialsRheologyBEnum, + MaterialsRheologyBbarEnum, + MaterialsRheologyLawEnum, + MaterialsRheologyNEnum, + MaterialsRheologyZEnum, + MaterialsRheologyZbarEnum, + MaterialsRhoIceEnum, + MaterialsRhoWaterEnum, + MaterialsRhoFreshwaterEnum, + MaterialsMuWaterEnum, + MaterialsThermalExchangeVelocityEnum, + MaterialsThermalconductivityEnum, + MaterialsLithosphereShearModulusEnum, + MaterialsLithosphereDensityEnum, + MaterialsMantleShearModulusEnum, + MaterialsMantleDensityEnum, + MeshAverageVertexConnectivityEnum, + MeshDimensionEnum, + MeshEdgesEnum, + MeshElementconnectivityEnum, + MeshElementonbedEnum, + MeshElementonsurfaceEnum, + MeshElements2dEnum, + MeshElementsEnum, + MeshLowerelementsEnum, + MeshNumberofedgesEnum, + MeshNumberofelements2dEnum, + MeshNumberofelementsEnum, + MeshNumberoflayersEnum, + MeshNumberofvertices2dEnum, + MeshNumberofverticesEnum, + MeshUpperelementsEnum, + MeshVertexonbedEnum, + MeshVertexonsurfaceEnum, + MeshXEnum, + MeshYEnum, + MeshZEnum, + MiscellaneousNameEnum, //FIXME: only used by qmu, should not be marshalled (already in queueing script) + PrognosticHydrostaticAdjustmentEnum, + PrognosticMinThicknessEnum, + PrognosticPenaltyFactorEnum, + PrognosticSpcthicknessEnum, + PrognosticStabilizationEnum, + PrognosticVertexPairingEnum, + PrognosticNumRequestedOutputsEnum, + PrognosticRequestedOutputsEnum, + QmuIsdakotaEnum, + MassFluxSegmentsEnum, + MassFluxSegmentsPresentEnum, + QmuMassFluxSegmentsPresentEnum, + QmuNumberofpartitionsEnum, + QmuNumberofresponsesEnum, + QmuPartitionEnum, + QmuResponsedescriptorsEnum, + QmuVariabledescriptorsEnum, + RiftsNumriftsEnum, + RiftsRiftstructEnum, + SettingsIoGatherEnum, + SettingsLowmemEnum, + SettingsOutputFrequencyEnum, + SettingsResultsAsPatchesEnum, + SettingsWaitonlockEnum, + SurfaceforcingsDelta18oEnum, + SurfaceforcingsDelta18oSurfaceEnum, + SurfaceforcingsIsdelta18oEnum, + SurfaceforcingsPrecipitationsPresentdayEnum, + SurfaceforcingsTemperaturesPresentdayEnum, + SurfaceforcingsTemperaturesLgmEnum, + DebugProfilingEnum, + ProfilingCurrentMemEnum, + ProfilingCurrentFlopsEnum, + ProfilingSolutionTimeEnum, + MaxIterationConvergenceFlagEnum, + SteadystateMaxiterEnum, + SteadystateNumRequestedOutputsEnum, + SteadystateReltolEnum, + SteadystateRequestedOutputsEnum, + SurfaceEnum, + SurfaceforcingsPrecipitationEnum, + SurfaceforcingsMassBalanceEnum, + SurfaceforcingsIspddEnum, + SurfaceforcingsDesfacEnum, + SurfaceforcingsS0pEnum, + SurfaceforcingsIssmbgradientsEnum, + SurfaceforcingsMonthlytemperaturesEnum, + SurfaceforcingsHrefEnum, + SurfaceforcingsSmbrefEnum, + SurfaceforcingsBPosEnum, + SurfaceforcingsBNegEnum, + ThermalMaxiterEnum, + ThermalPenaltyFactorEnum, + ThermalPenaltyLockEnum, + ThermalPenaltyThresholdEnum, + ThermalSpctemperatureEnum, + ThermalStabilizationEnum, + ThermalIsenthalpyEnum, + GiaMantleViscosityEnum, + GiaLithosphereThicknessEnum, + ThicknessEnum, + TimesteppingStartTimeEnum, + TimesteppingFinalTimeEnum, + TimesteppingCflCoefficientEnum, + TimesteppingTimeAdaptEnum, + TimesteppingTimeStepEnum, + TransientIsdiagnosticEnum, + TransientIsgroundinglineEnum, + TransientIsprognosticEnum, + TransientIsthermalEnum, + TransientIsgiaEnum, + TransientNumRequestedOutputsEnum, + TransientRequestedOutputsEnum, + /*}}}*/ + /*Solutions and Analyses{{{ */ + SolutionTypeEnum, + AnalysisTypeEnum, + ConfigurationTypeEnum, + AdjointBalancethicknessAnalysisEnum, + AdjointHorizAnalysisEnum, + AdjointSolutionEnum, + AnalysisCounterEnum, + NoneAnalysisEnum, + DefaultAnalysisEnum, + BalancethicknessAnalysisEnum, + BalancethicknessSolutionEnum, + WeakBalancethicknessAnalysisEnum, + WeakBalancethicknessSolutionEnum, + BedSlopeAnalysisEnum, + BedSlopeSolutionEnum, + BedSlopeXAnalysisEnum, + BedSlopeYAnalysisEnum, + DiagnosticHorizAnalysisEnum, + DiagnosticHutterAnalysisEnum, + DiagnosticSolutionEnum, + DiagnosticVertAnalysisEnum, + EnthalpyAnalysisEnum, + EnthalpySolutionEnum, + FlaimAnalysisEnum, + FlaimSolutionEnum, + HydrologyShreveAnalysisEnum, + HydrologyDCInefficientAnalysisEnum, + HydrologyDCEfficientAnalysisEnum, + HydrologySolutionEnum, + MeltingAnalysisEnum, + PrognosticAnalysisEnum, + PrognosticSolutionEnum, + SteadystateSolutionEnum, + SurfaceSlopeAnalysisEnum, + SurfaceSlopeSolutionEnum, + SurfaceSlopeXAnalysisEnum, + SurfaceSlopeYAnalysisEnum, + ThermalAnalysisEnum, + ThermalSolutionEnum, + TransientSolutionEnum, + GiaSolutionEnum, + GiaAnalysisEnum, + /*}}}*/ + /*Approximations {{{*/ + ApproximationEnum, + NoneApproximationEnum, + HutterApproximationEnum, + MacAyealApproximationEnum, + MacAyealPattynApproximationEnum, + MacAyealStokesApproximationEnum, + L1L2ApproximationEnum, + PattynApproximationEnum, + PattynStokesApproximationEnum, + StokesApproximationEnum, + /*}}}*/ + /*Datasets {{{*/ + ConstraintsEnum, + LoadsEnum, + MaterialsEnum, + NodesEnum, + ParametersEnum, + VerticesEnum, + ResultsEnum, + /*}}}*/ + /*Objects {{{*/ + GenericParamEnum, + AdolcParamEnum, + BoolInputEnum, + BoolParamEnum, + ContourEnum, + ControlInputEnum, + DatasetInputEnum, + DofIndexingEnum, + DoubleInputEnum, + DataSetParamEnum, + DoubleMatArrayParamEnum, + DoubleMatParamEnum, + DoubleParamEnum, + DoubleVecParamEnum, + ElementEnum, + ElementResultEnum, + ExternalResultEnum, + FileParamEnum, + HookEnum, + IcefrontEnum, + InputEnum, + IntInputEnum, + IntParamEnum, + IntVecParamEnum, + TransientParamEnum, + IceFrontTypeEnum, + MacAyeal2dIceFrontEnum, + MacAyeal3dIceFrontEnum, + MaticeEnum, + MatdamageiceEnum, + MatparEnum, + NodeEnum, + NumericalfluxEnum, + NumericalfluxTypeEnum, + ParamEnum, + L1L2IceFrontEnum, + PattynIceFrontEnum, + PengridEnum, + PenpairEnum, + PentaEnum, + PentaP1InputEnum, + ProfilerEnum, + MatrixParamEnum, + VectorParamEnum, + RiftfrontEnum, + RiftfrontTypeEnum, + SegmentEnum, + SegmentRiftfrontEnum, + SpcDynamicEnum, + SpcStaticEnum, + SpcTransientEnum, + StokesIceFrontEnum, + StringArrayParamEnum, + StringParamEnum, + TriaEnum, + TriaP1InputEnum, + VertexEnum, + /*}}}*/ + /*Fill {{{*/ + AirEnum, + IceEnum, + MelangeEnum, + WaterEnum, + /*}}}*/ + /*Rift state {{{*/ + ClosedEnum, + FreeEnum, + OpenEnum, + /*}}}*/ + /*Inputs {{{*/ + AdjointpEnum, + AdjointxEnum, + AdjointyEnum, + AdjointzEnum, + BalancethicknessMisfitEnum, + BedSlopeXEnum, + BedSlopeYEnum, + BoundaryEnum, + ConstantEnum, + ConvergedEnum, + ExtToIuEnum, + FillEnum, + FractionIncrementEnum, + FrictionEnum, + GroundinglineMeltingRateEnum, + InternalEnum, + IuToExtEnum, + MassFluxEnum, + MaxPenetrationEnum, + MeltingOffsetEnum, + MisfitEnum, + NumberNodeToElementConnectivityEnum, + PressureEnum, + PressurePicardEnum, + QmuPressureEnum, + QmuVxEnum, + QmuVyEnum, + QmuVzEnum, + QmuThicknessEnum, + QmuBedEnum, + QmuSurfaceEnum, + QmuMeltingEnum, + AndroidFrictionCoefficientEnum, + ResetPenaltiesEnum, + SegmentOnIceShelfEnum, + SurfaceAbsVelMisfitEnum, + SurfaceAreaEnum, + SurfaceAverageVelMisfitEnum, + SurfaceLogVelMisfitEnum, + SurfaceLogVxVyMisfitEnum, + SurfaceRelVelMisfitEnum, + SurfaceSlopeXEnum, + SurfaceSlopeYEnum, + TemperatureEnum, + TemperatureOldEnum, + TemperaturePicardEnum, + ThicknessAbsMisfitEnum, + VelEnum, + VelocityEnum, + VxAverageEnum, + VxEnum, + VxPicardEnum, + VyAverageEnum, + VyEnum, + VyPicardEnum, + VzEnum, + VzMacAyealEnum, + VzPattynEnum, + VzPicardEnum, + VzStokesEnum, + VxMeshEnum, + VyMeshEnum, + VzMeshEnum, + EnthalpyEnum, + EnthalpyPicardEnum, + ThicknessAbsGradientEnum, + ThicknessAlongGradientEnum, + ThicknessAcrossGradientEnum, + StepResponsesEnum, + IntMatParamEnum, + RheologyBbarAbsGradientEnum, + DragCoefficientAbsGradientEnum, + TransientInputEnum, + WaterfractionEnum, + WatercolumnEnum, + BasalFrictionEnum, + ViscousHeatingEnum, + QmuTemperatureEnum, + HydrologyWaterVxEnum, + HydrologyWaterVyEnum, + StressTensorEnum, + StressTensorxxEnum, + StressTensorxyEnum, + StressTensorxzEnum, + StressTensoryyEnum, + StressTensoryzEnum, + StressTensorzzEnum, + GiaOutputRatesEnum, + GiaCrossSectionShapeEnum, + GiadWdtEnum, + GiaWEnum, + /*}}}*/ + /*Element Interpolations{{{*/ + P0Enum, + P1Enum, + P1DGEnum, + /*}}}*/ + /*Results{{{*/ + SaveResultsEnum, + BoolElementResultEnum, + BoolExternalResultEnum, + DoubleElementResultEnum, + DoubleExternalResultEnum, + DoubleMatExternalResultEnum, + IntExternalResultEnum, + JEnum, + PatchEnum, + PatchNodesEnum, + PatchVerticesEnum, + PentaP1ElementResultEnum, + StringExternalResultEnum, + StepEnum, + TimeEnum, + TriaP1ElementResultEnum, + WaterColumnOldEnum, + /*}}}*/ + /*Responses{{{*/ + MinVelEnum, + MaxVelEnum, + MinVxEnum, + MaxVxEnum, + MaxAbsVxEnum, + MinVyEnum, + MaxVyEnum, + MaxAbsVyEnum, + MinVzEnum, + MaxVzEnum, + MaxAbsVzEnum, + IceVolumeEnum, + TotalSmbEnum, + /*}}}*/ + /*Convergence{{{*/ + RelativeEnum, + AbsoluteEnum, + IncrementalEnum, + /*}}}*/ + /*Grounding Line{{{*/ + AgressiveMigrationEnum, + NoneEnum, + SoftMigrationEnum, + SubelementMigrationEnum, + SubelementMigration2Enum, + GLlevelsetEnum, + /*}}}*/ + /*Solver{{{*/ + StokesSolverEnum, + /*}}}*/ + /*Parameters{{{*/ + AdjointEnum, + ColinearEnum, + ControlSteadyEnum, + FsetEnum, + Gradient1Enum, + Gradient2Enum, + Gradient3Enum, + GradientEnum, + GroundinglineMigrationEnum, + GsetEnum, + IndexEnum, + IndexedEnum, + IntersectEnum, + NodalEnum, + OldGradientEnum, + OutputFilePointerEnum, + OutputFileNameEnum, + LockFileNameEnum, + ToolkitsOptionsAnalysesEnum, + ToolkitsOptionsStringsEnum, + QmuErrNameEnum, + QmuInNameEnum, + QmuOutNameEnum, + RegularEnum, + ScaledEnum, + SeparateEnum, + SsetEnum, + VerboseEnum, + /*}}}*/ + /*Interpolation {{{*/ + TriangleInterpEnum, + BilinearInterpEnum, + NearestInterpEnum, + /*}}}*/ + /*Coordinate Systems{{{*/ + XYEnum, + XYZPEnum, + /*}}}*/ + /*Toolkits{{{*/ + DenseEnum, + MpiDenseEnum, + SeqEnum, + MpiEnum, + /*}}}*/ + /*Options{{{*/ + OptionEnum, + GenericOptionEnum, + OptionCellEnum, + OptionCharEnum, + OptionStructEnum, + OptionDoubleEnum, + OptionLogicalEnum, + /*}}}*/ + /*Rheology law (move too Material) {{{*/ + PatersonEnum, + ArrheniusEnum, + /*}}}*/ + MaximumNumberOfEnums +}; + +#endif Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 14960) @@ -9,8 +9,7 @@ #include -#include "./EnumToStringx.h" +#include "./Enum.h" #include "../Exceptions/exceptions.h" #include "../MemOps/MemOps.h" -#include "../../EnumDefinitions/EnumDefinitions.h" const char* EnumToStringx(int en){ Index: sm/trunk-jpl/src/c/shared/Enum/EnumToStringx.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.h (revision 14959) +++ (revision ) @@ -1,11 +1,0 @@ -/* - * \file EnumToStringx - * \brief: convert Enum To String - */ - -#ifndef _ENUM_TO_STRINGX_ - -const char* EnumToStringx(int enum_in); -void EnumToStringx(char** string,int enum_in); - -#endif Index: /issm/trunk-jpl/src/c/shared/Enum/README =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/README (revision 14960) +++ /issm/trunk-jpl/src/c/shared/Enum/README (revision 14960) @@ -0,0 +1,10 @@ + +DO NOT MODIFY the following files: +- StringToEnumx.cpp +- EnumToStringx.cpp +- src/m/enum/* +all these files are automatically synchronized with EnumDefinitions.h + +TO ADD AN ENUM: +add the corresponding lines to EnumDefinitions.h +and execute synchronizing script. Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 14960) @@ -9,7 +9,6 @@ #include -#include "./StringToEnumx.h" +#include "./Enum.h" #include "../Exceptions/exceptions.h" -#include "../../EnumDefinitions/EnumDefinitions.h" int StringToEnumx(const char* name){ Index: sm/trunk-jpl/src/c/shared/Enum/StringToEnumx.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.h (revision 14959) +++ (revision ) @@ -1,10 +1,0 @@ -/* - * \file StringToEnumx - * \brief: convert String to Enum - */ - -#ifndef _STRING_TO_ENUMX_ - -int StringToEnumx(const char* string_in); - -#endif Index: /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 14960) +++ /issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 14960) @@ -0,0 +1,214 @@ +#!/bin/bash +#Synchronize EnumToStringx.cpp and StringToEnumx.cpp and matlab Enums + +#Get all lines of EnumDefinitions2.h which hold Enum | remove all commas > put everything in file temp +cat EnumDefinitions.h | grep -e "[0-9]Enum," -e "[a-zA-Z]Enum," | grep -v include | sed -e "s/,/ /g" | awk '{print $1}' > temp + +#Removed existing files +rm $ISSM_DIR/src/m/enum/*.m +rm $ISSM_DIR/src/m/enum/*.py +rm $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp +rm $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp + +#Get number of enums +NUMENUMS=$(wc -l temp | awk '{printf("%s",$1);}'); + +#Build EnumToStringx.cpp {{{ +#Header +cat < $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp +/* +* \file EnumToStringx.cpp: +* \brief: output string associated with enum +* +* WARNING: DO NOT MODIFY THIS FILE +* this file has been automatically generated by Synchronize.sh +* Please read README for more information +*/ + +#include +#include "./Enum.h" +#include "../Exceptions/exceptions.h" +#include "../MemOps/MemOps.h" + +const char* EnumToStringx(int en){ + + switch(en){ + +END +#core +cat temp | awk '{print "\t\t" "case " $1" : return \"" substr($1,1,length($1)-4) "\";"}' >> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp +#Footer +cat <> $ISSM_DIR/src/c/shared/Enum/EnumToStringx.cpp + default : return "unknown"; + + } +} +void EnumToStringx(char** pstring,int enum_in){ + char *string = NULL; + int len = 0; + + len=strlen(EnumToStringx(enum_in)); + string=xNew(len+1); + memcpy(string,EnumToStringx(enum_in),(len+1)*sizeof(char)); + + /*Assign output pointer*/ + *pstring=string; +} +END +#}}} +#Build StringToEnumx.cpp {{{ +#Header +cat < $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp +/* +* \file StringToEnumx.cpp: +* \brief: output enum associated with string +* +* WARNING: DO NOT MODIFY THIS FILE +* this file has been automatically generated by Synchronize.sh +* Please read README for more information +*/ + +#include +#include "./Enum.h" + +int StringToEnumx(const char* name){ + + int stage=1; + +END + +#core +i1=1; +i2=120; +for (( i=1 ; i<=100 ; i++ )); do + echo " if(stage==$i){" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp + awk -v i1=$i1 -v i2=$i2 '{if(NR>=i1 && NR<=i2) print $0 }' temp | + awk '{print "\t" ((NR==1)?" if":" else if") " (strcmp(name,\"" substr($1,1,length($1)-4) "\")==0) return " $1 ";"}' >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp + echo " else stage=$(($i+1));" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp + echo " }" >> $ISSM_DIR//src/c/shared/Enum/StringToEnumx.cpp + + if [ $i2 -ge $NUMENUMS ]; then break; fi + let i1=$i1+120 + let i2=$i2+120 +done + +#footer +cat <> $ISSM_DIR/src/c/shared/Enum/StringToEnumx.cpp + /*If we reach this point, the string provided has not been found*/ + _error_("Enum " << name << " not found"); +} +END +#}}} + +# go through the lines of temp +ENUM=0; +#Add header to pythonenum file{{{ +cat < $ISSM_DIR/src/m/enum/EnumDefinitions.py +from StringToEnum import StringToEnum + +""" + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh + Please read src/c/EnumDefinitions/README for more information + +""" + +END +#}}} + +for NAMEENUM in $(cat temp); do + + #Get name and enum of the line i + NAME=$(echo $NAMEENUM | sed -e "s/Enum//g") + #offset Enum by one (Enum begins with 0 and not 1!) + let ENUM=$ENUM+1 + + #print info {{{ + if [ $ENUM -lt 10 ] + then + printf "\r " + printf "\r $ENUM/$NUMENUMS Adding "$NAME"..." + else + if [ $ENUM -lt 100 ] + then + printf "\r " + printf "\r $ENUM/$NUMENUMS Adding "$NAME"..." + else + printf "\r " + printf "\r$ENUM/$NUMENUMS Adding "$NAME"..." + fi + fi + #}}} + #Add case to matlabenum file{{{ + cat < $ISSM_DIR"/src/m/enum/"$(echo $NAMEENUM".m") +function macro=$(echo $NAMEENUM)() +%$(echo $NAMEENUM | awk {'print toupper($1)'}) - Enum of $(echo $NAME) +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=$NAMEENUM() + +macro=StringToEnum('$NAME'); +END +#}}} + #Add case to pythonenum file{{{ + cat <> $ISSM_DIR/src/m/enum/EnumDefinitions.py +def $(echo $NAMEENUM)(): + """ + $(echo $NAMEENUM | awk {'print toupper($1)'}) - Enum of $(echo $NAME) + + Usage: + macro=$NAMEENUM() + """ + + return StringToEnum('$NAME')[0] + +END +#}}} + +done +#MaximumNumberOfEnums (matlab){{{ +cat < $ISSM_DIR/src/m/enum/MaximumNumberOfEnums.m +function macro=MaximumNumberOfEnums() +%$(echo "MaximumNumberOfEnums" | awk {'print toupper($1)'}) - Enum of MaximumNumberOfEnums +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=MaximumNumberOfEnums() + +macro=$(cat EnumDefinitions.h | grep -e "[0-9]Enum" -e "[a-zA-Z]Enum" | grep -v include \ + | awk '{ printf "%s %s\n", NR-1, $0 }' \ + | grep "MaximumNumberOfEnums" | awk '{print $1}'); +END +#}}} +#MaximumNumberOfEnums (python){{{ +cat <> $ISSM_DIR/src/m/enum/EnumDefinitions.py +def MaximumNumberOfEnums(): + """ + $(echo "MaximumNumberOfEnums" | awk {'print toupper($1)'}) - Enum of MaximumNumberOfEnums + + Usage: + macro=MaximumNumberOfEnums() + """ + + return $(cat EnumDefinitions.h | grep -e "[0-9]Enum" -e "[a-zA-Z]Enum" | grep -v include \ + | awk '{ printf "%s %s\n", NR-1, $0 }' \ + | grep "MaximumNumberOfEnums" | awk '{print $1}') + +END +#}}} + +#clean up{{{ +rm temp +#}}} +#print info {{{ +printf "\r " +printf "\rdone!\n" +#}}} Index: /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../../classes/objects/objects.h" #include "../../Container/Parameters.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" char* OptionsFromAnalysis(Parameters* parameters,int analysis_type){ Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../../Container/Container.h" #include "../../classes/objects/objects.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 14960) @@ -15,5 +15,5 @@ #include #include "../shared.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" int DescriptorIndex(char* root, int* pindex,char* descriptor){ //We assume root has already been allocated, and we just have to copy into it. Index: /issm/trunk-jpl/src/c/shared/shared.h =================================================================== --- /issm/trunk-jpl/src/c/shared/shared.h (revision 14959) +++ /issm/trunk-jpl/src/c/shared/shared.h (revision 14960) @@ -9,6 +9,5 @@ #include "./Bamg/shared.h" #include "./Elements/elements.h" -#include "./Enum/EnumToStringx.h" -#include "./Enum/StringToEnumx.h" +#include "./Enum/Enum.h" #include "./Exceptions/exceptions.h" #include "./Exp/exp.h" Index: /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 14960) @@ -29,5 +29,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/shared.h" #include "../solutions/solutions.h" Index: /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../modules/modules.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" void ResetBoundaryConditions(FemModel* femmodel, int analysis_type){ Index: /issm/trunk-jpl/src/c/solutions/WrapperCorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/WrapperCorePointerFromSolutionEnum.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/WrapperCorePointerFromSolutionEnum.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/ad_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 14960) @@ -15,5 +15,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "../solvers/solvers.h" Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../shared/io/io.h" #include "../Container/Container.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/controlrestart.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controlrestart.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/controlrestart.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "./solutions.h" #include "../modules/modules.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" void controlrestart(FemModel* femmodel,IssmDouble* J){ Index: /issm/trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../modules/modules.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" void convergence(bool* pconverged, Matrix* Kff,Vector* pf,Vector* uf,Vector* old_uf,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/solutions/dakota_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14960) @@ -38,5 +38,5 @@ #include "../shared/io/io.h" #include "../toolkits/toolkits.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../classes/dakota/DakotaPlugin.h" #include "../classes/FemModel.h" Index: /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/dummy_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dummy_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/dummy_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/gia_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "../solvers/solvers.h" Index: /issm/trunk-jpl/src/c/solutions/gradient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../solvers/solvers.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/steadystateconvergence.cpp (revision 14960) @@ -12,5 +12,5 @@ #include "../shared/shared.h" #include "../Container/Container.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../solvers/solvers.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 14960) @@ -13,5 +13,5 @@ #include "../shared/shared.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "./solutions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_adjoint_linear.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_linear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_linear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_linear.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_newton.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "../solutions/solutions.h" Index: /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 14960) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" #include "../solutions/solutions.h" Index: /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 14960) @@ -5,5 +5,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../shared/io/io.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 14960) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" #include "../shared/io/io.h" -#include "../EnumDefinitions/EnumDefinitions.h" +#include "../shared/Enum/Enum.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14959) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14960) @@ -18,5 +18,5 @@ #include "../../classes/ToolkitOptions.h" #include "../../shared/io/Comm/Comm.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "./IssmToolkitUtils.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "../../shared/io/Comm/Comm.h" #include "../../classes/ToolkitOptions.h" -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/Exceptions/exceptions.h" #include "./IssmToolkitUtils.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14959) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14960) @@ -14,5 +14,5 @@ #endif -#include "../../EnumDefinitions/EnumDefinitions.h" +#include "../../shared/Enum/Enum.h" #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14959) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14960) @@ -14,5 +14,5 @@ #include "../../../shared/Exceptions/exceptions.h" #include "../../../shared/io/Comm/Comm.h" -#include "../../../EnumDefinitions/EnumDefinitions.h" +#include "../../../shared/Enum/Enum.h" void PetscSolve(PetscVec** puf, PetscMat* Kff, PetscVec* pf, PetscVec* uf0,PetscVec* df, Parameters* parameters){ /*{{{*/