Changeset 7329

Timestamp:

2021-10-20T18:51:43+02:00 (3 years 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:

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

branches/ORCHIDEE_2_2/ORCHIDEE/src_driver/forcing_tools.f90

@@ -219 +219 @@
     !Config Def  = NONE
     !Config Help = The format is the same as in the CF convention : 1999-09-13 12:0:0
-    str_cyclic_start = " "
+    str_cyclic_start = "NONE"
     CALL getin('CYCLIC_STARTDATE',str_cyclic_start)
     
@@ -227 +227 @@
     !Config Def  = NONE
     !Config Help = The format is the same as in the CF convention : 1999-09-13 12:0:0
-    str_cyclic_end = " "
+    str_cyclic_end = "NONE"
     CALL getin('CYCLIC_ENDDATE',str_cyclic_end)
     
@@ -253 +253 @@
     !---------------------------------
     ! cyclic start date
-    IF ( (INDEX(str_cyclic_start(1),"-") .NE. INDEX(str_cyclic_start(1),"-", .TRUE.)) .AND. &
+    IF (str_cyclic_start(1) .EQ. "NONE") THEN
+       ! CYCLIC_STARTDATE is not set in run.def
+       ! Set same values as START_DATE
+       c_year_start=s_year
+       c_month_start=s_month
+       c_day_start=s_day
+       c_sec_start=s_sec
+
+    ELSE IF ( (INDEX(str_cyclic_start(1),"-") .NE. INDEX(str_cyclic_start(1),"-", .TRUE.)) .AND. &
          &  (INDEX(str_cyclic_start(2),":") .NE. INDEX(str_cyclic_start(2),":", .TRUE.)) ) THEN
        DO i=1,2
@@ -308 +316 @@
     !---------------------------------
     ! for cyclic end date
-    IF ( (INDEX(str_cyclic_end(1),"-") .NE. INDEX(str_cyclic_end(1),"-", .TRUE.)) .AND. &
+    IF (str_cyclic_end(1) .EQ. "NONE") THEN
+       ! CYCLIC_ENDDATE is not set in run.def
+       ! Set same values as END_DATE
+       c_year_end=e_year
+       c_month_end=e_month
+       c_day_end=e_day
+       c_sec_end=e_sec
+    ELSE IF ( (INDEX(str_cyclic_end(1),"-") .NE. INDEX(str_cyclic_end(1),"-", .TRUE.)) .AND. &
          &  (INDEX(str_cyclic_end(2),":") .NE. INDEX(str_cyclic_end(2),":", .TRUE.)) ) THEN
        DO i=1,2