Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/libf/phylmd/printflag.F90

    r3356 r3411  
    3030    &  ************'
    3131  PRINT 100
    32   PRINT 10, iflag_cycle_diurne.GE.1, soil_model
     32  PRINT 10, cycle_diurne, soil_model
    3333  PRINT 100
    3434
    … …  
    9797  END IF
    9898
    99   IF (cycle_diurn0 .AND. .NOT. (iflag_cycle_diurne.GE.1) .OR. .NOT. cycle_diurn0 .AND. &
    100       (iflag_cycle_diurne.GE.1) ) THEN
    101     PRINT 13, cycle_diurn0, iflag_cycle_diurne
     99  IF (cycle_diurn0 .AND. .NOT. cycle_diurne .OR. .NOT. cycle_diurn0 .AND. &
     100      cycle_diurne) THEN
     101    PRINT 13, cycle_diurn0, cycle_diurne
    102102    PRINT 100
    103103  END IF
Note: See TracChangeset for help on using the changeset viewer.