Handmerge feature/pcolarco/#1-gocart2g-updates into develop

CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Added callbacks needed for GAAS2G. Removed diagnostic prints statements. Fixed bug with
+  the creation of Diagnostic Mie tables.
+
 - Updated `CODEOWNERS` to reflect changes in staffing
 - Updated `components.yaml`
   - Added fixture block

ESMF/Aerosol_GridComp/Aerosol_StateSpecs.rc

@@ -12,6 +12,7 @@ category: IMPORT
 #FRLAKE     | 1      | xy   | N   |      | fraction_of_lake
 #WET1       | 1      | xy   | N   |      | surface_soil_wetness
 #LWI        | 1      | xy   | N   |      | land-ocean-ice_mask
+#TROPP      | Pa     | xy   | N   |      | tropopause_pressure_based_on_blended_estimate
 #U10M       | m s-1  | xy   | N   |      | 10-meter_eastward_wind
 #V10M       | m s-1  | xy   | N   |      | 10-meter_northward_wind
 #AREA       | m^2    | xy   | N   |      | agrid_cell_area

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc

@@ -36,10 +36,7 @@ climOCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0
 # ORGANIC CARBON
 # ---------------
 # Biomass burning -- QFED-v2.x
-OC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/PIESA/sfc/QFED/NRT/v2.5r1_0.1_deg/Y%y4/M%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4
-
-# Terpene emission
-OC_TERPENE NA  Y Y %y4-%m2-%d2t12:00:00 none none terpene ExtData/PIESA/sfc/geia.terpene_biogenic.x144_y91_t12.1971.nc
+OC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null
 
 # Biofuel Source -- Included in AeroCom anthropogenic emissions
 OC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
@@ -63,7 +60,7 @@ pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
 # BLACK CARBON
 # ------------
 # QFED v2.x
-BC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/PIESA/sfc/QFED/NRT/v2.5r1_0.1_deg/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4
+BC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/PIESA/sfc/QFED/NRT/v2.5r1_0.1_deg/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4
 
 # Biofuel Source -- Included in AeroCom anthropogenic emissions
 BC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
@@ -84,7 +81,7 @@ BC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/PIESA
 # BROWN CARBON
 # ------------
 # Biomass burning -- QFED-v2.x
-BRC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none none biomass ExtData/PIESA/sfc/QFED/NRT/v2.5r1_0.1_deg/Y%y4/M%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4
+BRC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/PIESA/sfc/QFED/NRT/v2.5r1_0.1_deg/Y%y4/M%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4
 
 # Terpene emission
 BRC_TERPENE NA  Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc

@@ -10,6 +10,7 @@ category: IMPORT
  FROCEAN    | 1      | xy   | N   |      | fraction_of_ocean
  FRACI      | 1      | xy   | N   |      | ice_covered_fraction_of_tile
  LWI        | 1      | xy   | N   |      | land-ocean-ice_mask
+ TROPP      | Pa     | xy   | N   |      | tropopause_pressure_based_on_blended_estimate
  U10M       | m s-1  | xy   | N   |      | 10-meter_eastward_wind
  V10M       | m s-1  | xy   | N   |      | 10-meter_northward_wind
  USTAR      | m s-1  | xy   | N   |      | surface_velocity_scale
@@ -35,7 +36,10 @@ category: IMPORT
  pSOA_BIOB_VOC   | kg m-3 s-1 | xyz | C |   | SOA from Anthropogenic and biomass burning VOC
 #........................................................................................
  OC_BIOMASS  | 1      | xy   | N   |      | biomass burning emissions
- OC_TERPENE  | 1      | xy   | N   |      | terpene emissions
+ OC_ISOPRENE | 1      | xy   | N   |      | source species
+ OC_MTPA     | 1      | xy   | N   |      | source species
+ OC_MTPO     | 1      | xy   | N   |      | source species
+ OC_LIMO     | 1      | xy   | N   |      | source species
  OC_BIOFUEL  | 1      | xy   | N   |      | biofuel emissions
  OC_ANTEOC1  | 1      | xy   | N   |      | anthropogenic BF emissions
  OC_ANTEOC2  | 1      | xy   | N   |      | anthropogenic FF emissions
@@ -69,8 +73,8 @@ category: EXPORT
 #----------------------------------------------------------------------------------------
  CAMASS*    | kg kg-1    | xyz | C   |       | Carbonaceous Aerosol Mass Mixing Ratio                
  CACONC*    | kg m-3     | xyz | C   |       | Carbonaceous Aerosol Mass Concentration               
- CAEXTCOEF* | m-1        | xyz | C   | size(self%wavelengths_profile) | Carbonaceous Aerosol Extinction Coefficient [550 nm]  
- CASCACOEF* | m-1        | xyz | C   | size(self%wavelengths_profile) | Carbonaceous Aerosol Scattering Coefficient [550 nm]  
+ CAEXTCOEF* | m-1        | xyz | C   | size(self%wavelengths_profile) | Carbonaceous Aerosol Extinction Coefficient 
+ CASCACOEF* | m-1        | xyz | C   | size(self%wavelengths_profile) | Carbonaceous Aerosol Scattering Coefficient 
 #...........|............|.....|.....|.......|............................................
  CAEM*      | kg m-2 s-1 | xy  | N   | nbins | Carbonaceous Aerosol Emission (Bin %d) 
  CASD*      | kg m-2 s-1 | xy  | N   | nbins | Carbonaceous Aerosol Sedimentation (Bin %d)
