Skip to content

Commit

Permalink
Update CIME to ESMCI cime5.8.7-2 (PR #3126)
Browse files Browse the repository at this point in the history
Update CIME to ESMCI cime5.8.7-2

Squash merge of jgfouca/branch-for-to-acme-2019-08-14

Features:
* Update to latest NCAR PIO2 version
* improve the config_compilers.xml schema to catch case errors

Bug fixes:
* make sure output_root path is abspath
* make sure ~/.cime/config_compilers.xml file is also checked against schema
* fix indentation bug in get_timing

[BFB]
  • Loading branch information
jgfouca authored Aug 16, 2019
1 parent e18512c commit f97afa5
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions share/util/shr_pio_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -189,19 +189,20 @@ subroutine shr_pio_init2(comp_id, comp_name, comp_iamin, comp_comm, comp_comm_ia
allocate(iosystems(total_comps))

if(pio_async_interface) then
call pio_init(total_comps,mpi_comm_world, comp_comm, io_comm, iosystems)
do i=1,total_comps
ret = pio_set_rearr_opts(iosystems(i), pio_rearr_opt_comm_type,&
pio_rearr_opt_fcd,&
pio_rearr_opt_c2i_enable_hs, pio_rearr_opt_c2i_enable_isend,&
pio_rearr_opt_c2i_max_pend_req,&
pio_rearr_opt_i2c_enable_hs, pio_rearr_opt_i2c_enable_isend,&
pio_rearr_opt_i2c_max_pend_req)
if(ret /= PIO_NOERR) then
write(shr_log_unit,*) "ERROR: Setting rearranger options failed"
end if
end do
i=1
call shr_sys_abort('pio_async_interface is not currently supported')
! call pio_init(total_comps,mpi_comm_world, comp_comm, io_comm, iosystems)
! do i=1,total_comps
! ret = pio_set_rearr_opts(iosystems(i), pio_rearr_opt_comm_type,&
! pio_rearr_opt_fcd,&
! pio_rearr_opt_c2i_enable_hs, pio_rearr_opt_c2i_enable_isend,&
! pio_rearr_opt_c2i_max_pend_req,&
! pio_rearr_opt_i2c_enable_hs, pio_rearr_opt_i2c_enable_isend,&
! pio_rearr_opt_i2c_max_pend_req)
! if(ret /= PIO_NOERR) then
! write(shr_log_unit,*) "ERROR: Setting rearranger options failed"
! end if
! end do
! i=1
else
do i=1,total_comps
if(comp_iamin(i)) then
Expand Down

0 comments on commit f97afa5

Please sign in to comment.