Merged petsc/petsc into master

Merge from master

Merge branch 'master' into knepley/feature-dm-nearnullspace

* master: (219 commits)
petsc4py: update with VecScatter API changes
remove duplicate code
petsc4py: update to version 3.10.0
fixe

Merge branch 'master' into knepley/feature-dm-nearnullspace

* master: (219 commits)
petsc4py: update with VecScatter API changes
remove duplicate code
petsc4py: update to version 3.10.0
fixed typos in documentation
fixed typos in documentation
Fix some remaining Register()s to call InitializePackage()
Remove memory leaks of XXXRegister() is called but XXX object is never used
Add to PCTFS manual page that it does not work for complex numbers
Stray , in manual page that should be .
Only register MPI3 VecScatter if they are built
clarification of KSPSetComputeInitialGuess()
Add missing makefiles for VecScatter implementations
Changed VecScatterCreate() to take a communicator and return scatter as other first class PETSc objects do. Changed old VecScatterCreate() to VecScatterCreateWithData()
Added VecScatterSetUp() and converted implementations to use it to compute scatter information
Pull "MPI1" and "MPI3" specific code out of common VecScatter impls code This allows future implementations to use the common code also without changing the common code
Seperate VecScatter implementation code into three subdirectories seq, mpi1, and mpi3
doc: fix author list in manual wrt 6402aee
doc: fix LOCDIR wrt broken URL from MatHYPRESetPreallocation.html
ifort: ifx compile error with --with-mpi=0
changes/310.html: merged two TAO sections
...

Conflicts:
src/dm/interface/dm.c

show more ...

Merge branch 'master' into knepley/feature-ksp-ex10-transpose

* master: (219 commits)
petsc4py: update with VecScatter API changes
remove duplicate code
petsc4py: update to version 3.10.0
fi

Merge branch 'master' into knepley/feature-ksp-ex10-transpose

* master: (219 commits)
petsc4py: update with VecScatter API changes
remove duplicate code
petsc4py: update to version 3.10.0
fixed typos in documentation
fixed typos in documentation
Fix some remaining Register()s to call InitializePackage()
Remove memory leaks of XXXRegister() is called but XXX object is never used
Add to PCTFS manual page that it does not work for complex numbers
Stray , in manual page that should be .
Only register MPI3 VecScatter if they are built
clarification of KSPSetComputeInitialGuess()
Add missing makefiles for VecScatter implementations
Changed VecScatterCreate() to take a communicator and return scatter as other first class PETSc objects do. Changed old VecScatterCreate() to VecScatterCreateWithData()
Added VecScatterSetUp() and converted implementations to use it to compute scatter information
Pull "MPI1" and "MPI3" specific code out of common VecScatter impls code This allows future implementations to use the common code also without changing the common code
Seperate VecScatter implementation code into three subdirectories seq, mpi1, and mpi3
doc: fix author list in manual wrt 6402aee
doc: fix LOCDIR wrt broken URL from MatHYPRESetPreallocation.html
ifort: ifx compile error with --with-mpi=0
changes/310.html: merged two TAO sections
...

Conflicts:
src/ksp/ksp/interface/itfunc.c

show more ...

Merge branch 'barry/refactor-vecscatter-2'

Changed VecScatterCreate() to take a communicator and return scatter as other first class PETSc objects do.
Changed old VecScatterCreate() to VecScatterCreateWithData()

Completed basic refactorizati

Changed VecScatterCreate() to take a communicator and return scatter as other first class PETSc objects do.
Changed old VecScatterCreate() to VecScatterCreateWithData()

Completed basic refactorization of VecScatter code, ready for new implementations to be added.

