Changeset 7263 for branches


Ignore:
Timestamp:
2021-07-29T17:24:54+02:00 (3 years ago)
Author:
agnes.ducharne
Message:

Integrated r5653 from the to make the new driver work with CRUJRA forcing. Without it, only WFDEI/v2 was working. Also integrated r6222 into forcing_tools.f90. Many thanks to Xiaoni!

File:
1 edited

Legend:

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

    r7262 r7263  
    34453445    ! 
    34463446    ! 
    3447     nbland_loc = SUM(contfrac_loc) 
     3447    nbland_loc = 0 
     3448    DO ik=1, SIZE(contfrac_loc) 
     3449       IF (contfrac_loc(ik) > 0.0) THEN 
     3450          nbland_loc = nbland_loc + 1.0 
     3451       ENDIF 
     3452    ENDDO 
    34483453    ! 
    34493454    ! 
     
    38603865       CALL ipslerr (3,'forcing_givegrid'," This routine can only be called on the root processor.", & 
    38613866            &          "The information requested is only available on root processor.", " ") 
     3867    ENDIF 
     3868    ! 
     3869    IF (nbpoint_loc .NE. nbland_loc) THEN 
     3870       WRITE(numout, *) "forcing_givegrid:: nbpoint_loc=", nbpoint_loc 
     3871       WRITE(numout, *) "forcing_givegrid:: nbland_loc=", nbland_loc 
     3872       CALL ipslerr(3,'forcing_givegrid','nbpoint_loc and nbland_loc do match', &  
     3873                    'The calculation of land points is not correct','') 
    38623874    ENDIF 
    38633875    ! 
     
    40524064        ! First extral the information from the date string 
    40534065        ! 
    4054         READ(ymd(1:INDEX(ymd,'-')-1),'(I)') year0 
     4066        READ(ymd(1:INDEX(ymd,'-')-1),'(I4)') year0 
    40554067        ymd=TRIM(ymd(INDEX(ymd,'-')+1:LEN_TRIM(ymd))) 
    4056         READ(ymd(1:INDEX(ymd,'-')-1),'(I)') month0 
     4068        READ(ymd(1:INDEX(ymd,'-')-1),'(I2)') month0 
    40574069        ymd=TRIM(ymd(INDEX(ymd,'-')+1:LEN_TRIM(ymd))) 
    4058         READ(ymd,'(I)') day0 
     4070        READ(ymd,'(I2)') day0 
    40594071        ! 
    40604072        ! Now extract from the time string 
    40614073        ! 
    4062         READ(hms(1:INDEX(hms,':')-1),'(I)') hours0 
     4074        READ(hms(1:INDEX(hms,':')-1),'(I2)') hours0 
    40634075        hms=TRIM(hms(INDEX(hms,':')+1:LEN_TRIM(hms))) 
    4064         READ(hms(1:INDEX(hms,':')-1),'(I)') minutes0 
     4076        READ(hms(1:INDEX(hms,':')-1),'(I2)') minutes0 
    40654077        hms=TRIM(hms(INDEX(hms,':')+1:LEN_TRIM(hms))) 
    4066         READ(hms,'(I)') seci 
     4078        READ(hms,'(I2)') seci 
    40674079        ! 
    40684080        sec0 = hours0*3600. + minutes0*60. + seci 
Note: See TracChangeset for help on using the changeset viewer.