Bring in calculations for point source emissions in AQM (#1560)

* Updated FV3 hash, Bring in Fengsha and Pt Source input files, bring in updated aqm.rc Co-authored-by: Raffaele Montuoro <[email protected]>
ufs-community · Jan 9, 2023 · e50f701 · e50f701
1 parent a0bbece
commit e50f701
Show file tree

Hide file tree

Showing 16 changed files with 5,180 additions and 5,060 deletions.
diff --git a/AQM b/AQM
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/fv3_conf/fv3_aqm.IN b/tests/fv3_conf/fv3_aqm.IN
@@ -31,3 +31,5 @@ cp @[INPUTDATA_ROOT]/AQM/fix/NR_cb6r3_ae6_aq.nml .
 cp @[INPUTDATA_ROOT]/AQM/fix/omi_cmaq_2015_361X179.dat .
 cp @[INPUTDATA_ROOT]/AQM/fix/PHOT_OPTICS.dat .
 cp @[INPUTDATA_ROOT]/AQM/fix/Species_Table_TR_0.nml .
+cp @[INPUTDATA_ROOT]/AQM/fix/pt-2019080112.nc .
+cp @[INPUTDATA_ROOT]/AQM/fix/FENGSHA_p8_10km_inputs_CONUS_775.nc .
diff --git a/tests/parm/aqm/aqm.rc b/tests/parm/aqm/aqm.rc
@@ -16,7 +16,7 @@ csqy_data: CSQY_DATA_cb6r3_ae6_aq
 optics_data: PHOT_OPTICS.dat
 omi_data: omi_cmaq_2015_361X179.dat
 
-init_concentrations: false
+init_concentrations: true
 
 run_aerosol: true
 
@@ -25,11 +25,16 @@ dy_tracer_map_start: 9
 
 ctm_aod: true
 ctm_pmdiag: true
+ctm_wb_dust: true
+
+ctm_stdout: maintask
 
 #
 # Input emissions
 #
-emission_sources: anthro fire prod
+# emission_sources: anthro fire pt dust prod 
+# emission_sources: anthro dust prod 
+emission_sources: anthro pt fire dust prod 
 
 #
 # Anthropogenic
@@ -73,63 +78,63 @@ anthro_frequency: hourly
 # NO2 -0.05000 no2_sink_1 kg/s
 #
 anthro_species::
- ACET 1.00000 ACET KG/M2/S
- ACROLEIN 1.00000 ACROLEIN KG/M2/S
- ALD2 1.00000 ALD2 KG/M2/S
- ALD2_PRIMARY 1.00000 ALD2_PRIMARY KG/M2/S
- ALDX 1.00000 ALDX KG/M2/S
- BENZ 1.00000 BENZ KG/M2/S
- BUTADIENE13 1.00000 BUTADIENE13 KG/M2/S
- CH4 1.00000 CH4 KG/M2/S
- CH4_INV 1.00000 CH4_INV KG/M2/S
- CL2 1.00000 CL2 KG/M2/S
- CO 1.00000 CO KG/M2/S
- CO2_INV 1.00000 CO2_INV KG/M2/S
- ETH 1.00000 ETH KG/M2/S
- ETHA 1.00000 ETHA KG/M2/S
- ETHY 1.00000 ETHY KG/M2/S
- ETOH 1.00000 ETOH KG/M2/S
- FORM 1.00000 FORM KG/M2/S
- FORM_PRIMARY 1.00000 FORM_PRIMARY KG/M2/S
- HCL 1.00000 HCL KG/M2/S
- HONO 1.00000 HONO KG/M2/S
- IOLE 1.00000 IOLE KG/M2/S
- ISOP 1.00000 ISOP KG/M2/S
- KET 1.00000 KET KG/M2/S
- MEOH 1.00000 MEOH KG/M2/S
- NAPH 1.00000 NAPH KG/M2/S
- NH3 1.00000 NH3 KG/M2/S
- NH3_FERT 1.00000 NH3_FERT KG/M2/S
- NO 1.00000 NO KG/M2/S
- NO2 1.00000 NO2 KG/M2/S
- OLE 1.00000 OLE KG/M2/S
- PAL 1.00000 PAL KG/M2/S
- PAR 1.00000 PAR KG/M2/S
- PCA 1.00000 PCA KG/M2/S
- PCL 1.00000 PCL KG/M2/S
- PEC 1.00000 PEC KG/M2/S
- PFE 1.00000 PFE KG/M2/S
- PH2O 1.00000 PH2O KG/M2/S
- PK 1.00000 PK KG/M2/S
- PMC 1.00000 PMC KG/M2/S
- PMG 1.00000 PMG KG/M2/S
- PMN 1.00000 PMN KG/M2/S
- PMOTHR 1.00000 PMOTHR KG/M2/S
- PNA 1.00000 PNA KG/M2/S
- PNCOM 1.00000 PNCOM KG/M2/S
- PNH4 1.00000 PNH4 KG/M2/S
- PNO3 1.00000 PNO3 KG/M2/S
- POC 1.00000 POC KG/M2/S
- PRPA 1.00000 PRPA KG/M2/S
- PSI 1.00000 PSI KG/M2/S
- PSO4 1.00000 PSO4 KG/M2/S
- PTI 1.00000 PTI KG/M2/S
- SO2 1.00000 SO2 KG/M2/S
- SOAALK 1.00000 SOAALK KG/M2/S
- SULF 1.00000 SULF KG/M2/S
- TERP 1.00000 TERP KG/M2/S
- TOL 1.00000 TOL KG/M2/S
- XYLMN 1.00000 XYLMN KG/M2/S
+ ACET 0.00000 ACET KG/M2/S
+ ACROLEIN 0.00000 ACROLEIN KG/M2/S
+ ALD2 0.00000 ALD2 KG/M2/S
+ ALD2_PRIMARY 0.00000 ALD2_PRIMARY KG/M2/S
+ ALDX 0.00000 ALDX KG/M2/S
+ BENZ 0.00000 BENZ KG/M2/S
+ BUTADIENE13 0.00000 BUTADIENE13 KG/M2/S
+ CH4 0.00000 CH4 KG/M2/S
+ CH4_INV 0.00000 CH4_INV KG/M2/S
+ CL2 0.00000 CL2 KG/M2/S
+ CO 0.00000 CO KG/M2/S
+ CO2_INV 0.00000 CO2_INV KG/M2/S
+ ETH 0.00000 ETH KG/M2/S
+ ETHA 0.00000 ETHA KG/M2/S
+ ETHY 0.00000 ETHY KG/M2/S
+ ETOH 0.00000 ETOH KG/M2/S
+ FORM 0.00000 FORM KG/M2/S
+ FORM_PRIMARY 0.00000 FORM_PRIMARY KG/M2/S
+ HCL 0.00000 HCL KG/M2/S
+ HONO 0.00000 HONO KG/M2/S
+ IOLE 0.00000 IOLE KG/M2/S
+ ISOP 0.00000 ISOP KG/M2/S
+ KET 0.00000 KET KG/M2/S
+ MEOH 0.00000 MEOH KG/M2/S
+ NAPH 0.00000 NAPH KG/M2/S
+ NH3 0.00000 NH3 KG/M2/S
+ NH3_FERT 0.00000 NH3_FERT KG/M2/S
+ NO 0.00000 NO KG/M2/S
+ NO2 0.00000 NO2 KG/M2/S
+ OLE 0.00000 OLE KG/M2/S
+ PAL 0.00000 PAL KG/M2/S
+ PAR 0.00000 PAR KG/M2/S
+ PCA 0.00000 PCA KG/M2/S
+ PCL 0.00000 PCL KG/M2/S
+ PEC 0.00000 PEC KG/M2/S
+ PFE 0.00000 PFE KG/M2/S
+ PH2O 0.00000 PH2O KG/M2/S
+ PK 0.00000 PK KG/M2/S
+ PMC 0.00000 PMC KG/M2/S
+ PMG 0.00000 PMG KG/M2/S
+ PMN 0.00000 PMN KG/M2/S
+ PMOTHR 0.00000 PMOTHR KG/M2/S
+ PNA 0.00000 PNA KG/M2/S
+ PNCOM 0.00000 PNCOM KG/M2/S
+ PNH4 0.00000 PNH4 KG/M2/S
+ PNO3 0.00000 PNO3 KG/M2/S
+ POC 0.00000 POC KG/M2/S
+ PRPA 0.00000 PRPA KG/M2/S
+ PSI 0.00000 PSI KG/M2/S
+ PSO4 0.00000 PSO4 KG/M2/S
+ PTI 0.00000 PTI KG/M2/S
+ SO2 0.00000 SO2 KG/M2/S
+ SOAALK 0.00000 SOAALK KG/M2/S
+ SULF 0.00000 SULF KG/M2/S
+ TERP 0.00000 TERP KG/M2/S
+ TOL 0.00000 TOL KG/M2/S
+ XYLMN 0.00000 XYLMN KG/M2/S
  AACD
  FACD
  GLYXL
@@ -139,6 +144,26 @@ anthro_species::
  SESQ
  TOLU
 ::
+#
+# Fengsha Dust Emission Option
+#
+dust_type: fengsha
+
+dust_format: netcdf
+
+dust_frequency: monthly
+
+#dust_file: FENGSHA_p8_10km_inputs_RRFS_CONUScompact_13km.nc
+dust_file: FENGSHA_p8_10km_inputs_CONUS_775.nc 
+
+dust_alpha: 0.05
+
+dust_species::
+ clayf 1.00000 clayfrac 1
+ sandf 1.00000 sandfrac 1
+ drag 1.00000 albedo_drag 1
+ uthr 1.00000 uthres 1
+::
 
 #
 # Biogenic
@@ -237,26 +262,6 @@ bio_species::
  LAI_METHW 1.00000 LAI_METHW 1
 ::
 
-#
-# FENGSHA
-#
-fengsha_yn: true 
-
-fengsha_type: fengsha
-
-fengsha_format: netcdf
-
-fengsha_file: FENGSHA_p8_10km_inputs_RRFS_CONUScompact_13km.nc
-
-fengsha_frequency: monthly
-
-fengsha_species::
- CLAYF 1.00000 clayfrac 1
- SANDF 1.00000 sandfrac 1
- DRAG 1.00000 albedo_drag 1
- UTHR 1.00000 uthres 1
-::
-
 #
 # Fire emissions from GBBEPx
 #
@@ -319,6 +324,83 @@ fire_species::
  FRP 1000000 MeanFRP 1
 ::
 
+
+pt_type: point-source
+
+pt_file: pt-2019080112.nc
+
+pt_frequency: hourly
+
+pt_plume_rise: default
+pt_layers: 8
+
+pt_latlon_names: LATITUDE LONGITUDE
+pt_stack_diameter: STKDM
+pt_stack_height: STKHT
+pt_stack_temperature: STKTK
+pt_stack_velocity: STKVE
+
+pt_species::
+ ACET 1.0000 ACET MOL/S
+ ACROLEIN 1.0000 ACROLEIN MOL/S
+ ALD2 1.0000 ALD2 MOL/S
+ ALD2_PRIMARY 1.0000 ALD2_PRIMARY MOL/S
+ ALDX 1.0000 ALDX MOL/S
+ BENZ 1.0000 BENZ MOL/S
+ BUTADIENE13 1.0000 BUTADIENE13 MOL/S
+ CH4 1.0000 CH4 MOL/S
+ CL2 1.0000 CL2 MOL/S
+ CO 1.0000 CO MOL/S
+ ETH 1.0000 ETH MOL/S
+ ETHA 1.0000 ETHA MOL/S
+ ETHY 1.0000 ETHY MOL/S
+ ETOH 1.0000 ETOH MOL/S
+ FORM 1.0000 FORM MOL/S
+ FORM_PRIMARY 1.0000 FORM_PRIMARY MOL/S
+ HCL 1.0000 HCL MOL/S
+ HONO 1.0000 HONO MOL/S
+ IOLE 1.0000 IOLE MOL/S
+ ISOP 1.0000 ISOP MOL/S
+ KET 1.0000 KET MOL/S
+ MEOH 1.0000 MEOH MOL/S
+ NAPH 1.0000 NAPH MOL/S
+ NH3 1.0000 NH3 MOL/S
+ NH3_FERT 1.0000 NH3_FERT MOL/S
+ NO 1.0000 NO MOL/S
+ NO2 1.0000 NO2 MOL/S
+ NVOL 1.0000 NVOL MOL/S
+ OLE 1.0000 OLE MOL/S
+ PAL 1.0000 PAL G/S
+ PAR 1.0000 PAR MOL/S
+ PCA 1.0000 PCA G/S
+ PCL 1.0000 PCL G/S
+ PEC 1.0000 PEC G/S
+ PFE 1.0000 PFE G/S
+ PH2O 1.0000 PH2O G/S
+ PK 1.0000 PK G/S
+ PMC 1.0000 PMC G/S
+ PMG 1.0000 PMG G/S
+ PMN 1.0000 PMN G/S
+ PMOTHR 1.0000 PMOTHR G/S
+ PNA 1.0000 PNA G/S
+ PNCOM 1.0000 PNCOM G/S
+ PNH4 1.0000 PNH4 G/S
+ PNO3 1.0000 PNO3 G/S
+ POC 1.0000 POC G/S
+ PRPA 1.0000 PRPA MOL/S
+ PSI 1.0000 PSI G/S
+ PSO4 1.0000 PSO4 G/S
+ PTI 1.0000 PTI G/S
+ SO2 1.0000 SO2 MOL/S
+ SOAALK 1.0000 SOAALK MOL/S
+ SULF 1.0000 SULF MOL/S
+ TERP 1.0000 TERP MOL/S
+ TOL 1.0000 TOL MOL/S
+ UNR 1.0000 UNR MOL/S
+ VOC_INV 1.0000 VOC_INV G/S
+ XYLMN 1.0000 XYLMN MOL/S
+::
+
 #
 # Output products
 #

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -51,7 +51,7 @@ RUN | control_latlon
 RUN | control_wrtGauss_netcdf_parallel | | fv3 |
 RUN | control_c48 | | fv3 |
 RUN | control_c192 | | fv3 |
-RUN | control_c384 | - cheyenne.intel | fv3 |
+RUN | control_c384 |   | fv3 |
 RUN | control_c384gdas | | fv3 |
 RUN | control_stochy | | fv3 |
 RUN | control_stochy_restart | | | control_stochy

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
  TEST_35D=true
 fi
 
-BL_DATE=20230103
+BL_DATE=20230106
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/control_c384 b/tests/tests/control_c384
@@ -53,5 +53,5 @@ export FV3_RUN=control_run.IN
 export CCPP_SUITE=FV3_GFS_v16
 export INPUT_NML=control.nml.IN
 
-if [[ $MACHINE_ID = gaea.* || $MACHINE_ID = cheyenne.* ]]; then TPN=18
+if [[ $MACHINE_ID = gaea.* || $MACHINE_ID = cheyenne.* || $MACHINE_ID = jet.* ]]; then TPN=18
 fi