From 66c100482afdb26bb431d5c1e71deda28e3cdb69 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 26 Apr 2024 13:56:24 -0600
Subject: [PATCH 01/47] Update cmeps to the branch

---
 Externals.cfg | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 185f412cab..1aa8991883 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -48,9 +48,12 @@ tag = cime6.0.217_httpsbranch03
 required = True
 
 [cmeps]
-tag = cmeps0.14.50
+#tag = cmeps0.14.50
+#branch = dust_emis_mod
+hash = d79e34f67df825f9265bdaaf3091f8995d5df1a2
 protocol = git
-repo_url = https://github.com/ESCOMP/CMEPS.git
+#repo_url = https://github.com/ESCOMP/CMEPS.git
+repo_url = https://github.com/ekluzek/CMEPS.git
 local_path = components/cmeps
 required = True
 

From f8aa6eac32a00c821824478860c06a26fbdb9010 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 26 Apr 2024 15:02:04 -0600
Subject: [PATCH 02/47] Add shr_dust_emis_mod.F90 to the files needed for unit
 testing, fails, because ESMF is currently needed and not available

---
 src/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 568b53cd15..9d2e6041b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,9 +20,11 @@ add_subdirectory(${CLM_ROOT}/share/src csm_share)
 add_subdirectory(${CLM_ROOT}/share/unit_test_stubs/util csm_share_stubs)
 add_subdirectory(${CLM_ROOT}/share/src/esmf_wrf_timemgr esmf_wrf_timemgr)
 
-# Add the single file we need from CMEPS
-set (drv_sources_needed
-  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/glc_elevclass_mod.F90)
+# Add files needed from CMEPS
+list ( APPEND drv_sources_needed
+  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/glc_elevclass_mod.F90
+  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/shr_dust_emis_mod.F90
+  )
 
 # Add CLM source directories
 add_subdirectory(${CLM_ROOT}/src/utils clm_utils)

From b767a82b5eb448817e2e36609bde1633e105e358 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 29 Apr 2024 18:59:30 -0600
Subject: [PATCH 03/47] Start adding the unit testing for dust emission in
 cmeps

---
 Externals.cfg                                 |  2 +-
 src/CMakeLists.txt                            |  4 ++
 src/drv_test/CMakeLists.txt                   |  1 +
 .../shr_dust_emis_test/CMakeLists.txt         |  3 ++
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 50 +++++++++++++++++++
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/drv_test/CMakeLists.txt
 create mode 100644 src/drv_test/shr_dust_emis_test/CMakeLists.txt
 create mode 100644 src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf

diff --git a/Externals.cfg b/Externals.cfg
index 1aa8991883..70c0bd6124 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = d79e34f67df825f9265bdaaf3091f8995d5df1a2
+hash = 492faf0014ad9d91c22bb92e2570e558a76093fe
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d2e6041b5..9388e65bc2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,3 +105,7 @@ add_subdirectory(${CLM_ROOT}/src/dyn_subgrid/test clm_dyn_subgrid_test)
 add_subdirectory(${CLM_ROOT}/src/main/test clm_main_test)
 add_subdirectory(${CLM_ROOT}/src/init_interp/test clm_init_interp_test)
 add_subdirectory(${CLM_ROOT}/src/self_tests/test clm_self_tests_test)
+
+# Add driver unit test directories
+add_subdirectory(${CLM_ROOT}/src/drv_test drv_test)
+
diff --git a/src/drv_test/CMakeLists.txt b/src/drv_test/CMakeLists.txt
new file mode 100644
index 0000000000..adf66b8b92
--- /dev/null
+++ b/src/drv_test/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(shr_dust_emis_test)
diff --git a/src/drv_test/shr_dust_emis_test/CMakeLists.txt b/src/drv_test/shr_dust_emis_test/CMakeLists.txt
new file mode 100644
index 0000000000..21fb9c8d47
--- /dev/null
+++ b/src/drv_test/shr_dust_emis_test/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_pfunit_ctest(dust_emis
+  TEST_SOURCES "test_shr_dust_emis.pf"
+  LINK_LIBRARIES clm csm_share)
diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
new file mode 100644
index 0000000000..aa60427eac
--- /dev/null
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -0,0 +1,50 @@
+module test_shr_dust_emis
+
+  ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
+
+  use funit
+  use shr_dust_emis_mod, only : check_if_initialized
+  use unittestUtils, only : endrun_msg
+
+  implicit none
+
+  @TestCase
+  type, extends(TestCase) :: TestDustEmis
+   contains
+     procedure :: setUp
+     procedure :: tearDown
+  end type TestDustEmis
+
+contains
+
+  ! ========================================================================
+  ! Helper routines
+  ! ========================================================================
+
+  subroutine setUp(this)
+    class(TestDustEmis), intent(inout) :: this
+  end subroutine setUp
+
+  subroutine tearDown(this)
+    class(TestDustEmis), intent(inout) :: this
+
+  end subroutine tearDown
+
+
+
+  ! ========================================================================
+  ! Begin tests
+  ! ========================================================================
+
+   @Test
+  subroutine check_if_initialized_aborts(this)
+    ! Test that the check_if_initialized check aborts when called initially
+    class(TestDustEmis), intent(inout) :: this
+
+    call check_if_initialized()
+    @assertExceptionRaised(endrun_msg('ERROR: dust emission namelist has NOT been read in yet, shr_dust_emis_mod is NOT initialized') )
+
+  end subroutine check_if_initialized_aborts
+
+ 
+end module test_shr_dust_emis

From 82704fe7e86aa68f2bd7254d83bb62c53f4aabeb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 09:21:16 -0600
Subject: [PATCH 04/47] Change call to is_NOT_initialized function, unit test
 works

---
 src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index aa60427eac..a619618e1d 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -3,7 +3,7 @@ module test_shr_dust_emis
   ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
 
   use funit
-  use shr_dust_emis_mod, only : check_if_initialized
+  use shr_dust_emis_mod, only : is_NOT_initialized
   use unittestUtils, only : endrun_msg
 
   implicit none
@@ -40,9 +40,11 @@ contains
   subroutine check_if_initialized_aborts(this)
     ! Test that the check_if_initialized check aborts when called initially
     class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
 
-    call check_if_initialized()
+    not_init = is_NOT_initialized()
     @assertExceptionRaised(endrun_msg('ERROR: dust emission namelist has NOT been read in yet, shr_dust_emis_mod is NOT initialized') )
+    @assertTrue(not_init)
 
   end subroutine check_if_initialized_aborts
 

From 118010da9524fa08401ba6af3c2b6be560b0d2c7 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 10:51:45 -0600
Subject: [PATCH 05/47] add a test that is expected to fail

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index a619618e1d..646b3cfce1 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -3,8 +3,8 @@ module test_shr_dust_emis
   ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
 
   use funit
-  use shr_dust_emis_mod, only : is_NOT_initialized
-  use unittestUtils, only : endrun_msg
+  use shr_dust_emis_mod
+  use unittestUtils    , only : endrun_msg
 
   implicit none
 
@@ -48,5 +48,16 @@ contains
 
   end subroutine check_if_initialized_aborts
 
+   @Test
+  subroutine check_when_initialized_runs(this)
+    ! Test that the initializiation check runs when it is initialized
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    not_init = is_NOT_initialized()
+    @assertFalse(not_init)
+
+  end subroutine check_when_initialized_runs
  
 end module test_shr_dust_emis

From 516d14721ae3f29c40316c6fb7fbd4fd7d9970d2 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 11:10:03 -0600
Subject: [PATCH 06/47] Update cmeps version so will work

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 70c0bd6124..3753aac874 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = 492faf0014ad9d91c22bb92e2570e558a76093fe
+hash = ecb6d45aa00a4960564ea963b00754fb4c3b7d2c
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git

From 5cf5dc04734ff81fc77b43e8a003af826e9553a4 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 14:31:23 -0600
Subject: [PATCH 07/47] Add more tests that pass

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index 646b3cfce1..efe6a5c2a8 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -60,4 +60,35 @@ contains
 
   end subroutine check_when_initialized_runs
  
+   @Test
+  subroutine check_dust_emis(this)
+    ! Test that the dust_emis logical functions work as expected
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    @assertTrue( is_dust_emis_zender() )
+    @assertFalse( is_dust_emis_leung() )
+    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    @assertFalse( is_dust_emis_zender() )
+    @assertTrue( is_dust_emis_leung() )
+
+  end subroutine check_dust_emis
+
+   
+  @Test
+  subroutine check_zender_soil(this)
+    ! Test that the dust_emis_Zender logical functions work as expected
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    @assertTrue( is_zender_soil_erod_from_land() )
+    @assertFalse( is_zender_soil_erod_from_atm() )
+    call dust_emis_set_options( 'Zender_2003', 'atm')
+    @assertFalse( is_zender_soil_erod_from_land() )
+    @assertTrue( is_zender_soil_erod_from_atm() )
+
+  end subroutine check_zender_soil
+ 
 end module test_shr_dust_emis

From c2d226c20c1ae3cbbf5f3e2b91a7bee67fd0e5aa Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 1 May 2024 13:50:29 -0600
Subject: [PATCH 08/47] Add new tests and get working again

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index efe6a5c2a8..467d00de59 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -69,7 +69,7 @@ contains
     call dust_emis_set_options( 'Zender_2003', 'lnd')
     @assertTrue( is_dust_emis_zender() )
     @assertFalse( is_dust_emis_leung() )
-    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    call dust_emis_set_options( 'Leung_2023', 'none')
     @assertFalse( is_dust_emis_zender() )
     @assertTrue( is_dust_emis_leung() )
 
@@ -90,5 +90,25 @@ contains
     @assertTrue( is_zender_soil_erod_from_atm() )
 
   end subroutine check_zender_soil
+
+     
+  @Test
+  subroutine check_options(this)
+    ! Test that the check_options subroutine catches errors that should die
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'zztop', 'zztop')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: dust_emis_method namelist item is not valid'))
+    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source should NOT be set, when dust_emis_method=Leung_2023'))
+    call dust_emis_set_options( 'Leung_2023', 'atm')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source should NOT be set, when dust_emis_method=Leung_2023'))
+    call dust_emis_set_options( 'Zender_2003', 'none')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source can only be lnd or atm'))
+    call dust_emis_set_options( 'Zender_2003', 'zztop')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source can only be lnd or atm'))
+
+  end subroutine check_options
  
 end module test_shr_dust_emis

From 0ff68d77dc824f6dbb0c8f6cac0a9ec3773e0b8c Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 1 May 2024 14:05:25 -0600
Subject: [PATCH 09/47] Update cmeps with unit-testing completed

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 3753aac874..39818b0fdc 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = ecb6d45aa00a4960564ea963b00754fb4c3b7d2c
+hash = 0285eeb59605df44bc3abf38a61e8436361e7e8c
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git

From f65de8fc0968316fe7e9a4c99bbc6e897dee5a92 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 May 2024 11:08:24 -0600
Subject: [PATCH 10/47] Add LND_SETS_DUST_EMIS_DRV_FLDS which will be used to
 NOT set dust_emis drv_flds_in settings when CAM is going to set them

---
 cime_config/config_component.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index f7adab268f..c474b7e0c1 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -162,6 +162,20 @@
     This is typically set by the compset.</desc>
   </entry>
 
+  <entry id="LND_SETS_DUST_EMIS_DRV_FLDS">
+    <type>logical</type>
+    <valid_values>TRUE,FALSE</valid_values>
+    <default_value>TRUE</default_value>
+    <values>
+      <!-- Until CAM sets dust settings in drv_flds_in this should only be TRUE
+      <value compset="CAM"  >FALSE</value>
+      -->
+    </values>
+    <group>run_component_cpl</group>
+    <file>env_run.xml</file>
+    <desc>If CTSM will set the dust settings in drv_flds_in (TRUE), or if ATM (i.e. CAM) will - DO NOT EDIT (set by compset name)</desc>
+  </entry>
+
   <entry id="CLM_CONFIGURATION">
     <type>char</type>
     <valid_values>clm,nwp</valid_values>

From 89f08710f61275cb0ac1dea22b5de849787682b2 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 May 2024 11:17:34 -0600
Subject: [PATCH 11/47] Move dust_emis and soil_erod namelist items to the
 drv_fld_in namelist file in CMEPS

---
 bld/CLMBuildNamelist.pm                            | 13 ++++++++-----
 bld/namelist_files/namelist_defaults_ctsm.xml      |  2 --
 bld/namelist_files/namelist_definition_ctsm.xml    | 14 --------------
 .../namelist_definition_drv_flds.xml               | 13 +++++++++++++
 bld/unit_testers/build-namelist_test.pl            | 14 +++++++++++++-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index fb44023cd5..ce2c2a81d2 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -517,6 +517,7 @@ sub read_namelist_defaults {
                             "$cfgdir/namelist_files/namelist_defaults_ctsm.xml",
                             "$cfgdir/namelist_files/namelist_defaults_drv.xml",
                             "$cfgdir/namelist_files/namelist_defaults_fire_emis.xml",
+                            "$cfgdir/namelist_files/namelist_defaults_dust_emis.xml",
                             "$cfgdir/namelist_files/namelist_defaults_drydep.xml" );
 
   # Add the location of the use case defaults files to the options hash
@@ -3988,7 +3989,7 @@ sub setup_logic_fire_emis {
 #-------------------------------------------------------------------------------
 
 sub setup_logic_dust_emis {
-  # Logic to handle the dust emissions
+  # Logic to handle the dust emissions namelists, both drv_flds_in and lnd_in files
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
   # First get the dust emission method
@@ -4011,14 +4012,16 @@ sub setup_logic_dust_emis {
                        'dust_emis_method'=>$dust_emis_method, 'zender_soil_erod_source'=>$zender_source,
                        'hgrid'=>$nl_flags->{'res'}, 'lnd_tuning_mod'=>$nl_flags->{'lnd_tuning_mode'} );
         }
-     } else {
+     } elsif ( $zender_source eq "atm" ) {
         foreach my $option ( @zender_files_in_lnd_opts ) {
            if ( defined($nl->get_value($option)) ) {
-             $log->fatal_error("zender_soil_erod_source is NOT lnd, but the file option $option is being set" .
-                               " and should NOT be unless you want it handled here in the LAND model, " .
+             $log->fatal_error("zender_soil_erod_source is atm, and the file option $option is being set" .
+                               " which should NOT be unless you want it handled here in the LAND model, " .
                                "otherwise the equivalent option is set in CAM" );
            }
         }
+     } elsif ( $zender_source eq "none" ) {
+        $log->fatal_error("zender_soil_erod_source is set to none and only atm or lnd should be used when $var is Zender_2002" );
      }
   } else {
      # Verify that NONE of the Zender options are being set if Zender is NOT being used
@@ -4736,7 +4739,7 @@ sub write_output_files {
   $log->verbose_message("Writing clm namelist to $outfile");
 
   # Drydep, fire-emission or MEGAN namelist for driver
-  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm);
+  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm);
   $outfile = "$opts->{'dir'}/drv_flds_in";
   $nl->write($outfile, 'groups'=>\@groups, 'note'=>"$note" );
   $log->verbose_message("Writing @groups namelists to $outfile");
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 147a23f49a..6fde63ee02 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1991,8 +1991,6 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 <!-- Defaults for Zender's soil erodibility data  -->
 <!-- ===========================================  -->
 
