Changeset 1844 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Aug 22, 2013, 11:58:56 AM (11 years ago)

Author:

yann meurdesoif

Message:

Bug fix in transport for planetar version.
=> advection was not done

File:

• LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3dpar/advtrac_p.F90

@@ -460 +460 @@
 
         CALL qminimum_p( q, 2, finmasse )
+     endif ! of if (planet_type=="earth")
 
         !------------------------------------------------------------------
@@ -466 +467 @@
         !          iadvtr=0
 
-        !$OMP MASTER
-        call VTe(VTadvection)
-        call stop_timer(timer_vanleer)
-        call VTb(VThallo)
-        !$OMP END MASTER
-
-        do j=1,nqtot
-           call Register_SwapFieldHallo(q(1,1,j),q(1,1,j),ip1jmp1,llm, &
-                jj_nb_caldyn,0,0,Request_vanleer)
-        enddo
-
-        call Register_SwapFieldHallo(flxw,flxw,ip1jmp1,llm, &
+      !$OMP MASTER
+      call VTe(VTadvection)
+      call stop_timer(timer_vanleer)
+      call VTb(VThallo)
+     !$OMP END MASTER
+
+      do j=1,nqtot
+        call Register_SwapFieldHallo(q(1,1,j),q(1,1,j),ip1jmp1,llm, &
              jj_nb_caldyn,0,0,Request_vanleer)
-
-        call SendRequest(Request_vanleer)
-        !$OMP BARRIER
-        call WaitRequest(Request_vanleer)      
-
-        !$OMP BARRIER
-        !$OMP MASTER
-        call SetDistrib(jj_nb_caldyn)
-        call VTe(VThallo)
-        call resume_timer(timer_caldyn)
+      enddo
+
+      call Register_SwapFieldHallo(flxw,flxw,ip1jmp1,llm, &
+             jj_nb_caldyn,0,0,Request_vanleer)
+
+      call SendRequest(Request_vanleer)
+      !$OMP BARRIER
+      call WaitRequest(Request_vanleer)      
+
+ !$OMP BARRIER
+ !$OMP MASTER
+      call SetDistrib(jj_nb_caldyn)
+      call VTe(VThallo)
+      call resume_timer(timer_caldyn)
  !$OMP END MASTER
  !$OMP BARRIER  
         iadvtr=0
-     endif ! of if (planet_type=="earth")
   ENDIF ! if iadvtr.EQ.iapp_tracvl