Changeset 1795 for LMDZ5/branches/testing/libf/dyn3dpar/leapfrog_p.F

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/leapfrog_p.F (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3dpar/leapfrog_p.F

@@ -904 +904 @@
 c      ajout des tendances physiques:
 c      ------------------------------
-         IF (ok_strato) THEN
-           CALL top_bound_p( vcov,ucov,teta,masse,dufi,dvfi,dtetafi)
-         ENDIF
-       
           CALL addfi_p( dtphys, leapf, forward   ,
      $                  ucov, vcov, teta , q   ,ps ,
      $                 dufi, dvfi, dtetafi , dqfi ,dpfi  )
 
+         IF (ok_strato) THEN
+           CALL top_bound_p(vcov,ucov,teta,masse,dtphys)
+         ENDIF
+       
 c$OMP BARRIER
 c$OMP MASTER
@@ -1024 +1024 @@
         ! Sponge layer (if any)
         IF (ok_strato) THEN
-          ! set dufi,dvfi,... to zero
-          ijb=ij_begin
-          ije=ij_end
-!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
-          do l=1,llm
-            dufi(ijb:ije,l)=0
-            dtetafi(ijb:ije,l)=0
-            dqfi(ijb:ije,l,1:nqtot)=0
-          enddo
-!$OMP END DO
-!$OMP MASTER
-          dpfi(ijb:ije)=0
-!$OMP END MASTER
-          ijb=ij_begin
-          ije=ij_end
-          if (pole_sud) ije=ije-iip1
-!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
-          do l=1,llm
-            dvfi(ijb:ije,l)=0
-          enddo
-!$OMP END DO
-
-          CALL top_bound_p(vcov,ucov,teta,masse,dufi,dvfi,dtetafi)
-          CALL addfi_p( dtvr, leapf, forward   ,
-     $                  ucov, vcov, teta , q   ,ps ,
-     $                 dufi, dvfi, dtetafi , dqfi ,dpfi  )
+          CALL top_bound_p(vcov,ucov,teta,masse,dtvr)
 !$OMP BARRIER
         ENDIF ! of IF (ok_strato)