Ignore:
Timestamp:
Dec 10, 2009, 10:02:56 AM (15 years ago)
Author:
Laurent Fairhead
Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:
LMDZ4/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk

  • LMDZ4/trunk/libf/phylmd/phys_output_write.h

    r1146 r1279  
    219219       IF (o_LWdn200%flag(iff)<=lev_files(iff)) THEN
    220220      CALL histwrite_phy(nid_files(iff),
    221      s                   o_LWdn200%name,itau_w,zx_tmp_fi2d)
     221     s                   o_LWdn200%name,itau_w,LWdn200)
    222222       ENDIF
    223223
    224224       IF (o_LWdn200clr%flag(iff)<=lev_files(iff)) THEN
    225225      CALL histwrite_phy(nid_files(iff),
    226      s                  o_LWdn200clr%name,itau_w,zx_tmp_fi2d)
     226     s                  o_LWdn200clr%name,itau_w,LWdn200clr)
    227227       ENDIF
    228228
     
    575575
    576576! Champs interpolles sur des niveaux de pression
    577 ! if=1 on ecrit u v w phi sur 850 700 500 200 au niv 1
    578 ! if=2 on ecrit w et ph 500 seulement au niv 1
    579 !        et u v sur 850 700 500 200
    580 ! if=3 on ecrit ph a 500 seulement au niv 1
    581 !      on ecrit u v t q a 850 700 500 200 au niv 3
    582577
    583578        ll=0
    584579        DO k=1, nlevSTD
    585          IF(k.GE.2.AND.k.LE.12) bb2=clevSTD(k)
    586          IF(k.GE.13.AND.k.LE.17) bb3=clevSTD(k)
     580!         IF(k.GE.2.AND.k.LE.12) bb2=clevSTD(k)
     581!         IF(k.GE.13.AND.k.LE.17) bb3=clevSTD(k)
     582         bb2=clevSTD(k)
    587583         IF(bb2.EQ."850".OR.bb2.EQ."700".OR.
    588      $      bb2.EQ."500".OR.bb2.EQ."200") THEN
     584     $      bb2.EQ."500".OR.bb2.EQ."200".OR.
     585     $      bb2.EQ."50".OR.bb2.EQ."10") THEN
    589586
    590587! a refaire correctement !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     
    746743       ENDIF
    747744
    748 !      IF (o_pr_con_l%flag(iff)<=lev_files(iff)) THEN
    749 !      CALL histwrite_phy(nid_files(iff),o_pmflxr%name,itau_w,pmflxr)
    750 !      ENDIF
    751 
    752 !      IF (o_pr_con_i%flag(iff)<=lev_files(iff)) THEN
    753 !      CALL histwrite_phy(nid_files(iff),o_pmflxs%name,itau_w,pmflxs)
    754 !      ENDIF
    755 
    756 !      IF (o_pr_lsc_l%flag(iff)<=lev_files(iff)) THEN
    757 !      CALL histwrite_phy(nid_files(iff),o_prfl%name,itau_w,prfl)
    758 !      ENDIF
    759 
    760 !      IF (o_pr_lsc_i%flag(iff)<=lev_files(iff)) THEN
    761 !      CALL histwrite_phy(nid_files(iff),o_psfl%name,itau_w,psfl)
    762 !      ENDIF
     745      IF (o_pr_con_l%flag(iff)<=lev_files(iff)) THEN
     746      CALL histwrite_phy(nid_files(iff),
     747     s         o_pr_con_l%name,itau_w,pmflxr(:,1:klev))
     748      ENDIF
     749
     750      IF (o_pr_con_i%flag(iff)<=lev_files(iff)) THEN
     751      CALL histwrite_phy(nid_files(iff),
     752     s         o_pr_con_i%name,itau_w,pmflxs(:,1:klev))
     753      ENDIF
     754
     755      IF (o_pr_lsc_l%flag(iff)<=lev_files(iff)) THEN
     756      CALL histwrite_phy(nid_files(iff),
     757     s        o_pr_lsc_l%name,itau_w,prfl(:,1:klev))
     758      ENDIF
     759
     760      IF (o_pr_lsc_i%flag(iff)<=lev_files(iff)) THEN
     761      CALL histwrite_phy(nid_files(iff),
     762     s        o_pr_lsc_i%name,itau_w,psfl(:,1:klev))
     763      ENDIF
     764
    763765
    764766      IF (o_rh2m%flag(iff)<=lev_files(iff)) THEN
     
    831833       ENDIF
    832834
     835! OD550 per species
     836      IF (new_aod .and. (.not. aerosol_couple)) THEN
     837      DO naero = 1, naero_spc
     838          IF (o_tausumaero(naero)%flag(iff)<=lev_files(iff)) THEN
     839             CALL histwrite_phy(nid_files(iff),
     840     $            o_tausumaero(naero)%name,itau_w,
     841     $            tausum_aero(:,2,naero) )
     842          ENDIF
     843      END DO
     844      ENDIF
     845
    833846       IF (ok_ade) THEN
    834         IF (o_topswad%flag(iff)<=lev_files(iff)) THEN
    835       CALL histwrite_phy(nid_files(iff),o_topswad%name,itau_w,topswad)
    836         ENDIF
    837         IF (o_solswad%flag(iff)<=lev_files(iff)) THEN
    838       CALL histwrite_phy(nid_files(iff),o_solswad%name,itau_w,solswad)
    839         ENDIF
     847          IF (o_topswad%flag(iff)<=lev_files(iff)) THEN
     848             CALL histwrite_phy(nid_files(iff),o_topswad%name,itau_w,
     849     $            topswad_aero)
     850          ENDIF
     851          IF (o_solswad%flag(iff)<=lev_files(iff)) THEN
     852             CALL histwrite_phy(nid_files(iff),o_solswad%name,itau_w,
     853     $            solswad_aero)
     854          ENDIF
     855
     856!====MS forcing diagnostics
     857        if (new_aod) then             
     858        IF (o_swtoaas_nat%flag(iff)<=lev_files(iff)) THEN
     859        CALL histwrite_phy(nid_files(iff),o_swtoaas_nat%name,itau_w,
     860     $      topsw_aero(:,1))
     861        ENDIF
     862
     863        IF (o_swsrfas_nat%flag(iff)<=lev_files(iff)) THEN
     864        CALL histwrite_phy(nid_files(iff),o_swsrfas_nat%name,itau_w,
     865     $      solsw_aero(:,1))
     866        ENDIF
     867
     868        IF (o_swtoacs_nat%flag(iff)<=lev_files(iff)) THEN
     869        CALL histwrite_phy(nid_files(iff),o_swtoacs_nat%name,itau_w,
     870     $      topsw0_aero(:,1))
     871        ENDIF
     872
     873        IF (o_swsrfcs_nat%flag(iff)<=lev_files(iff)) THEN
     874        CALL histwrite_phy(nid_files(iff),o_swsrfcs_nat%name,itau_w,
     875     $      solsw0_aero(:,1))
     876        ENDIF
     877 
     878!ant
     879        IF (o_swtoaas_ant%flag(iff)<=lev_files(iff)) THEN
     880        CALL histwrite_phy(nid_files(iff),o_swtoaas_ant%name,itau_w,
     881     $      topsw_aero(:,2))
     882        ENDIF
     883
     884        IF (o_swsrfas_ant%flag(iff)<=lev_files(iff)) THEN
     885        CALL histwrite_phy(nid_files(iff),o_swsrfas_ant%name,itau_w,
     886     $      solsw_aero(:,2))
     887        ENDIF
     888
     889        IF (o_swtoacs_ant%flag(iff)<=lev_files(iff)) THEN
     890        CALL histwrite_phy(nid_files(iff),o_swtoacs_ant%name,itau_w,
     891     $      topsw0_aero(:,2))
     892        ENDIF
     893
     894        IF (o_swsrfcs_ant%flag(iff)<=lev_files(iff)) THEN
     895        CALL histwrite_phy(nid_files(iff),o_swsrfcs_ant%name,itau_w,
     896     $      solsw0_aero(:,2))
     897        ENDIF
     898
     899!cf
     900
     901        if (.not. aerosol_couple) then
     902        IF (o_swtoacf_nat%flag(iff)<=lev_files(iff)) THEN
     903        CALL histwrite_phy(nid_files(iff),o_swtoacf_nat%name,itau_w,
     904     $      topswcf_aero(:,1))
     905        ENDIF
     906
     907        IF (o_swsrfcf_nat%flag(iff)<=lev_files(iff)) THEN
     908        CALL histwrite_phy(nid_files(iff),o_swsrfcf_nat%name,itau_w,
     909     $      solswcf_aero(:,1))
     910        ENDIF
     911
     912        IF (o_swtoacf_ant%flag(iff)<=lev_files(iff)) THEN
     913        CALL histwrite_phy(nid_files(iff),o_swtoacf_ant%name,itau_w,
     914     $      topswcf_aero(:,2))
     915        ENDIF
     916
     917        IF (o_swsrfcf_ant%flag(iff)<=lev_files(iff)) THEN
     918        CALL histwrite_phy(nid_files(iff),o_swsrfcf_ant%name,itau_w,
     919     $      solswcf_aero(:,2))
     920        ENDIF
     921
     922        IF (o_swtoacf_zero%flag(iff)<=lev_files(iff)) THEN
     923        CALL histwrite_phy(nid_files(iff),o_swtoacf_zero%name,itau_w,
     924     $      topswcf_aero(:,3))
     925        ENDIF
     926
     927        IF (o_swsrfcf_zero%flag(iff)<=lev_files(iff)) THEN
     928        CALL histwrite_phy(nid_files(iff),o_swsrfcf_zero%name,itau_w,
     929     $      solswcf_aero(:,3))
     930        ENDIF
     931        endif
     932
     933        endif ! new_aod
     934!====MS forcing diagnostics
     935
    840936       ENDIF
    841937
    842938       IF (ok_aie) THEN
    843         IF (o_topswai%flag(iff)<=lev_files(iff)) THEN
    844       CALL histwrite_phy(nid_files(iff),o_topswai%name,itau_w,topswai)
    845         ENDIF
    846         IF (o_solswai%flag(iff)<=lev_files(iff)) THEN
    847       CALL histwrite_phy(nid_files(iff),o_solswai%name,itau_w,solswai)
    848         ENDIF
     939          IF (o_topswai%flag(iff)<=lev_files(iff)) THEN
     940             CALL histwrite_phy(nid_files(iff),o_topswai%name,itau_w,
     941     $            topswai_aero)
     942          ENDIF
     943          IF (o_solswai%flag(iff)<=lev_files(iff)) THEN
     944             CALL histwrite_phy(nid_files(iff),o_solswai%name,itau_w,
     945     $            solswai_aero)
     946          ENDIF
    849947       ENDIF
    850948
     
    9081006
    9091007      IF (o_ozone%flag(iff)<=lev_files(iff)) THEN
    910       DO k=1, klev
    911        DO i=1, klon
    912          zx_tmp_fi3d(i,k)=wo(i,k)*RG/46.6968
    913      $                    /(paprs(i,k)-paprs(i,k+1))
    914      $                    *(paprs(i,1)/101325.0)
    915        ENDDO !i
    916       ENDDO !k
    917       CALL histwrite_phy(nid_files(iff),o_ozone%name,itau_w,zx_tmp_fi3d)
     1008         CALL histwrite_phy(nid_files(iff), o_ozone%name, itau_w,
     1009     $        wo(:, :, 1) * dobson_u * 1e3 / zmasse / rmo3 * rmd)
     1010      ENDIF
     1011
     1012      IF (o_ozone_light%flag(iff)<=lev_files(iff) .and.
     1013     $     read_climoz == 2) THEN
     1014         CALL histwrite_phy(nid_files(iff), o_ozone_light%name, itau_w,
     1015     $        wo(:, :, 2) * dobson_u * 1e3 / zmasse / rmo3 * rmd)
    9181016      ENDIF
    9191017
Note: See TracChangeset for help on using the changeset viewer.