Changeset 2782 for trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER

Timestamp:

2011-06-16T09:35:07+02:00 (13 years ago)

Author:

smasson

Message:

bugfix in xmlio_server for some machines..., see ticket#837

Location:

trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src

Files:

• IOSERVER/mod_pack.f90 (modified) (4 diffs)
• XMLIO/mod_attribut.f90 (modified) (21 diffs)

trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/IOSERVER/mod_pack.f90

@@ -542 +542 @@
        SELECT CASE(attrib%type)
          CASE (integer0)
-           ALLOCATE(attrib%integer0_ptr)
+!!$           ALLOCATE(attrib%integer0_ptr)
            CALL unpack_data(attrib%integer0_ptr)
          CASE (integer1)
@@ -551 +551 @@
            CALL unpack_data(attrib%integer2_ptr)
          CASE (real0)
-           ALLOCATE(attrib%real0_ptr)
+!!$           ALLOCATE(attrib%real0_ptr)
            CALL unpack_data(attrib%real0_ptr)
          CASE (real1)
@@ -559 +559 @@
            ALLOCATE(attrib%real2_ptr(attrib%dim(1),attrib%dim(2)))
          CASE (logical0)
-           ALLOCATE(attrib%logical0_ptr)
+!!$           ALLOCATE(attrib%logical0_ptr)
            CALL unpack_data(attrib%logical0_ptr)
          CASE (logical1)
@@ -568 +568 @@
            CALL unpack_data(attrib%logical2_ptr)
          CASE (string0)
-           ALLOCATE(attrib%string0_ptr)
+!!$           ALLOCATE(attrib%string0_ptr)
            CALL unpack_string0
          CASE (string1)

trunk/NEMOGCM/EXTERNAL/XMLIO_SERVER/src/XMLIO/mod_attribut.f90

@@ -11 +11 @@
     INTEGER :: dim(7)
     INTEGER :: ndim
-    INTEGER,POINTER :: integer0_ptr
+    INTEGER :: integer0_ptr
     INTEGER,POINTER :: integer1_ptr(:)
     INTEGER,POINTER :: integer2_ptr(:,:)
-    REAL,POINTER    :: real0_ptr
+    REAL    :: real0_ptr
     REAL,POINTER    :: real1_ptr(:)
     REAL,POINTER    :: real2_ptr(:,:)
-    LOGICAL,POINTER :: logical0_ptr
+    LOGICAL :: logical0_ptr
     LOGICAL,POINTER :: logical1_ptr(:)
     LOGICAL,POINTER :: logical2_ptr(:,:)
     
-    CHARACTER(LEN=str_len),POINTER :: string0_ptr
+    CHARACTER(LEN=str_len) :: string0_ptr
     CHARACTER(LEN=str_len),POINTER :: string1_ptr(:)
     CHARACTER(LEN=str_len),POINTER :: string2_ptr(:,:)
@@ -81 +81 @@
     SELECT CASE(attrib%type)
        CASE (integer0)
-         DEALLOCATE(attrib%integer0_ptr)
+!!$         DEALLOCATE(attrib%integer0_ptr)
        CASE (integer1)
          DEALLOCATE(attrib%integer1_ptr)
@@ -87 +87 @@
          DEALLOCATE(attrib%integer2_ptr)
        CASE (real0)
-         DEALLOCATE(attrib%real0_ptr)
+!!$         DEALLOCATE(attrib%real0_ptr)
        CASE (real1)
          DEALLOCATE(attrib%real1_ptr)
@@ -93 +93 @@
          DEALLOCATE(attrib%real2_ptr)
        CASE (logical0)
-         DEALLOCATE(attrib%logical0_ptr)
+!!$         DEALLOCATE(attrib%logical0_ptr)
        CASE (logical1)
          DEALLOCATE(attrib%logical1_ptr)
@@ -99 +99 @@
          DEALLOCATE(attrib%logical2_ptr)
        CASE (string0)
-         DEALLOCATE(attrib%string0_ptr)
+!!$         DEALLOCATE(attrib%string0_ptr)
        CASE (string1)
          DEALLOCATE(attrib%string1_ptr)
@@ -112 +112 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    INTEGER,TARGET :: value
+    INTEGER :: value
     
     TYPE(attribut) :: attr_int0
@@ -118 +118 @@
     attr_int0%name=attr_name
     attr_int0%type=integer0
-    attr_int0%integer0_ptr=>value
+    attr_int0%integer0_ptr=value
     
   END FUNCTION attr_int0
@@ -126 +126 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    INTEGER,TARGET :: value(:)
+    INTEGER,TARGET, INTENT(INOUT) :: value(:)
     
     TYPE(attribut) :: attr_int1
@@ -140 +140 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    INTEGER,TARGET :: value(:,:)
+    INTEGER,TARGET, INTENT(INOUT) :: value(:,:)
     
     TYPE(attribut) :: attr_int2
@@ -155 +155 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    REAL,TARGET :: value
+    REAL :: value
     
     TYPE(attribut) :: attr_real0
@@ -161 +161 @@
     attr_real0%name=attr_name
     attr_real0%type=real0
-    attr_real0%real0_ptr=>value
+    attr_real0%real0_ptr=value
     
   END FUNCTION attr_real0
@@ -169 +169 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    REAL,TARGET :: value(:)
+    REAL,TARGET, INTENT(INOUT) :: value(:)
     
     TYPE(attribut) :: attr_real1
@@ -183 +183 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    REAL,TARGET :: value(:,:)
+    REAL,TARGET, INTENT(INOUT) :: value(:,:)
     
     TYPE(attribut) :: attr_real2
@@ -197 +197 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    LOGICAL,TARGET :: value
+    LOGICAL :: value
     
     TYPE(attribut) :: attr_logical0
@@ -203 +203 @@
     attr_logical0%name=attr_name
     attr_logical0%type=logical0
-    attr_logical0%logical0_ptr=>value
+    attr_logical0%logical0_ptr=value
     
   END FUNCTION attr_logical0
@@ -211 +211 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    LOGICAL,TARGET :: value(:)
+    LOGICAL,TARGET, INTENT(INOUT) :: value(:)
     
     TYPE(attribut) :: attr_logical1
@@ -225 +225 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    LOGICAL,TARGET :: value(:,:)
+    LOGICAL,TARGET, INTENT(INOUT) :: value(:,:)
     
     TYPE(attribut) :: attr_logical2
@@ -240 +240 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    CHARACTER(LEN=*),TARGET :: value
+    CHARACTER(LEN=*) :: value
     TYPE(attribut) :: attr_string0
 
@@ -246 +246 @@
       attr_string0%name=attr_name
       attr_string0%type=string0
-      attr_string0%string_len=LEN(value)
-      attr_string0%string0_ptr=>value
+      attr_string0%string_len=LEN_TRIM(value)
+      attr_string0%string0_ptr=value
     
   END FUNCTION attr_string0
@@ -255 +255 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    CHARACTER(LEN=*),TARGET :: value(:)
+    CHARACTER(LEN=*),TARGET, INTENT(INOUT) :: value(:)
     
     TYPE(attribut) :: attr_string1
@@ -270 +270 @@
     IMPLICIT NONE
     INTEGER :: attr_name
-    CHARACTER(LEN=*),TARGET :: value(:,:)
+    CHARACTER(LEN=*),TARGET, INTENT(INOUT) :: value(:,:)
     
     TYPE(attribut) :: attr_string2