Add ncol_ to aerosol_state for internal loops

Author: jimmielin

src/chemistry/aerosol/aerosol_instances_mod.F90

@@ -272,21 +272,21 @@ subroutine aerosol_instances_init_states(phys_state, pbuf2d)
              iaermod = iaermod + 1
              if (associated(aero_props_all(iaermod, ilist)%obj)) then
                 aero_states_all(iaermod, ilist, lchnk)%obj => &
-                     modal_aerosol_state(phys_state(lchnk), pbuf, ilist)
+                     modal_aerosol_state(phys_state(lchnk)%ncol, phys_state(lchnk), pbuf, ilist)
              end if
           end if
           if (carma_active_) then
              iaermod = iaermod + 1
              if (associated(aero_props_all(iaermod, ilist)%obj)) then
                 aero_states_all(iaermod, ilist, lchnk)%obj => &
-                     carma_aerosol_state(phys_state(lchnk), pbuf, ilist)
+                     carma_aerosol_state(phys_state(lchnk)%ncol, phys_state(lchnk), pbuf, ilist)
              end if
           end if
           if (bulk_active_) then
              iaermod = iaermod + 1
              if (associated(aero_props_all(iaermod, ilist)%obj)) then
                 aero_states_all(iaermod, ilist, lchnk)%obj => &
-                     bulk_aerosol_state(phys_state(lchnk), pbuf, ilist)
+                     bulk_aerosol_state(phys_state(lchnk)%ncol, phys_state(lchnk), pbuf, ilist)
              end if
           end if
        end do
