Merge tag 'cam6_4_164' into cam-polarcap

Misc tag before CESM3 release

Author: cacraigucar

.config_files.xml

@@ -5,7 +5,7 @@
 <entry_id>
 
   <!-- This is the same as the default entry in
-       cime/config/cesm/config_files.xml except for the value for clm:
+       cime/config/cesm/config_files.xml except for the value for cam:
        In a standalone cam checkout, COMP_ROOT_DIR_CAM is $SRCROOT
        rather than $SRCROOT/components/cam.
        However, because of the way overrides are handled, we need to
@@ -17,9 +17,9 @@
     <default_value>unset</default_value>
     <values>
       <value component="cam"      >$SRCROOT</value>
-      <value component="dlnd"      >$CIMEROOT/src/components/data_comps/dlnd</value>
-      <value component="slnd"      >$CIMEROOT/src/components/stub_comps/slnd</value>
-      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
+      <value component="datm"     >$SRCROOT/components/cdeps/datm</value>
+      <value component="satm"     >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/satm</value>
+      <value component="xatm"     >$SRCROOT/components/cmeps/med_test_comps/xatm</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>

.gitmodules

@@ -23,7 +23,7 @@
 	path = src/physics/ali_arms
 	url = https://github.com/ESCOMP/ALI-ARMS
         fxrequired = AlwaysRequired
-        fxtag = ALI_ARMS_v1.0.1
+        fxtag = ALI_ARMS_v1.0.2
         fxDONOTUSEurl = https://github.com/ESCOMP/ALI-ARMS
 
 [submodule "atmos_phys"]
@@ -139,7 +139,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_cesm1.0.79
+fxtag = ccs_config_cesm1.0.81
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 

ccs_config

@@ -2516,7 +2516,7 @@
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
     <options>
-      <option name="wallclock">00:40:00</option>
+      <option name="wallclock">00:50:00</option>
       <option name="comment" >WACCM7 with MA chemistry</option>
     </options>
   </test>

cime_config/testdefs/testlist_cam.xml

@@ -16,16 +16,17 @@ module aero_wetdep_cam
   use cam_history,   only: addfld, add_default, horiz_only, outfld
   use wetdep,        only: wetdep_init
 
-  use rad_constituents, only: rad_cnst_get_info
+  use radiative_aerosol, only: rad_aer_get_info
 
   use aerosol_properties_mod, only: aero_name_len
   use aerosol_properties_mod, only: aerosol_properties
   use modal_aerosol_properties_mod, only: modal_aerosol_properties
   use carma_aerosol_properties_mod, only: carma_aerosol_properties
 
   use aerosol_state_mod, only: aerosol_state, ptr2d_t
-  use modal_aerosol_state_mod, only: modal_aerosol_state
-  use carma_aerosol_state_mod, only: carma_aerosol_state
+  use aerosol_instances_mod, only: aerosol_instances_get_state, &
+                                   aerosol_instances_get_props, &
+                                   aerosol_instances_get_num_models
 
   use aero_convproc, only: aero_convproc_readnl, aero_convproc_init, aero_convproc_intr
   use aero_convproc, only: convproc_do_evaprain_atonce
@@ -172,7 +173,7 @@ subroutine aero_wetdep_init( )
                       history_chemistry_out=history_chemistry, &
                       convproc_do_aer_out = convproc_do_aer)
 
-    call rad_cnst_get_info(0, nmodes=nmodes, nbins=nbins)
+    call rad_aer_get_info(0, nmodes=nmodes, nbins=nbins)
 
     if (nmodes>0) then
        aero_props => modal_aerosol_properties()
@@ -409,26 +410,30 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
     real(r8) :: sflxbc(pcols), sflxbcdp(pcols)  ! deposition flux
 
     class(aerosol_state), pointer :: aero_state
+    class(aerosol_properties), pointer :: props_tmp
+    integer :: iaermod
 
     nullify(aero_state)
 
     if (.not.wetdep_active) return
 
     dcondt_resusp3d(:,:,:) = 0._r8
 
-    if (nmodes>0) then
-       aero_state => modal_aerosol_state(state,pbuf)
-       if (.not.associated(aero_state)) then
-          call endrun(subrname//' : construction of aero_state modal_aerosol_state object failed')
-       end if
-    else if (nbins>0) then
-       aero_state => carma_aerosol_state(state,pbuf)
-       if (.not.associated(aero_state)) then
-          call endrun(subrname//' : construction of aero_state carma_aerosol_state object failed')
+    !REMOVECAM - get persistent state from factory; under CAM-SIMA states will be passed as scheme inputs
+    nullify(aero_state)
+    do iaermod = 1, aerosol_instances_get_num_models()
+       props_tmp => aerosol_instances_get_props(iaermod, 0)
+       if (associated(props_tmp)) then
+          if (.not. props_tmp%model_is('BAM')) then
+             aero_state => aerosol_instances_get_state(iaermod, 0, state%lchnk)
+             exit
+          end if
        end if
-    else
-       call endrun(subrname//' : cannot determine aerosol model')
-    endif
+    end do
+    if (.not.associated(aero_state)) then
+       call endrun(subrname//' : no non-BAM aerosol state available for wetdep')
+    end if
+    !REMOVECAM_END
 
     lchnk = state%lchnk
     ncol = state%ncol
@@ -601,7 +606,7 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
                    qqcw_in(:ncol,:) = qqcw(mm)%fld(:ncol,:)
                 end if
 
-                f_act_conv(:ncol,:) = aero_state%convcld_actfrac( m, l, ncol, pver)
+                f_act_conv(:ncol,:) = aero_state%convcld_actfrac( aero_props, m, l, ncol, pver)
                 name = aname
              end if
 
@@ -796,10 +801,7 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
 
     end do bins_loop
 
-    if (associated(aero_state)) then
-       deallocate(aero_state)
-       nullify(aero_state)
-    end if
+    nullify(aero_state)
 
     ! if the user has specified prescribed aerosol dep fluxes then
     ! do not set cam_out dep fluxes according to the prognostic aerosols