Changeset 592 for codes/icosagcm/devel/src/diagnostics/diagflux.f90

Timestamp:

10/17/17 23:11:14 (7 years ago)

Author:

dubos

Message:

devel : finalize diagnostics of tracer fluxes

File:

• codes/icosagcm/devel/src/diagnostics/diagflux.f90 (modified) (5 diffs)

codes/icosagcm/devel/src/diagnostics/diagflux.f90

@@ -4 +4 @@
   SAVE
   
-  TYPE(t_field),POINTER :: f_qfluxt(:), f_qfluxt_lon(:), f_qfluxt_lat(:) ! time-integrated flux of scalars and its reconstruction at cell centers
+  TYPE(t_field),POINTER :: &
+       f_masst(:), f_qmasst(:), & ! time-integrated mass, tracer mass, 
+       f_massfluxt(:), f_qfluxt(:), & ! mass flux and tracer flux
+       f_qfluxt_lon(:), f_qfluxt_lat(:) ! scalar flux reconstructed  cell centers
   LOGICAL :: diagflux_on
   !$OMP THREADPRIVATE(diagflux_on)
@@ -15 +18 @@
     CALL getin("diagflux", diagflux_on)
     IF(diagflux_on) THEN
+       CALL allocate_field(f_masst,  field_t,type_real,llm, name="masst")
+       CALL allocate_field(f_qmasst,  field_t,type_real,llm,nqtot, name="qmasst")
+       CALL allocate_field(f_massfluxt, field_u,type_real,llm, name="massfluxt")
        CALL allocate_field(f_qfluxt,  field_u,type_real,llm,nqtot, name="qfluxt")
        CALL allocate_field(f_qfluxt_lon,  field_t,type_real,llm,nqtot, name="qfluxt_lon")
@@ -20 +26 @@
        CALL zero_qfluxt
     ELSE
+       CALL allocate_field(f_masst,  field_t,type_real,0, name="masst")
+       CALL allocate_field(f_qmasst,  field_t,type_real,llm,0, name="qmasst")
+       CALL allocate_field(f_massfluxt, field_u,type_real,0, name="massfluxt")
        CALL allocate_field(f_qfluxt,  field_u,type_real,llm,0, name="qfluxt")
        CALL allocate_field(f_qfluxt_lon,  field_t,type_real,llm,0, name="qfluxt_lon")
@@ -30 +39 @@
     USE omp_para
     INTEGER :: ind
-    REAL(rstd), POINTER :: qfluxt(:,:,:)
+    REAL(rstd), POINTER :: buf2(:,:),buf3(:,:,:)
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
        CALL swap_dimensions(ind)
-       qfluxt=f_qfluxt(ind)
-       qfluxt(:,ll_begin:ll_end,:)=0.
+       buf2=f_masst(ind)
+       buf2(:,ll_begin:ll_end)=0.
+       buf2=f_massfluxt(ind)
+       buf2(:,ll_begin:ll_end)=0.
+       buf3=f_qmasst(ind)
+       buf3(:,ll_begin:ll_end,:)=0.
+       buf3=f_qfluxt(ind)
+       buf3(:,ll_begin:ll_end,:)=0.
     END DO
   END SUBROUTINE zero_qfluxt
 
-  SUBROUTINE flux_centered_lonlat(scale, f_flux, f_flux_lon, f_flux_lat)
+  SUBROUTINE flux_centered_lonlat(scale, f_massflux, f_flux, f_massflux_lon, f_massflux_lat, f_flux_lon, f_flux_lat)
     REAL(rstd), INTENT(IN) :: scale
-    TYPE(t_field),POINTER :: f_flux(:), f_flux_lon(:), f_flux_lat(:)
-    REAL(rstd), POINTER :: flux(:,:,:), flux_lon(:,:,:), flux_lat(:,:,:)
+    TYPE(t_field),POINTER :: f_flux(:), f_flux_lon(:), f_flux_lat(:), &
+         f_massflux(:), f_massflux_lon(:), f_massflux_lat(:)
+    REAL(rstd), POINTER :: flux(:,:,:), flux_lon(:,:,:), flux_lat(:,:,:), &
+         massflux(:,:), massflux_lon(:,:), massflux_lat(:,:)
     INTEGER :: ind, itrac
     DO ind=1,ndomain
@@ -54 +71 @@
           CALL compute_flux_centered_lonlat(scale, flux(:,:,itrac), flux_lon(:,:,itrac), flux_lat(:,:,itrac))
        END DO
+       massflux=f_massflux(ind)
+       massflux_lon=f_massflux_lon(ind)
+       massflux_lat=f_massflux_lat(ind)
+       CALL compute_flux_centered_lonlat(scale, massflux, massflux_lon, massflux_lat)
     END DO
   END SUBROUTINE flux_centered_lonlat