Changeset 2669 for LMDZ5/branches/testing/libf/phylmd/Dust

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/Dust/phytracr_spl_mod.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -1170 +1170 @@
        !print *,nbtr
        do it=1,nbtr
-        print *, it, tname(it+2)
-        if (tname(it+2) == 'PREC' ) then
+        print *, it, tname(it+nqo)
+        if (tname(it+nqo) == 'PREC' ) then
             id_prec=it
         endif
-        if (tname(it+2) == 'FINE' ) then
+        if (tname(it+nqo) == 'FINE' ) then
             id_fine=it
         endif
-        if (tname(it+2) == 'COSS' ) then
+        if (tname(it+nqo) == 'COSS' ) then
             id_coss=it
         endif
-        if (tname(it+2) == 'CODU' ) then
+        if (tname(it+nqo) == 'CODU' ) then
             id_codu=it
         endif
-        if (tname(it+2) == 'SCDU' ) then
+        if (tname(it+nqo) == 'SCDU' ) then
             id_scdu=it
         endif
@@ -2621 +2621 @@
          call iophys_ecrit('fav'//str2,1,'SOURCE','',source_tr(:,it))
       enddo
-#endif
-
       do it=1,nbtr
          write(str2,'(i2.2)') it
          call iophys_ecrit('TRB'//str2,klev,'SOURCE','',tr_seri(:,:,it))
       enddo
+#endif
 
 
@@ -2650 +2649 @@
 
 #ifdef IOPHYS_DUST
-
       do it=1,nbtr
          write(str2,'(i2.2)') it
@@ -2676 +2674 @@
 !
 #ifdef IOPHYS_DUST
-!
       print *,'INPUT TO PRECUREMISSION'
          call iophys_ecrit('ftsol',4,'ftsol','',ftsol)