Changeset 2967 for LMDZ5/branches


Ignore:
Timestamp:
Jul 25, 2017, 3:24:40 PM (7 years ago)
Author:
acozic
Message:

merge with revision 2966 of the trunk to allow inca to run without crash with this version of lmdz

Location:
LMDZ5/branches/IPSLCM6.0.11
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/IPSLCM6.0.11

  • LMDZ5/branches/IPSLCM6.0.11/libf/phylmd/phys_output_write_mod.F90

    r2854 r2967  
    343343    USE YOESW, ONLY : RSUN
    344344#endif
     345    USE tracinca_mod, ONLY: config_inca
    345346
    346347    IMPLICIT NONE
     
    12471248          CALL histwrite_phy(o_solswad, solswad_aero*swradcorr)
    12481249          CALL histwrite_phy(o_solswad0, solswad0_aero*swradcorr)
    1249           CALL histwrite_phy(o_toplwad, toplwad_aero)
    1250           CALL histwrite_phy(o_toplwad0, toplwad0_aero)
    1251           CALL histwrite_phy(o_sollwad, sollwad_aero)
    1252           CALL histwrite_phy(o_sollwad0, sollwad0_aero)
     1250          IF (type_trac .ne. 'inca') THEN
     1251             IF (config_inca .ne. 'aeNP') THEN
     1252                CALL histwrite_phy(o_toplwad, toplwad_aero)
     1253                CALL histwrite_phy(o_toplwad0, toplwad0_aero)
     1254                CALL histwrite_phy(o_sollwad, sollwad_aero)
     1255                CALL histwrite_phy(o_sollwad0, sollwad0_aero)
     1256             ENDIF
     1257          ENDIF
    12531258          !====MS forcing diagnostics
    12541259          IF (new_aod) THEN
Note: See TracChangeset for help on using the changeset viewer.