Changeset 1279 for LMDZ4/trunk/libf/phylmd/write_histrac.h

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/write_histrac.h (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/write_histrac.h

@@ +1 @@
+!$Id $
+!***************************************
+!  ECRITURE DU FICHIER :  histrac.nc
+!***************************************
+  IF (ecrit_tra > 0. .AND. config_inca == 'none') THEN
+     
+     itau_w = itau_phy + nstep
+     
+     CALL histwrite_phy(nid_tra,"phis",itau_w,pphis)
+     CALL histwrite_phy(nid_tra,"aire",itau_w,airephy)
+
+!TRACEURS
+!----------------
+     DO it=1,nbtr
+        iiq=niadv(it+2)
+
+! CONCENTRATIONS
+        CALL histwrite_phy(nid_tra,tname(iiq),itau_w,tr_seri(:,:,it))
+
+! TD LESSIVAGE       
+        IF (lessivage .AND. aerosol(it)) THEN
+           CALL histwrite_phy(nid_tra,"fl"//tname(iiq),itau_w,flestottr(:,:,it))
+        ENDIF
+
+! TD THERMIQUES
+        IF (iflag_thermals.gt.0) THEN
+           CALL histwrite_phy(nid_tra,"d_tr_th_"//tname(iiq),itau_w,d_tr_th(:,:,it))
+        ENDIF
+
+! TD CONVECTION
+        IF (iflag_con.GE.2) THEN
+           CALL histwrite_phy(nid_tra,"d_tr_cv_"//tname(iiq),itau_w,d_tr_cv(:,:,it))
+        ENDIF
+
+! TD COUCHE-LIMITE
+        CALL histwrite_phy(nid_tra,"d_tr_cl_"//tname(iiq),itau_w,d_tr_cl(:,:,it))
+     ENDDO
+!---------------
 !
-! $Header$
 !
+! VENT (niveau 1)   
+     CALL histwrite_phy(nid_tra,"pyu1",itau_w,yu1)
+     CALL histwrite_phy(nid_tra,"pyv1",itau_w,yv1)
+!
+! TEMPERATURE DU SOL
+     zx_tmp_fi2d(:)=ftsol(:,1)         
+     CALL histwrite_phy(nid_tra,"ftsol1",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=ftsol(:,2)
+     CALL histwrite_phy(nid_tra,"ftsol2",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=ftsol(:,3)
+     CALL histwrite_phy(nid_tra,"ftsol3",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=ftsol(:,4)
+     CALL histwrite_phy(nid_tra,"ftsol4",itau_w,zx_tmp_fi2d)
+!      
+! NATURE DU SOL
+     zx_tmp_fi2d(:)=pctsrf(:,1)
+     CALL histwrite_phy(nid_tra,"psrf1",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=pctsrf(:,2)
+     CALL histwrite_phy(nid_tra,"psrf2",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=pctsrf(:,3)
+     CALL histwrite_phy(nid_tra,"psrf3",itau_w,zx_tmp_fi2d)
+     zx_tmp_fi2d(:)=pctsrf(:,4)
+     CALL histwrite_phy(nid_tra,"psrf4",itau_w,zx_tmp_fi2d)
+ 
+! DIVERS    
+     CALL histwrite_phy(nid_tra,"pplay",itau_w,pplay)     
+     CALL histwrite_phy(nid_tra,"t",itau_w,t_seri)     
+     CALL histwrite_phy(nid_tra,"mfu",itau_w,pmfu)
+     CALL histwrite_phy(nid_tra,"mfd",itau_w,pmfd)
+     CALL histwrite_phy(nid_tra,"en_u",itau_w,pen_u)
+     CALL histwrite_phy(nid_tra,"en_d",itau_w,pen_d)
+     CALL histwrite_phy(nid_tra,"de_d",itau_w,pde_d)
+     CALL histwrite_phy(nid_tra,"de_u",itau_w,pde_u)
+     CALL histwrite_phy(nid_tra,"coefh",itau_w,coefh)
 
-      IF (ecrit_tra>0. .AND. config_inca == 'none') THEN
-      ndex = 0
-      ndex2d = 0
-      ndex3d = 0
-c
-      itau_w = itau_phy + nstep
+     IF (ok_sync) THEN
+!$OMP MASTER
+        CALL histsync(nid_tra)
+!$OMP END MASTER
+     ENDIF
 
-      CALL histwrite_phy(nid_tra,"phis",itau_w,pphis)
-C
-      CALL histwrite_phy(nid_tra,"aire",itau_w,airephy)
+  ENDIF !ecrit_tra>0. .AND. config_inca == 'none'
 
-      DO it=1,nbtr
-       iiq=niadv(it+2)
-
-       CALL histwrite_phy(nid_tra,tname(iiq),itau_w,tr_seri(:,:,it))
-       if (lessivage) THEN
-       CALL histwrite_phy(nid_tra,"fl"//tname(iiq),itau_w,
-     .                                   flestottr(:,:,it))
-      endif
-      
-c----Olivia
-       CALL histwrite_phy(nid_tra,"d_tr_th_"//tname(iiq),itau_w,
-     .                                           d_tr_th(:,:,it))
-
-         if(iflag_con.GE.2) then
-       CALL histwrite_phy(nid_tra,"d_tr_cv_"//tname(iiq),itau_w,
-     .                                           d_tr_cv(:,:,it))
-         endif !(iflag_con.GE.2) then
-       CALL histwrite_phy(nid_tra,"d_tr_cl_"//tname(iiq),itau_w,
-     .                                           d_tr_cl(:,:,it))
-c---fin Olivia      
-      
-      ENDDO
-
-
-C abder
-         CALL histwrite_phy(nid_tra,"pyu1",itau_w,yu1)
-
-         CALL histwrite_phy(nid_tra,"pyv1",itau_w,yv1)
-
-         CALL histwrite_phy(nid_tra,"ftsol1",itau_w,pftsol1)
-
-         CALL histwrite_phy(nid_tra,"ftsol2",itau_w,pftsol2)
-
-         CALL histwrite_phy(nid_tra,"ftsol3",itau_w,pftsol3)
-
-         CALL histwrite_phy(nid_tra,"ftsol4",itau_w,pftsol4)
-
-         CALL histwrite_phy(nid_tra,"psrf1",itau_w,ppsrf1)
-
-         CALL histwrite_phy(nid_tra,"psrf2",itau_w,ppsrf2)
-
-         CALL histwrite_phy(nid_tra,"psrf3",itau_w,ppsrf3)
-
-         CALL histwrite_phy(nid_tra,"psrf4",itau_w,ppsrf4)
-        CALL histwrite_phy(nid_tra,"pplay",itau_w,pplay)
-
-        CALL histwrite_phy(nid_tra,"t",itau_w,t_seri)
-        CALL histwrite_phy(nid_tra,"mfu",itau_w,pmfu)
-        CALL histwrite_phy(nid_tra,"mfd",itau_w,pmfd)
-        CALL histwrite_phy(nid_tra,"en_u",itau_w,pen_u)
-        CALL histwrite_phy(nid_tra,"en_d",itau_w,pen_d)
-        CALL histwrite_phy(nid_tra,"de_d",itau_w,pde_d)
-        CALL histwrite_phy(nid_tra,"de_u",itau_w,pde_u)
-        CALL histwrite_phy(nid_tra,"coefh",itau_w,coefh)
-
-
-c abder
-
-      if (ok_sync) then
-c$OMP MASTER
-        call histsync(nid_tra)
-c$OMP END MASTER
-       endif
-
-       END IF !ecrit_tra>0. .AND. config_inca == 'none'
-
-
-