Changeset 365 for codes/icosagcm/trunk/src/timeloop_gcm.f90

Timestamp:

10/12/15 11:19:11 (9 years ago)

Author:

dubos

Message:

Cleanup detailed AAM budget

File:

• codes/icosagcm/trunk/src/timeloop_gcm.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -225 +225 @@
 
        IF (mod(it,itau_out)==0 ) THEN
+          CALL transfert_request(f_u,req_e1_vect)
           CALL write_output_fields_basic(f_ps, f_u, f_q)
        ENDIF
-
-       CALL check_conserve_detailed('detailed_budget 0', &
-            f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
 
        CALL guided(it*dt,f_ps,f_theta_rhodz,f_u,f_q)
@@ -239 +237 @@
           CALL HEVI_scheme(it, fluxt_zero)
        END SELECT
-       
-       CALL check_conserve_detailed('detailed_budget 1', &
-            f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
        
        IF (MOD(it,itau_dissip)==0) THEN
@@ -257 +252 @@
           ENDIF
           
+          CALL check_conserve_detailed(it, AAM_dyn, &
+               f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
+       
           CALL dissip(f_u,f_du,f_mass,f_phis, f_theta_rhodz,f_dtheta_rhodz)
           
@@ -264 +262 @@
              CALL euler_scheme(.FALSE.)  ! update only u, theta
           END IF
-       END IF
-       
-       CALL check_conserve_detailed('detailed_budget 2', &
-            f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)
+
+          CALL check_conserve_detailed(it, AAM_dissip, &
+               f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
+       END IF
        
        IF(MOD(it,itau_adv)==0) THEN
@@ -284 +282 @@
        END IF
        
-       IF (MOD(it,itau_check_conserv)==0) THEN
-          CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it) 
-       ENDIF
-       
        IF (MOD(it,itau_physics)==0) THEN
+          CALL check_conserve_detailed(it, AAM_dyn, &
+            f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
           CALL physics(it,f_phis, f_ps, f_theta_rhodz, f_u, f_wflux, f_q)        
+          CALL check_conserve_detailed(it, AAM_phys, &
+               f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
           !$OMP MASTER
           IF (first_physic) CALL SYSTEM_CLOCK(start_clock)
@@ -295 +293 @@
           first_physic=.FALSE.
        END IF
-       
+
+       IF (MOD(it,itau_check_conserv)==0) THEN
+          CALL check_conserve_detailed(it, AAM_dyn, &
+               f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
+          CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it) 
+       ENDIF       
     END DO
     
     CALL write_etat0(itau0+itaumax,f_ps, f_phis,f_theta_rhodz,f_u,f_q) 
     
+    CALL check_conserve_detailed(it, AAM_dyn, &
+         f_ps,f_dps,f_u,f_theta_rhodz,f_phis)
     CALL check_conserve(f_ps,f_dps,f_u,f_theta_rhodz,f_phis,it)  
     
@@ -316 +321 @@
     INTEGER :: it, itau0, itaumax, start_clock, stop_clock, rate_clock, throughput
     REAL :: per_step,total, elapsed
-    WRITE(*,'(A,I7,A,F8.1)') "It No :",it,"   t :",dt*it
+    WRITE(*,'(A,I7,A,F14.1)') "It No :",it,"   t :",dt*it
     IF(MOD(it,10)==0) THEN
        CALL SYSTEM_CLOCK(stop_clock)