Changeset 2870 for LMDZ5/branches/testing/libf/dyn3d

Timestamp:

May 4, 2017, 9:31:05 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2842:2865 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/dynetat0.f90 (modified) (1 diff)

LMDZ5/branches/testing/libf/dyn3d/dynetat0.f90

@@ -153 +153 @@
   INTEGER,          INTENT(IN) :: n1, n2
   CHARACTER(LEN=*), INTENT(IN) :: str1, str2
-  CHARACTER(LEN=256) :: s1, s2
+  CHARACTER(LEN=100) :: s1, s2
   IF(n1/=n2) THEN
     s1='value of '//TRIM(str1)//' ='
     s2=' read in starting file differs from parametrized '//TRIM(str2)//' ='
-    WRITE(msg,'(10x,a,i4,2x,a,i4)'),s1,n1,s2,n2
+    WRITE(msg,'(10x,a,i4,2x,a,i4)'),TRIM(ADJUSTL(s1)),n1,TRIM(ADJUSTL(s2)),n2
     CALL ABORT_gcm(TRIM(modname),TRIM(msg),1)
   END IF