Changeset 1382 for LMDZ4

Timestamp:

May 6, 2010, 3:44:09 PM (14 years ago)

Author:

yann meurdesoif

Message:

Correction sortie dynamque en parallèle

EM+YM

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/gcm.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/gcm.F

@@ -274 +274 @@
           CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
-
+!#ifdef CPP_IOIPSL
         if (planet_type.eq."earth") then
 #ifdef CPP_EARTH
 ! Load an Earth-format start file
          CALL dynetat0("start.nc",vcov,ucov,
-     &              teta,q,masse,ps,phis, time_0)
-#endif
-        ! SW model also has Earth-format start files
-        ! (but can be used without the CPP_EARTH directive)
-          if (iflag_phys.eq.0) then
-            CALL dynetat0("start.nc",vcov,ucov,
-     &              teta,q,masse,ps,phis, time_0)
-          endif
-
+     .              teta,q,masse,ps,phis, time_0)
+#endif
         endif ! of if (planet_type.eq."earth")
-
 c       write(73,*) 'ucov',ucov
 c       write(74,*) 'vcov',vcov
@@ -498 +490 @@
 #ifdef CPP_IOIPSL
       time_step = zdtvr
-      if (ok_dyn_ins) then
-        ! initialize output file for instantaneous outputs
-        ! t_ops = iecri * daysec ! do operations every t_ops
-        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,
-     &              t_ops,t_wrt)
-!      CALL inithist_p(dynhist_file,day_ref,annee_ref,time_step,
-!     .              t_ops, t_wrt, histid, histvid)
-      endif
-
-      IF (ok_dyn_ave) THEN 
-        ! initialize output file for averaged outputs
-        t_ops = iperiod * time_step ! do operations every t_ops
-        t_wrt = periodav * daysec   ! write output every t_wrt
-        CALL initdynav(day_ref,annee_ref,time_step,
-     &       t_ops,t_wrt)
+      IF (mpi_rank==0) then
+        if (ok_dyn_ins) then
+          ! initialize output file for instantaneous outputs
+          ! t_ops = iecri * daysec ! do operations every t_ops
+          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,
+     &                  t_ops,t_wrt)
+        endif
+
+        IF (ok_dyn_ave) THEN 
+          ! initialize output file for averaged outputs
+          t_ops = iperiod * time_step ! do operations every t_ops
+          t_wrt = periodav * daysec   ! write output every t_wrt
+          CALL initdynav(day_ref,annee_ref,time_step,
+     &                   t_ops,t_wrt)
 !         CALL initdynav_p(dynhistave_file,day_ref,annee_ref,time_step,
 !     .        t_ops, t_wrt, histaveid)
-      END IF
+        END IF
+      ENDIF
       dtav = iperiod*dtvr/daysec
 #endif