@@ -85,8 +89,10 @@ category: EXPORT
  CAPSOA*    | kg m-2 s-1 | xy  | N   |       | Carbonaceous Aerosol SOA Production                
  CASMASS*   | kg m-3     | xy  | N   |       | Carbonaceous Aerosol Surface Mass Concentration    
  CACMASS*   | kg m-2     | xy  | N   |       | Carbonaceous Aerosol Column Mass Density           
- CAEXTTAU*  |      1     | xy  | N   | size(self%wavelengths_vertint)  | Carbonaceous Aerosol Extinction AOT [550 nm]       
- CASCATAU*  |      1     | xy  | N   | size(self%wavelengths_vertint)  | Carbonaceous Aerosol Scattering AOT [550 nm]       
+ CAEXTTAU*  |      1     | xy  | N   | size(self%wavelengths_vertint) | Carbonaceous Aerosol Extinction AOT       
+ CASTEXTTAU*|      1     | xy  | N   | size(self%wavelengths_vertint) | Carbonaceous Aerosol Extinction AOT Stratosphere      
+ CASCATAU*  |      1     | xy  | N   | size(self%wavelengths_vertint) | Carbonaceous Aerosol Scattering AOT       
+ CASTSCATAU*|      1     | xy  | N   | size(self%wavelengths_vertint) | Carbonaceous Aerosol Scattering AOT Stratosphere     
  CAANGSTR*  |      1     | xy  | N   |       | Carbonaceous Aerosol Angstrom parameter [470-870 nm] 
  CAFLUXU*   | kg m-1 s-1 | xy  | N   |       | Carbonaceous Aerosol column u-wind mass flux       
  CAFLUXV*   | kg m-1 s-1 | xy  | N   |       | Carbonaceous Aerosol column v-wind mass flux       

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_CA.br.rc → ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_instance_CA.br.rc

@@ -2,7 +2,6 @@
 # Resource file for BR parameters.
 #
 
-
 aerosol_radBands_optics_file: ExtData/MERRA2/x/opticsBands_BRC.v1_5.RRTMG.nc
 aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_BRC.v1_5.nc
 
@@ -13,7 +12,7 @@ aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
 terpene_emission_fraction: 0.1
 
 # Ratio of POM/BRC -> convert source masses from carbon to POM
-pom_brc_ratio: 1.4
+pom_ca_ratio: 1.8
 
 # Initially hydrophobic portion
 hydrophobic_fraction: 0.5
@@ -35,9 +34,6 @@ molecular_weight: 0.18  0.18
 # Number of particles per kg mass
 fnum: 9.76e17  9.76e17
 
-# Number median radius [um]
-particle_radius_number: 0.0212  0.0212
-
 # Sigma of lognormal number distribution
 sigma: 2.20  2.20
 

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_instance_CA.oc.rc

@@ -0,0 +1,43 @@
+#
+# Resource file for Organic Carbon parameters. 
+#
+
+aerosol_radBands_optics_file: ExtData/MERRA2/x/opticsBands_OC.v1_3.RRTMG.nc
+aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_OC.v1_3.nc
+
+# Heights [m] of LTO, CDS and CRS aviation emissions layers
+aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
+
+# Fraction of biogenic VOCs emissions for SOA production
+monoterpenes_emission_fraction: 0.05
+isoprene_emission_fraction:     0.03
+
+# Ratio of POM/OC -> convert source masses from carbon to POM
+pom_ca_ratio: 1.8
+
+# particle radius
+particle_radius_microns: 0.35 0.35
+
+rhFlag: 0
+
+# Initially hydrophobic portion
+hydrophobic_fraction: 0.5
+
+# Scavenging efficiency per bin [km-1] (NOT USED UNLESS RAS IS CALLED)
+fscav: 0.0  0.4 
+
+# Dry particle density [kg m-3]
+particle_density: 1800   1800
+
+# Molecular weight of species [kg mole-1]
+molecular_weight: 0.18  0.18
+
+# Number of particles per kg mass
+fnum: 9.76e17  9.76e17
+
+# Sigma of lognormal number distribution
+sigma: 2.20  2.20
+
+pressure_lid_in_hPa: 0.01
+
+nbins: 2 

ESMF/GOCART2G_GridComp/CA2G_GridComp/CCMI_REF-C1/CA2G_GridComp_CA.bc.rc → ESMF/GOCART2G_GridComp/CA2G_GridComp/CCMI_REF-C1/CA2G_instance_CA.bc.rc

@@ -5,10 +5,7 @@
 nbins:  2 
 
 aerosol_radBands_optics_file: ExtData/MERRA2/x/opticsBands_BC.v1_3.RRTMG.nc
