Merge authors:
Anders Logg <logg@glaurung>
Benjamin Kehlet (benjamik)
Fredrik Valdmanis (fredva)
Johan Hake (johan-hake)
Johannes Ring (johannr)
------------------------------------------------------------
revno: 6753 [merge]
committer: Anders Logg <logg@glaurung>
branch nick: dolfin
timestamp: Tue 2012-06-26 12:20:32 +0200
message:
Merge work on built-in plotting from lp:~simula-acdc/dolfin/dolfin-plot.
- Implemented by Fredrik Heffer Valdmanis and Benjamin Kehlet (and Logg).
- This add support for most of Viper's functionality in both C++ and Python.
- Viper has served us well but is now going into a well-deserved retirement.
removed:
demo/undocumented/plot/cpp/dolfin-2.xml.gz
dolfin/io/XMLFunctionPlotData.cpp
dolfin/io/XMLFunctionPlotData.h
dolfin/plot/FunctionPlotData.cpp
dolfin/plot/FunctionPlotData.h
site-packages/dolfin/common/donothing.py
added:
dolfin/plot/ExpressionWrapper.cpp
dolfin/plot/ExpressionWrapper.h
dolfin/plot/GenericVTKPlottable.h
dolfin/plot/VTKPlottableGenericFunction.cpp
dolfin/plot/VTKPlottableGenericFunction.h
dolfin/plot/VTKPlottableMesh.cpp
dolfin/plot/VTKPlottableMesh.h
dolfin/plot/VTKPlottableMeshFunction.h
dolfin/plot/VTKPlotter.cpp
dolfin/plot/VTKPlotter.h
renamed:
demo/undocumented/plot/python/dolfin-2.xml.gz => demo/undocumented/plot/dolfin-2.xml.gz
modified:
AUTHORS
CMakeLists.txt
demo/undocumented/plot/cpp/main.cpp
demo/undocumented/plot/python/demo_plot.py
dolfin/CMakeLists.txt
dolfin/io/GenericFile.cpp
dolfin/io/GenericFile.h
dolfin/io/XMLFile.cpp
dolfin/io/XMLFile.h
dolfin/parameter/GlobalParameters.h
dolfin/plot/dolfin_plot.h
dolfin/plot/plot.cpp
dolfin/plot/plot.h
dolfin/swig/forwarddeclarations.i
dolfin/swig/generateswigcode.py
dolfin/swig/io/post.i
dolfin/swig/la/docstrings.i
dolfin/swig/la/imports.i
dolfin/swig/la/includes.i
dolfin/swig/la/local_imports.i
dolfin/swig/mesh/docstrings.i
dolfin/swig/mesh/imports.i
dolfin/swig/mesh/includes.i
dolfin/swig/mesh/local_imports.i
dolfin/swig/modules/common/headers.txt
dolfin/swig/modules/fem/headers.txt
dolfin/swig/modules/function/headers.txt
dolfin/swig/modules/io/headers.txt
dolfin/swig/modules/la/headers.txt
dolfin/swig/modules/mesh/headers.txt
dolfin/swig/plot/docstrings.i
dolfin/swig/plot/imports.i
dolfin/swig/plot/includes.i
dolfin/swig/plot/local_imports.i
dolfin/swig/shared_ptr_classes.i
site-packages/dolfin/common/__init__.py
site-packages/dolfin/common/plotting.py
The size of the diff (4007 lines) is larger than your specified limit of 500 lines
--
lp:dolfin
https://code.launchpad.net/~dolfin-core/dolfin/trunk
Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/trunk/+edit-subscription