Changeset 2001 for LMDZ5/trunk/libf/bibio/wxios.F90
- Timestamp:
- Apr 3, 2014, 3:52:45 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/bibio/wxios.F90
r1907 r2001 26 26 27 27 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 28 ! str + i => str_i !!!!!!!!!!!!!!!!!!!!29 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!30 31 SUBROUTINE concat(str, str2, str_str2)32 CHARACTER(len=*), INTENT(IN) :: str, str233 CHARACTER(len=20), INTENT(OUT) :: str_str234 35 36 str_str2 = TRIM(ADJUSTL(str//"_"//TRIM(ADJUSTL(str2))))37 !IF (prt_level >= 10) WRITE(lunout,*) "Xios. ",str,"+",str2,"=",str_str238 END SUBROUTINE concat39 40 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!41 28 ! 36day => 36d etc !!!!!!!!!!!!!!!!!!!! 42 29 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 158 145 g_ctx = xios_ctx 159 146 160 IF (prt_level >= 10) WRITE(lunout,*) "wxios_context_init: Current context is ",trim(g_ctx_name) 161 147 IF (prt_level >= 10) THEN 148 WRITE(lunout,*) "wxios_context_init: Current context is ",trim(g_ctx_name) 149 WRITE(lunout,*) " now call xios_solve_inheritance()" 150 ENDIF 162 151 !Une première analyse des héritages: 163 152 CALL xios_solve_inheritance() … … 313 302 TYPE(xios_axisgroup) :: axgroup 314 303 TYPE(xios_axis) :: ax 315 CHARACTER(len=20) :: axis_id 316 317 318 !Préparation du nom de l'axe: 319 CALL concat(axisgroup_id, axis_file, axis_id) 304 CHARACTER(len=50) :: axis_id 305 306 IF (len_trim(axisgroup_id).gt.len(axis_id)) THEN 307 WRITE(lunout,*) "wxios_add_vaxis: error, size of axis_id too small!!" 308 WRITE(lunout,*) " increase it to at least ",len_trim(axisgroup_id) 309 CALL abort_gcm("wxios_add_vaxis","len(axis_id) too small",1) 310 ENDIF 311 axis_id=trim(axisgroup_id) 320 312 321 313 !On récupère le groupe d'axes qui va bien: … … 332 324 IF (prt_level >= 10) WRITE(lunout,*) "wxios_add_vaxis: Axis created: ", TRIM(ADJUSTL(axis_id)) 333 325 ELSE 334 WRITE( *,*) "wxios_add_vaxis: Invalid axis: ", TRIM(ADJUSTL(axis_id))326 WRITE(lunout,*) "wxios_add_vaxis: Invalid axis: ", TRIM(ADJUSTL(axis_id)) 335 327 END IF 336 328 … … 367 359 368 360 IF (xios_is_valid_file("X"//fname)) THEN 369 IF (prt_level >= 10) WRITE(lunout,*) "wxios_add_file: New file: ", "X"//fname 370 IF (prt_level >= 10) WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl 361 IF (prt_level >= 10) THEN 362 WRITE(lunout,*) "wxios_add_file: New file: ", "X"//fname 363 WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl 364 ENDIF 371 365 ELSE 372 WRITE( *,*) "wxios_add_file: Error, invalid file: ", "X"//trim(fname)373 WRITE( *,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl366 WRITE(lunout,*) "wxios_add_file: Error, invalid file: ", "X"//trim(fname) 367 WRITE(lunout,*) "wxios_add_file: output_freq=",TRIM(ADJUSTL(nffreq)),"; output_lvl=",flvl 374 368 END IF 375 369 ELSE 376 IF (prt_level >= 10) WRITE(lunout,*) "wxios_add_file: File ",trim(fname), " défined using XML." 377 CALL xios_set_file_attr(fname, enabled=.TRUE.) 370 IF (prt_level >= 10) THEN 371 WRITE(lunout,*) "wxios_add_file: File ",trim(fname), " défined using XML." 372 ENDIF 373 ! Ehouarn: add an enable=.true. on top of xml definitions... why??? 374 CALL xios_set_file_attr(fname, enabled=.TRUE.) 378 375 END IF 379 376 END SUBROUTINE wxios_add_file … … 432 429 CHARACTER(len=*), INTENT(IN) :: op 433 430 434 CHARACTER(len=20) :: axis_id 431 CHARACTER(len=20) :: axis_id ! Ehouarn: dangerous... 435 432 CHARACTER(len=100) :: operation 436 433 TYPE(xios_file) :: f … … 441 438 442 439 443 !Préparation du nom de l'axe: 444 CALL concat("presnivs", fname, axis_id) 440 ! Ajout Abd pour NMC: 441 IF (fid.LE.6) THEN 442 axis_id="presnivs" 443 ELSE 444 axis_id="plev" 445 ENDIF 445 446 446 447 !on prépare le nom de l'opération: … … 448 449 449 450 450 451 451 !On selectionne le bon groupe de champs: 452 452 IF (fdim.EQ.2) THEN 453 453 CALL xios_get_fieldgroup_handle("fields_2D", fieldgroup) 454 454 ELSE 455 455 CALL xios_get_fieldgroup_handle("fields_3D", fieldgroup)
Note: See TracChangeset
for help on using the changeset viewer.