Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2103,13 +2103,16 @@ sub setup_logic_irrigate {
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;

add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'irrigate',
'use_crop'=>$nl_flags->{'use_crop'}, 'use_cndv'=>$nl_flags->{'use_cndv'},
'use_crop'=>$nl_flags->{'use_crop'}, 'use_cndv'=>$nl_flags->{'use_cndv'}, 'use_fates'=>$nl_flags->{'use_fates'},
'sim_year'=>$nl_flags->{'sim_year'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'}, );
if ( &value_is_true($nl->get_value('irrigate') ) ) {
$nl_flags->{'irrigate'} = ".true.";
if ( $nl_flags->{'sim_year'} eq "PtVg" ) {
$log->fatal_error("irrigate=TRUE does NOT make sense with the Potential Vegetation dataset, leave irrigate=FALSE");
}
if (&value_is_true($nl_flags->{'use_fates'})) {
$log->fatal_error("irrigate=TRUE is NOT possible with use_fates=TRUE, leave irrigate=FALSE");
}
} else {
$nl_flags->{'irrigate'} = ".false.";
}
Expand Down
9 changes: 5 additions & 4 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,11 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<stream_model_year_align_atm_c13 sim_year_range="1850-2000" >1700</stream_model_year_align_atm_c13>

<!-- Irrigation default (Note, the use-cases also set this) -->
<irrigate >.false.</irrigate>
<irrigate use_cndv=".false." sim_year_range="1850-2100">.true.</irrigate>
<irrigate phys="clm6_0" use_cndv=".false." sim_year_range="1850-2000">.true.</irrigate>
<irrigate phys="clm4_5" use_cndv=".false." sim_year_range="1850-2100">.false.</irrigate>
<irrigate >.false.</irrigate>
<irrigate use_fates=".true." >.false.</irrigate>
<irrigate use_cndv=".false." sim_year_range="1850-2100" use_fates=".false." >.true.</irrigate>
<irrigate phys="clm6_0" use_cndv=".false." sim_year_range="1850-2000" use_fates=".false." >.true.</irrigate>
<irrigate phys="clm4_5" use_cndv=".false." sim_year_range="1850-2100" >.false.</irrigate>

<!-- Saturation excess runoff for crops -->
<crop_fsat_equals_zero>.false.</crop_fsat_equals_zero>
Expand Down
7 changes: 7 additions & 0 deletions src/main/clm_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
use FATESFireFactoryMod , only : scalar_lightning
use FatesInterfaceTypesMod, only : fates_dispersal_cadence_none
use CIsoAtmTimeseriesMod, only : C14BombSpike, C13TimeSeries
use shr_log_mod, only : errMsg => shr_log_errMsg
!
! !ARGUMENTS:
implicit none
Expand Down Expand Up @@ -821,6 +822,12 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro

if (irrigate) then

if (use_fates) then
call endrun(msg=' ERROR: Can not have ' // &
'use_fates = .true. and irrigate = .true. ' // &
'Set one of them to .false. in your user_nl_clm. ' // &
errMsg(sourcefile, __LINE__))
endif
! ============================================================================
! Determine irrigation needed for future time steps
! ============================================================================
Expand Down
Loading