Changeset 145

Timestamp:

02/28/13 17:08:54 (11 years ago)

Author:

ymipsl

Message:

Add vampirtrace management

YM

Location:

codes/icosagcm/trunk/src

Files:

• advect_tracer.f90 (modified) (3 diffs)
• caldyn_gcm.f90 (modified) (9 diffs)
• dissip_gcm.f90 (modified) (11 diffs)
• timeloop_gcm.f90 (modified) (11 diffs)
• trace.F90 (added)

codes/icosagcm/trunk/src/advect_tracer.f90

@@ -39 +39 @@
     USE advect_mod
     USE mpipara
+    USE trace
     IMPLICIT NONE
-
+    
     TYPE(t_field),POINTER :: f_hfluxt(:)   ! time-integrated horizontal mass flux
     TYPE(t_field),POINTER :: f_wfluxt(:)   ! time-integrated vertical mass flux
@@ -51 +52 @@
     REAL(rstd),POINTER :: rhodz(:,:), u(:,:) 
     INTEGER :: ind,k
+
+    CALL trace_start("advect_tracer") 
 
     CALL transfert_request(f_u,req_e1)
@@ -110 +113 @@
     CALL transfert_request(f_q,req_i1)      ! necessary ?
     CALL transfert_request(f_rhodz,req_i1)  ! necessary ?
+    
+    CALL trace_end("advect_tracer")
+     
 
     ! horizontal transport - split in two to place transfer of gradq3d

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -91 +91 @@
     USE theta2theta_rhodz_mod
     USE mpipara
+    USE trace
     IMPLICIT NONE
     LOGICAL,INTENT(IN)    :: write_out
@@ -109 +110 @@
     INTEGER :: ind,ij
     
+    CALL trace_start("caldyn")
     CALL transfert_request(f_phis,req_i1) 
     CALL transfert_request(f_ps,req_i1) 
@@ -188 +190 @@
     
     !    CALL check_mass_conservation(f_ps,f_dps)
+    CALL trace_end("caldyn")
     
 END SUBROUTINE caldyn
@@ -195 +198 @@
   USE disvert_mod
   USE exner_mod
+  USE trace
   IMPLICIT NONE
   REAL(rstd),INTENT(IN)  :: u(iim*3*jjm,llm)
@@ -208 +212 @@
   LOGICAL,SAVE :: first=.TRUE.
   !$OMP THREADPRIVATE(first)
-  
+
+
+  CALL trace_start("compute_pvort")  
   !$OMP BARRIER      
   !$OMP MASTER  
@@ -281 +287 @@
     DEALLOCATE(qv)       ! potential velocity  
 !!$OMP END MASTER
-!!$OMP BARRIER                                                      
+!!$OMP BARRIER   
+    CALL trace_end("compute_pvort")
+                                                       
   END SUBROUTINE compute_pvort
   
@@ -288 +296 @@
   USE disvert_mod
   USE exner_mod
+  USE trace
   IMPLICIT NONE
     REAL(rstd),INTENT(IN)  :: phis(iim*jjm)
@@ -315 +324 @@
     LOGICAL,SAVE :: first=.TRUE.
 !$OMP THREADPRIVATE(first)
-        
+    
+    CALL trace_start("compute_caldyn")
 !$OMP BARRIER      
 !$OMP MASTER  
@@ -644 +654 @@
 !!$OMP END MASTER
 !!$OMP BARRIER                                                      
+    CALL trace_end("compute_caldyn")
+
   END SUBROUTINE compute_caldyn
 

codes/icosagcm/trunk/src/dissip_gcm.f90

@@ -430 +430 @@
   USE exner_mod
   USE geopotential_mod
+  USE trace
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ue(:)
@@ -447 +448 @@
     INTEGER :: l,i,j,n
     
+    CALL trace_start("dissip")
     CALL gradiv(f_ue,f_due_diss1)
     CALL gradrot(f_ue,f_due_diss2)
@@ -497 +499 @@
       END IF
    END DO
+
+   CALL trace_end("dissip")
 
     CONTAINS
@@ -532 +536 @@
   SUBROUTINE gradiv(f_ue,f_due)
   USE icosa
+  USE trace
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ue(:)
@@ -540 +545 @@
     INTEGER :: it
        
+    CALL trace_start("gradiv")
+
     DO ind=1,ndomain
       CALL swap_dimensions(ind)
@@ -560 +567 @@
     ENDDO
 
+   CALL trace_end("gradiv")
+
   END SUBROUTINE gradiv
   
@@ -565 +574 @@
   SUBROUTINE gradrot(f_ue,f_due)
   USE icosa
+  USE trace
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ue(:)
@@ -573 +583 @@
     INTEGER :: it
        
+    CALL trace_start("gradrot")
+
     DO ind=1,ndomain
       CALL swap_dimensions(ind)
@@ -594 +606 @@
     ENDDO
 
+    CALL trace_end("gradrot")
+
   END SUBROUTINE gradrot
   
   SUBROUTINE divgrad(f_theta,f_dtheta)
   USE icosa
+  USE trace
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_theta(:)
@@ -605 +620 @@
     INTEGER :: ind
     INTEGER :: it
+
+    CALL trace_start("divgrad")
        
     DO ind=1,ndomain
@@ -626 +643 @@
 
     ENDDO
+
+    CALL trace_end("divgrad")
 
   END SUBROUTINE divgrad

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -18 +18 @@
   USE physics_mod
   USE mpipara
-  
+  USE trace
   IMPLICIT NONE
   TYPE(t_field),POINTER :: f_phis(:)
@@ -222 +222 @@
     LOGICAL :: with_dps
     INTEGER :: ind
+
+    CALL trace_start("Euler_scheme")  
+
     DO ind=1,ndomain
        CALL swap_dimensions(ind)
@@ -238 +241 @@
     ENDDO
 
+    CALL trace_end("Euler_scheme")  
+
     END SUBROUTINE Euler_scheme
 
@@ -245 +250 @@
       REAL(rstd), DIMENSION(4), PARAMETER :: coef = (/ .25, 1./3., .5, 1. /)
       REAL(rstd) :: tau
+  
+      CALL trace_start("RK_scheme")  
 
       tau = dt*coef(stage)
@@ -268 +275 @@
          END IF
       END DO
+      
+      CALL trace_end("RK_scheme")
+      
     END SUBROUTINE RK_scheme
 
@@ -274 +284 @@
       INTEGER :: ind
 
+      CALL trace_start("leapfrog_scheme")
+        
       DO ind=1,ndomain
         CALL swap_dimensions(ind)
@@ -301 +313 @@
           
       ENDDO
+
+      CALL trace_end("leapfrog_scheme")
+
     END SUBROUTINE leapfrog_scheme  
  
@@ -307 +322 @@
     INTEGER :: ind, stage
     REAL :: tau
-    tau = dt/nb_stage
+
+      CALL trace_start("leapfrog_matsuno_scheme")
+    
+      tau = dt/nb_stage
       DO ind=1,ndomain
         CALL swap_dimensions(ind)
@@ -347 +365 @@
       
       ENDDO
+      CALL trace_end("leapfrog_matsuno_scheme")
       
     END SUBROUTINE leapfrog_matsuno_scheme  
@@ -353 +372 @@
     IMPLICIT NONE
       INTEGER :: ind
+
+      CALL trace_start("adam_bashforth_scheme")
 
       DO ind=1,ndomain
@@ -375 +396 @@
 
       ENDDO     
+
+      CALL trace_end("adam_bashforth_scheme")
       
     END SUBROUTINE adam_bashforth_scheme