@@ -342,15 +342,15 @@ subroutine aerosol_instances_create_states(list_idx, state, pbuf, aero_states, n
     iaermod = 0
     if (modal_active_) then
        iaermod = iaermod + 1
-       aero_states(iaermod)%obj => modal_aerosol_state(state, pbuf, list_idx)
+       aero_states(iaermod)%obj => modal_aerosol_state(state%ncol, state, pbuf, list_idx)
     end if
     if (carma_active_) then
        iaermod = iaermod + 1
-       aero_states(iaermod)%obj => carma_aerosol_state(state, pbuf, list_idx)
+       aero_states(iaermod)%obj => carma_aerosol_state(state%ncol, state, pbuf, list_idx)
     end if
     if (bulk_active_) then
        iaermod = iaermod + 1
-       aero_states(iaermod)%obj => bulk_aerosol_state(state, pbuf, list_idx)
+       aero_states(iaermod)%obj => bulk_aerosol_state(state%ncol, state, pbuf, list_idx)
     end if
 
   end subroutine aerosol_instances_create_states

src/chemistry/aerosol/aerosol_state_mod.F90

@@ -25,9 +25,12 @@ module aerosol_state_mod
   !! class can be extended for a specific aerosol package.
   type, abstract :: aerosol_state
      integer :: list_idx_ = 0 ! radiation climate/diagnostic list index
+     integer :: ncol_ = 0     ! number of active columns
    contains
      procedure :: list_idx => get_list_idx
      procedure :: set_list_idx
+     procedure :: ncol => get_ncol
+     procedure :: set_ncol
      procedure(aero_get_transported), deferred :: get_transported
      procedure(aero_set_transported), deferred :: set_transported
      procedure(aero_get_amb_total_bin_mmr), deferred :: ambient_total_bin_mmr
@@ -300,6 +303,23 @@ subroutine set_list_idx(self, list_idx)
     self%list_idx_ = list_idx
   end subroutine set_list_idx
 
+  !------------------------------------------------------------------------------
+  ! returns the number of active columns
+  !------------------------------------------------------------------------------
+  pure integer function get_ncol(self)
+    class(aerosol_state), intent(in) :: self
+    get_ncol = self%ncol_
+  end function get_ncol
+
+  !------------------------------------------------------------------------------
+  ! sets the number of active columns
+  !------------------------------------------------------------------------------
+  subroutine set_ncol(self, ncol)
+    class(aerosol_state), intent(inout) :: self
+    integer, intent(in) :: ncol
+    self%ncol_ = ncol
+  end subroutine set_ncol
+
   !------------------------------------------------------------------------------
   ! returns aerosol number, volume concentrations, and bulk hygroscopicity
   !------------------------------------------------------------------------------

src/chemistry/aerosol/bulk_aerosol_state_mod.F90

@@ -76,11 +76,12 @@ module bulk_aerosol_state_mod
 
   !------------------------------------------------------------------------------
   !------------------------------------------------------------------------------
-  function constructor(state,pbuf,list_idx) result(newobj)
+  function constructor(ncol,state,pbuf,list_idx) result(newobj)
     !REMOVECAM: host-model specific dimensions
     use ppgrid,           only: pcols, pver
     !REMOVECAM_END
 
+    integer, intent(in) :: ncol
     type(physics_state), target :: state
     type(physics_buffer_desc), pointer :: pbuf(:)
     integer, intent(in), optional :: list_idx
@@ -97,12 +98,17 @@ function constructor(state,pbuf,list_idx) result(newobj)
     newobj%state => state
     newobj%pbuf => pbuf
 
+    ! set number of active columns internally to prevent loops from accessing beyond
+    ! meaningful data in arrays
+    call newobj%set_ncol(ncol)
+
     if (present(list_idx)) call newobj%set_list_idx(list_idx)
 
     ! Allocate per-object workspace for derived number fields.
     ! Thread-safe: in CAM, each chunk has its own state object.
     allocate(newobj%num_work_(pcols, pver), stat=ierr)
     if (ierr /= 0) call endrun('bulk_aerosol_state constructor: num_work_ allocation error')
+    newobj%num_work_(:,:) = 0._r8
     allocate(newobj%zero_fld_(pcols, pver), stat=ierr)
     if (ierr /= 0) call endrun('bulk_aerosol_state constructor: zero_fld_ allocation error')
     newobj%zero_fld_(:,:) = 0._r8
@@ -209,20 +215,24 @@ subroutine get_ambient_num(self, bin_ndx, num)
     real(r8), pointer :: mmr(:,:)
     real(r8)          :: ntm
     character(len=32) :: aname
+    integer           :: nc
 
     ! Derive number mixing ratio from mass: num = mmr * num_to_mass_aer (* bam_sulfate_scale for sulfate).
     ! This matches the inline computation formerly in microp_aero.F90 and nucleate_ice_cam.F90.
     ! Computed into per-object workspace (num_work_); callers must use or copy before the next call.
+    ! Only active columns (1:ncol) are computed to avoid FPE on uninitialised padding columns.
+
+    nc = self%ncol()
 
     call rad_cnst_get_aer_mmr(self%list_idx_, bin_ndx, self%state, self%pbuf, mmr)
     call rad_aer_get_props(self%list_idx_, bin_ndx, num_to_mass_aer=ntm, aername=aname)
 
     ! Apply bam_sulfate_scale to sulfate/volcanic aerosol
     select case ( to_lower( aname(:4) ) )
     case ('sulf', 'volc') ! both treated as 'sulfate' in aero_props%get type.
-       self%num_work_(:,:) = mmr(:,:) * ntm * bam_sulfate_scale
+       self%num_work_(:nc,:) = mmr(:nc,:) * ntm * bam_sulfate_scale
     case default
-       self%num_work_(:,:) = mmr(:,:) * ntm
+       self%num_work_(:nc,:) = mmr(:nc,:) * ntm
     end select
 
     num => self%num_work_

src/chemistry/aerosol/carma_aerosol_state_mod.F90

@@ -67,7 +67,8 @@ module carma_aerosol_state_mod
 
   !------------------------------------------------------------------------------
   !------------------------------------------------------------------------------
-  function constructor(state,pbuf,list_idx) result(newobj)
+  function constructor(ncol,state,pbuf,list_idx) result(newobj)
+    integer, intent(in) :: ncol
     type(physics_state), target, optional :: state
     type(physics_buffer_desc), pointer, optional :: pbuf(:)
     integer, intent(in), optional :: list_idx
@@ -85,6 +86,10 @@ function constructor(state,pbuf,list_idx) result(newobj)
     newobj%state => state
     newobj%pbuf => pbuf
 
+    ! set number of active columns internally to prevent loops from accessing beyond
+    ! meaningful data in arrays
+    call newobj%set_ncol(ncol)
+
     if (present(list_idx)) call newobj%set_list_idx(list_idx)
 
   end function constructor
@@ -190,7 +195,7 @@ subroutine get_ambient_num(self, bin_ndx, num)
     integer :: igroup, ibin, rc, nchr, ncol
     real(r8) :: nmr(pcols,pver)
 
-    ncol = self%state%ncol
+    ncol = self%ncol()
 
     call rad_aer_get_info_by_bin(self%list_idx_, bin_ndx, bin_name=bin_name)
 
@@ -221,7 +226,7 @@ subroutine get_cldbrne_num(self, bin_ndx, num)
     integer :: igroup, ibin, rc, nchr, ncol
     real(r8) :: nmr(pcols,pver)
 
-    ncol = self%state%ncol
+    ncol = self%ncol()
 
     call rad_aer_get_info_by_bin(self%list_idx_, bin_ndx, bin_name=bin_name)
 
@@ -323,7 +328,7 @@ subroutine icenuc_size_wght_val(self, bin_ndx, col_ndx, lyr_ndx, species_type, u
 
     real(r8) :: wght_arr(pcols,pver)
 
-    call self%icenuc_size_wght(bin_ndx, self%state%ncol, pver, species_type, use_preexisting_ice, wght_arr)
+    call self%icenuc_size_wght(bin_ndx, self%ncol(), pver, species_type, use_preexisting_ice, wght_arr)
 
     wght = wght_arr(col_ndx,lyr_ndx)
 

src/chemistry/aerosol/modal_aerosol_state_mod.F90

@@ -64,7 +64,8 @@ module modal_aerosol_state_mod
 
   !------------------------------------------------------------------------------
   !------------------------------------------------------------------------------
-  function constructor(state,pbuf,list_idx) result(newobj)
+  function constructor(ncol,state,pbuf,list_idx) result(newobj)
+    integer, intent(in) :: ncol
     type(physics_state), target :: state
     type(physics_buffer_desc), pointer :: pbuf(:)
     integer, intent(in), optional :: list_idx
@@ -79,6 +80,7 @@ function constructor(state,pbuf,list_idx) result(newobj)
        return
     end if
 
+    call newobj%set_ncol(ncol)
     newobj%state => state
     newobj%pbuf => pbuf
 

src/chemistry/carma_aero/carma_aero_gasaerexch.F90

@@ -412,7 +412,7 @@ subroutine carma_aero_gasaerexch_sub(  state, &
   type(carma_aerosol_state), pointer :: aero_state
 
 !----------------------------------------------------------------------
-   aero_state => carma_aerosol_state(state, pbuf)
+   aero_state => carma_aerosol_state(ncol, state, pbuf)
 
 !  map CARMA soa to working soa(nbins,nsoa)