Changeset 1978

Timestamp:

Feb 14, 2014, 11:56:27 AM (11 years ago)

Author:

fhourdin

Message:

Suppression de l'appel à wrgradsfi
Removing calls to wrgradsfi

Location:

LMDZ5/trunk/libf/phylmd

Files:

• thermcell.F (modified) (1 diff)
• thermcellV0_main.F90 (modified) (2 diffs)
• thermcell_main.F90 (modified) (1 diff)
• thermcell_old.F (modified) (2 diffs)
• thermcell_out3d.h (deleted)
• thermcell_plume.F90 (modified) (2 diffs)
• wrgradsfi.F (deleted)

LMDZ5/trunk/libf/phylmd/thermcell.F

@@ -1003 +1003 @@
 #endif
 123   continue
-#define troisD
-#ifdef troisD
-c       if (sorties) then
-c      print*,'Debut des wrgradsfi'
-
-c      print*,'16 OK convect8'
-         call wrgradsfi(1,nlay,wd,'wd        ','wd        ')
-         call wrgradsfi(1,nlay,zwa,'wa        ','wa        ')
-         call wrgradsfi(1,nlay,fracd,'fracd     ','fracd     ')
-         call wrgradsfi(1,nlay,fraca,'fraca     ','fraca     ')
-         call wrgradsfi(1,nlay,xxx,'xxx       ','xxx       ')
-         call wrgradsfi(1,nlay,wa_moy,'wam       ','wam       ')
-c      print*,'WA6 ',wa_moy
-         call wrgradsfi(1,nlay,zla,'la        ','la        ')
-         call wrgradsfi(1,nlay,zld,'ld        ','ld        ')
-         call wrgradsfi(1,nlay,pt,'pt        ','pt        ')
-         call wrgradsfi(1,nlay,zh,'zh        ','zh        ')
-         call wrgradsfi(1,nlay,zha,'zha        ','zha        ')
-         call wrgradsfi(1,nlay,zua,'zua        ','zua        ')
-         call wrgradsfi(1,nlay,zva,'zva        ','zva        ')
-         call wrgradsfi(1,nlay,zu,'zu        ','zu        ')
-         call wrgradsfi(1,nlay,zv,'zv        ','zv        ')
-         call wrgradsfi(1,nlay,zo,'zo        ','zo        ')
-         call wrgradsfi(1,nlay,wh,'wh        ','wh        ')
-         call wrgradsfi(1,nlay,wu,'wu        ','wu        ')
-         call wrgradsfi(1,nlay,wv,'wv        ','wv        ')
-         call wrgradsfi(1,nlay,wo,'wo        ','wo        ')
-         call wrgradsfi(1,1,zmax,'zmax      ','zmax      ')
-         call wrgradsfi(1,nlay,zdhadj,'zdhadj    ','zdhadj    ')
-         call wrgradsfi(1,nlay,pduadj,'pduadj    ','pduadj    ')
-         call wrgradsfi(1,nlay,pdvadj,'pdvadj    ','pdvadj    ')
-         call wrgradsfi(1,nlay,pdoadj,'pdoadj    ','pdoadj    ')
-         call wrgradsfi(1,nlay,entr,'entr      ','entr      ')
-         call wrgradsfi(1,nlay,detr,'detr      ','detr      ')
-         call wrgradsfi(1,nlay,fm,'fm        ','fm        ')
-         call wrgradsfi(1,nlay,fmc,'fmc       ','fmc       ')
-         call wrgradsfi(1,nlay,zw2,'zw2       ','zw2       ')
-         call wrgradsfi(1,nlay,ztva,'ztva      ','ztva      ')
-         call wrgradsfi(1,nlay,ztv,'ztv       ','ztv       ')
-
-         call wrgradsfi(1,nlay,zo,'zo        ','zo        ')
-         call wrgradsfi(1,nlay,larg_cons,'Lc        ','Lc        ')
-         call wrgradsfi(1,nlay,larg_detr,'Ldetr     ','Ldetr     ')
-
-cCR:nouveaux diagnostiques
-      call wrgradsfi(1,nlay,entr_star  ,'entr_star   ','entr_star   ')     
-      call wrgradsfi(1,nlay,f_star    ,'f_star   ','f_star   ')
-      call wrgradsfi(1,1,zmax,'zmax      ','zmax      ')
-      call wrgradsfi(1,1,zmix,'zmix      ','zmix      ') 
-      zsortie1d(:)=lmax(:)
-      call wrgradsfi(1,1,zsortie1d,'lmax      ','lmax      ')
-      call wrgradsfi(1,1,wmax,'wmax      ','wmax      ')
-      zsortie1d(:)=lmix(:)
-      call wrgradsfi(1,1,zsortie1d,'lmix      ','lmix      ')
-      zsortie1d(:)=lentr(:)
-      call wrgradsfi(1,1,zsortie1d,'lentr      ','lentr     ')
-
-c      print*,'17 OK convect8'
-
-         do k=1,klev/10
-            write(str2,'(i2.2)') k
-            str10='wa'//str2
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=wa(ig,k,l)
-               enddo
-            enddo   
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=larg_part(ig,k,l)
-               enddo
-            enddo
-            str10='la'//str2
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-         enddo
-
-
-c     print*,'18 OK convect8'
-c      endif
-c      print*,'Fin des wrgradsfi'
-#endif
 
       endif

