diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 8fda08cda6..438d0ec5fe 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -181,7 +181,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). .false. .true. .false. -.false. 1 diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml index d46fdd1107..004a0d20c8 100644 --- a/bld/namelist_files/namelist_definition_ctsm.xml +++ b/bld/namelist_files/namelist_definition_ctsm.xml @@ -144,11 +144,6 @@ User-defined number of soil layers required to be set in the namelist when the u Default: iundef - -If TRUE, each pft exists on a separate soil column. - - If TRUE, use variable soil depth. diff --git a/src/main/clm_varctl.F90 b/src/main/clm_varctl.F90 index 4b3c5c9a65..9fb28be7e1 100644 --- a/src/main/clm_varctl.F90 +++ b/src/main/clm_varctl.F90 @@ -293,12 +293,6 @@ module clm_varctl logical, public :: use_biomass_heat_storage = .false. ! true => include biomass heat storage in canopy energy budget - !---------------------------------------------------------- - ! each pft has individual soil column switch - !---------------------------------------------------------- - - logical, public :: use_individual_pft_soil_column = .false. ! true => each pft exists on its own soil column - !---------------------------------------------------------- ! bedrock / soil depth switch !---------------------------------------------------------- diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90 index ae1324ed7a..20644e7ddf 100644 --- a/src/main/controlMod.F90 +++ b/src/main/controlMod.F90 @@ -247,8 +247,6 @@ subroutine control_init(dtime) namelist /clm_inparm/ use_biomass_heat_storage - namelist /clm_inparm/ use_individual_pft_soil_column - namelist /clm_inparm/ use_hydrstress namelist /clm_inparm/ use_dynroot @@ -749,8 +747,6 @@ subroutine control_spmd() call mpi_bcast (use_biomass_heat_storage, 1, MPI_LOGICAL, 0, mpicom, ier) - call mpi_bcast (use_individual_pft_soil_column, 1, MPI_LOGICAL, 0, mpicom, ier) - call mpi_bcast (use_hydrstress, 1, MPI_LOGICAL, 0, mpicom, ier) call mpi_bcast (use_dynroot, 1, MPI_LOGICAL, 0, mpicom, ier) diff --git a/src/main/initGridCellsMod.F90 b/src/main/initGridCellsMod.F90 index 1456e10a36..cdaac2f6e5 100644 --- a/src/main/initGridCellsMod.F90 +++ b/src/main/initGridCellsMod.F90 @@ -60,7 +60,7 @@ subroutine initGridcells(glc_behavior) use subgridWeightsMod , only : compute_higher_order_weights use landunit_varcon , only : istsoil, istwet, istdlak, istice_mec use landunit_varcon , only : isturb_tbd, isturb_hd, isturb_md, istcrop - use clm_varctl , only : use_fates,use_individual_pft_soil_column + use clm_varctl , only : use_fates use shr_const_mod , only : SHR_CONST_PI ! ! !ARGUMENTS: @@ -133,13 +133,8 @@ subroutine initGridcells(glc_behavior) ! Determine naturally vegetated landunit do gdc = bounds_clump%begg,bounds_clump%endg - if(use_individual_pft_soil_column) then - call set_landunit_veg_noncompete( & - ltype=istsoil, gi=gdc, li=li, ci=ci, pi=pi) - else - call set_landunit_veg_compete( & - ltype=istsoil, gi=gdc, li=li, ci=ci, pi=pi) - end if + call set_landunit_veg_compete( & + ltype=istsoil, gi=gdc, li=li, ci=ci, pi=pi) end do ! Determine crop landunit @@ -249,7 +244,7 @@ subroutine set_landunit_veg_compete (ltype, gi, li, ci, pi) ! Set decomposition properties call subgrid_get_info_natveg(gi, & - npatches=npatches, ncols=ncols, nlunits=nlunits, sesc=.FALSE.) + npatches=npatches, ncols=ncols, nlunits=nlunits) wtlunit2gcell = wt_lunit(gi, ltype) nlunits_added = 0 @@ -279,69 +274,6 @@ subroutine set_landunit_veg_compete (ltype, gi, li, ci, pi) end subroutine set_landunit_veg_compete - subroutine set_landunit_veg_noncompete (ltype, gi, li, ci, pi) - - - ! !DESCRIPTION: - ! Initialize vegetated landunit without competition - ! - ! !USES - use clm_instur, only : wt_lunit, wt_nat_patch - use subgridMod, only : subgrid_get_info_natveg, natveg_patch_exists - use clm_varpar, only : natpft_lb, natpft_ub - ! - ! !ARGUMENTS: - integer , intent(in) :: ltype ! landunit type - integer , intent(in) :: gi ! gridcell index - integer , intent(inout) :: li ! landunit index - integer , intent(inout) :: ci ! column index - integer , intent(inout) :: pi ! patch index - ! - ! !LOCAL VARIABLES: - integer :: m ! index - integer :: npatches ! number of patches in landunit - integer :: ncols - integer :: nlunits - integer :: npatches_added ! number of patches actually added - integer :: ncols_added ! number of columns actually added - integer :: nlunits_added ! number of landunits actually added - real(r8) :: wtlunit2gcell ! landunit weight in gridcell - !------------------------------------------------------------------------ - - ! Set decomposition properties - - call subgrid_get_info_natveg(gi, & - npatches=npatches, ncols=ncols, nlunits=nlunits, sesc=.TRUE.) - wtlunit2gcell = wt_lunit(gi, ltype) - - nlunits_added = 0 - ncols_added = 0 - npatches_added = 0 - - if (nlunits > 0) then - call add_landunit(li=li, gi=gi, ltype=ltype, wtgcell=wtlunit2gcell) - nlunits_added = nlunits_added + 1 - - - do m = natpft_lb,natpft_ub - if (natveg_patch_exists(gi, m)) then - ! Assume one column for each vegetation patch - call add_column(ci=ci, li=li, ctype=1, wtlunit=wt_nat_patch(gi,m)) - ncols_added = ncols_added + 1 - - call add_patch(pi=pi, ci=ci, ptype=m, wtcol=1.0_r8) - npatches_added = npatches_added + 1 - end if - end do - end if - - SHR_ASSERT_FL(nlunits_added == nlunits, sourcefile, __LINE__) - SHR_ASSERT_FL(ncols_added == ncols, sourcefile, __LINE__) - SHR_ASSERT_FL(npatches_added == npatches, sourcefile, __LINE__) - - end subroutine set_landunit_veg_noncompete - - !------------------------------------------------------------------------ subroutine set_landunit_wet_lake (ltype, gi, li, ci, pi) ! diff --git a/src/main/subgridMod.F90 b/src/main/subgridMod.F90 index 98cbc40192..7247fab15a 100644 --- a/src/main/subgridMod.F90 +++ b/src/main/subgridMod.F90 @@ -13,7 +13,7 @@ module subgridMod use shr_kind_mod , only : r8 => shr_kind_r8 use spmdMod , only : masterproc use abortutils , only : endrun - use clm_varctl , only : iulog,use_individual_pft_soil_column + use clm_varctl , only : iulog use clm_instur , only : wt_lunit, wt_nat_patch, urban_valid, wt_cft use landunit_varcon, only : istcrop, istdlak, istwet, isturb_tbd, isturb_hd, isturb_md use glcBehaviorMod , only : glc_behavior_type @@ -81,7 +81,7 @@ subroutine subgrid_get_gcellinfo (gi, glc_behavior, & nlunits = 0 ncohorts = 0 - call subgrid_get_info_natveg(gi, npatches_temp, ncols_temp, nlunits_temp, use_individual_pft_soil_column) + call subgrid_get_info_natveg(gi, npatches_temp, ncols_temp, nlunits_temp) call accumulate_counters() call subgrid_get_info_urban_tbd(gi, npatches_temp, ncols_temp, nlunits_temp) @@ -123,7 +123,7 @@ end subroutine accumulate_counters end subroutine subgrid_get_gcellinfo !----------------------------------------------------------------------- - subroutine subgrid_get_info_natveg(gi, npatches, ncols, nlunits, sesc) + subroutine subgrid_get_info_natveg(gi, npatches, ncols, nlunits) ! ! !DESCRIPTION: ! Obtain properties for natural vegetated landunit in this grid cell @@ -133,7 +133,6 @@ subroutine subgrid_get_info_natveg(gi, npatches, ncols, nlunits, sesc) ! ! !ARGUMENTS: integer, intent(in) :: gi ! grid cell index - logical, intent(in) :: sesc ! switch for separated soil columns of natural vegetation integer, intent(out) :: npatches ! number of nat veg patches in this grid cell integer, intent(out) :: ncols ! number of nat veg columns in this grid cell @@ -154,14 +153,8 @@ subroutine subgrid_get_info_natveg(gi, npatches, ncols, nlunits, sesc) end do if (npatches > 0) then - if(sesc) then - ! Assume one soil column for each patch - ncols = npatches - else - ! Assume that the vegetated landunit has one column - ncols = 1 - end if - + ! Assume that the vegetated landunit has one column + ncols = 1 nlunits = 1 else ! As noted in natveg_patch_exists, we expect a naturally vegetated landunit in