diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/categories.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/categories.pbxbtree new file mode 100644 index 0000000..d3f6bb3 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/categories.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/cdecls.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/cdecls.pbxbtree new file mode 100644 index 0000000..9d558b2 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/cdecls.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/decls.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/decls.pbxbtree new file mode 100644 index 0000000..d9dd6c8 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/decls.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/files.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/files.pbxbtree new file mode 100644 index 0000000..d285f0b Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/files.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/imports.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/imports.pbxbtree new file mode 100644 index 0000000..25e94b5 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/imports.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/pbxindex.header b/build/Xcode/epanet/epanet.build/epanet.pbxindex/pbxindex.header new file mode 100644 index 0000000..3e4ac05 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/pbxindex.header differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/protocols.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/protocols.pbxbtree new file mode 100644 index 0000000..d3f6bb3 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/protocols.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/refs.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/refs.pbxbtree new file mode 100644 index 0000000..a48cb1c Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/refs.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/control b/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/control new file mode 100644 index 0000000..e008c50 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/control differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/strings b/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/strings new file mode 100644 index 0000000..4c57bb2 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/strings.pbxstrings/strings differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/subclasses.pbxbtree b/build/Xcode/epanet/epanet.build/epanet.pbxindex/subclasses.pbxbtree new file mode 100644 index 0000000..124d157 Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/subclasses.pbxbtree differ diff --git a/build/Xcode/epanet/epanet.build/epanet.pbxindex/symbols0.pbxsymbols b/build/Xcode/epanet/epanet.build/epanet.pbxindex/symbols0.pbxsymbols new file mode 100644 index 0000000..422a2aa Binary files /dev/null and b/build/Xcode/epanet/epanet.build/epanet.pbxindex/symbols0.pbxsymbols differ diff --git a/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj new file mode 100644 index 0000000..746ab98 --- /dev/null +++ b/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj @@ -0,0 +1,422 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 22322F851068369500641384 /* enumstxt.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F701068369500641384 /* enumstxt.h */; }; + 22322F861068369500641384 /* epanet.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F711068369500641384 /* epanet.c */; }; + 22322F871068369500641384 /* funcs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F721068369500641384 /* funcs.h */; }; + 22322F881068369500641384 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F731068369500641384 /* hash.c */; }; + 22322F891068369500641384 /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F741068369500641384 /* hash.h */; }; + 22322F8A1068369500641384 /* hydraul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F751068369500641384 /* hydraul.c */; }; + 22322F8B1068369500641384 /* inpfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F761068369500641384 /* inpfile.c */; }; + 22322F8C1068369500641384 /* input1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F771068369500641384 /* input1.c */; }; + 22322F8D1068369500641384 /* input2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F781068369500641384 /* input2.c */; }; + 22322F8E1068369500641384 /* input3.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F791068369500641384 /* input3.c */; }; + 22322F8F1068369500641384 /* mempool.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7A1068369500641384 /* mempool.c */; }; + 22322F901068369500641384 /* mempool.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F7B1068369500641384 /* mempool.h */; }; + 22322F911068369500641384 /* output.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7C1068369500641384 /* output.c */; }; + 22322F921068369500641384 /* quality.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7D1068369500641384 /* quality.c */; }; + 22322F931068369500641384 /* report.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7E1068369500641384 /* report.c */; }; + 22322F941068369500641384 /* rules.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7F1068369500641384 /* rules.c */; }; + 22322F951068369500641384 /* smatrix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F801068369500641384 /* smatrix.c */; }; + 22322F961068369500641384 /* text.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F811068369500641384 /* text.h */; }; + 22322F971068369500641384 /* toolkit.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F821068369500641384 /* toolkit.h */; }; + 22322F981068369500641384 /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F831068369500641384 /* types.h */; }; + 22322F991068369500641384 /* vars.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322F841068369500641384 /* vars.h */; }; + 22322F9A1068369500641384 /* epanet.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F711068369500641384 /* epanet.c */; }; + 22322F9B1068369500641384 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F731068369500641384 /* hash.c */; }; + 22322F9C1068369500641384 /* hydraul.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F751068369500641384 /* hydraul.c */; }; + 22322F9D1068369500641384 /* inpfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F761068369500641384 /* inpfile.c */; }; + 22322F9E1068369500641384 /* input1.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F771068369500641384 /* input1.c */; }; + 22322F9F1068369500641384 /* input2.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F781068369500641384 /* input2.c */; }; + 22322FA01068369500641384 /* input3.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F791068369500641384 /* input3.c */; }; + 22322FA11068369500641384 /* mempool.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7A1068369500641384 /* mempool.c */; }; + 22322FA21068369500641384 /* output.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7C1068369500641384 /* output.c */; }; + 22322FA31068369500641384 /* quality.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7D1068369500641384 /* quality.c */; }; + 22322FA41068369500641384 /* report.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7E1068369500641384 /* report.c */; }; + 22322FA51068369500641384 /* rules.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F7F1068369500641384 /* rules.c */; }; + 22322FA61068369500641384 /* smatrix.c in Sources */ = {isa = PBXBuildFile; fileRef = 22322F801068369500641384 /* smatrix.c */; }; + 22322FAA106836BC00641384 /* epanet2.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322FA9106836B000641384 /* epanet2.h */; }; + 22322FAE106836D900641384 /* malloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 22322FAD106836D900641384 /* malloc.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 22322FAF1068370B00641384 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D2AAC0620554660B00DB518D; + remoteInfo = epanet; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 22322F66106833BB00641384 /* runepanet */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = runepanet; sourceTree = BUILT_PRODUCTS_DIR; }; + 22322F701068369500641384 /* enumstxt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = enumstxt.h; path = ../../../src/enumstxt.h; sourceTree = SOURCE_ROOT; }; + 22322F711068369500641384 /* epanet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = epanet.c; path = ../../../src/epanet.c; sourceTree = SOURCE_ROOT; }; + 22322F721068369500641384 /* funcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = funcs.h; path = ../../../src/funcs.h; sourceTree = SOURCE_ROOT; }; + 22322F731068369500641384 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hash.c; path = ../../../src/hash.c; sourceTree = SOURCE_ROOT; }; + 22322F741068369500641384 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hash.h; path = ../../../src/hash.h; sourceTree = SOURCE_ROOT; }; + 22322F751068369500641384 /* hydraul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hydraul.c; path = ../../../src/hydraul.c; sourceTree = SOURCE_ROOT; }; + 22322F761068369500641384 /* inpfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inpfile.c; path = ../../../src/inpfile.c; sourceTree = SOURCE_ROOT; }; + 22322F771068369500641384 /* input1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = input1.c; path = ../../../src/input1.c; sourceTree = SOURCE_ROOT; }; + 22322F781068369500641384 /* input2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = input2.c; path = ../../../src/input2.c; sourceTree = SOURCE_ROOT; }; + 22322F791068369500641384 /* input3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = input3.c; path = ../../../src/input3.c; sourceTree = SOURCE_ROOT; }; + 22322F7A1068369500641384 /* mempool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mempool.c; path = ../../../src/mempool.c; sourceTree = SOURCE_ROOT; }; + 22322F7B1068369500641384 /* mempool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mempool.h; path = ../../../src/mempool.h; sourceTree = SOURCE_ROOT; }; + 22322F7C1068369500641384 /* output.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = output.c; path = ../../../src/output.c; sourceTree = SOURCE_ROOT; }; + 22322F7D1068369500641384 /* quality.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = quality.c; path = ../../../src/quality.c; sourceTree = SOURCE_ROOT; }; + 22322F7E1068369500641384 /* report.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = report.c; path = ../../../src/report.c; sourceTree = SOURCE_ROOT; }; + 22322F7F1068369500641384 /* rules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rules.c; path = ../../../src/rules.c; sourceTree = SOURCE_ROOT; }; + 22322F801068369500641384 /* smatrix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = smatrix.c; path = ../../../src/smatrix.c; sourceTree = SOURCE_ROOT; }; + 22322F811068369500641384 /* text.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = text.h; path = ../../../src/text.h; sourceTree = SOURCE_ROOT; }; + 22322F821068369500641384 /* toolkit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = toolkit.h; path = ../../../src/toolkit.h; sourceTree = SOURCE_ROOT; }; + 22322F831068369500641384 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../../../src/types.h; sourceTree = SOURCE_ROOT; }; + 22322F841068369500641384 /* vars.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vars.h; path = ../../../src/vars.h; sourceTree = SOURCE_ROOT; }; + 22322FA9106836B000641384 /* epanet2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = epanet2.h; path = ../../../include/epanet2.h; sourceTree = SOURCE_ROOT; }; + 22322FAD106836D900641384 /* malloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = malloc.h; path = macinclude/malloc.h; sourceTree = ""; }; + D2AAC0630554660B00DB518D /* libepanet.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libepanet.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 22322F64106833BB00641384 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D289988505E68E00004EDB86 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 08FB7794FE84155DC02AAC07 /* epanet */ = { + isa = PBXGroup; + children = ( + 22322FA8106836A000641384 /* Include */, + 08FB7795FE84155DC02AAC07 /* Source */, + 1AB674ADFE9D54B511CA2CBB /* Products */, + ); + name = epanet; + sourceTree = ""; + }; + 08FB7795FE84155DC02AAC07 /* Source */ = { + isa = PBXGroup; + children = ( + 22322F701068369500641384 /* enumstxt.h */, + 22322F711068369500641384 /* epanet.c */, + 22322F721068369500641384 /* funcs.h */, + 22322F731068369500641384 /* hash.c */, + 22322F741068369500641384 /* hash.h */, + 22322F751068369500641384 /* hydraul.c */, + 22322F761068369500641384 /* inpfile.c */, + 22322F771068369500641384 /* input1.c */, + 22322F781068369500641384 /* input2.c */, + 22322F791068369500641384 /* input3.c */, + 22322F7A1068369500641384 /* mempool.c */, + 22322F7B1068369500641384 /* mempool.h */, + 22322F7C1068369500641384 /* output.c */, + 22322F7D1068369500641384 /* quality.c */, + 22322F7E1068369500641384 /* report.c */, + 22322F7F1068369500641384 /* rules.c */, + 22322F801068369500641384 /* smatrix.c */, + 22322F811068369500641384 /* text.h */, + 22322F821068369500641384 /* toolkit.h */, + 22322F831068369500641384 /* types.h */, + 22322F841068369500641384 /* vars.h */, + ); + name = Source; + sourceTree = ""; + }; + 1AB674ADFE9D54B511CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + D2AAC0630554660B00DB518D /* libepanet.dylib */, + 22322F66106833BB00641384 /* runepanet */, + ); + name = Products; + sourceTree = ""; + }; + 22322FA8106836A000641384 /* Include */ = { + isa = PBXGroup; + children = ( + 22322FAD106836D900641384 /* malloc.h */, + 22322FA9106836B000641384 /* epanet2.h */, + ); + name = Include; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + D2AAC0600554660B00DB518D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 22322FAA106836BC00641384 /* epanet2.h in Headers */, + 22322F851068369500641384 /* enumstxt.h in Headers */, + 22322F871068369500641384 /* funcs.h in Headers */, + 22322F891068369500641384 /* hash.h in Headers */, + 22322F901068369500641384 /* mempool.h in Headers */, + 22322F961068369500641384 /* text.h in Headers */, + 22322F971068369500641384 /* toolkit.h in Headers */, + 22322F981068369500641384 /* types.h in Headers */, + 22322F991068369500641384 /* vars.h in Headers */, + 22322FAE106836D900641384 /* malloc.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 22322F65106833BB00641384 /* runepanet */ = { + isa = PBXNativeTarget; + buildConfigurationList = 22322F6A106833E600641384 /* Build configuration list for PBXNativeTarget "runepanet" */; + buildPhases = ( + 22322F63106833BB00641384 /* Sources */, + 22322F64106833BB00641384 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 22322FB01068370B00641384 /* PBXTargetDependency */, + ); + name = runepanet; + productName = runepanet; + productReference = 22322F66106833BB00641384 /* runepanet */; + productType = "com.apple.product-type.tool"; + }; + D2AAC0620554660B00DB518D /* epanet */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1DEB914A08733D8E0010E9CD /* Build configuration list for PBXNativeTarget "epanet" */; + buildPhases = ( + D2AAC0600554660B00DB518D /* Headers */, + D2AAC0610554660B00DB518D /* Sources */, + D289988505E68E00004EDB86 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = epanet; + productName = epanet; + productReference = D2AAC0630554660B00DB518D /* libepanet.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 08FB7793FE84155DC02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "epanet" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 08FB7794FE84155DC02AAC07 /* epanet */; + projectDirPath = ""; + projectRoot = ../../..; + targets = ( + D2AAC0620554660B00DB518D /* epanet */, + 22322F65106833BB00641384 /* runepanet */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 22322F63106833BB00641384 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22322F9A1068369500641384 /* epanet.c in Sources */, + 22322F9B1068369500641384 /* hash.c in Sources */, + 22322F9C1068369500641384 /* hydraul.c in Sources */, + 22322F9D1068369500641384 /* inpfile.c in Sources */, + 22322F9E1068369500641384 /* input1.c in Sources */, + 22322F9F1068369500641384 /* input2.c in Sources */, + 22322FA01068369500641384 /* input3.c in Sources */, + 22322FA11068369500641384 /* mempool.c in Sources */, + 22322FA21068369500641384 /* output.c in Sources */, + 22322FA31068369500641384 /* quality.c in Sources */, + 22322FA41068369500641384 /* report.c in Sources */, + 22322FA51068369500641384 /* rules.c in Sources */, + 22322FA61068369500641384 /* smatrix.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D2AAC0610554660B00DB518D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22322F861068369500641384 /* epanet.c in Sources */, + 22322F881068369500641384 /* hash.c in Sources */, + 22322F8A1068369500641384 /* hydraul.c in Sources */, + 22322F8B1068369500641384 /* inpfile.c in Sources */, + 22322F8C1068369500641384 /* input1.c in Sources */, + 22322F8D1068369500641384 /* input2.c in Sources */, + 22322F8E1068369500641384 /* input3.c in Sources */, + 22322F8F1068369500641384 /* mempool.c in Sources */, + 22322F911068369500641384 /* output.c in Sources */, + 22322F921068369500641384 /* quality.c in Sources */, + 22322F931068369500641384 /* report.c in Sources */, + 22322F941068369500641384 /* rules.c in Sources */, + 22322F951068369500641384 /* smatrix.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 22322FB01068370B00641384 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D2AAC0620554660B00DB518D /* epanet */; + targetProxy = 22322FAF1068370B00641384 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + 1DEB914B08733D8E0010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + EXECUTABLE_PREFIX = lib; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INSTALL_PATH = /usr/local/lib; + PRODUCT_NAME = epanet; + }; + name = Debug; + }; + 1DEB914C08733D8E0010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EXECUTABLE_PREFIX = lib; + GCC_MODEL_TUNING = G5; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INSTALL_PATH = /usr/local/lib; + PRODUCT_NAME = epanet; + }; + name = Release; + }; + 1DEB914F08733D8E0010E9CD /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = macinclude; + ONLY_ACTIVE_ARCH = YES; + PREBINDING = NO; + SDKROOT = macosx10.6; + }; + name = Debug; + }; + 1DEB915008733D8E0010E9CD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = macinclude; + PREBINDING = NO; + SDKROOT = macosx10.6; + }; + name = Release; + }; + 22322F68106833BC00641384 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = CLE; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = runepanet; + }; + name = Debug; + }; + 22322F69106833BC00641384 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_MODEL_TUNING = G5; + GCC_PREPROCESSOR_DEFINITIONS = CLE; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; + INSTALL_PATH = /usr/local/bin; + PREBINDING = NO; + PRODUCT_NAME = runepanet; + ZERO_LINK = NO; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1DEB914A08733D8E0010E9CD /* Build configuration list for PBXNativeTarget "epanet" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB914B08733D8E0010E9CD /* Debug */, + 1DEB914C08733D8E0010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "epanet" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1DEB914F08733D8E0010E9CD /* Debug */, + 1DEB915008733D8E0010E9CD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 22322F6A106833E600641384 /* Build configuration list for PBXNativeTarget "runepanet" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22322F68106833BC00641384 /* Debug */, + 22322F69106833BC00641384 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; +} diff --git a/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3 b/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3 new file mode 100644 index 0000000..e52747b --- /dev/null +++ b/build/Xcode/epanet/epanet.xcodeproj/sam.mode1v3 @@ -0,0 +1,1422 @@ + + + + + ActivePerspectiveName + Project + AllowedModules + + + BundleLoadPath + + MaxInstances + n + Module + PBXSmartGroupTreeModule + Name + Groups and Files Outline View + + + BundleLoadPath + + MaxInstances + n + Module + PBXNavigatorGroup + Name + Editor + + + BundleLoadPath + + MaxInstances + n + Module + XCTaskListModule + Name + Task List + + + BundleLoadPath + + MaxInstances + n + Module + XCDetailModule + Name + File and Smart Group Detail Viewer + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXBuildResultsModule + Name + Detailed Build Results Viewer + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXProjectFindModule + Name + Project Batch Find Tool + + + BundleLoadPath + + MaxInstances + n + Module + XCProjectFormatConflictsModule + Name + Project Format Conflicts List + + + BundleLoadPath + + MaxInstances + n + Module + PBXBookmarksModule + Name + Bookmarks Tool + + + BundleLoadPath + + MaxInstances + n + Module + PBXClassBrowserModule + Name + Class Browser + + + BundleLoadPath + + MaxInstances + n + Module + PBXCVSModule + Name + Source Code Control Tool + + + BundleLoadPath + + MaxInstances + n + Module + PBXDebugBreakpointsModule + Name + Debug Breakpoints Tool + + + BundleLoadPath + + MaxInstances + n + Module + XCDockableInspector + Name + Inspector + + + BundleLoadPath + + MaxInstances + n + Module + PBXOpenQuicklyModule + Name + Open Quickly Tool + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXDebugSessionModule + Name + Debugger + + + BundleLoadPath + + MaxInstances + 1 + Module + PBXDebugCLIModule + Name + Debug Console + + + BundleLoadPath + + MaxInstances + n + Module + XCSnapshotModule + Name + Snapshots Tool + + + BundlePath + /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources + Description + DefaultDescriptionKey + DockingSystemVisible + + Extension + mode1v3 + FavBarConfig + + PBXProjectModuleGUID + 22322F6D1068349B00641384 + XCBarModuleItemNames + + XCBarModuleItems + + + FirstTimeWindowDisplayed + + Identifier + com.apple.perspectives.project.mode1v3 + MajorVersion + 33 + MinorVersion + 0 + Name + Default + Notifications + + OpenEditors + + PerspectiveWidths + + -1 + -1 + + Perspectives + + + ChosenToolbarItems + + active-combo-popup + action + NSToolbarFlexibleSpaceItem + debugger-enable-breakpoints + build + build-and-go + go + com.apple.ide.PBXToolbarStopButton + get-info + NSToolbarFlexibleSpaceItem + com.apple.pbx.toolbar.searchfield + + ControllerClassBaseName + + IconName + WindowOfProjectWithEditor + Identifier + perspective.project + IsVertical + + Layout + + + BecomeActive + + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C37FABC05509CD000000102 + 1C37FABC05539CD112110102 + E2644B35053B69B200211256 + 1C37FABC04509CD000100104 + 1CC0EA4004350EF90044410B + 1CC0EA4004350EF90041110B + + PBXProjectModuleGUID + 1CE0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + yes + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 186 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 08FB7794FE84155DC02AAC07 + 22322FA8106836A000641384 + 08FB7795FE84155DC02AAC07 + 1AB674ADFE9D54B511CA2CBB + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C37FABC05509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 28 + 26 + 0 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {186, 664}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + + XCSharingToken + com.apple.Xcode.GFSharingToken + + GeometryConfiguration + + Frame + {{0, 0}, {203, 682}} + GroupTreeTableConfiguration + + MainColumn + 186 + + RubberWindowFrame + 10 55 1241 723 0 0 1280 778 + + Module + PBXSmartGroupTreeModule + Proportion + 203pt + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1CE0B20306471E060097A5F4 + PBXProjectModuleLabel + epanet.c + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 1CE0B20406471E060097A5F4 + PBXProjectModuleLabel + epanet.c + _historyCapacity + 0 + bookmark + 22E9651712DE25BF00AFC3C0 + history + + 22D84C7E106845A4006D3DEE + 22CA5CC610977F26002D87B6 + 2288D7DF112E28D600D8B4B4 + 222BA1391180BE890071A4C7 + 222BA13B1180BE890071A4C7 + 22B1773E1199DED400A8EEC2 + 2270671C119B4A0C00BA4EF4 + 2211345511C189B0006B6918 + 223C3E2511C42F5800F60805 + 223C3E2711C42F5800F60805 + 223C3E2A11C42F5800F60805 + 223C3E2E11C42F5800F60805 + 226EC74811C6739B004BCBE1 + 226EC80A11C6E506004BCBE1 + 226EC80B11C6E506004BCBE1 + 226EC80C11C6E506004BCBE1 + 222BA21211C81765009CF8E3 + 222BA21311C81765009CF8E3 + 222BA21411C81765009CF8E3 + 222BA21611C81765009CF8E3 + 2299285511CFCEB10055BF95 + 2299285611CFCEB10055BF95 + 2299285811CFCEB10055BF95 + 22663BBD12D60AF7002E4167 + 22663BBF12D60AF7002E4167 + 22E9651512DE25BF00AFC3C0 + 22E9651612DE25BF00AFC3C0 + + + SplitCount + 1 + + StatusBarVisibility + + + GeometryConfiguration + + Frame + {{0, 0}, {1033, 600}} + RubberWindowFrame + 10 55 1241 723 0 0 1280 778 + + Module + PBXNavigatorGroup + Proportion + 600pt + + + ContentConfiguration + + PBXProjectModuleGUID + 1CE0B20506471E060097A5F4 + PBXProjectModuleLabel + Detail + + GeometryConfiguration + + Frame + {{0, 605}, {1033, 77}} + RubberWindowFrame + 10 55 1241 723 0 0 1280 778 + + Module + XCDetailModule + Proportion + 77pt + + + Proportion + 1033pt + + + Name + Project + ServiceClasses + + XCModuleDock + PBXSmartGroupTreeModule + XCModuleDock + PBXNavigatorGroup + XCDetailModule + + TableOfContents + + 22E9651812DE25BF00AFC3C0 + 1CE0B1FE06471DED0097A5F4 + 22E9651912DE25BF00AFC3C0 + 1CE0B20306471E060097A5F4 + 1CE0B20506471E060097A5F4 + + ToolbarConfigUserDefaultsMinorVersion + 2 + ToolbarConfiguration + xcode.toolbar.config.defaultV3 + + + ControllerClassBaseName + + IconName + WindowOfProject + Identifier + perspective.morph + IsVertical + 0 + Layout + + + BecomeActive + 1 + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 + 1C08E77C0454961000C914BD + 1C37FABC05509CD000000102 + 1C37FABC05539CD112110102 + E2644B35053B69B200211256 + 1C37FABC04509CD000100104 + 1CC0EA4004350EF90044410B + 1CC0EA4004350EF90041110B + + PBXProjectModuleGUID + 11E0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + yes + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 186 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 29B97314FDCFA39411CA2CEA + 1C37FABC05509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 0 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {186, 337}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + 1 + XCSharingToken + com.apple.Xcode.GFSharingToken + + GeometryConfiguration + + Frame + {{0, 0}, {203, 355}} + GroupTreeTableConfiguration + + MainColumn + 186 + + RubberWindowFrame + 373 269 690 397 0 0 1440 878 + + Module + PBXSmartGroupTreeModule + Proportion + 100% + + + Name + Morph + PreferredWidth + 300 + ServiceClasses + + XCModuleDock + PBXSmartGroupTreeModule + + TableOfContents + + 11E0B1FE06471DED0097A5F4 + + ToolbarConfiguration + xcode.toolbar.config.default.shortV3 + + + PerspectivesBarVisible + + ShelfIsVisible + + SourceDescription + file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec' + StatusbarIsVisible + + TimeStamp + 0.0 + ToolbarConfigUserDefaultsMinorVersion + 2 + ToolbarDisplayMode + 1 + ToolbarIsVisible + + ToolbarSizeMode + 1 + Type + Perspectives + UpdateMessage + The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'? + WindowJustification + 5 + WindowOrderList + + 22E9651A12DE25BF00AFC3C0 + 22E9651B12DE25BF00AFC3C0 + 1C78EAAD065D492600B07095 + 1CD10A99069EF8BA00B06720 + 22322F6E1068349B00641384 + /Users/sam/Desktop/epanet-220/trunk/build/Xcode/epanet/epanet.xcodeproj + + WindowString + 10 55 1241 723 0 0 1280 778 + WindowToolsV3 + + + FirstTimeWindowDisplayed + + Identifier + windowTool.build + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1CD0528F0623707200166675 + PBXProjectModuleLabel + epanet.c + StatusBarVisibility + + + GeometryConfiguration + + Frame + {{0, 0}, {792, 306}} + RubberWindowFrame + 266 190 792 588 0 0 1280 778 + + Module + PBXNavigatorGroup + Proportion + 306pt + + + BecomeActive + + ContentConfiguration + + PBXProjectModuleGUID + XCMainBuildResultsModuleGUID + PBXProjectModuleLabel + Build Results + XCBuildResultsTrigger_Collapse + 1021 + XCBuildResultsTrigger_Open + 1011 + + GeometryConfiguration + + Frame + {{0, 311}, {792, 236}} + RubberWindowFrame + 266 190 792 588 0 0 1280 778 + + Module + PBXBuildResultsModule + Proportion + 236pt + + + Proportion + 547pt + + + Name + Build Results + ServiceClasses + + PBXBuildResultsModule + + StatusbarIsVisible + + TableOfContents + + 22322F6E1068349B00641384 + 22E9650712DE25A500AFC3C0 + 1CD0528F0623707200166675 + XCMainBuildResultsModuleGUID + + ToolbarConfiguration + xcode.toolbar.config.buildV3 + WindowContentMinSize + 486 300 + WindowString + 266 190 792 588 0 0 1280 778 + WindowToolGUID + 22322F6E1068349B00641384 + WindowToolIsVisible + + + + FirstTimeWindowDisplayed + + Identifier + windowTool.debugger + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + Debugger + + HorizontalSplitView + + _collapsingFrameDimension + 0.0 + _indexOfCollapsedView + 0 + _percentageOfCollapsedView + 0.0 + isCollapsed + yes + sizes + + {{0, 0}, {439, 213}} + {{0, 213}, {439, 213}} + + + VerticalSplitView + + _collapsingFrameDimension + 0.0 + _indexOfCollapsedView + 0 + _percentageOfCollapsedView + 0.0 + isCollapsed + yes + sizes + + {{0, 0}, {439, 426}} + {{439, 0}, {438, 426}} + + + + LauncherConfigVersion + 8 + PBXProjectModuleGUID + 1C162984064C10D400B95A72 + PBXProjectModuleLabel + Debug - GLUTExamples (Underwater) + + GeometryConfiguration + + DebugConsoleVisible + None + DebugConsoleWindowFrame + {{200, 200}, {500, 300}} + DebugSTDIOWindowFrame + {{200, 200}, {500, 300}} + Frame + {{0, 0}, {877, 426}} + PBXDebugSessionStackFrameViewKey + + DebugVariablesTableConfiguration + + Name + 120 + Value + 85 + Summary + 209 + + Frame + {{0, 213}, {439, 213}} + RubberWindowFrame + 256 297 877 467 0 0 1280 778 + + RubberWindowFrame + 256 297 877 467 0 0 1280 778 + + Module + PBXDebugSessionModule + Proportion + 426pt + + + Proportion + 426pt + + + Name + Debugger + ServiceClasses + + PBXDebugSessionModule + + StatusbarIsVisible + + TableOfContents + + 1CD10A99069EF8BA00B06720 + 22E9650812DE25A500AFC3C0 + 1C162984064C10D400B95A72 + 22E9650912DE25A500AFC3C0 + 22E9650A12DE25A500AFC3C0 + 22E9650B12DE25A500AFC3C0 + 22E9650C12DE25A500AFC3C0 + 22E9650D12DE25A500AFC3C0 + + ToolbarConfiguration + xcode.toolbar.config.debugV3 + WindowString + 256 297 877 467 0 0 1280 778 + WindowToolGUID + 1CD10A99069EF8BA00B06720 + WindowToolIsVisible + + + + FirstTimeWindowDisplayed + + Identifier + windowTool.find + IsVertical + + Layout + + + Dock + + + Dock + + + BecomeActive + + ContentConfiguration + + PBXProjectModuleGUID + 1CDD528C0622207200134675 + PBXProjectModuleLabel + smatrix.c + StatusBarVisibility + + + GeometryConfiguration + + Frame + {{0, 0}, {1112, 493}} + RubberWindowFrame + 122 224 1112 778 0 0 1280 1002 + + Module + PBXNavigatorGroup + Proportion + 1112pt + + + Proportion + 493pt + + + ContentConfiguration + + PBXProjectModuleGUID + 1CD0528E0623707200166675 + PBXProjectModuleLabel + Project Find + + GeometryConfiguration + + Frame + {{0, 498}, {1112, 239}} + RubberWindowFrame + 122 224 1112 778 0 0 1280 1002 + + Module + PBXProjectFindModule + Proportion + 239pt + + + Proportion + 737pt + + + Name + Project Find + ServiceClasses + + PBXProjectFindModule + + StatusbarIsVisible + + TableOfContents + + 1C530D57069F1CE1000CFCEE + 22E3205E11CA762B008E8CBD + 22E3205F11CA762B008E8CBD + 1CDD528C0622207200134675 + 1CD0528E0623707200166675 + + WindowString + 122 224 1112 778 0 0 1280 1002 + WindowToolGUID + 1C530D57069F1CE1000CFCEE + WindowToolIsVisible + + + + Identifier + MENUSEPARATOR + + + FirstTimeWindowDisplayed + + Identifier + windowTool.debuggerConsole + IsVertical + + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1C78EAAC065D492600B07095 + PBXProjectModuleLabel + Debugger Console + + GeometryConfiguration + + Frame + {{0, 0}, {650, 209}} + RubberWindowFrame + 223 79 650 250 0 0 1280 778 + + Module + PBXDebugCLIModule + Proportion + 209pt + + + Proportion + 209pt + + + Name + Debugger Console + ServiceClasses + + PBXDebugCLIModule + + StatusbarIsVisible + + TableOfContents + + 1C78EAAD065D492600B07095 + 22E9650E12DE25A500AFC3C0 + 1C78EAAC065D492600B07095 + + ToolbarConfiguration + xcode.toolbar.config.consoleV3 + WindowString + 223 79 650 250 0 0 1280 778 + WindowToolGUID + 1C78EAAD065D492600B07095 + WindowToolIsVisible + + + + Identifier + windowTool.snapshots + Layout + + + Dock + + + Module + XCSnapshotModule + Proportion + 100% + + + Proportion + 100% + + + Name + Snapshots + ServiceClasses + + XCSnapshotModule + + StatusbarIsVisible + Yes + ToolbarConfiguration + xcode.toolbar.config.snapshots + WindowString + 315 824 300 550 0 0 1440 878 + WindowToolIsVisible + Yes + + + Identifier + windowTool.scm + Layout + + + Dock + + + ContentConfiguration + + PBXProjectModuleGUID + 1C78EAB2065D492600B07095 + PBXProjectModuleLabel + <No Editor> + PBXSplitModuleInNavigatorKey + + Split0 + + PBXProjectModuleGUID + 1C78EAB3065D492600B07095 + + SplitCount + 1 + + StatusBarVisibility + 1 + + GeometryConfiguration + + Frame + {{0, 0}, {452, 0}} + RubberWindowFrame + 743 379 452 308 0 0 1280 1002 + + Module + PBXNavigatorGroup + Proportion + 0pt + + + BecomeActive + 1 + ContentConfiguration + + PBXProjectModuleGUID + 1CD052920623707200166675 + PBXProjectModuleLabel + SCM + + GeometryConfiguration + + ConsoleFrame + {{0, 259}, {452, 0}} + Frame + {{0, 7}, {452, 259}} + RubberWindowFrame + 743 379 452 308 0 0 1280 1002 + TableConfiguration + + Status + 30 + FileName + 199 + Path + 197.0950012207031 + + TableFrame + {{0, 0}, {452, 250}} + + Module + PBXCVSModule + Proportion + 262pt + + + Proportion + 266pt + + + Name + SCM + ServiceClasses + + PBXCVSModule + + StatusbarIsVisible + 1 + TableOfContents + + 1C78EAB4065D492600B07095 + 1C78EAB5065D492600B07095 + 1C78EAB2065D492600B07095 + 1CD052920623707200166675 + + ToolbarConfiguration + xcode.toolbar.config.scm + WindowString + 743 379 452 308 0 0 1280 1002 + + + Identifier + windowTool.breakpoints + IsVertical + 0 + Layout + + + Dock + + + BecomeActive + 1 + ContentConfiguration + + PBXBottomSmartGroupGIDs + + 1C77FABC04509CD000000102 + + PBXProjectModuleGUID + 1CE0B1FE06471DED0097A5F4 + PBXProjectModuleLabel + Files + PBXProjectStructureProvided + no + PBXSmartGroupTreeModuleColumnData + + PBXSmartGroupTreeModuleColumnWidthsKey + + 168 + + PBXSmartGroupTreeModuleColumnsKey_v4 + + MainColumn + + + PBXSmartGroupTreeModuleOutlineStateKey_v7 + + PBXSmartGroupTreeModuleOutlineStateExpansionKey + + 1C77FABC04509CD000000102 + + PBXSmartGroupTreeModuleOutlineStateSelectionKey + + + 0 + + + PBXSmartGroupTreeModuleOutlineStateVisibleRectKey + {{0, 0}, {168, 350}} + + PBXTopSmartGroupGIDs + + XCIncludePerspectivesSwitch + 0 + + GeometryConfiguration + + Frame + {{0, 0}, {185, 368}} + GroupTreeTableConfiguration + + MainColumn + 168 + + RubberWindowFrame + 315 424 744 409 0 0 1440 878 + + Module + PBXSmartGroupTreeModule + Proportion + 185pt + + + ContentConfiguration + + PBXProjectModuleGUID + 1CA1AED706398EBD00589147 + PBXProjectModuleLabel + Detail + + GeometryConfiguration + + Frame + {{190, 0}, {554, 368}} + RubberWindowFrame + 315 424 744 409 0 0 1440 878 + + Module + XCDetailModule + Proportion + 554pt + + + Proportion + 368pt + + + MajorVersion + 3 + MinorVersion + 0 + Name + Breakpoints + ServiceClasses + + PBXSmartGroupTreeModule + XCDetailModule + + StatusbarIsVisible + 1 + TableOfContents + + 1CDDB66807F98D9800BB5817 + 1CDDB66907F98D9800BB5817 + 1CE0B1FE06471DED0097A5F4 + 1CA1AED706398EBD00589147 + + ToolbarConfiguration + xcode.toolbar.config.breakpointsV3 + WindowString + 315 424 744 409 0 0 1440 878 + WindowToolGUID + 1CDDB66807F98D9800BB5817 + WindowToolIsVisible + 1 + + + Identifier + windowTool.debugAnimator + Layout + + + Dock + + + Module + PBXNavigatorGroup + Proportion + 100% + + + Proportion + 100% + + + Name + Debug Visualizer + ServiceClasses + + PBXNavigatorGroup + + StatusbarIsVisible + 1 + ToolbarConfiguration + xcode.toolbar.config.debugAnimatorV3 + WindowString + 100 100 700 500 0 0 1280 1002 + + + Identifier + windowTool.bookmarks + Layout + + + Dock + + + Module + PBXBookmarksModule + Proportion + 100% + + + Proportion + 100% + + + Name + Bookmarks + ServiceClasses + + PBXBookmarksModule + + StatusbarIsVisible + 0 + WindowString + 538 42 401 187 0 0 1280 1002 + + + Identifier + windowTool.projectFormatConflicts + Layout + + + Dock + + + Module + XCProjectFormatConflictsModule + Proportion + 100% + + + Proportion + 100% + + + Name + Project Format Conflicts + ServiceClasses + + XCProjectFormatConflictsModule + + StatusbarIsVisible + 0 + WindowContentMinSize + 450 300 + WindowString + 50 850 472 307 0 0 1440 877 + + + Identifier + windowTool.classBrowser + Layout + + + Dock + + + BecomeActive + 1 + ContentConfiguration + + OptionsSetName + Hierarchy, all classes + PBXProjectModuleGUID + 1CA6456E063B45B4001379D8 + PBXProjectModuleLabel + Class Browser - NSObject + + GeometryConfiguration + + ClassesFrame + {{0, 0}, {374, 96}} + ClassesTreeTableConfiguration + + PBXClassNameColumnIdentifier + 208 + PBXClassBookColumnIdentifier + 22 + + Frame + {{0, 0}, {630, 331}} + MembersFrame + {{0, 105}, {374, 395}} + MembersTreeTableConfiguration + + PBXMemberTypeIconColumnIdentifier + 22 + PBXMemberNameColumnIdentifier + 216 + PBXMemberTypeColumnIdentifier + 97 + PBXMemberBookColumnIdentifier + 22 + + PBXModuleWindowStatusBarHidden2 + 1 + RubberWindowFrame + 385 179 630 352 0 0 1440 878 + + Module + PBXClassBrowserModule + Proportion + 332pt + + + Proportion + 332pt + + + Name + Class Browser + ServiceClasses + + PBXClassBrowserModule + + StatusbarIsVisible + 0 + TableOfContents + + 1C0AD2AF069F1E9B00FABCE6 + 1C0AD2B0069F1E9B00FABCE6 + 1CA6456E063B45B4001379D8 + + ToolbarConfiguration + xcode.toolbar.config.classbrowser + WindowString + 385 179 630 352 0 0 1440 878 + WindowToolGUID + 1C0AD2AF069F1E9B00FABCE6 + WindowToolIsVisible + 0 + + + Identifier + windowTool.refactoring + IncludeInToolsMenu + 0 + Layout + + + Dock + + + BecomeActive + 1 + GeometryConfiguration + + Frame + {0, 0}, {500, 335} + RubberWindowFrame + {0, 0}, {500, 335} + + Module + XCRefactoringModule + Proportion + 100% + + + Proportion + 100% + + + Name + Refactoring + ServiceClasses + + XCRefactoringModule + + WindowString + 200 200 500 356 0 0 1920 1200 + + + + diff --git a/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser b/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser new file mode 100644 index 0000000..614b634 --- /dev/null +++ b/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser @@ -0,0 +1,665 @@ +// !$*UTF8*$! +{ + 08FB7793FE84155DC02AAC07 /* Project object */ = { + activeArchitecturePreference = x86_64; + activeBuildConfigurationName = Release; + activeExecutable = 22322F67106833BB00641384 /* runepanet */; + activeTarget = D2AAC0620554660B00DB518D /* epanet */; + addToTargets = ( + D2AAC0620554660B00DB518D /* epanet */, + ); + breakpoints = ( + ); + codeSenseManager = 22322F62106833AB00641384 /* Code sense */; + executables = ( + 22322F67106833BB00641384 /* runepanet */, + ); + perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID; + PBXFileTableDataSourceColumnWidthsKey = ( + 22, + 300, + 682, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXExecutablesDataSource_ActiveFlagID, + PBXExecutablesDataSource_NameID, + PBXExecutablesDataSource_CommentsID, + ); + }; + PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 794, + 20, + 48, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; + PBXConfiguration.PBXFileTableDataSource3.XCSCMDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 20, + 475, + 20, + 48, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_SCM_ColumnID, + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; + PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 754, + 60, + 20, + 48, + 43, + 43, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXTargetDataSource_PrimaryAttribute, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 316548509; + PBXWorkspaceStateSaveDate = 316548509; + }; + perUserProjectItems = { + 2211345511C189B0006B6918 /* PBXTextBookmark */ = 2211345511C189B0006B6918 /* PBXTextBookmark */; + 222BA1391180BE890071A4C7 /* PBXTextBookmark */ = 222BA1391180BE890071A4C7 /* PBXTextBookmark */; + 222BA13B1180BE890071A4C7 /* PBXTextBookmark */ = 222BA13B1180BE890071A4C7 /* PBXTextBookmark */; + 222BA21211C81765009CF8E3 /* PBXTextBookmark */ = 222BA21211C81765009CF8E3 /* PBXTextBookmark */; + 222BA21311C81765009CF8E3 /* PBXTextBookmark */ = 222BA21311C81765009CF8E3 /* PBXTextBookmark */; + 222BA21411C81765009CF8E3 /* PBXTextBookmark */ = 222BA21411C81765009CF8E3 /* PBXTextBookmark */; + 222BA21611C81765009CF8E3 /* PBXTextBookmark */ = 222BA21611C81765009CF8E3 /* PBXTextBookmark */; + 223C3E2511C42F5800F60805 /* PBXTextBookmark */ = 223C3E2511C42F5800F60805 /* PBXTextBookmark */; + 223C3E2711C42F5800F60805 /* PBXTextBookmark */ = 223C3E2711C42F5800F60805 /* PBXTextBookmark */; + 223C3E2A11C42F5800F60805 /* PBXTextBookmark */ = 223C3E2A11C42F5800F60805 /* PBXTextBookmark */; + 223C3E2E11C42F5800F60805 /* PBXTextBookmark */ = 223C3E2E11C42F5800F60805 /* PBXTextBookmark */; + 22663BBD12D60AF7002E4167 /* PBXTextBookmark */ = 22663BBD12D60AF7002E4167 /* PBXTextBookmark */; + 22663BBF12D60AF7002E4167 /* PBXTextBookmark */ = 22663BBF12D60AF7002E4167 /* PBXTextBookmark */; + 226EC74811C6739B004BCBE1 /* PBXTextBookmark */ = 226EC74811C6739B004BCBE1 /* PBXTextBookmark */; + 226EC80A11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80A11C6E506004BCBE1 /* PBXTextBookmark */; + 226EC80B11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80B11C6E506004BCBE1 /* PBXTextBookmark */; + 226EC80C11C6E506004BCBE1 /* PBXTextBookmark */ = 226EC80C11C6E506004BCBE1 /* PBXTextBookmark */; + 2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */ = 2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */; + 2288D7DF112E28D600D8B4B4 /* PBXTextBookmark */ = 2288D7DF112E28D600D8B4B4 /* PBXTextBookmark */; + 2299285511CFCEB10055BF95 /* PBXTextBookmark */ = 2299285511CFCEB10055BF95 /* PBXTextBookmark */; + 2299285611CFCEB10055BF95 /* PBXTextBookmark */ = 2299285611CFCEB10055BF95 /* PBXTextBookmark */; + 2299285811CFCEB10055BF95 /* PBXTextBookmark */ = 2299285811CFCEB10055BF95 /* PBXTextBookmark */; + 22B1773E1199DED400A8EEC2 /* PBXTextBookmark */ = 22B1773E1199DED400A8EEC2 /* PBXTextBookmark */; + 22CA5CC610977F26002D87B6 /* PBXTextBookmark */ = 22CA5CC610977F26002D87B6 /* PBXTextBookmark */; + 22D84C7E106845A4006D3DEE /* PBXTextBookmark */ = 22D84C7E106845A4006D3DEE /* PBXTextBookmark */; + 22E9651512DE25BF00AFC3C0 /* PBXTextBookmark */ = 22E9651512DE25BF00AFC3C0 /* PBXTextBookmark */; + 22E9651612DE25BF00AFC3C0 /* XCBuildMessageTextBookmark */ = 22E9651612DE25BF00AFC3C0 /* XCBuildMessageTextBookmark */; + 22E9651712DE25BF00AFC3C0 /* PBXTextBookmark */ = 22E9651712DE25BF00AFC3C0 /* PBXTextBookmark */; + }; + sourceControlManager = 22322F61106833AB00641384 /* Source Control */; + userBuildSettings = { + OBJROOT = "$(SYMROOT)"; + SYMROOT = ./; + }; + }; + 2211345511C189B0006B6918 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F761068369500641384 /* inpfile.c */; + name = "inpfile.c: 68"; + rLen = 7; + rLoc = 2196; + rType = 0; + vrLen = 1107; + vrLoc = 1498; + }; + 222BA1391180BE890071A4C7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F741068369500641384 /* hash.h */; + name = "hash.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 399; + vrLoc = 0; + }; + 222BA13B1180BE890071A4C7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7B1068369500641384 /* mempool.h */; + name = "mempool.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 430; + vrLoc = 0; + }; + 222BA21211C81765009CF8E3 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F791068369500641384 /* input3.c */; + name = "input3.c: 106"; + rLen = 4; + rLoc = 2779; + rType = 0; + vrLen = 1300; + vrLoc = 2147; + }; + 222BA21311C81765009CF8E3 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7A1068369500641384 /* mempool.c */; + name = "mempool.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1096; + vrLoc = 0; + }; + 222BA21411C81765009CF8E3 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F801068369500641384 /* smatrix.c */; + name = "smatrix.c: 611"; + rLen = 0; + rLoc = 21459; + rType = 0; + vrLen = 1842; + vrLoc = 0; + }; + 222BA21611C81765009CF8E3 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 222BA21711C81765009CF8E3 /* _string.h */; + name = "_string.h: 72"; + rLen = 37; + rLoc = 2275; + rType = 0; + vrLen = 1280; + vrLoc = 1720; + }; + 222BA21711C81765009CF8E3 /* _string.h */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + name = _string.h; + path = /Developer/SDKs/MacOSX10.6.sdk/usr/include/secure/_string.h; + sourceTree = ""; + }; + 22322F61106833AB00641384 /* Source Control */ = { + isa = PBXSourceControlManager; + fallbackIsa = XCSourceControlManager; + isSCMEnabled = 0; + scmConfiguration = { + repositoryNamesForRoots = { + ../../.. = EPANET; + }; + }; + }; + 22322F62106833AB00641384 /* Code sense */ = { + isa = PBXCodeSenseManager; + indexTemplatePath = ""; + }; + 22322F65106833BB00641384 /* runepanet */ = { + activeExec = 0; + executables = ( + 22322F67106833BB00641384 /* runepanet */, + ); + }; + 22322F67106833BB00641384 /* runepanet */ = { + isa = PBXExecutable; + activeArgIndices = ( + YES, + YES, + ); + argumentStrings = ( + "net2-cl2.inp", + output.txt, + ); + autoAttachOnCrash = 1; + breakpointsEnabled = 1; + configStateDict = { + }; + customDataFormattersEnabled = 1; + dataTipCustomDataFormattersEnabled = 1; + dataTipShowTypeColumn = 1; + dataTipSortType = 0; + debuggerPlugin = GDBDebugging; + disassemblyDisplayState = 0; + dylibVariantSuffix = ""; + enableDebugStr = 1; + environmentEntries = ( + ); + executableSystemSymbolLevel = 0; + executableUserSymbolLevel = 0; + libgmallocEnabled = 0; + name = runepanet; + savedGlobals = { + }; + showTypeColumn = 0; + sourceDirectories = ( + ); + }; + 22322F701068369500641384 /* enumstxt.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 2040}}"; + sepNavSelRange = "{3567, 0}"; + sepNavVisRange = "{0, 1397}"; + }; + }; + 22322F711068369500641384 /* epanet.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {772, 47475}}"; + sepNavSelRange = "{89609, 28}"; + sepNavVisRange = "{89317, 642}"; + }; + }; + 22322F721068369500641384 /* funcs.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 4275}}"; + sepNavSelRange = "{872, 0}"; + sepNavVisRange = "{5560, 2692}"; + }; + }; + 22322F731068369500641384 /* hash.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 1575}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1451}"; + }; + }; + 22322F741068369500641384 /* hash.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {938, 572}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 399}"; + }; + }; + 22322F751068369500641384 /* hydraul.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 37245}}"; + sepNavSelRange = "{4586, 0}"; + sepNavVisRange = "{5973, 1560}"; + }; + }; + 22322F761068369500641384 /* inpfile.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1051, 8640}}"; + sepNavSelRange = "{15692, 9}"; + sepNavVisRange = "{15087, 1806}"; + }; + }; + 22322F771068369500641384 /* input1.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1051, 9615}}"; + sepNavSelRange = "{18142, 0}"; + sepNavVisRange = "{17691, 1069}"; + }; + }; + 22322F781068369500641384 /* input2.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 14790}}"; + sepNavSelRange = "{23238, 0}"; + sepNavVisRange = "{22319, 1198}"; + }; + }; + 22322F791068369500641384 /* input3.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 27885}}"; + sepNavSelRange = "{2779, 4}"; + sepNavVisRange = "{2147, 1300}"; + sepNavWindowFrame = "{{-1265, 18}, {1132, 777}}"; + }; + }; + 22322F7A1068369500641384 /* mempool.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 2940}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 1096}"; + }; + }; + 22322F7B1068369500641384 /* mempool.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {938, 572}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRange = "{0, 430}"; + }; + }; + 22322F7C1068369500641384 /* output.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1051, 10560}}"; + sepNavSelRange = "{8225, 4}"; + sepNavVisRange = "{7697, 1013}"; + }; + }; + 22322F7D1068369500641384 /* quality.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1051, 24450}}"; + sepNavSelRange = "{11965, 5}"; + sepNavVisRange = "{11499, 566}"; + }; + }; + 22322F7E1068369500641384 /* report.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 18405}}"; + sepNavSelRange = "{5967, 0}"; + sepNavVisRange = "{5202, 970}"; + }; + }; + 22322F7F1068369500641384 /* rules.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 14370}}"; + sepNavSelRange = "{23361, 0}"; + sepNavVisRange = "{24196, 785}"; + }; + }; + 22322F801068369500641384 /* smatrix.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1051, 11130}}"; + sepNavSelRange = "{20601, 0}"; + sepNavVisRange = "{23146, 875}"; + }; + }; + 22322F811068369500641384 /* text.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 8640}}"; + sepNavSelRange = "{6274, 0}"; + sepNavVisRange = "{5427, 1242}"; + }; + }; + 22322F821068369500641384 /* toolkit.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 3435}}"; + sepNavSelRange = "{3752, 0}"; + sepNavVisRange = "{5086, 1781}"; + }; + }; + 22322F831068369500641384 /* types.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {995, 7005}}"; + sepNavSelRange = "{2790, 6}"; + sepNavVisRange = "{1413, 1592}"; + }; + }; + 22322F841068369500641384 /* vars.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 2985}}"; + sepNavSelRange = "{12342, 0}"; + sepNavVisRange = "{10638, 2670}"; + }; + }; + 22322FA9106836B000641384 /* epanet2.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 3345}}"; + sepNavSelRange = "{1888, 0}"; + sepNavVisRange = "{4718, 1564}"; + }; + }; + 22322FAD106836D900641384 /* malloc.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {972, 700}}"; + sepNavSelRange = "{156, 0}"; + sepNavVisRange = "{0, 156}"; + }; + }; + 223C3E2511C42F5800F60805 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7F1068369500641384 /* rules.c */; + name = "rules.c: 815"; + rLen = 0; + rLoc = 23361; + rType = 0; + vrLen = 785; + vrLoc = 24196; + }; + 223C3E2711C42F5800F60805 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F811068369500641384 /* text.h */; + name = "text.h: 214"; + rLen = 0; + rLoc = 6274; + rType = 0; + vrLen = 1242; + vrLoc = 5427; + }; + 223C3E2A11C42F5800F60805 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7E1068369500641384 /* report.c */; + name = "report.c: 191"; + rLen = 0; + rLoc = 5967; + rType = 0; + vrLen = 970; + vrLoc = 5202; + }; + 223C3E2E11C42F5800F60805 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F701068369500641384 /* enumstxt.h */; + name = "enumstxt.h: 107"; + rLen = 0; + rLoc = 3567; + rType = 0; + vrLen = 1397; + vrLoc = 0; + }; + 22663BBD12D60AF7002E4167 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F841068369500641384 /* vars.h */; + name = "vars.h: 179"; + rLen = 0; + rLoc = 12342; + rType = 0; + vrLen = 2670; + vrLoc = 10638; + }; + 22663BBF12D60AF7002E4167 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F731068369500641384 /* hash.c */; + name = "hash.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1451; + vrLoc = 0; + }; + 226EC74811C6739B004BCBE1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F721068369500641384 /* funcs.h */; + name = "funcs.h: 22"; + rLen = 0; + rLoc = 872; + rType = 0; + vrLen = 2692; + vrLoc = 5560; + }; + 226EC80A11C6E506004BCBE1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F831068369500641384 /* types.h */; + name = "types.h: 70"; + rLen = 6; + rLoc = 2790; + rType = 0; + vrLen = 1592; + vrLoc = 1413; + }; + 226EC80B11C6E506004BCBE1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F771068369500641384 /* input1.c */; + name = "input1.c: 331"; + rLen = 0; + rLoc = 12979; + rType = 0; + vrLen = 1036; + vrLoc = 12535; + }; + 226EC80C11C6E506004BCBE1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F781068369500641384 /* input2.c */; + name = "input2.c: 786"; + rLen = 0; + rLoc = 23238; + rType = 0; + vrLen = 1198; + vrLoc = 22319; + }; + 2270671C119B4A0C00BA4EF4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7C1068369500641384 /* output.c */; + name = "output.c: 347"; + rLen = 0; + rLoc = 12203; + rType = 0; + vrLen = 1509; + vrLoc = 11269; + }; + 2288D7DF112E28D600D8B4B4 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F7D1068369500641384 /* quality.c */; + name = "quality.c: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1836; + vrLoc = 0; + }; + 2299285511CFCEB10055BF95 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F751068369500641384 /* hydraul.c */; + name = "hydraul.c: 132"; + rLen = 0; + rLoc = 4586; + rType = 0; + vrLen = 1560; + vrLoc = 5973; + }; + 2299285611CFCEB10055BF95 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322FAD106836D900641384 /* malloc.h */; + name = "malloc.h: 10"; + rLen = 0; + rLoc = 156; + rType = 0; + vrLen = 156; + vrLoc = 0; + }; + 2299285811CFCEB10055BF95 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F821068369500641384 /* toolkit.h */; + name = "toolkit.h: 138"; + rLen = 0; + rLoc = 3752; + rType = 0; + vrLen = 1781; + vrLoc = 5086; + }; + 22B1773E1199DED400A8EEC2 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22B1773F1199DED400A8EEC2 /* example1.cpp */; + name = "example1.cpp: 60"; + rLen = 0; + rLoc = 1769; + rType = 0; + vrLen = 1478; + vrLoc = 0; + }; + 22B1773F1199DED400A8EEC2 /* example1.cpp */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + name = example1.cpp; + path = /Users/sam/Downloads/v1.00beta/example1.cpp; + sourceTree = ""; + }; + 22CA5CC610977F26002D87B6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22D84C86106845FF006D3DEE /* project.pbxproj */; + name = "project.pbxproj: 416"; + rLen = 0; + rLoc = 21302; + rType = 0; + vrLen = 1814; + vrLoc = 0; + }; + 22D84C7E106845A4006D3DEE /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22D84C7F106845A4006D3DEE /* sam.pbxuser */; + name = "sam.pbxuser: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 909; + vrLoc = 0; + }; + 22D84C7F106845A4006D3DEE /* sam.pbxuser */ = { + isa = PBXFileReference; + lastKnownFileType = text; + name = sam.pbxuser; + path = /Users/sam/Documents/School/ENGCVS/EPANET/BASE/trunk/build/Xcode/epanet/epanet.xcodeproj/sam.pbxuser; + sourceTree = ""; + }; + 22D84C86106845FF006D3DEE /* project.pbxproj */ = { + isa = PBXFileReference; + lastKnownFileType = text.pbxproject; + name = project.pbxproj; + path = /Users/sam/Documents/School/ENGCVS/EPANET/BASE/trunk/build/Xcode/epanet/epanet.xcodeproj/project.pbxproj; + sourceTree = ""; + }; + 22E9651512DE25BF00AFC3C0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322FA9106836B000641384 /* epanet2.h */; + name = "epanet2.h: 75"; + rLen = 0; + rLoc = 1888; + rType = 0; + vrLen = 1564; + vrLoc = 4718; + }; + 22E9651612DE25BF00AFC3C0 /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Unused variable 'name'"; + fRef = 22322F711068369500641384 /* epanet.c */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 2890; + rType = 1; + }; + 22E9651712DE25BF00AFC3C0 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 22322F711068369500641384 /* epanet.c */; + name = "epanet.c: 2891"; + rLen = 28; + rLoc = 89609; + rType = 0; + vrLen = 1205; + vrLoc = 89037; + }; + D2AAC0620554660B00DB518D /* epanet */ = { + activeExec = 0; + }; +} diff --git a/build/Xcode/epanet/macinclude/malloc.h b/build/Xcode/epanet/macinclude/malloc.h new file mode 100644 index 0000000..1a882e9 --- /dev/null +++ b/build/Xcode/epanet/macinclude/malloc.h @@ -0,0 +1,10 @@ +/* + * malloc.h + * epanet + * + * Created by Sam Hatchett on 9/21/09. + * Copyright 2009 __MyCompanyName__. All rights reserved. + * + */ + +#include \ No newline at end of file diff --git a/include/epanet2.h b/include/epanet2.h index c22c856..4cbb348 100755 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -1,10 +1,10 @@ /* - ** EPANET2.H - ** - ** C/C++ header file for EPANET Programmers Toolkit - ** - ** Last updated on 2/14/08 (2.00.12) - */ +** EPANET2.H +** +** C/C++ header file for EPANET Programmers Toolkit +** +** Last updated on 2/14/08 (2.00.12) +*/ #ifndef EPANET2_H #define EPANET2_H @@ -37,8 +37,6 @@ #define EN_MIXFRACTION 22 #define EN_TANK_KBULK 23 -#define EN_TANKVOLUME 24 /* SH added 4.2010 */ - #define EN_DIAMETER 0 /* Link parameters */ #define EN_LENGTH 1 #define EN_ROUGHNESS 2 @@ -64,8 +62,6 @@ #define EN_RULESTEP 7 #define EN_STATISTIC 8 #define EN_PERIODS 9 -#define EN_HTIME 10 -#define EN_HALTFLAG 11 /* sh 4.2010 */ #define EN_NODECOUNT 0 /* Component counts */ #define EN_TANKCOUNT 1 @@ -140,94 +136,94 @@ #undef WINDOWS #ifdef _WIN32 -#define WINDOWS + #define WINDOWS #endif #ifdef __WIN32__ -#define WINDOWS + #define WINDOWS #endif // --- define DLLEXPORT #ifdef WINDOWS -#ifdef __cplusplus -#define DLLEXPORT extern "C" __declspec(dllexport) __stdcall + #ifdef __cplusplus + #define DLLEXPORT extern "C" __declspec(dllexport) __stdcall + #else + #define DLLEXPORT __declspec(dllexport) __stdcall + #endif #else -#define DLLEXPORT __declspec(dllexport) __stdcall -#endif -#else -#ifdef __cplusplus -#define DLLEXPORT extern "C" -#else -#define DLLEXPORT -#endif + #ifdef __cplusplus + #define DLLEXPORT extern "C" + #else + #define DLLEXPORT + #endif #endif // --- declare the EPANET toolkit functions -int DLLEXPORT ENepanet(char *, char *, char *, void (*) (char *)); -int DLLEXPORT ENopen(char *, char *, char *); -int DLLEXPORT ENsaveinpfile(char *); -int DLLEXPORT ENclose(void); + int DLLEXPORT ENepanet(char *, char *, char *, void (*) (char *)); + int DLLEXPORT ENopen(char *, char *, char *); + int DLLEXPORT ENsaveinpfile(char *); + int DLLEXPORT ENclose(void); -int DLLEXPORT ENsolveH(void); -int DLLEXPORT ENsaveH(void); -int DLLEXPORT ENopenH(void); -int DLLEXPORT ENinitH(int); -int DLLEXPORT ENrunH(long *); -int DLLEXPORT ENnextH(long *); -int DLLEXPORT ENcloseH(void); -int DLLEXPORT ENsavehydfile(char *); -int DLLEXPORT ENusehydfile(char *); + int DLLEXPORT ENsolveH(void); + int DLLEXPORT ENsaveH(void); + int DLLEXPORT ENopenH(void); + int DLLEXPORT ENinitH(int); + int DLLEXPORT ENrunH(long *); + int DLLEXPORT ENnextH(long *); + int DLLEXPORT ENcloseH(void); + int DLLEXPORT ENsavehydfile(char *); + int DLLEXPORT ENusehydfile(char *); -int DLLEXPORT ENsolveQ(void); -int DLLEXPORT ENopenQ(void); -int DLLEXPORT ENinitQ(int); -int DLLEXPORT ENrunQ(long *); -int DLLEXPORT ENnextQ(long *); -int DLLEXPORT ENstepQ(long *); -int DLLEXPORT ENcloseQ(void); + int DLLEXPORT ENsolveQ(void); + int DLLEXPORT ENopenQ(void); + int DLLEXPORT ENinitQ(int); + int DLLEXPORT ENrunQ(long *); + int DLLEXPORT ENnextQ(long *); + int DLLEXPORT ENstepQ(long *); + int DLLEXPORT ENcloseQ(void); -int DLLEXPORT ENwriteline(char *); -int DLLEXPORT ENreport(void); -int DLLEXPORT ENresetreport(void); -int DLLEXPORT ENsetreport(char *); + int DLLEXPORT ENwriteline(char *); + int DLLEXPORT ENreport(void); + int DLLEXPORT ENresetreport(void); + int DLLEXPORT ENsetreport(char *); -int DLLEXPORT ENgetcontrol(int, int *, int *, float *, - int *, float *); -int DLLEXPORT ENgetcount(int, int *); -int DLLEXPORT ENgetoption(int, float *); -int DLLEXPORT ENgettimeparam(int, long *); -int DLLEXPORT ENgetflowunits(int *); -int DLLEXPORT ENgetpatternindex(char *, int *); -int DLLEXPORT ENgetpatternid(int, char *); -int DLLEXPORT ENgetpatternlen(int, int *); -int DLLEXPORT ENgetpatternvalue(int, int, double *); -int DLLEXPORT ENgetqualtype(int *, int *); -int DLLEXPORT ENgeterror(int, char *, int); + int DLLEXPORT ENgetcontrol(int, int *, int *, float *, + int *, float *); + int DLLEXPORT ENgetcount(int, int *); + int DLLEXPORT ENgetoption(int, float *); + int DLLEXPORT ENgettimeparam(int, long *); + int DLLEXPORT ENgetflowunits(int *); + int DLLEXPORT ENgetpatternindex(char *, int *); + int DLLEXPORT ENgetpatternid(int, char *); + int DLLEXPORT ENgetpatternlen(int, int *); + int DLLEXPORT ENgetpatternvalue(int, int, float *); + int DLLEXPORT ENgetqualtype(int *, int *); + int DLLEXPORT ENgeterror(int, char *, int); -int DLLEXPORT ENgetnodeindex(char *, int *); -int DLLEXPORT ENgetnodeid(int, char *); -int DLLEXPORT ENgetnodetype(int, int *); -int DLLEXPORT ENgetnodevalue(int, int, double *); + int DLLEXPORT ENgetnodeindex(char *, int *); + int DLLEXPORT ENgetnodeid(int, char *); + int DLLEXPORT ENgetnodetype(int, int *); + int DLLEXPORT ENgetnodevalue(int, int, float *); -int DLLEXPORT ENgetlinkindex(char *, int *); -int DLLEXPORT ENgetlinkid(int, char *); -int DLLEXPORT ENgetlinktype(int, int *); -int DLLEXPORT ENgetlinknodes(int, int *, int *); -int DLLEXPORT ENgetlinkvalue(int, int, double *); + int DLLEXPORT ENgetlinkindex(char *, int *); + int DLLEXPORT ENgetlinkid(int, char *); + int DLLEXPORT ENgetlinktype(int, int *); + int DLLEXPORT ENgetlinknodes(int, int *, int *); + int DLLEXPORT ENgetlinkvalue(int, int, float *); -int DLLEXPORT ENgetversion(int *); + int DLLEXPORT ENgetversion(int *); -int DLLEXPORT ENsetcontrol(int, int, int, float, int, float); -int DLLEXPORT ENsetnodevalue(int, int, double); -int DLLEXPORT ENsetlinkvalue(int, int, double); -int DLLEXPORT ENaddpattern(char *); -int DLLEXPORT ENsetpattern(int, float *, int); -int DLLEXPORT ENsetpatternvalue(int, int, float); -int DLLEXPORT ENsettimeparam(int, long); -int DLLEXPORT ENsetoption(int, float); -int DLLEXPORT ENsetstatusreport(int); -int DLLEXPORT ENsetqualtype(int, char *, char *, char *); + int DLLEXPORT ENsetcontrol(int, int, int, float, int, float); + int DLLEXPORT ENsetnodevalue(int, int, float); + int DLLEXPORT ENsetlinkvalue(int, int, float); + int DLLEXPORT ENaddpattern(char *); + int DLLEXPORT ENsetpattern(int, float *, int); + int DLLEXPORT ENsetpatternvalue(int, int, float); + int DLLEXPORT ENsettimeparam(int, long); + int DLLEXPORT ENsetoption(int, float); + int DLLEXPORT ENsetstatusreport(int); + int DLLEXPORT ENsetqualtype(int, char *, char *, char *); #endif diff --git a/src/epanet.c b/src/epanet.c index be7a2cb..b38a5f6 100755 --- a/src/epanet.c +++ b/src/epanet.c @@ -1074,8 +1074,6 @@ int DLLEXPORT ENgetoption(int code, float *value) break; case EN_DEMANDMULT: v = Dmult; break; - case EN_HALTFLAG: v = checkHaltFlag(); /* sh - 4.2010 */ - break; /* sh - 4.2010 */ default: return(251); } *value = (float)v; @@ -1188,7 +1186,7 @@ int DLLEXPORT ENgetpatternlen(int index, int *len) } -int DLLEXPORT ENgetpatternvalue(int index, int period, double *value) +int DLLEXPORT ENgetpatternvalue(int index, int period, float *value) /*---------------------------------------------------------------- ** Input: index = index of time pattern ** period = pattern time period @@ -1202,7 +1200,7 @@ int DLLEXPORT ENgetpatternvalue(int index, int period, double *value) if (!Openflag) return(102); if (index < 1 || index > Npats) return(205); if (period < 1 || period > Pattern[index].Length) return(251); - *value = Pattern[index].F[period-1]; + *value = (float)Pattern[index].F[period-1]; return(0); } @@ -1316,7 +1314,7 @@ int DLLEXPORT ENgetnodetype(int index, int *code) } -int DLLEXPORT ENgetnodevalue(int index, int code, double *value) +int DLLEXPORT ENgetnodevalue(int index, int code, float *value) /*---------------------------------------------------------------- ** Input: index = node index ** code = node parameter code (see TOOLKIT.H) @@ -1332,15 +1330,6 @@ int DLLEXPORT ENgetnodevalue(int index, int code, double *value) /* Check for valid arguments */ *value = 0.0f; - - // added ability to get system-wide demand // SH added 4.2010 - if (index == 0) { - v = Dsystem; - v *= Ucf[FLOW]; - *value = v; - return(0); - } - if (!Openflag) return(102); if (index <= 0 || index > Nnodes) return(203); @@ -1486,17 +1475,9 @@ int DLLEXPORT ENgetnodevalue(int index, int code, double *value) /*** New parameter additions ends here. ***/ //(2.00.12 - LR) - /*** SH addition: retreive tank volume ***/ - case EN_TANKVOLUME: - if (index <= Njuncs) return(251); - v = Tank[index-Njuncs].V0; - break; - - - default: return(251); } - *value = v; + *value = (float)v; return(0); } @@ -1581,7 +1562,7 @@ int DLLEXPORT ENgetlinknodes(int index, int *node1, int *node2) } -int DLLEXPORT ENgetlinkvalue(int index, int code, double *value) +int DLLEXPORT ENgetlinkvalue(int index, int code, float *value) /*------------------------------------------------------------------ ** Input: index = link index ** code = link parameter code (see TOOLKIT.H) @@ -1715,7 +1696,7 @@ int DLLEXPORT ENgetlinkvalue(int index, int code, double *value) default: return(251); } - *value = v; + *value = (float)v; return(0); } @@ -1816,7 +1797,7 @@ int DLLEXPORT ENsetcontrol(int cindex, int ctype, int lindex, } -int DLLEXPORT ENsetnodevalue(int index, int code, double v) +int DLLEXPORT ENsetnodevalue(int index, int code, float v) /*---------------------------------------------------------------- ** Input: index = node index ** code = node parameter code (see TOOLKIT.H) @@ -1866,22 +1847,11 @@ int DLLEXPORT ENsetnodevalue(int index, int code, double v) j = ROUND(value); if (j < 0 || j > Npats) return(205); if (index <= Njuncs) - { - if (j == 0) { // SH 3.2010 - // we are re-setting the pattern assignment if we set pattern index to 0. // SH 3.2010 - demand = Node[index].D; // SH 3.2010 - demand->next = NULL; // SH 3.2010 - demand->Pat = 0; // SH 3.2010 - } // SH 3.2010 - else { // SH 3.2010 - for (demand = Node[index].D; demand != NULL; demand = demand ->next) - { - if (demand->next == NULL) demand->Pat = j; - } - } // SH 3.2010 - - - + { + for (demand = Node[index].D; demand != NULL; demand = demand ->next) + { + if (demand->next == NULL) demand->Pat = j; + } } else Tank[index-Njuncs].Pat = j; break; @@ -2036,7 +2006,7 @@ int DLLEXPORT ENsetnodevalue(int index, int code, double v) } -int DLLEXPORT ENsetlinkvalue(int index, int code, double v) +int DLLEXPORT ENsetlinkvalue(int index, int code, float v) /*---------------------------------------------------------------- ** Input: index = link index ** code = link parameter code (see TOOLKIT.H) @@ -2282,7 +2252,7 @@ int DLLEXPORT ENsettimeparam(int code, long value) */ { if (!Openflag) return(102); - //if (OpenHflag || OpenQflag) return(109); + if (OpenHflag || OpenQflag) return(109); if (value < 0) return(202); switch(code) { @@ -2319,15 +2289,13 @@ int DLLEXPORT ENsettimeparam(int code, long value) case EN_STATISTIC: if (value > RANGE) return(202); Tstatflag = (char)value; break; - case EN_HTIME: Htime = value; - break; default: return(251); } return(0); } -int DLLEXPORT ENsetoption(int code, double v) +int DLLEXPORT ENsetoption(int code, float v) /*---------------------------------------------------------------- ** Input: code = option code (see TOOLKIT.H) ** v = option value @@ -2364,9 +2332,6 @@ int DLLEXPORT ENsetoption(int code, double v) break; case EN_DEMANDMULT: if (value <= 0.0) return(202); Dmult = value; - break; - case EN_HALTFLAG: if (value < 0.0) return(202); - setHaltFlag((int)value); break; default: return(251); } diff --git a/src/hydraul.c b/src/hydraul.c index d194f05..de553df 100755 --- a/src/hydraul.c +++ b/src/hydraul.c @@ -82,13 +82,6 @@ double RelaxFactor; / /* Function to find flow coeffs. through open/closed valves */ //(2.00.11 - LR) void valvecoeff(int k); //(2.00.11 - LR) -int checkHaltFlag() { - return Haltflag; -} -int setHaltFlag(int value) { - Haltflag = value; - return 0; -} int openhyd() /* @@ -793,8 +786,7 @@ void controltimestep(long *tstep) long t,t1,t2; for (i=1; i<=Ncontrols; i++) - { - if (Control[i].Link == 0) continue; + { t = 0; if ( (n = Control[i].Node) > 0) /* Node control: */ { diff --git a/src/toolkit.h b/src/toolkit.h index 844d3e2..da036d7 100755 --- a/src/toolkit.h +++ b/src/toolkit.h @@ -59,8 +59,6 @@ AUTHOR: L. Rossman #define EN_MIXFRACTION 22 #define EN_TANK_KBULK 23 -#define EN_TANKVOLUME 24 /* SH added 4.2010 */ - #define EN_DIAMETER 0 /* Link parameters */ #define EN_LENGTH 1 #define EN_ROUGHNESS 2 @@ -86,8 +84,6 @@ AUTHOR: L. Rossman #define EN_RULESTEP 7 #define EN_STATISTIC 8 #define EN_PERIODS 9 -#define EN_HTIME 10 -#define EN_HALTFLAG 11 /* sh 4.2010 */ #define EN_NODECOUNT 0 /* Component counts */ #define EN_TANKCOUNT 1 @@ -198,31 +194,31 @@ AUTHOR: L. Rossman int DLLEXPORT ENgetpatternindex(char *, int *); int DLLEXPORT ENgetpatternid(int, char *); int DLLEXPORT ENgetpatternlen(int, int *); - int DLLEXPORT ENgetpatternvalue(int, int, double *); + int DLLEXPORT ENgetpatternvalue(int, int, float *); int DLLEXPORT ENgetqualtype(int *, int *); int DLLEXPORT ENgeterror(int, char *, int); int DLLEXPORT ENgetnodeindex(char *, int *); int DLLEXPORT ENgetnodeid(int, char *); int DLLEXPORT ENgetnodetype(int, int *); - int DLLEXPORT ENgetnodevalue(int, int, double *); + int DLLEXPORT ENgetnodevalue(int, int, float *); int DLLEXPORT ENgetlinkindex(char *, int *); int DLLEXPORT ENgetlinkid(int, char *); int DLLEXPORT ENgetlinktype(int, int *); int DLLEXPORT ENgetlinknodes(int, int *, int *); - int DLLEXPORT ENgetlinkvalue(int, int, double *); + int DLLEXPORT ENgetlinkvalue(int, int, float *); int DLLEXPORT ENgetversion(int *); int DLLEXPORT ENsetcontrol(int, int, int, float, int, float); - int DLLEXPORT ENsetnodevalue(int, int, double); - int DLLEXPORT ENsetlinkvalue(int, int, double); + int DLLEXPORT ENsetnodevalue(int, int, float); + int DLLEXPORT ENsetlinkvalue(int, int, float); int DLLEXPORT ENaddpattern(char *); int DLLEXPORT ENsetpattern(int, float *, int); int DLLEXPORT ENsetpatternvalue(int, int, float); int DLLEXPORT ENsettimeparam(int, long); - int DLLEXPORT ENsetoption(int, double); + int DLLEXPORT ENsetoption(int, float); int DLLEXPORT ENsetstatusreport(int); int DLLEXPORT ENsetqualtype(int, char *, char *, char *);