diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index e5bda4680d..8eaa4ece8b 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -3350,22 +3350,22 @@ sub setup_logic_hillslope { # my ($opts, $nl_flags, $definition, $defaults, $nl) = @_; - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_hillslope' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'downscale_hillslope_meteorology' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_head_gradient_method' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_transmissivity_method' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_pft_distribution_method' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_soil_profile_method' ); - add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_hillslope_routing', 'use_hillslope'=>$nl_flags->{'use_hillslope'} ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_hillslope' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'downscale_hillslope_meteorology' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_head_gradient_method' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_transmissivity_method' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_pft_distribution_method' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_soil_profile_method' ); + add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_hillslope_routing', 'use_hillslope'=>$nl_flags->{'use_hillslope'} ); my $use_hillslope = $nl->get_value('use_hillslope'); my $use_hillslope_routing = $nl->get_value('use_hillslope_routing'); - if ( (! &value_is_true($use_hillslope)) && &value_is_true($use_hillslope_routing) ) { - $log->fatal_error("Cannot turn on use_hillslope_routing when use_hillslope is off\n" ); - } + if ( (! &value_is_true($use_hillslope)) && &value_is_true($use_hillslope_routing) ) { + $log->fatal_error("Cannot turn on use_hillslope_routing when use_hillslope is off\n" ); + } my $downscale_hillslope_meteorology = $nl->get_value('use_hillslope_routing'); - if ( (! &value_is_true($use_hillslope)) && &value_is_true($downscale_hillslope_meteorology) ) { - $log->fatal_error("Cannot turn on downscale_hillslope_meteorology when use_hillslope is off\n" ); - } + if ( (! &value_is_true($use_hillslope)) && &value_is_true($downscale_hillslope_meteorology) ) { + $log->fatal_error("Cannot turn on downscale_hillslope_meteorology when use_hillslope is off\n" ); + } } #-------------------------------------------------------------------------------