Set the branch feature-2dflood up to date with the main branch #407
Conversation
Trigger new build
Add boost install
Dev merge master
Use of wrong variable for iteration: Addresses pyswmm#128
Adding Hot Start File save-during-simulation feature
Default values for two analysis options were changed to make them compatible with what the EPA SWMM GUI uses.
Bug fixes for release 5.2.3
Bump version
Merge master <- develop
…allow compilation
|
@lrntct do you want me to approve as is? Looks like we’ve had tons of updates since this. |
|
@bemcdonnell it's a ton of commits, yes. Most of them are already in main. I don't know if there is a plan to fix the CI. So far, I haven't run the NR tests. I have to figure out first how to run them. |
|
@lrntct would it be easier to rebase your code off main? One issue we are running up against with respect to the benchmarks is that GitHub actions deprecated our required version of visual studio. Therefore, technically we have been waiting for EPA to bump the release and update the benchmarks so we can match those. |
|
I tried rebasing, but the issue is that I would need to fix the conflicts for every new commit on the dev branch. Since all the code moved location, this is very tedious. On top of that, I understand that rebasing is not advisable when the commit has been already pushed. |
This PR includes all the commit made so far on the main branch, plus some to fix the tests.
Related to #111