Changeset 753

Timestamp:

Mar 1, 2007, 11:28:53 AM (17 years ago)

Author:

lsce

Message:

ACo : correction pour le mode guide en parallele

Location:

LMDZ4/branches/V3_test/libf/dyn3dpar

Files:

• leapfrog_p.F (modified) (3 diffs)
• massbar.F (added)
• read_reanalyse.F (modified) (10 diffs)

LMDZ4/branches/V3_test/libf/dyn3dpar/leapfrog_p.F

@@ -6 +6 @@
 #define IO_DEBUG
 
-#undef CPP_IOIPSL
+!#undef CPP_IOIPSL
 
       SUBROUTINE leapfrog_p(ucov,vcov,teta,ps,masse,phis,nq,q,clesphy0,
@@ -231 +231 @@
 #ifdef CPP_IOIPSL
       if (ok_guide.and.(itaufin-itau-1)*dtvr.gt.21600) then
-        call guide(itau,ucov,vcov,teta,q,masse,ps)
+        call guide_pp(itau,ucov,vcov,teta,q,masse,ps)
       else
         IF(prt_level>9)WRITE(*,*)'attention on ne guide pas les ',
@@ -552 +552 @@
        IF (offline) THEN
 Cmaf stokage du flux de masse pour traceurs OFF-LINE
-
+#undef CPP_IOIPSL
 #ifdef CPP_IOIPSL
            CALL fluxstokenc(pbaru,pbarv,masse,teta,phi,phis,

LMDZ4/branches/V3_test/libf/dyn3dpar/read_reanalyse.F

@@ -10 +10 @@
 c   mode=1 variabels GCM
 
+       USE parallel
 c -----------------------------------------------------------------
 c   Declarations
@@ -42 +43 @@
       integer ncidpl
       integer varidpl,ncidQ,varidQ
-      save ncidu,varidu,ncidv,varidv,ncidt,varidt,ncidps,varidps
+      save ncidpl,ncidu,varidu,ncidv,varidv,ncidt,varidt,ncidps,varidps
       save varidpl,ncidQ,varidQ
 
@@ -55 +56 @@
       logical first
       save first
+      INTEGER ierr
 
       data first/.true./
@@ -69 +71 @@
 c Vent zonal
             if (guide_u) then
-            ncidu=NCOPN('u.nc',NCNOWRIT,rcode)
-            varidu=NCVID(ncidu,'UWND',rcode)
-            print*,'ncidu,varidu',ncidu,varidu
-            if (ncidpl.eq.-99) ncidpl=ncidu
+               ncidu=NCOPN('u.nc',NCNOWRIT,rcode)
+               varidu=NCVID(ncidu,'UWND',rcode)
+               print*,'ncidu,varidu',ncidu,varidu
+               if (ncidpl.eq.-99) ncidpl=ncidu
             endif
 
 c Vent meridien
             if (guide_v) then
-            ncidv=NCOPN('v.nc',NCNOWRIT,rcode)
-            varidv=NCVID(ncidv,'VWND',rcode)
-            print*,'ncidv,varidv',ncidv,varidv
-            if (ncidpl.eq.-99) ncidpl=ncidu
-            endif
+               ncidv=NCOPN('v.nc',NCNOWRIT,rcode)
+               varidv=NCVID(ncidv,'VWND',rcode)
+               print*,'ncidv,varidv',ncidv,varidv
+               if (ncidpl.eq.-99) ncidpl=ncidu
+            endif
+           
 
 c Temperature
             if (guide_T) then
-            ncidt=NCOPN('T.nc',NCNOWRIT,rcode)
-            varidt=NCVID(ncidt,'AIR',rcode)
-            print*,'ncidt,varidt',ncidt,varidt
-            if (ncidpl.eq.-99) ncidpl=ncidu
-            endif
-
+               ncidt=NCOPN('T.nc',NCNOWRIT,rcode)
+               varidt=NCVID(ncidt,'AIR',rcode)
+               print*,'ncidt,varidt',ncidt,varidt
+               if (ncidpl.eq.-99) ncidpl=ncidu
+            endif
+            
 c Humidite
             if (guide_Q) then
-            ncidQ=NCOPN('hur.nc',NCNOWRIT,rcode)
-            varidQ=NCVID(ncidQ,'RH',rcode)
-            print*,'ncidQ,varidQ',ncidQ,varidQ
-            if (ncidpl.eq.-99) ncidpl=ncidu
-            endif
-
+               ncidQ=NCOPN('hur.nc',NCNOWRIT,rcode)
+               varidQ=NCVID(ncidQ,'RH',rcode)
+               print*,'ncidQ,varidQ',ncidQ,varidQ
+               if (ncidpl.eq.-99) ncidpl=ncidu
+            endif
+            
 c Pression de surface
             if (guide_P) then
-            ncidps=NCOPN('ps.nc',NCNOWRIT,rcode)
-            varidps=NCVID(ncidps,'SP',rcode)
-            print*,'ncidps,varidps',ncidps,varidps
-            endif
-
+               ncidps=NCOPN('ps.nc',NCNOWRIT,rcode)
+               varidps=NCVID(ncidps,'SP',rcode)
+               print*,'ncidps,varidps',ncidps,varidps
+            endif
+            
 c Coordonnee vertcale
             if (ncep) then
@@ -134 +137 @@
       status=NF_GET_VARA_REAL(ncidpl,varidpl,1,nlevnc,pl)
 #endif
+     
 c  passage en pascal
       pl(:)=100.*pl(:)
@@ -160 +164 @@
       count(4)=1
 
+
+c mise a zero des tableaux 
+c ------------------------
+       unc(:,:,:)=0.
+       vnc(:,:,:)=0.
+       tnc(:,:,:)=0.
+       Qnc(:,:,:)=0.
+
 c  Vent zonal
 c  ----------
 
       if (guide_u) then
-      print*,'avant la lecture de UNCEP nd de niv:',nlevnc
+         print*,'avant la lecture de UNCEP nd de niv:',nlevnc
+
 #ifdef NC_DOUBLE
-      status=NF_GET_VARA_DOUBLE(ncidu,varidu,start,count,unc)
+         status=NF_GET_VARA_DOUBLE(ncidu,varidu,start,count,unc)
 #else
-      status=NF_GET_VARA_REAL(ncidu,varidu,start,count,unc)
+         status=NF_GET_VARA_REAL(ncidu,varidu,start,count,unc)
 #endif
 c     call dump2d(iip1,jjp1,unc,'VENT NCEP   ')
 c     call dump2d(iip1,40,unc(1,1,nlevnc),'VENT NCEP   ')
-      print*,'WARNING!!! Correction bidon pour palier a un '
-      print*,'probleme dans la creation des fichiers nc'
-      call correctbid(iim,jjp1*nlevnc,unc)
-      call dump2d(iip1,jjp1,unc,'UNC COUCHE 1 ')
+         print*,'WARNING!!! Correction bidon pour palier a un '
+         print*,'probleme dans la creation des fichiers nc'
+         call correctbid(iim,jjp1*nlevnc,unc)
+         call dump2d(iip1,jjp1,unc,'UNC COUCHE 1 ')
       endif
 
@@ -185 +198 @@
       if (guide_T) then
 #ifdef NC_DOUBLE
-      status=NF_GET_VARA_DOUBLE(ncidt,varidt,start,count,tnc)
+         status=NF_GET_VARA_DOUBLE(ncidt,varidt,start,count,tnc)
 #else
-      status=NF_GET_VARA_REAL(ncidt,varidt,start,count,tnc)
+         status=NF_GET_VARA_REAL(ncidt,varidt,start,count,tnc)
 #endif
-      call dump2d(iip1,jjp1,tnc,'TNC COUCHE 1 AAA ')
-      call correctbid(iim,jjp1*nlevnc,tnc)
-      call dump2d(iip1,jjp1,tnc,'TNC COUCHE 1 BBB ')
+         call dump2d(iip1,jjp1,tnc,'TNC COUCHE 1 AAA ')
+         call correctbid(iim,jjp1*nlevnc,tnc)
+         call dump2d(iip1,jjp1,tnc,'TNC COUCHE 1 BBB ')
       endif
 
@@ -199 +212 @@
       if (guide_Q) then
 #ifdef NC_DOUBLE
-      status=NF_GET_VARA_DOUBLE(ncidQ,varidQ,start,count,Qnc)
+         status=NF_GET_VARA_DOUBLE(ncidQ,varidQ,start,count,Qnc)
 #else
-      status=NF_GET_VARA_REAL(ncidQ,varidQ,start,count,Qnc)
+         status=NF_GET_VARA_REAL(ncidQ,varidQ,start,count,Qnc)
 #endif
-      call correctbid(iim,jjp1*nlevnc,Qnc)
-      call dump2d(iip1,jjp1,Qnc,'QNC COUCHE 1 ')
+         call correctbid(iim,jjp1*nlevnc,Qnc)
+         call dump2d(iip1,jjp1,Qnc,'QNC COUCHE 1 ')
       endif
 
@@ -213 +226 @@
       if (guide_v) then
 #ifdef NC_DOUBLE
-      status=NF_GET_VARA_DOUBLE(ncidv,varidv,start,count,vnc)
+         status=NF_GET_VARA_DOUBLE(ncidv,varidv,start,count,vnc)
 #else
-      status=NF_GET_VARA_REAL(ncidv,varidv,start,count,vnc)
+         status=NF_GET_VARA_REAL(ncidv,varidv,start,count,vnc)
 #endif
-      call correctbid(iim,jjm*nlevnc,vnc)
-      call dump2d(iip1,jjm,vnc,'VNC COUCHE 1 ')
+         call correctbid(iim,jjm*nlevnc,vnc)
+         call dump2d(iip1,jjm,vnc,'VNC COUCHE 1 ')
       endif
 
@@ -232 +245 @@
       if (guide_P) then
 #ifdef NC_DOUBLE
-      status=NF_GET_VARA_DOUBLE(ncidps,varidps,start,count,psnc)
+         status=NF_GET_VARA_DOUBLE(ncidps,varidps,start,count,psnc)
 #else
-      status=NF_GET_VARA_REAL(ncidps,varidps,start,count,psnc)
+         status=NF_GET_VARA_REAL(ncidps,varidps,start,count,psnc)
 #endif
-      call dump2d(iip1,jjp1,psnc,'PSNC COUCHE 1 ')
-      call correctbid(iim,jjp1,psnc)
+         call dump2d(iip1,jjp1,psnc,'PSNC COUCHE 1 ')
+         call correctbid(iim,jjp1,psnc)
       endif