LMDZ5/trunk/libf/phylmd/thermcellV0_main.F90

@@ -191 +191 @@
          entr0=0.
          detr0=0.
-
-
-#undef wrgrads_thermcell
-#ifdef wrgrads_thermcell
-! Initialisation des sorties grads pour les thermiques.
-! Pour l'instant en 1D sur le point igout.
-! Utilise par thermcell_out3d.h
-         str10='therm'
-         call inigrads(1,1,rlond(igout),1.,-180.,180.,jjm, &
-     &   rlatd(igout),-90.,90.,1.,llm,pplay(igout,:),1.,   &
-     &   ptimestep,str10,'therm ')
-#endif
-
-
-
       endif
-
       fm=0. ; entr=0. ; detr=0.
 
@@ -795 +779 @@
 
       if (prt_level.ge.1) print*,'thermcell_main sorties 3D'
-#ifdef wrgrads_thermcell
-      include "thermcell_out3d.h"
-#endif
-
       endif
 

LMDZ5/trunk/libf/phylmd/thermcell_main.F90

@@ -1070 +1070 @@
 !     print*,'15 OK convect8 CCCCCCCCCCCCCCCCCCc'
 
-#ifdef wrgrads_thermcell
-      if (prt_level.ge.1) print*,'thermcell_main sorties 3D'
-#include "thermcell_out3d.h"
-#endif
-
       endif
 

LMDZ5/trunk/libf/phylmd/thermcell_old.F

@@ -4202 +4202 @@
 #endif
 123   continue
-#define troisD
-#ifdef troisD
-c       if (sorties) then
-      print*,'Debut des wrgradsfi'
-
-c      print*,'16 OK convect8'
-         call wrgradsfi(1,nlay,wd,'wd        ','wd        ')
-         call wrgradsfi(1,nlay,zwa,'wa        ','wa        ')
-         call wrgradsfi(1,nlay,fracd,'fracd     ','fracd     ')
-         call wrgradsfi(1,nlay,fraca,'fraca     ','fraca     ')
-         call wrgradsfi(1,nlay,xxx,'xxx       ','xxx       ')
-         call wrgradsfi(1,nlay,wa_moy,'wam       ','wam       ')
-c      print*,'WA6 ',wa_moy
-         call wrgradsfi(1,nlay,zla,'la        ','la        ')
-         call wrgradsfi(1,nlay,zld,'ld        ','ld        ')
-         call wrgradsfi(1,nlay,pt,'pt        ','pt        ')
-         call wrgradsfi(1,nlay,zh,'zh        ','zh        ')
-         call wrgradsfi(1,nlay,zha,'zha        ','zha        ')
-         call wrgradsfi(1,nlay,zua,'zua        ','zua        ')
-         call wrgradsfi(1,nlay,zva,'zva        ','zva        ')
-         call wrgradsfi(1,nlay,zu,'zu        ','zu        ')
-         call wrgradsfi(1,nlay,zv,'zv        ','zv        ')
-         call wrgradsfi(1,nlay,zo,'zo        ','zo        ')
-         call wrgradsfi(1,nlay,wh,'wh        ','wh        ')
-         call wrgradsfi(1,nlay,wu,'wu        ','wu        ')
-         call wrgradsfi(1,nlay,wv,'wv        ','wv        ')
-         call wrgradsfi(1,nlay,wo,'wo        ','wo        ')
-         call wrgradsfi(1,1,zmax,'zmax      ','zmax      ')
-         call wrgradsfi(1,nlay,zdhadj,'zdhadj    ','zdhadj    ')
-         call wrgradsfi(1,nlay,pduadj,'pduadj    ','pduadj    ')
-         call wrgradsfi(1,nlay,pdvadj,'pdvadj    ','pdvadj    ')
-         call wrgradsfi(1,nlay,pdoadj,'pdoadj    ','pdoadj    ')
-         call wrgradsfi(1,nlay,entr,'entr      ','entr      ')
-         call wrgradsfi(1,nlay,detr,'detr      ','detr      ')
-         call wrgradsfi(1,nlay,fm,'fm        ','fm        ')
-         call wrgradsfi(1,nlay,fmc,'fmc       ','fmc       ')
-         call wrgradsfi(1,nlay,zw2,'zw2       ','zw2       ')
-         call wrgradsfi(1,nlay,ztva,'ztva      ','ztva      ')
-         call wrgradsfi(1,nlay,ztv,'ztv       ','ztv       ')
-
-         call wrgradsfi(1,nlay,zo,'zo        ','zo        ')
-         call wrgradsfi(1,nlay,larg_cons,'Lc        ','Lc        ')
-         call wrgradsfi(1,nlay,larg_detr,'Ldetr     ','Ldetr     ')
-
-cCR:nouveaux diagnostiques
-      call wrgradsfi(1,nlay,entr_star  ,'entr_star   ','entr_star   ')     
-      call wrgradsfi(1,nlay,f_star    ,'f_star   ','f_star   ')
-      call wrgradsfi(1,1,zmax,'zmax      ','zmax      ')
-      call wrgradsfi(1,1,zmix,'zmix      ','zmix      ') 
-      zsortie1d(:)=lmax(:)
-      call wrgradsfi(1,1,zsortie1d,'lmax      ','lmax      ')
-      call wrgradsfi(1,1,wmax,'wmax      ','wmax      ')
-      zsortie1d(:)=lmix(:)
-      call wrgradsfi(1,1,zsortie1d,'lmix      ','lmix      ')
-      zsortie1d(:)=lentr(:)
-      call wrgradsfi(1,1,zsortie1d,'lentr      ','lentr     ')
-
-c      print*,'17 OK convect8'
-
-         do k=1,klev/10
-            write(str2,'(i2.2)') k
-            str10='wa'//str2
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=wa(ig,k,l)
-               enddo
-            enddo   
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=larg_part(ig,k,l)
-               enddo
-            enddo
-            str10='la'//str2
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-         enddo
-
-
-c     print*,'18 OK convect8'
-c      endif
-      print*,'Fin des wrgradsfi'
-#endif
 
       endif
