fix issue with aqua-planet

modified: bld/build-namelist modified: src/chemistry/bulk_aero/dust_model.F90 modified: src/chemistry/modal_aero/dust_model.F90
ESCOMP · Jul 26, 2024 · b01294f · b01294f
1 parent f7b9e5d
commit b01294f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/bld/build-namelist b/bld/build-namelist
@@ -3728,10 +3728,9 @@ if ( length($nl->get_value('soil_erod_file'))>0 ) {
         }
     }
 }
-if (!($simple_phys or $aqua_mode)) {
-    add_default($nl, 'dust_emis_method');
-    add_default($nl, 'zender_soil_erod_source');
-}
+# Dust emissions scheme (all configurations for now)
+add_default($nl, 'dust_emis_method');
+add_default($nl, 'zender_soil_erod_source');
 
 if (chem_has_species($cfg, 'NO')) {
     # set scaling of lightning NOx production

diff --git a/src/chemistry/bulk_aero/dust_model.F90 b/src/chemistry/bulk_aero/dust_model.F90
@@ -7,7 +7,6 @@ module dust_model
   use cam_abortutils,  only: endrun
   use cam_logfile,     only: iulog
   use shr_dust_emis_mod,only: is_dust_emis_zender, is_zender_soil_erod_from_atm
-  use cam_control_mod, only: aqua_planet
 
   implicit none
   private
@@ -60,7 +59,6 @@ subroutine dust_readnl(nlfile)
     namelist /dust_nl/ dust_emis_fact, soil_erod_file
 
     !-----------------------------------------------------------------------------
-    if (aqua_planet) return
 
     ! Read namelist
     if (masterproc) then
@@ -113,8 +111,6 @@ subroutine dust_init()
 
     integer :: n
 
-    if (aqua_planet) return
-
     do n = 1, dust_nbin
        call cnst_get_ind(dust_names(n), dust_indices(n),abort=.false.)
     end do
@@ -148,10 +144,6 @@ subroutine dust_emis( ncol, lchnk, dust_flux_in, cflx, soil_erod )
     real(r8), parameter :: dust_emis_sclfctr(dust_nbin) &
          = (/ 0.011_r8/0.032456_r8, 0.087_r8/0.174216_r8, 0.277_r8/0.4085517_r8, 0.625_r8/0.384811_r8 /)
 
-    soil_erod(:) = fillvalue
-
-    if (.not.dust_active) return
-
     ! set dust emissions
 
     if (is_zender_soil_erod_from_atm()) then

diff --git a/src/chemistry/modal_aero/dust_model.F90 b/src/chemistry/modal_aero/dust_model.F90
@@ -8,7 +8,6 @@ module dust_model
   use modal_aero_data,  only: ntot_amode, ndst=>nDust
   use cam_logfile,      only: iulog
   use shr_dust_emis_mod,only: is_dust_emis_zender, is_zender_soil_erod_from_atm
-  use cam_control_mod, only: aqua_planet
 
   implicit none
   private
@@ -58,7 +57,6 @@ subroutine dust_readnl(nlfile)
     namelist /dust_nl/ dust_emis_fact, soil_erod_file
 
     !-----------------------------------------------------------------------------
-    if (aqua_planet) return
 
     ! Read namelist
     if (masterproc) then
@@ -114,8 +112,6 @@ subroutine dust_init()
     character(len=32) :: spec_name
     integer, parameter :: mymodes(7) = (/ 2, 1, 3, 4, 5, 6, 7 /) ! tricky order ...
 
-    if (aqua_planet) return
-
     dust_nbin = ndst
     dust_nnum = ndst
 
@@ -171,7 +167,6 @@ subroutine dust_emis( ncol, lchnk, dust_flux_in, cflx, soil_erod )
     use soil_erod_mod, only : soil_erodibility
     use mo_constants,  only : dust_density
     use physconst,     only : pi
-    use cam_history_support, only : fillvalue
 
   ! args
     integer,  intent(in)    :: ncol, lchnk
@@ -184,8 +179,6 @@ subroutine dust_emis( ncol, lchnk, dust_flux_in, cflx, soil_erod )
     real(r8) :: x_mton
     real(r8),parameter :: soil_erod_threshold = 0.1_r8
 
-    soil_erod(:) = fillvalue
-
     ! set dust emissions
 
     if (is_zender_soil_erod_from_atm()) then