Changeset 935 for LMDZ4/branches/LMDZ4_V3_patches/libf/dyn3dpar

Timestamp:

Mar 26, 2008, 2:06:32 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Rajout ok_dynzon pour faire ou non les sorties bilan
LF

Location:

LMDZ4/branches/LMDZ4_V3_patches/libf/dyn3dpar

Files:

• conf_gcm.F (modified) (4 diffs)
• control.h (modified) (2 diffs)
• leapfrog_p.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4_V3_patches/libf/dyn3dpar/conf_gcm.F

@@ -600 +600 @@
        offline = .FALSE.
        CALL getin('offline',offline)
+
+!Config  Key  = ok_dynzon
+!Config  Desc = calcul et sortie des transports
+!Config  Def  = n
+!Config  Help = Permet de mettre en route le calcul des transports
+!Config         
+       ok_dynzon = .FALSE.
+       CALL getin('ok_dynzon',ok_dynzon)
 
 
@@ -643 +651 @@
       write(lunout,*)' tauyy = ', tauyy
       write(lunout,*)' offline = ', offline
+      write(lunout,*)' ok_dynzon = ', ok_dynzon
 
       RETURN
@@ -757 +766 @@
       write(lunout,*)' offline = ', offline
 
+!Config  Key  = ok_dynzon
+!Config  Desc = calcul et sortie des transports
+!Config  Def  = n
+!Config  Help = Permet de mettre en route le calcul des transports
+!Config         
+       ok_dynzon = .FALSE.
+       CALL getin('ok_dynzon',ok_dynzon)
 
       write(lunout,*)' #########################################'
@@ -799 +815 @@
       write(lunout,*)' tauy = ', tauy
       write(lunout,*)' offline = ', offline
+      write(lunout,*)' ok_dynzon = ', ok_dynzon
 c
       RETURN

LMDZ4/branches/LMDZ4_V3_patches/libf/dyn3dpar/control.h

@@ -14 +14 @@
      &              iperiod,iapp_tracvl,iconser,iecri,idissip,iphysiq , &
      &              periodav,ecritphy,iecrimoy,dayref,anneeref,         &
-     &              raz_date,offline,ip_ebil_dyn
+     &              raz_date,offline,ip_ebil_dyn,ok_dynzon
 
       INTEGER   nday,day_step,iperiod,iapp_tracvl,iconser,iecri,        &
@@ -21 +21 @@
       REAL periodav, ecritphy
       logical offline
+      logical ok_dynzon
 
 !-----------------------------------------------------------------------

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

@@ -1276 +1276 @@
                   iav=0
                ENDIF
-c#ifdef CPP_IOIPSL
-c             call Register_Hallo(vcov,ip1jm,llm,1,0,0,1,TestRequest)
-c             call SendRequest(TestRequest)
-cc$OMP BARRIER
-c              call WaitRequest(TestRequest)
-cc$OMP MASTER
+#ifdef CPP_IOIPSL
+             IF (ok_dynzon) THEN
+             call Register_Hallo(vcov,ip1jm,llm,1,0,0,1,TestRequest)
+             call SendRequest(TestRequest)
+c$OMP BARRIER
+              call WaitRequest(TestRequest)
+c$OMP MASTER
 c              CALL writedynav_p(histaveid, nqmx, itau,vcov ,
 c     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-cc$OMP END MASTER
-c               call bilan_dyn_p(2,dtvr*iperiod,dtvr*day_step*periodav,
-c     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
-c#endif
+c$OMP END MASTER
+               call bilan_dyn_p(2,dtvr*iperiod,dtvr*day_step*periodav,
+     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
+             ENDIF
+#endif
             ENDIF
 
@@ -1429 +1431 @@
                   iav=0
                ENDIF
-c#ifdef CPP_IOIPSL
-cc$OMP BARRIER
-
-c              call Register_Hallo(vcov,ip1jm,llm,1,0,0,1,TestRequest)
-c              call SendRequest(TestRequest)
-cc$OMP BARRIER
-c              call WaitRequest(TestRequest)
-
-cc$OMP MASTER
+#ifdef CPP_IOIPSL
+               IF (ok_dynzon) THEN
+c$OMP BARRIER
+
+              call Register_Hallo(vcov,ip1jm,llm,1,0,0,1,TestRequest)
+              call SendRequest(TestRequest)
+c$OMP BARRIER
+              call WaitRequest(TestRequest)
+
+c$OMP MASTER
 c              CALL writedynav_p(histaveid, nqmx, itau,vcov ,
 c     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-c               call bilan_dyn_p (2,dtvr*iperiod,dtvr*day_step*periodav,
-c     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
-cc$OMP END MASTER
-c#endif
+               call bilan_dyn_p (2,dtvr*iperiod,dtvr*day_step*periodav,
+     ,           ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q)
+c$OMP END MASTER
+               ENDIF
+#endif
             ENDIF