Commit 72daf7b
Add option to receive enthalpy fluxes via coupler
* Remove lrunoff_hflx and frunoff_hflx from the IOB type. These
are never used;
* mean_runoff_heat_flx and mean_calving_heat_flx are are never
advertized, so these have been deleted;
* If cesm_coupled=true, six new fields are imported:
- heat_content_lprec
- heat_content_fprec
- heat_content_evap
- heat_content_cond
- heat_content_rofl
- heat_content_rofi
* Add a new parameter (ENTHALPY_FROM_COUPLER) to control if the
enthalpy associated with mass entering/leaving the ocean is provided
via the coupler or calculated in MOM6.1 parent 6963b22 commit 72daf7b
4 files changed
Lines changed: 174 additions & 45 deletions
File tree
- config_src/drivers/nuopc_cap
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
654 | 654 | | |
655 | 655 | | |
656 | 656 | | |
657 | | - | |
658 | | - | |
| 657 | + | |
659 | 658 | | |
660 | 659 | | |
661 | 660 | | |
| |||
680 | 679 | | |
681 | 680 | | |
682 | 681 | | |
683 | | - | |
684 | | - | |
685 | | - | |
| 682 | + | |
686 | 683 | | |
687 | 684 | | |
688 | 685 | | |
| |||
703 | 700 | | |
704 | 701 | | |
705 | 702 | | |
706 | | - | |
707 | | - | |
708 | 703 | | |
709 | 704 | | |
710 | 705 | | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
711 | 722 | | |
712 | 723 | | |
713 | 724 | | |
| |||
756 | 767 | | |
757 | 768 | | |
758 | 769 | | |
759 | | - | |
760 | | - | |
761 | | - | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
762 | 780 | | |
763 | 781 | | |
764 | 782 | | |
| |||
1663 | 1681 | | |
1664 | 1682 | | |
1665 | 1683 | | |
1666 | | - | |
| 1684 | + | |
| 1685 | + | |
1667 | 1686 | | |
1668 | 1687 | | |
1669 | 1688 | | |
| |||
2388 | 2407 | | |
2389 | 2408 | | |
2390 | 2409 | | |
2391 | | - | |
| 2410 | + | |
2392 | 2411 | | |
2393 | 2412 | | |
2394 | 2413 | | |
| |||
2499 | 2518 | | |
2500 | 2519 | | |
2501 | 2520 | | |
2502 | | - | |
2503 | | - | |
2504 | | - | |
2505 | | - | |
2506 | | - | |
2507 | | - | |
2508 | | - | |
2509 | 2521 | | |
2510 | 2522 | | |
2511 | 2523 | | |
| |||
2576 | 2588 | | |
2577 | 2589 | | |
2578 | 2590 | | |
2579 | | - | |
| 2591 | + | |
| 2592 | + | |
| 2593 | + | |
| 2594 | + | |
| 2595 | + | |
| 2596 | + | |
| 2597 | + | |
| 2598 | + | |
| 2599 | + | |
| 2600 | + | |
| 2601 | + | |
| 2602 | + | |
| 2603 | + | |
| 2604 | + | |
| 2605 | + | |
| 2606 | + | |
| 2607 | + | |
| 2608 | + | |
| 2609 | + | |
| 2610 | + | |
| 2611 | + | |
| 2612 | + | |
| 2613 | + | |
| 2614 | + | |
| 2615 | + | |
| 2616 | + | |
| 2617 | + | |
| 2618 | + | |
| 2619 | + | |
| 2620 | + | |
| 2621 | + | |
| 2622 | + | |
| 2623 | + | |
| 2624 | + | |
| 2625 | + | |
| 2626 | + | |
2580 | 2627 | | |
2581 | | - | |
2582 | | - | |
| 2628 | + | |
| 2629 | + | |
2583 | 2630 | | |
2584 | 2631 | | |
2585 | 2632 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
225 | 265 | | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
| 266 | + | |
231 | 267 | | |
232 | 268 | | |
233 | 269 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
459 | 459 | | |
460 | 460 | | |
461 | 461 | | |
462 | | - | |
| 462 | + | |
463 | 463 | | |
464 | 464 | | |
465 | 465 | | |
| |||
474 | 474 | | |
475 | 475 | | |
476 | 476 | | |
| 477 | + | |
477 | 478 | | |
478 | 479 | | |
479 | 480 | | |
| |||
523 | 524 | | |
524 | 525 | | |
525 | 526 | | |
526 | | - | |
527 | 527 | | |
528 | 528 | | |
529 | 529 | | |
| |||
690 | 690 | | |
691 | 691 | | |
692 | 692 | | |
693 | | - | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
694 | 699 | | |
695 | 700 | | |
696 | 701 | | |
| |||
Lines changed: 51 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| 85 | + | |
| 86 | + | |
85 | 87 | | |
86 | 88 | | |
87 | 89 | | |
| |||
181 | 183 | | |
182 | 184 | | |
183 | 185 | | |
184 | | - | |
185 | | - | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
186 | 192 | | |
187 | 193 | | |
188 | 194 | | |
| |||
304 | 310 | | |
305 | 311 | | |
306 | 312 | | |
307 | | - | |
| 313 | + | |
308 | 314 | | |
309 | 315 | | |
310 | 316 | | |
| |||
487 | 493 | | |
488 | 494 | | |
489 | 495 | | |
490 | | - | |
491 | | - | |
492 | | - | |
493 | | - | |
494 | | - | |
495 | | - | |
496 | | - | |
497 | 496 | | |
498 | 497 | | |
499 | 498 | | |
| |||
544 | 543 | | |
545 | 544 | | |
546 | 545 | | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
547 | 565 | | |
548 | 566 | | |
549 | 567 | | |
| |||
1201 | 1219 | | |
1202 | 1220 | | |
1203 | 1221 | | |
| 1222 | + | |
| 1223 | + | |
| 1224 | + | |
1204 | 1225 | | |
1205 | 1226 | | |
1206 | 1227 | | |
| |||
1507 | 1528 | | |
1508 | 1529 | | |
1509 | 1530 | | |
| 1531 | + | |
| 1532 | + | |
| 1533 | + | |
| 1534 | + | |
| 1535 | + | |
| 1536 | + | |
| 1537 | + | |
| 1538 | + | |
| 1539 | + | |
| 1540 | + | |
| 1541 | + | |
| 1542 | + | |
| 1543 | + | |
| 1544 | + | |
| 1545 | + | |
| 1546 | + | |
| 1547 | + | |
| 1548 | + | |
| 1549 | + | |
| 1550 | + | |
1510 | 1551 | | |
1511 | 1552 | | |
1512 | 1553 | | |
| |||
0 commit comments