Changeset 2160 for LMDZ5/branches/testing/libf/bibio

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/bibio/handle_err_m.F90 (modified) (1 diff)
• libf/bibio/wxios.F90 (modified) (7 diffs)

LMDZ5/branches/testing/libf/bibio/handle_err_m.F90

@@ -39 +39 @@
           end if
        end if
-       stop 1
+       call abort_gcm("NetCDF95 handle_err", "", 1)
     end if
 

LMDZ5/branches/testing/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:
@@ -424 +432 @@
     ! Pour déclarer un champ      !!!!!!!!!!!!!!!!!
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    SUBROUTINE wxios_add_field_to_file(fieldname, fdim, fid, fname, fieldlongname, fieldunit, field_level, op)
+    SUBROUTINE wxios_add_field_to_file(fieldname, fdim, fid, fname, fieldlongname, fieldunit, field_level, op, nam_axvert)
         IMPLICIT NONE
         INCLUDE 'iniprint.h'
@@ -437 +445 @@
         
         CHARACTER(len=20) :: axis_id ! Ehouarn: dangerous...
+        CHARACTER(len=20), INTENT(IN), OPTIONAL :: nam_axvert
         CHARACTER(len=100) :: operation
         TYPE(xios_file) :: f
@@ -450 +459 @@
         ELSE
           axis_id="plev"
+        ENDIF
+ 
+        IF (PRESENT(nam_axvert)) THEN
+           axis_id=nam_axvert
+           print*,'nam_axvert=',axis_id
         ENDIF
         
@@ -550 +564 @@
     SUBROUTINE wxios_closedef()
         CALL xios_close_context_definition()
-        CALL xios_update_calendar(0)
+!        CALL xios_update_calendar(0)
     END SUBROUTINE wxios_closedef