Changeset 2870 for LMDZ5/branches/testing/libf/phylmd/dyn1d

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/phylmd/dyn1d/1DUTILS.h (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/dyn1d/1DUTILS.h

@@ -653 +653 @@
 
       modname = 'dyn1deta0 : '
-      nmq(1)="vap"
-      nmq(2)="cond"
-      do iq=3,nqtot
-        write(nmq(iq),'("tra",i1)') iq-2
-      enddo
+!!      nmq(1)="vap"
+!!      nmq(2)="cond"
+!!      do iq=3,nqtot
+!!        write(nmq(iq),'("tra",i1)') iq-2
+!!      enddo
+      DO iq = 1,nqtot
+        nmq(iq) = trim(tname(iq))
+      ENDDO
       print*,'in dyn1deta0 ',fichnom,klon,klev,nqtot
       CALL open_startphy(fichnom)
@@ -804 +807 @@
       CALL open_restartphy(fichnom)
       print*,'redm1 ',fichnom,klon,klev,nqtot
-      nmq(1)="vap"
-      nmq(2)="cond"
-      nmq(3)="tra1"
-      nmq(4)="tra2"
+!!      nmq(1)="vap"
+!!      nmq(2)="cond"
+!!      nmq(3)="tra1"
+!!      nmq(4)="tra2"
+      DO iq = 1,nqtot
+        nmq(iq) = trim(tname(iq))
+      ENDDO
 
       modname = 'dyn1dredem'