changed flag name for new snow thk flag to be more descriptive

components/elm/bld/namelist_files/namelist_definition.xml

@@ -729,7 +729,7 @@ snowpack conditions on glaciers and ice sheets, including a semi-empirical
 firn densification model. uses the same physics as use_extrasnowlayers but
 uses the original 5 snow layer scheme
 
-<entry id="use_snow_thk" type="logical" category="physics"
+<entry id="use_T_rho_dependent_snowthk" type="logical" category="physics"
 	group="elm_inparm" valid_values="" value=".false.">
 Toggle to use new snow thermal conductivity that relies on snow temperature and density. 
 </entry>

components/elm/src/biogeophys/SoilTemperatureMod.F90

@@ -834,7 +834,7 @@ subroutine SoilThermProp (bounds,  num_nolakec, filter_nolakec, &
     use elm_varcon      , only : denh2o, denice, tfrz, tkwat, tkice, tkair, cpice,  cpliq, thk_bedrock
     use landunit_varcon , only : istice, istice_mec, istwet
     use column_varcon   , only : icol_roof, icol_sunwall, icol_shadewall, icol_road_perv, icol_road_imperv
-    use elm_varctl      , only : iulog, use_snow_thk
+    use elm_varctl      , only : iulog, use_T_rho_dependent_snowthk
     !
     ! !ARGUMENTS:
     type(bounds_type)      , intent(in)    :: bounds
@@ -949,7 +949,7 @@ subroutine SoilThermProp (bounds,  num_nolakec, filter_nolakec, &
                endif
             endif
 
-            if (use_snow_thk) then ! chose which snow thermal conductivity to use 
+            if (use_T_rho_dependent_snowthk) then ! chose which snow thermal conductivity to use 
                if (snl(c)+1 < 1 .AND. (j >= snl(c)+1) .AND. (j <= 0)) then
                     bw(c,j) = (h2osoi_ice(c,j)+h2osoi_liq(c,j))/(frac_sno(c)*dz(c,j))
                     !write(iulog,*)"CAW bw(c,j)",bw(c,j)

components/elm/src/main/controlMod.F90

@@ -282,7 +282,7 @@ subroutine control_init( )
          use_nofire, use_lch4, use_vertsoilc, use_extralakelayers, &
          use_vichydro, use_century_decomp, use_cn, use_crop, use_snicar_frc, &
          use_snicar_ad, use_firn_percolation_and_compaction, use_extrasnowlayers,&
-         use_snow_thk, use_vancouver, use_mexicocity, use_noio
+         use_T_rho_dependent_snowthk, use_vancouver, use_mexicocity, use_noio
 
     ! cpl_bypass variables
     namelist /elm_inparm/ metdata_type, metdata_bypass, metdata_biases, &
@@ -723,11 +723,15 @@ subroutine control_spmd()
     call mpi_bcast (use_vertsoilc, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_extralakelayers, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_extrasnowlayers, 1, MPI_LOGICAL, 0, mpicom, ier)
+<<<<<<< HEAD
 <<<<<<< HEAD
     call mpi_bcast (use_firn_percolation_and_compaction, 1, MPI_LOGICAL, 0, mpicom, ier)
 =======
     call mpi_bcast (use_snow_thk, 1, MPI_LOGICAL, 0, mpicom, ier)
 >>>>>>> aa0f583905 (Added new snow Thermal Conductivity in SoilTemperatureMod.F90)
+=======
+    call mpi_bcast (use_T_rho_dependent_snowthk, 1, MPI_LOGICAL, 0, mpicom, ier)
+>>>>>>> 7d87f8c1ac (changed flag name for new snow thk flag to be more descriptive)
     call mpi_bcast (use_vichydro, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_century_decomp, 1, MPI_LOGICAL, 0, mpicom, ier)
     call mpi_bcast (use_cn, 1, MPI_LOGICAL, 0, mpicom, ier)
@@ -1028,11 +1032,15 @@ subroutine control_print ()
     write(iulog,*) '    use_lake_wat_storage = ', use_lake_wat_storage
     write(iulog,*) '    use_extralakelayers = ', use_extralakelayers
     write(iulog,*) '    use_extrasnowlayers = ', use_extrasnowlayers
+<<<<<<< HEAD
 <<<<<<< HEAD
     write(iulog,*) '    use_firn_percolation_and_compaction = ', use_firn_percolation_and_compaction
 =======
     write(iulog,*) '    use_snow_thk = ', use_snow_thk
 >>>>>>> aa0f583905 (Added new snow Thermal Conductivity in SoilTemperatureMod.F90)
+=======
+    write(iulog,*) '    use_T_rho_dependent_snowthk = ', use_T_rho_dependent_snowthk
+>>>>>>> 7d87f8c1ac (changed flag name for new snow thk flag to be more descriptive)
     write(iulog,*) '    use_vichydro = ', use_vichydro
     write(iulog,*) '    use_century_decomp = ', use_century_decomp
     write(iulog,*) '    use_cn = ', use_cn

components/elm/src/main/elm_varctl.F90

@@ -373,11 +373,11 @@ module elm_varctl
   logical, public :: use_snicar_ad       = .false.
   logical, public :: use_extrasnowlayers = .false.
   logical, public :: use_firn_percolation_and_compaction  = .false.
-  logical, public :: use_snow_thk        = .false.
   logical, public :: use_vancouver       = .false.
   logical, public :: use_mexicocity      = .false.
   logical, public :: use_noio            = .false.
   logical, public :: use_var_soil_thick  = .false.
+  logical, public :: use_T_rho_dependent_snowthk     = .false.
   logical, public :: use_atm_downscaling_to_topunit  = .false.
   character(len = SHR_KIND_CS), public :: precip_downscaling_method  = 'ERMM' ! Precip downscaling method values can be ERMM or FNM
   logical, public :: use_lake_wat_storage = .false.