[AQM] Implement output capabilities for production and bring pm25 as …

…a 3D diagnostic tracer in UFSWM (#1494) * Adding extra tracer (PM2.5) from AQM * correct units on aqm_pm25 tracer * Bring in production and fengsha section, but only enable prod * Keep PM2.5 name consistent with production. Co-authored-by: jkbk2004 <[email protected]>
ufs-community · Nov 18, 2022 · d31ee42 · d31ee42
1 parent cd35139
commit d31ee42
Show file tree

Hide file tree

Showing 14 changed files with 4,331 additions and 4,323 deletions.
diff --git a/AQM b/AQM
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/parm/aqm/aqm.rc b/tests/parm/aqm/aqm.rc
@@ -29,7 +29,7 @@ ctm_pmdiag: true
 #
 # Input emissions
 #
-emission_sources: anthro fire
+emission_sources: anthro fire prod
 
 #
 # Anthropogenic
@@ -237,6 +237,26 @@ 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
 #
@@ -298,3 +318,25 @@ fire_species::
  XYL 0.0002964 CO KG/M2/S
  FRP 1000000 MeanFRP 1
 ::
+
+#
+# Output products
+#
+prod_type: product
+
+prod_file: aqm.prod.nc
+
+prod_frequency: hourly
+
+prod_sync: true
+
+prod_species::
+ O3 ozone instantaneous
+ O3 o3min min
+ O3 o3max max
+ O3 o3ave average
+ PM2.5 pm25 instantaneous
+ PM2.5 pm25min min
+ PM2.5 pm25max max
+ PM2.5 pm25ave average
+::
diff --git a/tests/parm/diag_table/diag_table_aqm b/tests/parm/diag_table/diag_table_aqm
@@ -470,6 +470,7 @@
 "gfs_dyn", "pm25at", "pm25at", "fv3_history", "all", .false., "none", 2
 "gfs_dyn", "pm25ac", "pm25ac", "fv3_history", "all", .false., "none", 2
 "gfs_dyn", "pm25co", "pm25co", "fv3_history", "all", .false., "none", 2
+"gfs_dyn", "pm25_tot", "pm25_tot", "fv3_history", "all", .false., "none", 2
 "gfs_phys", "aod", "aod", "fv3_history2d", "all", .false., "none", 2
 #=============================================================================================
 #

diff --git a/tests/parm/field_table/field_table_aqm b/tests/parm/field_table/field_table_aqm
@@ -967,6 +967,11 @@
  "units", "1"
  "tracer_usage", "chemistry", "type=diagnostic"
  "profile_type", "fixed", "surface_value=0.0" /
+ "TRACER", "atmos_mod", "PM25_TOT"
+ "longname", "PM 2.5 from AQM model"
+ "units", "ug/m3"
+ "tracer_usage", "chemistry", "type=diagnostic"
+ "profile_type", "fixed", "surface_value=0.0" /
 # non-prognostic cloud amount
  "TRACER", "atmos_mod", "cld_amt"
  "longname", "cloud amount"

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=20221110
+BL_DATE=20221116
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/regional_atmaq b/tests/tests/regional_atmaq
@@ -74,7 +74,7 @@ export aqm_model='aqm'
 
 export FIELD_TABLE=field_table_aqm
 export DIAG_TABLE=diag_table_aqm
-export DNATS=4
+export DNATS=5
 export FSCAV_AERO="'aacd:0.0', 'acet:0.0', 'acrolein:0.0', 'acro_primary:0.0',
  'ald2:0.0', 'ald2_primary:0.0', 'aldx:0.0', 'benzene:0.0',
  'butadiene13:0.0', 'cat1:0.0', 'cl2:0.0', 'clno2:0.0',