Changeset 1172

Timestamp:

Jun 8, 2009, 5:32:22 PM (16 years ago)

Author:

yann meurdesoif

Message:

ajout du nouveau guide de F. Caudron (version parallele)
YM

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Files:

• comvert.h (modified) (1 diff)
• guide_p_mod.F90 (added)
• invert_lat.F90 (added)
• leapfrog_p.F (modified) (4 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/comvert.h

@@ -2 +2 @@
 ! $Header$
 !
-c-----------------------------------------------------------------------
-c   INCLUDE 'comvert.h'
+!-----------------------------------------------------------------------
+!   INCLUDE 'comvert.h'
 
-      COMMON/comvert/ap(llm+1),bp(llm+1),presnivs(llm),dpres(llm) ,
-     ,               pa,preff,nivsigs(llm),nivsig(llm+1)
+      COMMON/comvert/ap(llm+1),bp(llm+1),presnivs(llm),dpres(llm),       &
+     &               pa,preff,nivsigs(llm),nivsig(llm+1)
 
       REAL ap,bp,presnivs,dpres,pa,preff,nivsigs,nivsig
 
-c-----------------------------------------------------------------------
+!-----------------------------------------------------------------------

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/leapfrog_p.F

@@ -18 +18 @@
        USE timer_filtre, ONLY : print_filtre_timer
        USE infotrac
+       USE guide_p_mod, ONLY : guide_main
 
       IMPLICIT NONE
@@ -246 +247 @@
 c$OMP BARRIER
 
+
 #ifdef CPP_IOIPSL
-c$OMP MASTER
-      if (ok_guide.and.(itaufin-itau-1)*dtvr.gt.21600) then
-        call guide_pp(itau,ucov,vcov,teta,q,masse,ps)
-      else
-        IF(prt_level>9)WRITE(*,*)'attention on ne guide pas les ',
-     .    '6 dernieres heures'
+      if (ok_guide) then
+!$OMP MASTER
+        call guide_main(itau,ucov,vcov,teta,q,masse,ps)
+!$OMP END MASTER
+!$OMP BARRIER
       endif
-c$OMP END MASTER
 #endif
+
 c
 c     IF( MOD( itau, 10* day_step ).EQ.0 )  THEN
@@ -554 +555 @@
 
 !      CALL FTRACE_REGION_END("caldyn")
+
 c$OMP MASTER
       call VTe(VTcaldyn)
@@ -560 +562 @@
 cc$OMP BARRIER
 cc$OMP MASTER
-c      call WriteField_p('du',reshape(du,(/iip1,jmp1,llm/)))
-c      call WriteField_p('dv',reshape(dv,(/iip1,jjm,llm/)))
-c      call WriteField_p('dteta',reshape(dteta,(/iip1,jmp1,llm/)))
-c      call WriteField_p('dp',reshape(dp,(/iip1,jmp1/)))
-c      call WriteField_p('w',reshape(w,(/iip1,jmp1,llm/)))
-c      call WriteField_p('pbaru',reshape(pbaru,(/iip1,jmp1,llm/)))
-c      call WriteField_p('pbarv',reshape(pbarv,(/iip1,jjm,llm/)))
-c      call WriteField_p('p',reshape(p,(/iip1,jmp1,llmp1/)))
-c      call WriteField_p('masse',reshape(masse,(/iip1,jmp1,llm/)))
-c      call WriteField_p('pk',reshape(pk,(/iip1,jmp1,llm/)))
+!      call WriteField_p('du',reshape(du,(/iip1,jmp1,llm/)))
+!      call WriteField_p('dv',reshape(dv,(/iip1,jjm,llm/)))
+!      call WriteField_p('dteta',reshape(dteta,(/iip1,jmp1,llm/)))
+!      call WriteField_p('dp',reshape(dp,(/iip1,jmp1/)))
+!      call WriteField_p('w',reshape(w,(/iip1,jmp1,llm/)))
+!      call WriteField_p('pbaru',reshape(pbaru,(/iip1,jmp1,llm/)))
+!      call WriteField_p('pbarv',reshape(pbarv,(/iip1,jjm,llm/)))
+!      call WriteField_p('p',reshape(p,(/iip1,jmp1,llmp1/)))
+!      call WriteField_p('masse',reshape(masse,(/iip1,jmp1,llm/)))
+!      call WriteField_p('pk',reshape(pk,(/iip1,jmp1,llm/)))
 cc$OMP END MASTER