Changeset 840

Timestamp:

04/15/16 14:27:45 (8 years ago)

Author:

mhnguyen

Message:

Fixing some minors bug appeared under gcc 5.3

+) Make sure depend name come with typename
+) Correct typo in Fortran interface

Test
+) Compiling with gcc 5.3: NO

Location:

XIOS/trunk/src

Files:

• interface/fortran/ixml_tree.F90 (modified) (6 diffs)
• node/transformation.hpp (modified) (1 diff)

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

@@ -317 +317 @@
    SUBROUTINE xios(add_variabletofile)(parent_hdl, child_hdl, child_id)
       TYPE(txios(file))            , INTENT(IN) :: parent_hdl
-      TYPE(txios(variable))           , INTENT(OUT):: child_hdl
+      TYPE(txios(variable))        , INTENT(OUT):: child_hdl
       CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
 
@@ -330 +330 @@
    SUBROUTINE xios(add_variabletofield)(parent_hdl, child_hdl, child_id)
       TYPE(txios(field))            , INTENT(IN) :: parent_hdl
-      TYPE(txios(variable))           , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
+      TYPE(txios(variable))         , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL  , INTENT(IN) :: child_id
 
       IF (PRESENT(child_id)) THEN
@@ -409 +409 @@
    SUBROUTINE xios(add_fieldgrouptofile)(parent_hdl, child_hdl, child_id)
       TYPE(txios(file))            , INTENT(IN) :: parent_hdl
-      TYPE(txios(fieldgroup))     , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL  , INTENT(IN) :: child_id
+      TYPE(txios(fieldgroup))      , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
 
       IF (PRESENT(child_id)) THEN
@@ -422 +422 @@
    SUBROUTINE xios(add_variablegrouptofile)(parent_hdl, child_hdl, child_id)
       TYPE(txios(file))            , INTENT(IN) :: parent_hdl
-      TYPE(txios(variablegroup))     , INTENT(OUT):: child_hdl
-      CHARACTER(len = *), OPTIONAL  , INTENT(IN) :: child_id
+      TYPE(txios(variablegroup))   , INTENT(OUT):: child_hdl
+      CHARACTER(len = *), OPTIONAL , INTENT(IN) :: child_id
 
       IF (PRESENT(child_id)) THEN
@@ -435 +435 @@
    SUBROUTINE xios(add_variablegrouptofield)(parent_hdl, child_hdl, child_id)
       TYPE(txios(field))            , INTENT(IN) :: parent_hdl
-      TYPE(txios(variablegroup))     , INTENT(OUT):: child_hdl
+      TYPE(txios(variablegroup))    , INTENT(OUT):: child_hdl
       CHARACTER(len = *), OPTIONAL  , INTENT(IN) :: child_id
 
@@ -537 +537 @@
    END SUBROUTINE xios(add_interpolateaxistoaxis)
 
-      SUBROUTINE xios(add_inverseaxistoaxis)(parent_hdl, child_hdl, child_id)
+   SUBROUTINE xios(add_inverseaxistoaxis)(parent_hdl, child_hdl, child_id)
       TYPE(txios(axis))                      , INTENT(IN) :: parent_hdl
-      TYPE(txios(zoom_axis))                 , INTENT(OUT):: child_hdl
+      TYPE(txios(inverse_axis))              , INTENT(OUT):: child_hdl
       CHARACTER(len = *), OPTIONAL           , INTENT(IN) :: child_id
 

XIOS/trunk/src/node/transformation.hpp

@@ -43 +43 @@
 
   template<typename T>
-  CTransformation<T>::CallBackMap* CTransformation<T>::transformationCreationCallBacks_ = 0; //CTransformation<T>::CallBackMap();
+  typename CTransformation<T>::CallBackMap* CTransformation<T>::transformationCreationCallBacks_ = 0; //CTransformation<T>::CallBackMap();
 
   template<typename T>