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

Fire weather refactor (non-b4b) #1215

Merged
merged 36 commits into from
Aug 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c607e9b
code cleanup
Mar 13, 2024
43506c4
create patch method for summing grass and tree cover
Mar 15, 2024
34aba26
Merge branch 'main' into fire_weather_wind
Mar 15, 2024
9d2a68f
bug fix
Mar 15, 2024
35f5bbc
add use statements
Mar 18, 2024
9c87fdd
update use
Mar 18, 2024
ba540b0
add itrue
Mar 18, 2024
c70fd79
create site methods for calculating tree/grass fraction
Mar 18, 2024
1350a0f
get rid of separate wind effect method
Mar 18, 2024
b68e48f
update use statements
Mar 18, 2024
7038609
add sourcefile
Mar 18, 2024
e272c38
trying to get exception test to work
Mar 18, 2024
1cf2359
remove effective wind speed as patch variable
Mar 19, 2024
6b57d41
can't actually test for runfails
Mar 19, 2024
efa191b
can't actually test for fails
Mar 19, 2024
df35858
put globals back
Mar 19, 2024
3f793df
update test names
adrifoster Mar 20, 2024
770f0cb
get rid of unused uses
Mar 20, 2024
df34d77
Merge branch 'fire_weather_wind' of https://github.com/adrifoster/fat…
Mar 20, 2024
dbf5744
renaming functions
Mar 20, 2024
9ddf52a
merge in change from fire_refactor branch
May 1, 2024
8f870d5
Merge branch 'fire_refactor' into fire_weather_wind
May 3, 2024
94d0d3b
Merge branch 'main' into fire_weather_wind
May 7, 2024
5ee375b
fixing some typos
May 7, 2024
441d18b
Merge branch 'main' into fire_weather_wind
Jun 12, 2024
f9e2b11
Merge branch 'main' into fire_weather_wind
adrifoster Jun 17, 2024
8bff2ef
remove old file
Jun 18, 2024
6297e8b
Merge branch 'fire_weather_wind' of https://github.com/adrifoster/fat…
Jun 18, 2024
889a6a6
initialize wind speed to 0.0
adrifoster Jun 19, 2024
b52cc11
test_results
adrifoster Jun 19, 2024
9e57553
remove test_results.md
Aug 23, 2024
4b7bd88
move wind speed calculation to site loop
Aug 23, 2024
44aedff
Merge branch 'main' into fire_weather_wind
Aug 23, 2024
a497c70
fix merge conflicts
Aug 23, 2024
020013e
make suggested changes from review
Aug 23, 2024
04332a4
add new function to public statement
Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
can't actually test for runfails
  • Loading branch information
adrifoster committed Mar 19, 2024
commit 6b57d41dffdc86ed635d5f465d2568eb22f0c679
13 changes: 0 additions & 13 deletions fire/test/fire_weather_test/test_FireWeather.pf
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,6 @@ module test_FireWeather

end subroutine NI_not_negative

@Test
subroutine catch_div_zero(this)
! test that the first divide by zero is caught
class(TestFireWeather), intent(inout) :: this ! fire weather object
character(len=256) :: expected_msg

call this%fireWeatherNesterov%UpdateIndex(-1.0*SF_val_fdi_b, 0.0_r8, 20.0_r8, 0.0_r8)
expected_msg = endrun_msg("ENDRUN:divide by zero")
@assertExceptionRaised(expected_msg)
this%fireWeatherNesterov%fire_weather_index = 0.0_r8

end subroutine catch_div_zero

@Test
subroutine wind_zero(this)
! test that effective wind speed is zero when wind speed is zero
Expand Down