(There is still some code duplication between the VecScatter MPI1 and MPI3 code but it can be fixed at anytime without requiring changes to the VecScatter API.

Part 5 of a refactorization of VecScatter to be treated as a first class PETSc object

Commit-type: style-fix

show more ...

Merged petsc/petsc into master

Merge branch 'master' into knepley/fix-superdm-is

* master: (455 commits)
bib: spell out some names for format consistency with related refs
bib: two 2018 pubs now appeared
cleaning up analyze

Merge branch 'master' into knepley/fix-superdm-is

* master: (455 commits)
bib: spell out some names for format consistency with related refs
bib: two 2018 pubs now appeared
cleaning up analyzer warnings
compile fixes (workarround PGI bug?):
undoing the branch's changes to leastsquares outputs
more fixes for complex builds
compile error fix for complex builds
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix Pardiso code to only compile pardiso_init64 when needed, otherwise can generate warnings/errors
jenkins: run 'cleantest' before 'allgtest-tap' - an attempt to fix errors of type:
cuda: protect cuda includes
fix cuda warnings.
fix complex compile error
Revert "Improved polymorphism of interfaces for MatSetValuesBlocked()"
Bib: Updated ref
Doc: More function documentation
petscvec: move PetscSFCreateFromZero from vscat to vec sources
Fixed an uninitialized variable and got rid of an unused one.
memleak fixed and output files updated
fixing build errors on some archs
Mat: obey options prefix of Mat in MatNullSpaceTest
...

Conflicts:
include/petsc/private/dmpleximpl.h
src/dm/interface/dmi.c

show more ...

Merge branch 'master' into knepley/feature-pc-patch

* master: (281 commits)
compile fixes (workarround PGI bug?):
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix

Merge branch 'master' into knepley/feature-pc-patch

* master: (281 commits)
compile fixes (workarround PGI bug?):
1) Look for 64 bit integer MKL BLAS if 64 bit indices are used with PETSc 2) Fix Pardiso code to only compile pardiso_init64 when needed, otherwise can generate warnings/errors
jenkins: run 'cleantest' before 'allgtest-tap' - an attempt to fix errors of type:
cuda: protect cuda includes
fix cuda warnings.
fix complex compile error
Revert "Improved polymorphism of interfaces for MatSetValuesBlocked()"
Bib: Updated ref
Doc: More function documentation
petscvec: move PetscSFCreateFromZero from vscat to vec sources
Mat: obey options prefix of Mat in MatNullSpaceTest
Plex+SNES: Must pass user context through
vscat: move ftn-custom to correct location remove custom vecscatterdestroy_()
vscat: move interface routines to correct location
vscat: delete dead code
fix compile error
FE: Correct coordinates in IntegrateBd
Bib: Added refs
SNES ex17: 3D tests must require a 3D grid generator
Plex+TS: We cannot run the check with the same vector that is the TS solution
...

Conflicts:
include/petsc/private/dmpleximpl.h
src/docs/website/documentation/changes/dev.html
src/snes/examples/tutorials/ex13.c
src/snes/utils/dmplexsnes.c

show more ...

Merge branch 'master' into arcowie-rem/feature-error-logging

