Changeset 766 for LMDZ4/trunk/libf/phylmd/convect3.F

Timestamp:

Jun 4, 2007, 4:34:47 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Merge entre la version V3_conv et le HEAD
YM, JG, LF

File:

• LMDZ4/trunk/libf/phylmd/convect3.F (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/convect3.F

@@ -18 +18 @@
 cFleur       Introduction des traceurs dans convect3 le 6 juin 200
 c#################################################################
+      USE dimphy
+
 #include "dimensions.h"
-#include "dimphy.h"
+cym#include "dimphy.h"
       PARAMETER (NA=60)
 
@@ -1341 +1343 @@
 
 
-c$$$cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
-c$$$         call writeg1d(1,klev,ma,'ma  ','ma  ')
-c$$$          call writeg1d(1,klev,upwd,'upwd  ','upwd  ')
-c$$$          call writeg1d(1,klev,dnwd,'dnwd  ','dnwd  ')
-c$$$          call writeg1d(1,klev,dnwd0,'dnwd0  ','dnwd0  ')
-c$$$          call writeg1d(1,klev,tvp,'tvp  ','tvp  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,3),'tra3  ','tra3  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,4),'tra4  ','tra4  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,5),'tra5  ','tra5  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,6),'tra6  ','tra6  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,7),'tra7  ','tra7  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,8),'tra8  ','tra8  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,9),'tra9  ','tra9  ')
-c$$$          call writeg1d(1,klev,tra(1:klev,10),'tra10','tra10')
-c$$$          call writeg1d(1,klev,tra(1:klev,11),'tra11','tra11')
-c$$$          call writeg1d(1,klev,tra(1:klev,12),'tra12','tra12')
-c$$$          call writeg1d(1,klev,tra(1:klev,13),'tra13','tra13')
-c$$$          call writeg1d(1,klev,tra(1:klev,14),'tra14','tra14')
-c$$$          call writeg1d(1,klev,tra(1:klev,15),'tra15','tra15')
-c$$$          call writeg1d(1,klev,tra(1:klev,16),'tra16','tra16')
-c$$$          call writeg1d(1,klev,tra(1:klev,17),'tra17','tra17')
-c$$$          call writeg1d(1,klev,tra(1:klev,18),'tra18','tra18')
-c$$$          call writeg1d(1,klev,tra(1:klev,19),'tra19','tra19')
-c$$$          call writeg1d(1,klev,tra(1:klev,20),'tra20','tra20 ')
-c$$$          call writeg1d(1,klev,trap(1:klev,1),'trp1','trp1')
-c$$$          call writeg1d(1,klev,trap(1:klev,2),'trp2','trp2')
-c$$$          call writeg1d(1,klev,trap(1:klev,3),'trp3','trp3')
-c$$$          call writeg1d(1,klev,trap(1:klev,4),'trp4','trp4')
-c$$$          call writeg1d(1,klev,trap(1:klev,5),'trp5','trp5')
-c$$$          call writeg1d(1,klev,trap(1:klev,10),'trp10','trp10')
-c$$$          call writeg1d(1,klev,trap(1:klev,12),'trp12','trp12')
-c$$$          call writeg1d(1,klev,trap(1:klev,15),'trp15','trp15')
-c$$$          call writeg1d(1,klev,trap(1:klev,20),'trp20','trp20')
-c$$$          call writeg1d(1,klev,ftra(1:klev,1),'ftr1  ','ftr1  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,2),'ftr2  ','ftr2  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,3),'ftr3  ','ftr3  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,4),'ftr4  ','ftr4  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,5),'ftr5  ','ftr5  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,6),'ftr6  ','ftr6  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,7),'ftr7  ','ftr7  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,8),'ftr8  ','ftr8  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,9),'ftr9  ','ftr9  ')
-c$$$          call writeg1d(1,klev,ftra(1:klev,10),'ftr10','ftr10')
-c$$$          call writeg1d(1,klev,ftra(1:klev,11),'ftr11','ftr11')
-c$$$          call writeg1d(1,klev,ftra(1:klev,12),'ftr12','ftr12')
-c$$$          call writeg1d(1,klev,ftra(1:klev,13),'ftr13','ftr13')
-c$$$          call writeg1d(1,klev,ftra(1:klev,14),'ftr14','ftr14')
-c$$$          call writeg1d(1,klev,ftra(1:klev,15),'ftr15','ftr15')
-c$$$          call writeg1d(1,klev,ftra(1:klev,16),'ftr16','ftr16')
-c$$$          call writeg1d(1,klev,ftra(1:klev,17),'ftr17','ftr17')
-c$$$          call writeg1d(1,klev,ftra(1:klev,18),'ftr18','ftr18')
-c$$$          call writeg1d(1,klev,ftra(1:klev,19),'ftr19','ftr19')
-c$$$          call writeg1d(1,klev,ftra(1:klev,20),'ftr20','ftr20 ')
-c$$$          call writeg1d(1,klev,mp,'mp  ','mp ')
-c$$$          call writeg1d(1,klev,Mke,'Mke  ','Mke ')
+c@$$cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+c@$$         call writeg1d(1,klev,ma,'ma  ','ma  ')
+c@$$          call writeg1d(1,klev,upwd,'upwd  ','upwd  ')
+c@$$          call writeg1d(1,klev,dnwd,'dnwd  ','dnwd  ')
+c@$$          call writeg1d(1,klev,dnwd0,'dnwd0  ','dnwd0  ')
+c@$$          call writeg1d(1,klev,tvp,'tvp  ','tvp  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,3),'tra3  ','tra3  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,4),'tra4  ','tra4  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,5),'tra5  ','tra5  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,6),'tra6  ','tra6  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,7),'tra7  ','tra7  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,8),'tra8  ','tra8  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,9),'tra9  ','tra9  ')
+c@$$          call writeg1d(1,klev,tra(1:klev,10),'tra10','tra10')
+c@$$          call writeg1d(1,klev,tra(1:klev,11),'tra11','tra11')
+c@$$          call writeg1d(1,klev,tra(1:klev,12),'tra12','tra12')
+c@$$          call writeg1d(1,klev,tra(1:klev,13),'tra13','tra13')
+c@$$          call writeg1d(1,klev,tra(1:klev,14),'tra14','tra14')
+c@$$          call writeg1d(1,klev,tra(1:klev,15),'tra15','tra15')
+c@$$          call writeg1d(1,klev,tra(1:klev,16),'tra16','tra16')
+c@$$          call writeg1d(1,klev,tra(1:klev,17),'tra17','tra17')
+c@$$          call writeg1d(1,klev,tra(1:klev,18),'tra18','tra18')
+c@$$          call writeg1d(1,klev,tra(1:klev,19),'tra19','tra19')
+c@$$          call writeg1d(1,klev,tra(1:klev,20),'tra20','tra20 ')
+c@$$          call writeg1d(1,klev,trap(1:klev,1),'trp1','trp1')
+c@$$          call writeg1d(1,klev,trap(1:klev,2),'trp2','trp2')
+c@$$          call writeg1d(1,klev,trap(1:klev,3),'trp3','trp3')
+c@$$          call writeg1d(1,klev,trap(1:klev,4),'trp4','trp4')
+c@$$          call writeg1d(1,klev,trap(1:klev,5),'trp5','trp5')
+c@$$          call writeg1d(1,klev,trap(1:klev,10),'trp10','trp10')
+c@$$          call writeg1d(1,klev,trap(1:klev,12),'trp12','trp12')
+c@$$          call writeg1d(1,klev,trap(1:klev,15),'trp15','trp15')
+c@$$          call writeg1d(1,klev,trap(1:klev,20),'trp20','trp20')
+c@$$          call writeg1d(1,klev,ftra(1:klev,1),'ftr1  ','ftr1  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,2),'ftr2  ','ftr2  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,3),'ftr3  ','ftr3  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,4),'ftr4  ','ftr4  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,5),'ftr5  ','ftr5  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,6),'ftr6  ','ftr6  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,7),'ftr7  ','ftr7  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,8),'ftr8  ','ftr8  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,9),'ftr9  ','ftr9  ')
+c@$$          call writeg1d(1,klev,ftra(1:klev,10),'ftr10','ftr10')
+c@$$          call writeg1d(1,klev,ftra(1:klev,11),'ftr11','ftr11')
+c@$$          call writeg1d(1,klev,ftra(1:klev,12),'ftr12','ftr12')
+c@$$          call writeg1d(1,klev,ftra(1:klev,13),'ftr13','ftr13')
+c@$$          call writeg1d(1,klev,ftra(1:klev,14),'ftr14','ftr14')
+c@$$          call writeg1d(1,klev,ftra(1:klev,15),'ftr15','ftr15')
+c@$$          call writeg1d(1,klev,ftra(1:klev,16),'ftr16','ftr16')
+c@$$          call writeg1d(1,klev,ftra(1:klev,17),'ftr17','ftr17')
+c@$$          call writeg1d(1,klev,ftra(1:klev,18),'ftr18','ftr18')
+c@$$          call writeg1d(1,klev,ftra(1:klev,19),'ftr19','ftr19')
+c@$$          call writeg1d(1,klev,ftra(1:klev,20),'ftr20','ftr20 ')
+c@$$          call writeg1d(1,klev,mp,'mp  ','mp ')
+c@$$          call writeg1d(1,klev,Mke,'Mke  ','Mke ')