Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 14950) @@ -20,5 +20,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/Container/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 14950) @@ -22,5 +22,5 @@ #include "../classes/classes.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "../io/io.h" +#include "../shared/io/io.h" using namespace std; Index: /issm/trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Options.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/Container/Options.cpp (revision 14950) @@ -17,9 +17,9 @@ #include "./DataSet.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../classes/classes.h" #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "../io/io.h" +#include "../shared/io/io.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 14949) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 14950) @@ -180,4 +180,15 @@ ./shared/Matrix/matrix.h\ ./shared/Matrix/MatrixUtils.cpp\ + ./shared/io/io.h\ + ./shared/io/Disk/diskio.h\ + ./shared/io/Disk/pfopen.cpp\ + ./shared/io/Disk/pfclose.cpp\ + ./shared/io/Disk/WriteLockFile.cpp\ + ./shared/io/Print/PrintfFunction.cpp\ + ./shared/io/Print/Print.h\ + ./shared/io/Comm/Comm.h\ + ./shared/io/Comm/CommDef.h\ + ./shared/io/Comm/IssmComm.h\ + ./shared/io/Comm/IssmComm.cpp\ ./shared/Numerics/numerics.h\ ./shared/Numerics/types.h\ @@ -229,15 +240,4 @@ ./toolkitsenums.h\ ./toolkits.h\ - ./io/io.h\ - ./io/Disk/diskio.h\ - ./io/Disk/pfopen.cpp\ - ./io/Disk/pfclose.cpp\ - ./io/Disk/WriteLockFile.cpp\ - ./io/Print/PrintfFunction.cpp\ - ./io/Print/Print.h\ - ./io/Comm/Comm.h\ - ./io/Comm/CommDef.h\ - ./io/Comm/IssmComm.h\ - ./io/Comm/IssmComm.cpp\ ./EnumDefinitions/EnumDefinitions.h\ ./modules/ModelProcessorx/ModelProcessorx.h\ Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 14950) @@ -14,5 +14,5 @@ #include "../shared/Numerics/types.h" #include "../shared/Numerics/constants.h" -#include "../io/Print/Print.h" +#include "../shared/io/Print/Print.h" #include "../shared/Exceptions/exceptions.h" #include "../shared/MemOps/MemOps.h" Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../Container/Container.h" #include "../solutions/solutions.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "./classes.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 14950) @@ -16,5 +16,5 @@ #include "./classes.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../Container/Parameters.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/Patch.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "./classes.h" #include "../Container/Container.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/bamg/BamgGeom.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/BamgGeom.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/BamgGeom.cpp (revision 14950) @@ -1,5 +1,5 @@ #include #include "../objects/objects.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/bamg/BamgMesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/BamgMesh.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/BamgMesh.cpp (revision 14950) @@ -1,5 +1,5 @@ #include #include "../objects/objects.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp (revision 14950) @@ -2,5 +2,5 @@ #include "../../shared/shared.h" #include "../objects/objects.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" /*Constructors/Destructors*/ Index: /issm/trunk-jpl/src/c/classes/bamg/Edge.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Edge.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/Edge.cpp (revision 14950) @@ -7,5 +7,5 @@ #include "Mesh.h" #include "Geometry.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" namespace bamg { Index: /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "Metric.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" namespace bamg { Index: /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "Metric.h" #include "../../shared/Exceptions/exceptions.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" using namespace std; Index: /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./GaussPenta.h" #include "./GaussTria.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" Index: /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./GaussTria.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" Index: /issm/trunk-jpl/src/c/classes/objects/Contour.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Contour.h (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/Contour.h (revision 14950) @@ -10,5 +10,5 @@ #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../EnumDefinitions/EnumDefinitions.h" #include "./Object.h" Index: /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 14950) @@ -18,5 +18,5 @@ #include "../../../shared/Numerics/recast.h" #include "../../../EnumDefinitions/EnumDefinitions.h" -#include "../../../io/Comm/Comm.h" +#include "../../../shared/io/Comm/Comm.h" #include "./ExternalResult.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" #include "../../../modules/Ll2xyx/Ll2xyx.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" #include "../../../modules/Ll2xyx/Ll2xyx.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" #include "../../../modules/Ll2xyx/Ll2xyx.h" Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../Container/Container.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 14949) +++ /issm/trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 14950) @@ -17,5 +17,5 @@ #include "../../../shared/Exceptions/exceptions.h" #include "../../../shared/MemOps/MemOps.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "./OptionUtilities.h" Index: /issm/trunk-jpl/src/c/main/globals.h =================================================================== --- /issm/trunk-jpl/src/c/main/globals.h (revision 14949) +++ /issm/trunk-jpl/src/c/main/globals.h (revision 14950) @@ -6,5 +6,5 @@ #define _GLOBALS_H_ -#include "../io/Comm/Comm.h" +#include "../shared/io/Comm/Comm.h" #include "../classes/ToolkitOptions.h" Index: /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "./ConstraintsStateLocal.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./ConstraintsStateLocal.h" #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Delta18oParameterizationx/Delta18oParameterizationx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./Delta18oParameterizationx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "./EdgeDetectionx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./Exp2Kmlx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/InputConvergencex/InputConvergencex.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./InputConvergencex.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "./InterpFromGridToMeshx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./IoModelToConstraintsx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./KMLFileReadx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./KMLMeshWritex.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./KMLOverlayx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./Kml2Expx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 14950) @@ -8,5 +8,5 @@ #include "../../classes/objects/objects.h" #include "../../Container/Container.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" /*FUNCTION pKrigingx{{{*/ Index: /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./Ll2xyx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include Index: /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../VecMergex/VecMergex.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "./Mergesolutionfromftogx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/classes.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 14950) @@ -1,4 +1,4 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp (revision 14950) @@ -3,5 +3,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../Container/Container.h" #include "../../toolkits/toolkits.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../EnumDefinitions/EnumDefinitions.h" #include "../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp (revision 14950) @@ -10,5 +10,5 @@ #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14950) @@ -15,5 +15,5 @@ #include "../../shared/shared.h" #include "../MeshPartitionx/MeshPartitionx.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 14950) @@ -10,5 +10,5 @@ #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "./ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 14950) @@ -8,5 +8,5 @@ #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14950) @@ -10,5 +10,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 14950) @@ -13,5 +13,5 @@ #include "../../shared/shared.h" #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateLoadsGia.cpp (revision 14950) @@ -3,5 +3,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateLoadsHydrologyShreve.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateParametersHydrologyShreve.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14950) @@ -11,5 +11,5 @@ #include "../../classes/objects/objects.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../Container/Container.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 14950) @@ -13,5 +13,5 @@ class DofIndexing; -#include "../../io/io.h" +#include "../../shared/io/io.h" void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* iomodel_handle,char* rootpath,const int solution_type,const int nummodels,const int* analysis_type_listh); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 14950) @@ -13,5 +13,5 @@ #include "../../shared/shared.h" #include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx/ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 14950) @@ -2,5 +2,5 @@ #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 14950) @@ -8,5 +8,5 @@ #include "../../../classes/objects/objects.h" #include "../../../shared/shared.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../MeshPartitionx/MeshPartitionx.h" #include "../ModelProcessorx.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp (revision 14950) @@ -3,5 +3,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../toolkits/toolkits.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../../../Container/Container.h" #include "../../../toolkits/toolkits.h" -#include "../../../io/io.h" +#include "../../../shared/io/io.h" #include "../../../EnumDefinitions/EnumDefinitions.h" #include "../../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 14950) @@ -13,5 +13,5 @@ #include "./OutputResultsx.h" #include "../../Container/Container.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../classes/objects/objects.h" Index: /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp (revision 14950) @@ -14,5 +14,5 @@ #include "./ParseToolkitsOptionsx.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" #include "../../toolkits/toolkits.h" Index: /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./PositiveDegreeDayx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 14950) @@ -10,5 +10,5 @@ #include "./Reduceloadx.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" void Reduceloadx( Vector* pf, Matrix* Kfs, Vector* y_s,bool flag_ys0){ Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./ResetConstraintsx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (revision 14950) @@ -7,5 +7,5 @@ #include "../Xy2llx/Xy2llx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../Xy2llx/Xy2llx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "./SmbGradientsx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "./TriMeshx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../toolkits/toolkits.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 14950) @@ -4,5 +4,5 @@ #include "./Xy2llx.h" #include "../../shared/shared.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include Index: /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 14950) @@ -12,5 +12,5 @@ #include #include /* DBL_EPSILON */ -#include "../../io/io.h" +#include "../../shared/io/io.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 14950) @@ -11,5 +11,5 @@ #include "./numerics.h" #include "../../classes/objects/objects.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" #include Index: /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 14950) @@ -11,5 +11,5 @@ #include "./numerics.h" #include "../../classes/objects/objects.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #include "../../shared/shared.h" #include Index: /issm/trunk-jpl/src/c/shared/io/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/shared/io/CMakeLists.txt (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/CMakeLists.txt (revision 14950) @@ -0,0 +1,9 @@ +# Subdirectories {{{ +add_subdirectory(Disk) +# }}} +# Include Directory {{{ +include_directories(AFTER $ENV{ISSM_DIR}/src/c/io) +# }}} +# CORE_SOURCES {{{ +set(CORE_SOURCES $ENV{ISSM_DIR}/src/c/io/PrintfFunction.cpp PARENT_SCOPE) +# }}} Index: /issm/trunk-jpl/src/c/shared/io/Comm/Comm.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Comm/Comm.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Comm/Comm.h (revision 14950) @@ -0,0 +1,11 @@ +/*\file Comm.h + *\brief: communicator information + */ + +#ifndef _IO_COMM_H_ +#define _IO_COMM_H_ + +#include "./CommDef.h" +#include "./IssmComm.h" + +#endif Index: /issm/trunk-jpl/src/c/shared/io/Comm/CommDef.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Comm/CommDef.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Comm/CommDef.h (revision 14950) @@ -0,0 +1,16 @@ +/*\file CommDef.h + *\brief: defined communicator typedefs + */ + +#ifndef _IO_COMMDEF_H_ +#define _IO_COMMDEF_H_ + +/*Define communicator: */ +#ifdef _HAVE_MPI_ + #include + typedef MPI_Comm COMM; +#else + typedef int COMM; +#endif + +#endif Index: /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.cpp (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.cpp (revision 14950) @@ -0,0 +1,61 @@ +/*! \file IssmComm.cpp + * \brief file containing the methods for IssmComm.h + */ + +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "./IssmComm.h" +#include "../../Numerics/types.h" +#include "../../Exceptions/exceptions.h" + +void IssmComm::SetComm(COMM incomm){ /*{{{*/ + + /*A comm is provided, we are running in parallel (this is not a module)*/ + parallel = true; + comm = incomm; + +}/*}}}*/ +void IssmComm::SetComm(void){ /*{{{*/ + + /*no comm provided, This is a matlab/python module*/ + parallel = false; + + /*No need to initialise comm*/ + +}/*}}}*/ +COMM IssmComm::GetComm(){ /*{{{*/ + if(!parallel) _error_("Cannot return comm in serial mode"); + return comm; +}/*}}}*/ +int IssmComm::GetRank(){ /*{{{*/ + + int my_rank = 0; + + /*for matlab and python modules*/ + if(!parallel) return my_rank; + + #ifdef _HAVE_MPI_ + MPI_Comm_rank(comm,&my_rank); + #endif + + return my_rank; + +}/*}}}*/ +int IssmComm::GetSize(){ /*{{{*/ + + int size = 1; + + /*for matlab and python modules*/ + if(!parallel) return size; + + #ifdef _HAVE_MPI_ + MPI_Comm_size(comm,&size); + #endif + + return size; + +}/*}}}*/ Index: /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Comm/IssmComm.h (revision 14950) @@ -0,0 +1,34 @@ +/* \file IssmComm.h + * \brief create a class with a static comm, and static methods to access it + * This is a way of protecting access to the communicator. + */ + +#ifndef _ISSM_COMM_H +#define _ISSM_COMM_H + +/*{{{*/ +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "./CommDef.h" + +/*}}}*/ + +class IssmComm { + + private: + static COMM comm; + static bool parallel; + + public: + static void SetComm(COMM incomm); + static void SetComm(void); + static COMM GetComm(void); + static int GetRank(void); + static int GetSize(void); +}; + +#endif /* _ISSM_COMM_H */ Index: /issm/trunk-jpl/src/c/shared/io/Disk/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Disk/CMakeLists.txt (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Disk/CMakeLists.txt (revision 14950) @@ -0,0 +1,10 @@ +# Subdirectories {{{ +# }}} +# Include Directory {{{ +include_directories(AFTER $ENV{ISSM_DIR}/src/c/io/Disk) +# }}} +# CORE_SOURCES {{{ +set(CORE_SOURCES $ENV{ISSM_DIR}/src/c/io/Disk/pfclose.cpp + $ENV{ISSM_DIR}/src/c/io/Disk/pfopen.cpp + $ENV{ISSM_DIR}/src/c/io/Disk/WriteLockFile.cpp PARENT_SCOPE) +# }}} Index: /issm/trunk-jpl/src/c/shared/io/Disk/WriteLockFile.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Disk/WriteLockFile.cpp (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Disk/WriteLockFile.cpp (revision 14950) @@ -0,0 +1,24 @@ +/*!\file: WriteLockFile.cpp + * \brief + */ +#include +#include "../../shared.h" + +void WriteLockFile(char* filename){ + + /*recover my_rank:*/ + int my_rank=IssmComm::GetRank(); + + /* output: */ + FILE* fid=NULL; + + /* Open lock file and write 1 into it: */ + if(my_rank==0){ + fid=fopen(filename,"w"); + if(fid==NULL) _error_("error message: could not open lock file " << filename); + + /*Close file: */ + if(fclose(fid)!=0) _error_("could not close lock file " << filename); + } + +} Index: /issm/trunk-jpl/src/c/shared/io/Disk/diskio.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Disk/diskio.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Disk/diskio.h (revision 14950) @@ -0,0 +1,14 @@ +/*\file diskio.h + *\brief: I/O for ISSM from disk + */ + +#ifndef _DISK_IO_H_ +#define _DISK_IO_H_ + +#include + +FILE* pfopen(char* filename,const char* format); +void pfclose(FILE* fid,char* filename); +void WriteLockFile(char* filename); + +#endif /* _IO_H_ */ Index: /issm/trunk-jpl/src/c/shared/io/Disk/pfclose.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Disk/pfclose.cpp (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Disk/pfclose.cpp (revision 14950) @@ -0,0 +1,19 @@ +/*!\file: pfclose.cpp + * \brief fclose wrapper for parallel solution + */ + +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include +#include "../../shared.h" + +void pfclose(FILE* fid,char* filename){ + + /*Close file handle: */ + _assert_(fid); + if(fclose(fid)!=0)_error_("could not close file " << filename); +} Index: /issm/trunk-jpl/src/c/shared/io/Disk/pfopen.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Disk/pfopen.cpp (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Disk/pfopen.cpp (revision 14950) @@ -0,0 +1,23 @@ +/*!\file: pfopen.cpp + * \brief fopen wrapper for parallel solution + */ + +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include +#include "../../shared.h" + +FILE* pfopen(char* filename,const char* format){ + + FILE* fid=NULL; + + /*Open handle to data on disk: */ + fid=fopen(filename,format); + if(fid==NULL) _error_("could not open file " << filename << " for binary reading or writing"); + + return fid; +} Index: /issm/trunk-jpl/src/c/shared/io/Print/Print.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Print/Print.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Print/Print.h (revision 14950) @@ -0,0 +1,55 @@ +/*\file Print.h + *\brief: print I/O for ISSM + */ + +#ifndef _ISSM_PRINT_H_ +#define _ISSM_PRINT_H_ + +#ifdef HAVE_CONFIG_H +#include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include +#include +#include +#include + +using namespace std; +/*macros:*/ +/* _printf_ {{{*/ +/*Printing macro: only cpu number 0 */ +#define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0) +/*}}}*/ +/* _printLine_ {{{*/ +/* macro to print a line, adds std::endl */ +#define _printLine_(StreamArgs)\ + do{std::cout << StreamArgs << std::endl;}while(0) +/*}}}*/ +/* _printString_ {{{*/ +/* macro to print some string */ +#define _printString_(StreamArgs)\ + do{std::cout << StreamArgs;}while(0) +/*}}}*/ +/* _pprintLine_ {{{*/ +/* macro to print a line, adds std::endl, only on cpu 0 */ +#define _pprintLine_(StreamArgs)\ + do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \ + aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \ + PrintfFunction(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0) +/*}}}*/ +/* _pprintString_ {{{*/ +/* macro to print some string. Only on cpu0 */ +#define _pprintString_(StreamArgs)\ + do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \ + aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \ + PrintfFunction2(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0) +/*}}}*/ + +/*functions: */ +int PrintfFunction(const char* format,...); +int PrintfFunction(const string & message); +int PrintfFunction2(const string & message); + +#endif Index: /issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp (revision 14950) @@ -0,0 +1,88 @@ +/*\file PrintfFunction.c + *\brief: this function is used by the _printf_ macro, to take into account the + *fact we may be running on a cluster. + */ + +#ifdef HAVE_CONFIG_H + #include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include +#include +#ifdef _HAVE_ANDROID_NDK_ +#include +#endif +#include "./Print.h" +#include "../Comm/Comm.h" +#include "../../MemOps/MemOps.h" + +int PrintfFunction(const char* format,...){ + /*http://linux.die.net/man/3/vsnprintf*/ + + /*string to be printed: */ + char *buffer = NULL; + int n,size = 100; + int my_rank; + //variable list of arguments + va_list args; + + /*recover my_rank:*/ + my_rank=IssmComm::GetRank(); + + while(true){ + + /*allocate buffer for given string size*/ + buffer=xNew(size); + + /* Try to print in the allocated space. */ + va_start(args, format); + n=vsnprintf(buffer,size,format,args); + va_end(args); + + /* If that worked, return the string. */ + if(n>-1 && n-1) /* glibc 2.1 */ + size=n+1; /* precisely what is needed */ + else /* glibc 2.0 */ + size*=2; /* twice the old size */ + + xDelete(buffer); + } + + /*Ok, if we are running in parallel, get node 0 to print*/ + if(my_rank==0)_printString_(buffer); + + /*Clean up and return*/ + xDelete(buffer); + return 1; +} +int PrintfFunction(const string & message){ + int my_rank; + + /*recover my_rank:*/ + my_rank=IssmComm::GetRank(); + + if(my_rank==0){ + #ifdef _HAVE_ANDROID_JNI_ + __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str()); + #else + printf("%s\n",message.c_str()); + #endif + } + return 1; +} +int PrintfFunction2(const string & message){ + int my_rank; + + /*recover my_rank:*/ + my_rank=IssmComm::GetRank(); + + if(my_rank==0){ + printf("%s",message.c_str()); + } + return 1; +} Index: /issm/trunk-jpl/src/c/shared/io/io.h =================================================================== --- /issm/trunk-jpl/src/c/shared/io/io.h (revision 14950) +++ /issm/trunk-jpl/src/c/shared/io/io.h (revision 14950) @@ -0,0 +1,18 @@ +/*\file io.h + *\brief: I/O for ISSM + */ + +#ifndef _ISSM_IO_H_ +#define _ISSM_IO_H_ + +#ifdef HAVE_CONFIG_H +#include +#else +#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +#endif + +#include "./Disk/diskio.h" +#include "./Print/Print.h" +#include "./Comm/Comm.h" + +#endif /* _IO_H_ */ Index: /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.cpp (revision 14950) @@ -28,5 +28,5 @@ #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../shared/shared.h" Index: /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/ResetBoundaryConditions.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../classes/objects/objects.h" #include "../modules/modules.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/solutions/ad_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/ad_core.cpp (revision 14950) @@ -14,5 +14,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/adjointbalancethickness_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/adjointdiagnostic_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/balancethickness_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/bedslope_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/control_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/controlconvergence.cpp (revision 14950) @@ -10,5 +10,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../Container/Container.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../classes/objects/objects.h" #include "../modules/modules.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/solutions/dakota_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14950) @@ -36,5 +36,5 @@ #include "./solutions.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../toolkits/toolkits.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/dummy_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/dummy_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/dummy_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/enthalpy_core.cpp (revision 14950) @@ -9,5 +9,5 @@ #include "./solutions.h" #include "../modules/modules.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../solvers/solvers.h" Index: /issm/trunk-jpl/src/c/solutions/gia_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solutions/gradient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/prognostic_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/solutions.h =================================================================== --- /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14950) @@ -13,5 +13,5 @@ template class Vector; -#include "../io/Comm/Comm.h" +#include "../shared/io/Comm/Comm.h" #include "../shared/Numerics/types.h" Index: /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/surfaceslope_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../solvers/solvers.h" Index: /issm/trunk-jpl/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/thermal_core.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../classes/objects/objects.h" #include "../shared/shared.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "./solutions.h" Index: /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solvers/solver_hydro_nonlinear.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.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 14949) +++ /issm/trunk-jpl/src/c/solvers/solver_newton.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (revision 14950) @@ -5,5 +5,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../classes/objects/objects.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../modules/modules.h" #include "../solutions/solutions.h" Index: /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 14950) @@ -6,5 +6,5 @@ #include "../toolkits/toolkits.h" #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules/modules.h" Index: /issm/trunk-jpl/src/c/solvers/solvers.h =================================================================== --- /issm/trunk-jpl/src/c/solvers/solvers.h (revision 14949) +++ /issm/trunk-jpl/src/c/solvers/solvers.h (revision 14950) @@ -7,5 +7,5 @@ #include "../classes/objects/objects.h" -#include "../io/io.h" +#include "../shared/io/io.h" struct OptArgs; Index: /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../../shared/shared.h" #include "../../classes/classes.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #ifdef _HAVE_GSL_ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h (revision 14950) @@ -20,5 +20,5 @@ #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" #include "../../toolkits/gsl/gslincludes.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14950) @@ -17,5 +17,5 @@ #include "../../shared/MemOps/MemOps.h" #include "../../classes/ToolkitOptions.h" -#include "../../io/Comm/Comm.h" +#include "../../shared/io/Comm/Comm.h" #include "../../EnumDefinitions/EnumDefinitions.h" #include "./IssmToolkitUtils.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14950) @@ -21,5 +21,5 @@ #include "../../shared/MemOps/MemOps.h" #include "../../Container/DataSet.h" -#include "../../io/Comm/Comm.h" +#include "../../shared/io/Comm/Comm.h" #include "../../classes/objects/Bucket.h" #include "../mumps/mumpsincludes.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14950) @@ -20,5 +20,5 @@ #include "../../shared/Exceptions/exceptions.h" #include "../../shared/MemOps/MemOps.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" #ifdef _HAVE_MPI_ #include "../mpi/mpiincludes.h" Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 14950) @@ -18,5 +18,5 @@ #include "../../shared/Exceptions/exceptions.h" -#include "../../io/Print/Print.h" +#include "../../shared/io/Print/Print.h" #include "../../shared/MemOps/MemOps.h" #include Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../../shared/shared.h" #include "../../classes/classes.h" -#include "../../io/io.h" +#include "../../shared/io/io.h" void IssmSolve(IssmVec** pout,IssmMat* Kff, IssmVec* pf, Parameters* parameters){/*{{{*/ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14950) @@ -12,5 +12,5 @@ #include "../../shared/MemOps/MemOps.h" -#include "../../io/Comm/Comm.h" +#include "../../shared/io/Comm/Comm.h" #include "../../classes/ToolkitOptions.h" #include "../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/GetOwnershipBoundariesFromRange.cpp (revision 14950) @@ -12,5 +12,5 @@ #include #include "../../../shared/MemOps/MemOps.h" -#include "../../../io/Comm/Comm.h" +#include "../../../shared/io/Comm/Comm.h" void GetOwnershipBoundariesFromRange(int* plower_row,int* pupper_row,int range,COMM comm){ Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h (revision 14950) @@ -7,5 +7,5 @@ #include "../../../shared/Numerics/types.h" -#include "../../../io/Comm/Comm.h" +#include "../../../shared/io/Comm/Comm.h" int DetermineLocalSize(int global_size,COMM comm); Index: /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14950) @@ -13,5 +13,5 @@ #include "../../shared/MemOps/MemOps.h" #include "../../shared/Exceptions/exceptions.h" -#include "../../io/Comm/Comm.h" +#include "../../shared/io/Comm/Comm.h" #include "../mpi/patches/mpipatches.h" Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14950) @@ -13,5 +13,5 @@ #include "../../../shared/MemOps/MemOps.h" #include "../../../shared/Exceptions/exceptions.h" -#include "../../../io/Comm/Comm.h" +#include "../../../shared/io/Comm/Comm.h" #include "../../../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h (revision 14949) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h (revision 14950) @@ -13,5 +13,5 @@ #include "./SolverEnum.h" #include "../../toolkitsenums.h" -#include "../../../io/Comm/Comm.h" +#include "../../../shared/io/Comm/Comm.h" class Parameters; Index: /issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h =================================================================== --- /issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h (revision 14950) @@ -22,5 +22,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #undef __FUNCT__ Index: /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h =================================================================== --- /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h (revision 14950) @@ -24,5 +24,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h =================================================================== --- /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h (revision 14950) @@ -24,5 +24,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h =================================================================== --- /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h (revision 14950) @@ -24,5 +24,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h =================================================================== --- /issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h (revision 14950) @@ -20,5 +20,5 @@ #include "../../c/main/globals.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #undef __FUNCT__ Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h =================================================================== --- /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (revision 14950) @@ -24,5 +24,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h =================================================================== --- /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h (revision 14950) @@ -27,5 +27,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h =================================================================== --- /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h (revision 14949) +++ /issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h (revision 14950) @@ -24,5 +24,5 @@ #include "../../c/Container/Container.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" #include "../../c/EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp (revision 14949) +++ /issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp (revision 14950) @@ -11,5 +11,5 @@ #include "./matlabio.h" #include "../../c/shared/shared.h" -#include "../../c/io/io.h" +#include "../../c/shared/io/io.h" GenericOption* OptionDoubleParse( char* name, const mxArray* prhs[]){ /*{{{*/