339 add support for converting pgd from pga for the earthquake controller #342
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
longshuicy
approved these changes
Jan 13, 2025
| @@ -336,11 +336,13 @@ public static double getCorrectUnitsOfPGA(double pga, String units0, String unit | |||
| public static double getCorrectUnitsOfPGD(double pgd, String units0, String units1) { | |||
| if (units0 != null && units0.equalsIgnoreCase(units1)) { | |||
| return pgd; | |||
| } else if (units_m.equalsIgnoreCase(units0) || "m".equalsIgnoreCase(units0) && units_ft.equalsIgnoreCase(units1)) { | |||
| } else if (units_m.equalsIgnoreCase(units0) || "m".equalsIgnoreCase(units0) && (units_ft.equalsIgnoreCase(units1) || "ft".equalsIgnoreCase(units1))) { | |||
There was a problem hiding this comment.
Is this because we have inconsistent definition of feet vs ft?
There was a problem hiding this comment.
Yeah, there is some inconsistency in the static variable definitions (some are abbreviations and some aren't). Also, I wanted to match that a user could request "m" or "meters" so I made it so a user could request "feet" or with the abbreviation "ft".
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.
Added a conditional to check if the requested hazard is PGD and if it's not directly supported by the attenuation, it calls an internal method that handles converting PGA to PGD (as long as the hazard supports PGA).
I also added a unit test to verify it's working correctly.