using field table instead of code change for mraerosol

physics/GFS_rrtmg_pre.F90

@@ -197,7 +197,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,          &
       real(kind=kind_phys), dimension(im,lm+LTP+1) :: tem2db, hz
 
       real(kind=kind_phys), dimension(im,lm+LTP,min(4,ncnd))   :: ccnd
-      real(kind=kind_phys), dimension(im,lm+LTP,2:ntrac)       :: tracer1
+      real(kind=kind_phys), dimension(im,lm+LTP,2:ntrac+2)     :: tracer1
       real(kind=kind_phys), dimension(im,lm+LTP,NF_CLDS)       :: clouds
       real(kind=kind_phys), dimension(im,lm+LTP,NF_VGAS)       :: gasvmr
       real(kind=kind_phys), dimension(im,lm+LTP,NBDSW,NF_AESW) :: faersw
@@ -305,7 +305,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,          &
       enddo
 
       !--- recast remaining all tracers (except sphum) forcing them all to be positive
-      do j = 2, ntrac
+      do j = 2, ntrac 
         do k = 1, LM
           k1 = k + kd
           k2 = k + lsk
@@ -636,7 +636,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,          &
             enddo
           enddo
           ! for Thompson MP - prepare variables for calc_effr
-          if_thompson: if (imp_physics == imp_physics_thompson .and. ltaerosol) then
+          if_thompson: if (imp_physics == imp_physics_thompson .and. (ltaerosol .or. mraerosol)) then
             do k=1,LMK
               do i=1,IM
                 qvs = qlyr(i,k)
@@ -651,20 +651,6 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp,          &
                 nwfa  (i,k) = tracer1(i,k,ntwa)
               enddo
             enddo
-          else if (imp_physics == imp_physics_thompson .and. mraerosol) then
-            do k=1,LMK
-              do i=1,IM
-                qvs = qlyr(i,k)
-                qv_mp (i,k) = qvs/(1.-qvs)
-                rho   (i,k) = con_eps*plyr(i,k)*100./(con_rd*tlyr(i,k)*(qv_mp(i,k)+con_eps))
-                orho  (i,k) = 1.0/rho(i,k)
-                qc_mp (i,k) = tracer1(i,k,ntcw)/(1.-qvs)
-                qi_mp (i,k) = tracer1(i,k,ntiw)/(1.-qvs)
-                qs_mp (i,k) = tracer1(i,k,ntsw)/(1.-qvs)
-                nc_mp (i,k) = tracer1(i,k,ntlnc)/(1.-qvs)
-                ni_mp (i,k) = tracer1(i,k,ntinc)/(1.-qvs)
-              enddo
-            enddo
 
           elseif (imp_physics == imp_physics_thompson) then
             do k=1,LMK

physics/mp_thompson.F90

@@ -154,10 +154,6 @@ subroutine mp_thompson_init(ncol, nlev, con_g, con_rd, con_eps,    &
          where(qs<0)      qs = 0.0
          where(qg<0)      qg = 0.0
 
-         if (merra2_aerosol_aware) then
-           call get_niwfa(aerfld, nifa, nwfa, ncol, nlev)
-         end if
-
          !> - Convert specific humidity to water vapor mixing ratio.
          !> - Also, hydrometeor variables are mass or number mixing ratio
          !> - either kg of species per kg of dry air, or per kg of (dry + vapor).
@@ -218,6 +214,8 @@ subroutine mp_thompson_init(ncol, nlev, con_g, con_rd, con_eps,    &
                  nwfa(i,k) = naCCN1+naCCN0*exp(-((hgt(i,k)-hgt(i,1))/1000.)*niCCN3)
                enddo
              enddo
+           else if (merra2_aerosol_aware) then
+             call get_niwfa(aerfld, nifa, nwfa, ncol, nlev)
            else
              if (mpirank==mpiroot) write(*,*) ' Apparently initial CCN aerosols are present.'
              if (MAXVAL(nwfa2d) .lt. eps) then
@@ -520,7 +518,6 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd,           &
             errflg = 1
             return
          end if
-
          ! Set reduced time step if subcycling is used
          if (nsteps>1) then
             dtstep = dtp/real(nsteps, kind=kind_phys)
@@ -544,7 +541,7 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd,           &
                                          ' nc, nwfa, nifa, nwfa2d, nifa2d'
               errflg = 1
               return
-           else if (is_aerosol_aware .and. .not. (present(nc)     .and. &
+           else if (merra2_aerosol_aware .and. .not. (present(nc)     .and. &
                                                   present(nwfa)   .and. &
                                                   present(nifa)         )) then
               write(errmsg,fmt='(*(a))') 'Logic error in mp_thompson_run:', &
@@ -555,9 +552,6 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd,           &
            end if
          end if
 
-         if (merra2_aerosol_aware) then
-           call get_niwfa(aerfld, nifa, nwfa, ncol, nlev)
-         end if
 
          !> - Convert specific humidity to water vapor mixing ratio.
          !> - Also, hydrometeor variables are mass or number mixing ratio
@@ -702,7 +696,9 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd,           &
             ncten3     => diag3d(:,:,36:36)
             qcten3     => diag3d(:,:,37:37)
          end if set_extended_diagnostic_pointers
-
+         if (merra2_aerosol_aware) then
+           call get_niwfa(aerfld, nifa, nwfa, ncol, nlev)
+         end if
          !> - Call mp_gt_driver() with or without aerosols
          if (is_aerosol_aware .or. merra2_aerosol_aware) then
             if (do_effective_radii) then