Changeset 5109
- Timestamp:
- Jul 24, 2024, 11:16:13 AM (5 months ago)
- Location:
- LMDZ6/trunk
- Files:
-
- 8 edited
-
DefLists/field_def_lmdz.xml (modified) (7 diffs)
-
DefLists/file_def_histday_lmdz.xml (modified) (4 diffs)
-
DefLists/file_def_histmth_lmdz.xml (modified) (3 diffs)
-
arch/arch-X64_JEANZAY.env (modified) (1 diff)
-
arch/arch-X64_JEANZAY.path (modified) (1 diff)
-
libf/phylmd/phys_local_var_mod.F90 (modified) (6 diffs)
-
libf/phylmd/phys_output_ctrlout_mod.F90 (modified) (1 diff)
-
libf/phylmd/phys_output_write_mod.F90 (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/DefLists/field_def_lmdz.xml
r5039 r5109 221 221 <field id="fqfonte" long_name="Land ice melt" unit="kg/m2/s" /> 222 222 <field id="runofflic" long_name="Land ice melt to ocean" unit="kg/m2/s" /> 223 <field id="runoffland" long_name="Runoff to ocean" unit="kg/m2/s" /> 223 224 <field id="mrroli" long_name="Runoff flux over land ice" unit="kg/m2/s" /> 224 225 <field id="taux" long_name="Zonal wind stress" unit="Pa" /> … … 590 591 <field id="plulH216O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> 591 592 <field id="plucH216O" long_name="Convective Precip." unit="kg/(s*m2)" /> 593 <field id="runofflandH216O" long_name="Runoff to ocean" unit="kg/(s*m2)" /> 592 594 <field id="evapH216O" long_name="Evaporat." unit="kg/(s*m2)" /> 593 595 <field id="evap_terH216O" long_name="evaporation at surface ter" unit="kg/(s*m2)" /> … … 598 600 <field id="plulH217O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> 599 601 <field id="plucH217O" long_name="Convective Precip." unit="kg/(s*m2)" /> 602 <field id="runofflandH217O" long_name="Runoff to ocean" unit="kg/(s*m2)" /> 600 603 <field id="evapH217O" long_name="Evaporat." unit="kg/(s*m2)" /> 601 604 <field id="evap_terH217O" long_name="evaporation at surface ter" unit="kg/(s*m2)" /> … … 606 609 <field id="plulH218O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> 607 610 <field id="plucH218O" long_name="Convective Precip." unit="kg/(s*m2)" /> 611 <field id="runofflandH218O" long_name="Runoff to ocean" unit="kg/(s*m2)" /> 608 612 <field id="evapH218O" long_name="Evaporat." unit="kg/(s*m2)" /> 609 613 <field id="evap_terH218O" long_name="evaporation at surface ter" unit="kg/(s*m2)" /> … … 615 619 <field id="plulHDO" long_name="Large-scale Precip." unit="kg/(s*m2)" /> 616 620 <field id="plucHDO" long_name="Convective Precip." unit="kg/(s*m2)" /> 621 <field id="runofflandHDO" long_name="Runoff to ocean" unit="kg/(s*m2)" /> 617 622 <field id="evapHDO" long_name="Evaporat." unit="kg/(s*m2)" /> 618 623 <field id="evap_terHDO" long_name="evaporation at surface ter" unit="kg/(s*m2)" /> … … 623 628 <field id="plulHTO" long_name="Large-scale Precip." unit="kg/(s*m2)" /> 624 629 <field id="plucHTO" long_name="Convective Precip." unit="kg/(s*m2)" /> 630 <field id="runofflandHTO" long_name="Runoff to ocean" unit="kg/(s*m2)" /> 625 631 <field id="evapHTO" long_name="Evaporat." unit="kg/(s*m2)" /> 626 632 <field id="evap_terHTO" long_name="evaporation at surface ter" unit="kg/(s*m2)" /> … … 636 642 <field id="tke_buoy" long_name="TKE Buoyancy term" unit="m2/s3" /> 637 643 <field id="tke_shear" long_name="TKE Shear term" unit="m2/s3" /> 638 644 <field id="tke_trans" long_name="TKE Transport term" unit="m2/s3" /> 639 645 <field id="tke_ter" long_name="Max Turb. Kinetic Energy ter" unit="m2/s2" /> 640 646 <field id="tke_lic" long_name="Max Turb. Kinetic Energy lic" unit="m2/s2" /> -
LMDZ6/trunk/DefLists/file_def_histday_lmdz.xml
r4981 r5109 2 2 <file_definition type="one_file"> 3 3 <file_group id="defile"> 4 <file id="histday" name="histday" output_freq="1d" output_level=" _AUTO_" enabled="_AUTO_" compression_level="2" sync_freq="1d">4 <file id="histday" name="histday" output_freq="1d" output_level="1" enabled=".TRUE." compression_level="0" sync_freq="1d"> 5 5 6 6 <!-- VARS 1D --> … … 131 131 <field field_ref="mrroli" level="10" /> 132 132 <field field_ref="runofflic" level="10" /> 133 <field field_ref="runoffland" level="1" /> 133 <field field_ref="runoffland" level="1" /> 134 134 <field field_ref="taux" level="10" /> 135 135 <field field_ref="tauy" level="10" /> … … 453 453 <!-- Begin Added SN isotopes 2D fields 07 2023 --> 454 454 <!-- water oxygen H216O H217O H218O --> 455 <field_group level="11" > <!-- H216O --> 456 <field field_ref="precipH216O" /> 457 <field field_ref="plulH216O" /> 458 <field field_ref="plucH216O" /> 459 <field field_ref="runofflandH216O" /> 460 <field field_ref="evapH216O" /> 461 <field field_ref="evap_terH216O" /> 462 <field field_ref="evap_licH216O" /> 463 <field field_ref="evap_oceH216O" /> 464 <field field_ref="evap_sicH216O" /> 465 </field_group> 466 <field_group level="11" > <!-- H217O --> 467 <field field_ref="precipH217O" /> 468 <field field_ref="plulH217O" /> 469 <field field_ref="plucH217O" /> 470 <field field_ref="runofflandH217O" /> 471 <field field_ref="evapH217O" /> 472 <field field_ref="evap_terH217O" /> 473 <field field_ref="evap_licH217O" /> 474 <field field_ref="evap_oceH217O" /> 475 <field field_ref="evap_sicH217O" /> 476 </field_group> 477 <field_group level="1" > <!-- H218O --> 478 <field field_ref="precipH218O" /> 479 <field field_ref="plulH218O" /> 480 <field field_ref="plucH218O" /> 481 <field field_ref="runofflandH218O" /> 482 <field field_ref="evapH218O" /> 483 <field field_ref="evap_terH218O" /> 484 <field field_ref="evap_licH218O" /> 485 <field field_ref="evap_oceH218O" /> 486 <field field_ref="evap_sicH218O" /> 455 <field_group id="dd_2D_H216O" enabled="False" > <!-- H216O --> 456 <field field_ref="precipH216O" level="1" /> 457 <field field_ref="plulH216O" level="1" /> 458 <field field_ref="plucH216O" level="1" /> 459 <field field_ref="evapH216O" level="1" /> 460 <field field_ref="evap_terH216O" level="1" /> 461 <field field_ref="evap_licH216O" level="1" /> 462 <field field_ref="evap_oceH216O" level="1" /> 463 <field field_ref="evap_sicH216O" level="1" /> 464 </field_group> 465 <field_group id="dd_2D_H217O" enabled="False" > <!-- H217O --> 466 <field field_ref="precipH217O" level="1" /> 467 <field field_ref="plulH217O" level="1" /> 468 <field field_ref="plucH217O" level="1" /> 469 <field field_ref="evapH217O" level="1" /> 470 <field field_ref="evap_terH217O" level="1" /> 471 <field field_ref="evap_licH217O" level="1" /> 472 <field field_ref="evap_oceH217O" level="1" /> 473 <field field_ref="evap_sicH217O" level="1" /> 474 </field_group> 475 <field_group id="dd_2D_H218O" enabled="False" > <!-- H218O --> 476 <field field_ref="precipH218O" level="1" /> 477 <field field_ref="plulH218O" level="1" /> 478 <field field_ref="plucH218O" level="1" /> 479 <field field_ref="evapH218O" level="1" /> 480 <field field_ref="evap_terH218O" level="1" /> 481 <field field_ref="evap_licH218O" level="1" /> 482 <field field_ref="evap_oceH218O" level="1" /> 483 <field field_ref="evap_sicH218O" level="1" /> 487 484 </field_group> 488 485 <!-- water hydrogen HDO HTO --> 489 <field_group level="1" > <!-- HDO --> 490 <field field_ref="precipHDO" /> 491 <field field_ref="plulHDO" /> 492 <field field_ref="plucHDO" /> 493 <field field_ref="runofflandHDO" /> 494 <field field_ref="evapHDO" /> 495 <field field_ref="evap_terHDO" /> 496 <field field_ref="evap_licHDO" /> 497 <field field_ref="evap_oceHDO" /> 498 <field field_ref="evap_sicHDO" /> 499 </field_group> 500 <field_group level="11" > <!-- HTO --> 501 <field field_ref="plulHTO" /> 502 <field field_ref="precipHTO" /> 503 <field field_ref="plucHTO" /> 504 <field field_ref="runofflandHTO" /> 505 <field field_ref="evapHTO" /> 506 <field field_ref="evap_terHTO" /> 507 <field field_ref="evap_licHTO" /> 508 <field field_ref="evap_oceHTO" /> 509 <field field_ref="evap_sicHTO" /> 486 <field_group id="dd_2D_HDO" enabled="False" > <!-- HDO --> 487 <field field_ref="precipHDO" level="1" /> 488 <field field_ref="plulHDO" level="1" /> 489 <field field_ref="plucHDO" level="1" /> 490 <field field_ref="evapHDO" level="1" /> 491 <field field_ref="evap_terHDO" level="1" /> 492 <field field_ref="evap_licHDO" level="1" /> 493 <field field_ref="evap_oceHDO" level="1" /> 494 <field field_ref="evap_sicHDO" level="1" /> 495 </field_group> 496 <field_group id="dd_2D_HTO" enabled="False" > <!-- HTO --> 497 <field field_ref="plulHTO" level="1" /> 498 <field field_ref="precipHTO" level="1" /> 499 <field field_ref="plucHTO" level="1" /> 500 <field field_ref="evapHTO" level="1" /> 501 <field field_ref="evap_terHTO" level="1" /> 502 <field field_ref="evap_licHTO" level="1" /> 503 <field field_ref="evap_oceHTO" level="1" /> 504 <field field_ref="evap_sicHTO" level="1" /> 510 505 </field_group> 511 506 <!-- end Added SN isotopes 2D fields 07 2023 --> … … 687 682 <!-- Begin Added SN isotopes 3D fields 07 2023 --> 688 683 <!-- water oxygen H216O H217O H218O --> 689 <field_group level="11"> <!-- H216O -->690 <field field_ref="ovapH216O" />691 <field field_ref="oliqH216O" />692 <field field_ref="ocondH216O" />693 <field field_ref="dqdynH216O" />694 <field field_ref="dqldynH216O" />695 <field field_ref="dqconH216O" />696 <field field_ref="dqlscH216O" />697 <field field_ref="dqevaH216O" />698 <field field_ref="dqvdfH216O" />699 <field field_ref="dqajsH216O" />700 <field field_ref="dqtheH216O" />701 </field_group> 702 <field_group level="11" > <!-- H217O -->703 <field field_ref="ovapH217O" />704 <field field_ref="oliqH217O" />705 <field field_ref="ocondH217O" />706 <field field_ref="dqdynH217O" />707 <field field_ref="dqldynH217O" />708 <field field_ref="dqconH217O" />709 <field field_ref="dqlscH217O" />710 <field field_ref="dqevaH217O" />711 <field field_ref="dqvdfH217O" />712 <field field_ref="dqajsH217O" />713 <field field_ref="dqtheH217O" />714 </field_group> 715 <field_group level="1" > <!-- H218O -->716 <field field_ref="ovapH218O" />717 <field field_ref="oliqH218O" />718 <field field_ref="ocondH218O" />719 <field field_ref="dqdynH218O" />720 <field field_ref="dqldynH218O" />721 <field field_ref="dqconH218O" />722 <field field_ref="dqlscH218O" />723 <field field_ref="dqevaH218O" />724 <field field_ref="dqvdfH218O" />725 <field field_ref="dqajsH218O" />726 <field field_ref="dqtheH218O" />684 <field_group id="dd_3D_H216O" enabled="False" > <!-- H216O --> 685 <field field_ref="ovapH216O" level="1" /> 686 <field field_ref="oliqH216O" level="1" /> 687 <field field_ref="ocondH216O" level="1" /> 688 <field field_ref="dqdynH216O" level="1" /> 689 <field field_ref="dqldynH216O" level="1" /> 690 <field field_ref="dqconH216O" level="1" /> 691 <field field_ref="dqlscH216O" level="1" /> 692 <field field_ref="dqevaH216O" level="1" /> 693 <field field_ref="dqvdfH216O" level="1" /> 694 <field field_ref="dqajsH216O" level="1" /> 695 <field field_ref="dqtheH216O" level="1" /> 696 </field_group> 697 <field_group id="dd_3D_H217O" enabled="False" > <!-- H217O --> 698 <field field_ref="ovapH217O" level="1" /> 699 <field field_ref="oliqH217O" level="1" /> 700 <field field_ref="ocondH217O" level="1" /> 701 <field field_ref="dqdynH217O" level="1" /> 702 <field field_ref="dqldynH217O" level="1" /> 703 <field field_ref="dqconH217O" level="1" /> 704 <field field_ref="dqlscH217O" level="1" /> 705 <field field_ref="dqevaH217O" level="1" /> 706 <field field_ref="dqvdfH217O" level="1" /> 707 <field field_ref="dqajsH217O" level="1" /> 708 <field field_ref="dqtheH217O" level="1" /> 709 </field_group> 710 <field_group id="dd_3D_H218O" enabled="False" > <!-- H218O --> 711 <field field_ref="ovapH218O" level="1" /> 712 <field field_ref="oliqH218O" level="1" /> 713 <field field_ref="ocondH218O" level="1" /> 714 <field field_ref="dqdynH218O" level="1" /> 715 <field field_ref="dqldynH218O" level="1" /> 716 <field field_ref="dqconH218O" level="1" /> 717 <field field_ref="dqlscH218O" level="1" /> 718 <field field_ref="dqevaH218O" level="1" /> 719 <field field_ref="dqvdfH218O" level="1" /> 720 <field field_ref="dqajsH218O" level="1" /> 721 <field field_ref="dqtheH218O" level="1" /> 727 722 </field_group> 728 723 <!-- water hydrogen HDO HTO --> 729 <field_group level="1" > <!-- HDO -->730 <field field_ref="ovapHDO" />731 <field field_ref="oliqHDO" />732 <field field_ref="ocondHDO" />733 <field field_ref="dqdynHDO" />734 <field field_ref="dqldynHDO" />735 <field field_ref="dqconHDO" />736 <field field_ref="dqlscHDO" />737 <field field_ref="dqevaHDO" />738 <field field_ref="dqvdfHDO" />739 <field field_ref="dqajsHDO" />740 <field field_ref="dqtheHDO" />741 </field_group> 742 <field_group level="11" > <!-- HTO -->743 <field field_ref="ovapHTO" />744 <field field_ref="oliqHTO" />745 <field field_ref="ocondHTO" />746 <field field_ref="dqdynHTO" />747 <field field_ref="dqldynHTO" />748 <field field_ref="dqconHTO" />749 <field field_ref="dqlscHTO" />750 <field field_ref="dqevaHTO" />751 <field field_ref="dqvdfHTO" />752 <field field_ref="dqajsHTO" />753 <field field_ref="dqtheHTO" />724 <field_group id="dd_3D_HDO" enabled="False" > <!-- HDO --> 725 <field field_ref="ovapHDO" level="1" /> 726 <field field_ref="oliqHDO" level="1" /> 727 <field field_ref="ocondHDO" level="1" /> 728 <field field_ref="dqdynHDO" level="1" /> 729 <field field_ref="dqldynHDO" level="1" /> 730 <field field_ref="dqconHDO" level="1" /> 731 <field field_ref="dqlscHDO" level="1" /> 732 <field field_ref="dqevaHDO" level="1" /> 733 <field field_ref="dqvdfHDO" level="1" /> 734 <field field_ref="dqajsHDO" level="1" /> 735 <field field_ref="dqtheHDO" level="1" /> 736 </field_group> 737 <field_group id="dd_3D_HTO" enabled="False" > <!-- HTO --> 738 <field field_ref="ovapHTO" level="1" /> 739 <field field_ref="oliqHTO" level="1" /> 740 <field field_ref="ocondHTO" level="1" /> 741 <field field_ref="dqdynHTO" level="1" /> 742 <field field_ref="dqldynHTO" level="1" /> 743 <field field_ref="dqconHTO" level="1" /> 744 <field field_ref="dqlscHTO" level="1" /> 745 <field field_ref="dqevaHTO" level="1" /> 746 <field field_ref="dqvdfHTO" level="1" /> 747 <field field_ref="dqajsHTO" level="1" /> 748 <field field_ref="dqtheHTO" level="1" /> 754 749 </field_group> 755 750 <!-- End Added SN isotopes 3D fields 07 2023 --> -
LMDZ6/trunk/DefLists/file_def_histmth_lmdz.xml
r4981 r5109 2 2 <file_definition> 3 3 <file_group id="defile"> 4 <file id="histmth" name="histmth" output_freq="1mo" output_level=" _AUTO_" enabled="_AUTO_" compression_level="2">4 <file id="histmth" name="histmth" output_freq="1mo" output_level="1" enabled=".TRUE." compression_level="0"> 5 5 6 6 <!-- VARS 1D --> … … 502 502 <!-- Begin Added SN isotopes 2D fields 07 2023 --> 503 503 <!-- water oxygen H216O H217O H218O --> 504 <field_group level="11" > <!-- H216O --> 505 <field field_ref="precipH216O" /> 506 <field field_ref="plulH216O" /> 507 <field field_ref="plucH216O" /> 508 <field field_ref="runofflandH216O" /> 509 <field field_ref="evapH216O" /> 510 <field field_ref="evap_terH216O" /> 511 <field field_ref="evap_licH216O" /> 512 <field field_ref="evap_oceH216O" /> 513 <field field_ref="evap_sicH216O" /> 504 <field_group id="mm_2D_H216O" enabled="False" > <!-- H216O --> 505 <field field_ref="precipH216O" level="1" /> 506 <field field_ref="plulH216O" level="1" /> 507 <field field_ref="plucH216O" level="1" /> 508 <field field_ref="evapH216O" level="1" /> 509 <field field_ref="evap_terH216O" level="1" /> 510 <field field_ref="evap_licH216O" level="1" /> 511 <field field_ref="evap_oceH216O" level="1" /> 512 <field field_ref="evap_sicH216O" level="1" /> 514 513 </field_group> 515 <field_group level="11" > <!-- H217O --> 516 <field field_ref="precipH217O" /> 517 <field field_ref="plulH217O" /> 518 <field field_ref="plucH217O" /> 519 <field field_ref="runofflandH217O" /> 520 <field field_ref="evapH217O" /> 521 <field field_ref="evap_terH217O" /> 522 <field field_ref="evap_licH217O" /> 523 <field field_ref="evap_oceH217O" /> 524 <field field_ref="evap_sicH217O" /> 514 <field_group id="mm_2D_H217O" enabled="False" > <!-- H217O --> 515 <field field_ref="precipH217O" level="1" /> 516 <field field_ref="plulH217O" level="1" /> 517 <field field_ref="plucH217O" level="1" /> 518 <field field_ref="evapH217O" level="1" /> 519 <field field_ref="evap_terH217O" level="1" /> 520 <field field_ref="evap_licH217O" level="1" /> 521 <field field_ref="evap_oceH217O" level="1" /> 522 <field field_ref="evap_sicH217O" level="1" /> 525 523 </field_group> 526 <field_group level="1" > <!-- H218O --> 527 <field field_ref="precipH218O" /> 528 <field field_ref="plulH218O" /> 529 <field field_ref="plucH218O" /> 530 <field field_ref="runofflandH218O" /> 531 <field field_ref="evapH218O" /> 532 <field field_ref="evap_terH218O" /> 533 <field field_ref="evap_licH218O" /> 534 <field field_ref="evap_oceH218O" /> 535 <field field_ref="evap_sicH218O" /> 524 <field_group id="mm_2D_H218O" enabled="False" > <!-- H218O --> 525 <field field_ref="precipH218O" level="1" /> 526 <field field_ref="plulH218O" level="1" /> 527 <field field_ref="plucH218O" level="1" /> 528 <field field_ref="evapH218O" level="1" /> 529 <field field_ref="evap_terH218O" level="1" /> 530 <field field_ref="evap_licH218O" level="1" /> 531 <field field_ref="evap_oceH218O" level="1" /> 532 <field field_ref="evap_sicH218O" level="1" /> 536 533 </field_group> 537 534 <!-- water hydrogen HDO HTO --> 538 <field_group level="1" > <!-- HDO --> 539 <field field_ref="precipHDO" /> 540 <field field_ref="plulHDO" /> 541 <field field_ref="plucHDO" /> 542 <field field_ref="runofflandHDO" /> 543 <field field_ref="evapHDO" /> 544 <field field_ref="evap_terHDO" /> 545 <field field_ref="evap_licHDO" /> 546 <field field_ref="evap_oceHDO" /> 547 <field field_ref="evap_sicHDO" /> 535 <field_group id="mm_2D_HDO" enabled="False" > <!-- HDO --> 536 <field field_ref="precipHDO" level="1" /> 537 <field field_ref="plulHDO" level="1" /> 538 <field field_ref="plucHDO" level="1" /> 539 <field field_ref="evapHDO" level="1" /> 540 <field field_ref="evap_terHDO" level="1" /> 541 <field field_ref="evap_licHDO" level="1" /> 542 <field field_ref="evap_oceHDO" level="1" /> 543 <field field_ref="evap_sicHDO" level="1" /> 548 544 </field_group> 549 <field_group level="11" > <!-- HTO --> 550 <field field_ref="plulHTO" /> 551 <field field_ref="precipHTO" /> 552 <field field_ref="plucHTO" /> 553 <field field_ref="runofflandHTO" /> 554 <field field_ref="evapHTO" /> 555 <field field_ref="evap_terHTO" /> 556 <field field_ref="evap_licHTO" /> 557 <field field_ref="evap_oceHTO" /> 558 <field field_ref="evap_sicHTO" /> 545 <field_group id="mm_2D_HTO" enabled="False" > <!-- HTO --> 546 <field field_ref="plulHTO" level="1" /> 547 <field field_ref="precipHTO" level="1" /> 548 <field field_ref="plucHTO" level="1" /> 549 <field field_ref="evapHTO" level="1" /> 550 <field field_ref="evap_terHTO" level="1" /> 551 <field field_ref="evap_licHTO" level="1" /> 552 <field field_ref="evap_oceHTO" level="1" /> 553 <field field_ref="evap_sicHTO" level="1" /> 559 554 </field_group> 560 555 <!-- end Added SN isotopes 2D fields 07 2023 --> … … 743 738 <!-- Begin Added SN isotopes 3D fields 07 2023 --> 744 739 <!-- water oxygen H216O H217O H218O --> 745 <field_group level="11" > <!-- H216O -->746 <field field_ref="ovapH216O" />747 <field field_ref="oliqH216O" />748 <field field_ref="ocondH216O" />749 <field field_ref="dqdynH216O" />750 <field field_ref="dqldynH216O" />751 <field field_ref="dqconH216O" />752 <field field_ref="dqlscH216O" />753 <field field_ref="dqevaH216O" />754 <field field_ref="dqvdfH216O" />755 <field field_ref="dqajsH216O" />756 <field field_ref="dqtheH216O" />740 <field_group id="mm_3D_H216O" enabled="False" > <!-- H216O --> 741 <field field_ref="ovapH216O" level="1" /> 742 <field field_ref="oliqH216O" level="1" /> 743 <field field_ref="ocondH216O" level="1" /> 744 <field field_ref="dqdynH216O" level="1" /> 745 <field field_ref="dqldynH216O" level="1" /> 746 <field field_ref="dqconH216O" level="1" /> 747 <field field_ref="dqlscH216O" level="1" /> 748 <field field_ref="dqevaH216O" level="1" /> 749 <field field_ref="dqvdfH216O" level="1" /> 750 <field field_ref="dqajsH216O" level="1" /> 751 <field field_ref="dqtheH216O" level="1" /> 757 752 </field_group> 758 <field_group level="11" > <!-- H217O -->759 <field field_ref="ovapH217O" />760 <field field_ref="oliqH217O" />761 <field field_ref="ocondH217O" />762 <field field_ref="dqdynH217O" />763 <field field_ref="dqldynH217O" />764 <field field_ref="dqconH217O" />765 <field field_ref="dqlscH217O" />766 <field field_ref="dqevaH217O" />767 <field field_ref="dqvdfH217O" />768 <field field_ref="dqajsH217O" />769 <field field_ref="dqtheH217O" />753 <field_group id="mm_3D_H217O" enabled="False" > <!-- H217O --> 754 <field field_ref="ovapH217O" level="1" /> 755 <field field_ref="oliqH217O" level="1" /> 756 <field field_ref="ocondH217O" level="1" /> 757 <field field_ref="dqdynH217O" level="1" /> 758 <field field_ref="dqldynH217O" level="1" /> 759 <field field_ref="dqconH217O" level="1" /> 760 <field field_ref="dqlscH217O" level="1" /> 761 <field field_ref="dqevaH217O" level="1" /> 762 <field field_ref="dqvdfH217O" level="1" /> 763 <field field_ref="dqajsH217O" level="1" /> 764 <field field_ref="dqtheH217O" level="1" /> 770 765 </field_group> 771 <field_group level="1" > <!-- H218O -->772 <field field_ref="ovapH218O" />773 <field field_ref="oliqH218O" />774 <field field_ref="ocondH218O" />775 <field field_ref="dqdynH218O" />776 <field field_ref="dqldynH218O" />777 <field field_ref="dqconH218O" />778 <field field_ref="dqlscH218O" />779 <field field_ref="dqevaH218O" />780 <field field_ref="dqvdfH218O" />781 <field field_ref="dqajsH218O" />782 <field field_ref="dqtheH218O" />766 <field_group id="mm_3D_H218O" enabled="False" > <!-- H218O --> 767 <field field_ref="ovapH218O" level="1" /> 768 <field field_ref="oliqH218O" level="1" /> 769 <field field_ref="ocondH218O" level="1" /> 770 <field field_ref="dqdynH218O" level="1" /> 771 <field field_ref="dqldynH218O" level="1" /> 772 <field field_ref="dqconH218O" level="1" /> 773 <field field_ref="dqlscH218O" level="1" /> 774 <field field_ref="dqevaH218O" level="1" /> 775 <field field_ref="dqvdfH218O" level="1" /> 776 <field field_ref="dqajsH218O" level="1" /> 777 <field field_ref="dqtheH218O" level="1" /> 783 778 </field_group> 784 779 <!-- water hydrogen HDO HTO --> 785 <field_group level="1" > <!-- HDO -->786 <field field_ref="ovapHDO" />787 <field field_ref="oliqHDO" />788 <field field_ref="ocondHDO" />789 <field field_ref="dqdynHDO" />790 <field field_ref="dqldynHDO" />791 <field field_ref="dqconHDO" />792 <field field_ref="dqlscHDO" />793 <field field_ref="dqevaHDO" />794 <field field_ref="dqvdfHDO" />795 <field field_ref="dqajsHDO" />796 <field field_ref="dqtheHDO" />780 <field_group id="mm_3D_HDO" enabled="False" > <!-- HDO --> 781 <field field_ref="ovapHDO" level="1" /> 782 <field field_ref="oliqHDO" level="1" /> 783 <field field_ref="ocondHDO" level="1" /> 784 <field field_ref="dqdynHDO" level="1" /> 785 <field field_ref="dqldynHDO" level="1" /> 786 <field field_ref="dqconHDO" level="1" /> 787 <field field_ref="dqlscHDO" level="1" /> 788 <field field_ref="dqevaHDO" level="1" /> 789 <field field_ref="dqvdfHDO" level="1" /> 790 <field field_ref="dqajsHDO" level="1" /> 791 <field field_ref="dqtheHDO" level="1" /> 797 792 </field_group> 798 <field_group level="11" > <!-- HTO -->799 <field field_ref="ovapHTO" />800 <field field_ref="oliqHTO" />801 <field field_ref="ocondHTO" />802 <field field_ref="dqdynHTO" />803 <field field_ref="dqldynHTO" />804 <field field_ref="dqconHTO" />805 <field field_ref="dqlscHTO" />806 <field field_ref="dqevaHTO" />807 <field field_ref="dqvdfHTO" />808 <field field_ref="dqajsHTO" />809 <field field_ref="dqtheHTO" />793 <field_group id="mm_3D_HTO" enabled="False" > <!-- HTO --> 794 <field field_ref="ovapHTO" level="1" /> 795 <field field_ref="oliqHTO" level="1" /> 796 <field field_ref="ocondHTO" level="1" /> 797 <field field_ref="dqdynHTO" level="1" /> 798 <field field_ref="dqldynHTO" level="1" /> 799 <field field_ref="dqconHTO" level="1" /> 800 <field field_ref="dqlscHTO" level="1" /> 801 <field field_ref="dqevaHTO" level="1" /> 802 <field field_ref="dqvdfHTO" level="1" /> 803 <field field_ref="dqajsHTO" level="1" /> 804 <field field_ref="dqtheHTO" level="1" /> 810 805 </field_group> 811 806 <!-- End Added SN isotopes 3D fields 07 2023 --> -
LMDZ6/trunk/arch/arch-X64_JEANZAY.env
r5035 r5109 1 module purge2 module load intel-compilers/19.0.43 module load intel-mkl/19.0.44 module load hdf5/1.10.5-mpi5 module load netcdf/4.7.2-mpi6 module load netcdf-fortran/4.5.2-mpi7 module load netcdf958 module load subversion/1.9.79 module load cmake10 1 11 export FC=mpiifort 12 export CPP="icc -E" 13 export CC=icc 2 ############################################################## 3 # Gestion des modules 4 ############################################################## 14 5 6 hostname=jean-zay4 7 echo lmdz_env $hostname 0:3 ${hostname:0:3} 8 9 case ${hostname:0:5} in 10 11 jean-) ARCH=X64_JEANZAY 12 module purge 13 compilo=19.0.4 # available 2013.0, 2017.2 14 module load intel-compilers/$compilo 15 #module load intel-mpi/$compilo 16 module load intel-mkl/$compilo 17 module load hdf5/1.10.5-mpi 18 module load netcdf/4.7.2-mpi 19 module load netcdf-fortran/4.5.2-mpi 20 module load netcdf95/0.3-mpi 21 module load subversion/1.9.7 22 #Pour module gcc, voir : https://trac.lmd.jussieu.fr/LMDZ/wiki/PortageJeanZay 23 #module load gcc/6.5.0 24 module load nco 25 module load cdo 26 # Imputation de la consommation sur le groupe (projet) actif par defaut, 27 # idrproj indique le groupe (projet) actif par defaut 28 # idrproj -d newproj redefinit "newproj" en tant que projet actif, 29 # alors $STORE, $WORK etc vont designer les espaces de "newproj") 30 groupe=`idrproj | grep active | awk '{ print $1}'` 31 groupe="nfl" 32 submit="sbatch -A ${groupe}@cpu " 33 run="srun --label -n " 34 # Espaces suivants definis par defaut en fonction du groupe actif, 35 # par exemple : SCRATCHD=$SCRATCH is /gpfsstore/rech/$groupe/$login 36 # * On peut aussi ne pas installer les scripts a la racine de STORE, 37 # mais dans STORED=$STORE/your_folder 38 STORED=$STORE 39 SCRATCHD=$SCRATCH 40 LMDZD=$WORK 41 nb_mpi_max=2000 42 nb_omp_max=20 43 #LMDZ_Init sur le $STORE du $groupe 44 LMDZ_Init=$STORE/LMDZ_Init ;; 45 *) ARCH= 46 submit=". " 47 run="mpirun -np " 48 SCRATCHD=~/TMP/SCRATCH 49 STORED=~/TMP/ 50 LMDZD=~/TMP 51 nb_mpi_max=2 52 nb_omp_max=2 53 LMDZ_Init=~/LMDZ/LMDZ_Init 54 esac 55 56 57 echo LMDZ_Init dans lmdz_env $LMDZ_Init -
LMDZ6/trunk/arch/arch-X64_JEANZAY.path
r5035 r5109 1 NETCDF_INCDIR="-I$(nf-config --includedir) -I$(nc-config --includedir)" # nc required for xios 2 # Ugly hack for orchidee <=2.0 3 NETCDF_LIBDIR="-L$(nf-config --flibs | sed -e "s/-L//")" 1 # $Id$ 2 #NETCDF_LIBDIR="-L$NETCDFFORTRAN_LIBDIR -L$NETCDF_LIBDIR -lnetcdf -lnetcdff" 3 #NETCDF_INCDIR=-I$NETCDFFORTRAN_INCDIR 4 NETCDF_INCDIR="" 5 NETCDF_LIBDIR="" 4 6 NETCDF_LIB="-lnetcdff -lnetcdf" 5 NETCDF95_INCDIR="-I$(pwd)/../../include"6 NETCDF95_LIBDIR="-L$(pwd)/../../lib"7 NETCDF95_LIB="-lnetcdf95"8 7 9 # Exported 10 IOIPSL_INCDIR="-I$(pwd)/../IOIPSL/inc -I$(pwd)/../IOIPSL/lib" 11 IOIPSL_LIBDIR="-L$(pwd)/../IOIPSL/inc -L$(pwd)/../IOIPSL/lib" 8 NETCDF95_INCDIR=-I$NETCDF95_ROOT/include/NetCDF95 9 NETCDF95_LIBDIR=-L$NETCDF95_ROOT/lib 10 NETCDF95_LIB=-lnetcdf95 11 12 IOIPSL_INCDIR="-I$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc" 13 IOIPSL_LIBDIR="-L$LMDGCM/../../lib -L$LMDGCM/../IOIPSL/lib" 12 14 IOIPSL_LIB="-lioipsl" 13 15 14 # Exported 15 XIOS_INCDIR="-I$(pwd)/../XIOS/inc" 16 XIOS_LIBDIR="-L$(pwd)/../XIOS/lib" 16 XIOS_INCDIR="-I$LMDGCM/../XIOS/inc" 17 XIOS_LIBDIR="-L$LMDGCM/../XIOS/lib" 17 18 XIOS_LIB="-lxios -lstdc++" 18 19 19 # Exported 20 ORCH_INCDIR="-I$(pwd)/../ORCHIDEE/inc -I$(pwd)/../ORCHIDEE/lib" 21 ORCH_LIBDIR="-L$(pwd)/../ORCHIDEE/inc -L$(pwd)/../ORCHIDEE/lib" 20 ORCH_INCDIR="-I$LMDGCM/../../lib" 21 ORCH_LIBDIR="-L$LMDGCM/../../lib" 22 ORCH_LIB= 23 24 OASIS_INCDIR="-I$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1" 25 OASIS_LIBDIR="-L$LMDGCM/../../oasis3-mct/BLD/lib" 26 OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 27 28 INCA_INCDIR="-I$LMDGCM/../INCA/build/inc" 29 INCA_LIBDIR="-L$LMDGCM/../INCA/build/lib" 30 INCA_LIB="-lchimie" -
LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90
r5084 r5109 406 406 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxfluxlat, zxtsol, snow_lsc, zxfqfonte 407 407 !$OMP THREADPRIVATE(zxfluxlat, zxtsol, snow_lsc, zxfqfonte) 408 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxrunofflic 409 !$OMP THREADPRIVATE(zxrunofflic) 408 !SN runoffdiag 409 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxrunofflic, runoff_diag 410 !$OMP THREADPRIVATE(zxrunofflic, runoff_diag) 410 411 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zxqsurf, rain_lsc, rain_num 411 412 !$OMP THREADPRIVATE(zxqsurf, rain_lsc, rain_num) … … 413 414 REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: xtevap,xtprw 414 415 !$OMP THREADPRIVATE(xtevap,xtprw) 415 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: h1_diag ,runoff_diag416 REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: h1_diag 416 417 REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: xtrunoff_diag 417 !$OMP THREADPRIVATE(h1_diag ,runoff_diag,xtrunoff_diag)418 !$OMP THREADPRIVATE(h1_diagv,xtrunoff_diag) 418 419 REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: zxfxtcalving 419 420 !$OMP THREADPRIVATE(zxfxtcalving) … … 1054 1055 ALLOCATE(zxfqcalving(klon), zxfluxlat(klon)) 1055 1056 ALLOCATE(zxtsol(klon), snow_lsc(klon), zxfqfonte(klon), zxqsurf(klon)) 1056 ALLOCATE(zxrunofflic(klon)) 1057 ! SN add runoff_diag 1058 ALLOCATE(zxrunofflic(klon), runoff_diag(klon)) 1059 runoff_diag(:)=0. 1057 1060 ALLOCATE(zxustartlic(klon), zxrhoslic(klon), zxqsaltlic(klon)) 1058 1061 zxustartlic(:)=0. ; zxrhoslic(:)=0. ; zxqsaltlic(:)=0. … … 1069 1072 ALLOCATE(xtrain_lsc(ntraciso,klon)) 1070 1073 ALLOCATE(xtrunoff_diag(niso,klon)) 1071 ALLOCATE(h1_diag(klon) ,runoff_diag(klon))1074 ALLOCATE(h1_diag(klon)) 1072 1075 !SN 1073 runoff_diag(:)=0. ;xtrunoff_diag(:,:)=0. ! because variables are only given values on knon grid points1076 xtrunoff_diag(:,:)=0. ! because variables are only given values on knon grid points 1074 1077 #endif 1075 1078 ! … … 1474 1477 DEALLOCATE(uwat, vwat) 1475 1478 DEALLOCATE(zxfqcalving, zxfluxlat) 1476 DEALLOCATE(zxrunofflic) 1479 ! SN runoff_diag 1480 DEALLOCATE(zxrunofflic, runoff_diag) 1477 1481 DEALLOCATE(zxustartlic, zxrhoslic, zxqsaltlic) 1478 1482 DEALLOCATE(zxtsol, snow_lsc, zxfqfonte, zxqsurf) … … 1503 1507 DEALLOCATE(dxtvdf_x, dxtvdf_w) 1504 1508 DEALLOCATE(xt_therm) 1505 DEALLOCATE(h1_diag, runoff_diag,xtrunoff_diag)1509 DEALLOCATE(h1_diag,xtrunoff_diag) 1506 1510 #endif 1507 1511 ! -
LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90
r5056 r5109 2110 2110 TYPE(ctrl_out), SAVE :: o_runoff = ctrl_out((/ 1, 1, 10, 1, 10, 10, 11, 11, 11, 11/), & 2111 2111 'runoff', 'Run-off rate land ice', 'kg/m2/s', (/ ('', i=1, 10) /)) 2112 #ifdef ISO 2112 ! SN add runoff_diag 2113 !#ifdef ISO 2113 2114 TYPE(ctrl_out), SAVE :: o_runoff_diag = ctrl_out((/ 1, 1, 10, 1, 10, 10, 11, 11, 11, 11/), & 2114 2115 'runoffland', 'Run-off rate land for bucket', 'kg/m2/s', (/ ('', i=1, 10) /)) 2115 #endif2116 !#endif 2116 2117 TYPE(ctrl_out), SAVE :: o_albslw3 = ctrl_out((/ 1, 1, 1, 1, 10, 10, 11, 11, 11, 11/), & 2117 2118 'albslw3', 'Surface albedo LW3', '-', (/ ('', i=1, 10) /)) -
LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90
r5084 r5109 64 64 o_fder, o_ffonte, o_fqcalving, o_fqfonte, o_mrroli, o_runofflic, & 65 65 o_taux, o_tauy, o_snowsrf, o_qsnow, & 66 o_snowhgt, o_toice, o_sissnow, o_runoff, & 66 ! SN runoff_diag 67 o_snowhgt, o_toice, o_sissnow, o_runoff, o_runoff_diag, & 67 68 o_albslw3, o_pourc_srf, o_fract_srf, & 68 69 o_taux_srf, o_tauy_srf, o_tsol_srf, & … … 207 208 ! Isotopes 208 209 o_xtprecip,o_xtplul,o_xtpluc,o_xtovap,o_xtoliq,o_xtcond, & 209 o_ runoff_diag, o_xtrunoff_diag, &210 o_xtrunoff_diag, & 210 211 o_xtevap,o_dxtdyn,o_dxtldyn,o_dxtcon,o_dxtlsc,o_dxteva, & 211 212 o_dxtajs,o_dxtvdf,o_dxtthe, o_dxtch4, & … … 319 320 zxffonte, zxfqcalving, zxfqfonte, zxrunofflic, fluxu, & 320 321 fluxv, zxsnow, qsnow, snowhgt, to_ice, & 321 sissnow, runoff, albsol3_lic, evap_pot, & 322 ! SN runoff_diag 323 sissnow, runoff, runoff_diag, albsol3_lic, evap_pot, & 322 324 t2m, fluxt, fluxlat, fsollw, fsolsw, & 323 325 wfbils, wfevap, & … … 393 395 d_xt_ajs, d_xt_ajsb, & 394 396 d_xt_prod_nucl,d_xt_cosmo,d_xt_decroiss, & 395 runoff_diag,xtrunoff_diag, &397 xtrunoff_diag, & 396 398 #endif 397 399 ep, epmax_diag, & ! epmax_cape … … 449 451 USE indice_sol_mod, ONLY: nbsrf 450 452 #ifdef ISO 451 USE isotopes_mod, ONLY: iso_HTO 453 USE isotopes_mod, ONLY: iso_HTO, isoName 452 454 #endif 453 455 USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg … … 530 532 CHARACTER(LEN=maxlen) :: unt 531 533 #endif 534 535 #ifdef ISO 536 CHARACTER(LEN=maxlen) :: outiso 537 #endif 538 532 539 REAL,DIMENSION(klon,klev) :: z, dz 533 540 REAL,DIMENSION(klon) :: zrho, zt … … 2837 2844 end if 2838 2845 2846 !! runoff land bucket - ajout S. Nguyen 23 07 2024 2847 CALL histwrite_phy(o_runoff_diag, runoff_diag) 2848 2839 2849 #ifdef ISO 2840 2850 !write(*,*) 'tmp phys_output_write: ntiso=',ntiso 2841 !! runoff land bucket - ajout S. Nguyen 25 avril 2024 2842 CALL histwrite_phy(o_runoff_diag, runoff_diag) 2843 2844 do ixt=1,ntiso 2851 2852 DO ixt = 1, ntiso 2845 2853 !write(*,*) 'ixt,o_xtovap(ixt)=',ixt,o_xtovap(ixt) 2846 2854 IF (vars_defined) zx_tmp_fi2d(:) = xtrain_fall(ixt,:) + xtsnow_fall(ixt,:) … … 2919 2927 ENDDO ! iff 2920 2928 #endif 2929 2930 !SN activate water isotopes present in tracer.def 2931 #ifdef ISO 2932 DO ixt = 1, ntiso 2933 outiso = TRIM(isoName(ixt)) 2934 i = INDEX(outiso, '_', .TRUE.) 2935 outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso)) 2936 ! dayly 2937 CALL xios_set_fieldgroup_attr("dd_2D_"//TRIM(outiso), enabled=.TRUE.) 2938 CALL xios_set_fieldgroup_attr("dd_3D_"//TRIM(outiso), enabled=.TRUE.) 2939 ! monthly 2940 CALL xios_set_fieldgroup_attr("mm_2D_"//TRIM(outiso), enabled=.TRUE.) 2941 CALL xios_set_fieldgroup_attr("mm_3D_"//TRIM(outiso), enabled=.TRUE.) 2942 2943 ENDDO 2944 #endif 2921 2945 !On finalise l'initialisation: 2922 2946 IF (using_xios) CALL wxios_closedef()
Note: See TracChangeset
for help on using the changeset viewer.
