Changeset 5218
- Timestamp:
- Sep 23, 2024, 2:23:42 PM (3 months ago)
- Location:
- LMDZ6/branches/Amaury_dev
- Files:
-
- 6 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Amaury_dev
- Property svn:mergeinfo changed
/LMDZ6/trunk merged: 5138,5147,5149
- Property svn:mergeinfo changed
-
LMDZ6/branches/Amaury_dev/DefLists/field_def_lmdz.xml
r5132 r5218 588 588 <!-- Begin Added SN isotopes 2D fields 07 2023 --> 589 589 <!-- water oxygen H216O H217O H218O --> 590 <field_group id="iso2D_H216O" enabled="False" > <!-- H216O --> 590 591 <field id="precipH216O" long_name="Precip Totale liq+sol" unit="kg/(s*m2)" /> 591 592 <field id="plulH216O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> … … 597 598 <field id="evap_oceH216O" long_name="evaporation at surface oce" unit="kg/(s*m2)" /> 598 599 <field id="evap_sicH216O" long_name="evaporation at surface sic" unit="kg/(s*m2)" /> 600 </field_group> 601 <field_group id="iso2D_H217O" enabled="False" > <!-- H217O --> 599 602 <field id="precipH217O" long_name="Precip Totale liq+sol" unit="kg/(s*m2)" /> 600 603 <field id="plulH217O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> … … 606 609 <field id="evap_oceH217O" long_name="evaporation at surface oce" unit="kg/(s*m2)" /> 607 610 <field id="evap_sicH217O" long_name="evaporation at surface sic" unit="kg/(s*m2)" /> 611 </field_group> 612 <field_group id="iso2D_H218O" enabled="False" > <!-- H218O --> 608 613 <field id="precipH218O" long_name="Precip Totale liq+sol" unit="kg/(s*m2)" /> 609 614 <field id="plulH218O" long_name="Large-scale Precip." unit="kg/(s*m2)" /> … … 615 620 <field id="evap_oceH218O" long_name="evaporation at surface oce" unit="kg/(s*m2)" /> 616 621 <field id="evap_sicH218O" long_name="evaporation at surface sic" unit="kg/(s*m2)" /> 622 </field_group> 617 623 <!-- water hydrogen HDO HTO --> 624 <field_group id="iso2D_HDO" enabled="False" > <!-- HDO --> 618 625 <field id="precipHDO" long_name="Precip Totale liq+sol" unit="kg/(s*m2)" /> 619 626 <field id="plulHDO" long_name="Large-scale Precip." unit="kg/(s*m2)" /> … … 625 632 <field id="evap_oceHDO" long_name="evaporation at surface oce" unit="kg/(s*m2)" /> 626 633 <field id="evap_sicHDO" long_name="evaporation at surface sic" unit="kg/(s*m2)" /> 634 </field_group> 635 <field_group id="iso2D_HTO" enabled="False" > <!-- HTO --> 627 636 <field id="precipHTO" long_name="Precip Totale liq+sol" unit="kg/(s*m2)" /> 628 637 <field id="plulHTO" long_name="Large-scale Precip." unit="kg/(s*m2)" /> … … 634 643 <field id="evap_oceHTO" long_name="evaporation at surface oce" unit="kg/(s*m2)" /> 635 644 <field id="evap_sicHTO" long_name="evaporation at surface sic" unit="kg/(s*m2)" /> 645 </field_group> 636 646 <!-- end Added SN isotopes 2D fields 07 2023 --> 637 647 </field_group> … … 896 906 <!-- Begin Added SN isotopes 3D fields 07 2023 --> 897 907 <!-- water oxygen H216O H217O H218O --> 908 <field_group id="iso3D_H216O" enabled="False" > <!-- H216O --> 898 909 <field id="ovapH216O" long_name="Specific humidity" unit="kg/kg" /> 899 910 <field id="oliqH216O" long_name="Liquid water" unit="kg/kg" /> … … 907 918 <field id="dqajsH216O" long_name="Dry adjust. dQ" unit="(kg/kg)/s" /> 908 919 <field id="dqtheH216O" long_name="Thermal dQ" unit="(kg/kg)/s" /> 920 </field_group> 921 <field_group id="iso3D_H217O" enabled="False" > <!-- H217O --> 909 922 <field id="ovapH217O" long_name="Specific humidity" unit="kg/kg" /> 910 923 <field id="oliqH217O" long_name="Liquid water" unit="kg/kg" /> … … 918 931 <field id="dqajsH217O" long_name="Dry adjust. dQ" unit="(kg/kg)/s" /> 919 932 <field id="dqtheH217O" long_name="Thermal dQ" unit="(kg/kg)/s" /> 933 </field_group> 934 <field_group id="iso3D_H218O" enabled="False" > <!-- H218O --> 920 935 <field id="ovapH218O" long_name="Specific humidity" unit="kg/kg" /> 921 936 <field id="oliqH218O" long_name="Liquid water" unit="kg/kg" /> … … 929 944 <field id="dqajsH218O" long_name="Dry adjust. dQ" unit="(kg/kg)/s" /> 930 945 <field id="dqtheH218O" long_name="Thermal dQ" unit="(kg/kg)/s" /> 946 </field_group> 931 947 <!-- water hydrogen HDO HTO --> 948 <field_group id="iso3D_HDO" enabled="False" > <!-- HDO --> 932 949 <field id="ovapHDO" long_name="Specific humidity" unit="kg/kg" /> 933 950 <field id="oliqHDO" long_name="Liquid water" unit="kg/kg" /> … … 941 958 <field id="dqajsHDO" long_name="Dry adjust. dQ" unit="(kg/kg)/s" /> 942 959 <field id="dqtheHDO" long_name="Thermal dQ" unit="(kg/kg)/s" /> 960 </field_group> 961 <field_group id="iso3D_HTO" enabled="False" > <!-- HTO --> 943 962 <field id="ovapHTO" long_name="Specific humidity" unit="kg/kg" /> 944 963 <field id="oliqHTO" long_name="Liquid water" unit="kg/kg" /> … … 952 971 <field id="dqajsHTO" long_name="Dry adjust. dQ" unit="(kg/kg)/s" /> 953 972 <field id="dqtheHTO" long_name="Thermal dQ" unit="(kg/kg)/s" /> 973 </field_group> 954 974 <!-- End Added SN isotopes 3D fields 07 2023 --> 955 975 </field_group> -
LMDZ6/branches/Amaury_dev/DefLists/file_def_histday_lmdz.xml
r5132 r5218 453 453 <!-- Begin Added SN isotopes 2D fields 07 2023 --> 454 454 <!-- water oxygen H216O H217O H218O --> 455 <field_group id="dd_2D_H216O" enabled="False" > <!-- H216O -->456 455 <field field_ref="precipH216O" level="1" /> 457 456 <field field_ref="plulH216O" level="1" /> 458 457 <field field_ref="plucH216O" level="1" /> 458 <field field_ref="runofflandH216O" level="1" /> 459 459 <field field_ref="evapH216O" level="1" /> 460 460 <field field_ref="evap_terH216O" level="1" /> … … 462 462 <field field_ref="evap_oceH216O" level="1" /> 463 463 <field field_ref="evap_sicH216O" level="1" /> 464 </field_group>465 <field_group id="dd_2D_H217O" enabled="False" > <!-- H217O -->466 464 <field field_ref="precipH217O" level="1" /> 467 465 <field field_ref="plulH217O" level="1" /> 468 466 <field field_ref="plucH217O" level="1" /> 467 <field field_ref="runofflandH217O" level="1" /> 469 468 <field field_ref="evapH217O" level="1" /> 470 469 <field field_ref="evap_terH217O" level="1" /> … … 472 471 <field field_ref="evap_oceH217O" level="1" /> 473 472 <field field_ref="evap_sicH217O" level="1" /> 474 </field_group>475 <field_group id="dd_2D_H218O" enabled="False" > <!-- H218O -->476 473 <field field_ref="precipH218O" level="1" /> 477 474 <field field_ref="plulH218O" level="1" /> 478 475 <field field_ref="plucH218O" level="1" /> 476 <field field_ref="runofflandH218O" level="1" /> 479 477 <field field_ref="evapH218O" level="1" /> 480 478 <field field_ref="evap_terH218O" level="1" /> … … 482 480 <field field_ref="evap_oceH218O" level="1" /> 483 481 <field field_ref="evap_sicH218O" level="1" /> 484 </field_group>485 482 <!-- water hydrogen HDO HTO --> 486 <field_group id="dd_2D_HDO" enabled="False" > <!-- HDO -->487 483 <field field_ref="precipHDO" level="1" /> 488 484 <field field_ref="plulHDO" level="1" /> 489 485 <field field_ref="plucHDO" level="1" /> 486 <field field_ref="runofflandHDO" level="1" /> 490 487 <field field_ref="evapHDO" level="1" /> 491 488 <field field_ref="evap_terHDO" level="1" /> … … 493 490 <field field_ref="evap_oceHDO" level="1" /> 494 491 <field field_ref="evap_sicHDO" level="1" /> 495 </field_group>496 <field_group id="dd_2D_HTO" enabled="False" > <!-- HTO -->497 492 <field field_ref="plulHTO" level="1" /> 498 493 <field field_ref="precipHTO" level="1" /> 499 494 <field field_ref="plucHTO" level="1" /> 495 <field field_ref="runofflandHTO" level="1" /> 500 496 <field field_ref="evapHTO" level="1" /> 501 497 <field field_ref="evap_terHTO" level="1" /> … … 503 499 <field field_ref="evap_oceHTO" level="1" /> 504 500 <field field_ref="evap_sicHTO" level="1" /> 505 </field_group>506 501 <!-- end Added SN isotopes 2D fields 07 2023 --> 507 502 </field_group> … … 682 677 <!-- Begin Added SN isotopes 3D fields 07 2023 --> 683 678 <!-- water oxygen H216O H217O H218O --> 684 <field_group id="dd_3D_H216O" enabled="False" > <!-- H216O -->685 679 <field field_ref="ovapH216O" level="1" /> 686 680 <field field_ref="oliqH216O" level="1" /> … … 694 688 <field field_ref="dqajsH216O" level="1" /> 695 689 <field field_ref="dqtheH216O" level="1" /> 696 </field_group>697 <field_group id="dd_3D_H217O" enabled="False" > <!-- H217O -->698 690 <field field_ref="ovapH217O" level="1" /> 699 691 <field field_ref="oliqH217O" level="1" /> … … 707 699 <field field_ref="dqajsH217O" level="1" /> 708 700 <field field_ref="dqtheH217O" level="1" /> 709 </field_group>710 <field_group id="dd_3D_H218O" enabled="False" > <!-- H218O -->711 701 <field field_ref="ovapH218O" level="1" /> 712 702 <field field_ref="oliqH218O" level="1" /> … … 720 710 <field field_ref="dqajsH218O" level="1" /> 721 711 <field field_ref="dqtheH218O" level="1" /> 722 </field_group>723 712 <!-- water hydrogen HDO HTO --> 724 <field_group id="dd_3D_HDO" enabled="False" > <!-- HDO -->725 713 <field field_ref="ovapHDO" level="1" /> 726 714 <field field_ref="oliqHDO" level="1" /> … … 734 722 <field field_ref="dqajsHDO" level="1" /> 735 723 <field field_ref="dqtheHDO" level="1" /> 736 </field_group>737 <field_group id="dd_3D_HTO" enabled="False" > <!-- HTO -->738 724 <field field_ref="ovapHTO" level="1" /> 739 725 <field field_ref="oliqHTO" level="1" /> … … 747 733 <field field_ref="dqajsHTO" level="1" /> 748 734 <field field_ref="dqtheHTO" level="1" /> 749 </field_group>750 735 <!-- End Added SN isotopes 3D fields 07 2023 --> 751 736 </field_group> -
LMDZ6/branches/Amaury_dev/DefLists/file_def_histmth_lmdz.xml
r5132 r5218 502 502 <!-- Begin Added SN isotopes 2D fields 07 2023 --> 503 503 <!-- water oxygen H216O H217O H218O --> 504 <field_group id="mm_2D_H216O" enabled="False" > <!-- H216O -->505 504 <field field_ref="precipH216O" level="1" /> 506 505 <field field_ref="plulH216O" level="1" /> 507 506 <field field_ref="plucH216O" level="1" /> 507 <field field_ref="runofflandH216O" level="1" /> 508 508 <field field_ref="evapH216O" level="1" /> 509 509 <field field_ref="evap_terH216O" level="1" /> … … 511 511 <field field_ref="evap_oceH216O" level="1" /> 512 512 <field field_ref="evap_sicH216O" level="1" /> 513 </field_group>514 <field_group id="mm_2D_H217O" enabled="False" > <!-- H217O -->515 513 <field field_ref="precipH217O" level="1" /> 516 514 <field field_ref="plulH217O" level="1" /> 517 515 <field field_ref="plucH217O" level="1" /> 516 <field field_ref="runofflandH217O" level="1" /> 518 517 <field field_ref="evapH217O" level="1" /> 519 518 <field field_ref="evap_terH217O" level="1" /> … … 521 520 <field field_ref="evap_oceH217O" level="1" /> 522 521 <field field_ref="evap_sicH217O" level="1" /> 523 </field_group>524 <field_group id="mm_2D_H218O" enabled="False" > <!-- H218O -->525 522 <field field_ref="precipH218O" level="1" /> 526 523 <field field_ref="plulH218O" level="1" /> 527 524 <field field_ref="plucH218O" level="1" /> 525 <field field_ref="runofflandH218O" level="1" /> 528 526 <field field_ref="evapH218O" level="1" /> 529 527 <field field_ref="evap_terH218O" level="1" /> … … 531 529 <field field_ref="evap_oceH218O" level="1" /> 532 530 <field field_ref="evap_sicH218O" level="1" /> 533 </field_group>534 531 <!-- water hydrogen HDO HTO --> 535 <field_group id="mm_2D_HDO" enabled="False" > <!-- HDO -->536 532 <field field_ref="precipHDO" level="1" /> 537 533 <field field_ref="plulHDO" level="1" /> 538 534 <field field_ref="plucHDO" level="1" /> 535 <field field_ref="runofflandHDO" level="1" /> 539 536 <field field_ref="evapHDO" level="1" /> 540 537 <field field_ref="evap_terHDO" level="1" /> … … 542 539 <field field_ref="evap_oceHDO" level="1" /> 543 540 <field field_ref="evap_sicHDO" level="1" /> 544 </field_group>545 <field_group id="mm_2D_HTO" enabled="False" > <!-- HTO -->546 541 <field field_ref="plulHTO" level="1" /> 547 542 <field field_ref="precipHTO" level="1" /> 548 543 <field field_ref="plucHTO" level="1" /> 544 <field field_ref="runofflandHTO" level="1" /> 549 545 <field field_ref="evapHTO" level="1" /> 550 546 <field field_ref="evap_terHTO" level="1" /> … … 552 548 <field field_ref="evap_oceHTO" level="1" /> 553 549 <field field_ref="evap_sicHTO" level="1" /> 554 </field_group>555 550 <!-- end Added SN isotopes 2D fields 07 2023 --> 556 557 551 </field_group> 558 552 … … 738 732 <!-- Begin Added SN isotopes 3D fields 07 2023 --> 739 733 <!-- water oxygen H216O H217O H218O --> 740 <field_group id="mm_3D_H216O" enabled="False" > <!-- H216O -->741 734 <field field_ref="ovapH216O" level="1" /> 742 735 <field field_ref="oliqH216O" level="1" /> … … 750 743 <field field_ref="dqajsH216O" level="1" /> 751 744 <field field_ref="dqtheH216O" level="1" /> 752 </field_group>753 <field_group id="mm_3D_H217O" enabled="False" > <!-- H217O -->754 745 <field field_ref="ovapH217O" level="1" /> 755 746 <field field_ref="oliqH217O" level="1" /> … … 763 754 <field field_ref="dqajsH217O" level="1" /> 764 755 <field field_ref="dqtheH217O" level="1" /> 765 </field_group>766 <field_group id="mm_3D_H218O" enabled="False" > <!-- H218O -->767 756 <field field_ref="ovapH218O" level="1" /> 768 757 <field field_ref="oliqH218O" level="1" /> … … 776 765 <field field_ref="dqajsH218O" level="1" /> 777 766 <field field_ref="dqtheH218O" level="1" /> 778 </field_group>779 767 <!-- water hydrogen HDO HTO --> 780 <field_group id="mm_3D_HDO" enabled="False" > <!-- HDO -->781 768 <field field_ref="ovapHDO" level="1" /> 782 769 <field field_ref="oliqHDO" level="1" /> … … 790 777 <field field_ref="dqajsHDO" level="1" /> 791 778 <field field_ref="dqtheHDO" level="1" /> 792 </field_group>793 <field_group id="mm_3D_HTO" enabled="False" > <!-- HTO -->794 779 <field field_ref="ovapHTO" level="1" /> 795 780 <field field_ref="oliqHTO" level="1" /> … … 803 788 <field field_ref="dqajsHTO" level="1" /> 804 789 <field field_ref="dqtheHTO" level="1" /> 805 </field_group>806 790 <!-- End Added SN isotopes 3D fields 07 2023 --> 807 808 791 </field_group> 809 792 -
LMDZ6/branches/Amaury_dev/libf/misc/slatec_libmath_pch.f90
r5217 r5218 2 2 3 3 MODULE lmdz_libmath_pch 4 USE lmdz_xer, ONLY: xermsg4 USE slatec_xer, ONLY: xermsg 5 5 IMPLICIT NONE; PRIVATE 6 6 PUBLIC pchfe_95, pchsp_95 -
LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90
r5160 r5218 2921 2921 i = INDEX(outiso, '_', .TRUE.) 2922 2922 outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso)) 2923 ! dayly 2924 CALL xios_set_fieldgroup_attr("dd_2D_"//TRIM(outiso), enabled=.TRUE.) 2925 CALL xios_set_fieldgroup_attr("dd_3D_"//TRIM(outiso), enabled=.TRUE.) 2926 ! monthly 2927 CALL xios_set_fieldgroup_attr("mm_2D_"//TRIM(outiso), enabled=.TRUE.) 2928 CALL xios_set_fieldgroup_attr("mm_3D_"//TRIM(outiso), enabled=.TRUE.) 2923 2924 CALL xios_set_fieldgroup_attr("iso2D_"//TRIM(outiso), enabled=.TRUE.) 2925 CALL xios_set_fieldgroup_attr("iso3D_"//TRIM(outiso), enabled=.TRUE.) 2929 2926 2930 2927 ENDDO -
LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90
r5160 r5218 28 28 REAL, DIMENSION(klon,klev,nqtot), INTENT(IN) :: qx 29 29 REAL, DIMENSION(klon,klev), INTENT(OUT) :: d_t_eva 30 REAL, DIMENSION(klon,klev,nqtot), INTENT(OUT) :: 30 REAL, DIMENSION(klon,klev,nqtot), INTENT(OUT) :: d_qx_eva 31 31 32 32 REAL za,zb,zdelta,zlvdcp,zlsdcp … … 35 35 !--------Stochastic Boundary Layer Triggering: ALE_BL-------- 36 36 37 DO ixt =1,1+ntiso37 DO ixt = 1, 1+ntiso 38 38 ! Re-evaporer l'eau liquide nuageuse 39 39 … … 43 43 !PRINT *,'rrevap ; fl_cor_ebil:',fl_cor_ebil,' iflag_ice_thermo:',iflag_ice_thermo,' RVTMP2',RVTMP2 44 44 DO k = 1, klev ! re-evaporation de l'eau liquide nuageuse 45 45 DO i = 1, klon 46 46 47 IF (ixt ==1) THEN47 IF (ixt == 1) THEN ! water 48 48 IF (fl_cor_ebil > 0) THEN 49 49 !zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(q_seri(i,k)+ql_seri(i,k)+qs_seri(i,k))) … … 51 51 zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*(qx(i,k,ivapcur)+qx(i,k,iliqcur)+qx(i,k,isolcur))) 52 52 zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*(qx(i,k,ivapcur)+qx(i,k,iliqcur)+qx(i,k,isolcur))) 53 else53 ELSE 54 54 zlvdcp=RLVTT/RCPD/(1.0+RVTMP2*qx(i,k,ivapcur)) 55 55 !jyg< … … 57 57 ! A verifier !!! 58 58 zlsdcp=RLSTT/RCPD/(1.0+RVTMP2*qx(i,k,ivapcur)) 59 end if59 END IF 60 60 IF (iflag_ice_thermo == 0) THEN 61 61 zlsdcp=zlvdcp 62 END IF62 END IF 63 63 !>jyg 64 END IF 65 IF (iflag_ice_thermo == 0) THEN 66 !pas necessaire a priori 67 68 zdelta = MAX(0., SIGN(1., RTT - t_seri(i, k))) 69 zdelta = 0. 70 zb = MAX(0.0, qx(i, k, iliqcur)) 71 IF (ixt == 1) THEN 72 za = - MAX(0.0, qx(i, k, iliqcur)) & 73 * (zlvdcp * (1. - zdelta) + zlsdcp * zdelta) 74 d_t_eva(i, k) = za 75 END IF 76 d_qx_eva(i, k, ivapcur) = zb 77 d_qx_eva(i, k, iliqcur) = -qx(i, k, iliqcur) 78 d_qx_eva(i, k, isolcur) = 0. 79 80 ELSE 81 64 82 !CR: on r\'e-\'evapore eau liquide et glace 65 83 … … 68 86 ! za = - MAX(0.0,ql_seri(i,k)) & 69 87 ! * (zlvdcp*(1.-zdelta)+zlsdcp*zdelta) 70 za = - MAX(0.0,qx(i,k,iliqcur))*zlvdcp & 71 - MAX(0.0,qx(i,k,iliqcur))*zlsdcp 72 d_t_eva(i,k) = za 88 IF (ixt == 1) THEN 89 za = - MAX(0.0, qx(i, k, iliqcur)) * zlvdcp & 90 - MAX(0.0, qx(i, k, iliqcur)) * zlsdcp 91 d_t_eva(i, k) = za 73 92 74 endif !if (ixt.EQ.1) THEN93 END IF 75 94 !zb = MAX(0.0,ql_seri(i,k)+qs_seri(i,k)) 76 95 !d_q_eva(i,k) = zb … … 82 101 d_qx_eva(i,k,iliqcur) = -qx(i,k,iliqcur) 83 102 d_qx_eva(i,k,isolcur) = -qx(i,k,isolcur) 103 END IF 84 104 85 105 86 ENDDO87 END DO106 END DO 107 END DO 88 108 89 enddo ! do ixt=1,1+niso*(nzone +1) 90 109 END DO ! DO ixt = 1, 1+niso*(nzone +1) 91 110 92 111
Note: See TracChangeset
for help on using the changeset viewer.