Merge branch 'develop' into feature/add-log-info

FernandoAndrade-NOAA · Apr 30, 2024 · 8062620 · 8062620
2 parents 1177ae8 + 13d5b6d
commit 8062620
Show file tree

Hide file tree

Showing 14 changed files with 224 additions and 669 deletions.
diff --git a/parm/README.make_flatfile b/parm/README.make_flatfile
@@ -6,14 +6,14 @@ To make a .txt flat file for UPP, follow these steps within the parm/ directory:
 
 2) Select, then validate, the associated "postcntrl" file, e.g.,
 
-      xmllint --noout --schema EMC_POST_CTRL_Schema.xsd fv3lam_rrfs.xml
+      xmllint --noout --schema EMC_POST_CTRL_Schema.xsd rrfs_postcntrl.xml
 
 3) If file validation succeeds in steps (1) and (2), generate the .txt flat file, e.g.,
 
-      perl PostXMLPreprocessor.pl fv3lam_rrfs.xml post_avblflds.xml postxconfig-NT-fv3lam_rrfs.txt
+      perl PostXMLPreprocessor.pl rrfs_postcntrl.xml post_avblflds.xml postxconfig-NT-rrfs.txt
 
-   In this example, "fv3lam_rrfs.xml" and "fv3lam_post_avblflds.xml" are input files, read by the perl 
-   script. The "postxconfig-NT-fv3lam_rrfs.txt" flat file is the output file produced by the script, which 
+   In this example, "rrfs_postcntrl.xml" and "post_avblflds.xml" are input files, read by the perl 
+   script. The "postxconfig-NT-rrfs.txt" flat file is the output file produced by the script, which 
    can have any name.
 
    Note that a log file will be created by this script, in addition to the flat file.

diff --git a/parm/makefile b/parm/makefile
@@ -35,7 +35,7 @@ ALL_TXT= \
   postxconfig-NT-GFS-F00-TWO.txt \
   postxconfig-NT-hrrr.txt \
   postxconfig-NT-rap.txt \
-  postxconfig-NT-fv3lam_rrfs.txt \
+  postxconfig-NT-rrfs.txt \
   postxconfig-NT-UFS-aerosol.txt \
   postxconfig-NT-UFS-aerosol-F00.txt \
   postxconfig-NT-GEFS-aerosol.txt \
@@ -65,7 +65,7 @@ postxconfig-NT-GFS-TWO.txt:          postcntrl_gfs_two.xml          post_avblfld
 postxconfig-NT-GFS-F00-TWO.txt:      postcntrl_gfs_f00_two.xml      post_avblflds.xml
 postxconfig-NT-hrrr.txt:             hrrr_postcntrl.xml             post_avblflds_raphrrr.xml
 postxconfig-NT-rap.txt:              rap_postcntrl.xml              post_avblflds_raphrrr.xml
-postxconfig-NT-fv3lam_rrfs.txt:      fv3lam_rrfs.xml                post_avblflds.xml
+postxconfig-NT-rrfs.txt:             rrfs_postcntrl.xml             post_avblflds.xml
 postxconfig-NT-UFS-aerosol.txt:      postcntrl_ufs_aerosol.xml      post_avblflds.xml
 postxconfig-NT-UFS-aerosol-F00.txt:  postcntrl_ufs_aerosol_f00.xml  post_avblflds.xml
 postxconfig-NT-GEFS-aerosol.txt:     postcntrl_gefs_aerosol.xml     post_avblflds.xml

diff --git a/parm/post_avblflds.xml b/parm/post_avblflds.xml
@@ -6857,7 +6857,10 @@
        <pdstmpl>tmpl4_48</pdstmpl>
        <pname>AEMFLX</pname>
        <aerosol_type>particulate_org_matter_dry</aerosol_type>
-       <fixed_sfc1_type>surface</fixed_sfc1_type>
+       <fixed_sfc1_type>entire_atmos_single_lyr</fixed_sfc1_type>
+       <typ_intvl_size>smaller_than_first_limit</typ_intvl_size>
+       <scale_fact_1st_size>7</scale_fact_1st_size>
+       <scale_val_1st_size>25</scale_val_1st_size>
        <scale>5.0</scale>
     </param>
 
@@ -6945,8 +6948,10 @@
     <param>
        <post_avblfldidx>755</post_avblfldidx>
        <shortname>HWP_ON_SURFACE</shortname>
+       <pdstmpl>tmpl4_8</pdstmpl>
        <longname>Hourly Wildfire Potential on surface</longname>
        <pname>WFIREPOT</pname>
+       <stats_proc>AVE</stats_proc>
        <fixed_sfc1_type>surface</fixed_sfc1_type>
        <scale>5.0</scale>
     </param>
@@ -8335,5 +8340,45 @@
        <scale>6.0</scale>
     </param>
 
+    <param>
+       <post_avblfldidx>1015</post_avblfldidx>
+       <shortname>EBB_ON_HYBRID_LVL</shortname>
+       <pdstmpl>tmpl4_48</pdstmpl>
+       <pname>AEMFLX</pname>
+       <aerosol_type>particulate_org_matter_dry</aerosol_type>
+       <fixed_sfc1_type>hybrid_lvl</fixed_sfc1_type>
+       <typ_intvl_size>smaller_than_first_limit</typ_intvl_size>
+       <scale_fact_1st_size>7</scale_fact_1st_size>
+       <scale_val_1st_size>25</scale_val_1st_size>
+       <scale>6.0</scale>
+    </param>
+
+    <param>
+       <post_avblfldidx>1016</post_avblfldidx>
+       <shortname>EBB_ON_ISOBARIC_SFC</shortname>
+       <pdstmpl>tmpl4_48</pdstmpl>
+       <pname>AEMFLX</pname>
+       <aerosol_type>particulate_org_matter_dry</aerosol_type>
+       <fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
+       <typ_intvl_size>smaller_than_first_limit</typ_intvl_size>
+       <scale_fact_1st_size>7</scale_fact_1st_size>
+       <scale_val_1st_size>25</scale_val_1st_size>
+       <scale>6.0</scale>
+    </param>
+
+    <param>
+       <post_avblfldidx>1017</post_avblfldidx>
+       <shortname>EBB_ON_SPEC_HGT_LVL_ABOVE_GRND_8m</shortname>
+       <pdstmpl>tmpl4_48</pdstmpl>
+       <pname>AEMFLX</pname>
+       <aerosol_type>particulate_org_matter_dry</aerosol_type>
+       <fixed_sfc1_type>spec_hgt_lvl_above_grnd</fixed_sfc1_type>
+       <level>8.</level>
+       <typ_intvl_size>smaller_than_first_limit</typ_intvl_size>
+       <scale_fact_1st_size>7</scale_fact_1st_size>
+       <scale_val_1st_size>25</scale_val_1st_size>
+       <scale>6.0</scale>
+    </param>
+
   </post_avblflds>
 </postxml>