Changeset 593

Timestamp:

10/18/17 00:42:50 (7 years ago)

Author:

dubos

Message:

devel : fields for energy fluxes (diagflux)

Location:

codes/icosagcm/devel/src

Files:

• diagnostics/diagflux.F90 (moved) (moved from codes/icosagcm/devel/src/diagnostics/diagflux.f90) (2 diffs)
• kernels/energetics.k90 (added)

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

@@ -5 +5 @@
   
   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
+       f_masst(:), f_qmasst(:), & ! time-averaged mass, tracer mass, 
+       f_massfluxt(:), f_qfluxt(:), & ! time-integrated mass flux and tracer flux
+       f_qfluxt_lon(:), f_qfluxt_lat(:), & ! scalar flux reconstructed at cell centers
+       f_epot(:), f_ekin(:), f_enthalpy(:), & ! time-averaged potential E, kinetic E and enthalpy
+       f_epotfluxt(:), f_ekinfluxt(:), f_enthalpyfluxt(:) ! time averaged 'fluxes' of epot, ekin and enthalpy
   LOGICAL :: diagflux_on
   !$OMP THREADPRIVATE(diagflux_on)
@@ -15 +17 @@
   SUBROUTINE init_diagflux
     USE getin_mod
+    INTEGER :: ll
     diagflux_on = .FALSE.
     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")
-       CALL allocate_field(f_qfluxt_lat,  field_t,type_real,llm,nqtot, name="qfluxt_lat")
-       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")
-       CALL allocate_field(f_qfluxt_lat,  field_t,type_real,llm,0, name="qfluxt_lat")
-    END IF
+    ll = MERGE(ll,0,diagflux_on)
+    CALL allocate_field(f_masst,         field_t,type_real,ll,       name="masst")
+    CALL allocate_field(f_epot,          field_t,type_real,ll,       name="epot")
+    CALL allocate_field(f_ekin,          field_t,type_real,ll,       name="ekin")
+    CALL allocate_field(f_enthalpy,      field_t,type_real,ll,       name="enthalpy")
+    CALL allocate_field(f_qmasst,        field_t,type_real,ll,nqtot, name="qmasst")
+    CALL allocate_field(f_massfluxt,     field_u,type_real,ll,       name="massfluxt")
+    CALL allocate_field(f_epotfluxt,     field_u,type_real,ll,       name="epotfluxt")
+    CALL allocate_field(f_ekinfluxt,     field_u,type_real,ll,       name="ekinfluxt")
+    CALL allocate_field(f_enthalpyfluxt, field_u,type_real,ll,       name="enthalpyfluxt")
+    CALL allocate_field(f_qfluxt,        field_u,type_real,ll,nqtot, name="qfluxt")
+    CALL allocate_field(f_qfluxt_lon,    field_t,type_real,ll,nqtot, name="qfluxt_lon")
+    CALL allocate_field(f_qfluxt_lat,    field_t,type_real,ll,nqtot, name="qfluxt_lat")
+    IF(diagflux_on) CALL zero_qfluxt
   END SUBROUTINE init_diagflux
 
   SUBROUTINE zero_qfluxt
-    USE mpipara
     USE omp_para
     INTEGER :: ind