diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index 77d0303e07..eb9b6a2644 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -4156,8 +4156,6 @@ sub setup_logic_z0param {
my $z0param_method = remove_leading_and_trailing_quotes($nl->get_value('z0param_method' ));
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_z0m_snowmelt',
'z0param_method'=>$z0param_method );
- add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_z0mg_2d',
- 'z0param_method'=>$z0param_method );
}
#-------------------------------------------------------------------------------
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index ea0b9f321c..6fb73aa693 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -501,12 +501,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
.false.
.false.
-.true.
-.false.
-.true.
-
-
-
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index e2e84859ea..25b23050cd 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -2777,12 +2777,6 @@ If TRUE use parameterization of snow z0m as a function of accumulated
snow melt of Brock et al. (2006)
-
-If FALSE use constant ground z0m
-If TRUE use spatially explicit ground z0m from Prigent et al. (2005)
-
-
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index b78eeb7509..56351ccfba 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -37,13 +37,6 @@
-
-
- FAIL
- Half degree resolution issue
-
-
-
FAIL
diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 8486c7fa04..35fdd3b979 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -1315,24 +1315,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm
index 86903538e2..00f8b1faf8 100644
--- a/cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm
+++ b/cime_config/testdefs/testmods_dirs/clm/Meier2022_surf_rough/user_nl_clm
@@ -1,6 +1,5 @@
z0param_method = 'Meier2022'
use_z0m_snowmelt = .true.
-use_z0mg_2d = .false.
calc_human_stress_indices = 'NONE' ! Currently dies when turned on because of a negative humidity (about -31) in Wet Bulb calculation
paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm51_params.RMz0.c220304.nc'
diff --git a/src/biogeophys/FrictionVelocityMod.F90 b/src/biogeophys/FrictionVelocityMod.F90
index 4f72215381..d831b42b97 100644
--- a/src/biogeophys/FrictionVelocityMod.F90
+++ b/src/biogeophys/FrictionVelocityMod.F90
@@ -13,7 +13,7 @@ module FrictionVelocityMod
use decompMod , only : bounds_type
use abortutils , only : endrun
use clm_varcon , only : spval
- use clm_varctl , only : use_cn, use_luna, z0param_method, use_z0mg_2d, use_z0m_snowmelt
+ use clm_varctl , only : use_cn, use_luna, z0param_method, use_z0m_snowmelt
use LandunitType , only : lun
use ColumnType , only : col
use PatchType , only : patch
@@ -95,7 +95,6 @@ module FrictionVelocityMod
procedure, private :: InitCold
procedure, private :: ReadNamelist
procedure, private :: ReadParams
- procedure, private :: ReadZ0M
procedure, private, nopass :: StabilityFunc1 ! Stability function for rib < 0.
procedure, private, nopass :: StabilityFunc2 ! Stability function for rib < 0.
@@ -121,10 +120,6 @@ subroutine Init(this, bounds, NLFilename, params_ncid)
call this%ReadNamelist(NLFilename)
call this%ReadParams(params_ncid)
- if(use_z0mg_2d) then
- call this%ReadZ0M(bounds)
- end if
-
end subroutine Init
!------------------------------------------------------------------------
@@ -414,57 +409,6 @@ subroutine ReadParams( this, params_ncid )
end subroutine ReadParams
- !-----------------------------------------------------------------------
- subroutine ReadZ0M(this, bounds)
- !
- ! !DESCRIPTION:
- ! Initialize module time constant variables
- !
- ! !USES:
- use shr_log_mod, only : errMsg => shr_log_errMsg
- use fileutils , only : getfil
- use ncdio_pio , only : file_desc_t, ncd_defvar, ncd_io, ncd_pio_openfile, ncd_pio_closefile
- use spmdMod , only : masterproc
- use clm_varcon , only : grlnd
- use clm_varctl , only : fsurdat
- use ncdio_pio , only : ncd_io
- use clm_varctl , only : iulog
-
- !
- ! !ARGUMENTS:
- class(frictionvel_type) :: this
- type(bounds_type), intent(in) :: bounds
- !
- ! !LOCAL VARIABLES:
- integer :: c,g ! indices
- type(file_desc_t) :: ncid ! netcdf id
- character(len=256) :: locfn ! local filename
- integer :: ier ! error status
- logical :: readvar
- real(r8), pointer :: z0mg2d (:) ! read in - ground z0m
- !---------------------------------------------------------------------
-
- ! Allocate module variable for ground z0m
-
-
- call getfil (fsurdat, locfn, 0)
- call ncd_pio_openfile (ncid, locfn, 0)
-
-
- allocate(z0mg2d(bounds%begg:bounds%endg))
- call ncd_io(ncid=ncid, varname='Z0MG_2D', flag='read', data=z0mg2d, dim1name=grlnd, readvar=readvar)
- if (.not. readvar) then
- call endrun(msg=' ERROR: Z0MG_2D NOT on surfdata file'//errMsg(sourcefile, __LINE__))
- end if
- write(iulog,*) 'Writing z0mg2d'
- do c = bounds%begc, bounds%endc
- g = col%gridcell(c)
- this%z0mg_2D_col(c) = max(1.e-4_r8,z0mg2d(g))
- end do
- deallocate(z0mg2d)
-
- end subroutine ReadZ0M
-
!------------------------------------------------------------------------
subroutine Restart(this, bounds, ncid, flag)
!
@@ -637,12 +581,7 @@ subroutine SetRoughnessLengthsAndForcHeightsNonLake(this, bounds, &
z0mg(c) = this%zsno
end if
else
- if(use_z0mg_2d) then
- z0mg(c) = z0mg_2D(c)
- else
- z0mg(c) = this%zlnd
- end if
-
+ z0mg(c) = this%zlnd
end if
case ('Meier2022') ! Bare ground and ice have a different value
l = col%landunit(c)
@@ -664,9 +603,6 @@ subroutine SetRoughnessLengthsAndForcHeightsNonLake(this, bounds, &
else
- if(use_z0mg_2d) then
- z0mg(c) = z0mg_2D(c)
- else
z0mg(c) = this%zlnd
end if
diff --git a/src/main/clm_varctl.F90 b/src/main/clm_varctl.F90
index 6fe2c55692..7e14f64a3f 100644
--- a/src/main/clm_varctl.F90
+++ b/src/main/clm_varctl.F90
@@ -226,7 +226,6 @@ module clm_varctl
character(len=64), public :: z0param_method
logical, public :: use_z0m_snowmelt = .false. ! true => use snow z0m parameterization of Brock2006
- logical, public :: use_z0mg_2d = .false. ! true => use 2D ground z0m of Prigent2005
!----------------------------------------------------------
diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
index 427a95f98c..b06e852347 100644
--- a/src/main/controlMod.F90
+++ b/src/main/controlMod.F90
@@ -202,7 +202,7 @@ subroutine control_init(dtime)
soil_layerstruct_userdefined_nlevsoi, use_subgrid_fluxes, snow_cover_fraction_method, &
irrigate, run_zero_weight_urban, all_active, &
crop_fsat_equals_zero, for_testing_run_ncdiopio_tests, &
- z0param_method, use_z0m_snowmelt, use_z0mg_2d
+ z0param_method, use_z0m_snowmelt
! vertical soil mixing variables
namelist /clm_inparm/ &
@@ -784,7 +784,6 @@ subroutine control_spmd()
call mpi_bcast (snow_cover_fraction_method , len(snow_cover_fraction_method), MPI_CHARACTER, 0, mpicom, ier)
call mpi_bcast (z0param_method , len(z0param_method), MPI_CHARACTER, 0, mpicom, ier)
call mpi_bcast (use_z0m_snowmelt, 1, MPI_LOGICAL, 0, mpicom, ier)
- call mpi_bcast (use_z0mg_2d, 1, MPI_LOGICAL, 0, mpicom, ier)
call mpi_bcast (single_column,1, MPI_LOGICAL, 0, mpicom, ier)
call mpi_bcast (scmlat, 1, MPI_REAL8,0, mpicom, ier)
call mpi_bcast (scmlon, 1, MPI_REAL8,0, mpicom, ier)