H-SSRS #16
Merged
H-SSRS #16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: ssrs/layers.py ssrs/movmodel.py ssrs/simulator.py
Removed when manually merging with conflict
* `step_wt=0.5` * `steps_per_circle=8` -- to calculate change in angle per soaring step * `circling_steps_range=(32, 96)`, random value within this range -- fixed inconsistency with previous hard-coded max steps being 160 @ line #202 * `soaring_radius_range=(20., 60.)`, random value within this range * `gliding_range=(500., 2000)`, min/max
ewquon
approved these changes
Aug 30, 2022
* Fix problems related to the two resolutions `resolution` and `resolution_terrain` * Fix PAM format handling with implemented movement model.
…sage * Add option for wind data source (either `wtk` or `hrrr`) * Add option for thermal updraft model (either `naive` or `improvedAllen`). Improved Allen uses HRRR data * Fix handling of multi-variable regex within HRRR class * Fixed several details on the `compute_thermals_3d` that were broken since major refactoring of the HRRR class * Re-write of `get_convective_velocity` * Started a `checkInputs` function to handle incompatible input options (e.g. `improvedAllen` and `wtk`) * Added function to plot several atmospheric conditions from HRRR (right now, recomputing them) Still needs to be done: * Clean up commented out print statements * Add more checks for new options to ensure the selected options are * compatible with one another * Check the height used in HRRR's `wind_velocity_direction_at_altitude` for heights above 100 m * Save quantities interpolated onto grid from HRRR instead of re-doing it
Tracks would accumulate at the boundary and presence maps would heavily affected by that. The issue is that `break` only leaves the inner-most for loop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging Dave's code with the heuristic model