Skip to content

Commit

Permalink
Fixing remaining issues related to MPI buffer reuse
Browse files Browse the repository at this point in the history
This commit fixes the remaining issues related to MPI buffer reuse in
the MPAS components. The landice model had a statistics module that
previously used the same buffer for sending and receiving.

Additionally, the sea ice driver previously had an incorrect variable
that was used to test time intervals.
  • Loading branch information
douglasjacobsen committed Oct 27, 2015
1 parent 030d3e0 commit c3eaaa6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions components/mpas-cice/driver/ice_comp_mct.F
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ subroutine ice_init_mct( EClock, cdata_i, x2i_i, i2x_i, NLFilename )!{{{

logical, pointer :: tempLogicalConfig
character(len=StrKIND), pointer :: tempCharConfig
real (kind=RKIND), pointer :: tempRealConfig

interface
subroutine xml_stream_parser(xmlname, mgr_p, comm, ierr) bind(c)
Expand Down Expand Up @@ -553,8 +554,8 @@ end subroutine xml_stream_get_attributes
write (stderrUnit,*) 'Applying ICE coupling dt (s) of: ', ice_cpl_dt

! Verify the mpas time step fits into a coupling interval
call mpas_pool_get_config(domain % configs, 'config_dt', tempCharConfig)
call mpas_set_timeInterval(denInterval, timeString=tempCharConfig, ierr=ierr)
call mpas_pool_get_config(domain % configs, 'config_dt', tempRealConfig)
call mpas_set_timeInterval(denInterval, dt=tempRealConfig, ierr=ierr)
call mpas_set_timeInterval(zeroInterval, S=0, ierr=ierr)
call mpas_interval_division(start_time, alarmTimeStep, denInterval, numDivs, remInterval)

Expand Down
2 changes: 1 addition & 1 deletion components/mpasli/model
Submodule model updated from d5ef57 to 28f7c5

0 comments on commit c3eaaa6

Please sign in to comment.