Changeset 599 for codes/icosagcm/trunk/src/diagnostics/observable.f90

Timestamp:

10/19/17 17:04:26 (7 years ago)

Author:

dubos

Message:

trunk : backported commits r582-r598 (transport diagnostics)

File:

• codes/icosagcm/trunk/src/diagnostics/observable.f90 (modified) (4 diffs)

codes/icosagcm/trunk/src/diagnostics/observable.f90

@@ -6 +6 @@
   TYPE(t_field),POINTER, SAVE :: f_buf_i(:), &
        f_buf_Fel(:), f_buf_uh(:), & ! horizontal velocity, different from prognostic velocity if NH
-       f_buf_ulon(:), f_buf_ulat(:), &
-       f_buf_u3d(:) ! unused, remove ?
+       f_buf_ulon(:), f_buf_ulat(:)
   TYPE(t_field),POINTER, SAVE :: f_buf1_i(:), f_buf2_i(:)
   TYPE(t_field),POINTER, SAVE :: f_buf_v(:), f_buf_s(:), f_buf_p(:)
@@ -24 +23 @@
     CALL allocate_field(f_buf2_i,   field_t,type_real,llm,name="buffer2_i")
     CALL allocate_field(f_buf_p,   field_t,type_real,llm+1) 
-    CALL allocate_field(f_buf_u3d, field_t,type_real,3,llm)  ! 3D vel at cell centers
     CALL allocate_field(f_buf_ulon,field_t,type_real,llm, name="buf_ulon")
     CALL allocate_field(f_buf_ulat,field_t,type_real,llm, name="buf_ulat")
@@ -49 +47 @@
     USE theta2theta_rhodz_mod
     USE omega_mod
+    USE diagflux_mod
     LOGICAL, INTENT(IN) :: init
     INTEGER :: l
@@ -160 +159 @@
     END IF
 
+    IF(.NOT. init) THEN
+       IF(diagflux_on) THEN
+          CALL flux_centered_lonlat(1./(itau_out*dt) , f_massfluxt, f_buf_ulon, f_buf_ulat)
+          CALL output_field("mass_t", f_masst)
+          CALL output_field("massflux_lon",f_buf_ulon)
+          CALL output_field("massflux_lat",f_buf_ulat)
+
+          CALL transfert_request(f_epotfluxt,req_e1_vect) 
+          CALL flux_centered_lonlat(1./(itau_out*dt) , f_epotfluxt, f_buf_ulon, f_buf_ulat)
+          CALL output_field("epot_t", f_epot)
+          CALL output_field("epotflux_lon",f_buf_ulon)
+          CALL output_field("epotflux_lat",f_buf_ulat)
+
+          CALL transfert_request(f_ekinfluxt,req_e1_vect) 
+          CALL flux_centered_lonlat(1./(itau_out*dt) , f_ekinfluxt, f_buf_ulon, f_buf_ulat)
+          CALL output_field("ekin_t", f_ekin)
+          CALL output_field("ekinflux_lon",f_buf_ulon)
+          CALL output_field("ekinflux_lat",f_buf_ulat)
+
+          CALL transfert_request(f_enthalpyfluxt,req_e1_vect) 
+          CALL flux_centered_lonlat(1./(itau_out*dt) , f_enthalpyfluxt, f_buf_ulon, f_buf_ulat)
+          CALL output_field("enthalpy_t", f_enthalpy)
+          CALL output_field("enthalpyflux_lon",f_buf_ulon)
+          CALL output_field("enthalpyflux_lat",f_buf_ulat)
+
+          CALL qflux_centered_lonlat(1./(itau_out*dt) , f_qfluxt, f_qfluxt_lon, f_qfluxt_lat)
+          CALL output_field("qmass_t", f_qmasst)
+          CALL output_field("qflux_lon",f_qfluxt_lon)
+          CALL output_field("qflux_lat",f_qfluxt_lat)
+          CALL zero_qfluxt  ! restart accumulating fluxes
+       END IF
+    END IF
   END SUBROUTINE write_output_fields_basic