From dcd00dcaac3d359f4b87206f316fb2213e1c08a4 Mon Sep 17 00:00:00 2001 From: Ben Andre Date: Thu, 1 Dec 2016 11:59:29 -0700 Subject: [PATCH] Remove temporary_SF_switch Remove temporary_SF_switch. Spitfire is runtime configurable via name list and is now off by default. This switch was only used to disable spitfire at compile time. Fixes: 140 User interface changes?: spitfire configured at runtime instead of compile time. Code review: self Test suite: SMS_D_Mmpi-serial_Ld5.5x5_amazon.ICLM45ED.yellowstone_intel.clm-edTest Test baseline: 2ac7960 Test namelist changes: none Test answer changes: bit for bit Test summary: pass --- components/clm/src/ED/fire/SFMainMod.F90 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/components/clm/src/ED/fire/SFMainMod.F90 b/components/clm/src/ED/fire/SFMainMod.F90 index f86b006c6c..be53100a71 100755 --- a/components/clm/src/ED/fire/SFMainMod.F90 +++ b/components/clm/src/ED/fire/SFMainMod.F90 @@ -52,11 +52,8 @@ subroutine fire_model( currentSite, atm2lnd_inst, temperature_inst) type (ed_patch_type), pointer :: currentPatch - integer temporary_SF_switch - !zero fire things currentPatch => currentSite%youngest_patch - temporary_SF_switch = 1 do while(associated(currentPatch)) currentPatch%frac_burnt = 0.0_r8 currentPatch%AB = 0.0_r8 @@ -68,7 +65,7 @@ subroutine fire_model( currentSite, atm2lnd_inst, temperature_inst) write(iulog,*) 'use_ed_spit_fire',use_ed_spit_fire endif - if(use_ed_spit_fire.and.temporary_SF_switch==1)then + if(use_ed_spit_fire)then call fire_danger_index(currentSite, temperature_inst, atm2lnd_inst) call wind_effect(currentSite, atm2lnd_inst) call charecteristics_of_fuel(currentSite)