manual merge of conflict

Plex-Gmsh: Add custom Fortran wrapper for DMPlexCreateGmshFromFile

Three directory namespace changes for better --prefix install support

1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf

Three directory namespace changes for better --prefix install support

1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf and $PETSC_DIR/$PETSC_ARCH/conf become) lib/petsc-conf

show more ...

Merge branch 'master' into barry/ksp-converged-reason-viewer

Conflicts:
src/sys/objects/options.c

Merge branch 'knepley/fortran-plex-fromfile'

* knepley/fortran-plex-fromfile:
Plex: Added Fortran binding for DMPlexCreateFromFile()

Plex: Added Fortran binding for DMPlexCreateFromFile()

Merge branch 'master' of bitbucket.org:petsc/petsc

Merge branch 'knepley/feature-problem-class'

* knepley/feature-problem-class: (40 commits)
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove duplicate

Merge branch 'knepley/feature-problem-class'

* knepley/feature-problem-class: (40 commits)
PetscDS: Renamed from PetscProblem
ftn-types: fix compilers errors with PetscSection [remove duplicate code from petscvec*.h90]
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell refiner transform support
DMPlex ex3: Updated to Problem interface
DMDA: Fixed FE projection functions
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSection: Fortran bindings
DMPlex+HDF5: Had revered handedness of transformed periodic coordinates
DMPlex+HDF5: Preserve aspect ratio with remapping of periodic coordinates
DMPlex: Added missing declarations
Sys+DMDT: Added PetscValidFunction()
DMPlex: Fix for DMPlexProjectField()
DMPlex+HDF5: Selectively output fields for viz - Fields with NULL name are ignored
PetscSection: Allow NULL names
DMPlex: Fixes for DMPlexProjectField()
PetscProblem: Added scalar integral (objective function) - Added PetscProblemGet/SetObjective() - Used in PetscFEIntegrate() - Reworked PetscProblemEnlarge_Static()
DM+DT: Adding Fortran bindings
PetscViewer: Added HDF_VIZ format to names
...

show more ...

Merge branch 'knepley/feature-problem-class' into knepley/feature-quad-fas

* knepley/feature-problem-class: (38 commits)
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell r

Merge branch 'knepley/feature-problem-class' into knepley/feature-quad-fas

* knepley/feature-problem-class: (38 commits)
PetscSection: Fix Fortran datatypes support
DMPlex: Added quads to cell refiner transform support
DMPlex ex3: Updated to Problem interface
DMDA: Fixed FE projection functions
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSection: Fortran bindings
DMPlex+HDF5: Had revered handedness of transformed periodic coordinates
DMPlex+HDF5: Preserve aspect ratio with remapping of periodic coordinates
DMPlex: Added missing declarations
Sys+DMDT: Added PetscValidFunction()
DMPlex: Fix for DMPlexProjectField()
DMPlex+HDF5: Selectively output fields for viz - Fields with NULL name are ignored
PetscSection: Allow NULL names
DMPlex: Fixes for DMPlexProjectField()
PetscProblem: Added scalar integral (objective function) - Added PetscProblemGet/SetObjective() - Used in PetscFEIntegrate() - Reworked PetscProblemEnlarge_Static()
DM+DT: Adding Fortran bindings
PetscViewer: Added HDF_VIZ format to names
PetscFE+OpenCL: Make more respectable elasticity
PetscFE+OpenCL: Add flag for printing kernel
...

show more ...

Merge branch 'knepley/feature-problem-class' into knepley/fix-fe-gpu

* knepley/feature-problem-class: (34 commits)
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSecti

Merge branch 'knepley/feature-problem-class' into knepley/fix-fe-gpu

* knepley/feature-problem-class: (34 commits)
PetscSection: Fixes for Fortran stubs
DMPlex+TS+Doc: Function docs
PetscSection: Fortran bindings
DMPlex+HDF5: Had revered handedness of transformed periodic coordinates
DMPlex+HDF5: Preserve aspect ratio with remapping of periodic coordinates
DMPlex: Added missing declarations
Sys+DMDT: Added PetscValidFunction()
DMPlex: Fix for DMPlexProjectField()
DMPlex+HDF5: Selectively output fields for viz - Fields with NULL name are ignored
PetscSection: Allow NULL names
DMPlex: Fixes for DMPlexProjectField()
PetscProblem: Added scalar integral (objective function) - Added PetscProblemGet/SetObjective() - Used in PetscFEIntegrate() - Reworked PetscProblemEnlarge_Static()
DM+DT: Adding Fortran bindings
PetscViewer: Added HDF_VIZ format to names
PetscFE+OpenCL: Make more respectable elasticity
PetscFE+OpenCL: Add flag for printing kernel
DMPlex: Fixes to DMPlexProjectField()
PetscFE: Fix work arrays
PetscFE+OpenCL: Fix interface updates
DMDT: Fix complex problems
...

