Changeset 7329


Ignore:
Timestamp:
10/20/21 18:51:43 (3 months ago)
Author:
josefine.ghattas
Message:

Integrated commit [7314] from the trunk: Corrected error seen in debug mode with new driver: Treated case when variable CYCLIC_STARTDATE and CYCLIC_ENDDATE were not present in run.def.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/forcing_tools.f90

    r7328 r7329  
    219219    !Config Def  = NONE 
    220220    !Config Help = The format is the same as in the CF convention : 1999-09-13 12:0:0 
    221     str_cyclic_start = " " 
     221    str_cyclic_start = "NONE" 
    222222    CALL getin('CYCLIC_STARTDATE',str_cyclic_start) 
    223223     
     
    227227    !Config Def  = NONE 
    228228    !Config Help = The format is the same as in the CF convention : 1999-09-13 12:0:0 
    229     str_cyclic_end = " " 
     229    str_cyclic_end = "NONE" 
    230230    CALL getin('CYCLIC_ENDDATE',str_cyclic_end) 
    231231     
     
    253253    !--------------------------------- 
    254254    ! cyclic start date 
    255     IF ( (INDEX(str_cyclic_start(1),"-") .NE. INDEX(str_cyclic_start(1),"-", .TRUE.)) .AND. & 
     255    IF (str_cyclic_start(1) .EQ. "NONE") THEN 
     256       ! CYCLIC_STARTDATE is not set in run.def 
     257       ! Set same values as START_DATE 
     258       c_year_start=s_year 
     259       c_month_start=s_month 
     260       c_day_start=s_day 
     261       c_sec_start=s_sec 
     262 
     263    ELSE IF ( (INDEX(str_cyclic_start(1),"-") .NE. INDEX(str_cyclic_start(1),"-", .TRUE.)) .AND. & 
    256264         &  (INDEX(str_cyclic_start(2),":") .NE. INDEX(str_cyclic_start(2),":", .TRUE.)) ) THEN 
    257265       DO i=1,2 
     
    308316    !--------------------------------- 
    309317    ! for cyclic end date 
    310     IF ( (INDEX(str_cyclic_end(1),"-") .NE. INDEX(str_cyclic_end(1),"-", .TRUE.)) .AND. & 
     318    IF (str_cyclic_end(1) .EQ. "NONE") THEN 
     319       ! CYCLIC_ENDDATE is not set in run.def 
     320       ! Set same values as END_DATE 
     321       c_year_end=e_year 
     322       c_month_end=e_month 
     323       c_day_end=e_day 
     324       c_sec_end=e_sec 
     325    ELSE IF ( (INDEX(str_cyclic_end(1),"-") .NE. INDEX(str_cyclic_end(1),"-", .TRUE.)) .AND. & 
    311326         &  (INDEX(str_cyclic_end(2),":") .NE. INDEX(str_cyclic_end(2),":", .TRUE.)) ) THEN 
    312327       DO i=1,2 
Note: See TracChangeset for help on using the changeset viewer.