EPANET Update

This is the update of the OWA EPANET from the 2021 version to the April 2023 version. This will go file by file of the changes that GQC made to the 2021 version and an update of what the current implementation.

In this document files will be referenced in 2 ways. In the sections where there are no images built points to denote where the files are in the folder structure of the program. Starting with the root directory which is the EPANET directory. Please note that something with a subfile will be a folder.

• Folder_1
  • File 1
  • File 2
• Folder 2
  • File 3
  • Folder 3
    • file 4
• File 5

The 2nd way the file structure will be referenced will be with the relative file path in the header. The header will be in bold an example of this would be Folder_1/File 1. This will be used when specific code is being reviewed between the projects.

Files that have been modified

These are the files that we have modified.

Files where OWA has made the same changes that we have

The changes made to these files have been fixed in OWA Latest version so we will not need to copy these changes over.

doc/toolkit-usage.dox

There is 1 instance of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

include/epanet.cs

There are 3 instances of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

include/epanet2_enums.h

There is 1 instance of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

src/epanet.c

There are 16 instances of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

src/errors.dat

There is 1 instance of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

src/hydraul.c

There are 2 instances of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

src/hydsolver.c

There are 2 instances of GQC changes made in this files.

OWA made the same change. So we do not have to migrate over our change here.

OWA made the same change. So we do not have to migrate over our change here.

src/hydstatus.c

src/inpfile.c

src/input1.c

src/input3.c

src/types.h

test/test_node.cpp

tools/before-test.cmd

tools/run-nrtest.cmd

tools/run-nrtest.sh

tools/test-config.sh

tools/nrtest-epanet/setup.py

tools/nrtest-epanet/nrtest_epanet/init.py

src/input2.c

Files that need to be reviewed

src/hydcoeffs.c

There are 7 instances of GQC changes made in this files.

There is only 1 instance where the code was modified and did not pull our changes.

This code will need to be reviewed.

All other code locations OWA made the same change. So we do not have to migrate over our change here.

These are not files that will matter to running of EPANET these are documentation files.

Root Level

• AUTHORS
• LICENSE
• ReleaseNotes2_3.md

List of files that are only in GQC's Version of the project

These files will likely all get pulled in or generated to the new update. These files are being documented for process of elimination so they can be taken out of consideration.

Root Level files

Visual Studio project and solution files

• ALL_BUILD.vcxproj
• ALL_BUILD.vcxproj.filters
• EPANET.sln
• epanet2.vcxproj
• epanet2.vcxproj.filters
• ZERO_CHECK.vcxproj
• ZERO_CHECK.vcxproj.filters

Other

• cmake_install.cmake
• conanfile.py
• vars.h

CMakeFiles (Folder on Root)

• 3.20.2
  • CompilerIdC
    • CMakeCCompilerId.c
    • CompilerIdC.exe
    • CompilerIdC.vcxproj
  • CompilerIdCXX
    • CMakeCXXCompilerId.cpp
    • CompilerIdCXX.exe
    • CompilerIdCXX.vcxproj
  • CMakeCCompiler.cmake
  • CMakeCXXCompiler.cmake
  • CMakeDetermineCompilerABI_C.bin
  • CMakeDetermineCompilerABI_CXX.bin
  • CMakeRCCompiler.cmake
  • CMakeSystem.cmake
  • VCTargetsPath.txt
  • VCTargetsPath.vcxproj
• f14edb447eefd3e1aaa601e8563e26ea
  • generate.stamp.rule
• cmake.check_cache
• generate.stamp
• generate.stamp.depend
• generate.stamp.list
• TargetDirectories.txt

run (Folder on Root)

• CMakeFiles
  • generate.stamp
  • generate.stamp.depend
• cmake_install.cmake
• runepanet.vcxproj
• runepanet.vcxproj.filters

src (Folder on Root)

• outfile
  • CMakeFiles
    • generate.stamp
    • generate.stamp.depend
  • cmake_install.cmake
  • epanet-output.vcxproj
  • epanet-output.vcxproj.filters
• gqcext.c
• vars.h

List of the files that GQC has deleted from the project

These files will likely all be deleted in the new update. They are being documented for process of elimination so they can be taken out of consideration.

GQC got rid of data files from the tests folder.

• example_0.inp
• example_1.inp
• example1.out
• net1.inp
• net1.out
• enP1kAIm