-
 aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_BC.v1_3.nc
-aerosol_monochromatic_optics_wavelength: 4.7e-7 5.5e-7 6.7e-7 8.7e-7 ! units: nm
-n_channels: 4
 
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
@@ -20,7 +17,7 @@ hydrophobic_fraction: 0.8
 fscav: 0.0  0.4 
 
 # Dry particle density [kg m-3]
-particle_density: 1000   1000
+particle_density: 1800   1800
 
 # Molecular weight of species [kg mole-1]
 molecular_weight: 0.18  0.18
@@ -29,9 +26,10 @@ molecular_weight: 0.18  0.18
 fnum: 1.50e19  1.50e19
 
 # Number median radius [um]
-particle_radius_microns: 0.0118 0.0118
+particle_radius_microns: 0.35 0.35
 
 rhFlag: 0
+particle_density: 1800   1800
 
 # Sigma of lognormal number distribution
 sigma: 2.0  2.0

ESMF/GOCART2G_GridComp/CA2G_GridComp/MERRA2/CA2G_GridComp_CA.br.rc → ESMF/GOCART2G_GridComp/CA2G_GridComp/CCMI_REF-C1/CA2G_instance_CA.br.rc

@@ -2,13 +2,8 @@
 # Resource file for BR parameters.
 #
 
-
 aerosol_radBands_optics_file: ExtData/MERRA2/x/opticsBands_BRC.v1_5.RRTMG.nc
-
 aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_BRC.v1_5.nc
-aerosol_monochromatic_optics_wavelength: 470 550 670 870 ! units: nm
-n_channels: 4
-r_channels: 4.7e-7 5.5e-7 6.7e-7 8.7e-7
 
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
@@ -17,7 +12,7 @@ aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
 terpene_emission_fraction: 0.1
 
 # Ratio of POM/BRC -> convert source masses from carbon to POM
-pom_brc_ratio: 1.4
+pom_brc_ratio: 1.8
 
 # Initially hydrophobic portion
 hydrophobic_fraction: 0.5
@@ -26,7 +21,7 @@ hydrophobic_fraction: 0.5
 fscav: 0.0  0.4
 
 # particle radius
-particle_radius_microns: 0.0212  0.0212
+particle_radius_microns: 0.35 0.35
 
 rhFlag: 0
 
@@ -42,4 +37,6 @@ fnum: 9.76e17  9.76e17
 # Sigma of lognormal number distribution
 sigma: 2.20  2.20
 
+pressure_lid_in_hPa: 0.01
+
 nbins: 2

ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_CA.oc.rc → ESMF/GOCART2G_GridComp/CA2G_GridComp/CCMI_REF-C1/CA2G_instance_CA.oc.rc

@@ -8,17 +8,16 @@ aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_OC.v1_3.nc
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
 
-# Fraction of terpene emissions for SOA production
-terpene_emission_fraction: 0.1
+# Fraction of biogenic VOCs emissions for SOA production
+monoterpenes_emission_fraction: 0.05
+isoprene_emission_fraction:     0.03
 
 # Ratio of POM/OC -> convert source masses from carbon to POM
 pom_oc_ratio: 1.4
 
 # particle radius
 particle_radius_microns: 0.35 0.35
 
-particle_density: 1800 1800
-
 rhFlag: 0
 
 # Initially hydrophobic portion
@@ -41,6 +40,4 @@ sigma: 2.20  2.20
 
 pressure_lid_in_hPa: 0.01
 
-#point_emissions_srcfilen:  /gpfsm/dnb32/esherman/gocartRefactor/RC/CA2G_point_src_test.rc
-
 nbins: 2 

ESMF/GOCART2G_GridComp/CA2G_GridComp/MERRA2-DD/CA2G_GridComp_CA.bc.rc → ESMF/GOCART2G_GridComp/CA2G_GridComp/CCMI_REF-C2/CA2G_instance_CA.bc.rc

@@ -5,10 +5,7 @@
 nbins:  2 
 
 aerosol_radBands_optics_file: ExtData/MERRA2/x/opticsBands_BC.v1_3.RRTMG.nc
-
 aerosol_monochromatic_optics_file: ExtData/AeroCom/x/optics_BC.v1_3.nc
-aerosol_monochromatic_optics_wavelength: 4.7e-7 5.5e-7 6.7e-7 8.7e-7 ! units: nm
-n_channels: 4
 
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
@@ -20,7 +17,7 @@ hydrophobic_fraction: 0.8
 fscav: 0.0  0.4 
 
 # Dry particle density [kg m-3]
-particle_density: 1000   1000
+particle_density: 1800   1800
 
 # Molecular weight of species [kg mole-1]
 molecular_weight: 0.18  0.18
@@ -29,9 +26,10 @@ molecular_weight: 0.18  0.18
 fnum: 1.50e19  1.50e19
 
 # Number median radius [um]
-particle_radius_microns: 0.0118  0.0118
+particle_radius_microns: 0.35 0.35
 
 rhFlag: 0
+particle_density: 1800   1800
 
 # Sigma of lognormal number distribution
 sigma: 2.0  2.0