Changeset 532 for XIOS/trunk/src/generate_interface_impl.hpp

Timestamp:

12/10/14 14:27:09 (9 years ago)

Author:

rlacroix

Message:

Add a new attribute type for dates and use it for the context's start_date and time_origin.

The "xios_date" type should now be used to get/set date attributes through the Fortran interface. This avoids using strings to manipulate dates.

File:

• XIOS/trunk/src/generate_interface_impl.hpp (modified) (7 diffs)

XIOS/trunk/src/generate_interface_impl.hpp

@@ -8 +8 @@
 #include "enum.hpp"
 #include "array_new.hpp"
+#include "date.hpp"
 
 namespace xios
@@ -15 +16 @@
   template<> string CInterface::getStrFortranType<double>(void) {return string("REAL") ;}
   template<> string CInterface::getStrFortranType<float>(void) {return string("REAL") ;}
+  template<> string CInterface::getStrFortranType<CDate>(void) {return string("TYPE(txios(date))") ;}
 
   template<> string CInterface::getStrFortranKind<int>(void) {return string("") ;}
@@ -20 +22 @@
   template<> string CInterface::getStrFortranKind<double>(void) {return string("(KIND=8)") ;}
   template<> string CInterface::getStrFortranKind<float>(void) {return string("(KIND=4)") ;}
+  template<> string CInterface::getStrFortranKind<CDate>(void) {return string("") ;}
 
   template<> string CInterface::getStrFortranKindC<int>(void) {return string("(KIND=C_INT)") ;}
@@ -25 +28 @@
   template<> string CInterface::getStrFortranKindC<double>(void) {return string("(KIND=C_DOUBLE)") ;}
   template<> string CInterface::getStrFortranKindC<float>(void) {return string("(KIND=C_FLOAT)") ;}
+  template<> string CInterface::getStrFortranKindC<CDate>(void) {return string("") ;}
 
   template<> bool CInterface::matchingTypeCFortran<int>(void) { return true ; }
@@ -30 +34 @@
   template<> bool CInterface::matchingTypeCFortran<double>(void) { return true; }
   template<> bool CInterface::matchingTypeCFortran<float>(void) { return true; }
+  template<> bool CInterface::matchingTypeCFortran<CDate>(void) { return true; }
 
 
@@ -125 +130 @@
 //     if (!array_copy(domain_hdl->mask.getValue(), mask, extent1, extent2))
 //        ERROR("cxios_get_domain_mask(XDomainPtr domain_hdl, bool * mask, int extent1, int extent2)",<<"Output array size is not conform to array size attribut") ;
+
+  template<>
+  void CInterface::AttributeCInterface<CDate>(ostream& oss, const string& className,const string& name)
+  {
+    oss << "void cxios_set_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, cxios_date " << name << "_c)" << iendl;
+    oss << "{" << iendl;
+    oss << "  CTimer::get(\"XIOS\").resume();" << iendl;
+    oss << "  " << className << "_hdl->" << name << ".allocate();" << iendl;
+    oss << "  CDate& " << name <<" = " << className << "_hdl->" << name << ".get();" << iendl;
+    oss << "  " << name << ".setDate(" << name << "_c.year," << iendl;
+    oss << "                         " << name << "_c.month," << iendl;
+    oss << "                         " << name << "_c.day," << iendl;
+    oss << "                         " << name << "_c.hour," << iendl;
+    oss << "                         " << name << "_c.minute," << iendl;
+    oss << "                         " << name << "_c.second);" << iendl;
+    oss << "  if (" << name << ".hasRelCalendar())" << iendl;
+    oss << "    " << name << ".checkDate();" << iendl;
+    oss << "  CTimer::get(\"XIOS\").suspend();" << iendl;
+    oss << "}" << iendl;
+
+    oss << iendl;
+
+    oss << "void cxios_get_" << className << "_" << name << "(" << className << "_Ptr " << className << "_hdl, cxios_date* " << name << "_c)" << iendl;
+    oss << "{" << iendl;
+    oss << "  CTimer::get(\"XIOS\").resume();" << iendl;
+    oss << "  CDate " << name <<" = " << className << "_hdl->" << name << ".getInheritedValue();" << iendl;
+    oss << "  " << name << "_c->year = " << name << ".getYear();" << iendl;
+    oss << "  " << name << "_c->month = " << name << ".getMonth();" << iendl;
+    oss << "  " << name << "_c->day = " << name << ".getDay();" << iendl;
+    oss << "  " << name << "_c->hour = " << name << ".getHour();" << iendl;
+    oss << "  " << name << "_c->minute = " << name << ".getMinute();" << iendl;
+    oss << "  " << name << "_c->second = " << name << ".getSecond();" << iendl;
+    oss << "  CTimer::get(\"XIOS\").suspend();" << iendl;
+    oss << "}" << iendl;
+    oss << iendl;
+  }
 
 /*
@@ -256 +297 @@
      oss<<iendl ;
    }
+
+  template <>
+  void CInterface::AttributeFortran2003Interface<CDate>(ostream& oss, const string& className, const string& name)
+  {
+    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
+    oss << "  USE ISO_C_BINDING" << iendl;
+    oss << "  USE IDATE" << iendl;
+    oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
+    oss << "  TYPE(xios_date), VALUE :: " << name << iendl;
+    oss << "END SUBROUTINE cxios_set_" << className << "_" << name << iendl;
+    oss << iendl;
+    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
+    oss << "  USE ISO_C_BINDING" << iendl;
+    oss << "  USE IDATE" << iendl;
+    oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
+    oss << "  TYPE(txios(date)) :: " << name << iendl;
+    oss << "END SUBROUTINE cxios_get_" << className << "_" << name << iendl;
+    oss << iendl;
+  }
 
 /*