* master: (249 commits)
Bib: Added refs
Netcdf should always build netcdf-4 (needed for example by exodusii.
trivial fixes of incor

Merge branch 'master' into arcowie-rem/feature-error-logging

* master: (249 commits)
Bib: Added refs
Netcdf should always build netcdf-4 (needed for example by exodusii.
trivial fixes of incorrect formatting in SNES linesearch routines
ISSetBlockSize_General: removed blockwise contiguity check.
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out
config prefix: avoid ad-hoc path substitutions
config/install: no need to rename paths for installBinDir
rules: fix path in (evidently unimportant) uncrustify target
config pkgconfig: use ${prefix} in PETSc.pc and do not modify in install
fix gcov obj path
Improved polymorphism of interfaces for MatSetValuesBlocked()
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Dev manual: remove duplicate entry
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
...

show more ...

Merge branch 'master' into knepley/feature-plex-functionals

* master: (984 commits)
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out

Merge branch 'master' into knepley/feature-plex-functionals

* master: (984 commits)
netcdf: set zlib as optional dependency corretly [wrt --enable-netcdf-4] - otherwise netcdf configure errors out
fix gcov obj path
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Dev manual: remove duplicate entry
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
Tao: Added alternative output for chwirut2 test.
TS ex45,ex46: Removed overly refined tests for faster nightly tests.
KSP ex72: Fixed needlessly long-running PCTFS tests.
SNES ex56: Reduced test size to speed up nightly test suite.
KSPSolve_LSQR: don't compute unused norm of rhs
SNES ex13: Reduced problem sizes for nightly tests.
PetscOptionsDeprecated(): fix for NULL prefix
PetscOptionsDeprecated(): add option to print additional info
SNES ex12: Reduced sizes for BDDC tests.
...

show more ...

Merge branch 'master' into knepley/feature-plex-elasticity-test

* master: (1553 commits)
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
config

Merge branch 'master' into knepley/feature-plex-elasticity-test

* master: (1553 commits)
-options_table was changed to options_view in 2014 but documentation was not updated to reflect it
configure: fix F2003 test
Plex test ex5: Removed "future" test, as it resulted in issues in the nightly tests.
Some minor typos in TS
Add ADIOS2.py which I forgot to git add in the past
Plex ex5: Disable test
Doc: Added note for interface change
KSPLSQRMonitorDefault fixed for quad precision
Tao: Added alternative output for chwirut2 test.
TS ex45,ex46: Removed overly refined tests for faster nightly tests.
KSP ex72: Fixed needlessly long-running PCTFS tests.
SNES ex56: Reduced test size to speed up nightly test suite.
KSPSolve_LSQR: don't compute unused norm of rhs
SNES ex13: Reduced problem sizes for nightly tests.
PetscOptionsDeprecated(): fix for NULL prefix
PetscOptionsDeprecated(): add option to print additional info
SNES ex12: Reduced sizes for BDDC tests.
PetscFileRetrieve(): Suppress output to STDERR when downloading a file.
MatMatMult: Fixed unused variable pN.
DMDestroy: Guard call to dm->ops->destroy * Similar guards are in place in many other methods (IS,Vec,Mat) and permit the DM to be destroyed even if DMSetType() was never called.
...

show more ...

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-parallel-submesh

* master: (2931 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComp

Merge branch 'master' into knepley/feature-plex-parallel-submesh

* master: (2931 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex type is missing from fortran
initialize variables so that static analyzer doesn't mistakenly think they are used uninitialized.
Move access of prefix until it is actually used
Remove DMDASplitComm2d(), used in one example that was not tested
Functions that do not return PetscErrorCode should not use PetscFunctionBegin/End paradgm
remove unneeded reassignment of same value
Missing CHKERRQ(); Mostly in Tao code
Remove clang static analyser warning about passing NULL variable to strncat()
missing newline in -ts_monitor_extreme
minor fixes for integer counters
Configure: Deal with '__func__' in C89 builds with newer Clang and GCC.
Jenkinsfile: Increased timeout for tests to 5 minutes.
3.9 changes: further clarify removal of -pc_factor_mat_solver_package
Options deprecations: add "PETSc" to inline warning
removing unused variable
MatShift support added to MATSUBMAT. Mimics MATSHELL functionality. Needed for matrix-free Hessians in TAO Newton-Line-Search methods.
Add -ts_monitor_extreme
Dev manual: add note on deprecating options database keys
...

Conflicts:
src/dm/impls/plex/examples/tests/ex4.c

show more ...

Merge branch 'master' into knepley/fix-plex-submesh-projection

* master: (425 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex

Merge branch 'master' into knepley/fix-plex-submesh-projection

* master: (425 commits)
remove N in docs for SNESQN
replaced test tolerance with PETSC_SQRT_MACHINE_EPSILON
fortran: PetscComplex type is missing from fortran
initialize variables so that static analyzer doesn't mistakenly think they are used uninitialized.
Move access of prefix until it is actually used
Remove DMDASplitComm2d(), used in one example that was not tested
Functions that do not return PetscErrorCode should not use PetscFunctionBegin/End paradgm
remove unneeded reassignment of same value
Missing CHKERRQ(); Mostly in Tao code
Remove clang static analyser warning about passing NULL variable to strncat()
missing newline in -ts_monitor_extreme
minor fixes for integer counters
Configure: Deal with '__func__' in C89 builds with newer Clang and GCC.
Jenkinsfile: Increased timeout for tests to 5 minutes.
3.9 changes: further clarify removal of -pc_factor_mat_solver_package
Options deprecations: add "PETSc" to inline warning
removing unused variable
MatShift support added to MATSUBMAT. Mimics MATSHELL functionality. Needed for matrix-free Hessians in TAO Newton-Line-Search methods.
Add -ts_monitor_extreme
Dev manual: add note on deprecating options database keys
...

Conflicts:
src/dm/impls/plex/examples/tests/ex4.c

show more ...

initialize variables so that static analyzer doesn't mistakenly think they are used uninitialized.

Commit-type: testing-fix
Reported-by: clang static analyzer

Merge branch 'master' into knepley/feature-pc-patch

* master: (562 commits)
fix clang-analyzer warning
Developers manual never use system randomizers in PETSc and example source code.
missing

Merge branch 'master' into knepley/feature-pc-patch

* master: (562 commits)
fix clang-analyzer warning
Developers manual never use system randomizers in PETSc and example source code.
missing CHKERRQ()
DT: Reverting the tgamma change broke MPFR - I guess we need a nightly build with it in
Add a test for ex21
Fix error in ex21
Add missing fortran interface that handles null objects
DMComposite: add missing guards
MatPreallocate: fix overpreallocation of local rows
style fixes
MatView_MPI_DA: do not print twice the class prefix
MatSetOperation: stash the original MatView_XXX in the viewnative function pointer
DMCreateInterpolation_DA gracefully error instead of catching FPE signals
MatIncreaseOverlap: preserve communicator of index sets
MatMPIAIJ: fix indentation and missing CHKERRQ
ISBuildTwoSided: remove tabs and fix style
Fix documentation
PetscViewerDraw: fix unininitialized warning from valgrind
MatConvert_SeqAIJ_SeqBAIJ: remove error for non square matrices and add MAT_REUSE_MATRIX case
Mat: MAT_INPLACE_MATRIX can be used for transposition with rectangular matrices
...

Conflicts:
src/dm/dt/interface/dtfe.c
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexfem.c
src/snes/examples/tutorials/ex13.c
src/snes/examples/tutorials/ex62.c
src/snes/examples/tutorials/makefile
src/snes/examples/tutorials/output/ex62_18.out
src/snes/examples/tutorials/output/ex62_19.out
src/snes/examples/tutorials/output/ex62_20.out
src/snes/examples/tutorials/output/ex62_20_parmetis.out
src/snes/examples/tutorials/output/ex62_21.out
src/snes/examples/tutorials/output/ex62_22.out
src/snes/examples/tutorials/output/ex62_23.out
src/snes/examples/tutorials/output/ex62_24.out
src/snes/examples/tutorials/output/ex62_25.out
src/snes/examples/tutorials/output/ex62_26.out
src/snes/examples/tutorials/output/ex62_27.out
src/snes/examples/tutorials/output/ex62_28.out
src/snes/examples/tutorials/output/ex62_29.out
src/snes/examples/tutorials/output/ex62_2d_p3_1.out
src/snes/examples/tutorials/output/ex62_30.out
src/snes/examples/tutorials/output/ex62_31.out
src/snes/examples/tutorials/output/ex62_32.out
src/snes/examples/tutorials/output/ex62_33.out
src/snes/examples/tutorials/output/ex62_34.out
src/snes/examples/tutorials/output/ex62_35.out
src/snes/examples/tutorials/output/ex62_36.out
src/snes/examples/tutorials/output/ex62_pc_simple.out
src/snes/examples/tutorials/output/ex62_pc_simplec.out
src/snes/examples/tutorials/output/ex62_quad_q2p1_full.out
src/snes/examples/tutorials/output/ex62_quad_q2q1_full.out
src/snes/utils/dmplexsnes.c

show more ...

Merge branch 'master' into knepley/feature-error-logging

* master: (221 commits)
dashboard: count and list example compile failures like:
fix fix-pr879-jczhang-optimize-vecscatter-multi-copy
a

Merge branch 'master' into knepley/feature-error-logging

* master: (221 commits)
dashboard: count and list example compile failures like:
fix fix-pr879-jczhang-optimize-vecscatter-multi-copy
add manual page cross links for SNESLineSearchSetPostCheck() and related routines
fix help manual of MatCreateSubmatrices() Reported-by: Tim Steinhoff <kandanovian@gmail.com>
Add manual pages for PetscRealPart() and PetscImaginaryPart()
fix compile error with missing MPI_C_DOBULE_COMPLEX
fix typo Reported-by: Febrian Setianto <febrian.setianto@gmail.com>
plex tutorial ex5: updated test requirements
DMPlexLoad_HDF5_Xdmf_Internal: fix for complex PetscScalar.
DMPlexLoad_HDF5_Xdmf_Internal: fix for 64-bit PetscInt.
DMPlexBuildFromCellList_Internal: use DMPlexInvertCell_Internal (with PetscInt* arg)
petscviewer.h: removed notice which is no longer relevant
DMPlexCreateFromFile: document option
check only if PETSC_USE_DEBUG
DMPlexBuildFromCellList_Internal optionally inverts cells.
ex5: new test 4 with -compare without repartitioning
ex5: new test 3 using -compare
ex5: HDF5 write+read moved to separate function
ex5: option -format processed in ProcessOptions()
ex5: added missing hdf5 requirement
...

Conflicts:
include/petsclog.h

show more ...

Merge branch 'psanan/manpages-notes-newlines' [PR #932]

* psanan/manpages-notes-newlines:
A large number of man pages are improperly formatted because of the lack of a newline after "Notes:", "Fortr

Merge branch 'psanan/manpages-notes-newlines' [PR #932]

* psanan/manpages-notes-newlines:
A large number of man pages are improperly formatted because of the lack of a newline after "Notes:", "Fortran Notes:", or "Developer Notes:".
This batch adds those newlines, with 4 spaces of indentation afterwards.
The uniform indentation arguably makes the man pages a little less readable in the source itself,
but overall this hopefully has a large positive impact on the readability of the HTML pages.

show more ...

Man pages: add newlines after "Notes:"

This allows for proper formatting from sowing.

On OS X (using gsed, not the default BSD sed), from the PETSc root directory:

find src include -type f \(

Man pages: add newlines after "Notes:"

This allows for proper formatting from sowing.

On OS X (using gsed, not the default BSD sed), from the PETSc root directory:

find src include -type f \( -name "*.c" -or -name "*.h" -or -name "*.cxx" \) | xargs gsed -i 's/Notes\s*:\s*\(\w.*\)/Notes:\n \1/'

This adds a newline and 4 spaces whenever "Notes:" is followed by any "word" character, in any .c, .h, or .cxx file in src/ or include/

show more ...

Merge branch 'master' into knepley/feature-snes-ex13-spectral

* master: (2350 commits)
migrate warning fix from next-tmp
Revert "Remove dead code."
clarifying comment in the code
Remove dead

Merge branch 'master' into knepley/feature-snes-ex13-spectral

* master: (2350 commits)
migrate warning fix from next-tmp
Revert "Remove dead code."
clarifying comment in the code
Remove dead code.
Add JuMP citation
Copyedits and updates to developers manual
Add more protection to intrinsics
MPI: protect arguments in MPI macros
Add the missing conditionals for 64-bit build
Plex+VTK: Fix field type determination
Fix bug in name cleanup
Bib: Added ref
Plex+VTK: Fix field type determination
Plex: Updated test output - I am now hating this shit
forgot to save file after moving prototypes to petscsys.h
update Apple example project settings per Xcode
Two functions should actually be public, used, for example from Apple MacOS and iOS programs
includes should always be included relative to include directory
Apple removed old locations of docsets
SNES ex12: Updated test output
...

Conflicts:
src/snes/examples/tutorials/ex13.c

show more ...

Merge branch 'master' into knepley/feature-pc-patch

* master: (33 commits)
cleanup very ugly PCGAMG manual page
minor clarifications for VecScatterCreate() manual page
gcov: PETSC_ARCH is requ

Merge branch 'master' into knepley/feature-pc-patch

* master: (33 commits)
cleanup very ugly PCGAMG manual page
minor clarifications for VecScatterCreate() manual page
gcov: PETSC_ARCH is required onlyfor -run_gcov - and not for -merge_gcov [where it doesn't exist]
make clearer in help statements what --with-external-packages-dir is for.
Website: Added news entry for PETSc User Meeting 2018 on main page.
KSPGUESSPOD: exclude negative of zero eigenvalues from the energy computation
KSPGUESSFISCHER: use PetscInfo for KSP class
CUDA: Further test output fixes for mat_tests-ex2
Turn off elemental test for parmetis running since this does not work on batch systems.
3.8 Changes: KSPCHEBYSHEV
CUDA: Fixed most test errors due to MatMultTranspose*
KSPFGMRES: add KSP_NORM_NONE / PC_RIGHT as supported
KSPSetSupportedNorm man page: remove old note about default support for KSP_NORM_NONE
Dev manual: copyedit
DMPlexDistributeLabels: Propagate the output flag
cuda/cusp: update minimum supported versions of cuda to 7.5 and cusp to 0.5.0
cuda: remove configure option -with-cuda-arch. [use CUDAFLAGS instead]
projected gradient code fixed to obey recent convergence test changed
Merge conflicts resolved after rebase
norm update bug fixed in GPGC, test output reverted
...

show more ...

Merge remote-tracking branch 'origin/knepley/fix-snes-ex69' into tisaac/feature-dmfield

* origin/knepley/fix-snes-ex69: (311 commits)
PetscFECreateDefault: fix custom Fortran interface to use MPI_

Merge remote-tracking branch 'origin/knepley/fix-snes-ex69' into tisaac/feature-dmfield

* origin/knepley/fix-snes-ex69: (311 commits)
PetscFECreateDefault: fix custom Fortran interface to use MPI_Comm
SNES ex69: Updated test output
SNES ex69: Removed all mantle stuff and change fields to constants - Also use dsymutil for executables
SNES ex69: Removed special partition
SNES ex69: Fixed null space creation - Null space locks its vectors
PetscFE: PetscFECreateDefault() now takes MPI_Comm instead of DM
cleanup very ugly PCGAMG manual page
minor clarifications for VecScatterCreate() manual page
gcov: PETSC_ARCH is required onlyfor -run_gcov - and not for -merge_gcov [where it doesn't exist]
make clearer in help statements what --with-external-packages-dir is for.
Website: Added news entry for PETSc User Meeting 2018 on main page.
CUDA: Further test output fixes for mat_tests-ex2
Turn off elemental test for parmetis running since this does not work on batch systems.
3.8 Changes: KSPCHEBYSHEV
CUDA: Fixed most test errors due to MatMultTranspose*
website: update urls
website: fix Jason's name to match pic. Also add Todd's pic
Dev manual: copyedit
DMPlexDistributeLabels: Propagate the output flag
cuda/cusp: update minimum supported versions of cuda to 7.5 and cusp to 0.5.0
...

show more ...

Merge branch 'denera/tao-convergence-check-fix' [PR #886]

* denera/tao-convergence-check-fix:
TaoMonitor no longer has double-duty for both monitoring and updating the converged reason.
The converge

Merge branch 'denera/tao-convergence-check-fix' [PR #886]

* denera/tao-convergence-check-fix:
TaoMonitor no longer has double-duty for both monitoring and updating the converged reason.
The convergence function is now called explicitly in the algorithms following the monitor call, mimicking the current implementation of SNES.

show more ...

fix propagated throughout, convergence tolerance bug discovered and fixed in toy problem