Skip to content
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

V1.0.7 #11

Merged
merged 22 commits into from
Jun 13, 2022
Merged

V1.0.7 #11

merged 22 commits into from
Jun 13, 2022

Conversation

Sybrand
Copy link
Contributor

@Sybrand Sybrand commented Jun 8, 2022

Summary:

BUI no longer changing when fuel type changes. PDF slider no longer showing for M1/M2. 2 decimal places for fuel consumption. Slope limited to 60%. GFL changed to slider (resolves various bugs relating to text input), and no longer storing user value.

Detail:

  • Re-factor - removing "basic" screen code from app (just commented out for now, in case we want to bring it back in).
  • FBP: Switch grass fuel load to slider. (0.1 minimum, 1.00 maximum).
  • FBP: Reset grass to default on fuel type change, no longer storing GFL.
  • FBP: FFMC lower limit kept at 80 (values lower than 80 not deemed relevant).
  • FBP: Hide CFB and CFC when using grass fuel type.
  • FBP: The percent dead fir slider showing in M1/2, it should only be showing in M3/4.
  • FBP: When switching between fuel types it remembers all settings, but resets BUI to a baseline value
  • FBP: Change fuel consumption to show 2 decimal places (otherwise shows as 0 for grass).
  • FBP: Limit slope to 60%

@Sybrand Sybrand marked this pull request as ready for review June 9, 2022 17:35
const double maxGFL = 1.0;
const double defaultGFL = 0.35;
const double minGS = 0;
const double maxGS = 60;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comments to explain what GFL and GS stand for would be helpful :)

Copy link
Contributor Author

@Sybrand Sybrand Jun 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refer to GLC-X-10 Appendix I (https://cfs.nrcan.gc.ca/publications/download-pdf/31414):
GFL Grass Fuel Load
GS Ground Slope

@@ -176,12 +150,6 @@ class HomePageState extends State<HomePage> {
// onTap: () {
// _changeSection(Section.fwi);
// }),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reminder just in case - do you still need this commented-out code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed. Next big feature that's been requested is FWI.

@@ -52,7 +50,9 @@ BasicSettings _loadBasic(SharedPreferences prefs) {
altitude: prefs.getDouble('altitude') ?? defaultAltitude));

basicInput.waz = prefs.getDouble('waz') ?? 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wtf does "waz" stand for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refer to ST-X-3 Appendix II; wind azimuth in degrees; (https://cfs.nrcan.gc.ca/publications/download-pdf/10068)

This trips up @conbrad as well all the time. I've opted to stick to the conventions used in the wildfire papers, and in the CFFDRS R package. Using descriptive variable names ends up being more confusing, because it's hard to trace back the math.

@Sybrand Sybrand merged commit 2ebc21d into main Jun 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants