Changeset 1625

Timestamp:

12/14/18 17:28:25 (5 years ago)

Author:

oabramkina

Message:

XIOS 2.5: limiting the line length to 132 characters in the Fortran interface. Certain function names were exceeding this limit causing a compilation error in case gcc without -ffree-line-length-none option.

Location:

XIOS/branchs/xios-2.5

Files:

• arch/arch-GCC_LINUX.fcm (modified) (1 diff)
• src/generate_interface_impl.hpp (modified) (4 diffs)
• src/interface/fortran_attr/interpolate_domain_interface_attr.F90 (modified) (2 diffs)

XIOS/branchs/xios-2.5/arch/arch-GCC_LINUX.fcm

@@ -12 +12 @@
 %DEBUG_CFLAGS   -g 
 
-%BASE_FFLAGS    -D__NONE__ -ffree-line-length-none 
+%BASE_FFLAGS    -D__NONE__ 
 %PROD_FFLAGS    -O3
 %DEV_FFLAGS     -g -O2

XIOS/branchs/xios-2.5/src/generate_interface_impl.hpp

@@ -215 +215 @@
     string fortranKindC=getStrFortranKindC<T>();
 
-    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
+//    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
+    int indent = oss.iword(iendl.index);
+    string str = "SUBROUTINE cxios_set_" + className + "_" + name + "(" + className + "_hdl, " + name + ") BIND(C)";
+    if ((str.length() + indent) >132)
+    {
+      oss << str.substr(0,130-indent) ;
+      oss << "&" << endl;
+      oss << "&" << str.substr(130-indent,str.length()) ;
+    }
+    else
+    {
+      oss << str;
+    }
+    oss << iendl;
     oss << "  USE ISO_C_BINDING" << iendl;
     oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
@@ -231 +244 @@
   void CInterface::AttributeFortran2003Interface<string>(ostream& oss, const string& className, const string& name)
   {
-    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", " << name << "_size) BIND(C)" << iendl;
+//    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ", " << name << "_size) BIND(C)" << iendl;
+    int indent = oss.iword(iendl.index);
+    string str ="SUBROUTINE cxios_set_" + className + "_" + name + "(" + className + "_hdl, " + name + ", " + name + "_size) BIND(C)";
+    if ((str.length() + indent) >132)
+    {
+      oss << str.substr(0,130-indent) ;
+      oss << "&" << endl;
+      oss << "&" << str.substr(130-indent,str.length()) ;
+    }
+    else
+    {
+      oss << str;
+    }
+    oss << iendl;
     oss << "  USE ISO_C_BINDING" << iendl;
     oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
@@ -238 +264 @@
     oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl;
     oss << iendl;
-    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", " << name << "_size) BIND(C)" << iendl;
+//    oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ", " << name << "_size) BIND(C)" << iendl;
+    str = "SUBROUTINE cxios_get_" + className + "_" + name + "(" + className + "_hdl, " + name + ", " + name + "_size) BIND(C)";
+    if ((str.length() + indent) >132)
+    {
+      oss << str.substr(0,130-indent) ;
+      oss << "&" << endl;
+      oss << "&" << str.substr(130-indent,str.length()) ;
+    }
+    else
+    {
+      oss << str;
+    }
+    oss << iendl;
     oss << "  USE ISO_C_BINDING" << iendl;
     oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
@@ -247 +285 @@
 
   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(txios(date)), VALUE :: " << name << iendl;
-    oss << "END SUBROUTINE cxios_set_" << className << "_" << name << std::endl;
+  void CInterface::AttributeFortran2003Interface<CDuration>(ostream& oss, const string& className, const string& name)
+  {
+//    oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
+    string str = "SUBROUTINE cxios_set_" + className + "_" + name + "(" + className + "_hdl, " + name + ") BIND(C)";
+    int indent = oss.iword(iendl.index);
+    if ((str.length() + indent) >132)
+    {
+      oss << str.substr(0,130-indent) ;
+      oss << "&" << endl;
+      oss << "&" << str.substr(130-indent,str.length()) ;
+    }
+    else
+    {
+      oss << str;
+    }
     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 << std::endl;
-  }
-
-  template <>
-  void CInterface::AttributeFortran2003Interface<CDuration>(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 IDURATION" << iendl;

XIOS/branchs/xios-2.5/src/interface/fortran_attr/interpolate_domain_interface_attr.F90

@@ -88 +88 @@
 
 
-    SUBROUTINE cxios_set_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_convention_size) BIND(C)
+    SUBROUTINE cxios_set_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_conven&
+&tion_size) BIND(C)
       USE ISO_C_BINDING
       INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl
@@ -95 +96 @@
     END SUBROUTINE cxios_set_interpolate_domain_read_write_convention
 
-    SUBROUTINE cxios_get_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_convention_size) BIND(C)
+    SUBROUTINE cxios_get_interpolate_domain_read_write_convention(interpolate_domain_hdl, read_write_convention, read_write_conven&
+&tion_size) BIND(C)
       USE ISO_C_BINDING
       INTEGER (kind = C_INTPTR_T), VALUE :: interpolate_domain_hdl