Enable Thompson microphysics with UFS-Aerosols and update GOCART (#1049)

This update allows the Thompson microphysics scheme to be used with prognostic aerosols (UFS-Aerosols) and updates GOCART to version 2.0.2.
ufs-community · Feb 22, 2022 · 9bd6397 · 9bd6397
1 parent 2a410c7
commit 9bd6397
Show file tree

Hide file tree

Showing 14 changed files with 2,779 additions and 2,772 deletions.
diff --git a/FV3 b/FV3
diff --git a/GOCART b/GOCART
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/gocart/AERO_ExtData.rc b/tests/parm/gocart/AERO_ExtData.rc
@@ -95,6 +95,9 @@ OC_ANTEOC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 ExtData/PIESA/sfc/HTAP
 # EDGAR based ship emissions
 OC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_ship ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.ships.x3600_y1800_t12.2010.nc4
 
+# Aircraft fuel consumption
+OC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
+
 # Aviation emissions during the three phases of flight
 OC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.aviation_lto.x3600_y1800_t12.2010.nc4
 OC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.aviation_cds.x3600_y1800_t12.2010.nc4
@@ -119,6 +122,9 @@ BC_ANTEBC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none antebc2 ExtData/PIESA/sfc/HTAP
 # EDGAR based ship emissions
 BC_SHIP NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_ship ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.ships.x3600_y1800_t12.2010.nc4
 
+# Aircraft fuel consumption
+BC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
+
 # Aviation emissions during the LTO, SDC and CRS phases of flight
 BC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.aviation_lto.x3600_y1800_t12.2010.nc4
 BC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.aviation_cds.x3600_y1800_t12.2010.nc4
@@ -143,6 +149,9 @@ BRC_ANTEBRC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null
 # EDGAR based ship emissions
 BRC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null
 
+# Aircraft fuel consumption
+BRC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none none /dev/null
+
 # Aviation emissions during the three phases of flight
 BRC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
 BRC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null

diff --git a/tests/parm/gocart/CA2G_instance_CA.bc.rc b/tests/parm/gocart/CA2G_instance_CA.bc.rc
@@ -7,6 +7,9 @@ nbins:  2
 aerosol_radBands_optics_file: ExtData/optics/opticsBands_BC.v1_3.RRTMG.nc
 aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_BC.v1_3.nc
 
+# Aircraft emission factor: convert input unit to kg C
+aircraft_fuel_emission_factor: 1.0000
+
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
 
@@ -35,3 +38,4 @@ sigma: 2.0  2.0
 
 pressure_lid_in_hPa: 0.01
 
+point_emissions_srcfilen: /dev/null
diff --git a/tests/parm/gocart/CA2G_instance_CA.oc.rc b/tests/parm/gocart/CA2G_instance_CA.oc.rc
@@ -5,6 +5,9 @@
 aerosol_radBands_optics_file: ExtData/optics/opticsBands_OC.v1_3.RRTMG.nc
 aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_OC.v1_3.nc
 
+# Aircraft emission factor: convert input unit to kg C
+aircraft_fuel_emission_factor: 1.0000
+
 # Heights [m] of LTO, CDS and CRS aviation emissions layers
 aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3
 
@@ -41,3 +44,5 @@ sigma: 2.20  2.20
 pressure_lid_in_hPa: 0.01
 
 nbins: 2 
+
+point_emissions_srcfilen: /dev/null