JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Implementing metadata support

Browse Source
This commit is contained in:
Michael Tryby
2018-08-16 10:26:32 -04:00
parent 606101af89
commit efc44215f3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_output.cpp
View File

@@ -145,7 +145,7 @@ BOOST_FIXTURE_TEST_CASE(test_getNetSize, Fixture)
BOOST_FIXTURE_TEST_CASE(test_getUnits, Fixture) { BOOST_FIXTURE_TEST_CASE(test_getUnits, Fixture) {
int flag; int flag;
error = ENR_getUnits(p_handle, ENR_chemUnits, &flag); error = ENR_getUnits(p_handle, ENR_qualUnits, &flag);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK_EQUAL(flag, ENR_MGL); BOOST_CHECK_EQUAL(flag, ENR_MGL);

6
tools/epanet-output/include/epanet_output.h
View File

@@ -25,7 +25,7 @@ typedef enum {
typedef enum { typedef enum {
ENR_flowUnits = 1, ENR_flowUnits = 1,
ENR_pressUnits = 2, ENR_pressUnits = 2,
ENR_chemUnits = 3 ENR_qualUnits = 3
} ENR_Units; } ENR_Units;
typedef enum { typedef enum {
@@ -43,7 +43,7 @@ typedef enum {
typedef enum { typedef enum {
ENR_PSI = 0, ENR_PSI = 0,
ENR_MTRS = 1, ENR_MTR = 1,
ENR_KPA = 2 ENR_KPA = 2
} ENR_PressUnits; } ENR_PressUnits;
@@ -53,7 +53,7 @@ typedef enum {
ENR_UGL = 2, ENR_UGL = 2,
ENR_HOURS = 3, ENR_HOURS = 3,
ENR_PRCNT = 4 ENR_PRCNT = 4
} ENR_ChemUnits; } ENR_QualUnits;
typedef enum { typedef enum {
ENR_reportStart = 1, ENR_reportStart = 1,

4
tools/epanet-output/src/epanet_output.c
View File

@@ -327,7 +327,7 @@ int DLLEXPORT ENR_getUnits(ENR_Handle p_handle, ENR_Units code, int* unitFlag)
fread(unitFlag, WORDSIZE, 1, p_data->file); fread(unitFlag, WORDSIZE, 1, p_data->file);
break; break;
case ENR_chemUnits: case ENR_qualUnits:
offset = 7*WORDSIZE; offset = 7*WORDSIZE;
_fseek(p_data->file, offset, SEEK_SET); _fseek(p_data->file, offset, SEEK_SET);
fread(unitFlag, WORDSIZE, 1, p_data->file); fread(unitFlag, WORDSIZE, 1, p_data->file);
@@ -846,7 +846,7 @@ void errorLookup(int errcode, char* dest_msg, int dest_len)
default: msg = ERRERR; default: msg = ERRERR;
} }
strncpy(dest_msg, msg, MSGMAXLEN); strncpy(dest_msg, msg, MSG_MAXLEN);
} }
int validateFile(ENR_Handle p_handle) int validateFile(ENR_Handle p_handle)

2
tools/epanet-output/src/messages.h
View File

@@ -10,7 +10,7 @@
#ifndef MESSAGES_H_ #ifndef MESSAGES_H_
#define MESSAGES_H_ #define MESSAGES_H_
/*------------------- Error Messages --------------------*/ /*------------------- Error Messages --------------------*/
#define MSGMAXLEN 53 #define MSG_MAXLEN 53
#define WARN10 "Warning: model run issued warnings" #define WARN10 "Warning: model run issued warnings"