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

Timestamp:

06/10/16 17:49:07 (8 years ago)

Author:

dubos

Message:

Improved output

File:

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

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -31 +31 @@
 
     CHARACTER(len=255) :: def
-    
-!    IF (xios_output) itau_out=1
+
+    CALL init_caldyn
+    
+    IF (xios_output) itau_out=1
     IF (.NOT. enable_io) itau_out=HUGE(itau_out)
 
@@ -41 +43 @@
        STOP
     END IF
-
-    nqdyn = 1 ! one dynamical tracer = theta for the moment
 
     def='ARK2.3'
@@ -141 +141 @@
     CALL init_sponge
     CALL init_observable
-    CALL init_caldyn
     CALL init_guided
     CALL init_advect_tracer
@@ -220 +219 @@
     CALL trace_on
 
+    IF (xios_output) THEN ! we must call update_calendar before any XIOS output
+       CALL xios_update_calendar(1)
+    END IF
+    CALL write_output_fields_basic(.TRUE., f_phis, f_ps, f_mass, f_geopot, f_theta_rhodz, f_u, f_W, f_q)
+
     DO it=itau0+1,itau0+itaumax
 
        IF (is_master) CALL print_iteration(it, itau0, itaumax, start_clock, rate_clock)
+
        IF (xios_output) THEN
-          CALL xios_update_calendar(it)
+          IF(it>itau0+1) CALL xios_update_calendar(it-itau0)
        ELSE
           CALL update_time_counter(dt*it)
@@ -318 +323 @@
                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       
+       ENDIF
 
        IF (mod(it,itau_out)==0 ) THEN
           CALL transfert_request(f_u,req_e1_vect)
-          CALL write_output_fields_basic(f_phis, f_ps, f_mass, f_geopot, f_theta_rhodz, f_u, f_W, f_q)
+          CALL write_output_fields_basic(.FALSE.,f_phis, f_ps, f_mass, f_geopot, f_theta_rhodz, f_u, f_W, f_q)
        ENDIF