-<dust_emis_method>Zender_2003</dust_emis_method>
-<zender_soil_erod_source dust_emis_method="Zender_2003">atm</zender_soil_erod_source>
 <zendersoilerod_mapalgo>bilinear</zendersoilerod_mapalgo>
 <stream_fldfilename_zendersoilerod dust_emis_method="Zender_2003" zender_soil_erod_source="lnd" lnd_tuning_mode="cam45_cam6.0"
 >lnd/clm2/dustemisdata/dst_source2x2tunedcam6-2x2-forCLM_cdf5_c230312.nc</stream_fldfilename_zendersoilerod>
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index 37c457141c..e730082e90 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1612,20 +1612,6 @@ Mapping method from Nitrogen deposition input file to the model resolution
 <!-- Dust namelist and Zender soil erodibility stream                                          -->
 <!-- ========================================================================================  -->
 
-<entry id="dust_emis_method" type="char*12" category="physics"
-       group="clm_inparm" valid_values="Zender_2003,Leung_2023" >
-Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023
-scheme.
-(NOTE: The Leung 2023 method is NOT currently available)
-</entry>
-
-<entry id="zender_soil_erod_source" type="char*3" category="physics"
-       group="zendersoilerod" valid_values="lnd,atm" >
-Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
-here in CTSM, or in the ATM model.
-(only used when dust_emis_method is Zender_2003)
-</entry>
-
 <entry id="zendersoilerod_mapalgo" type="char*256" category="physics"
        group="zendersoilerod" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
 Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml
index 088f5c5fa9..89bab07f4f 100644
--- a/bld/namelist_files/namelist_definition_drv_flds.xml
+++ b/bld/namelist_files/namelist_definition_drv_flds.xml
@@ -123,4 +123,17 @@
     List of fluxes needed by the CARMA model, from CLM to CAM.
   </entry>
 
