Changeset 7263 for branches

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:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/forcing_tools.f90 (modified) (3 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/forcing_tools.f90

@@ -3445 +3445 @@
     !
     !
-    nbland_loc = SUM(contfrac_loc)
+    nbland_loc = 0
+    DO ik=1, SIZE(contfrac_loc)
+       IF (contfrac_loc(ik) > 0.0) THEN
+          nbland_loc = nbland_loc + 1.0
+       ENDIF
+    ENDDO
     !
     !
@@ -3860 +3865 @@
        CALL ipslerr (3,'forcing_givegrid'," This routine can only be called on the root processor.", &
             &          "The information requested is only available on root processor.", " ")
+    ENDIF
+    !
+    IF (nbpoint_loc .NE. nbland_loc) THEN
+       WRITE(numout, *) "forcing_givegrid:: nbpoint_loc=", nbpoint_loc
+       WRITE(numout, *) "forcing_givegrid:: nbland_loc=", nbland_loc
+       CALL ipslerr(3,'forcing_givegrid','nbpoint_loc and nbland_loc do match', & 
+                    'The calculation of land points is not correct','')
     ENDIF
     !
@@ -4052 +4064 @@
         ! First extral the information from the date string
         !
-        READ(ymd(1:INDEX(ymd,'-')-1),'(I)') year0
+        READ(ymd(1:INDEX(ymd,'-')-1),'(I4)') year0
         ymd=TRIM(ymd(INDEX(ymd,'-')+1:LEN_TRIM(ymd)))
-        READ(ymd(1:INDEX(ymd,'-')-1),'(I)') month0
+        READ(ymd(1:INDEX(ymd,'-')-1),'(I2)') month0
         ymd=TRIM(ymd(INDEX(ymd,'-')+1:LEN_TRIM(ymd)))
-        READ(ymd,'(I)') day0
+        READ(ymd,'(I2)') day0
         !
         ! Now extract from the time string
         !
-        READ(hms(1:INDEX(hms,':')-1),'(I)') hours0
+        READ(hms(1:INDEX(hms,':')-1),'(I2)') hours0
         hms=TRIM(hms(INDEX(hms,':')+1:LEN_TRIM(hms)))
-        READ(hms(1:INDEX(hms,':')-1),'(I)') minutes0
+        READ(hms(1:INDEX(hms,':')-1),'(I2)') minutes0
         hms=TRIM(hms(INDEX(hms,':')+1:LEN_TRIM(hms)))
-        READ(hms,'(I)') seci
+        READ(hms,'(I2)') seci
         !
         sec0 = hours0*3600. + minutes0*60. + seci