Changeset 1707 for LMDZ5/branches/testing/libf/dyn3dmem/exner_milieu_loc.F

Timestamp:

Jan 11, 2013, 10:19:19 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1706

---

Testing release based on r1706

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/exner_milieu_loc.F (modified) (4 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/exner_milieu_loc.F

@@ -1 +1 @@
 !
-! $Id $
+! $Id$
 !
       SUBROUTINE  exner_milieu_loc ( ngrid, ps, p,beta, pks, pk, pkf )
@@ -54 +54 @@
       logical,save :: firstcall=.true.
 !$OMP THREADPRIVATE(firstcall) 
-      character(len=*),parameter :: modname="exner_milieu_p"
+      character(len=*),parameter :: modname="exner_milieu_loc"
 
       ! Sanity check
       if (firstcall) then
-        ! check that vertical discretization is compatible
-        ! with this routine
-        if (disvert_type.ne.2) then
-          call abort_gcm(modname,
-     &     "this routine should only be called if disvert_type==2",42)
-        endif
         
         ! sanity checks for Shallow Water case (1 vertical layer)
@@ -123 +117 @@
       endif
 !$OMP END MASTER
-
+!$OMP BARRIER
         jjb=jj_begin
         jje=jj_end
@@ -171 +165 @@
       endif
 c$OMP END MASTER
+c$OMP BARRIER
 c
 c