Fix water-friendly aerosol surface emissions (#79)

* Fixes TEMPO case statement to properly initialize aerosol emissions

* Adds scale-awareness to water-friendly aerosol emissions and reduces emissions

* Update TEMPO with gitignore file and CCPP updates

* Update version to 8.2.2-1.2

* Change version to 8.2.2-2.0

Author: AndersJensen-NOAA

README.md

@@ -1,4 +1,4 @@
-MPAS-v8.2.2-1.1
+MPAS-v8.2.2-2.0
 ====
 
 The Model for Prediction Across Scales (MPAS) is a collaborative project for

src/core_atmosphere/Registry.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.2.2-1.1">
+<registry model="mpas" core="atmosphere" core_abbrev="atm" version="8.2.2-2.0">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->

src/core_atmosphere/physics/TEMPO

@@ -447,20 +447,21 @@ subroutine init_microphysics(dminfo,configs,mesh,state,time_lev,sfc_input,diag_p
        call thompson_init(l_mp_tables)
        call init_thompson_clouddroplets_forMPAS(mesh,sfc_input,diag_physics)
 
-    case("mp_tempo")
-       call tempo_init(l_mp_tables=l_mp_tables, &
-            hail_aware_flag=config_tempo_hailaware, aerosol_aware_flag=config_tempo_aerosolaware)
-
        microp2_select: select case(trim(microp_scheme))
           case("mp_thompson_aerosols")
              call init_thompson_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics)
 
-          case("tempo_aerosolaware")
-             call init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics)
-
           case default
        end select microp2_select
 
+    case("mp_tempo")
+       call tempo_init(l_mp_tables=l_mp_tables, &
+            hail_aware_flag=config_tempo_hailaware, aerosol_aware_flag=config_tempo_aerosolaware)
+
+       if (config_tempo_aerosolaware) then
+          call init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,diag_physics)
+       endif
+
     case("mp_wsm6")
        call mp_wsm6_init(den0=rho_a,denr=rho_r,dens=rho_s,cl=cliq,cpv=cpv, &
                          hail_opt=hail_opt,errmsg=errmsg,errflg=errflg)

src/core_atmosphere/physics/mpas_atmphys_driver_microphysics.F

@@ -183,7 +183,7 @@ subroutine init_tempo_aerosols_forMPAS(do_restart,dminfo,mesh,state,time_lev,dia
        deltaz = 9.0
     endif
     nwfa2d(iCell) = max(nwfa_default, min(aero_max, nwfa(k,iCell))) * &
-         0.000196 * 50.0 / deltaz
+         0.000196 * (5.0 / deltaz) * (areaCell(iCell) / 9.e6)
     nifa2d(iCell) = 0._RKIND
 !   call mpas_log_write('$i $r $r $r',intArgs=(/iCell/),realArgs=(/airmass,nwfa2d(iCell),nifa2d(iCell)/))
  enddo

src/core_atmosphere/physics/mpas_atmphys_init_tempo.F

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="8.2.2-1.1">
+<registry model="mpas" core="init_atmosphere" core_abbrev="init_atm" version="8.2.2-2.0">
 
 <!-- **************************************************************************************** -->
 <!-- ************************************** Dimensions ************************************** -->