Index: LMDZ5/branches/testing/libf/misc/wxios.F90 =================================================================== --- LMDZ5/branches/testing/libf/misc/wxios.F90 (revision 2542) +++ LMDZ5/branches/testing/libf/misc/wxios.F90 (revision 2787) @@ -25,4 +25,8 @@ !$OMP THREADPRIVATE(missing_val) +#ifdef XIOS1 +#error "XIOS v1 no longer supported, use XIOS v2." +#endif + CONTAINS @@ -33,9 +37,5 @@ SUBROUTINE reformadate(odate, ndate) CHARACTER(len=*), INTENT(IN) :: odate -#ifdef XIOS1 - CHARACTER(len=100), INTENT(OUT) :: ndate -#else TYPE(xios_duration) :: ndate -#endif INTEGER :: i = 0 @@ -52,27 +52,15 @@ i = INDEX(odate, "day") IF (i > 0) THEN -#ifdef XIOS1 - ndate = odate(1:i-1)//"d" -#else read(odate(1:i-1),*) ndate%day -#endif END IF i = INDEX(odate, "hr") IF (i > 0) THEN -#ifdef XIOS1 - ndate = odate(1:i-1)//"h" -#else read(odate(1:i-1),*) ndate%hour -#endif END IF i = INDEX(odate, "mth") IF (i > 0) THEN -#ifdef XIOS1 - ndate = odate(1:i-1)//"mo" -#else read(odate(1:i-1),*) ndate%month -#endif END IF @@ -197,34 +185,10 @@ !Variables pour xios: -#ifdef XIOS1 - TYPE(xios_time) :: mdtime -#else TYPE(xios_duration) :: mdtime -#endif !REAL(kind = 8) :: year=0, month=0, day=0, hour=0, minute=0, second=0 -#ifdef XIOS1 - mdtime = xios_time(0, 0, 0, 0, 0, pasdetemps) -#else mdtime%second=pasdetemps -#endif !Réglage du calendrier: -#ifdef XIOS1 - SELECT CASE (calendrier) - CASE('earth_360d') - CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "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") - IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier terrestre a 365 jours/an' - CASE('gregorian') - CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "Gregorian") - IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier gregorien' - CASE DEFAULT - abort_message = 'wxios_set_cal: Mauvais choix de calendrier' - CALL abort_gcm('Gcm:Xios',abort_message,1) - END SELECT -#else SELECT CASE (calendrier) CASE('earth_360d') @@ -241,5 +205,4 @@ CALL abort_gcm('Gcm:Xios',abort_message,1) END SELECT -#endif !Formatage de la date d'origine: @@ -247,9 +210,5 @@ IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Time origin: ", date -#ifdef XIOS1 - CALL xios_set_context_attr_hdl(g_ctx, time_origin = date) -#else CALL xios_set_time_origin(xios_date(annee,mois,jour,int(heure),0,0)) -#endif !Formatage de la date de debut: @@ -259,9 +218,5 @@ IF (prt_level >= 10) WRITE(lunout,*) "wxios_set_cal: Start date: ", date -#ifdef XIOS1 - CALL xios_set_context_attr_hdl(g_ctx, start_date = date) -#else CALL xios_set_start_date(xios_date(ini_an,ini_mois,ini_jour,int(ini_heure),0,0)) -#endif !Et enfin,le pas de temps: @@ -272,13 +227,7 @@ SUBROUTINE wxios_set_timestep(ts) REAL, INTENT(IN) :: ts -#ifdef XIOS1 - TYPE(xios_time) :: mdtime - - mdtime = xios_time(0, 0, 0, 0, 0, ts) -#else TYPE(xios_duration) :: mdtime mdtime%timestep = ts -#endif CALL xios_set_timestep(mdtime) @@ -334,13 +283,7 @@ !On parametrise le domaine: -#ifdef XIOS1 - 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)) -#else CALL xios_set_domain_attr_hdl(dom, ni_glo=ni_glo, ibegin=ibegin-1, ni=ni, type="rectilinear") 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)) -#endif IF (.NOT.is_sequential) THEN mask(:,:)=.TRUE. @@ -353,9 +296,5 @@ WRITE(lunout,*) "wxios_domain_param: mpirank=",mpi_rank," mask(:,nj)=",mask(:,nj) ENDIF -#ifdef XIOS1 - CALL xios_set_domain_attr_hdl(dom, mask=mask) -#else CALL xios_set_domain_attr_hdl(dom, mask_2d=mask) -#endif END IF @@ -401,9 +340,6 @@ ! Ehouarn: New way to declare axis, without axis_group: -#ifdef XIOS1 - CALL xios_set_axis_attr(trim(axis_id),size=axis_size,value=axis_value) -#else CALL xios_set_axis_attr(trim(axis_id),n_glo=axis_size,value=axis_value) -#endif + !Vérification: IF (xios_is_valid_axis(TRIM(ADJUSTL(axis_id)))) THEN @@ -429,9 +365,5 @@ TYPE(xios_file) :: x_file TYPE(xios_filegroup) :: x_fg -#ifdef XIOS1 - CHARACTER(len=100) :: nffreq -#else TYPE(xios_duration) :: nffreq -#endif !On regarde si le fichier n'est pas défini par XML: @@ -445,28 +377,15 @@ !On configure: -#ifdef XIOS1 - CALL xios_set_file_attr_hdl(x_file, name="X"//fname,& - output_freq=TRIM(ADJUSTL(nffreq)), output_level=flvl, enabled=.TRUE.) -#else CALL xios_set_file_attr_hdl(x_file, name="X"//fname,& output_freq=nffreq, output_level=flvl, enabled=.TRUE.) -#endif IF (xios_is_valid_file("X"//fname)) THEN IF (prt_level >= 10) THEN WRITE(lunout,*) "wxios_add_file: New file: ", "X"//fname -#ifdef XIOS1 - WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl -#else WRITE(lunout,*) "wxios_add_file: output_freq=",nffreq,"; output_lvl=",flvl -#endif ENDIF ELSE WRITE(lunout,*) "wxios_add_file: Error, invalid file: ", "X"//trim(fname) -#ifdef XIOS1 - WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl -#else WRITE(lunout,*) "wxios_add_file: output_freq=",nffreq,"; output_lvl=",flvl -#endif END IF ELSE @@ -538,7 +457,6 @@ TYPE(xios_field) :: field TYPE(xios_fieldgroup) :: fieldgroup -#ifndef XIOS1 TYPE(xios_duration) :: freq_op -#endif + LOGICAL :: bool=.FALSE. INTEGER :: lvl =0 @@ -599,10 +517,6 @@ !L'operation, sa frequence: -#ifdef XIOS1 - CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op="1ts", prec=4) -#else freq_op%timestep=1 CALL xios_set_field_attr_hdl(field, field_ref=fieldname, operation=TRIM(ADJUSTL(operation)), freq_op=freq_op, prec=4) -#endif