Skip to content

Commit

Permalink
Revert "Set stream_year_*_urbantv for clm4_5 to fix issue ESCOMP#175"
Browse files Browse the repository at this point in the history 
This reverts commit 43529b6:

Revert the change in urbantv for clm4_5 as it changes answers in
some cases.
  • Loading branch information
@ekluzek @fritzt
ekluzek authored and fritzt committed May 19, 2021
1 parent 7d5f5f2 commit ce52168
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 31 deletions.
20 changes: 2 additions & 18 deletions bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,9 +1210,8 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_last_urbantv phys="clm5_0" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_0" sim_year_range="1850-2100" >2015</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year_range="1850-2100" >2015</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year_range="1850-2100" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" sim_year_range="1850-2100" >2015</model_year_align_urbantv>
<stream_year_first_urbantv phys="clm4_5" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" sim_year="2000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year="2000" >2000</stream_year_last_urbantv>
Expand All @@ -1223,27 +1222,12 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_first_urbantv phys="clm5_0" sim_year="1000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year="1000" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year="2000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year="2000" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year="1850" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year="1850" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year="1000" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year="1000" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_urbantv>

<stream_fldfilename_urbantv phys="clm5_0" hgrid="0.9x1.25" >lnd/clm2/urbandata/CLM50_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>

<stream_fldfilename_urbantv phys="clm4_5" hgrid="0.9x1.25" >lnd/clm2/urbandata/CLM45_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>
Expand Down
3 changes: 0 additions & 3 deletions bld/namelist_files/use_cases/1850_control.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >1850</stream_year_last_popdens>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >1850</stream_year_last_urbantv>

Expand Down
3 changes: 0 additions & 3 deletions bld/namelist_files/use_cases/1850_noanthro_control.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >1850</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >1850</stream_year_last_urbantv>

<!-- Turn calculation of human stress indices all the way off to save some CPU -->
<calc_human_stress_indices >NONE</calc_human_stress_indices>

Expand Down
3 changes: 0 additions & 3 deletions bld/namelist_files/use_cases/2000_control.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
<stream_year_first_popdens phys="clm5_0" cnfireson=".true." >2000</stream_year_first_popdens>
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >2000</stream_year_last_popdens>

<stream_year_first_urbantv phys="clm4_5" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2000</stream_year_last_urbantv>

<stream_year_first_urbantv phys="clm5_0" >2000</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >2000</stream_year_last_urbantv>

Expand Down
4 changes: 0 additions & 4 deletions bld/namelist_files/use_cases/20thC_transient.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
<stream_year_last_popdens phys="clm5_0" cnfireson=".true." >2016</stream_year_last_popdens>
<model_year_align_popdens phys="clm5_0" cnfireson=".true." >1850</model_year_align_popdens>

<stream_year_first_urbantv phys="clm4_5" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm4_5" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm4_5" >1850</model_year_align_urbantv>

<stream_year_first_urbantv phys="clm5_0" >1850</stream_year_first_urbantv>
<stream_year_last_urbantv phys="clm5_0" >2106</stream_year_last_urbantv>
<model_year_align_urbantv phys="clm5_0" >1850</model_year_align_urbantv>
Expand Down

0 comments on commit ce52168

Please sign in to comment.