Changeset 772 for LMDZ4/trunk

Timestamp:

Jun 5, 2007, 2:31:44 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Suite du merge entre la version et la HEAD: quelques modifications de Yann sur le LF

Location:

LMDZ4/trunk/libf/bibio

Files:

• vampir.F90 (modified) (4 diffs)
• write_field.F90 (modified) (1 diff)

LMDZ4/trunk/libf/bibio/vampir.F90

@@ -9 +9 @@
   INTEGER,parameter :: VTinca=7
   
+  INTEGER,parameter :: nb_inst=7
+  INTEGER :: MPE_begin(nb_inst)
+  INTEGER :: MPE_end(nb_inst)
+  
 contains
 
   subroutine InitVampir
     implicit none
+
 #ifdef USE_VT
     include 'VT.inc'
@@ -24 +29 @@
     call VTSYMDEF(VTphysiq,"physiq","physiq",ierr)
     call VTSYMDEF(VTinca,"inca","inca",ierr)
-#endif  
+#endif
+
+#ifdef USE_MPE
+    include 'mpe_logf.h' 
+    integer :: ierr,i
+    
+    DO i=1,nb_inst
+      ierr = MPE_Log_get_state_eventIDs( MPE_begin(i), MPE_end(i) )
+    ENDDO
+    
+    ierr = MPE_Describe_state( MPE_begin(VTcaldyn), MPE_end(VTcaldyn),"caldyn", "yellow" )
+    ierr = MPE_Describe_state( MPE_begin(VTintegre), MPE_end(VTintegre),"integre", "blue" )
+    ierr = MPE_Describe_state( MPE_begin(VTadvection), MPE_end(VTadvection),"advection", "green" )
+    ierr = MPE_Describe_state( MPE_begin(VTdissipation), MPE_end(VTdissipation),"dissipation", "ivory" )
+    ierr = MPE_Describe_state( MPE_begin(VThallo), MPE_end(VThallo),"hallo", "orange" )
+    ierr = MPE_Describe_state( MPE_begin(VTphysiq), MPE_end(VTphysiq),"physiq", "purple" )
+    ierr = MPE_Describe_state( MPE_begin(VTinca), MPE_end(VTinca),"inca", "LightBlue" )
+#endif     
   end subroutine InitVampir
-  
+
   subroutine VTb(number)
     implicit none
@@ -35 +57 @@
     
     call VTBEGIN(number,ierr)
+#endif 
+#ifdef USE_MPE
+    include 'mpe_logf.h' 
+    integer :: ierr,i
+    ierr = MPE_Log_event( MPE_begin(number), 0, '' )
 #endif
+
   end subroutine VTb
-  
+
   subroutine VTe(number)
     implicit none
@@ -48 +76 @@
 #endif    
 
+#ifdef USE_MPE
+    include 'mpe_logf.h' 
+    integer :: ierr,i
+    ierr = MPE_Log_event( MPE_end(number), 0, '' )
+#endif
+
   end subroutine VTe
   
 end module Vampir
-  

LMDZ4/trunk/libf/bibio/write_field.F90

@@ +1 @@
+!
+! $Header$
+!
 module write_field
 implicit none