diff --git a/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
index a3c5009..b18425b 100644
--- a/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
+++ b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
@@ -50,7 +50,7 @@
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
proxyType = 1;
- remoteGlobalIDString = D2AAC0620554660B00DB518D /* epanet */;
+ remoteGlobalIDString = D2AAC0620554660B00DB518D;
remoteInfo = epanet;
};
/* End PBXContainerItemProxy section */
diff --git a/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3 b/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3
index b07f92d..9ebf88e 100644
--- a/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3
+++ b/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3
@@ -231,8 +231,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -269,15 +267,14 @@
08FB7794FE84155DC02AAC07
1C37FBAC04509CD000000102
- 22322FD41068391A00641384
- 22322FD51068391A00641384
1C37FAAC04509CD000000102
1C37FABC05509CD000000102
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 13
+ 6
+ 4
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
@@ -300,7 +297,7 @@
186
RubberWindowFrame
- 244 92 946 631 0 0 1280 778
+ 250 115 946 631 0 0 1280 778
Module
PBXSmartGroupTreeModule
@@ -311,6 +308,8 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
@@ -328,13 +327,13 @@
_historyCapacity
0
bookmark
- 22322FDB1068395700641384
+ 2232300F10683CF100641384
history
22322FBF106837F600641384
22322FC0106837F600641384
22322FC1106837F600641384
- 22322FC2106837F600641384
+ 22322FF710683C8E00641384
SplitCount
@@ -346,14 +345,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {738, 404}}
+ {{0, 0}, {738, 391}}
RubberWindowFrame
- 244 92 946 631 0 0 1280 778
+ 250 115 946 631 0 0 1280 778
Module
PBXNavigatorGroup
Proportion
- 404pt
+ 391pt
ContentConfiguration
@@ -366,14 +365,14 @@
GeometryConfiguration
Frame
- {{0, 409}, {738, 181}}
+ {{0, 396}, {738, 194}}
RubberWindowFrame
- 244 92 946 631 0 0 1280 778
+ 250 115 946 631 0 0 1280 778
Module
XCDetailModule
Proportion
- 181pt
+ 194pt
Proportion
@@ -392,9 +391,9 @@
TableOfContents
- 22322F6B1068349B00641384
+ 2232300310683CAF00641384
1CE0B1FE06471DED0097A5F4
- 22322F6C1068349B00641384
+ 2232300410683CAF00641384
1CE0B20306471E060097A5F4
1CE0B20506471E060097A5F4
@@ -532,15 +531,15 @@
5
WindowOrderList
- 22322FD71068391A00641384
- 22322FD81068391A00641384
- 1C78EAAD065D492600B07095
- 1CD10A99069EF8BA00B06720
+ 2232300D10683CAF00641384
+ 2232300E10683CAF00641384
22322F6E1068349B00641384
/Users/sam/Documents/School/ENGCVS/EPANET/BASE/trunk/build/Xcode/epanet/epanet.xcodeproj
+ 1CD10A99069EF8BA00B06720
+ 1C78EAAD065D492600B07095
WindowString
- 244 92 946 631 0 0 1280 778
+ 250 115 946 631 0 0 1280 778
WindowToolsV3
@@ -561,7 +560,7 @@
PBXProjectModuleGUID
1CD0528F0623707200166675
PBXProjectModuleLabel
- text.h
+
StatusBarVisibility
@@ -578,8 +577,6 @@
306pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -619,7 +616,7 @@
TableOfContents
22322F6E1068349B00641384
- 22322F6F1068349B00641384
+ 2232300510683CAF00641384
1CD0528F0623707200166675
XCMainBuildResultsModuleGUID
@@ -663,8 +660,8 @@
yes
sizes
- {{0, 0}, {439, 212}}
- {{0, 212}, {439, 214}}
+ {{0, 0}, {439, 213}}
+ {{0, 213}, {439, 213}}
VerticalSplitView
@@ -713,7 +710,7 @@
209
Frame
- {{0, 212}, {439, 214}}
+ {{0, 213}, {439, 213}}
RubberWindowFrame
256 297 877 467 0 0 1280 778
@@ -741,13 +738,13 @@
TableOfContents
1CD10A99069EF8BA00B06720
- 22322FCC106838DD00641384
+ 2232300610683CAF00641384
1C162984064C10D400B95A72
- 22322FCD106838DD00641384
- 22322FCE106838DD00641384
- 22322FCF106838DD00641384
- 22322FD0106838DD00641384
- 22322FD1106838DD00641384
+ 2232300710683CAF00641384
+ 2232300810683CAF00641384
+ 2232300910683CAF00641384
+ 2232300A10683CAF00641384
+ 2232300B10683CAF00641384
ToolbarConfiguration
xcode.toolbar.config.debugV3
@@ -756,7 +753,7 @@
WindowToolGUID
1CD10A99069EF8BA00B06720
WindowToolIsVisible
-
+
Identifier
@@ -888,7 +885,7 @@
Frame
{{0, 0}, {650, 209}}
RubberWindowFrame
- 65 83 650 250 0 0 1280 778
+ 223 79 650 250 0 0 1280 778
Module
PBXDebugCLIModule
@@ -911,17 +908,17 @@
TableOfContents
1C78EAAD065D492600B07095
- 22322FD2106838DD00641384
+ 2232300C10683CAF00641384
1C78EAAC065D492600B07095
ToolbarConfiguration
xcode.toolbar.config.consoleV3
WindowString
- 65 83 650 250 0 0 1280 778
+ 223 79 650 250 0 0 1280 778
WindowToolGUID
1C78EAAD065D492600B07095
WindowToolIsVisible
-
+
Identifier
diff --git a/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser b/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser
index 7d510e6..c0f3458 100644
--- a/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser
+++ b/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser
@@ -70,28 +70,15 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 275264380;
- PBXWorkspaceStateSaveDate = 275264380;
+ PBXPerProjectTemplateStateSaveDate = 275266721;
+ PBXWorkspaceStateSaveDate = 275266721;
};
perUserProjectItems = {
- 22322FB31068372200641384 /* XCBuildMessageTextBookmark */ = 22322FB31068372200641384 /* XCBuildMessageTextBookmark */;
- 22322FB41068372200641384 /* PBXTextBookmark */ = 22322FB41068372200641384 /* PBXTextBookmark */;
- 22322FB71068375C00641384 /* PBXTextBookmark */ = 22322FB71068375C00641384 /* PBXTextBookmark */;
- 22322FBA106837B000641384 /* PBXTextBookmark */ = 22322FBA106837B000641384 /* PBXTextBookmark */;
- 22322FBB106837B000641384 /* XCBuildMessageTextBookmark */ = 22322FBB106837B000641384 /* XCBuildMessageTextBookmark */;
- 22322FBC106837B000641384 /* PBXTextBookmark */ = 22322FBC106837B000641384 /* PBXTextBookmark */;
22322FBF106837F600641384 /* PBXTextBookmark */ = 22322FBF106837F600641384 /* PBXTextBookmark */;
22322FC0106837F600641384 /* PBXTextBookmark */ = 22322FC0106837F600641384 /* PBXTextBookmark */;
22322FC1106837F600641384 /* PBXTextBookmark */ = 22322FC1106837F600641384 /* PBXTextBookmark */;
- 22322FC2106837F600641384 /* XCBuildMessageTextBookmark */ = 22322FC2106837F600641384 /* XCBuildMessageTextBookmark */;
- 22322FC3106837F600641384 /* PBXTextBookmark */ = 22322FC3106837F600641384 /* PBXTextBookmark */;
- 22322FC81068386800641384 /* PBXTextBookmark */ = 22322FC81068386800641384 /* PBXTextBookmark */;
- 22322FCB106838DD00641384 /* PBXTextBookmark */ = 22322FCB106838DD00641384 /* PBXTextBookmark */;
- 22322FD3106838F400641384 /* PBXTextBookmark */ = 22322FD3106838F400641384 /* PBXTextBookmark */;
- 22322FD61068391A00641384 /* PBXTextBookmark */ = 22322FD61068391A00641384 /* PBXTextBookmark */;
- 22322FD91068395300641384 /* PBXTextBookmark */ = 22322FD91068395300641384 /* PBXTextBookmark */;
- 22322FDA1068395600641384 /* PBXTextBookmark */ = 22322FDA1068395600641384 /* PBXTextBookmark */;
- 22322FDB1068395700641384 /* PBXTextBookmark */ = 22322FDB1068395700641384 /* PBXTextBookmark */;
+ 22322FF710683C8E00641384 /* PBXTextBookmark */ = 22322FF710683C8E00641384 /* PBXTextBookmark */;
+ 2232300F10683CF100641384 /* PBXTextBookmark */ = 2232300F10683CF100641384 /* PBXTextBookmark */;
};
sourceControlManager = 22322F61106833AB00641384 /* Source Control */;
userBuildSettings = {
@@ -162,9 +149,9 @@
};
22322F811068369500641384 /* text.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {677, 7033}}";
- sepNavSelRange = "{9975, 0}";
- sepNavVisRange = "{4354, 771}";
+ sepNavIntBoundsRect = "{{0, 0}, {677, 7241}}";
+ sepNavSelRange = "{4559, 0}";
+ sepNavVisRange = "{4292, 735}";
};
};
22322FA9106836B000641384 /* epanet2.h */ = {
@@ -181,64 +168,6 @@
sepNavVisRange = "{0, 156}";
};
};
- 22322FB31068372200641384 /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "'malloc.h' file not found";
- fRef = 22322F711068369500641384 /* epanet.c */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 134;
- rType = 1;
- };
- 22322FB41068372200641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F711068369500641384 /* epanet.c */;
- name = "epanet.c: 135";
- rLen = 0;
- rLoc = 4518;
- rType = 0;
- vrLen = 380;
- vrLoc = 4328;
- };
- 22322FB71068375C00641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F711068369500641384 /* epanet.c */;
- name = "epanet.c: 135";
- rLen = 0;
- rLoc = 4518;
- rType = 0;
- vrLen = 632;
- vrLoc = 4669;
- };
- 22322FBA106837B000641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F711068369500641384 /* epanet.c */;
- name = "epanet.c: 135";
- rLen = 0;
- rLoc = 4518;
- rType = 0;
- vrLen = 632;
- vrLoc = 4669;
- };
- 22322FBB106837B000641384 /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "Backslash and newline separated by space";
- fRef = 22322F811068369500641384 /* text.h */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 324;
- rType = 1;
- };
- 22322FBC106837B000641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 324";
- rLen = 0;
- rLoc = 9977;
- rType = 0;
- vrLen = 875;
- vrLoc = 9551;
- };
22322FBF106837F600641384 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 22322FA9106836B000641384 /* epanet2.h */;
@@ -269,94 +198,25 @@
vrLen = 744;
vrLoc = 4146;
};
- 22322FC2106837F600641384 /* XCBuildMessageTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "Backslash and newline separated by space";
- fRef = 22322F811068369500641384 /* text.h */;
- fallbackIsa = XCBuildMessageTextBookmark;
- rLen = 1;
- rLoc = 324;
- rType = 1;
- };
- 22322FC3106837F600641384 /* PBXTextBookmark */ = {
+ 22322FF710683C8E00641384 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 324";
+ name = "text.h: 157";
rLen = 0;
- rLoc = 9977;
- rType = 0;
- vrLen = 1146;
- vrLoc = 9413;
- };
- 22322FC81068386800641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 324";
- rLen = 0;
- rLoc = 9975;
- rType = 0;
- vrLen = 948;
- vrLoc = 6512;
- };
- 22322FCB106838DD00641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 325";
- rLen = 0;
- rLoc = 9977;
- rType = 0;
- vrLen = 887;
- vrLoc = 9855;
- };
- 22322FD3106838F400641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 325";
- rLen = 0;
- rLoc = 9977;
- rType = 0;
- vrLen = 984;
- vrLoc = 9855;
- };
- 22322FD61068391A00641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 324";
- rLen = 0;
- rLoc = 9975;
+ rLoc = 4559;
rType = 0;
vrLen = 771;
vrLoc = 4354;
};
- 22322FD91068395300641384 /* PBXTextBookmark */ = {
+ 2232300F10683CF100641384 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 325";
+ name = "text.h: 157";
rLen = 0;
- rLoc = 9977;
+ rLoc = 4559;
rType = 0;
- vrLen = 984;
- vrLoc = 9855;
- };
- 22322FDA1068395600641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 325";
- rLen = 0;
- rLoc = 9977;
- rType = 0;
- vrLen = 984;
- vrLoc = 9855;
- };
- 22322FDB1068395700641384 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 22322F811068369500641384 /* text.h */;
- name = "text.h: 324";
- rLen = 0;
- rLoc = 9975;
- rType = 0;
- vrLen = 771;
- vrLoc = 4354;
+ vrLen = 735;
+ vrLoc = 4292;
};
D2AAC0620554660B00DB518D /* epanet */ = {
activeExec = 0;