Changeset 801

Timestamp:

11/27/15 11:03:05 (9 years ago)

Author:

rlacroix

Message:

Fortran interface: Add functions to convert a string to a date or a duration.

Location:

XIOS/trunk/src/interface

Files:

• c/icdate.cpp (modified) (1 diff)
• c/icduration.cpp (modified) (1 diff)
• fortran/date_interface.F90 (modified) (1 diff)
• fortran/duration_interface.F90 (modified) (1 diff)
• fortran/idate.F90 (modified) (1 diff)
• fortran/iduration.F90 (modified) (1 diff)
• fortran/ixios.F90 (modified) (1 diff)

XIOS/trunk/src/interface/c/icdate.cpp

@@ -53 +53 @@
   }
 
+  cxios_date cxios_date_convert_from_string(const char* str, int str_size)
+  {
+    std::string date_str;
+    xios::CDate date;
+
+    if (cstr2string(str, str_size, date_str))
+      date = xios::CDate::FromString(date_str,
+                                     getCalendar("cxios_date cxios_date_convert_from_string(const char* str, int str_size)"));
+
+    return { date.getYear(), date.getMonth(), date.getDay(), date.getHour(), date.getMinute(), date.getSecond() };
+  }
+
   cxios_date cxios_date_add_duration(cxios_date date_c, cxios_duration dur_c)
   {

XIOS/trunk/src/interface/c/icduration.cpp

@@ -13 +13 @@
     if (!string_copy(dur.toString(), str, str_size))
       ERROR("void cxios_duration_convert_to_string(cxios_duration dur_c, char* str, int str_size)", << "Input string is too short");
+  }
+
+  cxios_duration cxios_duration_convert_from_string(const char* str, int str_size)
+  {
+    std::string dur_str;
+    xios::CDuration dur;
+
+    if (cstr2string(str, str_size, dur_str))
+      dur = xios::CDuration::FromString(dur_str);
+
+    return { dur.year, dur.month, dur.day, dur.hour, dur.minute, dur.second, dur.timestep };
   }
 

XIOS/trunk/src/interface/fortran/date_interface.F90

@@ -26 +26 @@
          INTEGER(kind = C_INT), VALUE :: str_size
       END SUBROUTINE cxios_date_convert_to_string
+
+      TYPE(txios(date)) FUNCTION cxios_date_convert_from_string(str, str_size) BIND(C)
+         USE ISO_C_BINDING
+         IMPORT :: txios(date)
+         CHARACTER(kind = C_CHAR), DIMENSION(*) :: str
+         INTEGER(kind = C_INT), VALUE :: str_size
+      END FUNCTION cxios_date_convert_from_string
 
       TYPE(txios(date)) FUNCTION cxios_date_add_duration(date, dur) BIND(C)

XIOS/trunk/src/interface/fortran/duration_interface.F90

@@ -17 +17 @@
          INTEGER(kind = C_INT), VALUE :: str_size
       END SUBROUTINE cxios_duration_convert_to_string
+
+      TYPE(txios(duration)) FUNCTION cxios_duration_convert_from_string(str, str_size) BIND(C)
+         USE ISO_C_BINDING
+         IMPORT :: txios(duration)
+         CHARACTER(kind = C_CHAR), DIMENSION(*) :: str
+         INTEGER(kind = C_INT), VALUE :: str_size
+      END FUNCTION cxios_duration_convert_from_string
 
       TYPE(txios(duration)) FUNCTION cxios_duration_add(dur1, dur2) BIND(C)

XIOS/trunk/src/interface/fortran/idate.F90

@@ -63 +63 @@
    END SUBROUTINE xios(date_convert_to_string)
 
+   FUNCTION xios(date_convert_from_string)(str) RESULT(res)
+      USE DATE_INTERFACE, only : txios(date)
+      IMPLICIT NONE
+      CHARACTER(len = *), INTENT(IN) :: str
+      TYPE(txios(date)) :: res
+
+      res = cxios_date_convert_from_string(str, len(str))
+   END FUNCTION xios(date_convert_from_string)
+
    ! Addition: date + duration = date
 

XIOS/trunk/src/interface/fortran/iduration.F90

@@ -60 +60 @@
       CALL cxios_duration_convert_to_string(dur, str, len(str))
    END SUBROUTINE xios(duration_convert_to_string)
+
+   FUNCTION xios(duration_convert_from_string)(str) RESULT(res)
+      USE DURATION_INTERFACE, only : txios(duration)
+      IMPLICIT NONE
+      CHARACTER(len = *), INTENT(IN) :: str
+      TYPE(txios(duration)) :: res
+
+      res = cxios_duration_convert_from_string(str, len(str))
+   END FUNCTION xios(duration_convert_from_string)
 
    ! Addition

XIOS/trunk/src/interface/fortran/ixios.F90

@@ -23 +23 @@
 USE iduration, ONLY: txios(duration),                                                                            &
                      xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), &
-                     xios(duration_convert_to_string),                                                           &
+                     xios(duration_convert_to_string), xios(duration_convert_from_string),                       &
                      xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg),            &
                      xios(duration_eq), xios(duration_neq),                                                      &
                      OPERATOR(+), OPERATOR(-), OPERATOR(*)
 
-USE idate, ONLY : txios(date),                                                                                &
-                  xios(date_convert_to_seconds), xios(date_convert_to_string),                                &
-                  xios(date_add_duration), xios(date_sub_duration), xios(date_sub),                           &
-                  xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge),  &
-                  xios(date_get_second_of_year), xios(date_get_day_of_year), xios(date_get_fraction_of_year), &
-                  xios(date_get_second_of_day), xios(date_get_fraction_of_day),                               &
-                  OPERATOR(+), OPERATOR(-),                                                                   &
-                  OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=),           &
+USE idate, ONLY : txios(date),                                                                                 &
+                  xios(date_convert_to_seconds), xios(date_convert_to_string), xios(date_convert_from_string), &
+                  xios(date_add_duration), xios(date_sub_duration), xios(date_sub),                            &
+                  xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge),   &
+                  xios(date_get_second_of_year), xios(date_get_day_of_year), xios(date_get_fraction_of_year),  &
+                  xios(date_get_second_of_day), xios(date_get_fraction_of_day),                                &
+                  OPERATOR(+), OPERATOR(-),                                                                    &
+                  OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=),            &
                   ASSIGNMENT(=)