Changeset 583

Timestamp:

10/13/17 21:21:27 (7 years ago)

Author:

dubos

Message:

devel : accumulate tracer fluxes over time for diagnostics

Location:

codes/icosagcm/devel/src

Files:

• diagnostics/diagflux.f90 (added)
• icosa_init.f90 (modified) (3 diffs)
• kernels/advect_horiz.k90 (modified) (3 diffs)
• transport/advect.F90 (modified) (2 diffs)
• transport/advect_tracer.f90 (modified) (6 diffs)

codes/icosagcm/devel/src/icosa_init.f90

@@ -1 +1 @@
 MODULE icosa_init_mod
-
-
 
 CONTAINS
@@ -22 +20 @@
   USE restart_mod
   USE etat0_mod
+  USE diagflux_mod
   IMPLICIT NONE
   
@@ -55 +54 @@
     CALL init_timeloop
     CALL init_physics
-   
+
+    CALL init_diagflux
     CALL timeloop
     CALL switch_omp_no_distrib_level

codes/icosagcm/devel/src/kernels/advect_horiz.k90

@@ -19 +19 @@
          END IF
          qflux(ij+u_right,l) = hfluxt(ij+u_right,l)*qe
+         IF(diagflux_on) qfluxt(ij+u_right,l) = qfluxt(ij+u_right,l)+qflux(ij+u_right,l)
          IF(ne_lup*hfluxt(ij+u_lup,l)>0.) THEN
             qe = qi(ij,l)
@@ -31 +32 @@
          END IF
          qflux(ij+u_lup,l) = hfluxt(ij+u_lup,l)*qe
+         IF(diagflux_on) qfluxt(ij+u_lup,l) = qfluxt(ij+u_lup,l)+qflux(ij+u_lup,l)
          IF(ne_ldown*hfluxt(ij+u_ldown,l)>0.) THEN
             qe = qi(ij,l)
@@ -43 +45 @@
          END IF
          qflux(ij+u_ldown,l) = hfluxt(ij+u_ldown,l)*qe
+         IF(diagflux_on) qfluxt(ij+u_ldown,l) = qfluxt(ij+u_ldown,l)+qflux(ij+u_ldown,l)
       END DO
    END DO

codes/icosagcm/devel/src/transport/advect.F90

@@ -425 +425 @@
   ! Horizontal transport (S. Dubey, T. Dubos)
   ! Slope-limited van Leer approach with hexagons
-  SUBROUTINE compute_advect_horiz(update_mass,hfluxt,cc,gradq3d, mass,qi) 
+  SUBROUTINE compute_advect_horiz(update_mass,diagflux_on, hfluxt,cc,gradq3d, mass,qi,qfluxt)
     USE trace
     USE omp_para
     IMPLICIT NONE
-    LOGICAL, INTENT(IN)       :: update_mass
+    LOGICAL, INTENT(IN)       :: update_mass, diagflux_on
     REAL(rstd), INTENT(IN)    :: gradq3d(iim*jjm,llm,3) 
     REAL(rstd), INTENT(IN)    :: hfluxt(3*iim*jjm,llm) ! mass flux
@@ -435 +435 @@
     REAL(rstd), INTENT(INOUT) :: mass(iim*jjm,llm)
     REAL(rstd), INTENT(INOUT) :: qi(iim*jjm,llm)
+    REAL(rstd), INTENT(INOUT) :: qfluxt(3*iim*jjm,llm) ! time-integrated tracer flux
 
     REAL(rstd) :: dq,dmass,qe,ed(3), newmass

codes/icosagcm/devel/src/transport/advect_tracer.f90

@@ -1 +1 @@
 MODULE advect_tracer_mod
   USE icosa
+  USE advect_mod
   IMPLICIT NONE
   PRIVATE
@@ -25 +26 @@
 
   SUBROUTINE init_advect_tracer
-    USE advect_mod
     USE omp_para
     REAL(rstd),POINTER :: tangent(:,:)
@@ -54 +54 @@
   END SUBROUTINE init_advect_tracer
 
-  SUBROUTINE advect_tracer(f_hfluxt, f_wfluxt,f_u, f_q,f_rhodz)
-    USE advect_mod
+  SUBROUTINE advect_tracer(diagflux_on, f_hfluxt, f_wfluxt,f_u, f_q,f_rhodz,f_qfluxt)
     USE mpipara
     USE trace
     USE write_field_mod
     USE tracer_mod
-    IMPLICIT NONE
-    
+    LOGICAL, INTENT(IN) :: diagflux_on
     TYPE(t_field),POINTER :: f_hfluxt(:)   ! time-integrated horizontal mass flux
     TYPE(t_field),POINTER :: f_wfluxt(:)   ! time-integrated vertical mass flux
@@ -67 +65 @@
     TYPE(t_field),POINTER :: f_q(:)        ! tracer
     TYPE(t_field),POINTER :: f_rhodz(:)    ! mass field at beginning of macro time step
+    TYPE(t_field),POINTER :: f_qfluxt(:)   ! time-integrated horizontal tracer flux
 
     REAL(rstd),POINTER :: q(:,:,:), normal(:,:), tangent(:,:), sqrt_leng(:), gradq3d(:,:,:), cc(:,:,:)
-    REAL(rstd),POINTER :: hfluxt(:,:), wfluxt(:,:)
+    REAL(rstd),POINTER :: hfluxt(:,:), wfluxt(:,:), qfluxt(:,:,:)
     REAL(rstd),POINTER :: rhodz(:,:), u(:,:) 
 ! temporary shared variable for vlz
@@ -170 +169 @@
           rhodz   = f_rhodz(ind)
           hfluxt  = f_hfluxt(ind) 
+          qfluxt  = f_qfluxt(ind) 
           gradq3d = f_gradq3d(ind)
-          CALL compute_advect_horiz(k==nq_last,hfluxt,cc,gradq3d, rhodz,q(:,:,k))
+          CALL compute_advect_horiz(k==nq_last,diagflux_on, hfluxt,cc,gradq3d, rhodz,q(:,:,k),qfluxt(:,:,k))
         END DO
       ENDIF
@@ -214 +214 @@
     USE trace
     USE omp_para
-    IMPLICIT NONE
     LOGICAL, INTENT(IN)       :: update_mass
     REAL(rstd), INTENT(IN)    :: fac, wfluxt(iim*jjm,llm+1) ! vertical mass flux