-
Notifications
You must be signed in to change notification settings - Fork 3
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
update DFA path runscript [ana5; runscripts] #1039
Conversation
Hello @leon-wagner! Thanks for updating this PR.
Comment last updated at 2024-12-09 10:51:25 UTC |
ea6318f
to
83f2042
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1039 +/- ##
==========================================
- Coverage 73.82% 73.54% -0.29%
==========================================
Files 66 66
Lines 14916 15439 +523
==========================================
+ Hits 11012 11354 +342
- Misses 3904 4085 +181 ☔ View full report in Codecov by Sentry. |
- com1 overrides moved from runScript to ini - new --runDFA flag logic - path is generated from fields by default (resType changed accordingly) - moved runScript to main avaframe folder (for QGIS) - clean DFAPath output folder in avadir before generating path (necessary for QGIS, so if script is run multiple times, paths that are previously generated are not returned to QGIS) - removed coulomb friction and other com1 overrides, path is now generated from standard run - added option to add velocity info when FV is saved set splitpoint to be generated at the top of path if it is not found, instead of not at all (avoids issues with QGIS) - adjusted corresponding error message - accordingly adjusted plot generation to exclude splitPoints set at the top general changes to DFAPath output plots - add missing discrete color levels for Travel Angle and changed it from a mix of lapaz and batlow to nuuk color map - grey out faulty legend plotting line thereby removing user warning: “no artists found with label”… in log and removes empty legend in top right corner of birds eye view panel - more descriptive runDFA flag comment in runScript - set dt to 1 fixes #1038, adds extra checks for what type is expected (point, float or other) - adjustment to writePoint2SHPfile to account for pytest. tested and it still fixes the addressed problem. - adjusted runDFAModule flag, added to ini - renamed functions in DFAPathGeneration.py to reflect better what they do
Code Climate has analyzed commit 9191d8a and detected 6 issues on this pull request. Here's the issue category breakdown:
The test coverage on the diff in this pull request is 21.7% (50% is the threshold). This pull request will bring the total coverage in the repository to 69.5%. View more on Code Climate. |
Standardtests ok, apart from known |
With the aim of addressing #848, as well as rework of the runScript
Summary of changes:
restructured runComputeDFAPath script to make it compatible with QGIS connector, moved script to /avaframe
the -runDFA flag can now be set to run com1 to generate results for path generation (this was previously handled by a True/False argument within the runScript). The avaFolder may now also be added to the run command.
settings that are used to override com1DFA run were moved to DFAPath cfg as overrides. changed some of the overrides, path is now essentially generated from a default null com1 run with standard friction and particle settings, and dt=1. path is now also generated from fields as default, instead of from particles.
if splitpoint is not found with the set angle (default 20 degrees), the splitpoint is now generated at the top of the path, instead of not creating one, to avoid issues down the line. changed plot output accordingly.
added missing discrete color levels for travel angle, so now colors in the path output plot are generated with the same levels. additionally, color map for travel angles is now Crameri:nuuk (previously was undefined and a mix of Crameri:batlow and Crameri:lapaz)
also fixes two user warnings in DFAPath script log, one in connection with the legend, one with cmap. also fixed DFA path generation returns no coordinates for splitpoint #1038.
To do: