Changeset 1885 for LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

Timestamp:

Oct 4, 2013, 3:35:36 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Make dyn3dpar/bilan_dyn_p.F work in MPI and OpenMP.
EM

File:

• LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -1344 +1344 @@
 c$OMP BARRIER
         RETURN
-      ENDIF
+      ENDIF ! of IF (itau==itaumax)
       
       IF ( .NOT.purmats ) THEN
@@ -1396 +1396 @@
 #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 BARRIER
-c$OMP MASTER
-!              CALL writedynav_p(histaveid, itau,vcov ,
-!     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
-
-c ATTENTION!!! bilan_dyn_p ne marche probablement pas avec OpenMP
               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 !ok_dynzon
 #endif
@@ -1602 +1591 @@
 #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 BARRIER
-c$OMP MASTER
-!               CALL writedynav_p(histaveid, itau,vcov ,
-!     ,                          ucov,teta,pk,phi,q,masse,ps,phis)
                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
                END IF !ok_dynzon
 #endif