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.

Sign up for GitHub

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

Rosie/spitfire cleanup #148

Merged
merged 13 commits into from
Dec 1, 2016
Merged

Rosie/spitfire cleanup #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fdd3505
Changed temporary_spitfire_switch to 1
Feb 24, 2016
1d4238a
Modified two bugs in effective windspeed and in livegrass moisture fo…
Oct 7, 2016
edac755
Merge branch 'master' into rosie/spitfire_cleanup
Oct 7, 2016
a246d58
turned off SPITFIRE temporary switch for testing
Oct 14, 2016
dca960c
Merge branch 'master' into rosie/spitfire_cleanup
Oct 17, 2016
32bc16a
turn temp_sf_switch on
Oct 19, 2016
824e36c
Altered test scripts to make spitfire off by default, and add a singl…
Nov 14, 2016
7ece58c
Changes to namelist defaults to turn spitfire off
Nov 14, 2016
c04a117
re-added testlist file that acidentally got deleted
Nov 14, 2016
525f309
Swapped out the EdNoFire for EdFire test.
rgknox Nov 29, 2016
01d60bf
Merge pull request #1 from rgknox/rosie/spitfire_cleanup
rosiealice Nov 29, 2016
dcd00dc
Remove temporary_SF_switch
bandre-ucar Dec 1, 2016
2560ea1
Merge pull request #2 from bandre-ucar/rosie/spitfire_cleanup
rosiealice Dec 1, 2016
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
2 changes: 1 addition & 1 deletion components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,6 +1973,6 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_simyr1850_c160216.nc</fsurdat>
<use_lch4 bgc_mode="ed" >.false.</use_lch4>
<use_nitrif_denitrif bgc_mode="ed" >.false.</use_nitrif_denitrif>

<use_ed_spit_fire use_ed=".true.">.true.</use_ed_spit_fire>
<use_ed_spit_fire use_ed=".true.">.false.</use_ed_spit_fire>

</namelist_defaults>
10 changes: 5 additions & 5 deletions components/clm/cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,8 @@
<grid name="1x1_brazil">
<test name="ERS_D_Mmpi-serial_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
Expand All @@ -709,8 +709,8 @@
</test>
<test name="SMS_D_Mmpi-serial_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
Expand All @@ -724,15 +724,15 @@
<grid name="f10_f10">
<test name="ERS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edNoFire">ed</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edFire">ed</machine>
<machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
</test>
<test name="SMS_D_Ld5">
<machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
<machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
<machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
<machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
Expand Down
0 ...tmods_dirs/clm/edNoFire/include_user_mods → ...estmods_dirs/clm/edFire/include_user_mods
View file
Open in desktop
File renamed without changes.
0 ...testmods_dirs/clm/edNoFire/shell_commands → ...s/testmods_dirs/clm/edFire/shell_commands
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions components/clm/cime_config/testdefs/testmods_dirs/clm/edFire/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
use_ed_spit_fire = .true.

2 changes: 0 additions & 2 deletions components/clm/cime_config/testdefs/testmods_dirs/clm/edNoFire/user_nl_clm
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions components/clm/src/ED/fire/SFMainMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 0
do while(associated(currentPatch))
currentPatch%frac_burnt = 0.0_r8
currentPatch%AB = 0.0_r8
Expand All @@ -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)
Expand Down Expand Up @@ -222,7 +219,7 @@ subroutine charecteristics_of_fuel ( currentSite )
! average water content !is this the correct metric?
timeav_swc = sum(currentSite%water_memory(1:10)) / 10._r8
! Equation B2 in Thonicke et al. 2010
fuel_moisture(dg_sf) = max(0.0_r8, 10.0_r8/9._r8 * timeav_swc - 1.0_r8/9.0_r8)
fuel_moisture(lg_sf) = max(0.0_r8, 10.0_r8/9._r8 * timeav_swc - 1.0_r8/9.0_r8)

! Average properties over the first four litter pools (dead leaves, twigs, s branches, l branches)
currentPatch%fuel_bulkd = sum(currentPatch%fuel_frac(dg_sf:lb_sf) * SF_val_FBD(dg_sf:lb_sf))
Expand Down Expand Up @@ -363,7 +360,7 @@ subroutine wind_effect ( currentSite, atm2lnd_inst)

do while(associated(currentPatch))
currentPatch%total_tree_area = min(currentPatch%total_tree_area,currentPatch%area)
currentPatch%effect_wspeed = wind * (tree_fraction*0.6+grass_fraction*0.4+bare_fraction*1.0)
currentPatch%effect_wspeed = wind * (tree_fraction*0.4+(grass_fraction+bare_fraction)*0.6)

currentPatch => currentPatch%younger
enddo !end patch loop
Expand Down