Commit cf37902
committed
Merge branch 'atmosphere/gwdo_check_fix' into develop (PR #652)
This merge corrects the atmosphere_model's GWDO check to avoid incorrectly
halting the model when running a regional simulation entirely over water.
Originally, the GWDO check ensured that the GWDO fields were valid by checking
to see if the 'var2d' field was not all zero. For global simulations, an
all-zero 'var2d' field (with 'config_gwdo_scheme' not set to "off") most likely
meant that the user did not interpolate the GWDO fields.
However, regional MPAS simulations that were entirely over water would make
'var2d' and other GWDO fields all zero, which would incorrectly trigger this
error.
Now, the check on 'var2d' will only stop the model if not all grid cells are
water (based on the 'ivgtyp' field).
* atmosphere/gwdo_check_fix:
Fix GWDO check on all water regional simulations1 file changed
Lines changed: 19 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
448 | 448 | | |
449 | 449 | | |
450 | 450 | | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
451 | 454 | | |
452 | 455 | | |
453 | 456 | | |
| |||
473 | 476 | | |
474 | 477 | | |
475 | 478 | | |
476 | | - | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
477 | 495 | | |
478 | 496 | | |
479 | 497 | | |
| |||
0 commit comments