Ignore:
Timestamp:
Oct 21, 2016, 10:02:02 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Roll back to 2669. 2675 and 2676 were not supposed to get on the testing branch just yet

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2676 r2682  
    325325                <field field_ref="z0m" level="10" />
    326326                <field field_ref="z0h" level="10" />
    327                 <field field_ref="topswad" level="5" />
    328                 <field field_ref="topswad0" level="5" />
    329                 <field field_ref="topswai" level="5" />
    330                 <field field_ref="solswad" level="5" />
    331                 <field field_ref="solswad0" level="5" />
    332                 <field field_ref="solswai" level="5" />
     327                <field field_ref="topswad" level="2" />
     328                <field field_ref="topswad0" level="2" />
     329                <field field_ref="topswai" level="2" />
     330                <field field_ref="solswad" level="2" />
     331                <field field_ref="solswad0" level="2" />
     332                <field field_ref="solswai" level="2" />
    333333                <field field_ref="OD550_ASBCM" level="2" />
    334334                <field field_ref="OD550_ASPOMM" level="2" />
  • LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

    r2675 r2682  
    219219#ifdef CPP_XIOS
    220220    USE wxios, ONLY: missing_val, missing_val_omp
    221     USE xios, ONLY: xios_get_field_attr, xios_field_is_active
     221    USE xios, ONLY: xios_get_field_attr
    222222#endif
    223223#ifdef REPROBUS
     
    15231523       !   Initialisation des sorties
    15241524       !=============================================================
    1525 
    1526 #ifdef CPP_XIOS
    1527     !--setting up swaero_diag to TRUE in XIOS case
    1528     IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. &
    1529         xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. &
    1530         xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR.  &
    1531            (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. &
    1532                                xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0"))))  &
    1533         !!!--for now these fields are not in the XML files so they are omitted
    1534         !!!  xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) &
    1535         swaero_diag=.TRUE.
    1536 #endif
    15371525
    15381526#ifdef CPP_IOIPSL
     
    37053693               ZSWFT0_i, ZFSDN0, ZFSUP0)
    37063694
    3707 #ifndef CPP_XIOS
    3708           !--OB 30/05/2016 modified 20/10/2016
     3695          !--OB 30/05/2016
    37093696          !--here we return swaero_diag to FALSE
    37103697          !--and histdef will switch it back to TRUE if necessary
    37113698          !--this is necessary to get the right swaero at first step
    3712           !--but only in the case of no XIOS as XIOS is covered elsewhere
    37133699          IF (debut) swaero_diag = .FALSE.
    3714 #endif
    37153700          !
    37163701          !IM 2eme calcul radiatif pour le cas perturbe ou au moins un
Note: See TracChangeset for help on using the changeset viewer.