Commit 3176b17
committed
+Rename fluxes%TKE_tidal to fluxes%BBL_tidal_dis
Revised the name of fluxes%TKE_tidal to fluxes%BBL_tidal_dis to better reflect
what this field holds,and the fact that the efficiency of the conversion from
mean kinetic energy loss to turbulent kinetic energy has not been applied yet.
The units of fluxes%BBL_tidal_dis are [R Z L2 T-3 ~> W m-2], whereas those of
fluxes%TKE_tidal were [R Z3 T-3 ~> W m-2]. The factor rescaling between the
units of mean kinetic energy and those of turbulent kinetic energy were already
in set_diffusivity_CS%BBL_effic, and these have been cancelled out by this
change, but this is offset by the addition of rescaling factors in the term
setting this array in the NUOPC and mct convert_IOB_to_fluxes routines. In the
FMS_cap version of convert_IOB_to_fluxes, the extra rescaling factor is rolled
into the scaling factor used in the get_param call for rho_TKE_tidal. All
answers are bitwise identical, but there is a change in the name and rescaled
units of an element of a transparent type.1 parent 30edcf8 commit 3176b17
File tree
5 files changed
+42
-35
lines changed- config_src/drivers
- FMS_cap
- STALE_mct_cap
- nuopc_cap
- src
- core
- parameterizations/vertical
5 files changed
+42
-35
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | | - | |
| 91 | + | |
| 92 | + | |
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| |||
302 | 302 | | |
303 | 303 | | |
304 | 304 | | |
305 | | - | |
| 305 | + | |
306 | 306 | | |
307 | 307 | | |
308 | 308 | | |
| |||
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
314 | | - | |
| 314 | + | |
315 | 315 | | |
316 | 316 | | |
317 | 317 | | |
| |||
1304 | 1304 | | |
1305 | 1305 | | |
1306 | 1306 | | |
| 1307 | + | |
| 1308 | + | |
1307 | 1309 | | |
1308 | 1310 | | |
1309 | 1311 | | |
1310 | | - | |
1311 | | - | |
| 1312 | + | |
| 1313 | + | |
| 1314 | + | |
| 1315 | + | |
1312 | 1316 | | |
1313 | 1317 | | |
1314 | 1318 | | |
| |||
1573 | 1577 | | |
1574 | 1578 | | |
1575 | 1579 | | |
1576 | | - | |
| 1580 | + | |
1577 | 1581 | | |
1578 | 1582 | | |
1579 | | - | |
| 1583 | + | |
1580 | 1584 | | |
1581 | 1585 | | |
1582 | 1586 | | |
1583 | 1587 | | |
1584 | 1588 | | |
1585 | 1589 | | |
1586 | | - | |
| 1590 | + | |
| 1591 | + | |
1587 | 1592 | | |
1588 | 1593 | | |
1589 | | - | |
1590 | | - | |
| 1594 | + | |
| 1595 | + | |
1591 | 1596 | | |
1592 | 1597 | | |
1593 | 1598 | | |
1594 | 1599 | | |
1595 | 1600 | | |
1596 | | - | |
| 1601 | + | |
1597 | 1602 | | |
1598 | 1603 | | |
1599 | 1604 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
295 | 295 | | |
296 | 296 | | |
297 | 297 | | |
298 | | - | |
| 298 | + | |
299 | 299 | | |
300 | 300 | | |
301 | 301 | | |
| |||
304 | 304 | | |
305 | 305 | | |
306 | 306 | | |
307 | | - | |
| 307 | + | |
308 | 308 | | |
309 | 309 | | |
310 | 310 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
317 | 317 | | |
318 | 318 | | |
319 | 319 | | |
320 | | - | |
| 320 | + | |
321 | 321 | | |
322 | 322 | | |
323 | 323 | | |
| |||
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
329 | | - | |
| 329 | + | |
330 | 330 | | |
331 | 331 | | |
332 | 332 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
171 | | - | |
| 171 | + | |
| 172 | + | |
172 | 173 | | |
173 | 174 | | |
174 | 175 | | |
| |||
1313 | 1314 | | |
1314 | 1315 | | |
1315 | 1316 | | |
1316 | | - | |
1317 | | - | |
| 1317 | + | |
| 1318 | + | |
| 1319 | + | |
1318 | 1320 | | |
1319 | 1321 | | |
1320 | 1322 | | |
| |||
1438 | 1440 | | |
1439 | 1441 | | |
1440 | 1442 | | |
1441 | | - | |
| 1443 | + | |
1442 | 1444 | | |
1443 | 1445 | | |
1444 | 1446 | | |
| |||
1546 | 1548 | | |
1547 | 1549 | | |
1548 | 1550 | | |
1549 | | - | |
| 1551 | + | |
1550 | 1552 | | |
1551 | 1553 | | |
1552 | 1554 | | |
| |||
3160 | 3162 | | |
3161 | 3163 | | |
3162 | 3164 | | |
3163 | | - | |
3164 | | - | |
| 3165 | + | |
| 3166 | + | |
3165 | 3167 | | |
3166 | 3168 | | |
3167 | 3169 | | |
| |||
3348 | 3350 | | |
3349 | 3351 | | |
3350 | 3352 | | |
3351 | | - | |
3352 | | - | |
| 3353 | + | |
| 3354 | + | |
3353 | 3355 | | |
3354 | 3356 | | |
3355 | 3357 | | |
| |||
3566 | 3568 | | |
3567 | 3569 | | |
3568 | 3570 | | |
3569 | | - | |
| 3571 | + | |
3570 | 3572 | | |
3571 | 3573 | | |
3572 | 3574 | | |
| |||
3713 | 3715 | | |
3714 | 3716 | | |
3715 | 3717 | | |
3716 | | - | |
3717 | | - | |
| 3718 | + | |
| 3719 | + | |
3718 | 3720 | | |
3719 | 3721 | | |
3720 | 3722 | | |
| |||
3985 | 3987 | | |
3986 | 3988 | | |
3987 | 3989 | | |
3988 | | - | |
3989 | | - | |
| 3990 | + | |
| 3991 | + | |
3990 | 3992 | | |
3991 | 3993 | | |
3992 | 3994 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1416 | 1416 | | |
1417 | 1417 | | |
1418 | 1418 | | |
1419 | | - | |
1420 | | - | |
| 1419 | + | |
| 1420 | + | |
1421 | 1421 | | |
1422 | 1422 | | |
1423 | 1423 | | |
| |||
1647 | 1647 | | |
1648 | 1648 | | |
1649 | 1649 | | |
1650 | | - | |
1651 | | - | |
1652 | | - | |
| 1650 | + | |
| 1651 | + | |
| 1652 | + | |
1653 | 1653 | | |
1654 | 1654 | | |
1655 | 1655 | | |
| |||
0 commit comments