+  <entry id="dust_emis_method" type="char*80" category="dust_emissions"
+    group="dust_emis_inparm" valid_values="Zender_2003,Leung_2023" >
+     Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023 scheme.
+     (NOTE: The Leung 2023 method is NOT currently available)
+  </entry>
+
+  <entry id="zender_soil_erod_source" type="char*80" category="dust_emissions"
+    group="dust_emis_inparm" valid_values="none,lnd,atm" >
+     Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
+     in the active LAND model or in the ATM model.
+     (only used when dust_emis_method is Zender_2003)
+  </entry>
+
 </namelist_definition>
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 7b654337af..114fb0c36c 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 2513;
+my $ntests = 2515;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 1545;
@@ -1255,6 +1255,18 @@ sub cat_and_create_namelistinfile {
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },
+     "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
+                                     namelst=>"dust_emis_method='Zender_2003', " .
+                                     "zender_soil_erod_source='none'",
+                                     GLC_TWO_WAY_COUPLING=>"FALSE",
+                                     phys=>"clm5_1",
+                                     },
+     "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
+                                     namelst=>"dust_emis_method='Zender_2003', " .
+                                     "zender_soil_erod_source='zztop'",
+                                     GLC_TWO_WAY_COUPLING=>"FALSE",
+                                     phys=>"clm5_1",
+                                     },
                );
 foreach my $key ( keys(%failtest) ) {
    print( "$key\n" );

From 6f8021cb9be81521f4f905b27b353ce9de1980be Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 7 May 2024 03:30:20 -0600
Subject: [PATCH 12/47] Start adding reference for LND_SETS_DUST_EMIS_DRV_FLDS
 in unit tester

---
 bld/unit_testers/build-namelist_test.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 114fb0c36c..30110d92f7 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -42,7 +42,7 @@ sub make_env_run {
     my %settings = @_;
 
     # Set default settings
-    my %env_vars = ( DIN_LOC_ROOT=>"MYDINLOCROOT", GLC_TWO_WAY_COUPLING=>"FALSE", NEONSITE=>"" );
+    my %env_vars = ( DIN_LOC_ROOT=>"MYDINLOCROOT", GLC_TWO_WAY_COUPLING=>"FALSE",  LND_SETS_DUST_EMIS_DRV_FLDS=>"TRUE", NEONSITE=>"" );
     # Set any settings that came in from function call
     foreach my $item ( keys(%settings) ) {
        $env_vars{$item} = $settings{$item};

From f52f76fc0c71f3521a0680207141b1545dd6098a Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 7 May 2024 03:31:04 -0600
Subject: [PATCH 13/47] Add dust emis namelist default for drv_flds_in

---
 .../namelist_defaults_dust_emis.xml           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 bld/namelist_files/namelist_defaults_dust_emis.xml

diff --git a/bld/namelist_files/namelist_defaults_dust_emis.xml b/bld/namelist_files/namelist_defaults_dust_emis.xml
new file mode 100644
index 0000000000..40bf3d9078
--- /dev/null
+++ b/bld/namelist_files/namelist_defaults_dust_emis.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/xsl" href="namelist_defaults.xsl"?>
+
+<namelist_defaults>
+
+<!--
+Values to use by default for creation of CLM model driver namelists.
+The element names are the same as the corresponding namelist
+variables.  Values that depend on the model configuration use
+attributes to express the dependency.  The recognized attributes
+are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
+attributes from the config_cache.xml file (with keys converted to upper-case).
+-->
+
+<!-- Defaults for dust_emis_inparm namelist  -->
+<dust_emis_method>Zender_2003</dust_emis_method>
+
+<zender_soil_erod_source>atm</zender_soil_erod_source>
+
+</namelist_defaults>

From 8aa0a708ca8751aa770ccc40a66fb962d26f5acc Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 26 Apr 2024 13:56:24 -0600
Subject: [PATCH 14/47] Update cmeps to the branch

---
 Externals.cfg | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Externals.cfg b/Externals.cfg
index 185f412cab..1aa8991883 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -48,9 +48,12 @@ tag = cime6.0.217_httpsbranch03
 required = True
 
 [cmeps]
-tag = cmeps0.14.50
+#tag = cmeps0.14.50
+#branch = dust_emis_mod
+hash = d79e34f67df825f9265bdaaf3091f8995d5df1a2
 protocol = git
-repo_url = https://github.com/ESCOMP/CMEPS.git
+#repo_url = https://github.com/ESCOMP/CMEPS.git
+repo_url = https://github.com/ekluzek/CMEPS.git
 local_path = components/cmeps
 required = True
 

From 603d2677f85eff3a15a284ded3d89722371b81be Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 26 Apr 2024 15:02:04 -0600
Subject: [PATCH 15/47] Add shr_dust_emis_mod.F90 to the files needed for unit
 testing, fails, because ESMF is currently needed and not available

---
 src/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 568b53cd15..9d2e6041b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,9 +20,11 @@ add_subdirectory(${CLM_ROOT}/share/src csm_share)
 add_subdirectory(${CLM_ROOT}/share/unit_test_stubs/util csm_share_stubs)
 add_subdirectory(${CLM_ROOT}/share/src/esmf_wrf_timemgr esmf_wrf_timemgr)
 
-# Add the single file we need from CMEPS
-set (drv_sources_needed
-  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/glc_elevclass_mod.F90)
+# Add files needed from CMEPS
+list ( APPEND drv_sources_needed
+  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/glc_elevclass_mod.F90
+  ${CLM_ROOT}/components/cmeps/cesm/nuopc_cap_share/shr_dust_emis_mod.F90
+  )
 
 # Add CLM source directories
 add_subdirectory(${CLM_ROOT}/src/utils clm_utils)

From 0b48097c502c98521b8014171a2d4f3cdaa5dec2 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 29 Apr 2024 18:59:30 -0600
Subject: [PATCH 16/47] Start adding the unit testing for dust emission in
 cmeps

---
 Externals.cfg                                 |  2 +-
 src/CMakeLists.txt                            |  4 ++
 src/drv_test/CMakeLists.txt                   |  1 +
 .../shr_dust_emis_test/CMakeLists.txt         |  3 ++
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 50 +++++++++++++++++++
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/drv_test/CMakeLists.txt
 create mode 100644 src/drv_test/shr_dust_emis_test/CMakeLists.txt
 create mode 100644 src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf

diff --git a/Externals.cfg b/Externals.cfg
index 1aa8991883..70c0bd6124 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = d79e34f67df825f9265bdaaf3091f8995d5df1a2
+hash = 492faf0014ad9d91c22bb92e2570e558a76093fe
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d2e6041b5..9388e65bc2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,3 +105,7 @@ add_subdirectory(${CLM_ROOT}/src/dyn_subgrid/test clm_dyn_subgrid_test)
 add_subdirectory(${CLM_ROOT}/src/main/test clm_main_test)
 add_subdirectory(${CLM_ROOT}/src/init_interp/test clm_init_interp_test)
 add_subdirectory(${CLM_ROOT}/src/self_tests/test clm_self_tests_test)
+
+# Add driver unit test directories
+add_subdirectory(${CLM_ROOT}/src/drv_test drv_test)
+
diff --git a/src/drv_test/CMakeLists.txt b/src/drv_test/CMakeLists.txt
new file mode 100644
index 0000000000..adf66b8b92
--- /dev/null
+++ b/src/drv_test/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(shr_dust_emis_test)
diff --git a/src/drv_test/shr_dust_emis_test/CMakeLists.txt b/src/drv_test/shr_dust_emis_test/CMakeLists.txt
new file mode 100644
index 0000000000..21fb9c8d47
--- /dev/null
+++ b/src/drv_test/shr_dust_emis_test/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_pfunit_ctest(dust_emis
+  TEST_SOURCES "test_shr_dust_emis.pf"
+  LINK_LIBRARIES clm csm_share)
diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
new file mode 100644
index 0000000000..aa60427eac
--- /dev/null
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -0,0 +1,50 @@
+module test_shr_dust_emis
+
+  ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
+
+  use funit
+  use shr_dust_emis_mod, only : check_if_initialized
+  use unittestUtils, only : endrun_msg
+
+  implicit none
+
+  @TestCase
+  type, extends(TestCase) :: TestDustEmis
+   contains
+     procedure :: setUp
+     procedure :: tearDown
+  end type TestDustEmis
+
+contains
+
+  ! ========================================================================
+  ! Helper routines
+  ! ========================================================================
+
+  subroutine setUp(this)
+    class(TestDustEmis), intent(inout) :: this
+  end subroutine setUp
+
+  subroutine tearDown(this)
+    class(TestDustEmis), intent(inout) :: this
+
+  end subroutine tearDown
+
+
+
+  ! ========================================================================
+  ! Begin tests
+  ! ========================================================================
+
+   @Test
+  subroutine check_if_initialized_aborts(this)
+    ! Test that the check_if_initialized check aborts when called initially
+    class(TestDustEmis), intent(inout) :: this
+
+    call check_if_initialized()
+    @assertExceptionRaised(endrun_msg('ERROR: dust emission namelist has NOT been read in yet, shr_dust_emis_mod is NOT initialized') )
+
+  end subroutine check_if_initialized_aborts
+
+ 
+end module test_shr_dust_emis

From d2d2da45ec2662c404424096b03a9b32debd9e01 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 09:21:16 -0600
Subject: [PATCH 17/47] Change call to is_NOT_initialized function, unit test
 works

---
 src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index aa60427eac..a619618e1d 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -3,7 +3,7 @@ module test_shr_dust_emis
   ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
 
   use funit
-  use shr_dust_emis_mod, only : check_if_initialized
+  use shr_dust_emis_mod, only : is_NOT_initialized
   use unittestUtils, only : endrun_msg
 
   implicit none
@@ -40,9 +40,11 @@ contains
   subroutine check_if_initialized_aborts(this)
     ! Test that the check_if_initialized check aborts when called initially
     class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
 
-    call check_if_initialized()
+    not_init = is_NOT_initialized()
     @assertExceptionRaised(endrun_msg('ERROR: dust emission namelist has NOT been read in yet, shr_dust_emis_mod is NOT initialized') )
+    @assertTrue(not_init)
 
   end subroutine check_if_initialized_aborts
 

From 66578f0efd1f575b3adfe49bf1682e9c6fe703cb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 10:51:45 -0600
Subject: [PATCH 18/47] add a test that is expected to fail

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index a619618e1d..646b3cfce1 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -3,8 +3,8 @@ module test_shr_dust_emis
   ! Tests of shr_dust_emis_mod.F90 from CMEPS nuopc_cap_share
 
   use funit
-  use shr_dust_emis_mod, only : is_NOT_initialized
-  use unittestUtils, only : endrun_msg
+  use shr_dust_emis_mod
+  use unittestUtils    , only : endrun_msg
 
   implicit none
 
@@ -48,5 +48,16 @@ contains
 
   end subroutine check_if_initialized_aborts
 
+   @Test
+  subroutine check_when_initialized_runs(this)
+    ! Test that the initializiation check runs when it is initialized
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    not_init = is_NOT_initialized()
+    @assertFalse(not_init)
+
+  end subroutine check_when_initialized_runs
  
 end module test_shr_dust_emis

From a6927691757bdb91dc4d911461446a4e0746c3aa Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 11:10:03 -0600
Subject: [PATCH 19/47] Update cmeps version so will work

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 70c0bd6124..3753aac874 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = 492faf0014ad9d91c22bb92e2570e558a76093fe
+hash = ecb6d45aa00a4960564ea963b00754fb4c3b7d2c
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git

From a65752d3d1abfc626631390c6b2378a5813e079f Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Apr 2024 14:31:23 -0600
Subject: [PATCH 20/47] Add more tests that pass

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index 646b3cfce1..efe6a5c2a8 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -60,4 +60,35 @@ contains
 
   end subroutine check_when_initialized_runs
  
+   @Test
+  subroutine check_dust_emis(this)
+    ! Test that the dust_emis logical functions work as expected
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    @assertTrue( is_dust_emis_zender() )
+    @assertFalse( is_dust_emis_leung() )
+    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    @assertFalse( is_dust_emis_zender() )
+    @assertTrue( is_dust_emis_leung() )
+
+  end subroutine check_dust_emis
+
+   
+  @Test
+  subroutine check_zender_soil(this)
+    ! Test that the dust_emis_Zender logical functions work as expected
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'Zender_2003', 'lnd')
+    @assertTrue( is_zender_soil_erod_from_land() )
+    @assertFalse( is_zender_soil_erod_from_atm() )
+    call dust_emis_set_options( 'Zender_2003', 'atm')
+    @assertFalse( is_zender_soil_erod_from_land() )
+    @assertTrue( is_zender_soil_erod_from_atm() )
+
+  end subroutine check_zender_soil
+ 
 end module test_shr_dust_emis

From dd73ca699a83c80f5d2dc36fb9fa7482b4eec5eb Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 1 May 2024 13:50:29 -0600
Subject: [PATCH 21/47] Add new tests and get working again

---
 .../shr_dust_emis_test/test_shr_dust_emis.pf  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index efe6a5c2a8..467d00de59 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -69,7 +69,7 @@ contains
     call dust_emis_set_options( 'Zender_2003', 'lnd')
     @assertTrue( is_dust_emis_zender() )
     @assertFalse( is_dust_emis_leung() )
-    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    call dust_emis_set_options( 'Leung_2023', 'none')
     @assertFalse( is_dust_emis_zender() )
     @assertTrue( is_dust_emis_leung() )
 
@@ -90,5 +90,25 @@ contains
     @assertTrue( is_zender_soil_erod_from_atm() )
 
   end subroutine check_zender_soil
+
+     
+  @Test
+  subroutine check_options(this)
+    ! Test that the check_options subroutine catches errors that should die
+    class(TestDustEmis), intent(inout) :: this
+    logical :: not_init
+
+    call dust_emis_set_options( 'zztop', 'zztop')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: dust_emis_method namelist item is not valid'))
+    call dust_emis_set_options( 'Leung_2023', 'lnd')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source should NOT be set, when dust_emis_method=Leung_2023'))
+    call dust_emis_set_options( 'Leung_2023', 'atm')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source should NOT be set, when dust_emis_method=Leung_2023'))
+    call dust_emis_set_options( 'Zender_2003', 'none')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source can only be lnd or atm'))
+    call dust_emis_set_options( 'Zender_2003', 'zztop')
+    @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source can only be lnd or atm'))
+
+  end subroutine check_options
  
 end module test_shr_dust_emis

From ccd976af2ace8896eef72013d80ba3bccd8684af Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 1 May 2024 14:05:25 -0600
Subject: [PATCH 22/47] Update cmeps with unit-testing completed

---
 Externals.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals.cfg b/Externals.cfg
index 3753aac874..39818b0fdc 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -50,7 +50,7 @@ required = True
 [cmeps]
 #tag = cmeps0.14.50
 #branch = dust_emis_mod
-hash = ecb6d45aa00a4960564ea963b00754fb4c3b7d2c
+hash = 0285eeb59605df44bc3abf38a61e8436361e7e8c
 protocol = git
 #repo_url = https://github.com/ESCOMP/CMEPS.git
 repo_url = https://github.com/ekluzek/CMEPS.git

From 65fc5536bd17b81f3b532ac764e15991b61a1e41 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 May 2024 11:08:24 -0600
Subject: [PATCH 23/47] Add LND_SETS_DUST_EMIS_DRV_FLDS which will be used to
 NOT set dust_emis drv_flds_in settings when CAM is going to set them

---
 cime_config/config_component.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index f7adab268f..c474b7e0c1 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -162,6 +162,20 @@
     This is typically set by the compset.</desc>
   </entry>
 
+  <entry id="LND_SETS_DUST_EMIS_DRV_FLDS">
+    <type>logical</type>
+    <valid_values>TRUE,FALSE</valid_values>
+    <default_value>TRUE</default_value>
+    <values>
+      <!-- Until CAM sets dust settings in drv_flds_in this should only be TRUE
+      <value compset="CAM"  >FALSE</value>
+      -->
+    </values>
+    <group>run_component_cpl</group>
+    <file>env_run.xml</file>
+    <desc>If CTSM will set the dust settings in drv_flds_in (TRUE), or if ATM (i.e. CAM) will - DO NOT EDIT (set by compset name)</desc>
+  </entry>
+
   <entry id="CLM_CONFIGURATION">
     <type>char</type>
     <valid_values>clm,nwp</valid_values>

From d9c94eb04ebbf31ef4d5441d26eb59d360b2251d Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Sat, 4 May 2024 11:17:34 -0600
Subject: [PATCH 24/47] Move dust_emis and soil_erod namelist items to the
 drv_fld_in namelist file in CMEPS

---
 bld/CLMBuildNamelist.pm                            | 13 ++++++++-----
 bld/namelist_files/namelist_defaults_ctsm.xml      |  2 --
 bld/namelist_files/namelist_definition_ctsm.xml    | 14 --------------
 .../namelist_definition_drv_flds.xml               | 13 +++++++++++++
 bld/unit_testers/build-namelist_test.pl            | 14 +++++++++++++-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index fb44023cd5..ce2c2a81d2 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -517,6 +517,7 @@ sub read_namelist_defaults {
                             "$cfgdir/namelist_files/namelist_defaults_ctsm.xml",
                             "$cfgdir/namelist_files/namelist_defaults_drv.xml",
                             "$cfgdir/namelist_files/namelist_defaults_fire_emis.xml",
+                            "$cfgdir/namelist_files/namelist_defaults_dust_emis.xml",
                             "$cfgdir/namelist_files/namelist_defaults_drydep.xml" );
 
   # Add the location of the use case defaults files to the options hash
@@ -3988,7 +3989,7 @@ sub setup_logic_fire_emis {
 #-------------------------------------------------------------------------------
 
 sub setup_logic_dust_emis {
-  # Logic to handle the dust emissions
+  # Logic to handle the dust emissions namelists, both drv_flds_in and lnd_in files
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
   # First get the dust emission method
@@ -4011,14 +4012,16 @@ sub setup_logic_dust_emis {
                        'dust_emis_method'=>$dust_emis_method, 'zender_soil_erod_source'=>$zender_source,
                        'hgrid'=>$nl_flags->{'res'}, 'lnd_tuning_mod'=>$nl_flags->{'lnd_tuning_mode'} );
         }
-     } else {
+     } elsif ( $zender_source eq "atm" ) {
         foreach my $option ( @zender_files_in_lnd_opts ) {
            if ( defined($nl->get_value($option)) ) {
-             $log->fatal_error("zender_soil_erod_source is NOT lnd, but the file option $option is being set" .
-                               " and should NOT be unless you want it handled here in the LAND model, " .
+             $log->fatal_error("zender_soil_erod_source is atm, and the file option $option is being set" .
+                               " which should NOT be unless you want it handled here in the LAND model, " .
                                "otherwise the equivalent option is set in CAM" );
            }
         }
+     } elsif ( $zender_source eq "none" ) {
+        $log->fatal_error("zender_soil_erod_source is set to none and only atm or lnd should be used when $var is Zender_2002" );
      }
   } else {
      # Verify that NONE of the Zender options are being set if Zender is NOT being used
@@ -4736,7 +4739,7 @@ sub write_output_files {
   $log->verbose_message("Writing clm namelist to $outfile");
 
   # Drydep, fire-emission or MEGAN namelist for driver
-  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm);
+  @groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm);
   $outfile = "$opts->{'dir'}/drv_flds_in";
   $nl->write($outfile, 'groups'=>\@groups, 'note'=>"$note" );
   $log->verbose_message("Writing @groups namelists to $outfile");
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index cc407961ff..b232c865cb 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1993,8 +1993,6 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 <!-- Defaults for Zender's soil erodibility data  -->
 <!-- ===========================================  -->
 
-<dust_emis_method>Zender_2003</dust_emis_method>
-<zender_soil_erod_source dust_emis_method="Zender_2003">atm</zender_soil_erod_source>
 <zendersoilerod_mapalgo>bilinear</zendersoilerod_mapalgo>
 <stream_fldfilename_zendersoilerod dust_emis_method="Zender_2003" zender_soil_erod_source="lnd" lnd_tuning_mode="cam45_cam6.0"
 >lnd/clm2/dustemisdata/dst_source2x2tunedcam6-2x2-forCLM_cdf5_c230312.nc</stream_fldfilename_zendersoilerod>
diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
index 37c457141c..e730082e90 100644
--- a/bld/namelist_files/namelist_definition_ctsm.xml
+++ b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1612,20 +1612,6 @@ Mapping method from Nitrogen deposition input file to the model resolution
 <!-- Dust namelist and Zender soil erodibility stream                                          -->
 <!-- ========================================================================================  -->
 
-<entry id="dust_emis_method" type="char*12" category="physics"
-       group="clm_inparm" valid_values="Zender_2003,Leung_2023" >
-Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023
-scheme.
-(NOTE: The Leung 2023 method is NOT currently available)
-</entry>
-
-<entry id="zender_soil_erod_source" type="char*3" category="physics"
-       group="zendersoilerod" valid_values="lnd,atm" >
-Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
-here in CTSM, or in the ATM model.
-(only used when dust_emis_method is Zender_2003)
-</entry>
-
 <entry id="zendersoilerod_mapalgo" type="char*256" category="physics"
        group="zendersoilerod" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
 Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
diff --git a/bld/namelist_files/namelist_definition_drv_flds.xml b/bld/namelist_files/namelist_definition_drv_flds.xml
index 088f5c5fa9..89bab07f4f 100644
--- a/bld/namelist_files/namelist_definition_drv_flds.xml
+++ b/bld/namelist_files/namelist_definition_drv_flds.xml
@@ -123,4 +123,17 @@
     List of fluxes needed by the CARMA model, from CLM to CAM.
   </entry>
 
+  <entry id="dust_emis_method" type="char*80" category="dust_emissions"
+    group="dust_emis_inparm" valid_values="Zender_2003,Leung_2023" >
+     Which dust emission method is going to be used. Either the Zender 2003 scheme or the Leung 2023 scheme.
+     (NOTE: The Leung 2023 method is NOT currently available)
+  </entry>
+
+  <entry id="zender_soil_erod_source" type="char*80" category="dust_emissions"
+    group="dust_emis_inparm" valid_values="none,lnd,atm" >
+     Option only applying for the Zender_2003 method for whether the soil erodibility file is handled
+     in the active LAND model or in the ATM model.
+     (only used when dust_emis_method is Zender_2003)
+  </entry>
+
 </namelist_definition>
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 7b654337af..114fb0c36c 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 2513;
+my $ntests = 2515;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 1545;
@@ -1255,6 +1255,18 @@ sub cat_and_create_namelistinfile {
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },
+     "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
+                                     namelst=>"dust_emis_method='Zender_2003', " .
+                                     "zender_soil_erod_source='none'",
+                                     GLC_TWO_WAY_COUPLING=>"FALSE",
+                                     phys=>"clm5_1",
+                                     },
+     "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
+                                     namelst=>"dust_emis_method='Zender_2003', " .
+                                     "zender_soil_erod_source='zztop'",
+                                     GLC_TWO_WAY_COUPLING=>"FALSE",
+                                     phys=>"clm5_1",
+                                     },
                );
 foreach my $key ( keys(%failtest) ) {
    print( "$key\n" );

From 0c23d08c2bad4677b70afe22640e2a8bb5f4543a Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Thu, 2 May 2024 14:26:53 -0600
Subject: [PATCH 25/47] Update ChangeLog and ChangeSum.

---
 doc/ChangeLog | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/ChangeSum |  1 +
 2 files changed, 82 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e5c2466085..e0a5e45cb6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,85 @@
 ===============================================================
+Tag name: ctsm5.2.003
+Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
+Date: Thu May  2 14:06:54 MDT 2024
+One-line Summary: Merge b4b-dev
+
+Purpose and description of changes
+----------------------------------
+
+Brings in 4 PRs from b4b-dev to master:
+- Regional CTSM Simulations and Capability of Creating Mesh Files (ESCOMP/CTSM#1892; Negin Sobhani and Adrianna Foster)
+- Add line about documentation in PR template (ESCOMP/CTSM#2488; Sam Rabin)
+- CTSM5.2 2000 fsurdat T42 64x128 file (ESCOMP/CTSM#2495; Sam Levis)
+- Move plumber2 scripts to python directory (ESCOMP/CTSM#2505; Teagan King)
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+List of CTSM issues fixed (include CTSM Issue # and description):
+- Resolves ESCOMP/CTSM#1513: Need a process to subset ESMF mesh files from global ones for regional grids
+- Resolves ESCOMP/CTSM#1773: High resolution regional simulations
+- Resolves ESCOMP/CTSM#2187: Move new PLUMBER2 scripts to python directory to enable python testing
+- Resolves ESCOMP/CTSM#2486: Temporarily add back a T42 dataset for CAM
+
+
+Notes of particular relevance for users
+---------------------------------------
+
+Changes to documentation:
+- Adds documentation for making mesh files
+
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Changes to tests or testing:
+- Adds testing for mesh-making Python scripts
+- Adds testing for plumber2_surf_wrapper
+
+
+Testing summary:
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+- ESCOMP/CTSM#2513: Merge b4b-dev 2024-05-02
+- Constituent PRs:
+  - ESCOMP/CTSM#1892: Regional CTSM Simulations and Capability of Creating Mesh Files (https://github.com/ESCOMP/CTSM/pull/1892)
+  - ESCOMP/CTSM#2488: Add line about documentation in PR template (https://github.com/ESCOMP/CTSM/pull/2488)
+  - ESCOMP/CTSM#2495: CTSM5.2 2000 fsurdat T42 64x128 file (https://github.com/ESCOMP/CTSM/pull/2495)
+  - ESCOMP/CTSM#2505: Move plumber2 scripts to python directory (https://github.com/ESCOMP/CTSM/pull/2505)
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.002
 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
 Date: Fri 26 Apr 2024 11:13:46 AM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 40033a7d6f..b48e04889d 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.2.003 samrabin 05/02/2024 Merge b4b-dev
        ctsm5.2.002 glemieux 04/26/2024 FATES default allometry parameter file update
        ctsm5.2.001     erik 04/22/2024 Merge b4b-dev
          ctsm5.2.0     many 04/20/2024 New mksurfdata_esmf tool to create new surface datasets that are in place

From 747d104c156733f520008819359612c0b8b1dd83 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 7 May 2024 03:30:20 -0600
Subject: [PATCH 26/47] Start adding reference for LND_SETS_DUST_EMIS_DRV_FLDS
 in unit tester

---
 bld/unit_testers/build-namelist_test.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 114fb0c36c..30110d92f7 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -42,7 +42,7 @@ sub make_env_run {
     my %settings = @_;
 
     # Set default settings
-    my %env_vars = ( DIN_LOC_ROOT=>"MYDINLOCROOT", GLC_TWO_WAY_COUPLING=>"FALSE", NEONSITE=>"" );
+    my %env_vars = ( DIN_LOC_ROOT=>"MYDINLOCROOT", GLC_TWO_WAY_COUPLING=>"FALSE",  LND_SETS_DUST_EMIS_DRV_FLDS=>"TRUE", NEONSITE=>"" );
     # Set any settings that came in from function call
     foreach my $item ( keys(%settings) ) {
        $env_vars{$item} = $settings{$item};

From c36f3a9e6aa9e58f8ff05d4db7ee7349690841f5 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 7 May 2024 03:31:04 -0600
Subject: [PATCH 27/47] Add dust emis namelist default for drv_flds_in

---
 .../namelist_defaults_dust_emis.xml           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 bld/namelist_files/namelist_defaults_dust_emis.xml

diff --git a/bld/namelist_files/namelist_defaults_dust_emis.xml b/bld/namelist_files/namelist_defaults_dust_emis.xml
new file mode 100644
index 0000000000..40bf3d9078
--- /dev/null
+++ b/bld/namelist_files/namelist_defaults_dust_emis.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet type="text/xsl" href="namelist_defaults.xsl"?>
+
+<namelist_defaults>
+
+<!--
+Values to use by default for creation of CLM model driver namelists.
+The element names are the same as the corresponding namelist
+variables.  Values that depend on the model configuration use
+attributes to express the dependency.  The recognized attributes
+are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration
+attributes from the config_cache.xml file (with keys converted to upper-case).
+-->
+
+<!-- Defaults for dust_emis_inparm namelist  -->
+<dust_emis_method>Zender_2003</dust_emis_method>
+
+<zender_soil_erod_source>atm</zender_soil_erod_source>
+
+</namelist_defaults>

From 8ab4063d65dff584758d054c05287e49a00d9130 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 15 May 2024 11:14:02 -0600
Subject: [PATCH 28/47] Git rebase didn't correct the change files for some
 reason, so going back to the b4b-dev version of those

---
 doc/ChangeLog | 81 ---------------------------------------------------
 doc/ChangeSum |  1 -
 2 files changed, 82 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e0a5e45cb6..e5c2466085 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,85 +1,4 @@
 ===============================================================
-Tag name: ctsm5.2.003
-Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
-Date: Thu May  2 14:06:54 MDT 2024
-One-line Summary: Merge b4b-dev
-
-Purpose and description of changes
-----------------------------------
-
-Brings in 4 PRs from b4b-dev to master:
-- Regional CTSM Simulations and Capability of Creating Mesh Files (ESCOMP/CTSM#1892; Negin Sobhani and Adrianna Foster)
-- Add line about documentation in PR template (ESCOMP/CTSM#2488; Sam Rabin)
-- CTSM5.2 2000 fsurdat T42 64x128 file (ESCOMP/CTSM#2495; Sam Levis)
-- Move plumber2 scripts to python directory (ESCOMP/CTSM#2505; Teagan King)
-
-
-Significant changes to scientifically-supported configurations
---------------------------------------------------------------
-
-Does this tag change answers significantly for any of the following physics configurations?
-(Details of any changes will be given in the "Answer changes" section below.)
-
-    [Put an [X] in the box for any configuration with significant answer changes.]
-
-[ ] clm6_0
-
-[ ] clm5_1
-
-[ ] clm5_0
-
-[ ] ctsm5_0-nwp
-
-[ ] clm4_5
-
-
-Bugs fixed
-----------
-
-List of CTSM issues fixed (include CTSM Issue # and description):
-- Resolves ESCOMP/CTSM#1513: Need a process to subset ESMF mesh files from global ones for regional grids
-- Resolves ESCOMP/CTSM#1773: High resolution regional simulations
-- Resolves ESCOMP/CTSM#2187: Move new PLUMBER2 scripts to python directory to enable python testing
-- Resolves ESCOMP/CTSM#2486: Temporarily add back a T42 dataset for CAM
-
-
-Notes of particular relevance for users
----------------------------------------
-
-Changes to documentation:
-- Adds documentation for making mesh files
-
-
-Notes of particular relevance for developers:
----------------------------------------------
-
-Changes to tests or testing:
-- Adds testing for mesh-making Python scripts
-- Adds testing for plumber2_surf_wrapper
-
-
-Testing summary:
-----------------
-
-  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
-
-    derecho ----- OK
-    izumi ------- OK
-
-
-Other details
--------------
-
-Pull Requests that document the changes (include PR ids):
-- ESCOMP/CTSM#2513: Merge b4b-dev 2024-05-02
-- Constituent PRs:
-  - ESCOMP/CTSM#1892: Regional CTSM Simulations and Capability of Creating Mesh Files (https://github.com/ESCOMP/CTSM/pull/1892)
-  - ESCOMP/CTSM#2488: Add line about documentation in PR template (https://github.com/ESCOMP/CTSM/pull/2488)
-  - ESCOMP/CTSM#2495: CTSM5.2 2000 fsurdat T42 64x128 file (https://github.com/ESCOMP/CTSM/pull/2495)
-  - ESCOMP/CTSM#2505: Move plumber2 scripts to python directory (https://github.com/ESCOMP/CTSM/pull/2505)
-
-===============================================================
-===============================================================
 Tag name: ctsm5.2.002
 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov)
 Date: Fri 26 Apr 2024 11:13:46 AM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index b48e04889d..40033a7d6f 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,6 +1,5 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
-       ctsm5.2.003 samrabin 05/02/2024 Merge b4b-dev
        ctsm5.2.002 glemieux 04/26/2024 FATES default allometry parameter file update
        ctsm5.2.001     erik 04/22/2024 Merge b4b-dev
          ctsm5.2.0     many 04/20/2024 New mksurfdata_esmf tool to create new surface datasets that are in place

From b706c5a717652f24ca30e7dd43285b9e527b0f16 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 16 May 2024 16:22:11 -0600
Subject: [PATCH 29/47] Have build-namelist not do the dust emission namelist
 settings, when the XML variable is set for CAM to do it, and add a test for
 this

---
 bld/CLMBuildNamelist.pm                 | 120 +++++++++--------
 bld/unit_testers/build-namelist_test.pl | 169 ++----------------------
 2 files changed, 80 insertions(+), 209 deletions(-)

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
index ce2c2a81d2..98fdd861a0 100755
--- a/bld/CLMBuildNamelist.pm
+++ b/bld/CLMBuildNamelist.pm
@@ -97,7 +97,7 @@ OPTIONS
 				        CENTURY or MIMICS decomposition
                                         This toggles on the namelist variables:
 				        use_fates. use_lch4 and use_nitrif_denitrif are optional
-				 
+
                               (Only for CLM4.5/CLM5.0)
      -[no-]chk_res            Also check [do NOT check] to make sure the resolution and
                               land-mask is valid.
@@ -1012,7 +1012,7 @@ sub setup_cmdl_fire_light_res {
      if ( ! &value_is_true($nl_flags->{'neon'}) ) {
          if ( defined($opts->{'clm_usr_name'}) ) {
             $log->warning("The NEON lightning dataset does NOT cover the entire globe, make sure it covers the region for your grid");
-         } else { 
+         } else {
             $log->fatal_error("The NEON lightning dataset can NOT be used for global grids or regions or points outside of its area as it does NOT cover the entire globe.");
          }
      }
@@ -1702,7 +1702,7 @@ sub process_namelist_inline_logic {
   ######################################
   # namelist options for dust emissions
   ######################################
-  setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl);
+  setup_logic_dust_emis($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref);
 
   #################################
   # namelist group: megan_emis_nl #
@@ -2273,7 +2273,7 @@ sub setup_logic_crop_inparm {
      }
      add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "initial_seed_at_planting",
                  'use_crop'=>$nl->get_value('use_crop') );
-     
+
      my $crop_residue_removal_frac = $nl->get_value('crop_residue_removal_frac');
      add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'crop_residue_removal_frac' );
      if ( $crop_residue_removal_frac < 0.0 or $crop_residue_removal_frac > 1.0 ) {
@@ -2614,8 +2614,8 @@ SIMYR:    foreach my $sim_yr ( @sim_years ) {
                 if ( defined($use_init_interp_default) ) {
                    $log->fatal_error($err_msg." but can't find one without $useinitvar being set to true, change it to true in your user_nl_clm file in your case");
                 } else {
-                   my $set = "Relevent settings: use_cndv = ". $nl_flags->{'use_cndv'} . " phys = " . 
-                              $physv->as_string() . " hgrid = " . $nl_flags->{'res'} . " sim_year = " . 
+                   my $set = "Relevent settings: use_cndv = ". $nl_flags->{'use_cndv'} . " phys = " .
+                              $physv->as_string() . " hgrid = " . $nl_flags->{'res'} . " sim_year = " .
                               $settings{'sim_year'} . " lnd_tuning_mode = " . $nl_flags->{'lnd_tuning_mode'} .
                               "use_fates = " . $nl_flags->{'use_fates'};
                    $log->fatal_error($err_msg." but the default setting of $useinitvar is false, so set both $var to a startup file and $useinitvar==TRUE, or developers should modify the namelist_defaults file".$set);
@@ -3158,7 +3158,6 @@ sub setup_logic_supplemental_nitrogen {
       add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
 		  'suplnitro', 'use_fates'=>$nl_flags->{'use_fates'});
   }
-  
   #
   # Error checking for suplnitro
   #
@@ -3683,10 +3682,10 @@ sub setup_logic_nitrogen_deposition {
                 'use_cn'=>$nl_flags->{'use_cn'}, 'hgrid'=>$nl_flags->{'res'},
                 'clm_accelerated_spinup'=>$nl_flags->{'clm_accelerated_spinup'} );
     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'ndep_taxmode', 'phys'=>$nl_flags->{'phys'},
-		'use_cn'=>$nl_flags->{'use_cn'}, 
+		'use_cn'=>$nl_flags->{'use_cn'},
 		'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'} );
     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'ndep_varlist', 'phys'=>$nl_flags->{'phys'},
-		'use_cn'=>$nl_flags->{'use_cn'}, 
+		'use_cn'=>$nl_flags->{'use_cn'},
 		'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'} );
     add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_first_ndep', 'phys'=>$nl_flags->{'phys'},
                 'use_cn'=>$nl_flags->{'use_cn'}, 'sim_year'=>$nl_flags->{'sim_year'},
@@ -3990,51 +3989,64 @@ sub setup_logic_fire_emis {
 
 sub setup_logic_dust_emis {
   # Logic to handle the dust emissions namelists, both drv_flds_in and lnd_in files
-  my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
+  my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_;
 
-  # First get the dust emission method
-  my $var = "dust_emis_method";
-  add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var );
-
-  my $dust_emis_method = remove_leading_and_trailing_quotes( $nl->get_value($var) );
-
-  my @zender_files_in_lnd_opts = ( "stream_fldfilename_zendersoilerod", "stream_meshfile_zendersoilerod",
-                                   "zendersoilerod_mapalgo" );
-  if ( $dust_emis_method eq "Zender_2003" ) {
-     # get the zender_soil_erod_source
-     add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
-                 "zender_soil_erod_source", 'dust_emis_method'=>$dust_emis_method );
-
-     my $zender_source = remove_leading_and_trailing_quotes( $nl->get_value('zender_soil_erod_source') );
-     if ( $zender_source eq "lnd" ) {
-        foreach my $option ( @zender_files_in_lnd_opts ) {
-           add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $option,
-                       'dust_emis_method'=>$dust_emis_method, 'zender_soil_erod_source'=>$zender_source,
-                       'hgrid'=>$nl_flags->{'res'}, 'lnd_tuning_mod'=>$nl_flags->{'lnd_tuning_mode'} );
-        }
-     } elsif ( $zender_source eq "atm" ) {
-        foreach my $option ( @zender_files_in_lnd_opts ) {
-           if ( defined($nl->get_value($option)) ) {
-             $log->fatal_error("zender_soil_erod_source is atm, and the file option $option is being set" .
-                               " which should NOT be unless you want it handled here in the LAND model, " .
-                               "otherwise the equivalent option is set in CAM" );
-           }
-        }
-     } elsif ( $zender_source eq "none" ) {
-        $log->fatal_error("zender_soil_erod_source is set to none and only atm or lnd should be used when $var is Zender_2002" );
-     }
+  # Only set dust emission settings -- if not connected to CAM
+  my $lnd_sets_dust = logical_to_fortran($envxml_ref->{'LND_SETS_DUST_EMIS_DRV_FLDS'});
+  if ( &value_is_true( $lnd_sets_dust)) {
+
+      # First get the dust emission method
+      my $var = "dust_emis_method";
+      add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var );
+      my $dust_emis_method = remove_leading_and_trailing_quotes( $nl->get_value($var) );
+
+      my @zender_files_in_lnd_opts = ( "stream_fldfilename_zendersoilerod", "stream_meshfile_zendersoilerod",
+                                       "zendersoilerod_mapalgo" );
+      if ( $dust_emis_method eq "Zender_2003" ) {
+         # get the zender_soil_erod_source
+         add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
+                     "zender_soil_erod_source", 'dust_emis_method'=>$dust_emis_method );
+
+         my $zender_source = remove_leading_and_trailing_quotes( $nl->get_value('zender_soil_erod_source') );
+         if ( $zender_source eq "lnd" ) {
+            foreach my $option ( @zender_files_in_lnd_opts ) {
+               add_default($opts,  $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $option,
+                           'dust_emis_method'=>$dust_emis_method, 'zender_soil_erod_source'=>$zender_source,
+                           'hgrid'=>$nl_flags->{'res'}, 'lnd_tuning_mod'=>$nl_flags->{'lnd_tuning_mode'} );
+            }
+         } elsif ( $zender_source eq "atm" ) {
+            foreach my $option ( @zender_files_in_lnd_opts ) {
+               if ( defined($nl->get_value($option)) ) {
+                  $log->fatal_error("zender_soil_erod_source is atm, and the file option $option is being set" .
+                                    " which should NOT be unless you want it handled here in the LAND model, " .
+                                    "otherwise the equivalent option is set in CAM" );
+               }
+            }
+         } elsif ( $zender_source eq "none" ) {
+            $log->fatal_error("zender_soil_erod_source is set to none and only atm or lnd should be used when $var is Zender_2002" );
+         }
+      } else {
+         # Verify that NONE of the Zender options are being set if Zender is NOT being used
+         push @zender_files_in_lnd_opts, "zender_soil_erod_source";
+         foreach my $option ( @zender_files_in_lnd_opts ) {
+            if ( defined($nl->get_value($option)) ) {
+               $log->fatal_error("dust_emis_method is NOT set to Zender_2003, but one of it's options " .
+                                 "$option is being set, need to change one or the other" );
+            }
+         }
+         if ( $dust_emis_method eq "Leung_2023" ) {
+            $log->warning("dust_emis_method is Leung_2023 and that option has NOT been brought into CTSM yet");
+         }
+      }
+  # Otherwise make sure dust settings are NOT being set in CLM
   } else {
-     # Verify that NONE of the Zender options are being set if Zender is NOT being used
-     push @zender_files_in_lnd_opts, "zender_soil_erod_source";
-     foreach my $option ( @zender_files_in_lnd_opts ) {
-        if ( defined($nl->get_value($option)) ) {
-          $log->fatal_error("dust_emis_method is NOT set to Zender_2003, but one of it's options " .
-                            "$option is being set, need to change one or the other" );
-        }
-     }
-     if ( $dust_emis_method eq "Leung_2023" ) {
-        $log->warning("dust_emis_method is Leung_2023 and that option has NOT been brought into CTSM yet");
-     }
+      my @vars = ( "dust_emis_method", "zender_soil_erod_source" );
+      foreach my $option ( @vars ) {
+         if ( defined($nl->get_value($option)) ) {
+            $log->fatal_error("Dust emission variable is being set in CTSM, which should NOT be done when" .
+                              " connected to CAM as CAM should set them");
+         }
+      }
   }
 }
 
@@ -4528,8 +4540,8 @@ sub setup_logic_fates {
         my $suplnitro = $nl->get_value('suplnitro');
         my $parteh_mode = $nl->get_value('fates_parteh_mode');
         if ( ($parteh_mode == 1) &&  ($suplnitro !~ /ALL/) && not &value_is_true( $nl_flags->{'use_fates_sp'}) ) {
-          $log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " . 
-                            "but and FATES-SP is not active, but fates_parteh_mode is 1, so Nitrogen is not active" . 
+          $log->fatal_error("supplemental Nitrogen (suplnitro) is NOT set to ALL, FATES is on, " .
+                            "but and FATES-SP is not active, but fates_parteh_mode is 1, so Nitrogen is not active" .
                             "Change suplnitro back to ALL");
         }
         #
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 30110d92f7..d017997c6a 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 2515;
+my $ntests = 2516;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 1545;
@@ -500,447 +500,358 @@ sub cat_and_create_namelistinfile {
 my %failtest = (
      "coldstart but with IC file"=>{ options=>"-clm_start_type cold -envxml_dir .",
                                      namelst=>"finidat='$finidat'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "clm_demand on finidat"     =>{ options=>"-clm_demand finidat -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "blank IC file, not cold"   =>{ options=>"-clm_start_type startup -envxml_dir .",
                                      namelst=>"finidat=' '",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "startup without interp"    =>{ options=>"-clm_start_type startup -envxml_dir . -bgc sp -sim_year 1850",
                                      namelst=>"use_init_interp=.false., start_ymd=19200901",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "use_crop without -crop"    =>{ options=>" -envxml_dir .",
                                      namelst=>"use_crop=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "soilm_stream off w file"      =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_soil_moisture_streams = .false.,stream_fldfilename_soilm='file_provided_when_off'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "exice_stream off w file"  =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_excess_ice=.true., use_excess_ice_streams = .false.,stream_fldfilename_exice='file_provided_when_off'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "exice_stream off w mesh"  =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_excess_ice=.true., use_excess_ice_streams = .false.,stream_meshfile_exice='file_provided_when_off'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "exice off, but stream on"  =>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_excess_ice=.false., use_excess_ice_streams = .true.,stream_fldfilename_exice='file_provided', stream_meshfile_exice='file_provided'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "exice stream off, but setmap"=>{ options=>"-res 0.9x1.25 -envxml_dir .",
                                      namelst=>"use_excess_ice=.true., use_excess_ice_streams = .false.,stream_mapalgo_exice='bilinear'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "exice stream on, but mct"    =>{ options=>"--res 0.9x1.25 --envxml_dir . --driver mct --lnd_frac $DOMFILE ",
                                      namelst=>"use_excess_ice=.true., use_excess_ice_streams=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "clm50CNDVwtransient"       =>{ options=>" -envxml_dir . -use_case 20thC_transient -dynamic_vegetation -res 10x15 -ignore_warnings",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "decomp_without_cn"         =>{ options=>" -envxml_dir . -bgc sp",
                                      namelst=>"soil_decomp_method='CENTURYKoven2013'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "bgc_with_no_decomp"        =>{ options=>" -envxml_dir . -bgc bgc",
                                      namelst=>"soil_decomp_method='None'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "reseed without CN"         =>{ options=>" -envxml_dir . -bgc sp",
                                      namelst=>"reseed_dead_plants=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "onset_threh w SP"          =>{ options=>" -envxml_dir . -bgc sp",
                                      namelst=>"onset_thresh_depends_on_veg=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "dribble_crphrv w/o CN"     =>{ options=>" -envxml_dir . -bgc sp",
                                      namelst=>"dribble_crophrv_xsmrpool_2atm=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "dribble_crphrv w/o crop"   =>{ options=>" -envxml_dir . -bgc bgc -no-crop",
                                      namelst=>"dribble_crophrv_xsmrpool_2atm=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "CNDV with flanduse_timeseries - clm4_5"=>{ options=>"-bgc bgc -dynamic_vegetation -envxml_dir . -ignore_warnings",
                                      namelst=>"flanduse_timeseries='my_flanduse_timeseries_file.nc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "use_cndv=T without bldnml op"=>{ options=>"-bgc bgc -envxml_dir . -ignore_warnings",
                                      namelst=>"use_cndv=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "use_cndv=F with dyn_veg op"=>{ options=>"-bgc bgc -dynamic_vegetation -envxml_dir . -ignore_warnings",
                                      namelst=>"use_cndv=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "crop with use_crop false"  =>{ options=>"-crop -bgc bgc -envxml_dir .",
                                      namelst=>"use_crop=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "crop without CN"           =>{ options=>"-crop -bgc sp -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "toosmall soil w trans"     =>{ options=>"-envxml_dir .",
                                      namelst=>"toosmall_soil=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "toosmall lake w trans"     =>{ options=>"-envxml_dir .",
                                      namelst=>"toosmall_lake=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "toosmall crop w trans"     =>{ options=>"-bgc bgc -crop -envxml_dir .",
                                      namelst=>"toosmall_crop=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "toosmall wetl w trans"     =>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"toosmall_wetland=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "toosmall glc  w trans"     =>{ options=>"-bgc sp  -envxml_dir .",
                                      namelst=>"toosmall_glacier=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "toosmall urban w trans"    =>{ options=>"-bgc sp  -envxml_dir .",
                                      namelst=>"toosmall_urban=10, dyn_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "collapse_urban w trans"    =>{ options=>"-bgc sp  -envxml_dir .",
                                      namelst=>"collapse_urban=T, dyn_transient_crops=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "n_dom_landunits w trans"    =>{ options=>"-bgc sp  -envxml_dir .",
                                      namelst=>"n_dom_landunits=2, dyn_transient_crops=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "n_dom_pfts w trans"         =>{ options=>"-bgc sp  -envxml_dir .",
                                      namelst=>"n_dom_pfts=2, dyn_transient_crops=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "baset_map without crop"    =>{ options=>"-bgc bgc -envxml_dir . -no-crop",
                                      namelst=>"baset_mapping='constant'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "mapvary var w/o varymap"   =>{ options=>"-crop -bgc bgc -envxml_dir . -crop",
                                      namelst=>"baset_mapping='constant', baset_latvary_slope=1.0, baset_latvary_intercept=10.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "grainproductWOcrop"       =>{ options=>"-bgc bgc -no-crop -envxml_dir .",
                                     namelst=>"use_grainproduct=.true.",
-                                    GLC_TWO_WAY_COUPLING=>"FALSE",
                                     phys=>"clm4_5",
                                    },
      "interp without finidat"    =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_init_interp=.true. finidat=' '",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "sp and c13"                =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_c13=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "sp and c14"                =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_c14=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "bombspike no c14"          =>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"use_c14=.false. use_c14_bombspike=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "use c13 timeseries no cn"  =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_c13_timeseries=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "use c13 timeseries no c13"=>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"use_c13=.false. use_c13_timeseries=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "bombspike no cn"           =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_c14_bombspike=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightres no cn"            =>{ options=>"-bgc sp -envxml_dir . -light_res 360x720",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "NEONlightresButGlobal"     =>{ options=>"--res 4x5 --bgc bgc --envxml_dir . --light_res 106x740",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "spno-fire"                 =>{ options=>"-bgc sp -envxml_dir . -use_case 2000_control",
                                      namelst=>"fire_method='nofire'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightres no fire"          =>{ options=>"-bgc bgc -envxml_dir . -light_res 360x720",
                                      namelst=>"fire_method='nofire'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightres none bgc"         =>{ options=>"-bgc bgc -envxml_dir . -light_res none",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightresnotnone-nofire"    =>{ options=>"-bgc bgc -envxml_dir . -light_res 94x192",
                                      namelst=>"fire_method='nofire'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightresnonenofirelightfil"=>{ options=>"-bgc bgc -envxml_dir . -light_res none",
                                      namelst=>"fire_method='nofire',stream_fldfilename_lightng='build-namelist_test.pl'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lightrescontradictlightfil"=>{ options=>"-bgc bgc -envxml_dir . -light_res 360x720",
                                      namelst=>"stream_fldfilename_lightng='build-namelist_test.pl'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "finundated and not methane"=>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"use_lch4=.false.,finundation_method='h2osfc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "use_cn=true bgc=sp"        =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"use_cn=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "freeliv wo fun"            =>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"freelivfix_intercept=9.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "use_cn=false bgc=bgc"      =>{ options=>"-bgc bgc -envxml_dir .",
                                      namelst=>"use_cn=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "lower=aqu-45 with/o Zeng"  =>{ options=>"-envxml_dir .",
                                      namelst=>"lower_boundary_condition=4,soilwater_movement_method=1,use_bedrock=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "Zeng w lower=flux"         =>{ options=>"-envxml_dir .",
                                      namelst=>"lower_boundary_condition=1,soilwater_movement_method=0,use_bedrock=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "Zeng w lower=zeroflux"     =>{ options=>"-envxml_dir .",
                                      namelst=>"lower_boundary_condition=2,soilwater_movement_method=0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "Zeng w lower=table"        =>{ options=>"-envxml_dir .",
                                      namelst=>"lower_boundary_condition=3,soilwater_movement_method=0,use_bedrock=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "use_vic=F with -vic op"    =>{ options=>"-vichydro -envxml_dir .",
                                      namelst=>"use_vichydro=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "-vic with l_bnd=flux"      =>{ options=>"-vichydro -envxml_dir .",
                                      namelst=>"lower_boundary_condition=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "-vic with l_bnd=zeroflux"  =>{ options=>"-vichydro -envxml_dir .",
                                      namelst=>"lower_boundary_condition=2",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "bedrock with l_bnc=flux"   =>{ options=>"-envxml_dir .",
                                      namelst=>"use_bedrock=.true., lower_boundary_condition=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "bedrock with l_bnc=tabl"   =>{ options=>"-envxml_dir .",
                                      namelst=>"use_bedrock=.true., lower_boundary_condition=3",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "bedrock with l_bnc=aqui"   =>{ options=>"-envxml_dir .",
                                      namelst=>"use_bedrock=.true., lower_boundary_condition=4",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "zengdeck with l_bnc=flux"  =>{ options=>"-envxml_dir .",
                                      namelst=>"soilwater_movement_method=0, lower_boundary_condition=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "zengdeck with l_bnc=z-flux"=>{ options=>"-envxml_dir .",
                                      namelst=>"soilwater_movement_method=0, lower_boundary_condition=2",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "zengdeck with l_bnc=tabl"  =>{ options=>"-envxml_dir .",
                                      namelst=>"soilwater_movement_method=0, lower_boundary_condition=3",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "l_bnd=tabl with h2osfcfl=0"=>{ options=>"-envxml_dir .",
                                      namelst=>"h2osfcflag=0, lower_boundary_condition=3",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "l_bnd=flux with h2osfcfl=0"=>{ options=>"-envxml_dir .",
                                      namelst=>"h2osfcflag=0, lower_boundary_condition=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "l_bnd=zflux with h2osfcfl=0"=>{ options=>"-envxml_dir .",
                                      namelst=>"h2osfcflag=0, lower_boundary_condition=2",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "h2osfcfl=0 with clm5.0"    =>{ options=>"-envxml_dir .",
                                      namelst=>"h2osfcflag=0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "45bad lnd_tuning_mode value" =>{ options=>"-lnd_tuning_mode clm5_0_GSWP3  -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "50bad lnd_tuning_mode value" =>{ options=>"-lnd_tuning_mode clm4_5_CRUNCEP  -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "bgc_spinup without cn"     =>{ options=>"-clm_accelerated_spinup on -bgc sp -envxml_dir .",
                                      namelst=>"spinup_state=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "spinup=1 without bldnml op"=>{ options=>"-clm_accelerated_spinup off -bgc bgc -envxml_dir .",
                                      namelst=>"spinup_state=1",,
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "bgc_spinup without cn"     =>{ options=>"-clm_accelerated_spinup on -bgc sp -envxml_dir .",
                                      namelst=>"spinup_state=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "baseflow w aquifer"        =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"baseflow_scalar=1.0, lower_boundary_condition=4,use_bedrock=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "baseflow w table"          =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"baseflow_scalar=1.0, lower_boundary_condition=3,use_bedrock=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "br_root and bgc=sp"        =>{ options=>"-bgc sp -envxml_dir .",
                                      namelst=>"br_root=1.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "both co2_type and on nml"  =>{ options=>"-co2_type constant -envxml_dir .",
                                      namelst=>"co2_type='prognostic'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "both lnd_frac and on nml"  =>{ options=>"-driver mct -lnd_frac $DOMFILE -envxml_dir .",
                                      namelst=>"fatmlndfrc='frac.nc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lnd_frac set to UNSET"     =>{ options=>"-driver mct -lnd_frac UNSET -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "lnd_frac set but nuopc"    =>{ options=>"-driver nuopc -lnd_frac $DOMFILE -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "lnd_frac not set but lilac"=>{ options=>"-driver nuopc -lilac -envxml_dir . -lnd_frac UNSET",
                                      namelst=>"fsurdat='surfdata.nc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "fatmlndfrc set but nuopc"  =>{ options=>"-driver nuopc -envxml_dir .",
                                      namelst=>"fatmlndfrc='frac.nc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "force_send but not nuopc"  =>{ options=>"-driver mct -lnd_frac $DOMFILE -envxml_dir .",
                                      namelst=>"force_send_to_atm = .false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "branch but NO nrevsn"      =>{ options=>"-clm_start_type branch -envxml_dir .",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "glc_nec inconsistent"      =>{ options=>"-envxml_dir .",
                                      namelst=>"maxpatch_glc=5",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "NoGLCMec"                  =>{ options=>"-envxml_dir . -glc_nec 0",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "UpdateGlcContradict"       =>{ options=>"-envxml_dir .",
@@ -950,321 +861,263 @@ sub cat_and_create_namelistinfile {
                                    },
      "useFATESContradict"        =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useFATESContradict2"       =>{ options=>"-envxml_dir . -no-megan",
                                      namelst=>"use_fates=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useFATESWCN"               =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_cn=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useFATESWcrop"             =>{ options=>"-bgc fates -envxml_dir . -no-megan -crop",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "useFATESWcreatecrop"       =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"create_crop_landunit=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useFATESWn_dom_pft"        =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"n_dom_pfts = 1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useFATESWbMH"              =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_biomass_heat_storage=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "FireNoneButFATESfireon"    =>{ options=>"-bgc fates -envxml_dir . -no-megan -light_res none",
                                      namelst=>"fates_spitfire_mode=4",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "FATESwspitfireOffLigtOn"    =>{ options=>"-bgc fates -envxml_dir . -no-megan -light_res 360x720",
                                      namelst=>"fates_spitfire_mode=0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "useFATESWluna"             =>{ options=>"--bgc fates --envxml_dir . --no-megan",
                                      namelst=>"use_luna=TRUE",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "useFATESWfun"              =>{ options=>"--bgc fates --envxml_dir . --no-megan",
                                      namelst=>"use_fun=TRUE",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "useFATESWOsuplnitro"       =>{ options=>"--bgc fates --envxml_dir . --no-megan",
                                      namelst=>"suplnitro='NONE'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "FireNoneButBGCfireon"    =>{ options=>"-bgc bgc -envxml_dir . -light_res none",
                                      namelst=>"fire_method='li2021gswpfrc'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm6_0",
                                    },
      "createcropFalse"           =>{ options=>"-bgc bgc -envxml_dir . -no-megan",
                                      namelst=>"create_crop_landunit=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "usespitfireButNOTFATES"    =>{ options=>"-envxml_dir . -no-megan",
                                      namelst=>"fates_spitfire_mode=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "usespitfireusefatessp"    =>{ options=>"-envxml_dir . --bgc fates",
                                      namelst=>"fates_spitfire_mode=1,use_fates_sp=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "usefatesspusefateshydro"   =>{ options=>"-envxml_dir . --bgc fates",
                                      namelst=>"use_fates_sp=.true.,use_fates_planthydro=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useloggingButNOTFATES"     =>{ options=>"-envxml_dir . -no-megan",
                                      namelst=>"use_fates_logging=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useinventorybutnotfile"    =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates_inventory_init=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "inventoryfileDNE"          =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates_inventory_init=.true., fates_inventory_ctrl_filename='zztop'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useinventorybutnotfile"    =>{ options=>"--res 0.9x1.25 --bgc fates --envxml_dir . --no-megan",
                                      namelst=>"use_fates_luh=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "inventoryfileDNE"          =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates_luh=.true., fluh_timeseries='zztop'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useMEGANwithFATES"         =>{ options=>"-bgc fates -envxml_dir . -megan",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useFIREEMISwithFATES"      =>{ options=>"-bgc fates -envxml_dir . -fire_emis --no-megan",
                                     namelst=>"",
-                                    GLC_TWO_WAY_COUPLING=>"FALSE",
                                     phys=>"clm4_5",
                                  },
      "useDRYDEPwithFATES"        =>{ options=>"--bgc fates --envxml_dir . --no-megan --drydep",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm4_5",
                                    },
      "useFATESSPWONOCOMP"        =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates_sp=T,use_fates_nocomp=F",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useFATESTRANSWdynPFT"      =>{ options=>"-bgc fates -envxml_dir . -use_case 20thC_transient -no-megan",
                                      namelst=>"do_transient_pfts=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useHYDSTwithFATES"         =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_hydrstress=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "useHYDSTwithdynroot"       =>{ options=>"-bgc bgc -envxml_dir . -megan",
                                      namelst=>"use_hydrstress=.true., use_dynroot=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "specWOfireemis"            =>{ options=>"-envxml_dir . -no-fire_emis",
                                      namelst=>"fire_emis_specifier='bc_a1 = BC'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "elevWOfireemis"            =>{ options=>"-envxml_dir . -no-fire_emis",
                                      namelst=>"fire_emis_elevated=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "noanthro_w_crop"            =>{ options=>"-envxml_dir . -res 0.9x1.25 -bgc bgc -crop -use_case 1850_noanthro_control",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "noanthro_w_irrig"           =>{ options=>"-envxml_dir . -res 0.9x1.25 -bgc bgc -use_case 1850_noanthro_control",
                                      namelst=>"irrigate=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "spdotransconflict"          =>{ options=>"-envxml_dir . -bgc sp -use_case 20thC_transient",
                                      namelst=>"do_transient_pfts=T,do_transient_crops=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "dogrossandsp"               =>{ options=>"--envxml_dir . --bgc sp --use_case 20thC_transient",
                                      namelst=>"do_grossunrep=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "dogrossandfates"            =>{ options=>"--envxml_dir . --bgc fates --use_case 20thC_transient --no-megan",
                                      namelst=>"do_grossunrep=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "dogrossandnottrans"         =>{ options=>"--envxml_dir . --bgc bgc --use_case 2000_control",
                                      namelst=>"do_grossunrep=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "nocropwfert"                =>{ options=>"-envxml_dir . -bgc sp -no-crop",
                                      namelst=>"use_fertilizer=T",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lmr1WOcn"                   =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"leafresp_method=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lmr2WOcn"                   =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"leafresp_method=2",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lmr0Wcn"                    =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"leafresp_method=0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "nofireButSetcli_scale"     =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"fire_method='nofire', cli_scale=5.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "nocnButSetrh_low"          =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"rh_low=5.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "funWOcn"                   =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"use_fun=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "flexCNWOcn"                =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"use_flexibleCN=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "flexCNFUNwcarbonresp"      =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"use_flexibleCN=.true.,use_FUN=.true.,carbon_resp_opt=1",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "funWOnitrif"               =>{ options=>"-envxml_dir .",
                                      namelst=>"use_fun=.true., use_nitrif_denitrif=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "SPModeWNitrifNMethane"     =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"use_lch4=.true., use_nitrif_denitrif=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "knitrmaxWOnitrif"          =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"use_nitrif_denitrif=.false., k_nitr_max=1.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "respcoefWOnitrif"          =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"use_nitrif_denitrif=.false., denitrif_respiration_coefficient=1.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "respexpWOnitrif"           =>{ options=>"-envxml_dir . -bgc bgc",
                                      namelst=>"use_nitrif_denitrif=.false., denitrif_respiration_exponent=1.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "lunaWSPandlnctrue"         =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"use_luna=.true., lnc_opt=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "NOlunabutsetJmaxb1"        =>{ options=>"-envxml_dir . -bgc sp",
                                      namelst=>"use_luna=.false., jmaxb1=1.0",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "envxml_not_dir"            =>{ options=>"-envxml_dir myuser_nl_clm",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "envxml_emptydir"           =>{ options=>"-envxml_dir xFail",
                                      namelst=>"",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                    },
      "fates_non_sp_laistreams"   =>{ options=>"--envxml_dir . --bgc fates",
                                      namelst=>"use_lai_streams=.true., use_fates_sp=.false.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                      },
      "bgc_non_sp_laistreams"     =>{ options=>"--envxml_dir . -bgc bgc",
                                      namelst=>"use_lai_streams=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                      },
      "bgc_laistreams_input"     =>{ options=>"--envxml_dir . --bgc bgc",
                                      namelst=>"stream_year_first_lai=1999",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                      },
      "crop_laistreams_input"     =>{ options=>"--envxml_dir . --bgc sp --crop",
                                      namelst=>"use_lai_streams=.true.",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_0",
                                      },
      "soil_erod_wo_Zender"      =>{ options=>"--envxml_dir . --ignore_warnings",
                                      namelst=>"dust_emis_method='Leung_2023', " .
                                      "stream_meshfile_zendersoilerod = '/dev/null'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },
      "soil_erod_wo_lnd_source"  =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "stream_fldfilename_zendersoilerod = '/dev/null', zender_soil_erod_source='atm'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },
      "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "zender_soil_erod_source='none'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },
      "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "zender_soil_erod_source='zztop'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
+                                     phys=>"clm5_1",
+                                     },
+     "Set_Dust_When_CAM_Sets"   =>{ options=>"--envxml_dir .",
+                                     namelst=>"dust_emis_method='Zender_2003'",
+                                     LND_SETS_DUST_EMIS_DRV_FLDS=>"FALSE",
                                      phys=>"clm5_1",
                                      },
                );
@@ -1273,7 +1126,13 @@ sub cat_and_create_namelistinfile {
    &make_config_cache($failtest{$key}{"phys"});
    my $options  = $failtest{$key}{"options"};
    my $namelist = $failtest{$key}{"namelst"};
-   &make_env_run( GLC_TWO_WAY_COUPLING=>$failtest{$key}{"GLC_TWO_WAY_COUPLING"} );
+   my %settings;
+   foreach my $xmlvar ( "GLC_TWO_WAY_COUPLING", "LND_SETS_DUST_EMIS_DRV_FLDS") {
+      if ( defined($failtest{$key}{$xmlvar}) ) {
+         $settings{$xmlvar} = $failtest{$key}{$xmlvar};
+      }
+   }
+   &make_env_run( %settings );
    eval{ system( "$bldnml $options -namelist \"&clmexp $namelist /\" > $tempfile 2>&1 " ); };
    isnt( $?, 0, $key );
    system( "cat $tempfile" );
@@ -1515,7 +1374,7 @@ sub cat_and_create_namelistinfile {
 # cases; I'm not sure if it's actually important to test this with all
 # of the different use cases.
 my @glc_res = ( "0.9x1.25", "1.9x2.5" );
-my @use_cases = ( 
+my @use_cases = (
                   "1850-2100_SSP2-4.5_transient",
                   "1850_control",
                   "2000_control",

From cb7376eb55987f0785dd9a857c2fd24a720e6017 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 9 Jul 2024 01:25:57 -0600
Subject: [PATCH 30/47] Remove whitespace at end of lines

---
 src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
index 467d00de59..c811cab5f5 100644
--- a/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
+++ b/src/drv_test/shr_dust_emis_test/test_shr_dust_emis.pf
@@ -59,7 +59,7 @@ contains
     @assertFalse(not_init)
 
   end subroutine check_when_initialized_runs
- 
+
    @Test
   subroutine check_dust_emis(this)
     ! Test that the dust_emis logical functions work as expected
@@ -75,7 +75,6 @@ contains
 
   end subroutine check_dust_emis
 
-   
   @Test
   subroutine check_zender_soil(this)
     ! Test that the dust_emis_Zender logical functions work as expected
@@ -91,7 +90,6 @@ contains
 
   end subroutine check_zender_soil
 
-     
   @Test
   subroutine check_options(this)
     ! Test that the check_options subroutine catches errors that should die
@@ -110,5 +108,5 @@ contains
     @assertExceptionRaised(endrun_msg('(check_options_finish_init) ERROR: zender_soil_erod_source can only be lnd or atm'))
 
   end subroutine check_options
- 
+
 end module test_shr_dust_emis

From 17fb3d8ee57c94c757405b8f77afcf97de5b927f Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 11 Jul 2024 01:27:49 -0600
Subject: [PATCH 31/47] Changes to remove dust_emis namelist items from CTSM
 fortran code and use shr_dust_emis_mod from CMEPS

---
 components/cmeps                               |  2 +-
 src/biogeochem/DustEmisBase.F90                |  1 -
 src/biogeochem/DustEmisFactory.F90             | 14 ++++++--------
 .../DustEmis_test/test_DustEmisZender2003.pf   |  2 ++
 src/cpl/nuopc/lnd_import_export.F90            |  5 +++++
 .../share_esmf/ZenderSoilErodStreamType.F90    | 18 ++++++------------
 src/main/clm_varctl.F90                        |  5 -----
 src/main/controlMod.F90                        |  6 ------
 8 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/components/cmeps b/components/cmeps
index 6384ff4e4a..e1335d32fc 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit 6384ff4e4a6bc82a678f9419a43ffbd5d53ac209
+Subproject commit e1335d32fca0e5571a0d5a7edb0d1473266b7923
diff --git a/src/biogeochem/DustEmisBase.F90 b/src/biogeochem/DustEmisBase.F90
index c5e4260634..47f2f32688 100644
--- a/src/biogeochem/DustEmisBase.F90
+++ b/src/biogeochem/DustEmisBase.F90
@@ -31,7 +31,6 @@ module DustEmisBase
   use LandunitType         , only : lun
   use ColumnType           , only : col
   use PatchType            , only : patch
-  use clm_varctl           , only : dust_emis_method
   !
   ! !PUBLIC TYPES
   implicit none
diff --git a/src/biogeochem/DustEmisFactory.F90 b/src/biogeochem/DustEmisFactory.F90
index 371e77d6dc..24162fde24 100644
--- a/src/biogeochem/DustEmisFactory.F90
+++ b/src/biogeochem/DustEmisFactory.F90
@@ -28,9 +28,9 @@ function create_dust_emissions(bounds, NLFilename) result(dust_emis)
         !---------------------------------------------------------------------------
         use DustEmisBase      , only : dust_emis_base_type
         use DustEmisZender2003, only : dust_emis_zender2003_type
-        use clm_varctl        , only : dust_emis_method
         use decompMod         , only : bounds_type
         use shr_kind_mod      , only : CL => shr_kind_cl
+        use shr_dust_emis_mod , only : is_dust_emis_zender, is_dust_emis_leung
         implicit none
         ! Arguments
         class(dust_emis_base_type), allocatable :: dust_emis
@@ -38,20 +38,18 @@ function create_dust_emissions(bounds, NLFilename) result(dust_emis)
         character(len=*),  intent(in) :: NLFilename
         ! Local variables
 
-        select case ( trim(dust_emis_method) )
-
-        case( "Zender_2003" )
+        if ( is_dust_emis_zender() )then
            allocate(dust_emis, source=dust_emis_zender2003_type() )
         
         ! This will be added when the Leung2023 comes in
-        !case( "Leung_2023" )
+        !else if ( is_dust_emis_leung() )
         !  allocate(dust_emis, source=dust_emis_zender2003_type() )
-        case default
-           write(iulog,*) 'ERROR: unknown dust_emis_method: ', dust_emis_method, &
+        else
+           write(iulog,*) 'ERROR: unknown dust_emis_method: ', &
                            errMsg(sourcefile, __LINE__)
            call endrun( "Unrecognized dust_emis_method"  )
 
-        end select
+        end if
 
         call dust_emis%Init(bounds, NLFilename)
 
diff --git a/src/biogeochem/test/DustEmis_test/test_DustEmisZender2003.pf b/src/biogeochem/test/DustEmis_test/test_DustEmisZender2003.pf
index 8641b8cceb..0289cadabc 100644
--- a/src/biogeochem/test/DustEmis_test/test_DustEmisZender2003.pf
+++ b/src/biogeochem/test/DustEmis_test/test_DustEmisZender2003.pf
@@ -9,6 +9,7 @@ module test_DustEmisZender2003
   use DustEmisZender2003
   use shr_kind_mod , only : r8 => shr_kind_r8
   use DustEmisFactory, only : create_dust_emissions
+  use shr_dust_emis_mod, only : dust_emis_set_options
 
   implicit none
 
@@ -37,6 +38,7 @@ contains
     call this%input%setUp()
  
     ! Create the dust emission object last
+    call dust_emis_set_options( 'Zender_2003', 'atm')
     allocate(this%dust_emis, source = create_dust_emissions(bounds, NLFilename))
   end subroutine setUp
 
diff --git a/src/cpl/nuopc/lnd_import_export.F90 b/src/cpl/nuopc/lnd_import_export.F90
index b9966f81e9..624590b9a6 100644
--- a/src/cpl/nuopc/lnd_import_export.F90
+++ b/src/cpl/nuopc/lnd_import_export.F90
@@ -160,9 +160,11 @@ subroutine advertise_fields(gcomp, flds_scalar_name, glc_present, cism_evolve, r
 
     use shr_carma_mod     , only : shr_carma_readnl
     use shr_ndep_mod      , only : shr_ndep_readnl
+    use shr_dust_emis_mod , only : shr_dust_emis_readnl
     use shr_fire_emis_mod , only : shr_fire_emis_readnl
     use clm_varctl        , only : ndep_from_cpl
     use controlMod        , only : NLFilename
+    use spmdMod           , only : mpicom
 
     ! input/output variables
     type(ESMF_GridComp)            :: gcomp
@@ -237,6 +239,9 @@ subroutine advertise_fields(gcomp, flds_scalar_name, glc_present, cism_evolve, r
 
     ! The following namelist reads should always be called regardless of the send_to_atm value
 
+    ! Dust emissions from land to atmosphere
+    call shr_dust_emis_readnl( mpicom, "drv_flds_in")
+
     ! Dry Deposition velocities from land - ALSO initialize drydep here
     call shr_drydep_readnl("drv_flds_in", drydep_nflds)
 
diff --git a/src/cpl/share_esmf/ZenderSoilErodStreamType.F90 b/src/cpl/share_esmf/ZenderSoilErodStreamType.F90
index 194e022132..32e776063b 100644
--- a/src/cpl/share_esmf/ZenderSoilErodStreamType.F90
+++ b/src/cpl/share_esmf/ZenderSoilErodStreamType.F90
@@ -42,7 +42,6 @@ module ZenderSoilErodStreamType
 
   ! ! PRIVATE DATA:
   type, private :: streamcontrol_type
-     character(len=CL)  :: zender_soil_erod_source             ! if calculed in lnd or atm
      character(len=CL)  :: stream_fldFileName_zendersoilerod   ! data Filename
      character(len=CL)  :: stream_meshfile_zendersoilerod      ! mesh Filename
      character(len=CL)  :: zendersoilerod_mapalgo              ! map algo
@@ -179,7 +178,7 @@ logical function UseStreams(this)
     ! file is being used with it
     !
     ! !USES:
-    use clm_varctl, only : dust_emis_method
+    use shr_dust_emis_mod, only : is_dust_emis_zender, is_zender_soil_erod_from_land
     !
     ! !ARGUMENTS:
     implicit none
@@ -189,7 +188,7 @@ logical function UseStreams(this)
     if ( .not. control%namelist_set )then
        call endrun(msg=' ERROR namelist NOT set before being used'//errMsg(sourcefile, __LINE__))
     end if
-    if ( (trim(dust_emis_method) == 'Zender_2003') .and. (control%zender_soil_erod_source == "lnd") )then
+    if ( is_dust_emis_zender() .and. is_zender_soil_erod_from_land() )then
        UseStreams = .true.
     else
        UseStreams = .false.
@@ -289,6 +288,7 @@ subroutine ReadNML(this, bounds, NLFilename)
    use shr_nl_mod       , only : shr_nl_find_group_name
    use shr_log_mod      , only : errMsg => shr_log_errMsg
    use shr_mpi_mod      , only : shr_mpi_bcast
+   use shr_dust_emis_mod, only : is_zender_soil_erod_from_land
    !
    ! arguments
    implicit none
@@ -304,14 +304,13 @@ subroutine ReadNML(this, bounds, NLFilename)
    character(len=CL)  :: stream_meshfile_zendersoilerod = ' '
    character(len=CL)  :: zendersoilerod_mapalgo = ' '
    character(len=CL)  :: tmp_file_array(3)
-   character(len=3)   :: zender_soil_erod_source = 'atm'
    character(len=*), parameter :: namelist_name = 'zendersoilerod'    ! MUST agree with group name in namelist definition to read.
    character(len=*), parameter :: subName = "('zendersoilerod::ReadNML')"
    !-----------------------------------------------------------------------
 
    namelist /zendersoilerod/ &               ! MUST agree with namelist_name above
         zendersoilerod_mapalgo,  stream_fldFileName_zendersoilerod, &
-        stream_meshfile_zendersoilerod, zender_soil_erod_source
+        stream_meshfile_zendersoilerod
 
    ! Default values for namelist
 
@@ -330,12 +329,11 @@ subroutine ReadNML(this, bounds, NLFilename)
       close(nu_nml)
    endif
 
-   call shr_mpi_bcast(zender_soil_erod_source           , mpicom)
    call shr_mpi_bcast(zendersoilerod_mapalgo            , mpicom)
    call shr_mpi_bcast(stream_fldFileName_zendersoilerod , mpicom)
    call shr_mpi_bcast(stream_meshfile_zendersoilerod    , mpicom)
 
-   if (masterproc .and. (zender_soil_erod_source == "lnd") ) then
+   if (masterproc .and. is_zender_soil_erod_from_land() ) then
       write(iulog,*) ' '
       write(iulog,*) namelist_name, ' stream settings:'
       write(iulog,*) '  stream_fldFileName_zendersoilerod = ',stream_fldFileName_zendersoilerod
@@ -343,13 +341,10 @@ subroutine ReadNML(this, bounds, NLFilename)
       write(iulog,*) '  zendersoilerod_mapalgo            = ',zendersoilerod_mapalgo
    endif
 
-   if ( (trim(zender_soil_erod_source) /= 'atm') .and. (trim(zender_soil_erod_source) /= 'lnd')  )then
-      call endrun(msg=' ERROR zender_soil_erod_source must be either lnd or atm and is NOT'//errMsg(sourcefile, __LINE__))
-   end if
    tmp_file_array(1) = stream_fldFileName_zendersoilerod
    tmp_file_array(2) = stream_meshfile_zendersoilerod
    tmp_file_array(3) = zendersoilerod_mapalgo
-   if ( trim(zender_soil_erod_source) == 'lnd' )then
+   if ( is_zender_soil_erod_from_land() ) then
       do i = 1, size(tmp_file_array)
          if ( len_trim(tmp_file_array(i)) == 0 )then
             call endrun(msg=' ERROR '//trim(tmp_file_array(i))//' must be set when Zender_2003 is being used and zender_soil_erod_source is lnd'//errMsg(sourcefile, __LINE__))
@@ -365,7 +360,6 @@ subroutine ReadNML(this, bounds, NLFilename)
    this%stream_fldFileName_zendersoilerod = stream_fldFileName_zendersoilerod
    this%stream_meshfile_zendersoilerod    = stream_meshfile_zendersoilerod
    this%zendersoilerod_mapalgo            = zendersoilerod_mapalgo
-   this%zender_soil_erod_source           = zender_soil_erod_source
 
    this%namelist_set = .true.
 
diff --git a/src/main/clm_varctl.F90 b/src/main/clm_varctl.F90
index cbfcbfd8ea..97c818af94 100644
--- a/src/main/clm_varctl.F90
+++ b/src/main/clm_varctl.F90
@@ -276,11 +276,6 @@ module clm_varctl
   ! option to activate OC in snow in SNICAR
   logical, public :: do_sno_oc = .false.  ! control to include organic carbon (OC) in snow
 
-  !----------------------------------------------------------
-  ! DUST emission method
-  !----------------------------------------------------------
-  character(len=25), public :: dust_emis_method = 'Zender_2003'  ! Dust emisison method to use: Zender_2003 or Leung_2023
-
   !----------------------------------------------------------
   ! C isotopes
   !----------------------------------------------------------
diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90
index 4773cc6921..c92732806c 100644
--- a/src/main/controlMod.F90
+++ b/src/main/controlMod.F90
@@ -207,12 +207,6 @@ subroutine control_init(dtime)
          for_testing_no_crop_seed_replenishment, &
          z0param_method, use_z0m_snowmelt
 
-    ! NOTE: EBK 02/26/2024: dust_emis_method is here in CTSM temporarily until it's moved to CMEPS
-    ! See: https://github.com/ESCOMP/CMEPS/pull/429
-    ! Normally this should also need error checking and a broadcast, but since
-    ! there is only one hardcoded option right now that is unneeded.
-    namelist /clm_inparm/ dust_emis_method
-
     ! vertical soil mixing variables
     namelist /clm_inparm/  &
          som_adv_flux, max_depth_cryoturb

From 7dd9af0195592c2a2d9c49fc6767f53ea1bff128 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 11 Jul 2024 02:48:19 -0600
Subject: [PATCH 32/47] Update test number

---
 bld/unit_testers/build-namelist_test.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index a24b308620..cf5aedef9b 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3259;
+my $ntests = 3256;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 2001;

From 976347ddcd0e158a54483b72f7a48d8825c96f37 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 11 Jul 2024 13:16:32 -0600
Subject: [PATCH 33/47] Update cmeps and ccs_config to versions used in #2590
 which allows cases to build

---
 .gitmodules | 4 ++--
 ccs_config  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b48068c9f6..ee06997ce5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm0.0.106
+fxtag = ccs_config_cesm1.0.0
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
@@ -50,7 +50,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps0.14.73
+fxtag = cmeps0.14.77
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
diff --git a/ccs_config b/ccs_config
index 2ff978f92a..69a958581e 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit 2ff978f92a5ac9a6ab243e5c14d06a7e2d2f5799
+Subproject commit 69a958581ecd2d32ee9cb1c38bcd3847b8b920bf

From 170b3a518701e7fb0494423bcc9ef11d90e87f62 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 11 Jul 2024 13:17:21 -0600
Subject: [PATCH 34/47] Update cmeps and ccs_config to versions used in #2590
 which allows cases to build

---
 components/cmeps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/cmeps b/components/cmeps
index e1335d32fc..47fb4e633a 160000
--- a/components/cmeps
+++ b/components/cmeps
@@ -1 +1 @@
-Subproject commit e1335d32fca0e5571a0d5a7edb0d1473266b7923
+Subproject commit 47fb4e633a76ec6d60969b1af751f90790387246

From ba28bea5ca49e44e48d3739647baae04915d805f Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Thu, 11 Jul 2024 13:20:10 -0600
Subject: [PATCH 35/47] Update number of tests and comment out the whole values
 section as it fails without at least one thing set

---
 bld/unit_testers/build-namelist_test.pl | 2 +-
 cime_config/config_component.xml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index cf5aedef9b..5abb381c16 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -166,7 +166,7 @@ sub cat_and_create_namelistinfile {
 my $ntests = 3256;
 
 if ( defined($opts{'compare'}) ) {
-   $ntests += 2001;
+   $ntests += 1965;
 }
 plan( tests=>$ntests );
 
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 01990e162f..7500668905 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -166,11 +166,11 @@
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
     <default_value>TRUE</default_value>
+    <!-- Until CAM sets dust settings in drv_flds_in this should only be TRUE
     <values>
-      <!-- Until CAM sets dust settings in drv_flds_in this should only be TRUE
       <value compset="CAM"  >FALSE</value>
-      -->
     </values>
+    -->
     <group>run_component_cpl</group>
     <file>env_run.xml</file>
     <desc>If CTSM will set the dust settings in drv_flds_in (TRUE), or if ATM (i.e. CAM) will - DO NOT EDIT (set by compset name)</desc>

From 5686defdd31c03cdba0bcc247e3d590a0069d9d4 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <ekluzek@users.noreply.github.com>
Date: Mon, 15 Jul 2024 11:40:38 -0600
Subject: [PATCH 36/47] Update bld/unit_testers/build-namelist_test.pl

Syntax of breaking up into two lines was confusing, so just making a longer line that is more clear.
---
 bld/unit_testers/build-namelist_test.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 5abb381c16..a22cdd4059 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -1095,8 +1095,7 @@ sub cat_and_create_namelistinfile {
                                      phys=>"clm5_1",
                                      },
      "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "zender_soil_erod_source='none'",
+                                     namelst=>"dust_emis_method='Zender_2003', zender_soil_erod_source='none'",
                                      GLC_TWO_WAY_COUPLING=>"FALSE",
                                      phys=>"clm5_1",
                                      },

From 7dbc538216ed01ed92dd656b7133238e0bad8ea6 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 15 Jul 2024 15:08:44 -0600
Subject: [PATCH 37/47] Remove duplicated tests, and new dust tests with clm6_0

---
 bld/unit_testers/build-namelist_test.pl | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 5abb381c16..0b26e86476 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -1072,39 +1072,27 @@ sub cat_and_create_namelistinfile {
      "soil_erod_wo_Zender"      =>{ options=>"--envxml_dir . --ignore_warnings",
                                      namelst=>"dust_emis_method='Leung_2023', " .
                                      "stream_meshfile_zendersoilerod = '/dev/null'",
-                                     phys=>"clm5_1",
+                                     phys=>"clm6_0",
                                      },
      "soil_erod_wo_lnd_source"  =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "stream_fldfilename_zendersoilerod = '/dev/null', zender_soil_erod_source='atm'",
-                                     phys=>"clm5_1",
+                                     phys=>"clm6_0",
                                      },
      "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "zender_soil_erod_source='none'",
-                                     phys=>"clm5_1",
+                                     phys=>"clm6_0",
                                      },
      "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003', " .
                                      "zender_soil_erod_source='zztop'",
-                                     phys=>"clm5_1",
+                                     phys=>"clm6_0",
                                      },
      "Set_Dust_When_CAM_Sets"   =>{ options=>"--envxml_dir .",
                                      namelst=>"dust_emis_method='Zender_2003'",
                                      LND_SETS_DUST_EMIS_DRV_FLDS=>"FALSE",
-                                     phys=>"clm5_1",
-                                     },
-     "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "zender_soil_erod_source='none'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
-                                     phys=>"clm5_1",
-                                     },
-     "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "zender_soil_erod_source='zztop'",
-                                     GLC_TWO_WAY_COUPLING=>"FALSE",
-                                     phys=>"clm5_1",
+                                     phys=>"clm6_0",
                                      },
                );
 foreach my $key ( keys(%failtest) ) {

From 02f9cb325d3884add3ecfb45904c34bb3edb0f62 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 15 Jul 2024 15:25:35 -0600
Subject: [PATCH 38/47] Make fail tests lines where the namelst option is split
 up into two lines into one long line, because the way they were concatonated
 look obscure and possibly wrong, the long lines are easier to read

---
 bld/unit_testers/build-namelist_test.pl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 0b26e86476..d72331b1c2 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -1070,23 +1070,19 @@ sub cat_and_create_namelistinfile {
                                      phys=>"clm5_0",
                                      },
      "soil_erod_wo_Zender"      =>{ options=>"--envxml_dir . --ignore_warnings",
-                                     namelst=>"dust_emis_method='Leung_2023', " .
-                                     "stream_meshfile_zendersoilerod = '/dev/null'",
+                                     namelst=>"dust_emis_method='Leung_2023', stream_meshfile_zendersoilerod = '/dev/null'",
                                      phys=>"clm6_0",
                                      },
      "soil_erod_wo_lnd_source"  =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "stream_fldfilename_zendersoilerod = '/dev/null', zender_soil_erod_source='atm'",
+                                     namelst=>"dust_emis_method='Zender_2003', stream_fldfilename_zendersoilerod = '/dev/null', zender_soil_erod_source='atm'",
                                      phys=>"clm6_0",
                                      },
      "soil_erod_none_w_Zender"  =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "zender_soil_erod_source='none'",
+                                     namelst=>"dust_emis_method='Zender_2003', zender_soil_erod_source='none'",
                                      phys=>"clm6_0",
                                      },
      "soil_erod_bad_w_Zender"   =>{ options=>"--envxml_dir .",
-                                     namelst=>"dust_emis_method='Zender_2003', " .
-                                     "zender_soil_erod_source='zztop'",
+                                     namelst=>"dust_emis_method='Zender_2003', zender_soil_erod_source='zztop'",
                                      phys=>"clm6_0",
                                      },
      "Set_Dust_When_CAM_Sets"   =>{ options=>"--envxml_dir .",

From 8478b730663ee4a6698b70804e95a1f029662aab Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 16 Jul 2024 13:58:00 -0600
Subject: [PATCH 39/47] Comments about move to CMEPS

---
 src/drv_test/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/drv_test/CMakeLists.txt b/src/drv_test/CMakeLists.txt
index adf66b8b92..938e55a598 100644
--- a/src/drv_test/CMakeLists.txt
+++ b/src/drv_test/CMakeLists.txt
@@ -1 +1,3 @@
+# This test should be moved to be under CMEPS
+# See: https://github.com/ESCOMP/CMEPS/issues/458
 add_subdirectory(shr_dust_emis_test)

From b11bc8923bbaa6edc6c60913c37c1ba7f906d2b6 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 24 Jul 2024 11:21:17 -0600
Subject: [PATCH 40/47] Update cism to work with this cmeps version

---
 .gitmodules     | 2 +-
 components/cism | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 501708f587..810b43a266 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release
 [submodule "cism"]
 path = components/cism
 url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_001
+fxtag = cismwrap_2_2_002
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
diff --git a/components/cism b/components/cism
index c05dd5c4fc..c84cc9f5b3 160000
--- a/components/cism
+++ b/components/cism
@@ -1 +1 @@
-Subproject commit c05dd5c4fc85327e76523aaea9cfe1e388748928
+Subproject commit c84cc9f5b3103766a35d0a7ddd5e9dbd7deae762

From 38656f9c9904a312b041afaf9d15ed2e95f3838a Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 24 Jul 2024 11:49:01 -0600
Subject: [PATCH 41/47] Get LILAC test working

---
 bld/env_run.xml                          | 1 +
 python/ctsm/lilac_make_runtime_inputs.py | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/bld/env_run.xml b/bld/env_run.xml
index f3b7467168..cd865ad82c 100644
--- a/bld/env_run.xml
+++ b/bld/env_run.xml
@@ -9,6 +9,7 @@ Sample env_run.xml file that allows build-namelist to be run for testing in this
 -->
 <entry id="DIN_LOC_ROOT"         value="MYDINLOCROOT"  /> 
 <entry id="GLC_TWO_WAY_COUPLING" value="FALSE"         /> 
+<entry id="LND_SETS_DUST_EMIS_DRV_FLDS" value="TRUE"   /> 
 <entry id="NEONSITE"             value=""              /> 
 
 </config_definition>
diff --git a/python/ctsm/lilac_make_runtime_inputs.py b/python/ctsm/lilac_make_runtime_inputs.py
index 71f3c9bbe4..33b87c543e 100644
--- a/python/ctsm/lilac_make_runtime_inputs.py
+++ b/python/ctsm/lilac_make_runtime_inputs.py
@@ -47,6 +47,12 @@
       <valid_values>TRUE,FALSE</valid_values>
     </entry>
   </group>
+  <group id="run_cpl">
+    <entry id="LND_SETS_DUST_EMIS_DRV_FLDS" value="TRUE">
+      <type>logical</type>
+      <valid_values>TRUE,FALSE</valid_values>
+    </entry>
+  </group>
 </file>
 """
 

From e438a907e1fa23934255a10dddcfee4601bcd20d Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Wed, 24 Jul 2024 12:14:39 -0600
Subject: [PATCH 42/47] Fix test number

---
 bld/unit_testers/build-namelist_test.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index 198df535ad..1533e00d73 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,7 +163,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3311;
+my $ntests = 3317;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 2052;

From 0f9fee7ea3b3f6732e2f0dd7bf75f7f6536b3cfa Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 29 Jul 2024 11:42:44 -0600
Subject: [PATCH 43/47] LILAC needs to read and handle the drv_flds_in file as
 dust emission settings are required and it's namelist must be read

---
 cime_config/SystemTests/lilacsmoke.py    | 2 +-
 python/ctsm/lilac_make_runtime_inputs.py | 1 -
 src/CMakeLists.txt                       | 1 +
 src/cpl/lilac/lnd_comp_esmf.F90          | 5 +++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cime_config/SystemTests/lilacsmoke.py b/cime_config/SystemTests/lilacsmoke.py
index 1287301ba2..5bdbb31ec1 100644
--- a/cime_config/SystemTests/lilacsmoke.py
+++ b/cime_config/SystemTests/lilacsmoke.py
@@ -38,7 +38,7 @@
 
 logger = logging.getLogger(__name__)
 
-_LILAC_RUNTIME_FILES = ["lnd_in", "lnd_modelio.nml", "lilac_in"]
+_LILAC_RUNTIME_FILES = ["lnd_in", "lnd_modelio.nml", "drv_flds_in", "lilac_in"]
 
 
 class LILACSMOKE(SystemTestsCommon):
diff --git a/python/ctsm/lilac_make_runtime_inputs.py b/python/ctsm/lilac_make_runtime_inputs.py
index 33b87c543e..e751f6c931 100644
--- a/python/ctsm/lilac_make_runtime_inputs.py
+++ b/python/ctsm/lilac_make_runtime_inputs.py
@@ -307,7 +307,6 @@ def buildnml(cime_path, rundir):
     # remove temporary files in rundir
     os.remove(os.path.join(rundir, "config_cache.xml"))
     os.remove(os.path.join(rundir, "env_lilac.xml"))
-    os.remove(os.path.join(rundir, "drv_flds_in"))
     os.remove(infile)
 
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9388e65bc2..5b0f6c9b1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -107,5 +107,6 @@ add_subdirectory(${CLM_ROOT}/src/init_interp/test clm_init_interp_test)
 add_subdirectory(${CLM_ROOT}/src/self_tests/test clm_self_tests_test)
 
 # Add driver unit test directories
+# (these should be moved to the appropriate submodule)
 add_subdirectory(${CLM_ROOT}/src/drv_test drv_test)
 
diff --git a/src/cpl/lilac/lnd_comp_esmf.F90 b/src/cpl/lilac/lnd_comp_esmf.F90
index 298aa730c0..6c8bb2a491 100644
--- a/src/cpl/lilac/lnd_comp_esmf.F90
+++ b/src/cpl/lilac/lnd_comp_esmf.F90
@@ -114,6 +114,8 @@ subroutine lnd_init(comp, import_state, export_state, clock, rc)
     use ESMF              , only : ESMF_StateAdd
     use ESMF              , only : operator(==)
 
+    use shr_dust_emis_mod , only : shr_dust_emis_readnl
+
     ! input/output variables
     type(ESMF_GridComp)  :: comp         ! CLM gridded component
     type(ESMF_State)     :: import_state ! CLM import state
@@ -270,6 +272,9 @@ subroutine lnd_init(comp, import_state, export_state, clock, rc)
     ! Fill in the value for model_meshfile in lnd_comp_shr used by the stream routines in share_esmf/
     model_meshfile = trim(lnd_mesh_filename)
 
+    ! Reading in the drv_flds_in namelist is required for dust emissions
+    call shr_dust_emis_readnl( mpicom, "drv_flds_in")
+
     !----------------------
     ! Obtain caseid and start type from attributes in import state
     !----------------------

From 17c748bad564c560cf305549b744c7c82c13b5c5 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Mon, 29 Jul 2024 17:06:26 -0600
Subject: [PATCH 44/47] Fix 1x1_cidadinhoBR tests by specifying 2000_control
 for it and 1850_control for smallville

---
 bld/unit_testers/build-namelist_test.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index c92f428d82..d6291c94de 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -1532,7 +1532,11 @@ sub cat_and_create_namelistinfile {
 # Check for crop resolutions
 my @crop1850_res = ( "1x1_smallvilleIA", "1x1_cidadinhoBR" );
 foreach my $res ( @crop1850_res ) {
-   $options = "-bgc bgc -crop -res $res -use_case 1850_control -envxml_dir .";
+   my $use_case = "1850_control";
+   if ( $res =~ /1x1_cidadinhoBR/ ) {
+      $use_case = "2000_control";
+   }
+   $options = "-bgc bgc -crop -res $res -use_case $use_case -envxml_dir .";
    &make_env_run();
    eval{ system( "$bldnml $options  > $tempfile 2>&1 " ); };
    is( $@, '', "$options" );

From 4d4fe83b759c972c9f4e8d0ad9422d1cd36c7693 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Jul 2024 08:38:44 -0600
Subject: [PATCH 45/47] Fix test numbers

---
 bld/unit_testers/build-namelist_test.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
index d6291c94de..5bccb3b77c 100755
--- a/bld/unit_testers/build-namelist_test.pl
+++ b/bld/unit_testers/build-namelist_test.pl
@@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3317;
+my $ntests = 3329;
 
 if ( defined($opts{'compare'}) ) {
-   $ntests += 2052;
+   $ntests += 1999;
 }
 plan( tests=>$ntests );
 

From cdb36a0f681d02a2c5720940c169a559783a3e9b Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Jul 2024 08:39:36 -0600
Subject: [PATCH 46/47] Update change files

---
 doc/ChangeLog | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/ChangeSum |   1 +
 2 files changed, 116 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 79d640242d..8c01174329 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,119 @@
 ===============================================================
+Tag name: ctsm5.2.017
+Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326)
+Date: Tue 30 Jul 2024 08:39:20 AM MDT
+One-line Summary: Dust emissions control moved to cmeps
+
+Purpose and description of changes
+----------------------------------
+
+Remove the dust emissions namelist items from CTSM and use the namelist in the drv_flds_in for CMEPS.
+
+This updates CTSM to use the namelist control in CMEPS (in ESCOMP/CMEPS#429). So the CMEPS external needs to be updated, and the
+namelist control in CTSM changed to use CMEPS rather than the internal CTSM control settings and the CTSM ones removed.
+
+The new XML variable:
+
+   LND_SETS_DUST_EMIS_DRV_FLDS
+
+controls whether dust emission settings are set by CTSM or by CAM. Only one or the other can set them, and it's required so when CAM
+and CTSM are running together they need to know which one will select.
+
+This required some changes for LILAC. The drv_flds_in namelist file is now required for LILAC, and read for dust emissions
+(and dust emissions only) at the LILAC lnd_comp_esmf.F90 level.
+
+Add a unit test for the CMEPS code to make sure it's working correctly. This validates the code both for CAM and CTSM.
+
+Fix the cidinahoBR test in the build-namelist unit tester.
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+
+  Fixes #2376 -- Update CTSM with CMEPS that controls dust emission options
+  Fixes #2150 -- Ability to flip between different dust emission methods
+  Fixes #2524 -- Add option to NOT set dust emission settings when coupled to CAM
+  Fixes #2666 -- cidinahoBR test in build-namelist 
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+   dust_emis_method can NOT be set to Leung_2023 -- yet.
+   See below about LND_SETS_DUST_EMIS_DRV_FLDS
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+  CTSM namelist items moved to the dust_emis_inparm namelist in drv_flds_in:
+  zender_soil_erod_source and dust_emis_method
+
+  New logical XML variable:
+     LND_SETS_DUST_EMIS_DRV_FLDS
+  If TRUE CTSM sets the dust emission namelist, otherwise CAM will (when coupled to CAM) 
+  If you are NOT coupled to CAM and LND_SETS_DUST_EMIS_DRV_FLDS==FALSE, the model will abort
+  trying to read the dust_emis_inparm namelist in drv_flds_in.
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance):
+   Added a PF unit test for CMEPS dust emission code. This should be moved to CMEPS, but still run here.
+   Control design in DustEmisFactory, uses a Functional Programming design pattern with pure functions
+   from CMEPS for CTSM to know the drv_flds_in settings. Design notes were added in that regard.
+
+Testing summary: Regular
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - PASS (1006 are different because of the namelist changes)
+
+  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - PASS
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No bit-for-bit
+
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+  #2545 -- Dust emission control moved to CMEPS
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.016
 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
 Date: Sat 27 Jul 2024 05:13:08 PM MDT
diff --git a/doc/ChangeSum b/doc/ChangeSum
index 382e5cf7cb..15a67bcf04 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.2.017     erik 07/30/2024 Dust emissions control moved to cmeps
        ctsm5.2.016 samrabin 07/27/2024 Enable new crop calendars for clm60 compsets
        ctsm5.2.015 multiple 07/22/2024 Update submodule tags to pass runoff from cism to rof
        ctsm5.2.014 multiple 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false.

From f28ecdb5cbd3ab3ab28ffd149ef54761055e926e Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Tue, 30 Jul 2024 08:44:59 -0600
Subject: [PATCH 47/47] Add note about the fails compared to baselines

---
 doc/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8c01174329..aeb7b2972f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -105,6 +105,12 @@ Answer changes
 
 Changes answers relative to baseline: No bit-for-bit
 
+  The following tests compared different to baseline because of reproducability issues:
+     ERP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings
+     SMS_D.1x1_brazil.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdDryDepSatPhen
+     SMS_D.1x1_brazil.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdMeganSatPhen
+  The CN-MATRIX issue is because of #2619 and FATES because of #2656
+
 Other details
 -------------