Skip to content

Commit

Permalink
Update to use_spitfire after merge with master
Browse files Browse the repository at this point in the history
In merge a mismatch between master and branch was identified.
(use_spit_fire updated to use_spitfire)
This was found in failed testing and corrected.
With this change passed the full test suite.

Fixes:
User interface changes?: No
Code review: JK Shuman
Test suite: full suite, yellowstone
Test baseline:clm4_5_12_r195
Test namelist changes: no
Test answer changes: bit for bit
Test summary: PASS
  • Loading branch information
jkshuman committed Mar 16, 2017
1 parent 3cf2821 commit 81994bd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions components/clm/src/ED/fire/SFMainMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ subroutine fire_model( currentSite, bc_in)
enddo

if(write_SF==1)then
write(fates_log(),*) 'use_ed_spit_fire',use_ed_spit_fire
write(fates_log(),*) 'use_ed_spitfire',use_ed_spitfire
endif

if(use_ed_spit_fire)then
if(use_ed_spitfire)then
call fire_danger_index(currentSite, bc_in)
call wind_effect(currentSite, bc_in)
call charecteristics_of_fuel(currentSite)
Expand Down
2 changes: 1 addition & 1 deletion components/clm/src/ED/main/EDInitMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module EDInitMod
use FatesGlobals , only : endrun => fates_endrun
use EDTypesMod , only : nclmax
use FatesGlobals , only : fates_log
use clm_varctl , only : use_ed_spit_fire
use clm_varctl , only : use_ed_spitfire
use clm_time_manager , only : is_restart
use pftconMod , only : pftcon
use EDEcophysConType , only : EDecophyscon
Expand Down

0 comments on commit 81994bd

Please sign in to comment.