@@ -5576 +5494 @@
       enddo
 
-
-
-         do k=1,klev/10
-            write(str2,'(i2.2)') k
-            str10='wa'//str2
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=wa(ig,k,l)
-               enddo
-            enddo   
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-            do l=1,nlay
-               do ig=1,ngrid
-                  zsortie(ig,l)=larg_part(ig,k,l)
-               enddo
-            enddo
-            str10='la'//str2
-            CALL wrgradsfi(1,nlay,zsortie,str10,str10)
-         enddo
-
-      endif
-
-
-
       return
       end

LMDZ5/trunk/libf/phylmd/thermcell_plume.F90

@@ -462 +462 @@
         if (prt_level.ge.20) print*,'coucou calcul detr 470: ig, l', ig, l
 
-#undef wrgrads_thermcell
-#ifdef wrgrads_thermcell
-         call wrgradsfi(1,klev,entr_star(igout,1:klev),'esta      ','esta      ')
-         call wrgradsfi(1,klev,detr_star(igout,1:klev),'dsta      ','dsta      ')
-         call wrgradsfi(1,klev,zbuoy(igout,1:klev),'buoy      ','buoy      ')
-         call wrgradsfi(1,klev,zdqt(igout,1:klev),'dqt      ','dqt      ')
-         call wrgradsfi(1,klev,w_est(igout,1:klev),'w_est     ','w_est     ')
-         call wrgradsfi(1,klev,w_est(igout,2:klev+1),'w_es2     ','w_es2     ')
-         call wrgradsfi(1,klev,zw2(igout,1:klev),'zw2A      ','zw2A      ')
-#endif
-
-
      return 
      end
@@ -874 +862 @@
         if (prt_level.ge.20) print*,'coucou calcul detr 470: ig, l', ig, l
 
-#undef wrgrads_thermcell
-#ifdef wrgrads_thermcell
-         call wrgradsfi(1,klev,entr_star(igout,1:klev),'esta      ','esta      ')
-         call wrgradsfi(1,klev,detr_star(igout,1:klev),'dsta      ','dsta      ')
-         call wrgradsfi(1,klev,zbuoy(igout,1:klev),'buoy      ','buoy      ')
-         call wrgradsfi(1,klev,zdqt(igout,1:klev),'dqt      ','dqt      ')
-         call wrgradsfi(1,klev,w_est(igout,1:klev),'w_est     ','w_est     ')
-         call wrgradsfi(1,klev,w_est(igout,2:klev+1),'w_es2     ','w_es2     ')
-         call wrgradsfi(1,klev,zw2(igout,1:klev),'zw2A      ','zw2A      ')
-#endif
-
-
      return 
      end