Merge pull request #1369 from NCAR/develop-cloud-bug-fix

cam6_4_112: Fix minor bugs in cloud chemistry

Author: mattldawson

doc/ChangeLog

@@ -460,7 +460,7 @@ subroutine aero_convproc_intr( aero_props, aero_state, state, ptend, pbuf, ztodt
 
             ndx = aer_cnst_ndx(mm)
 
-            if (ndx>0) call outfld( trim(cnst_name_extd(1,mm))//'SFWET', aerdepwetis(:,ndx), pcols, lchnk )
+            if (ndx>0) call outfld( trim(cnst_name_extd(1,mm))//'SFWETC', aerdepwetis(:,ndx), pcols, lchnk )
             call outfld( trim(cnst_name_extd(1,mm))//'SFSIC', sflxic(:,mm), pcols, lchnk )
             call outfld( trim(cnst_name_extd(1,mm))//'SFSEC', sflxec(:,mm), pcols, lchnk )
 

src/chemistry/aerosol/aero_convproc.F90

@@ -268,6 +268,8 @@ subroutine add_hist_fields(name,baseunits)
 
       call addfld (trim(name)//'SFWET', &
            horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux at surface')
+      call addfld (trim(name)//'SFWETC', &
+           horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux (convective) at surface')
       call addfld (trim(name)//'SFSIC', &
            horiz_only,  'A',baseunits//'/m2/s ','Wet deposition flux (incloud, convective) at surface')
       call addfld (trim(name)//'SFSIS', &
@@ -666,8 +668,8 @@ subroutine aero_wetdep_tend( state, dt, dlf, cam_out, ptend, pbuf)
                 call outfld( trim(name)//'SFWET', sflx, pcols, lchnk)
                 if (ndx>0) aerdepwetcw(:ncol,ndx) = sflx(:ncol)
              else
-                if (.not.convproc_do_aer) call outfld( trim(name)//'SFWET', sflx, pcols, lchnk)
                 if (ndx>0) aerdepwetis(:ncol,ndx) = aerdepwetis(:ncol,ndx) + sflx(:ncol)
+                call outfld( trim(name)//'SFWET', aerdepwetis(:ncol,ndx), ncol, lchnk)
              end if
 
              sflx(:)=0._r8

src/chemistry/aerosol/aero_wetdep_cam.F90

@@ -369,9 +369,13 @@ subroutine aero_model_init( pbuf2d )
 
     if( has_sox ) then
        call addfld( 'XPH_LWC',(/ 'lev' /), 'A','kg/kg', 'pH value multiplied by lwc')
+       call addfld( 'AQSO4_H2O2', horiz_only, 'A', 'kg/m2/s', 'SO4 aqueous phase chemistry due to H2O2')
+       call addfld( 'AQSO4_O3', horiz_only, 'A', 'kg/m2/s', 'SO4 aqueous phase chemistry due to O3')
 
        if ( history_aerosol ) then
           call add_default ('XPH_LWC', 1, ' ')
+          call add_default ('AQSO4_H2O2', 1, ' ')
+          call add_default ('AQSO4_O3', 1, ' ')
        endif
     endif
 
@@ -1067,6 +1071,7 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
 
     if( has_sox ) then
        call setsox( state, &
+            pbuf,     &
             ncol,     &
             lchnk,    &
             loffset,  &
@@ -1078,7 +1083,6 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
             cwat,     &
             cldfr,    &
             cldnum,   &
-            airdens,  &
             invariants, &
             vmrcw,    &
             vmr,      &
@@ -1088,7 +1092,9 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
             aqso4_h2o2,&
             aqso4_o3  &
             )
-        call outfld( 'XPH_LWC',xphlwc(:ncol,:), ncol , lchnk )
+        call outfld( 'XPH_LWC',    xphlwc(:ncol,:),   ncol, lchnk )
+        call outfld( 'AQSO4_H2O2', aqso4_h2o2(:ncol), ncol, lchnk )
+        call outfld( 'AQSO4_O3',   aqso4_o3(:ncol),   ncol, lchnk )
     endif
 
     if( has_soa ) then

src/chemistry/aerosol/mo_setsox.F90

@@ -678,6 +678,7 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
 
     if( has_sox ) then
          call setsox( state,  &
+              pbuf,     &
               ncol,     &
               lchnk,    &
               loffset,  &
@@ -689,7 +690,6 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
               cwat,     &
               cldfr,    &
               cldnum,   &
-              airdens,  &
               invariants, &
               vmrcw,    &
               vmr,      &

src/chemistry/bulk_aero/aero_model.F90

@@ -1060,6 +1060,7 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
 
     if( has_sox ) then
        call setsox( state, &
+              pbuf,     &
               ncol,     &
               lchnk,    &
               loffset,  &
@@ -1071,7 +1072,6 @@ subroutine aero_model_gasaerexch( state, loffset, ncol, lchnk, troplev, delt, re
               cwat,     &
               cldfr,    &
               cldnum,   &
-              airdens,  &
               invariants, &
               vmrcw,    &
               vmr,      &

src/chemistry/carma_aero/aero_model.F90

@@ -448,11 +448,11 @@ subroutine sox_cldaero_update( &
 
        end do
 
-       qin(:,k,id_so2) =  MAX( qin(:,k,id_so2),    small_value )
-
-       if ( id_nh3 > 0 ) then
-          qin(:,k,id_nh3) =  MAX( qin(:,k,id_nh3),    small_value )
-       endif
+       qin(:,k,id_so2)   = MAX( qin(:,k,id_so2),   small_value )
+       qin(:,k,id_h2o2)  = MAX( qin(:,k,id_h2o2),  small_value )
+       qin(:,k,id_h2so4) = MAX( qin(:,k,id_h2so4), small_value )
+       if ( id_msa > 0 ) qin(:,k,id_msa) = MAX( qin(:,k,id_msa), small_value )
+       if ( id_nh3 > 0 ) qin(:,k,id_nh3) = MAX( qin(:,k,id_nh3), small_value )
 
     end do