Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndrewBenjamin-NOAA
AndrewBenjamin-NOAA committed Apr 2, 2024
2 parents 193549b + df9b16b commit f612448
Show file tree
Hide file tree
Showing 8 changed files with 318 additions and 43 deletions.
14 changes: 10 additions & 4 deletions parm/fv3lam_rrfs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@
</param>

<param>
<shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
<pname>SOILMOI</pname>
<shortname>CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
<pname>CISOILM</pname>
<scale>3.0</scale>
</param>

Expand Down Expand Up @@ -2196,8 +2196,8 @@
</param>

<param>
<shortname>SOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
<pname>SOILMOI</pname>
<shortname>CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
<pname>CISOILM</pname>
<scale>3.0</scale>
</param>

Expand Down Expand Up @@ -2311,6 +2311,12 @@
<scale>4.0</scale>
</param>

<param>
<shortname>ACM_SNOM_ON_SURFACE</shortname>
<pname>SNOM</pname>
<scale>4.0</scale>
</param>

<param>
<shortname>GSD_INST_CRAIN_ON_SURFACE</shortname>
<pname>CRAIN</pname>
Expand Down
8 changes: 8 additions & 0 deletions parm/post_avblflds.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6599,6 +6599,14 @@
<scale>9.0</scale>
</param>

<param>
<post_avblfldidx>713</post_avblfldidx>
<shortname>CISOILM_ON_DEPTH_BEL_LAND_SFC</shortname>
<pname>CISOILM</pname>
<fixed_sfc1_type>depth_bel_land_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<post_avblfldidx>719</post_avblfldidx>
<shortname>INST_USWRF_ON_TOP_OF_ATMOS</shortname>
Expand Down
39 changes: 31 additions & 8 deletions parm/postcntrl_sfs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,50 @@

<param>
<shortname>HGT_ON_ISOBARIC_SFC</shortname>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>6.0</scale>
</param>

<param>
<shortname>TMP_ON_ISOBARIC_SFC</shortname>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>SPFH_ON_ISOBARIC_SFC</shortname>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>RH_ON_ISOBARIC_SFC</shortname>
<level>1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>UGRD_ON_ISOBARIC_SFC</shortname>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>VGRD_ON_ISOBARIC_SFC</shortname>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>ABSV_ON_ISOBARIC_SFC</shortname>
<level>1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.</level>
<scale>4.0</scale>
</param>

<param>
<shortname>O3MR_ON_ISOBARIC_SFC</shortname>
<table_info>NCEP</table_info>
<level>100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 20000. 25000. 30000. 35000. 40000.</level>
<level>1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 20000. 25000. 30000. 35000. 40000.</level>
<scale>5.0</scale>
</param>

Expand Down Expand Up @@ -633,6 +633,29 @@
<scale>4.0</scale>
</param>

<param>
<shortname>HLCY_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
<level>3000.</level>
<level2>0.</level2>
<scale>4.0</scale>
</param>

<param>
<shortname>ACM_SSRUN_ON_SURFACE</shortname>
<scale>4.0</scale>
</param>

<param>
<shortname>AVE_VBDSF_ON_SURFACE</shortname>
<table_info>NCEP</table_info>
<scale>6.0</scale>
</param>

<param>
<shortname>AVE_NBDSF_ON_SURFACE</shortname>
<table_info>NCEP</table_info>
<scale>6.0</scale>
</param>

<!-- comments wherever I like -->
</paramset>
Expand Down
182 changes: 165 additions & 17 deletions parm/postxconfig-NT-SFS.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1
106
110
GFSPRS
0
ncep_nco
Expand Down Expand Up @@ -27,8 +27,8 @@ HGT
isobaric_sfc
0
?
31
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
39
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -64,8 +64,8 @@ TMP
isobaric_sfc
0
?
31
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
39
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -101,8 +101,8 @@ SPFH
isobaric_sfc
0
?
31
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
39
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -138,8 +138,8 @@ RH
isobaric_sfc
0
?
26
1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
34
1. 2. 4. 7. 10. 20. 40. 70. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -175,8 +175,8 @@ UGRD
isobaric_sfc
0
?
31
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
39
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -212,8 +212,8 @@ VGRD
isobaric_sfc
0
?
31
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
39
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -249,8 +249,8 @@ ABSV
isobaric_sfc
0
?
26
1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
34
1. 2. 4. 7. 10. 20. 40. 70. 1000. 2000. 3000. 5000. 7000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 92500. 95000. 97500. 100000.
?
0
?
Expand Down Expand Up @@ -286,8 +286,8 @@ NCEP
isobaric_sfc
0
?
18
100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 20000. 25000. 30000. 35000. 40000.
26
1. 2. 4. 7. 10. 20. 40. 70. 100. 200. 300. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 20000. 25000. 30000. 35000. 40000.
?
0
?
Expand Down Expand Up @@ -3938,3 +3938,151 @@ surface
?
?
?
162
HLCY_ON_SPEC_HGT_LVL_ABOVE_GRND
?
1
tmpl4_0
HLCY
?
?
spec_hgt_lvl_above_grnd
0
?
1
3000.
spec_hgt_lvl_above_grnd
0
?
1
0.
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
122
ACM_SSRUN_ON_SURFACE
?
1
tmpl4_8
SSRUN
?
ACM
surface
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
4.0
0
0
0
?
?
?
401
AVE_VBDSF_ON_SURFACE
averaged surface visible beam downward solar flux
1
tmpl4_8
VBDSF
NCEP
AVE
surface
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
6.0
0
0
0
?
?
?
403
AVE_NBDSF_ON_SURFACE
averaged surface near IR beam downward solar flux
1
tmpl4_8
NBDSF
NCEP
AVE
surface
0
?
0
?
?
0
?
0
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
1
6.0
0
0
0
?
?
?
Loading

0 comments on commit f612448

Please sign in to comment.