show more ...

DM+DT: Adding Fortran bindings

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
gfortran: remove 132 char limit from f90 free-form
SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc
DMPlex-Gmsh: Use trueNumCells when building the coordinate section
Sys: Got guard logic reversed
Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*()
PetscFV: I hate fucking complex
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
fix test of DMLocalToGlobalBegin/End and add actual test cases
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed
owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt
another reuse of allocated array in 2d/3d DMDA create
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
PetscFV: Another complex fix
DMPlex+TS: Fixing types
ISIdentity() was wrong for block IS! Indices are NOT scaled by bs
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
...

show more ...

Merge branch 'master' into barry/saws-options

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c

show more ...

Merge remote-tracking branch 'origin/master' into feature-dmmoab

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this wa

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this was really bad)
outdated example that doesn't match coding style removed and buggy
petscversion.h: workaround ifort -cpp lack of referential transparency
configure: ignore AR, MAKEFLAGS [if set in env]
incorrect first entry in array being zeroed in example
sizeof.c: remove dependence on petsc [and fix syntax error]
nightlybuilds: use consistant PETSC_ARCH, machine names
TS: Allow viewing of TS solutions
DMPlex: Fix comparison for complex
change MPIVersion streams to use MPI_Wtime() to be portable to Windows do not use scalar square root on real number; it upsets Microsoft
cannot use I in PETSc code because in complex it sometimes represents imaginary number cannot pass PetscScalar * to VecNorm()
in dashboard don't warn about SSL and BOI deprecated
TS ex11: Fixed output formatting
Doc+DMPlex: Added function documentation for some refinement functions
streams: translate code from 'bash' to 'sh' [fix freebsd]
barry is an idiot who doesn't have a clue as to what he is doing (and git's unfriendlyness doesn't help matters)
don't list examples under C that don't work with complex!
forgotten output file
removed valgrind warning about sending uninitialized data
nightly builds ignore unrecognized pragma and .c file as C++ code
...

Conflicts:
include/petsc-private/dmpleximpl.h

show more ...

Merge branch 'master' of bitbucket.org:petsc/petsc
Fuck if git tells me to git pull then I pull, if you want me to do something else than have git tell what to do

Merge branch 'knepley/feature-plex-periodic'

* knepley/feature-plex-periodic:
TS: Allow viewing of TS solutions
DMPlex: Fix comparison for complex
Draw: Fixed bad check
SNES ex62: Enhance ex

Merge branch 'knepley/feature-plex-periodic'

* knepley/feature-plex-periodic:
TS: Allow viewing of TS solutions
DMPlex: Fix comparison for complex
Draw: Fixed bad check
SNES ex62: Enhance ex62 to use tensor-product cells
DMPlex: Now we are correctly creating the Mobius band - Coordinates for uniform refinement are still broken
DMPlex: If domain is periodic, uniform refinement of coordinates will respect this
DMPlex: Allow geometry routines to recognize periodic quads
DMPlex: Added DMPlexLocalizeCoordinates() - This pulls coordinates from vertices to the cell, which allows discontinuities - We use this for periodic problems
DM: Added preliminary support for periodic coordinates - Added DMGet/SetPeriodicity() which is for clipping coordinates to a periodic box
DMPlex: Needed a custom Fortran wrapper for DMPlexInterpolate() because now we require that the incoming mesh be NULL
DMPlex: Fix handling of Fortran NULLs
DMPlex: Updated test output - The DMView was changed
SNES ex12: Cleanup structure - Use PetscFECreateDefault()
PetscFE: Added a view for Basic
SNES ex12: Starting to cleanup test names
SNES ex62: Marked MF tests as broken

show more ...

DMPlex: Needed a custom Fortran wrapper for DMPlexInterpolate() because now we require that the incoming mesh be NULL

Merge branch 'master' into shri/ts-events

Conflicts:
src/ts/interface/ts.c

Merge branch 'master' into shri/feature-dm-circuit

Conflicts:
src/dm/impls/makefile

Merge branch 'master' into prbrune/snes-fascontinuation

Conflicts:
include/petscsnesfas.h

Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long

Conflicts:
src/ts/examples/tutorials/advection-dif

Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

show more ...

Merge branch 'master' into knepley/feature-dmda-section

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed tes

Merge branch 'master' into knepley/feature-dmda-section

* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed test output
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
...

Conflicts:
config/builder.py
include/petscdmda.h
src/dm/dt/interface/dtfe.c
src/dm/impls/da/dageometry.c
src/dm/impls/da/dalocal.c
src/dm/impls/plex/plexgeometry.c

show more ...