Changeset 3867 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wxios.F90

Timestamp:

Jan 8, 2016, 9:52:14 AM (9 years ago)

Author:

ymipsl

Message:

• Switch to XIOS 2
• Append main part of forcing configuration (LMDZ stand alone)
• Create etat0 and limit from usual LMDZ input files, using XIOS 2 interpolation functionnalities
  • missing parametrization of gravity waves
  • missing aerosol

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wxios.F90 (modified) (17 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wxios.F90

@@ -31 +31 @@
     SUBROUTINE reformadate(odate, ndate)
         CHARACTER(len=*), INTENT(IN) :: odate
-        CHARACTER(len=100), INTENT(OUT) :: ndate
+        TYPE(xios_duration) :: ndate
         
         INTEGER :: i = 0
@@ -46 +46 @@
         i = INDEX(odate, "day")
         IF (i > 0) THEN
-            ndate = odate(1:i-1)//"d"
+            read(odate(1:i-1),*) ndate%day
         END IF
 
         i = INDEX(odate, "hr")
         IF (i > 0) THEN
-            ndate = odate(1:i-1)//"h"
+            read(odate(1:i-1),*) ndate%hour
         END IF
 
         i = INDEX(odate, "mth")
         IF (i > 0) THEN
-            ndate = odate(1:i-1)//"mo"
+            read(odate(1:i-1),*) ndate%month
         END IF
         
@@ -135 +135 @@
     SUBROUTINE wxios_context_init()
         USE print_control_mod, ONLY : prt_level, lunout
+        USE mod_phys_lmdz_mpi_data, ONLY : COMM_LMDZ_PHY
         IMPLICIT NONE
 
@@ -141 +142 @@
 !$OMP MASTER
         !Initialisation du contexte:
-        CALL xios_context_initialize(g_ctx_name, g_comm)
+        CALL xios_context_initialize(g_ctx_name, COMM_LMDZ_PHY)
         CALL xios_get_handle(g_ctx_name, xios_ctx)    !Récupération
         CALL xios_set_current_context(xios_ctx)            !Activation
@@ -186 +187 @@
      
      !Variables pour xios:
-     TYPE(xios_time) :: mdtime
+     TYPE(xios_duration) :: mdtime
      !REAL(kind = 8) :: year=0, month=0, day=0, hour=0, minute=0, second=0
      
-        mdtime = xios_time(0, 0, 0, 0, 0, pasdetemps)
+        mdtime%second=pasdetemps
 
         !Réglage du calendrier:
         SELECT CASE (calendrier)
             CASE('earth_360d')
-                CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "D360")
+                CALL xios_define_calendar("D360")
                 IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier terrestre a 360 jours/an'
             CASE('earth_365d')
-                CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "NoLeap")
+                CALL xios_define_calendar("NoLeap")
                 IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier terrestre a 365 jours/an'
             CASE('earth_366d')
-                CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "Gregorian")
+                CALL xios_define_calendar("Gregorian")
                 IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier gregorien'
             CASE DEFAULT
@@ -211 +212 @@
         
         IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Time origin: ", date
-        
-        CALL xios_set_context_attr_hdl(g_ctx, time_origin = date)
+
+        CALL xios_set_time_origin(xios_date(annee,mois,jour,int(heure),0,0))
 
         !Formatage de la date de debut:
@@ -220 +221 @@
         IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Start date: ", date
         
-        CALL xios_set_context_attr_hdl(g_ctx, start_date = date)
+        CALL xios_set_start_date(xios_date(ini_an,ini_mois,ini_jour,int(ini_heure),0,0))
         
         !Et enfin,le pas de temps:
@@ -229 +230 @@
     SUBROUTINE wxios_set_timestep(ts)
         REAL, INTENT(IN) :: ts
-        TYPE(xios_time) :: mdtime     
-
-        mdtime = xios_time(0, 0, 0, 0, 0, ts)
+        TYPE(xios_duration) :: mdtime     
+
+        mdtime%timestep = ts
 
         CALL xios_set_timestep(mdtime)
@@ -285 +286 @@
         
         !On parametrise le domaine:
-        CALL xios_set_domain_attr_hdl(dom, ni_glo=ni_glo, ibegin=ibegin, ni=ni)
-        CALL xios_set_domain_attr_hdl(dom, nj_glo=nj_glo, jbegin=jbegin, nj=nj, data_dim=2)
-        CALL xios_set_domain_attr_hdl(dom, lonvalue=io_lon(ibegin:iend), latvalue=io_lat(jbegin:jend))
+        CALL xios_set_domain_attr_hdl(dom, ni_glo=ni_glo, ibegin=ibegin-1, ni=ni)
+        CALL xios_set_domain_attr_hdl(dom, nj_glo=nj_glo, jbegin=jbegin-1, nj=nj, data_dim=2)
+        CALL xios_set_domain_attr_hdl(dom, lonvalue_1d=io_lon(ibegin:iend), latvalue_1d=io_lat(jbegin:jend))
 
         IF (.NOT.is_sequential) THEN
@@ -299 +300 @@
               WRITE(lunout,*) "wxios_domain_param: mpirank=",mpi_rank," mask(:,nj)=",mask(:,nj)
             ENDIF
-            CALL xios_set_domain_attr_hdl(dom, mask=mask)
+            CALL xios_set_domain_attr_hdl(dom, mask_2d=mask)
         END IF
 
@@ -322 +323 @@
         REAL :: boundslon_mpi(klon_mpi,nvertex)
         REAL :: boundslat_mpi(klon_mpi,nvertex)
-        TYPE(xios_domain) :: dom
+        TYPE(xios_domaingroup) :: dom
 
 
@@ -331 +332 @@
 
 !$OMP MASTER
-        CALL xios_get_domain_handle("dom_glo", dom)
+        CALL xios_get_domaingroup_handle("dom_glo", dom)
         
         !On parametrise le domaine:
-        CALL xios_set_domain_attr_hdl(dom, ni_glo=klon_glo, ibegin=ij_begin, ni=ij_nb, data_dim=1, type="unstructured")
-        CALL xios_set_domain_attr_hdl(dom, nvertex=nvertex, lonvalue=lon_mpi, latvalue=lat_mpi, bounds_lon=TRANSPOSE(boundslon_mpi), bounds_lat=TRANSPOSE(boundslat_mpi) )
+        CALL xios_set_attr(dom, ni_glo=klon_glo, ibegin=ij_begin-1, ni=ij_nb, type="unstructured")
+        CALL xios_set_attr(dom, nvertex=nvertex, lonvalue_1d=lon_mpi, latvalue_1d=lat_mpi, bounds_lon_1d=TRANSPOSE(boundslon_mpi), bounds_lat_1d=TRANSPOSE(boundslat_mpi) )
 !$OMP END MASTER
 
@@ -375 +376 @@
         
         ! Ehouarn: New way to declare axis, without axis_group:
-        CALL xios_set_axis_attr(trim(axis_id),size=axis_size,value=axis_value)
+        CALL xios_set_axis_attr(trim(axis_id),n_glo=axis_size,value=axis_value)
         
         !Vérification:
@@ -400 +401 @@
         TYPE(xios_file) :: x_file
         TYPE(xios_filegroup) :: x_fg
-        CHARACTER(len=100) :: nffreq
+!        CHARACTER(len=100) :: nffreq
+        TYPE(xios_duration) :: nffreq
         
         !On regarde si le fichier n'est pas défini par XML:
@@ -413 +415 @@
             !On configure:
             CALL xios_set_file_attr_hdl(x_file, name="X"//fname,&
-                output_freq=TRIM(ADJUSTL(nffreq)), output_level=flvl, enabled=.TRUE.)
+                output_freq=nffreq, output_level=flvl, enabled=.TRUE.)
         
             IF (xios_is_valid_file("X"//fname)) THEN
                 IF (prt_level >= 10) THEN
                   WRITE(lunout,*) "wxios_add_file: New file: ", "X"//fname
-                  WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
+                  WRITE(lunout,*) "wxios_add_file: output_freq=",nffreq,"; output_lvl=",flvl
                 ENDIF
             ELSE
                 WRITE(lunout,*) "wxios_add_file: Error, invalid file: ", "X"//trim(fname)
-                WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl
+                WRITE(lunout,*) "wxios_add_file: output_freq=",nffreq,"; output_lvl=",flvl
             END IF
         ELSE
@@ -492 +494 @@
         TYPE(xios_field) :: field
         TYPE(xios_fieldgroup) :: fieldgroup
+        TYPE(xios_duration) :: freq_op
         LOGICAL :: bool=.FALSE.
         INTEGER :: lvl =0
@@ -550 +553 @@
             
             !L'operation, sa frequence:
-            CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op="1ts", prec=4)
+            freq_op%timestep=1
+            CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op=freq_op, prec=4)