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

Change VERSION to ENGINE_VERSION

Browse Source 
Also changed it form 200 to 201 as some changes were made to the engine
in 2.1.

Closes #27
This commit is contained in:
Elad Salomons
2015-12-07 22:18:05 +02:00
parent 3c006d724e
commit 99a215b88a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/epanet.c
View File

@@ -2930,7 +2930,7 @@ int openhydfile()
if (Hydflag != USE) if (Hydflag != USE)
{ {
magic = MAGICNUMBER; magic = MAGICNUMBER;
version = VERSION; version = ENGINE_VERSION;
nsize[0] = Nnodes; nsize[0] = Nnodes;
nsize[1] = Nlinks; nsize[1] = Nlinks;
nsize[2] = Ntanks; nsize[2] = Ntanks;
@@ -2950,7 +2950,7 @@ int openhydfile()
fread(&magic,sizeof(INT4),1,HydFile); fread(&magic,sizeof(INT4),1,HydFile);
if (magic != MAGICNUMBER) return(306); if (magic != MAGICNUMBER) return(306);
fread(&version,sizeof(INT4),1,HydFile); fread(&version,sizeof(INT4),1,HydFile);
if (version != VERSION) return(306); if (version != ENGINE_VERSION) return(306);
if (fread(nsize,sizeof(INT4),6,HydFile) < 6) return(306); if (fread(nsize,sizeof(INT4),6,HydFile) < 6) return(306);
if (nsize[0] != Nnodes || nsize[1] != Nlinks || if (nsize[0] != Nnodes || nsize[1] != Nlinks ||
nsize[2] != Ntanks || nsize[3] != Npumps || nsize[2] != Ntanks || nsize[3] != Npumps ||

2
src/types.h
View File

@@ -39,7 +39,7 @@ typedef int INT4; /
/*** Updated ***/ /*** Updated ***/
#define CODEVERSION 20100 #define CODEVERSION 20100
#define MAGICNUMBER 516114521 #define MAGICNUMBER 516114521
#define VERSION 200 #define ENGINE_VERSION 201
#define EOFMARK 0x1A /* Use 0x04 for UNIX systems */ #define EOFMARK 0x1A /* Use 0x04 for UNIX systems */
#define MAXTITLE 3 /* Max. # title lines */ #define MAXTITLE 3 /* Max. # title lines */
#define MAXID 31 /* Max. # characters in ID name */ //(2.00.11 - LR) #define MAXID 31 /* Max. # characters in ID name */ //(2.00.11 - LR)