Changeset 595 for codes/icosagcm/devel/src/time/timeloop_gcm.f90

Timestamp:

10/19/17 10:32:52 (7 years ago)

Author:

dubos

Message:

devel : fix halo issues with computation of energy fluxes

File:

• codes/icosagcm/devel/src/time/timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/devel/src/time/timeloop_gcm.f90

@@ -304 +304 @@
        
        IF(MOD(it,itau_adv)==0) THEN
-          IF(diagflux_on) CALL diagflux_energy(adv_over_out, f_phis,f_rhodz,f_theta_rhodz,f_u, f_geopot,f_theta, f_hfluxt)
           CALL advect_tracer(f_hfluxt,f_wfluxt,f_u, f_q,f_rhodz, & ! update q and rhodz after RK step
                adv_over_out, f_masst,f_qmasst,f_massfluxt, f_qfluxt)  ! accumulate mass and fluxes if diagflux_on
           fluxt_zero=.TRUE. ! restart accumulation of hfluxt and qfluxt at next call to explicit_scheme / HEVI_scheme
+          ! At this point advect_tracer has obtained the halos of u and rhodz,
+          ! needed for correct computation of kinetic energy
+          IF(diagflux_on) CALL diagflux_energy(adv_over_out, f_phis,f_rhodz,f_theta_rhodz,f_u, f_geopot,f_theta, f_hfluxt)
+
           IF (check_rhodz) THEN ! check that rhodz is consistent with ps
              DO ind=1,ndomain