Changeset 380

Timestamp:

05/25/16 10:00:02 (8 years ago)

Author:

ymipsl

Message:

Add module for tracer.
Some tracer can be defined as passive, ie not advected

YM

File:

• codes/icosagcm/trunk/src/advect_tracer.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/advect_tracer.f90

@@ -59 +59 @@
     USE trace
     USE write_field_mod
+    USE tracer_mod
     IMPLICIT NONE
     
@@ -76 +77 @@
     REAL(rstd),POINTER ::  wq(:,:)           ! time-integrated flux of q
     
-     INTEGER :: ind,k
+     INTEGER :: ind,k, nq_last
     LOGICAL,SAVE :: first=.TRUE.
 !$OMP THREADPRIVATE(first)
@@ -93 +94 @@
 
     IF(nqtot<1) RETURN
+    nq_last=-1
+    
+    DO k = 1, nqtot
+      IF (advection_scheme(k)==advect_vanleer) nq_last=k
+    ENDDO
+     
+    IF(nq_last<0) RETURN
+      
     CALL trace_start("advect_tracer") 
 
@@ -123 +132 @@
 
        DO k = 1, nqtot
-          CALL vlz(k==nqtot,0.5, wfluxt,rhodz,q(:,:,k),1,dzqw, adzqw, dzq, wq)
+          IF (advection_scheme(k)==advect_vanleer) CALL vlz(k==nq_last,0.5, wfluxt,rhodz,q(:,:,k),1,dzqw, adzqw, dzq, wq)
        END DO
 
@@ -135 +144 @@
     ! horizontal transport - split in two to place transfer of gradq3d
     DO k = 1, nqtot
-       DO ind=1,ndomain
+      IF (advection_scheme(k)==advect_vanleer) THEN
+       
+        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE
           CALL swap_dimensions(ind)
@@ -144 +155 @@
           CALL compute_gradq3d(q(:,:,k),sqrt_leng,gradq3d,xyz_i,xyz_v)
 
-       END DO
-
-       CALL send_message(f_gradq3d,req_gradq3d)
-       CALL wait_message(req_cc)
-       CALL wait_message(req_gradq3d)
-
-
-       DO ind=1,ndomain
+        END DO
+
+        CALL send_message(f_gradq3d,req_gradq3d)
+        CALL wait_message(req_cc)
+        CALL wait_message(req_gradq3d)
+
+
+        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE
           CALL swap_dimensions(ind)
@@ -160 +171 @@
           hfluxt  = f_hfluxt(ind) 
           gradq3d = f_gradq3d(ind)
-          CALL compute_advect_horiz(k==nqtot,hfluxt,cc,gradq3d, rhodz,q(:,:,k))
-       END DO
+          CALL compute_advect_horiz(k==nq_last,hfluxt,cc,gradq3d, rhodz,q(:,:,k))
+        END DO
+      ENDIF
     END DO 
     
@@ -180 +192 @@
 
        DO k = 1,nqtot
-          CALL vlz(k==nqtot, 0.5,wfluxt,rhodz, q(:,:,k),0, dzqw, adzqw, dzq, wq)
+         IF (advection_scheme(k)==advect_vanleer) CALL vlz(k==nq_last, 0.5,wfluxt,rhodz, q(:,:,k),0, dzqw, adzqw, dzq, wq)
        END DO