Changeset 2095 for LMDZ5/trunk/libf

Timestamp:

Jul 17, 2014, 1:12:30 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Modifications nécessaires pour la bonne définition du temps dans les
fichier Xios

---

Necessary modifications for the definition of time in Xios files

Location:

LMDZ5/trunk/libf

Files:

• bibio/wxios.F90 (modified) (4 diffs)
• phylmd/phys_output_mod.F90 (modified) (4 diffs)
• phylmd/phys_output_write_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/bibio/wxios.F90

@@ -161 +161 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    SUBROUTINE wxios_set_cal(pasdetemps, calendrier, annee, mois, jour, heure)
+    SUBROUTINE wxios_set_cal(pasdetemps, calendrier, annee, mois, jour, heure, ini_an, ini_mois, ini_jour, ini_heure)
         IMPLICIT NONE
         INCLUDE 'iniprint.h'
@@ -167 +167 @@
      !Paramètres:
      CHARACTER(len=*), INTENT(IN) :: calendrier
-     INTEGER, INTENT(IN) :: annee, mois, jour
-     REAL, INTENT(IN) :: pasdetemps, heure
+     INTEGER, INTENT(IN) :: annee, mois, jour, ini_an, ini_mois, ini_jour
+     REAL, INTENT(IN) :: pasdetemps, heure, ini_heure
      
      !Variables:
@@ -197 +197 @@
         END SELECT
         
-        !Formatage de la date de départ:
-        WRITE(date, "(i4.4,'-',i2.2,'-',i2.2,' 00:00:00')") annee, mois, jour
-        
-        IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Initial time: ", date
-        
-        CALL xios_set_context_attr_hdl(g_ctx, start_date= date)
+        !Formatage de la date d'origine:
+        WRITE(date, "(i4.4,'-',i2.2,'-',i2.2,' ',i2.2,':00:00')") annee, mois, jour, int(heure)
+        
+        IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Time origin: ", date
+        
+        CALL xios_set_context_attr_hdl(g_ctx, time_origin = date)
+
+        !Formatage de la date de debut:
+
+        WRITE(date, "(i4.4,'-',i2.2,'-',i2.2,' ',i2.2,':00:00')") ini_an, ini_mois, ini_jour, int(ini_heure)
+        
+        IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Start date: ", date
+        
+        CALL xios_set_context_attr_hdl(g_ctx, start_date = date)
         
         !Et enfin,le pas de temps:
@@ -550 +558 @@
     SUBROUTINE wxios_closedef()
         CALL xios_close_context_definition()
-        CALL xios_update_calendar(0)
+!        CALL xios_update_calendar(0)
     END SUBROUTINE wxios_closedef
     

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -94 +94 @@
     REAL                                  :: dtime
     INTEGER                               :: idayref
-    REAL                                  :: zjulian
+    REAL                                  :: zjulian_start, zjulian
     REAL, DIMENSION(klev)                 :: Ahyb, Bhyb, Alt
     CHARACTER(LEN=4), DIMENSION(nlevSTD)  :: clevSTD
@@ -133 +133 @@
     INTEGER :: x_an, x_mois, x_jour
     REAL :: x_heure
+    INTEGER :: ini_an, ini_mois, ini_jour
+    REAL :: ini_heure
 #endif
 
@@ -255 +257 @@
      ELSE
          CALL ymds2ju(annee_ref, 1, idayref, 0.0, zjulian)
+         CALL ymds2ju(annee_ref, 1, day_ini, start_time, zjulian_start)
      END IF
 
@@ -261 +264 @@
     !Temps julian => an, mois, jour, heure
     CALL ju2ymds(zjulian, x_an, x_mois, x_jour, x_heure)
-    CALL wxios_set_cal(dtime, calend, x_an, x_mois, x_jour, x_heure)
+    CALL ju2ymds(zjulian_start, ini_an, ini_mois, ini_jour, ini_heure)
+    CALL wxios_set_cal(dtime, calend, x_an, x_mois, x_jour, x_heure, ini_an, &
+                       ini_mois, ini_jour, ini_heure )
 #endif
 

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -300 +300 @@
              write(lunout,*)"phys_output_write: call xios_update_calendar, itau_w=",itau_w
           endif
-          CALL xios_update_calendar(itau_w)
+!          CALL xios_update_calendar(itau_w)
+          CALL xios_update_calendar(itap)
        END IF
        !$OMP END MASTER