-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Improve description of flushing discharge #7
base: master
Are you sure you want to change the base?
Conversation
Improved the overestimation of the exchange caused by a flushing discharge by introducing a constant factor of 0.82 to the flushing velocity (see equation 19 in section 2.1 of the documentation). Please check @mahoneyDeltares @jackvreeken can you please check the workflow that updates the python library and the spreadsheet version of the ZSF now that we've migrated from GitLab?
@maijvis Created a Draft PR for your changes, so they can be discussed more easily |
Some comments:
|
The number is based on CFD validation. I think it might be best to make the flushing factor user definable with a default value of 1, agree @mahoneyDeltares? What can I do about the style/test errors @jackvreeken? |
I'd say the default should be reasonable, and if that's 0.82 for most cases, then it should be 0.82. As far as the style errors, you can take a look at the job that failed: https://github.com/Deltares/libzsf/actions/runs/4872318244/jobs/8690353188 If you want to fix them locally, you can run the command locally, and add a commit on top. The command that "fixes" the files is part of the CI pipeline, so if you ever forget it just go look here: https://github.com/Deltares/libzsf/blob/master/.github/workflows/ci.yml#L26 :) So, install LLVM if you haven't already (see https://github.com/llvm/llvm-project/releases, or directly download https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/LLVM-16.0.0-win64.exe ). Then you can run the command locally, and it will fix the files. Assuming you have a repository on your computer: git fetch
git checkout flushing_effectiveness
# If you diverged from the origin, because I rebased your branch (which I really shouldn't do)
git reset --hard origin/flushing_effectiveness
# Run the command that fixes the files
clang-format -i src/* include/*
# add changes
git add -p
# make a commit
git commit -m "Style fixes" When the pipeline succeeds, and we're about ready to merge, we can squash all the commits into one. Locally that means doing
I'm not sure how familiar you are with all this, so I can step in and do some of these things if you get stuck or don't quite know what to do. You don't have to learn everything all at once! |
Oh, one more general comment, it probably makes a lot of sense to change the docs in this PR as well if we're setting the default to 0.82 (or even introduce the option to change it). Maybe with some explanation on why (i.e. a summary of the results that led to this). |
Improved the overestimation of the exchange caused by a flushing discharge by introducing a constant factor of 0.82 to the flushing velocity (see equation 19 in section 2.1 of the documentation). Please check @mahoneyDeltares
@jackvreeken can you please check the workflow that updates the python library and the spreadsheet version of the ZSF now that we've migrated from GitLab?