Changeset 7904 for branches

Timestamp:

2023-03-06T09:38:57+01:00 (22 months ago)

Author:

josefine.ghattas

Message:

Modification needed to be compatible with IOIPSL before and after revision 6272 on IOPSL/trunk : In IOIPSL, calendar attribute changed from "360d" to "360_day". Now in ORCHIDEE, check both attributes.

"360_day" is the correct attribute according to CF convention. "360d"
leads to an error when opening a history file with xarray.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• . (modified) (1 prop)
• src_parallel/xios_orchidee.f90 (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -238 +238 @@
     ELSE IF (calendar_str == 'noleap') THEN
        calendar_str='noleap'
-    ELSE IF (calendar_str == '360d') THEN
+    ELSE IF (calendar_str == '360d' .OR. calendar_str == '360_day') THEN
        calendar_str='d360'
     END IF