Skip to content

Commit

Permalink
Merge pull request #616 from ekluzek/noanthro
Browse files Browse the repository at this point in the history 
No anthro options to tools, and all future scenarios in place, plus a few small issue fixes
  • Loading branch information
@ekluzek
ekluzek committed Jan 15, 2019
2 parents 72a9a46 + 086a034 commit aea3cfa
Show file tree
Hide file tree
Showing 11 changed files with 2,568 additions and 32 deletions.
17 changes: 17 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@ manage_externals.log
*.swp
*~

# vim files (from https://github.com/github/gitignore/blob/master/Global/Vim.gitignore)
# Swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
# Temporary
.netrwhist
# (removed *~ because it is listed above)
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~

# mac files
.DS_Store

Expand Down
8 changes: 4 additions & 4 deletions bld/CLMBuildNamelist.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ REQUIRED OPTIONS
"-res list" to list valid resolutions.
(default: 0.9x1.25)
-sim_year "year" Year to simulate for input datasets
(i.e. 1850, 2000, 2010, 1850-2000, 1850-2100)
(i.e. PtVg, 1850, 2000, 2010, 1850-2000, 1850-2100)
"-sim_year list" to list valid simulation years
(default 2000)
OPTIONS
Expand Down Expand Up @@ -1219,19 +1219,19 @@ sub setup_cmdl_simulation_year {
}

$nl_flags->{'sim_year_range'} = $defaults->get_value("sim_year_range");
$nl_flags->{'sim_year'} = $val;
$nl_flags->{'sim_year'} = &remove_leading_and_trailing_quotes($val);
if ( $val =~ /([0-9]+)-([0-9]+)/ ) {
$nl_flags->{'sim_year'} = $1;
$nl_flags->{'sim_year_range'} = $val;
}
$val = $nl_flags->{'sim_year'};
my $group = $definition->get_group_name($var);
$nl->set_variable_value($group, $var, $val );
$nl->set_variable_value($group, $var, "'$val'" );
if ( ! $definition->is_valid_value( $var, $val, 'noquotes'=>1 ) ) {
my @valid_values = $definition->get_valid_values( $var );
$log->fatal_error("$var of $val is NOT valid. Valid values are: @valid_values");
}
$nl->set_variable_value($group, $var, $val );
$nl->set_variable_value($group, $var, "'$val'" );
$log->verbose_message("CLM sim_year is $nl_flags->{'sim_year'}");

$var = "sim_year_range";
Expand Down
8 changes: 4 additions & 4 deletions bld/namelist_files/createMkSrfEntry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ class mksrfDataEntry_prog:
# Class data
year_start = 2016
year_end = 2100
ssp_rcp = "SSP5-8.5"
subdir = "pftcftdynharv.0.25x0.25.SSP5-8.5.simyr2016-2100.c171005"
cdate = 171005
desc = "SSP5RCP85_clm5"
ssp_rcp = "SSP4-6.0"
subdir = "pftcftdynharv.0.25x0.25.SSP4-6.0.simyr2016-2100.c181217"
cdate = 181217
desc = "SSP4RCP60_clm5"

def parse_cmdline_args( self ):
"Parse the command line arguments for create data entry list"
Expand Down
58 changes: 58 additions & 0 deletions bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,9 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc</
<fsurdat hgrid="ne16np4" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts_Irrig_CMIP6_simyr2000_c170824.nc</fsurdat>

<fsurdat 81003="conus_30_x8" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_conus_30_x8_16pfts_Irrig_CMIP6_simyr2000_c181003.nc</fsurdat>

<fsurdat hgrid="5x5_amazon" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_Irrig_CMIP6_simyr2000_c171214.nc</fsurdat>
<fsurdat hgrid="1x1_brazil" sim_year="2000" use_crop=".false." irrigate=".true.">
Expand Down Expand Up @@ -746,6 +749,9 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_78pfts_CMIP6_simyr2000_c170824.nc</fsurda
<fsurdat hgrid="ne16np4" sim_year="2000" use_crop=".true." >
lnd/clm2/surfdata_map/surfdata_ne16np4_78pfts_CMIP6_simyr2000_c170824.nc</fsurdat>

<fsurdat hgrid="conus_30_x8" sim_year="2000" use_crop=".true." >
lnd/clm2/surfdata_map/surfdata_conus_30_x8_78pfts_CMIP6_simyr2000_c181003.nc</fsurdat>

<!-- 100% Urban single-point datasets (only for sim-year=2000) -->
<fsurdat hgrid="1x1_camdenNJ" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_1x1_camdenNJ_16pfts_Irrig_CMIP6_simyr2000_c171214.nc</fsurdat>
Expand Down Expand Up @@ -782,6 +788,9 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_16pfts_Irrig_CMIP6_simyr1850_c170824.nc<
<fsurdat hgrid="ne30np4" sim_year="1850" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_Irrig_CMIP6_simyr1850_c170824.nc</fsurdat>

