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

Jump to bottom

Miscellaneous small answer changes #1497

Merged
merged 21 commits into from
Oct 8, 2021
Merged

Miscellaneous small answer changes #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c3aea99
Fix #1462 so that GSSHA and GSSUN are actually set for history files …
ekluzek Sep 20, 2021
ebcd92d
Remove local version of max_cs so that the global one will be used fi…
ekluzek Sep 20, 2021
b02907c
Change initialization of this%t_soisno_col(c,1:nlevgrnd) from 274 to …
ekluzek Sep 20, 2021
1e2729f
Change defaults for use_lch4 and use_nitrif_denitrif to be false if s…
ekluzek Sep 20, 2021
dbc8066
allow methane to be on for dynamic lake test, this is addressed in #4…
ekluzek Sep 20, 2021
16187e9
Make Medlyn2011 the default for both clm5_0 and clm5_1 physics regard…
ekluzek Sep 21, 2021
536c6e5
Add a sp no-anthro test that fails (because of #1496)
ekluzek Sep 22, 2021
688494b
Increase compare tests
ekluzek Sep 22, 2021
f1e9f8b
Fix #1496 so SP and no-anthro works
ekluzek Sep 22, 2021
a79e840
For fsurdat search for irrigated crop files first and if not found se…
ekluzek Sep 23, 2021
96d6865
Update paramfile with ceta as per Van Kampenhour et al. 2017
ekluzek Sep 23, 2021
20d8a26
Need to add check on vichydro for fsurdat this fixe #1503
ekluzek Sep 29, 2021
1ebd96c
Lengthen wallclock for test
ekluzek Sep 29, 2021
9d7a450
Add specital logic for handling flanduse.timeseries in clm_demand try…
ekluzek Sep 30, 2021
1448fbf
Correct flanduse_timeseries name and set use_vichydro to true for the…
ekluzek Sep 30, 2021
4756060
Add a failing test that to check that crop and FATES can't be on toge…
ekluzek Oct 6, 2021
1dc07fc
Make sure FATES does not run with crop on, when finding fsurdat for F…
ekluzek Oct 6, 2021
5bb554e
Initial update of change files
ekluzek Oct 7, 2021
1ab1bc0
Finish changelog file
ekluzek Oct 7, 2021
5b4bfeb
Update date
ekluzek Oct 7, 2021
12f8b82
More update on changelog
ekluzek Oct 8, 2021
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
75 changes: 56 additions & 19 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,14 +747,13 @@ sub setup_cmdl_fates_mode {
# want to set a catch to fail and warn users if they explicitly set incompatible user namelist
# options

# my $var = "use_somevar";
# $val = $nl_flags->{$var};
# if ( defined($nl->get_value($var)) ) {
# if ( &value_is_true($nl->get_value($var)) ) {
# $log->fatal_error("$var was set to .true., which is incompatible when -bgc fates option is used.");
# }
# }

my $var = "use_crop";
$val = $nl_flags->{$var};
if ( defined($nl->get_value($var)) ) {
if ( &value_is_true($nl->get_value($var)) ) {
$log->fatal_error("$var was set to .true., which is incompatible when -bgc fates option is used.");
}
}

# The following variables may be set by the user and are compatible with use_fates
# no need to set defaults, covered in a different routine
Expand Down Expand Up @@ -870,12 +869,13 @@ sub setup_cmdl_bgc {
my $var = "soil_decomp_method";
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
'phys'=>$nl_flags->{'phys'}, 'use_cn'=>$nl_flags->{'use_cn'}, 'use_fates'=>$nl_flags->{'use_fates'} );
my $soil_decomp_method = remove_leading_and_trailing_quotes( $nl->get_value( $var ) );

if ( &value_is_true($nl_flags->{'use_cn'}) || &value_is_true($nl_flags->{'use_fates'})) {
if ( remove_leading_and_trailing_quotes( $nl->get_value($var)) eq "None" ) {
if ( $soil_decomp_method eq "None" ) {
$log->fatal_error("$var must NOT be None if use_cn or use_fates are on");
}
} elsif ( remove_leading_and_trailing_quotes($nl->get_value($var)) ne "None" ) {
} elsif ( $soil_decomp_method ne "None" ) {
$log->fatal_error("$var must be None if use_cn or use_fates are not");
}
#
Expand All @@ -885,13 +885,13 @@ sub setup_cmdl_bgc {
my %settings = ( 'bgc_mode'=>$nl_flags->{'bgc_mode'} );
foreach my $var ( @list ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
'phys'=>$nl_flags->{'phys'}, 'use_cn'=>$nl_flags->{'use_cn'}, 'use_fates'=>$nl_flags->{'use_fates'} );
'phys'=>$nl_flags->{'phys'}, 'soil_decomp_method'=>$soil_decomp_method );
$nl_flags->{$var} = $nl->get_value($var);
}
if ( remove_leading_and_trailing_quotes( $nl->get_value($var)) eq "None" ) {
if ( $soil_decomp_method eq "None" ) {
foreach my $var ( @list ) {
if ( &value_is_true($nl_flags->{$var}) ) {
$log->fatal_error("When soil_decomp_method is NONE $var can NOT be TRUE");
$log->fatal_error("When soil_decomp_method is None $var can NOT be TRUE");
}
}
} else {
Expand Down Expand Up @@ -1304,9 +1304,10 @@ sub setup_cmdl_vichydro {

$var = "use_vichydro";
$val = $nl->get_value($var);
my $set = undef;
if ($nl_flags->{'vichydro'} eq 1) {
my $group = $definition->get_group_name($var);
my $set = ".true.";
$set = ".true.";
if ( defined($val) && $set ne $val ) {
$log->fatal_error("$var contradicts the command-line -vichydro option" );
}
Expand All @@ -1315,7 +1316,10 @@ sub setup_cmdl_vichydro {
my @valid_values = $definition->get_valid_values( $var );
$log->fatal_error("$var has a value ($val) that is NOT valid. Valid values are: @valid_values");
}
} else {
$set = ".false.";
}
$nl_flags->{$var} = $set;
}


Expand Down Expand Up @@ -2165,6 +2169,7 @@ sub setup_logic_demand {
$settings{'hgrid'} = $nl_flags->{'res'};
$settings{'sim_year'} = $nl_flags->{'sim_year'};
$settings{'sim_year_range'} = $nl_flags->{'sim_year_range'};
$settings{'use_vichydro'} = $nl_flags->{'use_vichydro'};
$settings{'mask'} = $nl_flags->{'mask'};
$settings{'crop'} = $nl_flags->{'crop'};
$settings{'ssp_rcp'} = $nl_flags->{'ssp_rcp'};
Expand Down Expand Up @@ -2202,7 +2207,22 @@ sub setup_logic_demand {
if ( $item eq "finidat" ) {
$log->fatal_error( "Do NOT put findat in the clm_demand list, set the clm_start_type=startup so initial conditions are required");
}
# For landuse.timeseries try with crop and irrigate on first, if found use it, otherwise try with exact settings
# Logic for this is identical for fsurdat
if ( $item eq "flanduse_timeseries" ) {
$settings{'irrigate'} = ".true.";
$settings{'use_crop'} = ".true.";
$settings{'nofail'} = 1;
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $item, %settings );
if ( $item eq "flanduse_timeseries" ) {
$settings{'nofail'} = 0;
$settings{'irrigate'} = $nl_flags->{'irrigate'};
$settings{'use_crop'} = $nl_flags->{'use_crop'};
if ( ! defined($nl->get_value( $item )) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $item, %settings );
}
}
}
}

Expand Down Expand Up @@ -2231,10 +2251,27 @@ sub setup_logic_surface_dataset {
if ($flanduse_timeseries ne "null" && &value_is_true($nl_flags->{'use_cndv'}) ) {
$log->fatal_error( "dynamic PFT's (setting flanduse_timeseries) are incompatible with dynamic vegetation (use_cndv=.true)." );
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'fsurdat',
'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
'sim_year'=>$nl_flags->{'sim_year'}, 'irrigate'=>$nl_flags->{'irrigate'},
'use_crop'=>$nl_flags->{'use_crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
#
# Always get the crop version of the datasets now and let the code turn it into the form desired
# Provided this isn't with FATES on
#
my $var = "fsurdat";
if ( ! &value_is_true($nl_flags->{'use_fates'}) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'},
'sim_year'=>$nl_flags->{'sim_year'}, 'irrigate'=>".true.", 'use_vichydro'=>$nl_flags->{'use_vichydro'},
'use_crop'=>".true.", 'glc_nec'=>$nl_flags->{'glc_nec'}, 'nofail'=>1);
}
# If didn't find the crop version check for the exact match
if ( ! defined($nl->get_value($var) ) ) {
if ( ! &value_is_true($nl_flags->{'use_fates'}) ) {
$log->verbose_message( "Crop version of $var NOT found, searching for an exact match" );
}
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
'hgrid'=>$nl_flags->{'res'}, 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'use_vichydro'=>$nl_flags->{'use_vichydro'},
'sim_year'=>$nl_flags->{'sim_year'}, 'irrigate'=>$nl_flags->{'irrigate'},
'use_crop'=>$nl_flags->{'use_crop'}, 'glc_nec'=>$nl_flags->{'glc_nec'});
}
}

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -2919,7 +2956,7 @@ sub setup_logic_hydrology_switches {
}
# Test bad configurations
my $lower = $nl->get_value( 'lower_boundary_condition' );
my $use_vic = $nl->get_value( 'use_vichydro' );
my $use_vic = $nl_flags->{'use_vichydro'};
my $use_bed = $nl->get_value( 'use_bedrock' );
my $soilmtd = $nl->get_value( 'soilwater_movement_method' );
if ( defined($soilmtd) && defined($lower) && $soilmtd == 0 && $lower != 4 ) {
Expand Down
55 changes: 32 additions & 23 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<modifyphoto_and_lmr_forcrop phys="clm4_5" >.false.</modifyphoto_and_lmr_forcrop>

<!-- Method to use for stomatal conducatance -->
<stomatalcond_method phys="clm5_1" use_hydrstress=".true." >Medlyn2011</stomatalcond_method>
<stomatalcond_method phys="clm5_1" use_hydrstress=".false.">Ball-Berry1987</stomatalcond_method>
<stomatalcond_method phys="clm5_0" use_hydrstress=".true." >Medlyn2011</stomatalcond_method>
<stomatalcond_method phys="clm5_0" use_hydrstress=".false.">Ball-Berry1987</stomatalcond_method>
<stomatalcond_method phys="clm4_5" >Ball-Berry1987</stomatalcond_method>
<stomatalcond_method phys="clm5_1" >Medlyn2011</stomatalcond_method>
<stomatalcond_method phys="clm5_0" >Medlyn2011</stomatalcond_method>
<stomatalcond_method phys="clm4_5" >Ball-Berry1987</stomatalcond_method>

<!-- Carbon isotope concentration files -->
<atm_c13_filename use_c13=".true." use_c13_timeseries=".true." ssp_rcp="hist" >lnd/clm2/isotopes/atm_delta_C13_CMIP6_1850-2015_yearly_v2.0_c190528.nc</atm_c13_filename>
Expand Down Expand Up @@ -483,7 +481,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- The default filenames are given relative to the root directory
for the CLM2 data in the CESM distribution -->
<!-- Plant function types (relative to {csmdata}) -->
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c210803.nc</paramfile>
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c210923.nc</paramfile>
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c210803.nc</paramfile>
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c210803.nc</paramfile>

Expand Down Expand Up @@ -1043,13 +1041,19 @@ p
<fsurdat hgrid="48x96" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_48x96_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>

<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".false." irrigate=".true." use_vichydro=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".false." irrigate=".true.">
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".false." irrigate=".true." use_vichydro=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1.9x2.5_hist_16pfts_Irrig_CMIP6_simyr2000_c190304.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".false." irrigate=".true." >
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1.9x2.5_hist_16pfts_Irrig_CMIP6_simyr2000_c190304.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".false." irrigate=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_4x5_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".false." irrigate=".true.">
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".false." irrigate=".true." use_vichydro=".true.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_10x15_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".false." irrigate=".true." >
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_10x15_hist_16pfts_Irrig_CMIP6_simyr2000_c190214.nc</fsurdat>

<fsurdat hgrid="ne30np4" sim_year="2000" use_crop=".false." irrigate=".true.">
Expand Down Expand Up @@ -1080,13 +1084,13 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_C96_hist_78pfts_CMIP6_simyr2000
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_C48_hist_78pfts_CMIP6_simyr2000_c200317.nc</fsurdat>
<fsurdat hgrid="C24" sim_year="2000">
lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_C24_hist_78pfts_CMIP6_simyr2000_c200317.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." >
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_0.9x1.25_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." >
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_1.9x2.5_hist_78pfts_CMIP6_simyr2000_c190304.nc</fsurdat>
<fsurdat hgrid="0.125x0.125" sim_year="2000" use_crop=".true." >
lnd/clm2/surfdata_map/release-clm5.0.24/surfdata_0.125x0.125_hist_78pfts_CMIP6_simyr2005_c190624.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." >
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_10x15_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true." >
lnd/clm2/surfdata_map/release-clm5.0.18/surfdata_4x5_hist_78pfts_CMIP6_simyr2000_c190214.nc</fsurdat>
Expand Down Expand Up @@ -1198,11 +1202,17 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts

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

<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000" irrigate=".true."
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000" irrigate=".true." use_vichydro=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_0.9x1.25_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" irrigate=".true."
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" irrigate=".true." use_vichydro=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_1.9x2.5_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000" irrigate=".true."
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_1.9x2.5_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000" irrigate=".true." use_vichydro=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000" irrigate=".true."
use_crop=".false." >lnd/clm2/surfdata_map/landuse.timeseries_4x5_hist_16pfts_Irrig_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
Expand All @@ -1219,11 +1229,11 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts

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

<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000" use_vichydro=".false."
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_0.9x1.25_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_vichydro=".false."
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_1.9x2.5_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000" use_vichydro=".false."
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_10x15_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000"
use_crop=".true." >lnd/clm2/surfdata_map/landuse.timeseries_4x5_hist_78pfts_CMIP6_simyr1850-2015_c170824.nc</flanduse_timeseries>
Expand Down Expand Up @@ -2527,15 +2537,14 @@ lnd/clm2/surfdata_map/release-clm5.0.30/surfdata_ne0np4.CONUS.ne30x8_hist_78pfts
<!-- Defaults for different BGC modes -->
<!-- ========================================= -->

<use_lch4 >.false.</use_lch4>
<use_lch4 use_cn=".true." >.true.</use_lch4>
<use_lch4 use_fates=".true." >.false.</use_lch4>
<soil_decomp_method use_cn=".true." >CENTURYKoven2013</soil_decomp_method>
<soil_decomp_method use_fates=".true." >CENTURYKoven2013</soil_decomp_method>
<soil_decomp_method >None</soil_decomp_method>
<use_nitrif_denitrif >.false.</use_nitrif_denitrif>
<use_nitrif_denitrif use_cn=".true." >.true.</use_nitrif_denitrif>
<use_nitrif_denitrif use_fates=".true.">.false.</use_nitrif_denitrif>

<use_lch4 soil_decomp_method="None" >.false.</use_lch4>
<use_lch4 >.true.</use_lch4>
<use_nitrif_denitrif soil_decomp_method="None" >.false.</use_nitrif_denitrif>
<use_nitrif_denitrif >.true.</use_nitrif_denitrif>

<!-- ===== FATES DEFAULTS =========== -->
<fates_spitfire_mode use_fates=".true.">0</fates_spitfire_mode>
Expand Down
4 changes: 2 additions & 2 deletions bld/namelist_files/use_cases/1850_noanthro_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<do_harvest >.false.</do_harvest>

<!-- Set contants having to do with fire due to human influences to zero (human ignition counts, and crop fires -->
<pot_hmn_ign_counts_alpha >0.0</pot_hmn_ign_counts_alpha>
<cropfire_a1 >0.0</cropfire_a1>
<pot_hmn_ign_counts_alpha use_cn=".true.">0.0</pot_hmn_ign_counts_alpha>
<cropfire_a1 use_cn=".true.">0.0</cropfire_a1>

</namelist_defaults>
16 changes: 8 additions & 8 deletions bld/unit_testers/build-namelist_test.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 1839;
my $ntests = 1843;
if ( defined($opts{'compare'}) ) {
$ntests += 1251;
$ntests += 1254;
}
plan( tests=>$ntests );

Expand Down Expand Up @@ -462,6 +462,7 @@ sub cat_and_create_namelistinfile {
"-bgc sp -use_case 2000_control -res 0.9x1.25 -namelist '&a use_soil_moisture_streams = T/'",
"-bgc bgc -use_case 1850-2100_SSP5-8.5_transient -namelist '&a start_ymd=19101023/'",
"-bgc bgc -use_case 2000_control -namelist \"&a fire_method='nofire'/\" -crop",
"-res 0.9x1.25 -bgc sp -use_case 1850_noanthro_control -drydep -fire_emis",
"-res 0.9x1.25 -bgc bgc -use_case 1850_noanthro_control -drydep -fire_emis -light_res 360x720",
) {
my $file = $startfile;
Expand Down Expand Up @@ -638,12 +639,6 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
# This one should fail now, because we don't have non irrigated non-crop datasets
"-irrigate=F without -crop" =>{ options=>"-bgc bgc -no-crop -envxml_dir .",
namelst=>"irrigate=.false.",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm4_5",
},
"grainproductWOcrop" =>{ options=>"-bgc bgc -no-crop -envxml_dir .",
namelst=>"use_grainproduct=.true.",
GLC_TWO_WAY_COUPLING=>"FALSE",
Expand Down Expand Up @@ -944,6 +939,11 @@ sub cat_and_create_namelistinfile {
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_0",
},
"useFATESWcrop" =>{ options=>"-bgc fates -envxml_dir . -no-megan -crop",
namelst=>"",
GLC_TWO_WAY_COUPLING=>"FALSE",
phys=>"clm5_1",
},
"useFATESWcreatecrop" =>{ options=>"-bgc fates -envxml_dir . -no-megan",
namelst=>"create_crop_landunit=.true.",
GLC_TWO_WAY_COUPLING=>"FALSE",
Expand Down
Loading