Changeset 2488 for LMDZ5/branches/testing/libf/dyn3dmem/gcm.F90

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/gcm.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/gcm.F90

@@ -415 +415 @@
 #ifdef CPP_IOIPSL
   time_step = zdtvr
-  IF (mpi_rank==0) then
      if (ok_dyn_ins) then
         ! initialize output file for instantaneous outputs
@@ -421 +420 @@
         t_ops =((1.0*iecri)/day_step) * daysec  
         t_wrt = daysec ! iecri * daysec ! write output every t_wrt
-        t_wrt = daysec ! iecri * daysec ! write output every t_wrt
-        CALL inithist(day_ref,annee_ref,time_step, &
+        CALL inithist_loc(day_ref,annee_ref,time_step, &
              t_ops,t_wrt)
      endif
@@ -432 +430 @@
         CALL initdynav_loc(day_ref,annee_ref,time_step,t_ops,t_wrt)
      END IF
-  ENDIF
   dtav = iperiod*dtvr/daysec
 #endif