<fsurdat hgrid="conus_30_x8" sim_year="1850" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/surfdata_conus_30_x8_16pfts_Irrig_CMIP6_simyr1850_c181003.nc</fsurdat>

<!-- pre-industrial with crop -->
<fsurdat hgrid="360x720cru" sim_year="1850" use_crop=".true." >
lnd/clm2/surfdata_map/surfdata_360x720cru_78pfts_CMIP6_simyr1850_c170824.nc</fsurdat>
Expand Down Expand Up @@ -811,6 +820,9 @@ lnd/clm2/surfdata_map/surfdata_ne30np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurda
<fsurdat hgrid="ne120np4" sim_year="1850" use_crop=".true." >
lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurdat>

<fsurdat hgrid="conus_30_x8" sim_year="1850" use_crop=".true." >
lnd/clm2/surfdata_map/surfdata_conus_30_x8_78pfts_CMIP6_simyr1850_c181003.nc</fsurdat>

<!-- Dynamic PFT surface datasets (relative to {csmdata}) -->

<!-- Note that, to reduce the number of necessary datasets, we use an RCP
Expand Down Expand Up @@ -840,6 +852,9 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurd
<flanduse_timeseries hgrid="ne30np4" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="conus_30_x8" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_conus_30_x8_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c181003.nc</flanduse_timeseries>

<!-- Dynamic PFT surface datasets for crop -->

<flanduse_timeseries hgrid="0.47x0.63" sim_year_range="1850-2000"
Expand Down Expand Up @@ -867,6 +882,9 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurd
<flanduse_timeseries hgrid="ne30np4" sim_year_range="1850-2000"
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="conus_30_x8" sim_year_range="1850-2000"
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_conus_30_x8_hist_78pfts_CMIP6_simyr1850-2015_c181004.nc</flanduse_timeseries>

<!-- Note that this transient file only goes up to year 1855.
This is sufficient for testing purposes, but could cause problems if you try to run beyond 1855. -->
<flanduse_timeseries hgrid="1x1_smallvilleIA" sim_year_range="1850-2000"
Expand Down Expand Up @@ -2492,6 +2510,46 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170824.nc</fsurd

<!-- mapping files for 0.125x0.125 END -->

<!-- mapping files for conus_30_x8 START added on Mon Jan 14 21:41:02 2019-->
<!-- Created by lnd/clm/bld/namelist_files/createMapEntry.pl-->

<map frm_hgrid="5x5min" frm_lmask="nomask" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_5x5min_nomask_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="3x3min" frm_lmask="GLOBE-Gardner" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_3x3min_GLOBE-Gardner_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="3x3min" frm_lmask="LandScan2004" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_3x3min_LandScan2004_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="10x10min" frm_lmask="nomask" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_10x10min_nomask_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="0.5x0.5" frm_lmask="MODIS" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_0.5x0.5_MODIS_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="5x5min" frm_lmask="ORNL-Soil" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_5x5min_ORNL-Soil_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="0.5x0.5" frm_lmask="AVHRR" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_0.5x0.5_AVHRR_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="3x3min" frm_lmask="MODIS-wCsp" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_3x3min_MODIS-wCsp_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="1km-merge-10min" frm_lmask="HYDRO1K-merge-nomask" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_1km-merge-10min_HYDRO1K-merge-nomask_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="360x720cru" frm_lmask="cruncep" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_360x720cru_cruncep_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="10x10min" frm_lmask="IGBPmergeICESatGIS" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_10x10min_IGBPmergeICESatGIS_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="3x3min" frm_lmask="GLOBE-Gardner-mergeGIS" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_3x3min_GLOBE-Gardner-mergeGIS_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="0.9x1.25" frm_lmask="GRDC" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_0.9x1.25_GRDC_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="5x5min" frm_lmask="ISRIC-WISE" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_5x5min_ISRIC-WISE_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="3x3min" frm_lmask="USGS" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_3x3min_USGS_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="0.25x0.25" frm_lmask="MODIS" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_0.25x0.25_MODIS_to_conus_30_x8_nomask_aave_da_c181003.nc</map>
<map frm_hgrid="5x5min" frm_lmask="IGBP-GSDP" to_hgrid="conus_30_x8" to_lmask="nomask"
>lnd/clm2/mappingdata/maps/conus_30_x8/map_5x5min_IGBP-GSDP_to_conus_30_x8_nomask_aave_da_c181003.nc</map>

<!-- mapping files for conus_30_x8 END -->

<!-- ========================================= -->
<!-- Defaults for modelio namelist -->
<!-- ========================================= -->
Expand Down

0 comments on commit aea3cfa

Please sign in to comment.