Stormwater-Management-Model icon indicating copy to clipboard operation
Stormwater-Management-Model copied to clipboard

Set the branch feature-2dflood up to date with the main branch

Open lrntct opened this issue 10 months ago • 4 comments

This PR includes all the commit made so far on the main branch, plus some to fix the tests. Related to #111

lrntct avatar Mar 16 '25 05:03 lrntct

@lrntct do you want me to approve as is? Looks like we’ve had tons of updates since this.

bemcdonnell avatar Mar 16 '25 16:03 bemcdonnell

@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 avatar Mar 16 '25 17:03 lrntct

@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.

bemcdonnell avatar Mar 16 '25 18:03 bemcdonnell

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. I am not a git guru, though, so I might be mistaken.

lrntct avatar Mar 16 '25 18:03 lrntct