Commit c9199f5
Bring in some HAFSv2 related UFSATM developments (#1047)
- NoahMP LSM and sea ice related updates for HAFS moving nesting from @RongqianYang-NOAA, @barlage, and @wramstrom. Meanwhile, lots of contribution (discussions/diagnostics/debugging/testing) from @ChuankaiWang-NOAA, @yonghuiweng, ZhanZhang-NOAA, @helin.wei@noaa.gov, @fanglin.yang@noaa.gov, @BinLiu-NOAA as well.
- Add snow layer and snow soil layer thickness to GFS_type.
- Add checks for soil moisture for Noah MP.
- Changes for distinguishing between new and old points for snow-related fields reset in moving nest physics.
- Add leading_edge logical array to indicate which nest points have been interpolated. Needed for NOAH MP moving nest upgrades.
- NOAHMP moving nest sea ice and cryosphere fixes and added variables tiice, tisfc, sncovr, fice, hice.
- HAFS moving-nesting related 3D-IAU capability. (from @XuLu-NOAA)
- Enable RRTMGP working with nesting (moving-nesting) configurations. (from @Qingfu-Liu, @dustinswales)
- Introduce two Thompson MP related namelist options of fs_fac_rain and fs_fac_snow for adjustments of max terminal fall speeds of rain and snow. (from @WeiguoWang-NOAA)
- Introduce two namelist options of cat_adj_deep and cat_adj_shal to adjust convective adjustment time in SASAS convection scheme. (from @JunghoonShin-NOAA)
- Update HAFS moving-nesting internal tracker to output moving nest domain location to support the moving-nesting forecast restart capability.
---------
Co-authored-by: William Ramstrom <William.Ramstrom@noaa.gov>
Co-authored-by: Ruiyu Sun <Ruiyu.Sun@noaa.gov>
Co-authored-by: BijuThomas-NOAA <biju.thomas@noaa.gov>
Co-authored-by: Dustin Swales <dustin.swales@noaa.gov>
Co-authored-by: Dusan Jovic <48258889+DusanJovic-NOAA@users.noreply.github.com>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
Co-authored-by: AndrewHazelton <andrew.hazelton@noaa.gov>
Co-authored-by: Weiguo Wang <weiguo.wang@noaa.gov>
Co-authored-by: XuLu-NOAA <Xu.Lu@noaa.gov>
Co-authored-by: Bin.Li <bin.li@noaa.gov>
Co-authored-by: JungHoon Shin <junghoon.shin@noaa.gov>
Co-authored-by: Rongqian Yang <ryang@orion-login-2.hpc.msstate.edu>
Co-authored-by: Anders Jensen <anders.jensen@noaa.gov>
Co-authored-by: Ping Zhu <pzu@orion-login-1.hpc.msstate.edu>
Co-authored-by: Grant Firl <grant.firl@noaa.gov>
Co-authored-by: Kwun Y. Fung <kwun@orion-login-3.hpc.msstate.edu>
Co-authored-by: dustinswales <dswales@ucar.edu>
Co-authored-by: Kwun Y. Fung <kwun@orion-login-1.hpc.msstate.edu>
Co-authored-by: Kwun Y. Fung <kwun@hercules-login-1.hpc.msstate.edu>
Co-authored-by: Weiguo Wang <Weiguo.Wang@gaea63.ncrc.gov>1 parent 30b6019 commit c9199f5
File tree
13 files changed
+2833
-540
lines changed- ccpp
- data
- suites
- fv3
- moving_nest
13 files changed
+2833
-540
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1083 | 1083 | | |
1084 | 1084 | | |
1085 | 1085 | | |
| 1086 | + | |
| 1087 | + | |
1086 | 1088 | | |
1087 | 1089 | | |
1088 | 1090 | | |
| |||
1365 | 1367 | | |
1366 | 1368 | | |
1367 | 1369 | | |
| 1370 | + | |
1368 | 1371 | | |
1369 | 1372 | | |
1370 | 1373 | | |
| |||
1379 | 1382 | | |
1380 | 1383 | | |
1381 | 1384 | | |
| 1385 | + | |
1382 | 1386 | | |
1383 | 1387 | | |
1384 | 1388 | | |
| |||
1696 | 1700 | | |
1697 | 1701 | | |
1698 | 1702 | | |
| 1703 | + | |
| 1704 | + | |
1699 | 1705 | | |
1700 | 1706 | | |
1701 | 1707 | | |
| |||
3714 | 3720 | | |
3715 | 3721 | | |
3716 | 3722 | | |
| 3723 | + | |
| 3724 | + | |
3717 | 3725 | | |
3718 | 3726 | | |
3719 | 3727 | | |
| |||
3967 | 3975 | | |
3968 | 3976 | | |
3969 | 3977 | | |
| 3978 | + | |
3970 | 3979 | | |
3971 | 3980 | | |
3972 | 3981 | | |
| |||
3981 | 3990 | | |
3982 | 3991 | | |
3983 | 3992 | | |
| 3993 | + | |
3984 | 3994 | | |
3985 | 3995 | | |
3986 | 3996 | | |
| |||
4071 | 4081 | | |
4072 | 4082 | | |
4073 | 4083 | | |
| 4084 | + | |
| 4085 | + | |
4074 | 4086 | | |
4075 | 4087 | | |
4076 | 4088 | | |
| |||
4226 | 4238 | | |
4227 | 4239 | | |
4228 | 4240 | | |
4229 | | - | |
| 4241 | + | |
| 4242 | + | |
4230 | 4243 | | |
4231 | 4244 | | |
4232 | 4245 | | |
| |||
4292 | 4305 | | |
4293 | 4306 | | |
4294 | 4307 | | |
4295 | | - | |
| 4308 | + | |
4296 | 4309 | | |
4297 | 4310 | | |
| 4311 | + | |
4298 | 4312 | | |
4299 | 4313 | | |
4300 | 4314 | | |
| |||
4319 | 4333 | | |
4320 | 4334 | | |
4321 | 4335 | | |
4322 | | - | |
| 4336 | + | |
4323 | 4337 | | |
4324 | 4338 | | |
4325 | 4339 | | |
| |||
4970 | 4984 | | |
4971 | 4985 | | |
4972 | 4986 | | |
| 4987 | + | |
| 4988 | + | |
4973 | 4989 | | |
4974 | 4990 | | |
4975 | 4991 | | |
| |||
5315 | 5331 | | |
5316 | 5332 | | |
5317 | 5333 | | |
| 5334 | + | |
5318 | 5335 | | |
5319 | 5336 | | |
5320 | 5337 | | |
5321 | 5338 | | |
5322 | 5339 | | |
5323 | 5340 | | |
5324 | 5341 | | |
| 5342 | + | |
5325 | 5343 | | |
5326 | 5344 | | |
5327 | 5345 | | |
| |||
5441 | 5459 | | |
5442 | 5460 | | |
5443 | 5461 | | |
| 5462 | + | |
| 5463 | + | |
5444 | 5464 | | |
5445 | 5465 | | |
5446 | 5466 | | |
| |||
6436 | 6456 | | |
6437 | 6457 | | |
6438 | 6458 | | |
| 6459 | + | |
| 6460 | + | |
6439 | 6461 | | |
6440 | 6462 | | |
6441 | 6463 | | |
| |||
7034 | 7056 | | |
7035 | 7057 | | |
7036 | 7058 | | |
| 7059 | + | |
| 7060 | + | |
7037 | 7061 | | |
7038 | 7062 | | |
7039 | 7063 | | |
| |||
7247 | 7271 | | |
7248 | 7272 | | |
7249 | 7273 | | |
| 7274 | + | |
7250 | 7275 | | |
7251 | 7276 | | |
7252 | 7277 | | |
| |||
7256 | 7281 | | |
7257 | 7282 | | |
7258 | 7283 | | |
| 7284 | + | |
7259 | 7285 | | |
7260 | 7286 | | |
7261 | 7287 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5187 | 5187 | | |
5188 | 5188 | | |
5189 | 5189 | | |
| 5190 | + | |
| 5191 | + | |
| 5192 | + | |
| 5193 | + | |
| 5194 | + | |
| 5195 | + | |
| 5196 | + | |
| 5197 | + | |
| 5198 | + | |
| 5199 | + | |
| 5200 | + | |
| 5201 | + | |
| 5202 | + | |
| 5203 | + | |
5190 | 5204 | | |
5191 | 5205 | | |
5192 | 5206 | | |
| |||
6199 | 6213 | | |
6200 | 6214 | | |
6201 | 6215 | | |
| 6216 | + | |
| 6217 | + | |
| 6218 | + | |
| 6219 | + | |
| 6220 | + | |
| 6221 | + | |
| 6222 | + | |
6202 | 6223 | | |
6203 | 6224 | | |
6204 | 6225 | | |
| |||
6234 | 6255 | | |
6235 | 6256 | | |
6236 | 6257 | | |
| 6258 | + | |
| 6259 | + | |
| 6260 | + | |
| 6261 | + | |
| 6262 | + | |
| 6263 | + | |
| 6264 | + | |
6237 | 6265 | | |
6238 | 6266 | | |
6239 | 6267 | | |
| |||
- physics/CONV/SAMF/samfdeepcnv.f+4-2
- physics/CONV/SAMF/samfdeepcnv.meta+8
- physics/CONV/SAMF/samfshalcnv.f+4-2
- physics/CONV/SAMF/samfshalcnv.meta+8
- physics/MP/Thompson/module_mp_thompson.F90+20-5
- physics/MP/Thompson/mp_thompson.F90+10-3
- physics/MP/Thompson/mp_thompson.meta+18
- physics/Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90+4-2
- physics/Radiation/RRTMGP/rrtmgp_lw_gas_optics.F90+5-3
- physics/Radiation/RRTMGP/rrtmgp_sw_cloud_optics.F90+4-2
- physics/Radiation/RRTMGP/rrtmgp_sw_gas_optics.F90+4-2
Lines changed: 16 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
17 | 16 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | | - | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
60 | 59 | | |
61 | 60 | | |
62 | 61 | | |
63 | | - | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
64 | 67 | | |
65 | 68 | | |
66 | 69 | | |
| |||
Lines changed: 16 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
17 | 16 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | | - | |
29 | 28 | | |
30 | 29 | | |
31 | 30 | | |
| |||
58 | 57 | | |
59 | 58 | | |
60 | 59 | | |
61 | | - | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
62 | 65 | | |
63 | 66 | | |
64 | 67 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
67 | | - | |
68 | 67 | | |
69 | 68 | | |
70 | 69 | | |
| |||
85 | 84 | | |
86 | 85 | | |
87 | 86 | | |
88 | | - | |
89 | 87 | | |
90 | 88 | | |
91 | 89 | | |
| |||
106 | 104 | | |
107 | 105 | | |
108 | 106 | | |
109 | | - | |
110 | 107 | | |
111 | 108 | | |
112 | 109 | | |
| |||
117 | 114 | | |
118 | 115 | | |
119 | 116 | | |
120 | | - | |
121 | 117 | | |
122 | 118 | | |
123 | 119 | | |
| |||
0 commit comments