From: maier Date: Sat, 29 Sep 2012 22:49:08 +0000 (+0000) Subject: Cleanup in contrib X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37718f475f39fa55d74aade6d1ff7aeeb99421cd;p=dealii-svn.git Cleanup in contrib git-svn-id: https://svn.dealii.org/branches/branch_cmake@26884 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/TODO.CMAKE b/deal.II/TODO.CMAKE index 1f2add31aa..07280ccdbf 100644 --- a/deal.II/TODO.CMAKE +++ b/deal.II/TODO.CMAKE @@ -5,6 +5,8 @@ Major: * Add the rest of the Bug tests +* Bump functionparser to version 4.5 + * The following features have to be written: * MUMPS * SLEPC diff --git a/deal.II/cmake/configure/configure_1_tbb.cmake b/deal.II/cmake/configure/configure_1_tbb.cmake index 1b040d93ab..fd44c39b35 100644 --- a/deal.II/cmake/configure/configure_1_tbb.cmake +++ b/deal.II/cmake/configure/configure_1_tbb.cmake @@ -125,7 +125,7 @@ SET(FEATURE_TBB_HAVE_CONTRIB TRUE) MACRO(FEATURE_TBB_CONFIGURE_CONTRIB var) - SET(tbb_folder "${CMAKE_SOURCE_DIR}/contrib/tbb/tbb30_104oss") + SET(tbb_folder "${CMAKE_SOURCE_DIR}/contrib/tbb30_104oss") # # Setup threading (before configuring our build...) diff --git a/deal.II/contrib/README.contrib b/deal.II/contrib/README.contrib new file mode 100644 index 0000000000..f962480b72 --- /dev/null +++ b/deal.II/contrib/README.contrib @@ -0,0 +1,76 @@ +This folder contains third party projects bundled with deal.II + +PLEASE NOTE THAT THESE PROJECTS ARE COPYRIGHTED BY OTHERS THAN THE deal.II +AUTHORS, but are included by permission. For details, consult the stated +licenses below. + +Below is a detailed list of the content of each subdirectory, and the +licenses that apply. + + +boost-1.49.0 +============ + +Contains parts of the boost c++ libraries copyrighted by the boost authors +and licensed under the Boost Software License Version 1.0. See +boost-1.49.0/LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt + +A full version of the library can be downloaded at http://www.boost.org/. + + +functionparser (TODO: for fparser4.5) +============== + +Contains the functionparser project which copyrighted by Juha Nieminen and +licensed under the GNU Lesser General Public License (LGPL) Version 3. +See functionparser/README, functionparser/lgpl-3.0.txt or +http://warp.povusers.org/FunctionParser/ + +A full version of the functionparser project can be downloaded at +http://warp.povusers.org/FunctionParser/. + + +mesh_conversion (TODO -> move to utilities) +=============== + +Is a program originally written by Jean-Paul Pelteret and licensed under +the GNU General Public License (GPL) Version 2.0. See +mesh_conversion/README.txt, mesh_conversion/gpl-2.0.txt. + +TODO: A homepage. + + +parameter_gui (TODO -> move to utilities) +============= + +Is a program written by Martin Steigemann and Wolfgang Bangerth and +licensed under the GNU Lesser General Public License (LGPL) Version 2.1 or +later. See parameter_gui/README, parameter_gui/lgpl-2.1.txt. + +TODO: A homepage. + + +./tbb30_104oss +============== + +Contains parts of the Intel Threading Building Blocks library copyrighted +by the respective authors and licensed under the GNU General Public License +(GPL) Version 2.0 with a runtime exception. See tbb30_104oss/COPYING or +http://threadingbuildingblocks.org/. + +A full version of the tbb project can be downloaded at +http://threadingbuildingblocks.org/. + + +./umfpack (UMFPACK 5.0.2, AMD 2.2, UFCONFIG) +========= + +Contains parts of the UMFPACK, AMD and UFCONFIG libraries copyrighted by +Timothy A. Davis, Patrick R. Amestoy, and Iain S. Duff and licensed under +the GNU Lesser General Public Licensse version 2.1 or later. Or alternative +licenses as explained in umfpack/UMFPACK/Doc/License and +umfpack/AMD/Doc/License. See umfpack/README.txt and umfpack/lgpl-2.1.txt. + +A full version of UMFPACK can be downloaded at +http://www.cise.ufl.edu/research/sparse/umfpack/. + diff --git a/deal.II/contrib/boost-1.49.0/LICENSE_1_0.txt b/deal.II/contrib/boost-1.49.0/LICENSE_1_0.txt new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/deal.II/contrib/boost-1.49.0/LICENSE_1_0.txt @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/deal.II/contrib/dx/README b/deal.II/contrib/dx/README deleted file mode 100644 index f22e2f2066..0000000000 --- a/deal.II/contrib/dx/README +++ /dev/null @@ -1,27 +0,0 @@ -================================================== -= Networks for IBM Open Visualization Data Explorer -================================================== - -Information on OpenDX: - - -http://www.research.ibm.com/dx/ - -================================================== - -Structure of this directory: - -single: visualization for files with all components in a - single data vector - -single/scalar.net: - extract one scalar from the data vector and visualize by - shading and isolines - - - -License -================================================== -The files in this directory are under the same license -as the main part of the library. See doc/license.html -for details. diff --git a/deal.II/contrib/dx/grid.cfg b/deal.II/contrib/dx/grid.cfg deleted file mode 100644 index 746a65c0da..0000000000 --- a/deal.II/contrib/dx/grid.cfg +++ /dev/null @@ -1,55 +0,0 @@ -// -// time: Thu May 2 18:01:00 2002 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// Message Window: -// window: position = (0.0000,0.6895), size = 0.4781x0.2568 -// -// panel[0]: position = (0.0000,0.0039), size = 0.2930x0.4395, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 205, height = 206 -// layout: snap = 0, width = 50, height = 50, align = NN -// -// interactor FileSelector[1]: num_components = 1, value = "grid.dx" -// instance: panel = 0, x = 9, y = 9, style = FileSelector, vertical = 1, size = 196x57 -// -// interactor Selector[3]: num_components = 1, value = 0 -// selections: maximum = 2, current = 0 -// option[0]: name = "cells", value = 0 -// option[1]: name = "faces", value = 1 -// instance: panel = 0, x = 12, y = 80, style = Option Menu, vertical = 1, size = 102x58 -// -// interactor Selector[2]: num_components = 1, value = 3 -// selections: maximum = 5, current = 3 -// option[0]: name = "boundary", value = 0 -// option[1]: name = "material", value = 1 -// option[2]: name = "level", value = 2 -// option[3]: name = "diameter", value = 3 -// option[4]: name = "measure", value = 4 -// instance: panel = 0, x = 8, y = 148, style = Option Menu, vertical = 1, size = 134x58 -// -// node Image[1]: -// depth: value = 24 -// window: position = (0.0281,0.3271), size = 0.5109x0.5117 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 1 -// input[5]: defaulting = 0, value = [0 0 0] -// input[6]: defaulting = 0, value = [0 0 7.10757] -// input[7]: defaulting = 0, value = 3.80895 -// input[8]: defaulting = 0, value = 640 -// input[9]: defaulting = 0, value = 0.750781 -// input[10]: defaulting = 0, value = [0 1 0] -// input[11]: defaulting = 1, value = 30.0001 -// input[12]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 1, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 1, value = 1 -// input[18]: defaulting = 1, value = 1 -// input[19]: defaulting = 0, value = 0 -// input[22]: defaulting = 0, value = "white" -// input[29]: defaulting = 1, value = 0 -// internal caching: 1 -// interaction mode = NONE diff --git a/deal.II/contrib/dx/grid.net b/deal.II/contrib/dx/grid.net deleted file mode 100644 index 3580f0a7cb..0000000000 --- a/deal.II/contrib/dx/grid.net +++ /dev/null @@ -1,647 +0,0 @@ -// -// time: Thu May 2 18:01:00 2002 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// workspace: width = 342, height = 598 -// layout: snap = 0, width = 50, height = 50, align = NN -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 31, y = 10, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "grid.dx" - // output[2]: visible = 1, type = 32, value = "grid.dx" - // - // - // node Import[1]: x = 28, y = 80, inputs = 6, label = Import - // input[2]: visible = 0 - // input[3]: visible = 0 - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Selector[3]: x = 162, y = 12, inputs = 7, label = Selector - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Selector_3" - // input[2]: defaulting = 0, visible = 0, type = 32, value = "cells" - // input[3]: defaulting = 0, visible = 0, type = 29, value = 0 - // input[4]: defaulting = 0, visible = 1, type = 16777248, value = {"cells" "faces" } - // input[5]: defaulting = 1, visible = 0, type = 16777245, value = {0 1 } - // output[1]: visible = 1, type = 29, value = 0 - // output[2]: visible = 1, type = 32, value = "cells" - // -main_Selector_3_out_1[cache: 2], -main_Selector_3_out_2[cache: 2] = - Selector( - main_Selector_3_in_1, - main_Selector_3_in_2, - main_Selector_3_in_3, - main_Selector_3_in_4, - main_Selector_3_in_5, - main_Selector_3_in_6, - main_Selector_3_in_7 - ) [instance: 3, cache: 1]; - // - // node Select[2]: x = 101, y = 148, inputs = 3, label = Select - // -main_Select_2_out_1 = - Select( - main_Import_1_out_1, - main_Selector_3_out_2, - main_Select_2_in_3 - ) [instance: 2, cache: 1]; - // - // node Selector[2]: x = 278, y = 12, inputs = 7, label = Selector - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Selector_2" - // input[2]: defaulting = 0, visible = 0, type = 32, value = "diameter" - // input[3]: defaulting = 0, visible = 0, type = 29, value = 3 - // input[4]: defaulting = 0, visible = 1, type = 16777248, value = {"boundary" "material" "level" "diameter" "measure" } - // input[5]: defaulting = 1, visible = 0, type = 16777245, value = {0 1 2 3 4 } - // output[1]: visible = 1, type = 29, value = 3 - // output[2]: visible = 1, type = 32, value = "diameter" - // -main_Selector_2_out_1[cache: 2], -main_Selector_2_out_2[cache: 2] = - Selector( - main_Selector_2_in_1, - main_Selector_2_in_2, - main_Selector_2_in_3, - main_Selector_2_in_4, - main_Selector_2_in_5, - main_Selector_2_in_6, - main_Selector_2_in_7 - ) [instance: 2, cache: 1]; - // - // node Replace[1]: x = 140, y = 245, inputs = 4, label = Replace - // input[3]: defaulting = 1, visible = 1, type = 32, value = "boundary" - // input[4]: visible = 0 - // -main_Replace_1_out_1 = - Replace( - main_Select_2_out_1, - main_Select_2_out_1, - main_Selector_2_out_2, - main_Replace_1_in_4 - ) [instance: 1, cache: 1]; - // - // node AutoColor[1]: x = 54, y = 327, inputs = 10, label = AutoColor - // input[7]: defaulting = 1, visible = 0, type = 5, value = NULL - // -main_AutoColor_1_out_1, -main_AutoColor_1_out_2 = - AutoColor( - main_Replace_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node ColorBar[1]: x = 203, y = 395, inputs = 16, label = ColorBar - // input[2]: visible = 0 - // input[3]: visible = 0 - // input[4]: visible = 0 - // input[8]: visible = 0 - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_ColorBar_1_in_6, - main_ColorBar_1_in_7, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[2]: x = 161, y = 467, inputs = 2, label = Collect - // -main_Collect_2_out_1 = - Collect( - main_AutoColor_1_out_1, - main_ColorBar_1_out_1 - ) [instance: 2, cache: 1]; - // - // node Image[1]: x = 152, y = 536, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [0 0 0] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [0 0 7.10757] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 3.80895 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 640 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.750781 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 30.0001 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[29]: defaulting = 1, visible = 0, type = 3, value = 0 - // depth: value = 24 - // window: position = (0.0281,0.3271), size = 0.5109x0.5117 - // internal caching: 1 - // interaction mode = NONE - // -main_Image_1_out_1, -main_Image_1_out_2, -main_Image_1_out_3 = - Image( - main_Image_1_in_1, - main_Collect_2_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "grid.dx"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Selector_3_in_1 = "Selector_3"; -main_Selector_3_in_2 = "cells" ; -main_Selector_3_in_3 = 0 ; -main_Selector_3_in_4 = {"cells" "faces" }; -main_Selector_3_in_5 = NULL; -main_Selector_3_in_6 = NULL; -main_Selector_3_in_7 = NULL; -main_Selector_3_out_2 = "cells" ; -main_Select_2_in_3 = NULL; -main_Select_2_out_1 = NULL; -main_Selector_2_in_1 = "Selector_2"; -main_Selector_2_in_2 = "diameter" ; -main_Selector_2_in_3 = 3 ; -main_Selector_2_in_4 = {"boundary" "material" "level" "diameter" "measure" }; -main_Selector_2_in_5 = NULL; -main_Selector_2_in_6 = NULL; -main_Selector_2_in_7 = NULL; -main_Selector_2_out_2 = "diameter" ; -main_Replace_1_in_4 = NULL; -main_Replace_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_ColorBar_1_in_2 = NULL; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = NULL; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_6 = NULL; -main_ColorBar_1_in_7 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = NULL; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_2_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [0 0 0]; -main_Image_1_in_6 = [0 0 7.10757]; -main_Image_1_in_7 = 3.80895; -main_Image_1_in_8 = 640; -main_Image_1_in_9 = 0.750781; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = NULL; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = NULL; -main_Image_1_in_30 = NULL; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = NULL; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = NULL; -main_Image_1_in_37 = NULL; -main_Image_1_in_38 = NULL; -main_Image_1_in_39 = NULL; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = NULL; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/dx/grid_boundary.cfg b/deal.II/contrib/dx/grid_boundary.cfg deleted file mode 100644 index 04eef9d62a..0000000000 --- a/deal.II/contrib/dx/grid_boundary.cfg +++ /dev/null @@ -1,46 +0,0 @@ -// -// time: Wed Dec 19 15:41:09 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// Message Window: -// window: position = (0.4922,0.6895), size = 0.4781x0.2568 -// -// panel[0]: position = (0.1930,0.3730), size = 0.2930x0.4395, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 216, height = 161 -// layout: snap = 0, width = 50, height = 50, align = NN -// -// interactor FileSelector[2]: num_components = 1, value = NULL -// instance: panel = 0, x = 20, y = 23, style = FileSelector, vertical = 1, size = 196x57 -// -// interactor Scalar[1]: num_components = 1, value = 0.5 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0 -// instance: panel = 0, x = 21, y = 105, style = Stepper, vertical = 1, size = 166x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// node Image[1]: -// depth: value = 24 -// window: position = (0.4500,0.3291), size = 0.5109x0.5117 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 0 -// input[5]: defaulting = 1, value = [0 0 0] -// input[6]: defaulting = 1, value = [6.81977 -3.672 -3.97284] -// input[7]: defaulting = 0, value = 4.66499 -// input[8]: defaulting = 0, value = 640 -// input[9]: defaulting = 0, value = 0.750781 -// input[10]: defaulting = 1, value = [0 1 0] -// input[11]: defaulting = 1, value = 30.0001 -// input[12]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 1, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 1, value = 1 -// input[18]: defaulting = 1, value = 1 -// input[19]: defaulting = 0, value = 0 -// input[22]: defaulting = 0, value = "white" -// input[29]: defaulting = 1, value = 0 -// input[41]: defaulting = 0, value = "rotate" -// internal caching: 1 diff --git a/deal.II/contrib/dx/grid_boundary.net b/deal.II/contrib/dx/grid_boundary.net deleted file mode 100644 index 799c7dfbe2..0000000000 --- a/deal.II/contrib/dx/grid_boundary.net +++ /dev/null @@ -1,564 +0,0 @@ -// -// time: Wed Dec 19 15:41:09 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// workspace: width = 500, height = 606 -// layout: snap = 1, width = 50, height = 50, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[2]: x = 31, y = 44, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = NULL - // output[2]: visible = 1, type = 32, value = NULL - // - // - // node Import[1]: x = 39, y = 144, inputs = 6, label = Import - // -main_Import_1_out_1 = - Import( - main_FileSelector_2_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node ShowConnections[1]: x = 9, y = 244, inputs = 1, label = ShowConnections - // -main_ShowConnections_1_out_1 = - ShowConnections( - main_Import_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Color[1]: x = 39, y = 344, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // -main_Color_1_out_1 = - Color( - main_ShowConnections_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node ShowBoundary[1]: x = 169, y = 244, inputs = 2, label = ShowBoundary - // -main_ShowBoundary_1_out_1 = - ShowBoundary( - main_Import_1_out_1, - main_ShowBoundary_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Scalar[1]: x = 400, y = 44, inputs = 11, label = Scalar - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Scalar_1" - // input[3]: defaulting = 0, visible = 0, type = 5, value = 0.5 - // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0 - // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 5 - // output[1]: visible = 1, type = 5, value = 0.5 - // - // - // node Color[2]: x = 239, y = 344, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "red" - // input[3]: defaulting = 1, visible = 1, type = 5, value = .5 - // -main_Color_2_out_1 = - Color( - main_ShowBoundary_1_out_1, - main_Color_2_in_2, - main_Scalar_1_out_1, - main_Color_2_in_4, - main_Color_2_in_5 - ) [instance: 2, cache: 1]; - // - // node Collect[1]: x = 148, y = 444, inputs = 2, label = Collect - // -main_Collect_1_out_1 = - Collect( - main_Color_1_out_1, - main_Color_2_out_1 - ) [instance: 1, cache: 1]; - // - // node Image[1]: x = 139, y = 544, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[5]: defaulting = 1, visible = 0, type = 8, value = [0 0 0] - // input[6]: defaulting = 1, visible = 0, type = 8, value = [6.81977 -3.672 -3.97284] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 4.66499 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 640 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.750781 - // input[10]: defaulting = 1, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 30.0001 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[29]: defaulting = 1, visible = 0, type = 3, value = 0 - // input[41]: defaulting = 0, visible = 0, type = 32, value = "rotate" - // depth: value = 24 - // window: position = (0.4500,0.3291), size = 0.5109x0.5117 - // internal caching: 1 - // -main_Image_1_out_1, -main_Image_1_out_2, -main_Image_1_out_3 = - Image( - main_Image_1_in_1, - main_Collect_1_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_2_out_1 = NULL; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_ShowConnections_1_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_ShowBoundary_1_in_2 = NULL; -main_ShowBoundary_1_out_1 = NULL; -main_Scalar_1_in_1 = "Scalar_1"; -main_Scalar_1_in_2 = NULL; -main_Scalar_1_in_3 = 0.5 ; -main_Scalar_1_in_4 = NULL; -main_Scalar_1_in_5 = NULL; -main_Scalar_1_in_6 = NULL; -main_Scalar_1_in_7 = NULL; -main_Scalar_1_in_8 = NULL; -main_Scalar_1_in_9 = NULL; -main_Scalar_1_in_10 = NULL; -main_Scalar_1_in_11 = NULL; -main_Scalar_1_out_1 = 0.5 ; -main_Color_2_in_2 = "red"; -main_Color_2_in_4 = NULL; -main_Color_2_in_5 = NULL; -main_Color_2_out_1 = NULL; -main_Collect_1_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 0; -main_Image_1_in_5 = NULL; -main_Image_1_in_6 = NULL; -main_Image_1_in_7 = 4.66499; -main_Image_1_in_8 = 640; -main_Image_1_in_9 = 0.750781; -main_Image_1_in_10 = NULL; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = NULL; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = NULL; -main_Image_1_in_30 = NULL; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = NULL; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = NULL; -main_Image_1_in_37 = NULL; -main_Image_1_in_38 = NULL; -main_Image_1_in_39 = NULL; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = "rotate"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/dx/grid_simple.cfg b/deal.II/contrib/dx/grid_simple.cfg deleted file mode 100644 index f2a7eb8f45..0000000000 --- a/deal.II/contrib/dx/grid_simple.cfg +++ /dev/null @@ -1,18 +0,0 @@ -// -// time: Fri Dec 14 14:44:51 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// interactor FileSelector[1]: num_components = 1, value = NULL -// -// node Image[1]: -// depth: value = 24 -// window: position = (0.4500,0.3291), size = 0.5109x0.5127 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[19]: defaulting = 0, value = 0 -// input[22]: defaulting = 0, value = "white" -// internal caching: 1 -// interaction mode = NONE diff --git a/deal.II/contrib/dx/grid_simple.net b/deal.II/contrib/dx/grid_simple.net deleted file mode 100644 index 6b19544a69..0000000000 --- a/deal.II/contrib/dx/grid_simple.net +++ /dev/null @@ -1,493 +0,0 @@ -// -// time: Fri Dec 14 14:44:51 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// workspace: width = 292, height = 506 -// layout: snap = 1, width = 50, height = 50, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 181, y = 44, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = NULL - // output[2]: visible = 1, type = 32, value = NULL - // - // - // node Import[1]: x = 189, y = 144, inputs = 6, label = Import - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node ShowConnections[1]: x = 159, y = 244, inputs = 1, label = ShowConnections - // -main_ShowConnections_1_out_1 = - ShowConnections( - main_Import_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Color[1]: x = 189, y = 344, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // -main_Color_1_out_1 = - Color( - main_ShowConnections_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node Image[1]: x = 189, y = 444, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // depth: value = 24 - // window: position = (0.4500,0.3291), size = 0.5109x0.5127 - // internal caching: 1 - // interaction mode = NONE - // -main_Image_1_out_1, -main_Image_1_out_2, -main_Image_1_out_3 = - Image( - main_Image_1_in_1, - main_Color_1_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = NULL; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_ShowConnections_1_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 0; -main_Image_1_in_5 = NULL; -main_Image_1_in_6 = NULL; -main_Image_1_in_7 = NULL; -main_Image_1_in_8 = NULL; -main_Image_1_in_9 = NULL; -main_Image_1_in_10 = NULL; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = NULL; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = NULL; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = NULL; -main_Image_1_in_30 = NULL; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = NULL; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = NULL; -main_Image_1_in_37 = NULL; -main_Image_1_in_38 = NULL; -main_Image_1_in_39 = NULL; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = NULL; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/dx/single/rubbergrid.cfg b/deal.II/contrib/dx/single/rubbergrid.cfg deleted file mode 100644 index 4cf683b8ef..0000000000 --- a/deal.II/contrib/dx/single/rubbergrid.cfg +++ /dev/null @@ -1,59 +0,0 @@ -// -// time: Mon Dec 3 11:20:30 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// panel[0]: position = (0.6477,0.0303), size = 0.3047x0.2666, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 196, height = 216 -// layout: snap = 1, width = 50, height = 50, align = NL -// -// interactor FileSelector[1]: num_components = 1, value = "/home/people/kanschat/c/deal.II/gk/n/T.04.dx" -// instance: panel = 0, x = 0, y = 6, style = FileSelector, vertical = 1, size = 196x57 -// filter = /home/kanschat/deal.II/gk/n/*.dx -// -// interactor Integer[1]: num_components = 1, value = 3 -// component[0]: minimum = 0, maximum = 6, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 89, style = Stepper, vertical = 1, size = 118x56 -// label: value = Component: -// local continuous: value = 1, mode = local -// local increment[0]: value = 1, mode = global -// -// interactor Scalar[1]: num_components = 1, value = -0.5 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 5, global continuous = 0 -// instance: panel = 0, x = 0, y = 160, style = Stepper, vertical = 1, size = 166x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// node Image[1]: -// depth: value = 8 -// window: position = (0.1422,0.1650), size = 0.6180x0.7227 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 1 -// input[5]: defaulting = 0, value = [0.5 0.5 0.3927] -// input[6]: defaulting = 0, value = [0.495799 -2.79439 1.23819] -// input[7]: defaulting = 1, value = 1.82268 -// input[8]: defaulting = 0, value = 777 -// input[9]: defaulting = 0, value = 0.896396 -// input[10]: defaulting = 0, value = [-0.164473 0.2454 0.955368] -// input[11]: defaulting = 0, value = 30.0 -// input[12]: defaulting = 0, value = 1 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 0, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 0, value = 1 -// input[18]: defaulting = 0, value = 1 -// input[19]: defaulting = 0, value = 1 -// input[22]: defaulting = 0, value = "white" -// input[26]: defaulting = 0, value = "eps color dpi=65 orient=landscape" -// input[29]: defaulting = 0, value = 1 -// input[30]: defaulting = 0, value = {"x", "y", "z"} -// input[33]: defaulting = 0, value = 0 -// input[36]: defaulting = 0, value = 0 -// input[37]: defaulting = 0, value = {"blue", "grey5", "black", "black"} -// input[38]: defaulting = 0, value = {"background", "grid", "ticks", "labels"} -// input[39]: defaulting = 0, value = 0.5 -// input[41]: defaulting = 0, value = "rotate" -// internal caching: 1 diff --git a/deal.II/contrib/dx/single/rubbergrid.net b/deal.II/contrib/dx/single/rubbergrid.net deleted file mode 100644 index fe120b3e38..0000000000 --- a/deal.II/contrib/dx/single/rubbergrid.net +++ /dev/null @@ -1,891 +0,0 @@ -// -// time: Mon Dec 3 11:20:30 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// page assignment: Color order=3, windowed=0, showing=1 -// page assignment: Display order=4, windowed=0, showing=0 -// page assignment: Input order=2, windowed=0, showing=0 -// workspace: width = 435, height = 551 -// layout: snap = 1, width = 50, height = 80, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 331, y = 9, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "/home/people/kanschat/c/deal.II/gk/n/T.04.dx" - // output[2]: visible = 1, type = 32, value = "T.04.dx" - // page group: Input - // - // - // node Import[1]: x = 39, y = 89, inputs = 6, label = Import - // page group: Input - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Extract[1]: x = 198, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_1_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Inquire[1]: x = 189, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // input[3]: defaulting = 1, visible = 1, type = 32, value = NULL - // page group: Input - // -main_Inquire_1_out_1 = - Inquire( - main_Extract_1_out_1, - main_Inquire_1_in_2, - main_Inquire_1_in_3 - ) [instance: 1, cache: 1]; - // - // node Integer[1]: x = 141, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_1" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 3 - // input[4]: visible = 1 - // input[5]: defaulting = 0, visible = 1, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 6 - // input[7]: defaulting = 1, visible = 1, type = 5, value = 1.0 - // input[8]: visible = 1 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // input[11]: defaulting = 1, visible = 1, type = 32, value = "Component select" - // output[1]: visible = 1, type = 1, value = 3 - // page group: Input - // -main_Integer_1_out_1[cache: 2] = - Integer( - main_Integer_1_in_1, - main_Integer_1_in_2, - main_Integer_1_in_3, - main_Integer_1_in_4, - main_Integer_1_in_5, - main_Inquire_1_out_1, - main_Integer_1_in_7, - main_Integer_1_in_8, - main_Integer_1_in_9, - main_Integer_1_in_10, - main_Integer_1_in_11 - ) [instance: 1, cache: 1]; - // - // node Compute[1]: x = 41, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "select($0,$1)" - // page group: Input - // expression: value = select(a,b) - // name[2]: value = a - // name[3]: value = b - // -main_Compute_1_out_1[cache: 0] = - Compute( - main_Compute_1_in_1, - main_Import_1_out_1, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[1]: x = 38, y = 489, inputs = 1, label = data_input - // page group: Input - // -data_input = main_Compute_1_out_1; - // - // node Receiver[1]: x = 238, y = 9, inputs = 1, label = data_input - // page group: Color - // -main_Receiver_1_out_1[cache: 0] = data_input; - // - // node Scalar[1]: x = 100, y = 9, inputs = 11, label = Scalar - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Scalar_1" - // input[3]: defaulting = 0, visible = 0, type = 5, value = -0.5 - // input[5]: defaulting = 1, visible = 0, type = 5, value = -1000000.0 - // input[6]: defaulting = 1, visible = 0, type = 5, value = 1000000.0 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 5 - // output[1]: visible = 1, type = 5, value = -0.5 - // page group: Color - // - // - // node RubberSheet[1]: x = 126, y = 89, inputs = 4, label = RubberSheet - // input[2]: defaulting = 1, visible = 1, type = 5, value = NULL - // page group: Color - // -main_RubberSheet_1_out_1 = - RubberSheet( - main_Receiver_1_out_1, - main_Scalar_1_out_1, - main_RubberSheet_1_in_3, - main_RubberSheet_1_in_4 - ) [instance: 1, cache: 1]; - // - // node AutoColor[1]: x = 236, y = 169, inputs = 10, label = AutoColor - // input[2]: defaulting = 1, visible = 0, type = 5, value = NULL - // page group: Color - // -main_AutoColor_1_out_1[cache: 0], -main_AutoColor_1_out_2[cache: 0] = - AutoColor( - main_RubberSheet_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node Format[1]: x = 398, y = 409, inputs = 3, label = Format - // input[1]: defaulting = 0, visible = 0, type = 32, value = "%s: %d" - // page group: Input - // -main_Format_1_out_1 = - Format( - main_Format_1_in_1, - main_FileSelector_1_out_2, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[2]: x = 411, y = 489, inputs = 1, label = title - // page group: Input - // -title = main_Format_1_out_1; - // - // node Receiver[3]: x = 361, y = 9, inputs = 1, label = title - // page group: Display - // -main_Receiver_3_out_1[cache: 0] = title; - // - // node Caption[1]: x = 345, y = 89, inputs = 9, label = Caption - // input[2]: defaulting = 0, visible = 1, type = 8, value = [.5 .01] - // page group: Display - // -main_Caption_1_out_1 = - Caption( - main_Receiver_3_out_1, - main_Caption_1_in_2, - main_Caption_1_in_3, - main_Caption_1_in_4, - main_Caption_1_in_5, - main_Caption_1_in_6, - main_Caption_1_in_7, - main_Caption_1_in_8, - main_Caption_1_in_9 - ) [instance: 1, cache: 1]; - // - // node Isosurface[1]: x = 86, y = 169, inputs = 6, label = Isosurface - // input[3]: defaulting = 0, visible = 1, type = 1, value = 20 - // page group: Color - // -main_Isosurface_1_out_1 = - Isosurface( - main_RubberSheet_1_out_1, - main_Isosurface_1_in_2, - main_Isosurface_1_in_3, - main_Isosurface_1_in_4, - main_Isosurface_1_in_5, - main_Isosurface_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Color[2]: x = 89, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // page group: Color - // -main_Color_2_out_1 = - Color( - main_Isosurface_1_out_1, - main_Color_2_in_2, - main_Color_2_in_3, - main_Color_2_in_4, - main_Color_2_in_5 - ) [instance: 2, cache: 1]; - // - // node Collect[3]: x = 148, y = 329, inputs = 2, label = Collect - // page group: Color - // -main_Collect_3_out_1 = - Collect( - main_Color_2_out_1, - main_AutoColor_1_out_1 - ) [instance: 3, cache: 1]; - // - // node Statistics[2]: x = 315, y = 89, inputs = 1, label = Statistics - // page group: Color - // -main_Statistics_2_out_1, -main_Statistics_2_out_2, -main_Statistics_2_out_3, -main_Statistics_2_out_4, -main_Statistics_2_out_5 = - Statistics( - main_Receiver_1_out_1 - ) [instance: 2, cache: 1]; - // - // node ColorBar[1]: x = 339, y = 249, inputs = 16, label = ColorBar - // input[2]: defaulting = 0, visible = 0, type = 8, value = [0.99 0.5] - // input[3]: visible = 0 - // input[4]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[6]: visible = 1 - // input[7]: visible = 1 - // input[8]: defaulting = 0, visible = 0, type = 32, value = NULL - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // input[11]: defaulting = 0, visible = 0, type = 5, value = .9 - // input[14]: defaulting = 1, visible = 0, type = 16777248, value = NULL - // page group: Color - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_Statistics_2_out_4, - main_Statistics_2_out_5, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 248, y = 409, inputs = 2, label = Collect - // page group: Color - // -main_Collect_1_out_1 = - Collect( - main_Collect_3_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Receiver[4]: x = 38, y = 9, inputs = 1, label = data_input - // page group: Display - // -main_Receiver_4_out_1[cache: 0] = data_input; - // - // node ShowConnections[1]: x = 59, y = 89, inputs = 1, label = ShowConnections - // page group: Display - // -main_ShowConnections_1_out_1 = - ShowConnections( - main_Receiver_4_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[3]: x = 253, y = 489, inputs = 1, label = image - // page group: Color - // -image = main_Collect_1_out_1; - // - // node Receiver[2]: x = 153, y = 9, inputs = 1, label = image - // page group: Display - // -main_Receiver_2_out_1[cache: 0] = image; - // - // node Collect[4]: x = 248, y = 169, inputs = 2, label = Collect - // page group: Display - // -main_Collect_4_out_1 = - Collect( - main_ShowConnections_1_out_1, - main_Receiver_2_out_1 - ) [instance: 4, cache: 1]; - // - // node Color[1]: x = 353, y = 169, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 0, type = 32, value = "black" - // input[3]: visible = 0 - // page group: Display - // -main_Color_1_out_1 = - Color( - main_Caption_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node Collect[2]: x = 248, y = 249, inputs = 2, label = Collect - // page group: Display - // -main_Collect_2_out_1 = - Collect( - main_Collect_4_out_1, - main_Color_1_out_1 - ) [instance: 2, cache: 1]; - // - // node Image[1]: x = 239, y = 329, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [0.5 0.5 0.3927] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [0.495799 -2.79439 1.23819] - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.82268 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 777 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.896396 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [-0.164473 0.2454 0.955368] - // input[11]: defaulting = 0, visible = 0, type = 5, value = 30.0 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 0, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "eps color dpi=65 orient=landscape" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[30]: defaulting = 0, visible = 0, type = 16777248, value = {"x", "y", "z"} - // input[33]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"blue", "grey5", "black", "black"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.5 - // input[41]: defaulting = 0, visible = 0, type = 32, value = "rotate" - // page group: Display - // depth: value = 8 - // window: position = (0.1422,0.1650), size = 0.6180x0.7227 - // internal caching: 1 - // -main_Image_1_out_1[cache: 0], -main_Image_1_out_2[cache: 0], -main_Image_1_out_3[cache: 0] = - Image( - main_Image_1_in_1, - main_Collect_2_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = NULL; -main_FileSelector_1_out_2 = NULL; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Extract_1_in_2 = NULL; -main_Extract_1_out_1 = NULL; -main_Inquire_1_in_2 = "shape"; -main_Inquire_1_in_3 = NULL; -main_Inquire_1_out_1 = NULL; -main_Integer_1_in_1 = "Integer_1"; -main_Integer_1_in_2 = NULL; -main_Integer_1_in_3 = 3; -main_Integer_1_in_4 = NULL; -main_Integer_1_in_5 = 0; -main_Integer_1_in_7 = NULL; -main_Integer_1_in_8 = NULL; -main_Integer_1_in_9 = NULL; -main_Integer_1_in_10 = NULL; -main_Integer_1_in_11 = NULL; -main_Integer_1_out_1 = 3; -main_Compute_1_in_1 = "select($0,$1)"; -main_Compute_1_out_1 = NULL; -main_Transmitter_1_out_1 = NULL; -main_Receiver_1_out_1 = NULL; -main_Scalar_1_in_1 = "Scalar_1"; -main_Scalar_1_in_2 = NULL; -main_Scalar_1_in_3 = -0.5 ; -main_Scalar_1_in_4 = NULL; -main_Scalar_1_in_5 = NULL; -main_Scalar_1_in_6 = NULL; -main_Scalar_1_in_7 = NULL; -main_Scalar_1_in_8 = NULL; -main_Scalar_1_in_9 = NULL; -main_Scalar_1_in_10 = NULL; -main_Scalar_1_in_11 = NULL; -main_Scalar_1_out_1 = -0.5 ; -main_RubberSheet_1_in_3 = NULL; -main_RubberSheet_1_in_4 = NULL; -main_RubberSheet_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_Format_1_in_1 = "%s: %d"; -main_Format_1_out_1 = NULL; -main_Transmitter_2_out_1 = NULL; -main_Receiver_3_out_1 = NULL; -main_Caption_1_in_2 = [.5 .01]; -main_Caption_1_in_3 = NULL; -main_Caption_1_in_4 = NULL; -main_Caption_1_in_5 = NULL; -main_Caption_1_in_6 = NULL; -main_Caption_1_in_7 = NULL; -main_Caption_1_in_8 = NULL; -main_Caption_1_in_9 = NULL; -main_Caption_1_out_1 = NULL; -main_Isosurface_1_in_2 = NULL; -main_Isosurface_1_in_3 = 20; -main_Isosurface_1_in_4 = NULL; -main_Isosurface_1_in_5 = NULL; -main_Isosurface_1_in_6 = NULL; -main_Isosurface_1_out_1 = NULL; -main_Color_2_in_2 = "black"; -main_Color_2_in_3 = NULL; -main_Color_2_in_4 = NULL; -main_Color_2_in_5 = NULL; -main_Color_2_out_1 = NULL; -main_Collect_3_out_1 = NULL; -main_Statistics_2_out_4 = NULL; -main_Statistics_2_out_5 = NULL; -main_ColorBar_1_in_2 = [0.99 0.5]; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = 0; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = .9; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -main_Receiver_4_out_1 = NULL; -main_ShowConnections_1_out_1 = NULL; -main_Transmitter_3_out_1 = NULL; -main_Receiver_2_out_1 = NULL; -main_Collect_4_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_Collect_2_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X8,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [0.5 0.5 0.3927]; -main_Image_1_in_6 = [0.495799 -2.79439 1.23819]; -main_Image_1_in_7 = NULL; -main_Image_1_in_8 = 777; -main_Image_1_in_9 = 0.896396; -main_Image_1_in_10 = [-0.164473 0.2454 0.955368]; -main_Image_1_in_11 = 30.0; -main_Image_1_in_12 = 1; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = "none"; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = 1; -main_Image_1_in_18 = 1; -main_Image_1_in_19 = 1; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = "eps color dpi=65 orient=landscape"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 1; -main_Image_1_in_30 = {"x", "y", "z"}; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 0; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 0; -main_Image_1_in_37 = {"blue", "grey5", "black", "black"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.5; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = "rotate"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/dx/single/scalar.cfg b/deal.II/contrib/dx/single/scalar.cfg deleted file mode 100644 index e29a67d660..0000000000 --- a/deal.II/contrib/dx/single/scalar.cfg +++ /dev/null @@ -1,55 +0,0 @@ -// -// time: Sun Feb 22 22:08:26 2004 -// -// version: 3.1.2 (format), 4.2.0 (DX) -// -// Message Window: -// window: position = (0.5149,0.0038), size = 0.4780x0.2571 -// -// panel[0]: position = (0.6202,0.5886), size = 0.3048x0.2667, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 196, height = 145 -// layout: snap = 1, width = 50, height = 50, align = NL -// -// interactor FileSelector[1]: num_components = 1, value = "/home/kanschat/deal.II/gk/n/slug.04.dx" -// instance: panel = 0, x = 0, y = 6, style = FileSelector, vertical = 1, size = 196x57 -// filter = *.dx -// -// interactor Integer[1]: num_components = 1, value = 2 -// component[0]: minimum = 0, maximum = 4, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 89, style = Stepper, vertical = 1, size = 118x56 -// label: value = Component: -// local continuous: value = 1, mode = local -// local increment[0]: value = 1, mode = global -// -// node Image[1]: -// depth: value = 24 -// window: position = (0.0000,0.1333), size = 0.5196x0.6552 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 1 -// input[5]: defaulting = 0, value = [0.5 1 0] -// input[6]: defaulting = 0, value = [0.5 1 7.10757] -// input[7]: defaulting = 0, value = 3.80895 -// input[8]: defaulting = 0, value = 859 -// input[9]: defaulting = 0, value = 0.75 -// input[10]: defaulting = 0, value = [0 1 0] -// input[11]: defaulting = 0, value = 30.0001 -// input[12]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 1, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 1, value = 1 -// input[18]: defaulting = 1, value = 1 -// input[19]: defaulting = 0, value = 0 -// input[22]: defaulting = 0, value = "white" -// input[26]: defaulting = 0, value = "eps color dpi=65 orient=landscape" -// input[29]: defaulting = 0, value = 0 -// input[30]: defaulting = 0, value = {"x", "y", "z"} -// input[33]: defaulting = 0, value = 0 -// input[36]: defaulting = 0, value = 0 -// input[37]: defaulting = 0, value = {"blue", "grey5", "black", "black"} -// input[38]: defaulting = 0, value = {"background", "grid", "ticks", "labels"} -// input[39]: defaulting = 0, value = 0.5 -// input[41]: defaulting = 0, value = "none" -// internal caching: 1 diff --git a/deal.II/contrib/dx/single/scalar.net b/deal.II/contrib/dx/single/scalar.net deleted file mode 100644 index b26967831e..0000000000 --- a/deal.II/contrib/dx/single/scalar.net +++ /dev/null @@ -1,828 +0,0 @@ -// -// time: Sun Feb 22 22:08:26 2004 -// -// version: 3.1.2 (format), 4.2.0 (DX) -// -// -// MODULE main -// page assignment: Color order=3, windowed=0, showing=1 -// page assignment: Display order=4, windowed=0, showing=0 -// page assignment: Input order=2, windowed=0, showing=0 -// workspace: width = 435, height = 551 -// layout: snap = 1, width = 50, height = 80, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 331, y = 9, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "/home/kanschat/deal.II/gk/n/slug.04.dx" - // output[2]: visible = 1, type = 32, value = "slug.04.dx" - // page group: Input - // - // - // node Import[1]: x = 39, y = 89, inputs = 6, label = Import - // page group: Input - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Extract[1]: x = 198, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_1_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Inquire[1]: x = 189, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // input[3]: defaulting = 1, visible = 1, type = 32, value = NULL - // page group: Input - // -main_Inquire_1_out_1 = - Inquire( - main_Extract_1_out_1, - main_Inquire_1_in_2, - main_Inquire_1_in_3 - ) [instance: 1, cache: 1]; - // - // node Integer[1]: x = 141, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_1" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 2 - // input[4]: visible = 1 - // input[5]: defaulting = 0, visible = 1, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 4 - // input[7]: defaulting = 1, visible = 1, type = 5, value = 1.0 - // input[8]: visible = 1 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // input[11]: defaulting = 1, visible = 1, type = 32, value = "Component select" - // output[1]: visible = 1, type = 1, value = 2 - // page group: Input - // -main_Integer_1_out_1[cache: 2] = - Integer( - main_Integer_1_in_1, - main_Integer_1_in_2, - main_Integer_1_in_3, - main_Integer_1_in_4, - main_Integer_1_in_5, - main_Inquire_1_out_1, - main_Integer_1_in_7, - main_Integer_1_in_8, - main_Integer_1_in_9, - main_Integer_1_in_10, - main_Integer_1_in_11 - ) [instance: 1, cache: 1]; - // - // node Compute[1]: x = 41, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "select($0,$1)" - // page group: Input - // expression: value = select(a,b) - // name[2]: value = a - // name[3]: value = b - // -main_Compute_1_out_1[cache: 0] = - Compute( - main_Compute_1_in_1, - main_Import_1_out_1, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[1]: x = 38, y = 489, inputs = 1, label = data_input - // page group: Input - // -data_input = main_Compute_1_out_1; - // - // node Receiver[1]: x = 238, y = 9, inputs = 1, label = data_input - // page group: Color - // -main_Receiver_1_out_1[cache: 0] = data_input; - // - // node AutoColor[1]: x = 186, y = 89, inputs = 10, label = AutoColor - // input[2]: defaulting = 1, visible = 0, type = 5, value = NULL - // page group: Color - // -main_AutoColor_1_out_1[cache: 0], -main_AutoColor_1_out_2[cache: 0] = - AutoColor( - main_Receiver_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node Format[1]: x = 398, y = 409, inputs = 3, label = Format - // input[1]: defaulting = 0, visible = 0, type = 32, value = "%s: %d" - // page group: Input - // -main_Format_1_out_1 = - Format( - main_Format_1_in_1, - main_FileSelector_1_out_2, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[2]: x = 411, y = 489, inputs = 1, label = title - // page group: Input - // -title = main_Format_1_out_1; - // - // node Receiver[3]: x = 361, y = 9, inputs = 1, label = title - // page group: Display - // -main_Receiver_3_out_1[cache: 0] = title; - // - // node Caption[1]: x = 345, y = 89, inputs = 9, label = Caption - // input[2]: defaulting = 0, visible = 1, type = 8, value = [.5 .01] - // page group: Display - // -main_Caption_1_out_1 = - Caption( - main_Receiver_3_out_1, - main_Caption_1_in_2, - main_Caption_1_in_3, - main_Caption_1_in_4, - main_Caption_1_in_5, - main_Caption_1_in_6, - main_Caption_1_in_7, - main_Caption_1_in_8, - main_Caption_1_in_9 - ) [instance: 1, cache: 1]; - // - // node Isosurface[1]: x = 86, y = 169, inputs = 6, label = Isosurface - // input[3]: defaulting = 0, visible = 1, type = 1, value = 10 - // page group: Color - // -main_Isosurface_1_out_1 = - Isosurface( - main_Receiver_1_out_1, - main_Isosurface_1_in_2, - main_Isosurface_1_in_3, - main_Isosurface_1_in_4, - main_Isosurface_1_in_5, - main_Isosurface_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Color[2]: x = 89, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // page group: Color - // -main_Color_2_out_1 = - Color( - main_Isosurface_1_out_1, - main_Color_2_in_2, - main_Color_2_in_3, - main_Color_2_in_4, - main_Color_2_in_5 - ) [instance: 2, cache: 1]; - // - // node Collect[3]: x = 148, y = 329, inputs = 2, label = Collect - // page group: Color - // -main_Collect_3_out_1 = - Collect( - main_Color_2_out_1, - main_AutoColor_1_out_1 - ) [instance: 3, cache: 1]; - // - // node Statistics[2]: x = 315, y = 89, inputs = 1, label = Statistics - // page group: Color - // -main_Statistics_2_out_1, -main_Statistics_2_out_2, -main_Statistics_2_out_3, -main_Statistics_2_out_4, -main_Statistics_2_out_5 = - Statistics( - main_Receiver_1_out_1 - ) [instance: 2, cache: 1]; - // - // node ColorBar[1]: x = 339, y = 249, inputs = 16, label = ColorBar - // input[2]: defaulting = 0, visible = 0, type = 8, value = [0.99 0.5] - // input[3]: visible = 0 - // input[4]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[6]: visible = 1 - // input[7]: visible = 1 - // input[8]: defaulting = 0, visible = 0, type = 32, value = NULL - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // input[11]: defaulting = 0, visible = 0, type = 5, value = .9 - // input[14]: defaulting = 1, visible = 0, type = 16777248, value = NULL - // page group: Color - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_Statistics_2_out_4, - main_Statistics_2_out_5, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 248, y = 409, inputs = 2, label = Collect - // page group: Color - // -main_Collect_1_out_1 = - Collect( - main_Collect_3_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[3]: x = 253, y = 489, inputs = 1, label = image - // page group: Color - // -image = main_Collect_1_out_1; - // - // node Receiver[2]: x = 153, y = 9, inputs = 1, label = image - // page group: Display - // -main_Receiver_2_out_1[cache: 0] = image; - // - // node Color[1]: x = 353, y = 169, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 0, type = 32, value = "black" - // input[3]: visible = 0 - // page group: Display - // -main_Color_1_out_1 = - Color( - main_Caption_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node Collect[2]: x = 248, y = 249, inputs = 2, label = Collect - // page group: Display - // -main_Collect_2_out_1 = - Collect( - main_Receiver_2_out_1, - main_Color_1_out_1 - ) [instance: 2, cache: 1]; - // - // node Image[1]: x = 239, y = 329, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [0.5 1 0] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [0.5 1 7.10757] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 3.80895 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 859 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.75 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 0, visible = 0, type = 5, value = 30.0001 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "eps color dpi=65 orient=landscape" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[30]: defaulting = 0, visible = 0, type = 16777248, value = {"x", "y", "z"} - // input[33]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"blue", "grey5", "black", "black"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.5 - // input[41]: defaulting = 0, visible = 0, type = 32, value = "none" - // page group: Display - // depth: value = 24 - // window: position = (0.0000,0.1333), size = 0.5196x0.6552 - // internal caching: 1 - // -main_Image_1_out_1[cache: 0], -main_Image_1_out_2[cache: 0], -main_Image_1_out_3[cache: 0] = - Image( - main_Image_1_in_1, - main_Collect_2_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "/home/kanschat/deal.II/gk/n/slug.04.dx"; -main_FileSelector_1_out_2 = "slug.04.dx"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Extract_1_in_2 = NULL; -main_Extract_1_out_1 = NULL; -main_Inquire_1_in_2 = "shape"; -main_Inquire_1_in_3 = NULL; -main_Inquire_1_out_1 = NULL; -main_Integer_1_in_1 = "Integer_1"; -main_Integer_1_in_2 = NULL; -main_Integer_1_in_3 = 2; -main_Integer_1_in_4 = NULL; -main_Integer_1_in_5 = 0; -main_Integer_1_in_7 = NULL; -main_Integer_1_in_8 = NULL; -main_Integer_1_in_9 = NULL; -main_Integer_1_in_10 = NULL; -main_Integer_1_in_11 = NULL; -main_Integer_1_out_1 = 2; -main_Compute_1_in_1 = "select($0,$1)"; -main_Compute_1_out_1 = NULL; -main_Transmitter_1_out_1 = NULL; -main_Receiver_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_Format_1_in_1 = "%s: %d"; -main_Format_1_out_1 = NULL; -main_Transmitter_2_out_1 = NULL; -main_Receiver_3_out_1 = NULL; -main_Caption_1_in_2 = [.5 .01]; -main_Caption_1_in_3 = NULL; -main_Caption_1_in_4 = NULL; -main_Caption_1_in_5 = NULL; -main_Caption_1_in_6 = NULL; -main_Caption_1_in_7 = NULL; -main_Caption_1_in_8 = NULL; -main_Caption_1_in_9 = NULL; -main_Caption_1_out_1 = NULL; -main_Isosurface_1_in_2 = NULL; -main_Isosurface_1_in_3 = 10; -main_Isosurface_1_in_4 = NULL; -main_Isosurface_1_in_5 = NULL; -main_Isosurface_1_in_6 = NULL; -main_Isosurface_1_out_1 = NULL; -main_Color_2_in_2 = "black"; -main_Color_2_in_3 = NULL; -main_Color_2_in_4 = NULL; -main_Color_2_in_5 = NULL; -main_Color_2_out_1 = NULL; -main_Collect_3_out_1 = NULL; -main_Statistics_2_out_4 = NULL; -main_Statistics_2_out_5 = NULL; -main_ColorBar_1_in_2 = [0.99 0.5]; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = 0; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = .9; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -main_Transmitter_3_out_1 = NULL; -main_Receiver_2_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_Collect_2_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X24,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [0.5 1 0]; -main_Image_1_in_6 = [0.5 1 7.10757]; -main_Image_1_in_7 = 3.80895; -main_Image_1_in_8 = 859; -main_Image_1_in_9 = 0.75; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = 30.0001; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = "eps color dpi=65 orient=landscape"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 0; -main_Image_1_in_30 = {"x", "y", "z"}; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 0; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 0; -main_Image_1_in_37 = {"blue", "grey5", "black", "black"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.5; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = "none"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 2 0"); -$sync -main(); diff --git a/deal.II/contrib/dx/single/stokes.cfg b/deal.II/contrib/dx/single/stokes.cfg deleted file mode 100644 index 0ade10731a..0000000000 --- a/deal.II/contrib/dx/single/stokes.cfg +++ /dev/null @@ -1,81 +0,0 @@ -// -// time: Mon Dec 10 11:47:01 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// panel[0]: position = (0.6430,0.5078), size = 0.2945x0.3984, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 326, height = 226 -// layout: snap = 1, width = 50, height = 50, align = NL -// -// panel[1]: position = (0.0000,0.5068), size = 0.2930x0.4395, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 123, height = 61 -// layout: snap = 0, width = 50, height = 50, align = NN -// -// interactor FileSelector[1]: num_components = 1, value = "/home/atlas2/kanschat/c/deal.II/gk/n/T.00.dx" -// instance: panel = 0, x = 0, y = 6, style = FileSelector, vertical = 1, size = 196x57 -// filter = *.dx -// -// interactor Integer[1]: num_components = 1, value = 6 -// component[0]: minimum = 0, maximum = 14, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 89, style = Stepper, vertical = 1, size = 118x56 -// label: value = Pressure -// local continuous: value = 1, mode = local -// local increment[0]: value = 1, mode = global -// -// interactor Integer[2]: num_components = 1, value = 4 -// component[0]: minimum = 0, maximum = 14, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 1, x = 5, y = 5, style = Stepper, vertical = 1, size = 118x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// instance: panel = 0, x = 200, y = 87, style = Stepper, vertical = 1, size = 118x56 -// label: value = Velocity -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// interactor Integer[4]: num_components = 1, value = 200 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 200, y = 170, style = Stepper, vertical = 1, size = 126x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// interactor Integer[3]: num_components = 1, value = 1 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 170, style = Stepper, vertical = 1, size = 144x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// node Image[1]: -// depth: value = 8 -// window: position = (0.0000,0.1338), size = 0.9023x0.5967 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 1 -// input[5]: defaulting = 0, value = [1 0 0] -// input[6]: defaulting = 0, value = [1 0 23.9834] -// input[7]: defaulting = 0, value = 12.8527 -// input[8]: defaulting = 0, value = 1141 -// input[9]: defaulting = 0, value = 0.497 -// input[10]: defaulting = 0, value = [0 1 0] -// input[11]: defaulting = 1, value = 30.0001 -// input[12]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 1, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 1, value = 1 -// input[18]: defaulting = 1, value = 1 -// input[19]: defaulting = 0, value = 0 -// input[22]: defaulting = 0, value = "white" -// input[26]: defaulting = 0, value = "eps color dpi=65 orient=landscape" -// input[29]: defaulting = 0, value = 1 -// input[30]: defaulting = 0, value = {"x", "y", "z"} -// input[33]: defaulting = 0, value = 0 -// input[36]: defaulting = 0, value = 0 -// input[37]: defaulting = 0, value = {"blue", "grey5", "black", "black"} -// input[38]: defaulting = 0, value = {"background", "grid", "ticks", "labels"} -// input[39]: defaulting = 0, value = 0.5 -// input[41]: defaulting = 0, value = "none" -// internal caching: 1 diff --git a/deal.II/contrib/dx/single/stokes.net b/deal.II/contrib/dx/single/stokes.net deleted file mode 100644 index 553fe65c07..0000000000 --- a/deal.II/contrib/dx/single/stokes.net +++ /dev/null @@ -1,1016 +0,0 @@ -// -// time: Mon Dec 10 11:47:01 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// page assignment: Color order=2, windowed=0, showing=0 -// page assignment: Display order=4, windowed=0, showing=0 -// page assignment: Input order=1, windowed=0, showing=0 -// page assignment: vector order=3, windowed=0, showing=1 -// workspace: width = 353, height = 391 -// layout: snap = 1, width = 50, height = 80, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 331, y = 9, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "/home/atlas2/kanschat/c/deal.II/gk/n/T.00.dx" - // output[2]: visible = 1, type = 32, value = "T.00.dx" - // page group: Input - // - // - // node Import[1]: x = 39, y = 89, inputs = 6, label = Import - // page group: Input - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Extract[1]: x = 98, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_1_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Inquire[1]: x = 89, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // input[3]: defaulting = 1, visible = 1, type = 32, value = NULL - // page group: Input - // -main_Inquire_1_out_1 = - Inquire( - main_Extract_1_out_1, - main_Inquire_1_in_2, - main_Inquire_1_in_3 - ) [instance: 1, cache: 1]; - // - // node Integer[1]: x = 148, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_1" - // input[2]: visible = 0 - // input[3]: defaulting = 0, visible = 0, type = 1, value = 6 - // input[5]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 14 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // input[11]: defaulting = 0, visible = 0, type = 32, value = "Scalar component" - // output[1]: visible = 1, type = 1, value = 6 - // page group: Input - // -main_Integer_1_out_1[cache: 2] = - Integer( - main_Integer_1_in_1, - main_Integer_1_in_2, - main_Integer_1_in_3, - main_Integer_1_in_4, - main_Integer_1_in_5, - main_Inquire_1_out_1, - main_Integer_1_in_7, - main_Integer_1_in_8, - main_Integer_1_in_9, - main_Integer_1_in_10, - main_Integer_1_in_11 - ) [instance: 1, cache: 1]; - // - // node Compute[1]: x = 41, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "select($0,$1)" - // page group: Input - // expression: value = select(a,b) - // name[2]: value = a - // name[3]: value = b - // -main_Compute_1_out_1[cache: 0] = - Compute( - main_Compute_1_in_1, - main_Import_1_out_1, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[1]: x = 38, y = 489, inputs = 1, label = data_input - // page group: Input - // -data_input = main_Compute_1_out_1; - // - // node Receiver[1]: x = 238, y = 9, inputs = 1, label = data_input - // page group: Color - // -main_Receiver_1_out_1[cache: 0] = data_input; - // - // node AutoColor[1]: x = 186, y = 89, inputs = 10, label = AutoColor - // input[2]: defaulting = 1, visible = 0, type = 5, value = NULL - // page group: Color - // -main_AutoColor_1_out_1[cache: 0], -main_AutoColor_1_out_2[cache: 0] = - AutoColor( - main_Receiver_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node Extract[2]: x = 298, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_2_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_2_in_2 - ) [instance: 2, cache: 1]; - // - // node Inquire[2]: x = 289, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // page group: Input - // -main_Inquire_2_out_1 = - Inquire( - main_Extract_2_out_1, - main_Inquire_2_in_2, - main_Inquire_2_in_3 - ) [instance: 2, cache: 1]; - // - // node Integer[2]: x = 298, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_2" - // input[2]: visible = 0 - // input[3]: defaulting = 0, visible = 0, type = 1, value = 4 - // input[5]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 14 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 4 - // page group: Input - // -main_Integer_2_out_1[cache: 2] = - Integer( - main_Integer_2_in_1, - main_Integer_2_in_2, - main_Integer_2_in_3, - main_Integer_2_in_4, - main_Integer_2_in_5, - main_Inquire_2_out_1, - main_Integer_2_in_7, - main_Integer_2_in_8, - main_Integer_2_in_9, - main_Integer_2_in_10, - main_Integer_2_in_11 - ) [instance: 2, cache: 1]; - // - // node Compute[2]: x = 241, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "[select($0,$1), select($0,$1+1)]" - // page group: Input - // expression: value = [select(a,b), select(a,b+1)] - // name[2]: value = a - // name[3]: value = b - // -main_Compute_2_out_1 = - Compute( - main_Compute_2_in_1, - main_Import_1_out_1, - main_Integer_2_out_1 - ) [instance: 2, cache: 1]; - // - // node Transmitter[4]: x = 233, y = 489, inputs = 1, label = vector_input - // page group: Input - // -vector_input = main_Compute_2_out_1; - // - // node Receiver[4]: x = 133, y = 9, inputs = 1, label = vector_input - // page group: vector - // -main_Receiver_4_out_1[cache: 0] = vector_input; - // - // node Integer[4]: x = 298, y = 9, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_4" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 200 - // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000 - // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 200 - // page group: vector - // - // - // node Sample[1]: x = 197, y = 89, inputs = 2, label = Sample - // page group: vector - // -main_Sample_1_out_1 = - Sample( - main_Receiver_4_out_1, - main_Integer_4_out_1 - ) [instance: 1, cache: 1]; - // - // node AutoGlyph[1]: x = 165, y = 169, inputs = 7, label = AutoGlyph - // page group: vector - // -main_AutoGlyph_1_out_1 = - AutoGlyph( - main_Sample_1_out_1, - main_AutoGlyph_1_in_2, - main_AutoGlyph_1_in_3, - main_AutoGlyph_1_in_4, - main_AutoGlyph_1_in_5, - main_AutoGlyph_1_in_6, - main_AutoGlyph_1_in_7 - ) [instance: 1, cache: 1]; - // - // node Format[1]: x = 398, y = 409, inputs = 3, label = Format - // input[1]: defaulting = 0, visible = 0, type = 32, value = "%s: %d" - // page group: Input - // -main_Format_1_out_1 = - Format( - main_Format_1_in_1, - main_FileSelector_1_out_2, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[2]: x = 411, y = 489, inputs = 1, label = title - // page group: Input - // -title = main_Format_1_out_1; - // - // node Receiver[3]: x = 361, y = 9, inputs = 1, label = title - // page group: Display - // -main_Receiver_3_out_1[cache: 0] = title; - // - // node Caption[1]: x = 345, y = 89, inputs = 9, label = Caption - // input[2]: defaulting = 0, visible = 1, type = 8, value = [.5 .01] - // page group: Display - // -main_Caption_1_out_1 = - Caption( - main_Receiver_3_out_1, - main_Caption_1_in_2, - main_Caption_1_in_3, - main_Caption_1_in_4, - main_Caption_1_in_5, - main_Caption_1_in_6, - main_Caption_1_in_7, - main_Caption_1_in_8, - main_Caption_1_in_9 - ) [instance: 1, cache: 1]; - // - // node Integer[3]: x = 48, y = 9, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_3" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000 - // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 1 - // page group: Color - // - // - // node Isosurface[1]: x = 86, y = 169, inputs = 6, label = Isosurface - // input[3]: defaulting = 1, visible = 1, type = 1, value = 10 - // page group: Color - // -main_Isosurface_1_out_1 = - Isosurface( - main_Receiver_1_out_1, - main_Isosurface_1_in_2, - main_Integer_3_out_1, - main_Isosurface_1_in_4, - main_Isosurface_1_in_5, - main_Isosurface_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Color[2]: x = 89, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // page group: Color - // -main_Color_2_out_1 = - Color( - main_Isosurface_1_out_1, - main_Color_2_in_2, - main_Color_2_in_3, - main_Color_2_in_4, - main_Color_2_in_5 - ) [instance: 2, cache: 1]; - // - // node Statistics[2]: x = 315, y = 89, inputs = 1, label = Statistics - // page group: Color - // -main_Statistics_2_out_1, -main_Statistics_2_out_2, -main_Statistics_2_out_3, -main_Statistics_2_out_4, -main_Statistics_2_out_5 = - Statistics( - main_Receiver_1_out_1 - ) [instance: 2, cache: 1]; - // - // node ColorBar[1]: x = 339, y = 249, inputs = 16, label = ColorBar - // input[2]: defaulting = 0, visible = 0, type = 8, value = [0.99 0.5] - // input[3]: visible = 0 - // input[4]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[6]: visible = 1 - // input[7]: visible = 1 - // input[8]: defaulting = 0, visible = 0, type = 32, value = NULL - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // input[11]: defaulting = 0, visible = 0, type = 5, value = .9 - // input[14]: defaulting = 1, visible = 0, type = 16777248, value = NULL - // page group: Color - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_Statistics_2_out_4, - main_Statistics_2_out_5, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 239, y = 329, inputs = 3, label = Collect - // page group: Color - // -main_Collect_1_out_1 = - Collect( - main_Color_2_out_1, - main_AutoColor_1_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[3]: x = 253, y = 409, inputs = 1, label = image - // page group: Color - // -image = main_Collect_1_out_1; - // - // node Receiver[2]: x = 53, y = 9, inputs = 1, label = image - // page group: Display - // -main_Receiver_2_out_1[cache: 0] = image; - // - // node Color[3]: x = 189, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "grey15" - // page group: vector - // -main_Color_3_out_1 = - Color( - main_AutoGlyph_1_out_1, - main_Color_3_in_2, - main_Color_3_in_3, - main_Color_3_in_4, - main_Color_3_in_5 - ) [instance: 3, cache: 1]; - // - // node Transmitter[5]: x = 187, y = 329, inputs = 1, label = vector_plot - // page group: vector - // -vector_plot = main_Color_3_out_1; - // - // node Receiver[5]: x = 137, y = 9, inputs = 1, label = vector_plot - // page group: Display - // -main_Receiver_5_out_1[cache: 0] = vector_plot; - // - // node Color[1]: x = 353, y = 169, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 0, type = 32, value = "black" - // input[3]: visible = 0 - // page group: Display - // -main_Color_1_out_1 = - Color( - main_Caption_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node Collect[2]: x = 239, y = 249, inputs = 3, label = Collect - // page group: Display - // -main_Collect_2_out_1 = - Collect( - main_Receiver_2_out_1, - main_Receiver_5_out_1, - main_Color_1_out_1 - ) [instance: 2, cache: 1]; - // - // node Image[1]: x = 239, y = 329, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [1 0 0] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [1 0 23.9834] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 12.8527 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 1141 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.497 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 30.0001 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 1, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "eps color dpi=65 orient=landscape" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[30]: defaulting = 0, visible = 0, type = 16777248, value = {"x", "y", "z"} - // input[33]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"blue", "grey5", "black", "black"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.5 - // input[41]: defaulting = 0, visible = 0, type = 32, value = "none" - // page group: Display - // depth: value = 8 - // window: position = (0.0000,0.1338), size = 0.9023x0.5967 - // internal caching: 1 - // -main_Image_1_out_1[cache: 0], -main_Image_1_out_2[cache: 0], -main_Image_1_out_3[cache: 0] = - Image( - main_Image_1_in_1, - main_Collect_2_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "/home/atlas2/kanschat/c/deal.II/gk/n/T.00.dx"; -main_FileSelector_1_out_2 = "T.00.dx"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Extract_1_in_2 = NULL; -main_Extract_1_out_1 = NULL; -main_Inquire_1_in_2 = "shape"; -main_Inquire_1_in_3 = NULL; -main_Inquire_1_out_1 = NULL; -main_Integer_1_in_1 = "Integer_1"; -main_Integer_1_in_2 = NULL; -main_Integer_1_in_3 = 6 ; -main_Integer_1_in_4 = NULL; -main_Integer_1_in_5 = 0; -main_Integer_1_in_7 = NULL; -main_Integer_1_in_8 = NULL; -main_Integer_1_in_9 = NULL; -main_Integer_1_in_10 = NULL; -main_Integer_1_in_11 = "Scalar component"; -main_Integer_1_out_1 = 6 ; -main_Compute_1_in_1 = "select($0,$1)"; -main_Compute_1_out_1 = NULL; -main_Transmitter_1_out_1 = NULL; -main_Receiver_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = NULL; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_Extract_2_in_2 = NULL; -main_Extract_2_out_1 = NULL; -main_Inquire_2_in_2 = "shape"; -main_Inquire_2_in_3 = NULL; -main_Inquire_2_out_1 = NULL; -main_Integer_2_in_1 = "Integer_2"; -main_Integer_2_in_2 = NULL; -main_Integer_2_in_3 = 4 ; -main_Integer_2_in_4 = NULL; -main_Integer_2_in_5 = 0; -main_Integer_2_in_7 = NULL; -main_Integer_2_in_8 = NULL; -main_Integer_2_in_9 = NULL; -main_Integer_2_in_10 = NULL; -main_Integer_2_in_11 = NULL; -main_Integer_2_out_1 = 4 ; -main_Compute_2_in_1 = "[select($0,$1), select($0,$1+1)]"; -main_Compute_2_out_1 = NULL; -main_Transmitter_4_out_1 = NULL; -main_Receiver_4_out_1 = NULL; -main_Integer_4_in_1 = "Integer_4"; -main_Integer_4_in_2 = NULL; -main_Integer_4_in_3 = 200 ; -main_Integer_4_in_4 = NULL; -main_Integer_4_in_5 = NULL; -main_Integer_4_in_6 = NULL; -main_Integer_4_in_7 = NULL; -main_Integer_4_in_8 = NULL; -main_Integer_4_in_9 = NULL; -main_Integer_4_in_10 = NULL; -main_Integer_4_in_11 = NULL; -main_Integer_4_out_1 = 200 ; -main_Sample_1_out_1 = NULL; -main_AutoGlyph_1_in_2 = NULL; -main_AutoGlyph_1_in_3 = NULL; -main_AutoGlyph_1_in_4 = NULL; -main_AutoGlyph_1_in_5 = NULL; -main_AutoGlyph_1_in_6 = NULL; -main_AutoGlyph_1_in_7 = NULL; -main_AutoGlyph_1_out_1 = NULL; -main_Format_1_in_1 = "%s: %d"; -main_Format_1_out_1 = NULL; -main_Transmitter_2_out_1 = NULL; -main_Receiver_3_out_1 = NULL; -main_Caption_1_in_2 = [.5 .01]; -main_Caption_1_in_3 = NULL; -main_Caption_1_in_4 = NULL; -main_Caption_1_in_5 = NULL; -main_Caption_1_in_6 = NULL; -main_Caption_1_in_7 = NULL; -main_Caption_1_in_8 = NULL; -main_Caption_1_in_9 = NULL; -main_Caption_1_out_1 = NULL; -main_Integer_3_in_1 = "Integer_3"; -main_Integer_3_in_2 = NULL; -main_Integer_3_in_3 = 1 ; -main_Integer_3_in_4 = NULL; -main_Integer_3_in_5 = NULL; -main_Integer_3_in_6 = NULL; -main_Integer_3_in_7 = NULL; -main_Integer_3_in_8 = NULL; -main_Integer_3_in_9 = NULL; -main_Integer_3_in_10 = NULL; -main_Integer_3_in_11 = NULL; -main_Integer_3_out_1 = 1 ; -main_Isosurface_1_in_2 = NULL; -main_Isosurface_1_in_4 = NULL; -main_Isosurface_1_in_5 = NULL; -main_Isosurface_1_in_6 = NULL; -main_Isosurface_1_out_1 = NULL; -main_Color_2_in_2 = "black"; -main_Color_2_in_3 = NULL; -main_Color_2_in_4 = NULL; -main_Color_2_in_5 = NULL; -main_Color_2_out_1 = NULL; -main_Statistics_2_out_4 = NULL; -main_Statistics_2_out_5 = NULL; -main_ColorBar_1_in_2 = [0.99 0.5]; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = 0; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = .9; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -main_Transmitter_3_out_1 = NULL; -main_Receiver_2_out_1 = NULL; -main_Color_3_in_2 = "grey15"; -main_Color_3_in_3 = NULL; -main_Color_3_in_4 = NULL; -main_Color_3_in_5 = NULL; -main_Color_3_out_1 = NULL; -main_Transmitter_5_out_1 = NULL; -main_Receiver_5_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_Collect_2_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X8,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [1 0 0]; -main_Image_1_in_6 = [1 0 23.9834]; -main_Image_1_in_7 = 12.8527; -main_Image_1_in_8 = 1141; -main_Image_1_in_9 = 0.497; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = NULL; -main_Image_1_in_18 = NULL; -main_Image_1_in_19 = 0; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = "eps color dpi=65 orient=landscape"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 1; -main_Image_1_in_30 = {"x", "y", "z"}; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 0; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 0; -main_Image_1_in_37 = {"blue", "grey5", "black", "black"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.5; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = "none"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/dx/single/vector.cfg b/deal.II/contrib/dx/single/vector.cfg deleted file mode 100644 index ab028169df..0000000000 --- a/deal.II/contrib/dx/single/vector.cfg +++ /dev/null @@ -1,81 +0,0 @@ -// -// time: Mon Dec 10 11:55:49 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// panel[0]: position = (0.6430,0.5078), size = 0.2945x0.3984, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 326, height = 226 -// layout: snap = 1, width = 50, height = 50, align = NL -// -// panel[1]: position = (0.0000,0.5068), size = 0.2930x0.4395, startup = 1, devstyle = 1 -// title: value = Control Panel -// -// workspace: width = 123, height = 61 -// layout: snap = 0, width = 50, height = 50, align = NN -// -// interactor FileSelector[1]: num_components = 1, value = "/home/atlas2/kanschat/c/deal.II/gk/n/T.02.dx" -// instance: panel = 0, x = 0, y = 6, style = FileSelector, vertical = 1, size = 196x57 -// filter = *.dx -// -// interactor Integer[1]: num_components = 1, value = 6 -// component[0]: minimum = 0, maximum = 14, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 89, style = Stepper, vertical = 1, size = 118x56 -// label: value = Pressure -// local continuous: value = 1, mode = local -// local increment[0]: value = 1, mode = global -// -// interactor Integer[2]: num_components = 1, value = 4 -// component[0]: minimum = 0, maximum = 14, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 1, x = 5, y = 5, style = Stepper, vertical = 1, size = 118x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// instance: panel = 0, x = 200, y = 87, style = Stepper, vertical = 1, size = 118x56 -// label: value = Velocity -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// interactor Integer[4]: num_components = 1, value = 200 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 200, y = 170, style = Stepper, vertical = 1, size = 126x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// interactor Integer[3]: num_components = 1, value = 19 -// component[0]: minimum = -1e+06, maximum = 1e+06, global increment = 1, decimal = 0, global continuous = 0 -// instance: panel = 0, x = 0, y = 170, style = Stepper, vertical = 1, size = 144x56 -// local continuous: value = 0, mode = global -// local increment[0]: value = 1, mode = global -// -// node Image[1]: -// depth: value = 8 -// window: position = (0.0000,0.1338), size = 0.9023x0.5967 -// input[1]: defaulting = 0, value = "Image_1" -// input[4]: defaulting = 0, value = 1 -// input[5]: defaulting = 0, value = [1.30335 0.0232449 0] -// input[6]: defaulting = 0, value = [1.30335 0.0232449 24.7457] -// input[7]: defaulting = 0, value = 8.25193 -// input[8]: defaulting = 0, value = 1141 -// input[9]: defaulting = 0, value = 0.497 -// input[10]: defaulting = 0, value = [0 1 0] -// input[11]: defaulting = 1, value = 18.9322 -// input[12]: defaulting = 0, value = 0 -// input[14]: defaulting = 0, value = 1 -// input[15]: defaulting = 1, value = "none" -// input[16]: defaulting = 1, value = "none" -// input[17]: defaulting = 0, value = 1 -// input[18]: defaulting = 0, value = 1 -// input[19]: defaulting = 0, value = 1 -// input[22]: defaulting = 0, value = "white" -// input[26]: defaulting = 0, value = "eps color dpi=65 orient=landscape" -// input[29]: defaulting = 0, value = 1 -// input[30]: defaulting = 0, value = {"x", "y", "z"} -// input[33]: defaulting = 0, value = 0 -// input[36]: defaulting = 0, value = 0 -// input[37]: defaulting = 0, value = {"blue", "grey5", "black", "black"} -// input[38]: defaulting = 0, value = {"background", "grid", "ticks", "labels"} -// input[39]: defaulting = 0, value = 0.5 -// input[41]: defaulting = 0, value = "panzoom" -// internal caching: 1 diff --git a/deal.II/contrib/dx/single/vector.net b/deal.II/contrib/dx/single/vector.net deleted file mode 100644 index 2933fb59ce..0000000000 --- a/deal.II/contrib/dx/single/vector.net +++ /dev/null @@ -1,1017 +0,0 @@ -// -// time: Mon Dec 10 11:55:49 2001 -// -// version: 3.1.2 (format), 4.1.3 (DX) -// -// -// MODULE main -// page assignment: Color order=2, windowed=0, showing=1 -// page assignment: Display order=4, windowed=0, showing=0 -// page assignment: Input order=1, windowed=0, showing=0 -// page assignment: vector order=3, windowed=0, showing=0 -// workspace: width = 435, height = 471 -// layout: snap = 1, width = 50, height = 80, align = CC -// -macro main( -) -> ( -) { - // - // node FileSelector[1]: x = 331, y = 9, inputs = 0, label = FileSelector - // output[1]: visible = 1, type = 32, value = "/home/atlas2/kanschat/c/deal.II/gk/n/T.02.dx" - // output[2]: visible = 1, type = 32, value = "T.02.dx" - // page group: Input - // - // - // node Import[1]: x = 39, y = 89, inputs = 6, label = Import - // page group: Input - // -main_Import_1_out_1 = - Import( - main_FileSelector_1_out_1, - main_Import_1_in_2, - main_Import_1_in_3, - main_Import_1_in_4, - main_Import_1_in_5, - main_Import_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Extract[1]: x = 98, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_1_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_1_in_2 - ) [instance: 1, cache: 1]; - // - // node Inquire[1]: x = 89, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // input[3]: defaulting = 1, visible = 1, type = 32, value = NULL - // page group: Input - // -main_Inquire_1_out_1 = - Inquire( - main_Extract_1_out_1, - main_Inquire_1_in_2, - main_Inquire_1_in_3 - ) [instance: 1, cache: 1]; - // - // node Integer[1]: x = 148, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_1" - // input[2]: visible = 0 - // input[3]: defaulting = 0, visible = 0, type = 1, value = 6 - // input[5]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 14 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // input[11]: defaulting = 0, visible = 0, type = 32, value = "Scalar component" - // output[1]: visible = 1, type = 1, value = 6 - // page group: Input - // -main_Integer_1_out_1[cache: 2] = - Integer( - main_Integer_1_in_1, - main_Integer_1_in_2, - main_Integer_1_in_3, - main_Integer_1_in_4, - main_Integer_1_in_5, - main_Inquire_1_out_1, - main_Integer_1_in_7, - main_Integer_1_in_8, - main_Integer_1_in_9, - main_Integer_1_in_10, - main_Integer_1_in_11 - ) [instance: 1, cache: 1]; - // - // node Compute[1]: x = 41, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "select($0,$1)" - // page group: Input - // expression: value = select(a,b) - // name[2]: value = a - // name[3]: value = b - // -main_Compute_1_out_1[cache: 0] = - Compute( - main_Compute_1_in_1, - main_Import_1_out_1, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[1]: x = 38, y = 489, inputs = 1, label = data_input - // page group: Input - // -data_input = main_Compute_1_out_1; - // - // node Receiver[1]: x = 238, y = 9, inputs = 1, label = data_input - // page group: Color - // -main_Receiver_1_out_1[cache: 0] = data_input; - // - // node AutoColor[1]: x = 186, y = 89, inputs = 10, label = AutoColor - // input[2]: defaulting = 1, visible = 0, type = 5, value = NULL - // input[10]: defaulting = 0, visible = 0, type = 16777248, value = {"white"} - // page group: Color - // -main_AutoColor_1_out_1[cache: 0], -main_AutoColor_1_out_2[cache: 0] = - AutoColor( - main_Receiver_1_out_1, - main_AutoColor_1_in_2, - main_AutoColor_1_in_3, - main_AutoColor_1_in_4, - main_AutoColor_1_in_5, - main_AutoColor_1_in_6, - main_AutoColor_1_in_7, - main_AutoColor_1_in_8, - main_AutoColor_1_in_9, - main_AutoColor_1_in_10 - ) [instance: 1, cache: 1]; - // - // node Extract[2]: x = 298, y = 169, inputs = 2, label = Extract - // page group: Input - // -main_Extract_2_out_1 = - Extract( - main_Import_1_out_1, - main_Extract_2_in_2 - ) [instance: 2, cache: 1]; - // - // node Inquire[2]: x = 289, y = 249, inputs = 3, label = Inquire - // input[2]: defaulting = 0, visible = 1, type = 32, value = "shape" - // page group: Input - // -main_Inquire_2_out_1 = - Inquire( - main_Extract_2_out_1, - main_Inquire_2_in_2, - main_Inquire_2_in_3 - ) [instance: 2, cache: 1]; - // - // node Integer[2]: x = 298, y = 329, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_2" - // input[2]: visible = 0 - // input[3]: defaulting = 0, visible = 0, type = 1, value = 4 - // input[5]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[6]: defaulting = 1, visible = 1, type = 1, value = 14 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 4 - // page group: Input - // -main_Integer_2_out_1[cache: 2] = - Integer( - main_Integer_2_in_1, - main_Integer_2_in_2, - main_Integer_2_in_3, - main_Integer_2_in_4, - main_Integer_2_in_5, - main_Inquire_2_out_1, - main_Integer_2_in_7, - main_Integer_2_in_8, - main_Integer_2_in_9, - main_Integer_2_in_10, - main_Integer_2_in_11 - ) [instance: 2, cache: 1]; - // - // node Compute[2]: x = 241, y = 409, inputs = 3, label = Compute - // input[1]: defaulting = 0, visible = 0, type = 32, value = "[select($0,$1), select($0,$1+1)]" - // page group: Input - // expression: value = [select(a,b), select(a,b+1)] - // name[2]: value = a - // name[3]: value = b - // -main_Compute_2_out_1 = - Compute( - main_Compute_2_in_1, - main_Import_1_out_1, - main_Integer_2_out_1 - ) [instance: 2, cache: 1]; - // - // node Transmitter[4]: x = 233, y = 489, inputs = 1, label = vector_input - // page group: Input - // -vector_input = main_Compute_2_out_1; - // - // node Receiver[4]: x = 133, y = 9, inputs = 1, label = vector_input - // page group: vector - // -main_Receiver_4_out_1[cache: 0] = vector_input; - // - // node Integer[4]: x = 298, y = 9, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_4" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 200 - // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000 - // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 200 - // page group: vector - // - // - // node Sample[1]: x = 197, y = 89, inputs = 2, label = Sample - // page group: vector - // -main_Sample_1_out_1 = - Sample( - main_Receiver_4_out_1, - main_Integer_4_out_1 - ) [instance: 1, cache: 1]; - // - // node AutoGlyph[1]: x = 165, y = 169, inputs = 7, label = AutoGlyph - // page group: vector - // -main_AutoGlyph_1_out_1 = - AutoGlyph( - main_Sample_1_out_1, - main_AutoGlyph_1_in_2, - main_AutoGlyph_1_in_3, - main_AutoGlyph_1_in_4, - main_AutoGlyph_1_in_5, - main_AutoGlyph_1_in_6, - main_AutoGlyph_1_in_7 - ) [instance: 1, cache: 1]; - // - // node Format[1]: x = 398, y = 409, inputs = 3, label = Format - // input[1]: defaulting = 0, visible = 0, type = 32, value = "%s: %d" - // page group: Input - // -main_Format_1_out_1 = - Format( - main_Format_1_in_1, - main_FileSelector_1_out_2, - main_Integer_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[2]: x = 411, y = 489, inputs = 1, label = title - // page group: Input - // -title = main_Format_1_out_1; - // - // node Receiver[3]: x = 361, y = 9, inputs = 1, label = title - // page group: Display - // -main_Receiver_3_out_1[cache: 0] = title; - // - // node Caption[1]: x = 345, y = 89, inputs = 9, label = Caption - // input[2]: defaulting = 0, visible = 1, type = 8, value = [.5 .01] - // page group: Display - // -main_Caption_1_out_1 = - Caption( - main_Receiver_3_out_1, - main_Caption_1_in_2, - main_Caption_1_in_3, - main_Caption_1_in_4, - main_Caption_1_in_5, - main_Caption_1_in_6, - main_Caption_1_in_7, - main_Caption_1_in_8, - main_Caption_1_in_9 - ) [instance: 1, cache: 1]; - // - // node Integer[3]: x = 48, y = 9, inputs = 11, label = Integer - // input[1]: defaulting = 0, visible = 0, type = 32, value = "Integer_3" - // input[3]: defaulting = 0, visible = 0, type = 1, value = 19 - // input[5]: defaulting = 1, visible = 0, type = 1, value = -1000000 - // input[6]: defaulting = 1, visible = 0, type = 1, value = 1000000 - // input[7]: defaulting = 1, visible = 0, type = 5, value = 1.0 - // input[9]: defaulting = 1, visible = 0, type = 1, value = 0 - // output[1]: visible = 1, type = 1, value = 19 - // page group: Color - // - // - // node Isosurface[1]: x = 86, y = 169, inputs = 6, label = Isosurface - // input[3]: defaulting = 1, visible = 1, type = 1, value = 10 - // page group: Color - // -main_Isosurface_1_out_1 = - Isosurface( - main_Receiver_1_out_1, - main_Isosurface_1_in_2, - main_Integer_3_out_1, - main_Isosurface_1_in_4, - main_Isosurface_1_in_5, - main_Isosurface_1_in_6 - ) [instance: 1, cache: 1]; - // - // node Color[2]: x = 89, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "black" - // page group: Color - // -main_Color_2_out_1 = - Color( - main_Isosurface_1_out_1, - main_Color_2_in_2, - main_Color_2_in_3, - main_Color_2_in_4, - main_Color_2_in_5 - ) [instance: 2, cache: 1]; - // - // node Statistics[2]: x = 315, y = 89, inputs = 1, label = Statistics - // page group: Color - // -main_Statistics_2_out_1, -main_Statistics_2_out_2, -main_Statistics_2_out_3, -main_Statistics_2_out_4, -main_Statistics_2_out_5 = - Statistics( - main_Receiver_1_out_1 - ) [instance: 2, cache: 1]; - // - // node ColorBar[1]: x = 339, y = 249, inputs = 16, label = ColorBar - // input[2]: defaulting = 0, visible = 0, type = 8, value = [0.99 0.5] - // input[3]: visible = 0 - // input[4]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[6]: visible = 1 - // input[7]: visible = 1 - // input[8]: defaulting = 0, visible = 0, type = 32, value = NULL - // input[9]: defaulting = 0, visible = 0, type = 16777248, value = {"black"} - // input[11]: defaulting = 0, visible = 0, type = 5, value = .9 - // input[14]: defaulting = 1, visible = 0, type = 16777248, value = NULL - // page group: Color - // -main_ColorBar_1_out_1 = - ColorBar( - main_AutoColor_1_out_2, - main_ColorBar_1_in_2, - main_ColorBar_1_in_3, - main_ColorBar_1_in_4, - main_ColorBar_1_in_5, - main_Statistics_2_out_4, - main_Statistics_2_out_5, - main_ColorBar_1_in_8, - main_ColorBar_1_in_9, - main_ColorBar_1_in_10, - main_ColorBar_1_in_11, - main_ColorBar_1_in_12, - main_ColorBar_1_in_13, - main_ColorBar_1_in_14, - main_ColorBar_1_in_15, - main_ColorBar_1_in_16 - ) [instance: 1, cache: 1]; - // - // node Collect[1]: x = 239, y = 329, inputs = 3, label = Collect - // page group: Color - // -main_Collect_1_out_1 = - Collect( - main_Color_2_out_1, - main_AutoColor_1_out_1, - main_ColorBar_1_out_1 - ) [instance: 1, cache: 1]; - // - // node Transmitter[3]: x = 253, y = 409, inputs = 1, label = image - // page group: Color - // -image = main_Collect_1_out_1; - // - // node Receiver[2]: x = 53, y = 9, inputs = 1, label = image - // page group: Display - // -main_Receiver_2_out_1[cache: 0] = image; - // - // node Color[3]: x = 189, y = 249, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 1, type = 32, value = "grey15" - // page group: vector - // -main_Color_3_out_1 = - Color( - main_AutoGlyph_1_out_1, - main_Color_3_in_2, - main_Color_3_in_3, - main_Color_3_in_4, - main_Color_3_in_5 - ) [instance: 3, cache: 1]; - // - // node Transmitter[5]: x = 187, y = 329, inputs = 1, label = vector_plot - // page group: vector - // -vector_plot = main_Color_3_out_1; - // - // node Receiver[5]: x = 137, y = 9, inputs = 1, label = vector_plot - // page group: Display - // -main_Receiver_5_out_1[cache: 0] = vector_plot; - // - // node Color[1]: x = 353, y = 169, inputs = 5, label = Color - // input[2]: defaulting = 0, visible = 0, type = 32, value = "black" - // input[3]: visible = 0 - // page group: Display - // -main_Color_1_out_1 = - Color( - main_Caption_1_out_1, - main_Color_1_in_2, - main_Color_1_in_3, - main_Color_1_in_4, - main_Color_1_in_5 - ) [instance: 1, cache: 1]; - // - // node Collect[2]: x = 239, y = 249, inputs = 3, label = Collect - // page group: Display - // -main_Collect_2_out_1 = - Collect( - main_Receiver_2_out_1, - main_Receiver_5_out_1, - main_Color_1_out_1 - ) [instance: 2, cache: 1]; - // - // node Image[1]: x = 239, y = 329, inputs = 49, label = Image - // input[1]: defaulting = 0, visible = 0, type = 67108863, value = "Image_1" - // input[4]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[5]: defaulting = 0, visible = 0, type = 8, value = [1.30335 0.0232449 0] - // input[6]: defaulting = 0, visible = 0, type = 8, value = [1.30335 0.0232449 24.7457] - // input[7]: defaulting = 0, visible = 0, type = 5, value = 8.25193 - // input[8]: defaulting = 0, visible = 0, type = 1, value = 1141 - // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.497 - // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0] - // input[11]: defaulting = 1, visible = 0, type = 5, value = 18.9322 - // input[12]: defaulting = 0, visible = 0, type = 1, value = 0 - // input[14]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[15]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[16]: defaulting = 1, visible = 0, type = 32, value = "none" - // input[17]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[18]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[19]: defaulting = 0, visible = 0, type = 1, value = 1 - // input[22]: defaulting = 0, visible = 0, type = 32, value = "white" - // input[26]: defaulting = 0, visible = 0, type = 32, value = "eps color dpi=65 orient=landscape" - // input[29]: defaulting = 0, visible = 0, type = 3, value = 1 - // input[30]: defaulting = 0, visible = 0, type = 16777248, value = {"x", "y", "z"} - // input[33]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[36]: defaulting = 0, visible = 0, type = 3, value = 0 - // input[37]: defaulting = 0, visible = 0, type = 16777248, value = {"blue", "grey5", "black", "black"} - // input[38]: defaulting = 0, visible = 0, type = 16777248, value = {"background", "grid", "ticks", "labels"} - // input[39]: defaulting = 0, visible = 0, type = 5, value = 0.5 - // input[41]: defaulting = 0, visible = 0, type = 32, value = "panzoom" - // page group: Display - // depth: value = 8 - // window: position = (0.0000,0.1338), size = 0.9023x0.5967 - // internal caching: 1 - // -main_Image_1_out_1[cache: 0], -main_Image_1_out_2[cache: 0], -main_Image_1_out_3[cache: 0] = - Image( - main_Image_1_in_1, - main_Collect_2_out_1, - main_Image_1_in_3, - main_Image_1_in_4, - main_Image_1_in_5, - main_Image_1_in_6, - main_Image_1_in_7, - main_Image_1_in_8, - main_Image_1_in_9, - main_Image_1_in_10, - main_Image_1_in_11, - main_Image_1_in_12, - main_Image_1_in_13, - main_Image_1_in_14, - main_Image_1_in_15, - main_Image_1_in_16, - main_Image_1_in_17, - main_Image_1_in_18, - main_Image_1_in_19, - main_Image_1_in_20, - main_Image_1_in_21, - main_Image_1_in_22, - main_Image_1_in_23, - main_Image_1_in_24, - main_Image_1_in_25, - main_Image_1_in_26, - main_Image_1_in_27, - main_Image_1_in_28, - main_Image_1_in_29, - main_Image_1_in_30, - main_Image_1_in_31, - main_Image_1_in_32, - main_Image_1_in_33, - main_Image_1_in_34, - main_Image_1_in_35, - main_Image_1_in_36, - main_Image_1_in_37, - main_Image_1_in_38, - main_Image_1_in_39, - main_Image_1_in_40, - main_Image_1_in_41, - main_Image_1_in_42, - main_Image_1_in_43, - main_Image_1_in_44, - main_Image_1_in_45, - main_Image_1_in_46, - main_Image_1_in_47, - main_Image_1_in_48, - main_Image_1_in_49 - ) [instance: 1, cache: 1]; -// network: end of macro body -CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2); -} -main_FileSelector_1_out_1 = "/home/atlas2/kanschat/c/deal.II/gk/n/T.02.dx"; -main_FileSelector_1_out_2 = "T.02.dx"; -main_Import_1_in_2 = NULL; -main_Import_1_in_3 = NULL; -main_Import_1_in_4 = NULL; -main_Import_1_in_5 = NULL; -main_Import_1_in_6 = NULL; -main_Import_1_out_1 = NULL; -main_Extract_1_in_2 = NULL; -main_Extract_1_out_1 = NULL; -main_Inquire_1_in_2 = "shape"; -main_Inquire_1_in_3 = NULL; -main_Inquire_1_out_1 = NULL; -main_Integer_1_in_1 = "Integer_1"; -main_Integer_1_in_2 = NULL; -main_Integer_1_in_3 = 6 ; -main_Integer_1_in_4 = NULL; -main_Integer_1_in_5 = 0; -main_Integer_1_in_7 = NULL; -main_Integer_1_in_8 = NULL; -main_Integer_1_in_9 = NULL; -main_Integer_1_in_10 = NULL; -main_Integer_1_in_11 = "Scalar component"; -main_Integer_1_out_1 = 6 ; -main_Compute_1_in_1 = "select($0,$1)"; -main_Compute_1_out_1 = NULL; -main_Transmitter_1_out_1 = NULL; -main_Receiver_1_out_1 = NULL; -main_AutoColor_1_in_2 = NULL; -main_AutoColor_1_in_3 = NULL; -main_AutoColor_1_in_4 = NULL; -main_AutoColor_1_in_5 = NULL; -main_AutoColor_1_in_6 = NULL; -main_AutoColor_1_in_7 = NULL; -main_AutoColor_1_in_8 = NULL; -main_AutoColor_1_in_9 = NULL; -main_AutoColor_1_in_10 = {"white"}; -main_AutoColor_1_out_1 = NULL; -main_AutoColor_1_out_2 = NULL; -main_Extract_2_in_2 = NULL; -main_Extract_2_out_1 = NULL; -main_Inquire_2_in_2 = "shape"; -main_Inquire_2_in_3 = NULL; -main_Inquire_2_out_1 = NULL; -main_Integer_2_in_1 = "Integer_2"; -main_Integer_2_in_2 = NULL; -main_Integer_2_in_3 = 4 ; -main_Integer_2_in_4 = NULL; -main_Integer_2_in_5 = 0; -main_Integer_2_in_7 = NULL; -main_Integer_2_in_8 = NULL; -main_Integer_2_in_9 = NULL; -main_Integer_2_in_10 = NULL; -main_Integer_2_in_11 = NULL; -main_Integer_2_out_1 = 4 ; -main_Compute_2_in_1 = "[select($0,$1), select($0,$1+1)]"; -main_Compute_2_out_1 = NULL; -main_Transmitter_4_out_1 = NULL; -main_Receiver_4_out_1 = NULL; -main_Integer_4_in_1 = "Integer_4"; -main_Integer_4_in_2 = NULL; -main_Integer_4_in_3 = 200 ; -main_Integer_4_in_4 = NULL; -main_Integer_4_in_5 = NULL; -main_Integer_4_in_6 = NULL; -main_Integer_4_in_7 = NULL; -main_Integer_4_in_8 = NULL; -main_Integer_4_in_9 = NULL; -main_Integer_4_in_10 = NULL; -main_Integer_4_in_11 = NULL; -main_Integer_4_out_1 = 200 ; -main_Sample_1_out_1 = NULL; -main_AutoGlyph_1_in_2 = NULL; -main_AutoGlyph_1_in_3 = NULL; -main_AutoGlyph_1_in_4 = NULL; -main_AutoGlyph_1_in_5 = NULL; -main_AutoGlyph_1_in_6 = NULL; -main_AutoGlyph_1_in_7 = NULL; -main_AutoGlyph_1_out_1 = NULL; -main_Format_1_in_1 = "%s: %d"; -main_Format_1_out_1 = NULL; -main_Transmitter_2_out_1 = NULL; -main_Receiver_3_out_1 = NULL; -main_Caption_1_in_2 = [.5 .01]; -main_Caption_1_in_3 = NULL; -main_Caption_1_in_4 = NULL; -main_Caption_1_in_5 = NULL; -main_Caption_1_in_6 = NULL; -main_Caption_1_in_7 = NULL; -main_Caption_1_in_8 = NULL; -main_Caption_1_in_9 = NULL; -main_Caption_1_out_1 = NULL; -main_Integer_3_in_1 = "Integer_3"; -main_Integer_3_in_2 = NULL; -main_Integer_3_in_3 = 19 ; -main_Integer_3_in_4 = NULL; -main_Integer_3_in_5 = NULL; -main_Integer_3_in_6 = NULL; -main_Integer_3_in_7 = NULL; -main_Integer_3_in_8 = NULL; -main_Integer_3_in_9 = NULL; -main_Integer_3_in_10 = NULL; -main_Integer_3_in_11 = NULL; -main_Integer_3_out_1 = 19 ; -main_Isosurface_1_in_2 = NULL; -main_Isosurface_1_in_4 = NULL; -main_Isosurface_1_in_5 = NULL; -main_Isosurface_1_in_6 = NULL; -main_Isosurface_1_out_1 = NULL; -main_Color_2_in_2 = "black"; -main_Color_2_in_3 = NULL; -main_Color_2_in_4 = NULL; -main_Color_2_in_5 = NULL; -main_Color_2_out_1 = NULL; -main_Statistics_2_out_4 = NULL; -main_Statistics_2_out_5 = NULL; -main_ColorBar_1_in_2 = [0.99 0.5]; -main_ColorBar_1_in_3 = NULL; -main_ColorBar_1_in_4 = 0; -main_ColorBar_1_in_5 = NULL; -main_ColorBar_1_in_8 = NULL; -main_ColorBar_1_in_9 = {"black"}; -main_ColorBar_1_in_10 = NULL; -main_ColorBar_1_in_11 = .9; -main_ColorBar_1_in_12 = NULL; -main_ColorBar_1_in_13 = NULL; -main_ColorBar_1_in_14 = NULL; -main_ColorBar_1_in_15 = NULL; -main_ColorBar_1_in_16 = NULL; -main_ColorBar_1_out_1 = NULL; -main_Collect_1_out_1 = NULL; -main_Transmitter_3_out_1 = NULL; -main_Receiver_2_out_1 = NULL; -main_Color_3_in_2 = "grey15"; -main_Color_3_in_3 = NULL; -main_Color_3_in_4 = NULL; -main_Color_3_in_5 = NULL; -main_Color_3_out_1 = NULL; -main_Transmitter_5_out_1 = NULL; -main_Receiver_5_out_1 = NULL; -main_Color_1_in_2 = "black"; -main_Color_1_in_3 = NULL; -main_Color_1_in_4 = NULL; -main_Color_1_in_5 = NULL; -main_Color_1_out_1 = NULL; -main_Collect_2_out_1 = NULL; -macro Image( - id, - object, - where, - useVector, - to, - from, - width, - resolution, - aspect, - up, - viewAngle, - perspective, - options, - buttonState = 1, - buttonUpApprox = "none", - buttonDownApprox = "none", - buttonUpDensity = 1, - buttonDownDensity = 1, - renderMode = 0, - defaultCamera, - reset, - backgroundColor, - throttle, - RECenable = 0, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable = 0, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - interactionMode, - title, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - webOptions) -> ( - object, - camera, - where) -{ - ImageMessage( - id, - backgroundColor, - throttle, - RECenable, - RECfile, - RECformat, - RECresolution, - RECaspect, - AAenable, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels, - interactionMode, - title, - renderMode, - buttonUpApprox, - buttonDownApprox, - buttonUpDensity, - buttonDownDensity) [instance: 1, cache: 1]; - autoCamera = - AutoCamera( - object, - "front", - object, - resolution, - aspect, - [0,1,0], - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - realCamera = - Camera( - to, - from, - width, - resolution, - aspect, - up, - perspective, - viewAngle, - backgroundColor) [instance: 1, cache: 1]; - coloredDefaultCamera = - UpdateCamera(defaultCamera, - background=backgroundColor) [instance: 1, cache: 1]; - nullDefaultCamera = - Inquire(defaultCamera, - "is null + 1") [instance: 1, cache: 1]; - resetCamera = - Switch( - nullDefaultCamera, - coloredDefaultCamera, - autoCamera) [instance: 1, cache: 1]; - resetNull = - Inquire( - reset, - "is null + 1") [instance: 2, cache: 1]; - reset = - Switch( - resetNull, - reset, - 0) [instance: 2, cache: 1]; - whichCamera = - Compute( - "($0 != 0 || $1 == 0) ? 1 : 2", - reset, - useVector) [instance: 1, cache: 1]; - camera = Switch( - whichCamera, - resetCamera, - realCamera) [instance: 3, cache: 1]; - AAobject = - AutoAxes( - object, - camera, - AAlabels, - AAticks, - AAcorners, - AAframe, - AAadjust, - AAcursor, - AAgrid, - AAcolors, - AAannotation, - AAlabelscale, - AAfont, - AAxTickLocs, - AAyTickLocs, - AAzTickLocs, - AAxTickLabels, - AAyTickLabels, - AAzTickLabels) [instance: 1, cache: 1]; - switchAAenable = Compute("$0+1", - AAenable) [instance: 2, cache: 1]; - object = Switch( - switchAAenable, - object, - AAobject) [instance:4, cache: 1]; - SWapproximation_options = - Switch( - buttonState, - buttonUpApprox, - buttonDownApprox) [instance: 5, cache: 1]; - SWdensity_options = - Switch( - buttonState, - buttonUpDensity, - buttonDownDensity) [instance: 6, cache: 1]; - HWapproximation_options = - Format( - "%s,%s", - buttonDownApprox, - buttonUpApprox) [instance: 1, cache: 1]; - HWdensity_options = - Format( - "%d,%d", - buttonDownDensity, - buttonUpDensity) [instance: 2, cache: 1]; - switchRenderMode = Compute( - "$0+1", - renderMode) [instance: 3, cache: 1]; - approximation_options = Switch( - switchRenderMode, - SWapproximation_options, - HWapproximation_options) [instance: 7, cache: 1]; - density_options = Switch( - switchRenderMode, - SWdensity_options, - HWdensity_options) [instance: 8, cache: 1]; - renderModeString = Switch( - switchRenderMode, - "software", - "hardware")[instance: 9, cache: 1]; - object_tag = Inquire( - object, - "object tag")[instance: 3, cache: 1]; - annoted_object = - Options( - object, - "send boxes", - 0, - "cache", - 1, - "object tag", - object_tag, - "ddcamera", - whichCamera, - "rendering approximation", - approximation_options, - "render every", - density_options, - "button state", - buttonState, - "rendering mode", - renderModeString) [instance: 1, cache: 1]; - RECresNull = - Inquire( - RECresolution, - "is null + 1") [instance: 4, cache: 1]; - ImageResolution = - Inquire( - camera, - "camera resolution") [instance: 5, cache: 1]; - RECresolution = - Switch( - RECresNull, - RECresolution, - ImageResolution) [instance: 10, cache: 1]; - RECaspectNull = - Inquire( - RECaspect, - "is null + 1") [instance: 6, cache: 1]; - ImageAspect = - Inquire( - camera, - "camera aspect") [instance: 7, cache: 1]; - RECaspect = - Switch( - RECaspectNull, - RECaspect, - ImageAspect) [instance: 11, cache: 1]; - switchRECenable = Compute( - "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4", - RECenable, - switchRenderMode, - RECresolution, - ImageResolution, - RECaspect, - ImageAspect) [instance: 4, cache: 1]; - NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object); - Display( - NoRECobject, - camera, - where, - throttle) [instance: 1, cache: 1]; - image = - Render( - RECNoRerenderObject, - camera) [instance: 1, cache: 1]; - Display( - image, - NULL, - where, - throttle) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 1, cache: 1]; - rec_where = Display( - RECNoRerHW, - camera, - where, - throttle) [instance: 1, cache: 0]; - rec_image = ReadImageWindow( - rec_where) [instance: 1, cache: 1]; - WriteImage( - rec_image, - RECfile, - RECformat) [instance: 1, cache: 1]; - RECupdateCamera = - UpdateCamera( - camera, - resolution=RECresolution, - aspect=RECaspect) [instance: 2, cache: 1]; - Display( - RECRerenderObject, - camera, - where, - throttle) [instance: 1, cache: 1]; - RECRerenderObject = - ScaleScreen( - RECRerenderObject, - NULL, - RECresolution, - camera) [instance: 1, cache: 1]; - image = - Render( - RECRerenderObject, - RECupdateCamera) [instance: 2, cache: 1]; - WriteImage( - image, - RECfile, - RECformat) [instance: 2, cache: 1]; -} -main_Image_1_in_1 = "Image_1"; -main_Image_1_in_3 = "X8,,"; -main_Image_1_in_4 = 1; -main_Image_1_in_5 = [1.30335 0.0232449 0]; -main_Image_1_in_6 = [1.30335 0.0232449 24.7457]; -main_Image_1_in_7 = 8.25193; -main_Image_1_in_8 = 1141; -main_Image_1_in_9 = 0.497; -main_Image_1_in_10 = [0 1 0]; -main_Image_1_in_11 = NULL; -main_Image_1_in_12 = 0; -main_Image_1_in_13 = NULL; -main_Image_1_in_14 = 1; -main_Image_1_in_15 = NULL; -main_Image_1_in_16 = NULL; -main_Image_1_in_17 = 1; -main_Image_1_in_18 = 1; -main_Image_1_in_19 = 1; -main_Image_1_in_20 = NULL; -main_Image_1_in_21 = NULL; -main_Image_1_in_22 = "white"; -main_Image_1_in_23 = NULL; -main_Image_1_in_25 = NULL; -main_Image_1_in_26 = "eps color dpi=65 orient=landscape"; -main_Image_1_in_27 = NULL; -main_Image_1_in_28 = NULL; -main_Image_1_in_29 = 1; -main_Image_1_in_30 = {"x", "y", "z"}; -main_Image_1_in_31 = NULL; -main_Image_1_in_32 = NULL; -main_Image_1_in_33 = 0; -main_Image_1_in_34 = NULL; -main_Image_1_in_35 = NULL; -main_Image_1_in_36 = 0; -main_Image_1_in_37 = {"blue", "grey5", "black", "black"}; -main_Image_1_in_38 = {"background", "grid", "ticks", "labels"}; -main_Image_1_in_39 = 0.5; -main_Image_1_in_40 = NULL; -main_Image_1_in_41 = "panzoom"; -main_Image_1_in_42 = NULL; -main_Image_1_in_43 = NULL; -main_Image_1_in_44 = NULL; -main_Image_1_in_45 = NULL; -main_Image_1_in_46 = NULL; -main_Image_1_in_47 = NULL; -main_Image_1_in_48 = NULL; -main_Image_1_in_49 = NULL; -Executive("product version 4 1 3"); -$sync -main(); diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile deleted file mode 100644 index fe35c28982..0000000000 --- a/deal.II/contrib/hsl/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -# $Id$ -# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010 by Wolfgang Bangerth - - -D = ../.. - -include $D/common/Make.global_options - -# get lists of files we need -f-files = $(shell a="`echo source/*.f`"; if test "$$a" != "source/*.f" ; then echo $$a ; fi) -o-files = $(f-files:source/%.f=$(LIBDIR)/contrib/hsl/%.$(OBJEXT)) - - - - -# rules -lib: $(LIBDIR)/libhsl$(lib-suffix) $(LIBDIR)/bin/detached_ma27$(EXEEXT) - - - -$(LIBDIR)/contrib/hsl/%.$(OBJEXT) : - @echo =====hsl==============optimized==$(MT)== $( $@ \ - || (rm -f $@ ; false) - - -# include all the dependencies -include Makefile.dep - - -.PHONY: clean -.PHONY: lib lib$(static-lib-suffix) lib.g$(static-lib-suffix) diff --git a/deal.II/contrib/hsl/include/hsl/hsl.h b/deal.II/contrib/hsl/include/hsl/hsl.h deleted file mode 100644 index 99907ecdca..0000000000 --- a/deal.II/contrib/hsl/include/hsl/hsl.h +++ /dev/null @@ -1,271 +0,0 @@ -//---------------------------- hsl.h --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2000, 2001, 2002, 2003 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- hsl.h --------------------------- -#ifndef __deal2__hsl_h -#define __deal2__hsl_h - - - - - -/** - * In this namespace we declare the Fortran functions that are used - * from the Harwell Subroutine Library. The functions which we use - * here provide services for the direct solution of sparse systems of - * linear equations. For a thorough discussion of these functions, as - * well as for a way to download them, please see - * @url{http://www.cse.clrc.ac.uk/Activity/HSL}. For a description of - * the steps necessary for the installation of HSL subroutines, read - * the section on external libraries in the deal.II ReadMe file. - * - * @author Wolfgang Bangerth, 2000, 2001 - */ -namespace HSL -{ - /** - * This namespace serves for the - * declaration of those functions - * inside the Harwell Subroutine - * Library that are used in - * connection with the MA27 direct - * sparse solver. - * - * MA27 is a direct solver for - * sparse symmetric linear systems - * of equations. The linear system - * needs not necessarily be - * definite. - * - * @author Wolfgang Bangerth, 2000 - */ - namespace MA27 - { - /** - * Extern declaration of the MA27 - * initialization function. See - * the MA27 documentation for - * more information about its - * purpose and the meaning of its - * arguments. - */ - extern "C" - void ma27ad_ (const unsigned int *N, - const unsigned int *NZ, - const unsigned int *IRN, - const unsigned int *ICN, - unsigned int *IW, - const unsigned int *LIW, - unsigned int *IKEEP, - unsigned int *IW1, - unsigned int *NSTEPS, - int *IFLAG); - - /** - * Extern declaration of the MA27 - * factorization function. See - * the MA27 documentation for - * more information about its - * purpose and the meaning of its - * arguments. - */ - extern "C" - void ma27bd_ (const unsigned int *N, - const unsigned int *NZ, - const unsigned int *IRN, - const unsigned int *ICN, - double *A, - const unsigned int *LA, - unsigned int *IW, - const unsigned int *LIW, - const unsigned int *IKEEP, - const unsigned int *NSTEPS, - unsigned int *MAXFRT, - unsigned int *IW1, - int *IFLAG); - - /** - * Extern declaration of the MA27 - * solver function. See - * the MA27 documentation for - * more information about its - * purpose and the meaning of its - * arguments. - */ - extern "C" - void ma27cd_ (const unsigned int *N, - const double *A, - const unsigned int *LA, - const unsigned int *IW, - const unsigned int *LIW, - double *W, - const unsigned int *MAXFRT, - double *RHS, - const unsigned int *IW1, - const unsigned int *NSTEPS); - - /** - * Declaration of a Fortran - * helper function that returns - * the value of @p{NRLNEC} from - * the @p{MA27ED} common block of - * the MA27 functions. - * - * This function does not belong - * to the Harwell Subroutine - * Library, but was written for - * the interface to that library. - */ - extern "C" - void ma27x1_ (unsigned int *NRLNEC); - - /** - * Declaration of a Fortran - * helper function that returns - * the value of @p{NIRNEC} from - * the @p{MA27ED} common block of - * the MA27 functions. - * - * This function does not belong - * to the Harwell Subroutine - * Library, but was written for - * the interface to that library. - */ - extern "C" - void ma27x2_ (unsigned int *NIRNEC); - - /** - * Set the value of the error - * stream @p{LP}. Setting it to - * zero suppresses error output - * from the @p{MA27*} functions. - */ - extern "C" - void ma27x3_ (const unsigned int *LP); - } - - - - /** - * This namespace serves for the - * declaration of those functions - * inside the Harwell Subroutine - * Library that are used in - * connection with the MA47 direct - * sparse solver. - * - * MA47 is a direct solver for - * sparse symmetric linear systems - * of equations. The linear system - * needs not necessarily be - * definite. - * - * @author Wolfgang Bangerth, 2000 - */ - namespace MA47 - { - /** - * Extern declaration of the - * function from the Harwell - * Subroutine Library that - * returns some default values - * for parameters of the MA47 - * direct solver. See the MA47 - * documentation for more - * information about its purpose - * and the meaning of its - * arguments. - */ - extern "C" - void ma47id_ (double *CNTL, - unsigned int *ICNTL); - - /** - * Extern declaration of the - * function from the Harwell - * Subroutine Library that does - * some symbolic manipulations - * for the MA47 direct - * solver. See the MA47 - * documentation for more - * information about its purpose - * and the meaning of its - * arguments. - */ - extern "C" - void ma47ad_ (const unsigned int *N, - const unsigned int *NE, - unsigned int *IRN, - unsigned int *JCN, - unsigned int *IW, - const unsigned int *LIW, - unsigned int *KEEP, - const unsigned int *ICNTL, - double *RINFO, - int *INFO); - - /** - * Extern declaration of the - * function from the Harwell - * Subroutine Library that does - * the factorization for the MA47 - * direct solver. See the MA47 - * documentation for more - * information about its purpose - * and the meaning of its - * arguments. - */ - extern "C" - void ma47bd_ (const unsigned int *N, - const unsigned int *NE, - const unsigned int *JCN, - double *A, - const unsigned int *LA, - unsigned int *IW, - const unsigned int *LIW, - const unsigned int *KEEP, - const double *CNTL, - const unsigned int *ICNTL, - unsigned int *IW1, - double *RINFO, - int *INFO); - - - /** - * Extern declaration of the - * function from the Harwell - * Subroutine Library that does - * the solution for a certain - * right hand side for the MA47 - * direct solver. See the MA47 - * documentation for more - * information about its purpose - * and the meaning of its - * arguments. - */ - extern "C" - void ma47cd_ (const unsigned int *N, - const double *A, - const unsigned int *LA, - const unsigned int *IW, - const unsigned int *LIW, - double *W, - double *RHS, - unsigned int *IW1, - const unsigned int *ICNTL); - } -} - - -//---------------------------- hsl.h --------------------------- -// end of #ifndef __deal2__hsl_h -#endif -//---------------------------- hsl.h --------------------------- diff --git a/deal.II/contrib/hsl/source/Makefile b/deal.II/contrib/hsl/source/Makefile deleted file mode 100644 index 5063b9a642..0000000000 --- a/deal.II/contrib/hsl/source/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -default: - @echo Nothing to do here - -get: - @svn export http://wolfgang.math.tamu.edu/svn/bangerth/projects/trunk/hsl-solvers - @mv hsl-solvers/*.f . - @rm -rf hsl-solvers - -.PHONY: get diff --git a/deal.II/contrib/hsl/source/detached_ma27.cc b/deal.II/contrib/hsl/source/detached_ma27.cc deleted file mode 100644 index 3bd1afeb55..0000000000 --- a/deal.II/contrib/hsl/source/detached_ma27.cc +++ /dev/null @@ -1,320 +0,0 @@ -//---------------------------- detached_ma27.cc --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2002, 2003, 2006, 2007, 2008, 2009, 2011 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- detached_ma27.cc --------------------------- - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#ifndef DEAL_II_USE_DIRECT_ERRNO_H -# include -#else -# include -#endif - -#include - - -DEAL_II_NAMESPACE_OPEN - - - -/** - * Output an error message and terminate the program. - */ -void die (const std::string &text, const pid_t pid) -{ - sleep (rand()%5 + getpid()%5); - std::cerr << "----- detached_ma27(" << pid << "): " << text - << std::endl; - abort (); -} - - -/** - * Output an error message and terminate the program. Write two error - * codes. - */ -template -void die (const std::string &text, const T1 t1, const T2 t2, const pid_t pid) -{ - sleep (rand()%5 + getpid()%5); - std::cerr << "----- detached_ma27(" << pid << "): " << text - << " code1=" << t1 << ", code2=" << t2 - << std::endl; - abort (); -} - - - -/** - * loop and check every once in a while whether the mother process is - * still existing or has died without giving us due notice. if the - * latter is the case, then also exit this process - * - * check by calling "kill(PID,0)", where PID is the pid of the - * parent. if the return value is non-null, then kill couldn't find out - * about the parent process, so it is apparently gone - */ -struct MonitorData -{ - const pid_t master_pid; - const pid_t primary_pid; -}; - - -extern "C" -void * monitor_parent_liveness (void *monitor_data) -{ - const pid_t master_pid = ((MonitorData*)monitor_data)->master_pid; - const pid_t primary_pid = ((MonitorData*)monitor_data)->primary_pid; - - while (true) - { - int ret = kill (master_pid, 0); - if (ret != 0) - { - if ((ret == -1) && (errno == ESRCH)) - die ("Master process seems to have died!", primary_pid); - else - die ("Unspecified error while checking for other process!", - ret, errno, primary_pid); - } - - // ok, master still running, - // take a little rest and then - // ask again - sleep (10); - } - - return 0; -} - - - - -/** - * Put a certain number of objects to the output stream. - */ -template -void put (const T *t, const size_t N, const char * /*debug_info*/) -{ - unsigned int count = 0; - while (count < sizeof(T)*N) - { - // repeat writing until syscall - // is not interrupted - int ret; - do - ret = write (1, reinterpret_cast (t) + count, - sizeof(T) * N - count); - while ((ret<0) && (errno==EINTR)); - if (ret < 0) - die ("error on client side in 'put'", ret, errno, getpid()); - - count += ret; - } - - fflush (NULL); -} - - - -/** - * Read a certain number of objects from the input stream. - */ -template -void get (T *t, const size_t N, const char * /*debug_info*/) -{ - unsigned int count = 0; - while (count < sizeof(T)*N) - { - int ret; - do - ret = read (0, reinterpret_cast (t) + count, - sizeof(T) * N - count); - while ((ret<0) && (errno==EINTR)); - - if (ret < 0) - die ("error on client side in 'get'", ret, errno, getpid()); - else - count += ret; - } -} - -DEAL_II_NAMESPACE_CLOSE - - -int main () -{ - using namespace dealii; - - // first action is to get the pid - // of the master process, so that - // we can check whether it is still - // alive or not... - pid_t master_pid; - get (&master_pid, 1, "master_pid"); - // ...and start off a thread that - // actually checks that. this - // second process will eventually - // be kill when we exit the main - // program, but part from that we - // create it detached - static MonitorData monitor_data = { master_pid, getpid() }; - pthread_t thread; - pthread_create (&thread, 0, &monitor_parent_liveness, &monitor_data); - - // then go into the action loop... - unsigned int N, NZ, NSTEPS, LA, MAXFRT, LIW; - int IFLAG; - std::vector IRN, ICN, IW, IKEEP, IW1; - std::vector A; - - while (true) - { - char action; - get(&action, 1, "ACTION"); - - switch (action) - { - case '1': - { - get (&N, 1, "N"); - get (&NZ, 1, "NZ"); - - IRN.resize (NZ); - ICN.resize (NZ); - - get (&IRN[0], NZ, "IRN"); - get (&ICN[0], NZ, "ICN"); - get (&LIW, 1, "LIW"); - get (&IFLAG, 1, "IFLAG"); - - IW.resize (LIW); - IKEEP.resize (3*N); - IW1.resize (2*N); - - // next call function - HSL::MA27::ma27ad_ (&N, &NZ, &IRN[0], &ICN[0], &IW[0], &LIW, - &IKEEP[0], &IW1[0], &NSTEPS, &IFLAG); - - // then return IFLAG - put (&IFLAG, 1, "IFLAG"); - - sleep (1); - break; - }; - - case '2': - { - get (&LA, 1, "LA"); - A.resize (LA); - get (&A[0], LA, "A"); - - HSL::MA27::ma27bd_ (&N, &NZ, &IRN[0], &ICN[0], &A[0], &LA, - &IW[0], &LIW, &IKEEP[0], - &NSTEPS, &MAXFRT, &IW1[0], &IFLAG); - - // if IFLAG==0, then the - // call succeeded and we - // won't need ICN, IRN, - // and IKEEP any more - if (IFLAG==0) - { - std::vector tmp1, tmp2, tmp3; - ICN.swap (tmp1); - IRN.swap (tmp2); - IKEEP.swap (tmp3); - }; - - // finally return IFLAG - put (&IFLAG, 1, "IFLAG"); - - break; - }; - - - case '3': - { - std::vector W(MAXFRT); - std::vector rhs(N); - get (&rhs[0], N, "RHS"); - - HSL::MA27::ma27cd_ (&N, &A[0], &LA, &IW[0], - &LIW, &W[0], &MAXFRT, &rhs[0], - &IW1[0], &NSTEPS); - - put (&rhs[0], N, "RHS"); - - break; - }; - - - case '4': - { - unsigned int NRLNEC; - HSL::MA27::ma27x1_ (&NRLNEC); - put (&NRLNEC, 1, "NRLNEC"); - break; - }; - - case '5': - { - unsigned int NIRNEC; - HSL::MA27::ma27x2_ (&NIRNEC); - put (&NIRNEC, 1, "NIRNEC"); - break; - }; - - case '6': - { - unsigned int LP; - get (&LP, 1, "LP"); - HSL::MA27::ma27x3_ (&LP); - break; - }; - - case '7': - { - // ok, this is the stop - // signal. exit gracefully - exit (0); - break; - }; - - default: - die ("Invalid action key", action, - static_cast(action), - getpid()); - }; - }; - // exit without waiting for the - // child thread, since that will - // loop forever. however, we should - // never be able to get to this - // point anyway... -} - - diff --git a/deal.II/contrib/hsl/source/ma27sup.f b/deal.II/contrib/hsl/source/ma27sup.f deleted file mode 100644 index c7260a13c6..0000000000 --- a/deal.II/contrib/hsl/source/ma27sup.f +++ /dev/null @@ -1,43 +0,0 @@ -C Return the value of NRLNEC - - SUBROUTINE ma27x1(X) - INTEGER X - COMMON /MA27ED/OPS,IERROR,NRLTOT,NIRTOT,NRLNEC,NIRNEC,NRLADU, - + NIRADU,NRLBDU,NIRBDU,NCMPA,NCMPBR,NCMPBI,NTWO,NEIG - DOUBLE PRECISION OPS - INTEGER IERROR,NRLTOT,NIRTOT,NRLNEC,NIRNEC,NRLADU,NIRADU,NRLBDU, - + NIRBDU,NCMPA,NCMPBR,NCMPBI,NTWO,NEIG - - X=NRLNEC - RETURN - END - - - - -C Return the value of NIRNEC - SUBROUTINE ma27x2(X) - INTEGER X - COMMON /MA27ED/OPS,IERROR,NRLTOT,NIRTOT,NRLNEC,NIRNEC,NRLADU, - + NIRADU,NRLBDU,NIRBDU,NCMPA,NCMPBR,NCMPBI,NTWO,NEIG - DOUBLE PRECISION OPS - INTEGER IERROR,NRLTOT,NIRTOT,NRLNEC,NIRNEC,NRLADU,NIRADU,NRLBDU, - + NIRBDU,NCMPA,NCMPBR,NCMPBI,NTWO,NEIG - - X=NIRNEC - RETURN - END - - -C Set value of error stream. If zero, then no error output -C is generated, which is what we usually want since we catch -C errors internally and treat them - SUBROUTINE ma27x3(X) - INTEGER X - COMMON /MA27DD/U,LP,MP,LDIAG - DOUBLE PRECISION U - INTEGER LP,MP,LDIAG - - LP=X - RETURN - END diff --git a/deal.II/contrib/mesh_conversion/Main.cc b/deal.II/contrib/mesh_conversion/Main.cc old mode 100755 new mode 100644 diff --git a/deal.II/contrib/mesh_conversion/MeshConversion.cc b/deal.II/contrib/mesh_conversion/MeshConversion.cc old mode 100755 new mode 100644 diff --git a/deal.II/contrib/mesh_conversion/MeshConversion.h b/deal.II/contrib/mesh_conversion/MeshConversion.h old mode 100755 new mode 100644 diff --git a/deal.II/contrib/mesh_conversion/README.txt b/deal.II/contrib/mesh_conversion/README.txt old mode 100755 new mode 100644 diff --git a/deal.II/contrib/mesh_conversion/gpl-2.0.txt b/deal.II/contrib/mesh_conversion/gpl-2.0.txt new file mode 100644 index 0000000000..d159169d10 --- /dev/null +++ b/deal.II/contrib/mesh_conversion/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/deal.II/contrib/meshes/backstep.inp b/deal.II/contrib/meshes/backstep.inp deleted file mode 100644 index d3d7673594..0000000000 --- a/deal.II/contrib/meshes/backstep.inp +++ /dev/null @@ -1,34 +0,0 @@ -# Backward facing step -19 13 0 0 0 -1 -2 1 0 -2 -1 1 0 -3 0 1 0 -4 1 1 0 -5 2 1 0 -6 3 1 0 -7 4 1 0 -8 -2 0 0 -9 -1 0 0 -10 0 0 0 -11 1 0 0 -12 2 0 0 -13 3 0 0 -14 4 0 0 -15 0 -1 0 -16 1 -1 0 -17 2 -1 0 -18 3 -1 0 -19 4 -1 0 -1 0 quad 8 9 2 1 -2 0 quad 9 10 3 2 -3 0 quad 10 11 4 3 -4 0 quad 11 12 5 4 -5 0 quad 12 13 6 5 -6 0 quad 13 14 7 6 -7 0 quad 15 16 11 10 -8 0 quad 16 17 12 11 -9 0 quad 17 18 13 12 -10 0 quad 18 19 14 13 -11 1 line 1 8 -12 2 line 19 14 -13 2 line 14 7 diff --git a/deal.II/contrib/parameter_gui/README b/deal.II/contrib/parameter_gui/README new file mode 100644 index 0000000000..43f041a2bd --- /dev/null +++ b/deal.II/contrib/parameter_gui/README @@ -0,0 +1,5 @@ +This subdirectory contains the parameterr_gui project. + +It is copyrighted by Martin Steigemann and Wolfgang Bangerth and +distributed under the same license as the deal.II library, i.e. +The GNU Lesser General Public License (LGPL) version 2.1 or later. diff --git a/deal.II/contrib/parameter_gui/lgpl-2.1.txt b/deal.II/contrib/parameter_gui/lgpl-2.1.txt new file mode 100644 index 0000000000..4362b49151 --- /dev/null +++ b/deal.II/contrib/parameter_gui/lgpl-2.1.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/deal.II/contrib/tbb/tbb30_104oss/CHANGES b/deal.II/contrib/tbb30_104oss/CHANGES similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/CHANGES rename to deal.II/contrib/tbb30_104oss/CHANGES diff --git a/deal.II/contrib/tbb/tbb30_104oss/COPYING b/deal.II/contrib/tbb30_104oss/COPYING similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/COPYING rename to deal.II/contrib/tbb30_104oss/COPYING diff --git a/deal.II/contrib/tbb/tbb30_104oss/Makefile b/deal.II/contrib/tbb30_104oss/Makefile similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/Makefile rename to deal.II/contrib/tbb30_104oss/Makefile diff --git a/deal.II/contrib/tbb/tbb30_104oss/README b/deal.II/contrib/tbb30_104oss/README similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/README rename to deal.II/contrib/tbb30_104oss/README diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/AIX.gcc.inc b/deal.II/contrib/tbb30_104oss/build/AIX.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/AIX.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/AIX.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/AIX.inc b/deal.II/contrib/tbb30_104oss/build/AIX.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/AIX.inc rename to deal.II/contrib/tbb30_104oss/build/AIX.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/FreeBSD.gcc.inc b/deal.II/contrib/tbb30_104oss/build/FreeBSD.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/FreeBSD.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/FreeBSD.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/FreeBSD.inc b/deal.II/contrib/tbb30_104oss/build/FreeBSD.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/FreeBSD.inc rename to deal.II/contrib/tbb30_104oss/build/FreeBSD.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.rml b/deal.II/contrib/tbb30_104oss/build/Makefile.rml similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/Makefile.rml rename to deal.II/contrib/tbb30_104oss/build/Makefile.rml diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb b/deal.II/contrib/tbb30_104oss/build/Makefile.tbb similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbb rename to deal.II/contrib/tbb30_104oss/build/Makefile.tbb diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbbmalloc b/deal.II/contrib/tbb30_104oss/build/Makefile.tbbmalloc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/Makefile.tbbmalloc rename to deal.II/contrib/tbb30_104oss/build/Makefile.tbbmalloc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/Makefile.test b/deal.II/contrib/tbb30_104oss/build/Makefile.test similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/Makefile.test rename to deal.II/contrib/tbb30_104oss/build/Makefile.test diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/SunOS.gcc.inc b/deal.II/contrib/tbb30_104oss/build/SunOS.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/SunOS.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/SunOS.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/SunOS.inc b/deal.II/contrib/tbb30_104oss/build/SunOS.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/SunOS.inc rename to deal.II/contrib/tbb30_104oss/build/SunOS.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/SunOS.suncc.inc b/deal.II/contrib/tbb30_104oss/build/SunOS.suncc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/SunOS.suncc.inc rename to deal.II/contrib/tbb30_104oss/build/SunOS.suncc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/codecov.txt b/deal.II/contrib/tbb30_104oss/build/codecov.txt similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/codecov.txt rename to deal.II/contrib/tbb30_104oss/build/codecov.txt diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/common.inc b/deal.II/contrib/tbb30_104oss/build/common.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/common.inc rename to deal.II/contrib/tbb30_104oss/build/common.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc b/deal.II/contrib/tbb30_104oss/build/common_rules.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/common_rules.inc rename to deal.II/contrib/tbb30_104oss/build/common_rules.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/detect.js b/deal.II/contrib/tbb30_104oss/build/detect.js similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/detect.js rename to deal.II/contrib/tbb30_104oss/build/detect.js diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/generate_tbbvars.bat b/deal.II/contrib/tbb30_104oss/build/generate_tbbvars.bat similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/generate_tbbvars.bat rename to deal.II/contrib/tbb30_104oss/build/generate_tbbvars.bat diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/generate_tbbvars.sh b/deal.II/contrib/tbb30_104oss/build/generate_tbbvars.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/generate_tbbvars.sh rename to deal.II/contrib/tbb30_104oss/build/generate_tbbvars.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/index.html b/deal.II/contrib/tbb30_104oss/build/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/index.html rename to deal.II/contrib/tbb30_104oss/build/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/linux.gcc.inc b/deal.II/contrib/tbb30_104oss/build/linux.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/linux.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/linux.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/linux.icc.inc b/deal.II/contrib/tbb30_104oss/build/linux.icc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/linux.icc.inc rename to deal.II/contrib/tbb30_104oss/build/linux.icc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/linux.inc b/deal.II/contrib/tbb30_104oss/build/linux.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/linux.inc rename to deal.II/contrib/tbb30_104oss/build/linux.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/macos.gcc.inc b/deal.II/contrib/tbb30_104oss/build/macos.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/macos.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/macos.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/macos.icc.inc b/deal.II/contrib/tbb30_104oss/build/macos.icc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/macos.icc.inc rename to deal.II/contrib/tbb30_104oss/build/macos.icc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/macos.inc b/deal.II/contrib/tbb30_104oss/build/macos.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/macos.inc rename to deal.II/contrib/tbb30_104oss/build/macos.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/suncc.map.pause b/deal.II/contrib/tbb30_104oss/build/suncc.map.pause similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/suncc.map.pause rename to deal.II/contrib/tbb30_104oss/build/suncc.map.pause diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/test_launcher.bat b/deal.II/contrib/tbb30_104oss/build/test_launcher.bat similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/test_launcher.bat rename to deal.II/contrib/tbb30_104oss/build/test_launcher.bat diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/test_launcher.sh b/deal.II/contrib/tbb30_104oss/build/test_launcher.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/test_launcher.sh rename to deal.II/contrib/tbb30_104oss/build/test_launcher.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/version_info_aix.sh b/deal.II/contrib/tbb30_104oss/build/version_info_aix.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/version_info_aix.sh rename to deal.II/contrib/tbb30_104oss/build/version_info_aix.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/version_info_linux.sh b/deal.II/contrib/tbb30_104oss/build/version_info_linux.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/version_info_linux.sh rename to deal.II/contrib/tbb30_104oss/build/version_info_linux.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/version_info_macos.sh b/deal.II/contrib/tbb30_104oss/build/version_info_macos.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/version_info_macos.sh rename to deal.II/contrib/tbb30_104oss/build/version_info_macos.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/version_info_sunos.sh b/deal.II/contrib/tbb30_104oss/build/version_info_sunos.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/version_info_sunos.sh rename to deal.II/contrib/tbb30_104oss/build/version_info_sunos.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/version_info_windows.js b/deal.II/contrib/tbb30_104oss/build/version_info_windows.js similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/version_info_windows.js rename to deal.II/contrib/tbb30_104oss/build/version_info_windows.js diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/index.html b/deal.II/contrib/tbb30_104oss/build/vsproject/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/index.html rename to deal.II/contrib/tbb30_104oss/build/vsproject/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/makefile.sln b/deal.II/contrib/tbb30_104oss/build/vsproject/makefile.sln similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/makefile.sln rename to deal.II/contrib/tbb30_104oss/build/vsproject/makefile.sln diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbb.vcproj b/deal.II/contrib/tbb30_104oss/build/vsproject/tbb.vcproj similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbb.vcproj rename to deal.II/contrib/tbb30_104oss/build/vsproject/tbb.vcproj diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbbmalloc.vcproj b/deal.II/contrib/tbb30_104oss/build/vsproject/tbbmalloc.vcproj similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbbmalloc.vcproj rename to deal.II/contrib/tbb30_104oss/build/vsproject/tbbmalloc.vcproj diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbbmalloc_proxy.vcproj b/deal.II/contrib/tbb30_104oss/build/vsproject/tbbmalloc_proxy.vcproj similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/tbbmalloc_proxy.vcproj rename to deal.II/contrib/tbb30_104oss/build/vsproject/tbbmalloc_proxy.vcproj diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/vsproject/version_string.tmp b/deal.II/contrib/tbb30_104oss/build/vsproject/version_string.tmp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/vsproject/version_string.tmp rename to deal.II/contrib/tbb30_104oss/build/vsproject/version_string.tmp diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/windows.cl.inc b/deal.II/contrib/tbb30_104oss/build/windows.cl.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/windows.cl.inc rename to deal.II/contrib/tbb30_104oss/build/windows.cl.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/windows.gcc.inc b/deal.II/contrib/tbb30_104oss/build/windows.gcc.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/windows.gcc.inc rename to deal.II/contrib/tbb30_104oss/build/windows.gcc.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/windows.icl.inc b/deal.II/contrib/tbb30_104oss/build/windows.icl.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/windows.icl.inc rename to deal.II/contrib/tbb30_104oss/build/windows.icl.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/windows.inc b/deal.II/contrib/tbb30_104oss/build/windows.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/windows.inc rename to deal.II/contrib/tbb30_104oss/build/windows.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/xbox360.cl.inc b/deal.II/contrib/tbb30_104oss/build/xbox360.cl.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/xbox360.cl.inc rename to deal.II/contrib/tbb30_104oss/build/xbox360.cl.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/build/xbox360.inc b/deal.II/contrib/tbb30_104oss/build/xbox360.inc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/build/xbox360.inc rename to deal.II/contrib/tbb30_104oss/build/xbox360.inc diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/Release_Notes.txt b/deal.II/contrib/tbb30_104oss/doc/Release_Notes.txt similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/Release_Notes.txt rename to deal.II/contrib/tbb30_104oss/doc/Release_Notes.txt diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00001.html b/deal.II/contrib/tbb30_104oss/doc/html/a00001.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00001.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00001.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00002.html b/deal.II/contrib/tbb30_104oss/doc/html/a00002.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00002.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00002.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00003.html b/deal.II/contrib/tbb30_104oss/doc/html/a00003.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00003.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00003.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00004.html b/deal.II/contrib/tbb30_104oss/doc/html/a00004.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00004.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00004.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00005.html b/deal.II/contrib/tbb30_104oss/doc/html/a00005.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00005.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00005.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00006.html b/deal.II/contrib/tbb30_104oss/doc/html/a00006.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00006.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00006.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00007.html b/deal.II/contrib/tbb30_104oss/doc/html/a00007.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00007.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00007.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00009.html b/deal.II/contrib/tbb30_104oss/doc/html/a00009.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00009.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00009.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00011.html b/deal.II/contrib/tbb30_104oss/doc/html/a00011.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00011.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00011.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00012.html b/deal.II/contrib/tbb30_104oss/doc/html/a00012.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00012.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00012.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00013.html b/deal.II/contrib/tbb30_104oss/doc/html/a00013.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00013.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00013.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00015.html b/deal.II/contrib/tbb30_104oss/doc/html/a00015.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00015.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00015.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00016.html b/deal.II/contrib/tbb30_104oss/doc/html/a00016.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00016.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00016.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00017.html b/deal.II/contrib/tbb30_104oss/doc/html/a00017.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00017.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00017.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00018.html b/deal.II/contrib/tbb30_104oss/doc/html/a00018.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00018.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00018.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00019.html b/deal.II/contrib/tbb30_104oss/doc/html/a00019.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00019.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00019.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00021.html b/deal.II/contrib/tbb30_104oss/doc/html/a00021.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00021.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00021.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00026.html b/deal.II/contrib/tbb30_104oss/doc/html/a00026.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00026.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00026.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00031.html b/deal.II/contrib/tbb30_104oss/doc/html/a00031.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00031.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00031.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00034.html b/deal.II/contrib/tbb30_104oss/doc/html/a00034.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00034.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00034.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00035.html b/deal.II/contrib/tbb30_104oss/doc/html/a00035.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00035.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00035.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00036.html b/deal.II/contrib/tbb30_104oss/doc/html/a00036.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00036.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00036.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00037.html b/deal.II/contrib/tbb30_104oss/doc/html/a00037.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00037.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00037.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00038.html b/deal.II/contrib/tbb30_104oss/doc/html/a00038.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00038.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00038.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00039.html b/deal.II/contrib/tbb30_104oss/doc/html/a00039.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00039.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00039.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00040.html b/deal.II/contrib/tbb30_104oss/doc/html/a00040.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00040.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00040.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00041.html b/deal.II/contrib/tbb30_104oss/doc/html/a00041.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00041.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00041.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00042.html b/deal.II/contrib/tbb30_104oss/doc/html/a00042.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00042.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00042.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00043.html b/deal.II/contrib/tbb30_104oss/doc/html/a00043.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00043.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00043.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00044.html b/deal.II/contrib/tbb30_104oss/doc/html/a00044.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00044.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00044.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00046.html b/deal.II/contrib/tbb30_104oss/doc/html/a00046.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00046.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00046.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00048.html b/deal.II/contrib/tbb30_104oss/doc/html/a00048.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00048.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00048.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00049.html b/deal.II/contrib/tbb30_104oss/doc/html/a00049.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00049.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00049.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00050.html b/deal.II/contrib/tbb30_104oss/doc/html/a00050.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00050.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00050.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00051.html b/deal.II/contrib/tbb30_104oss/doc/html/a00051.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00051.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00051.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00052.html b/deal.II/contrib/tbb30_104oss/doc/html/a00052.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00052.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00052.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00053.html b/deal.II/contrib/tbb30_104oss/doc/html/a00053.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00053.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00053.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00054.html b/deal.II/contrib/tbb30_104oss/doc/html/a00054.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00054.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00054.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00055.html b/deal.II/contrib/tbb30_104oss/doc/html/a00055.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00055.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00055.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00056.html b/deal.II/contrib/tbb30_104oss/doc/html/a00056.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00056.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00056.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00057.html b/deal.II/contrib/tbb30_104oss/doc/html/a00057.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00057.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00057.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00058.html b/deal.II/contrib/tbb30_104oss/doc/html/a00058.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00058.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00058.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00059.html b/deal.II/contrib/tbb30_104oss/doc/html/a00059.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00059.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00059.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00060.html b/deal.II/contrib/tbb30_104oss/doc/html/a00060.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00060.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00060.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00061.html b/deal.II/contrib/tbb30_104oss/doc/html/a00061.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00061.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00061.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00062.html b/deal.II/contrib/tbb30_104oss/doc/html/a00062.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00062.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00062.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00063.html b/deal.II/contrib/tbb30_104oss/doc/html/a00063.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00063.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00063.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00065.html b/deal.II/contrib/tbb30_104oss/doc/html/a00065.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00065.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00065.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00067.html b/deal.II/contrib/tbb30_104oss/doc/html/a00067.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00067.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00067.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00068.html b/deal.II/contrib/tbb30_104oss/doc/html/a00068.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00068.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00068.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00069.html b/deal.II/contrib/tbb30_104oss/doc/html/a00069.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00069.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00069.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00070.html b/deal.II/contrib/tbb30_104oss/doc/html/a00070.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00070.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00070.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00072.html b/deal.II/contrib/tbb30_104oss/doc/html/a00072.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00072.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00072.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00073.html b/deal.II/contrib/tbb30_104oss/doc/html/a00073.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00073.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00073.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00075.html b/deal.II/contrib/tbb30_104oss/doc/html/a00075.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00075.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00075.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00076.html b/deal.II/contrib/tbb30_104oss/doc/html/a00076.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00076.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00076.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00077.html b/deal.II/contrib/tbb30_104oss/doc/html/a00077.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00077.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00077.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00084.html b/deal.II/contrib/tbb30_104oss/doc/html/a00084.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00084.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00084.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00086.html b/deal.II/contrib/tbb30_104oss/doc/html/a00086.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00086.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00086.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00088.html b/deal.II/contrib/tbb30_104oss/doc/html/a00088.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00088.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00088.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00090.html b/deal.II/contrib/tbb30_104oss/doc/html/a00090.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00090.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00090.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00092.html b/deal.II/contrib/tbb30_104oss/doc/html/a00092.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00092.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00092.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00094.html b/deal.II/contrib/tbb30_104oss/doc/html/a00094.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00094.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00094.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00095.html b/deal.II/contrib/tbb30_104oss/doc/html/a00095.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00095.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00095.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00096.html b/deal.II/contrib/tbb30_104oss/doc/html/a00096.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00096.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00096.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00097.html b/deal.II/contrib/tbb30_104oss/doc/html/a00097.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00097.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00097.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00098.html b/deal.II/contrib/tbb30_104oss/doc/html/a00098.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00098.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00098.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00099.html b/deal.II/contrib/tbb30_104oss/doc/html/a00099.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00099.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00099.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00100.html b/deal.II/contrib/tbb30_104oss/doc/html/a00100.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00100.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00100.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00101.html b/deal.II/contrib/tbb30_104oss/doc/html/a00101.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00101.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00101.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00102.html b/deal.II/contrib/tbb30_104oss/doc/html/a00102.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00102.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00102.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00109.html b/deal.II/contrib/tbb30_104oss/doc/html/a00109.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00109.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00109.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00115.html b/deal.II/contrib/tbb30_104oss/doc/html/a00115.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00115.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00115.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00116.html b/deal.II/contrib/tbb30_104oss/doc/html/a00116.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00116.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00116.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00145.html b/deal.II/contrib/tbb30_104oss/doc/html/a00145.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00145.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00145.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00146.html b/deal.II/contrib/tbb30_104oss/doc/html/a00146.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00146.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00146.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00147.html b/deal.II/contrib/tbb30_104oss/doc/html/a00147.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00147.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00147.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00148.html b/deal.II/contrib/tbb30_104oss/doc/html/a00148.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00148.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00148.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00149.html b/deal.II/contrib/tbb30_104oss/doc/html/a00149.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00149.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00149.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00150.html b/deal.II/contrib/tbb30_104oss/doc/html/a00150.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00150.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00150.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00151.html b/deal.II/contrib/tbb30_104oss/doc/html/a00151.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00151.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00151.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00152.html b/deal.II/contrib/tbb30_104oss/doc/html/a00152.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00152.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00152.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00153.html b/deal.II/contrib/tbb30_104oss/doc/html/a00153.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00153.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00153.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00154.html b/deal.II/contrib/tbb30_104oss/doc/html/a00154.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00154.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00154.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00155.html b/deal.II/contrib/tbb30_104oss/doc/html/a00155.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00155.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00155.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00156.html b/deal.II/contrib/tbb30_104oss/doc/html/a00156.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00156.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00156.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00157.html b/deal.II/contrib/tbb30_104oss/doc/html/a00157.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00157.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00157.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00157.png b/deal.II/contrib/tbb30_104oss/doc/html/a00157.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00157.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00157.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00158.html b/deal.II/contrib/tbb30_104oss/doc/html/a00158.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00158.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00158.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00159.html b/deal.II/contrib/tbb30_104oss/doc/html/a00159.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00159.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00159.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00159.png b/deal.II/contrib/tbb30_104oss/doc/html/a00159.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00159.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00159.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00160.html b/deal.II/contrib/tbb30_104oss/doc/html/a00160.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00160.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00160.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00161.html b/deal.II/contrib/tbb30_104oss/doc/html/a00161.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00161.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00161.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00161.png b/deal.II/contrib/tbb30_104oss/doc/html/a00161.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00161.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00161.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00162.html b/deal.II/contrib/tbb30_104oss/doc/html/a00162.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00162.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00162.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00163.html b/deal.II/contrib/tbb30_104oss/doc/html/a00163.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00163.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00163.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00163.png b/deal.II/contrib/tbb30_104oss/doc/html/a00163.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00163.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00163.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00164.html b/deal.II/contrib/tbb30_104oss/doc/html/a00164.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00164.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00164.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00165.html b/deal.II/contrib/tbb30_104oss/doc/html/a00165.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00165.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00165.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00165.png b/deal.II/contrib/tbb30_104oss/doc/html/a00165.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00165.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00165.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00166.html b/deal.II/contrib/tbb30_104oss/doc/html/a00166.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00166.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00166.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00167.html b/deal.II/contrib/tbb30_104oss/doc/html/a00167.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00167.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00167.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00167.png b/deal.II/contrib/tbb30_104oss/doc/html/a00167.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00167.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00167.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00168.html b/deal.II/contrib/tbb30_104oss/doc/html/a00168.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00168.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00168.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00169.html b/deal.II/contrib/tbb30_104oss/doc/html/a00169.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00169.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00169.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00169.png b/deal.II/contrib/tbb30_104oss/doc/html/a00169.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00169.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00169.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00170.html b/deal.II/contrib/tbb30_104oss/doc/html/a00170.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00170.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00170.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00171.html b/deal.II/contrib/tbb30_104oss/doc/html/a00171.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00171.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00171.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00172.html b/deal.II/contrib/tbb30_104oss/doc/html/a00172.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00172.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00172.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00173.html b/deal.II/contrib/tbb30_104oss/doc/html/a00173.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00173.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00173.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00174.html b/deal.II/contrib/tbb30_104oss/doc/html/a00174.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00174.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00174.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00175.html b/deal.II/contrib/tbb30_104oss/doc/html/a00175.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00175.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00175.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00176.html b/deal.II/contrib/tbb30_104oss/doc/html/a00176.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00176.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00176.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00176.png b/deal.II/contrib/tbb30_104oss/doc/html/a00176.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00176.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00176.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00177.html b/deal.II/contrib/tbb30_104oss/doc/html/a00177.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00177.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00177.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00178.html b/deal.II/contrib/tbb30_104oss/doc/html/a00178.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00178.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00178.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00179.html b/deal.II/contrib/tbb30_104oss/doc/html/a00179.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00179.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00179.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00180.html b/deal.II/contrib/tbb30_104oss/doc/html/a00180.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00180.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00180.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00181.html b/deal.II/contrib/tbb30_104oss/doc/html/a00181.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00181.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00181.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00182.html b/deal.II/contrib/tbb30_104oss/doc/html/a00182.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00182.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00182.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00183.html b/deal.II/contrib/tbb30_104oss/doc/html/a00183.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00183.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00183.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00184.html b/deal.II/contrib/tbb30_104oss/doc/html/a00184.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00184.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00184.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00185.html b/deal.II/contrib/tbb30_104oss/doc/html/a00185.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00185.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00185.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00186.html b/deal.II/contrib/tbb30_104oss/doc/html/a00186.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00186.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00186.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00187.html b/deal.II/contrib/tbb30_104oss/doc/html/a00187.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00187.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00187.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00188.html b/deal.II/contrib/tbb30_104oss/doc/html/a00188.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00188.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00188.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00189.html b/deal.II/contrib/tbb30_104oss/doc/html/a00189.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00189.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00189.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00190.html b/deal.II/contrib/tbb30_104oss/doc/html/a00190.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00190.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00190.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00191.html b/deal.II/contrib/tbb30_104oss/doc/html/a00191.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00191.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00191.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00192.html b/deal.II/contrib/tbb30_104oss/doc/html/a00192.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00192.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00192.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00193.html b/deal.II/contrib/tbb30_104oss/doc/html/a00193.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00193.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00193.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00194.html b/deal.II/contrib/tbb30_104oss/doc/html/a00194.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00194.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00194.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00195.html b/deal.II/contrib/tbb30_104oss/doc/html/a00195.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00195.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00195.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00196.html b/deal.II/contrib/tbb30_104oss/doc/html/a00196.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00196.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00196.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00197.html b/deal.II/contrib/tbb30_104oss/doc/html/a00197.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00197.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00197.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00198.html b/deal.II/contrib/tbb30_104oss/doc/html/a00198.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00198.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00198.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00199.html b/deal.II/contrib/tbb30_104oss/doc/html/a00199.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00199.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00199.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00200.html b/deal.II/contrib/tbb30_104oss/doc/html/a00200.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00200.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00200.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00201.html b/deal.II/contrib/tbb30_104oss/doc/html/a00201.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00201.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00201.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00202.html b/deal.II/contrib/tbb30_104oss/doc/html/a00202.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00202.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00202.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00203.html b/deal.II/contrib/tbb30_104oss/doc/html/a00203.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00203.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00203.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00204.html b/deal.II/contrib/tbb30_104oss/doc/html/a00204.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00204.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00204.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00204.png b/deal.II/contrib/tbb30_104oss/doc/html/a00204.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00204.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00204.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00205.html b/deal.II/contrib/tbb30_104oss/doc/html/a00205.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00205.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00205.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00206.html b/deal.II/contrib/tbb30_104oss/doc/html/a00206.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00206.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00206.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00207.html b/deal.II/contrib/tbb30_104oss/doc/html/a00207.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00207.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00207.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00208.html b/deal.II/contrib/tbb30_104oss/doc/html/a00208.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00208.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00208.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00209.html b/deal.II/contrib/tbb30_104oss/doc/html/a00209.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00209.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00209.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00210.html b/deal.II/contrib/tbb30_104oss/doc/html/a00210.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00210.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00210.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00211.html b/deal.II/contrib/tbb30_104oss/doc/html/a00211.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00211.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00211.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00211.png b/deal.II/contrib/tbb30_104oss/doc/html/a00211.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00211.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00211.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00212.html b/deal.II/contrib/tbb30_104oss/doc/html/a00212.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00212.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00212.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00213.html b/deal.II/contrib/tbb30_104oss/doc/html/a00213.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00213.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00213.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00214.html b/deal.II/contrib/tbb30_104oss/doc/html/a00214.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00214.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00214.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00214.png b/deal.II/contrib/tbb30_104oss/doc/html/a00214.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00214.png rename to deal.II/contrib/tbb30_104oss/doc/html/a00214.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00215.html b/deal.II/contrib/tbb30_104oss/doc/html/a00215.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00215.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00215.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00216.html b/deal.II/contrib/tbb30_104oss/doc/html/a00216.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00216.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00216.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00217.html b/deal.II/contrib/tbb30_104oss/doc/html/a00217.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00217.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00217.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00218.html b/deal.II/contrib/tbb30_104oss/doc/html/a00218.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00218.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00218.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00219.html b/deal.II/contrib/tbb30_104oss/doc/html/a00219.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00219.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00219.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00253.html b/deal.II/contrib/tbb30_104oss/doc/html/a00253.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00253.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00253.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00272.html b/deal.II/contrib/tbb30_104oss/doc/html/a00272.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00272.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00272.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00279.html b/deal.II/contrib/tbb30_104oss/doc/html/a00279.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00279.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00279.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00280.html b/deal.II/contrib/tbb30_104oss/doc/html/a00280.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00280.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00280.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00281.html b/deal.II/contrib/tbb30_104oss/doc/html/a00281.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00281.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00281.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00282.html b/deal.II/contrib/tbb30_104oss/doc/html/a00282.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00282.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00282.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00283.html b/deal.II/contrib/tbb30_104oss/doc/html/a00283.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00283.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00283.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00284.html b/deal.II/contrib/tbb30_104oss/doc/html/a00284.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00284.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00284.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00285.html b/deal.II/contrib/tbb30_104oss/doc/html/a00285.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00285.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00285.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00286.html b/deal.II/contrib/tbb30_104oss/doc/html/a00286.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00286.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00286.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00304.html b/deal.II/contrib/tbb30_104oss/doc/html/a00304.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00304.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00304.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00314.html b/deal.II/contrib/tbb30_104oss/doc/html/a00314.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00314.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00314.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00316.html b/deal.II/contrib/tbb30_104oss/doc/html/a00316.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00316.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00316.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00317.html b/deal.II/contrib/tbb30_104oss/doc/html/a00317.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00317.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00317.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00325.html b/deal.II/contrib/tbb30_104oss/doc/html/a00325.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00325.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00325.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00326.html b/deal.II/contrib/tbb30_104oss/doc/html/a00326.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00326.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00326.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00327.html b/deal.II/contrib/tbb30_104oss/doc/html/a00327.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00327.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00327.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00328.html b/deal.II/contrib/tbb30_104oss/doc/html/a00328.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00328.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00328.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00330.html b/deal.II/contrib/tbb30_104oss/doc/html/a00330.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00330.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00330.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00331.html b/deal.II/contrib/tbb30_104oss/doc/html/a00331.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00331.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00331.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00341.html b/deal.II/contrib/tbb30_104oss/doc/html/a00341.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00341.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00341.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00342.html b/deal.II/contrib/tbb30_104oss/doc/html/a00342.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00342.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00342.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00347.html b/deal.II/contrib/tbb30_104oss/doc/html/a00347.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00347.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00347.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00356.html b/deal.II/contrib/tbb30_104oss/doc/html/a00356.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00356.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00356.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00359.html b/deal.II/contrib/tbb30_104oss/doc/html/a00359.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00359.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00359.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00372.html b/deal.II/contrib/tbb30_104oss/doc/html/a00372.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00372.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00372.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00374.html b/deal.II/contrib/tbb30_104oss/doc/html/a00374.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00374.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00374.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00375.html b/deal.II/contrib/tbb30_104oss/doc/html/a00375.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00375.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00375.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00376.html b/deal.II/contrib/tbb30_104oss/doc/html/a00376.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00376.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00376.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00385.html b/deal.II/contrib/tbb30_104oss/doc/html/a00385.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00385.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00385.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00389.html b/deal.II/contrib/tbb30_104oss/doc/html/a00389.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00389.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00389.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00391.html b/deal.II/contrib/tbb30_104oss/doc/html/a00391.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00391.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00391.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00397.html b/deal.II/contrib/tbb30_104oss/doc/html/a00397.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00397.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00397.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00401.html b/deal.II/contrib/tbb30_104oss/doc/html/a00401.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00401.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00401.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00406.html b/deal.II/contrib/tbb30_104oss/doc/html/a00406.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00406.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00406.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00410.html b/deal.II/contrib/tbb30_104oss/doc/html/a00410.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00410.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00410.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00414.html b/deal.II/contrib/tbb30_104oss/doc/html/a00414.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00414.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00414.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00419.html b/deal.II/contrib/tbb30_104oss/doc/html/a00419.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00419.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00419.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00431.html b/deal.II/contrib/tbb30_104oss/doc/html/a00431.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00431.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00431.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00432.html b/deal.II/contrib/tbb30_104oss/doc/html/a00432.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00432.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00432.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00433.html b/deal.II/contrib/tbb30_104oss/doc/html/a00433.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00433.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00433.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00434.html b/deal.II/contrib/tbb30_104oss/doc/html/a00434.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00434.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00434.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00435.html b/deal.II/contrib/tbb30_104oss/doc/html/a00435.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00435.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00435.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00436.html b/deal.II/contrib/tbb30_104oss/doc/html/a00436.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00436.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00436.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00437.html b/deal.II/contrib/tbb30_104oss/doc/html/a00437.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00437.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00437.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00438.html b/deal.II/contrib/tbb30_104oss/doc/html/a00438.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00438.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00438.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00447.html b/deal.II/contrib/tbb30_104oss/doc/html/a00447.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00447.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00447.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00454.html b/deal.II/contrib/tbb30_104oss/doc/html/a00454.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00454.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00454.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00455.html b/deal.II/contrib/tbb30_104oss/doc/html/a00455.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00455.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00455.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00457.html b/deal.II/contrib/tbb30_104oss/doc/html/a00457.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00457.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00457.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00458.html b/deal.II/contrib/tbb30_104oss/doc/html/a00458.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00458.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00458.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00462.html b/deal.II/contrib/tbb30_104oss/doc/html/a00462.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00462.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00462.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00463.html b/deal.II/contrib/tbb30_104oss/doc/html/a00463.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00463.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00463.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00464.html b/deal.II/contrib/tbb30_104oss/doc/html/a00464.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00464.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00464.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00465.html b/deal.II/contrib/tbb30_104oss/doc/html/a00465.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00465.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00465.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00470.html b/deal.II/contrib/tbb30_104oss/doc/html/a00470.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00470.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00470.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00471.html b/deal.II/contrib/tbb30_104oss/doc/html/a00471.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00471.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00471.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00478.html b/deal.II/contrib/tbb30_104oss/doc/html/a00478.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00478.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00478.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00486.html b/deal.II/contrib/tbb30_104oss/doc/html/a00486.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00486.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00486.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/a00488.html b/deal.II/contrib/tbb30_104oss/doc/html/a00488.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/a00488.html rename to deal.II/contrib/tbb30_104oss/doc/html/a00488.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/annotated.html b/deal.II/contrib/tbb30_104oss/doc/html/annotated.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/annotated.html rename to deal.II/contrib/tbb30_104oss/doc/html/annotated.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/concepts.html b/deal.II/contrib/tbb30_104oss/doc/html/concepts.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/concepts.html rename to deal.II/contrib/tbb30_104oss/doc/html/concepts.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/deprecated.html b/deal.II/contrib/tbb30_104oss/doc/html/deprecated.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/deprecated.html rename to deal.II/contrib/tbb30_104oss/doc/html/deprecated.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/doxygen.css b/deal.II/contrib/tbb30_104oss/doc/html/doxygen.css similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/doxygen.css rename to deal.II/contrib/tbb30_104oss/doc/html/doxygen.css diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/doxygen.png b/deal.II/contrib/tbb30_104oss/doc/html/doxygen.png similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/doxygen.png rename to deal.II/contrib/tbb30_104oss/doc/html/doxygen.png diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/files.html b/deal.II/contrib/tbb30_104oss/doc/html/files.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/files.html rename to deal.II/contrib/tbb30_104oss/doc/html/files.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions.html b/deal.II/contrib/tbb30_104oss/doc/html/functions.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_enum.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_enum.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_enum.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_enum.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_eval.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_eval.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_eval.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_eval.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_func.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_func.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_func.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_func.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_rela.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_rela.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_rela.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_rela.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_type.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_type.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_type.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_type.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_vars.html b/deal.II/contrib/tbb30_104oss/doc/html/functions_vars.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/functions_vars.html rename to deal.II/contrib/tbb30_104oss/doc/html/functions_vars.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/globals.html b/deal.II/contrib/tbb30_104oss/doc/html/globals.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/globals.html rename to deal.II/contrib/tbb30_104oss/doc/html/globals.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/globals_func.html b/deal.II/contrib/tbb30_104oss/doc/html/globals_func.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/globals_func.html rename to deal.II/contrib/tbb30_104oss/doc/html/globals_func.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/hierarchy.html b/deal.II/contrib/tbb30_104oss/doc/html/hierarchy.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/hierarchy.html rename to deal.II/contrib/tbb30_104oss/doc/html/hierarchy.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/index.html b/deal.II/contrib/tbb30_104oss/doc/html/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/index.html rename to deal.II/contrib/tbb30_104oss/doc/html/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/modules.html b/deal.II/contrib/tbb30_104oss/doc/html/modules.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/modules.html rename to deal.II/contrib/tbb30_104oss/doc/html/modules.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers.html b/deal.II/contrib/tbb30_104oss/doc/html/namespacemembers.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespacemembers.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_enum.html b/deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_enum.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_enum.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_enum.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_eval.html b/deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_eval.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_eval.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_eval.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_func.html b/deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_func.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_func.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_func.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_type.html b/deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_type.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespacemembers_type.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespacemembers_type.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/namespaces.html b/deal.II/contrib/tbb30_104oss/doc/html/namespaces.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/namespaces.html rename to deal.II/contrib/tbb30_104oss/doc/html/namespaces.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/pages.html b/deal.II/contrib/tbb30_104oss/doc/html/pages.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/pages.html rename to deal.II/contrib/tbb30_104oss/doc/html/pages.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_do_body_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_do_body_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_do_body_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_do_body_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_for_body_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_for_body_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_for_body_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_for_body_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_reduce_body_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_reduce_body_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_reduce_body_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_reduce_body_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_reduce_lambda_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_reduce_lambda_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_reduce_lambda_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_reduce_lambda_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_scan_body_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_scan_body_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_scan_body_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_scan_body_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_sort_iter_req.html b/deal.II/contrib/tbb30_104oss/doc/html/parallel_sort_iter_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/parallel_sort_iter_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/parallel_sort_iter_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/range_req.html b/deal.II/contrib/tbb30_104oss/doc/html/range_req.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/range_req.html rename to deal.II/contrib/tbb30_104oss/doc/html/range_req.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_b.gif b/deal.II/contrib/tbb30_104oss/doc/html/tab_b.gif similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_b.gif rename to deal.II/contrib/tbb30_104oss/doc/html/tab_b.gif diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_l.gif b/deal.II/contrib/tbb30_104oss/doc/html/tab_l.gif similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_l.gif rename to deal.II/contrib/tbb30_104oss/doc/html/tab_l.gif diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_r.gif b/deal.II/contrib/tbb30_104oss/doc/html/tab_r.gif similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/tab_r.gif rename to deal.II/contrib/tbb30_104oss/doc/html/tab_r.gif diff --git a/deal.II/contrib/tbb/tbb30_104oss/doc/html/tabs.css b/deal.II/contrib/tbb30_104oss/doc/html/tabs.css similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/doc/html/tabs.css rename to deal.II/contrib/tbb30_104oss/doc/html/tabs.css diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/index.html b/deal.II/contrib/tbb30_104oss/include/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/index.html rename to deal.II/contrib/tbb30_104oss/include/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/_concurrent_queue_internal.h b/deal.II/contrib/tbb30_104oss/include/tbb/_concurrent_queue_internal.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/_concurrent_queue_internal.h rename to deal.II/contrib/tbb30_104oss/include/tbb/_concurrent_queue_internal.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/_concurrent_unordered_internal.h b/deal.II/contrib/tbb30_104oss/include/tbb/_concurrent_unordered_internal.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/_concurrent_unordered_internal.h rename to deal.II/contrib/tbb30_104oss/include/tbb/_concurrent_unordered_internal.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/_tbb_windef.h b/deal.II/contrib/tbb30_104oss/include/tbb/_tbb_windef.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/_tbb_windef.h rename to deal.II/contrib/tbb30_104oss/include/tbb/_tbb_windef.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/aligned_space.h b/deal.II/contrib/tbb30_104oss/include/tbb/aligned_space.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/aligned_space.h rename to deal.II/contrib/tbb30_104oss/include/tbb/aligned_space.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/atomic.h b/deal.II/contrib/tbb30_104oss/include/tbb/atomic.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/atomic.h rename to deal.II/contrib/tbb30_104oss/include/tbb/atomic.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range.h b/deal.II/contrib/tbb30_104oss/include/tbb/blocked_range.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range.h rename to deal.II/contrib/tbb30_104oss/include/tbb/blocked_range.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range2d.h b/deal.II/contrib/tbb30_104oss/include/tbb/blocked_range2d.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range2d.h rename to deal.II/contrib/tbb30_104oss/include/tbb/blocked_range2d.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range3d.h b/deal.II/contrib/tbb30_104oss/include/tbb/blocked_range3d.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/blocked_range3d.h rename to deal.II/contrib/tbb30_104oss/include/tbb/blocked_range3d.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/cache_aligned_allocator.h b/deal.II/contrib/tbb30_104oss/include/tbb/cache_aligned_allocator.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/cache_aligned_allocator.h rename to deal.II/contrib/tbb30_104oss/include/tbb/cache_aligned_allocator.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/combinable.h b/deal.II/contrib/tbb30_104oss/include/tbb/combinable.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/combinable.h rename to deal.II/contrib/tbb30_104oss/include/tbb/combinable.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/condition_variable b/deal.II/contrib/tbb30_104oss/include/tbb/compat/condition_variable similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/condition_variable rename to deal.II/contrib/tbb30_104oss/include/tbb/compat/condition_variable diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/ppl.h b/deal.II/contrib/tbb30_104oss/include/tbb/compat/ppl.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/ppl.h rename to deal.II/contrib/tbb30_104oss/include/tbb/compat/ppl.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/thread b/deal.II/contrib/tbb30_104oss/include/tbb/compat/thread similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/compat/thread rename to deal.II/contrib/tbb30_104oss/include/tbb/compat/thread diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_hash_map.h b/deal.II/contrib/tbb30_104oss/include/tbb/concurrent_hash_map.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_hash_map.h rename to deal.II/contrib/tbb30_104oss/include/tbb/concurrent_hash_map.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_queue.h b/deal.II/contrib/tbb30_104oss/include/tbb/concurrent_queue.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_queue.h rename to deal.II/contrib/tbb30_104oss/include/tbb/concurrent_queue.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_unordered_map.h b/deal.II/contrib/tbb30_104oss/include/tbb/concurrent_unordered_map.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_unordered_map.h rename to deal.II/contrib/tbb30_104oss/include/tbb/concurrent_unordered_map.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_vector.h b/deal.II/contrib/tbb30_104oss/include/tbb/concurrent_vector.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/concurrent_vector.h rename to deal.II/contrib/tbb30_104oss/include/tbb/concurrent_vector.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/critical_section.h b/deal.II/contrib/tbb30_104oss/include/tbb/critical_section.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/critical_section.h rename to deal.II/contrib/tbb30_104oss/include/tbb/critical_section.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/enumerable_thread_specific.h b/deal.II/contrib/tbb30_104oss/include/tbb/enumerable_thread_specific.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/enumerable_thread_specific.h rename to deal.II/contrib/tbb30_104oss/include/tbb/enumerable_thread_specific.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/index.html b/deal.II/contrib/tbb30_104oss/include/tbb/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/index.html rename to deal.II/contrib/tbb30_104oss/include/tbb/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/ibm_aix51.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/ibm_aix51.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/ibm_aix51.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/ibm_aix51.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_common.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_common.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_common.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_common.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_ia32.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_ia32.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_ia32.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_ia32.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_ia64.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_ia64.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_ia64.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_ia64.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_intel64.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_intel64.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/linux_intel64.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/linux_intel64.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/mac_ppc.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/mac_ppc.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/mac_ppc.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/mac_ppc.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/macos_common.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/macos_common.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/macos_common.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/macos_common.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/sunos_sparc.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/sunos_sparc.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/sunos_sparc.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/sunos_sparc.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_api.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_api.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_api.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_api.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_ia32.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_ia32.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_ia32.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_ia32.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_intel64.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_intel64.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/windows_intel64.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/windows_intel64.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/xbox360_ppc.h b/deal.II/contrib/tbb30_104oss/include/tbb/machine/xbox360_ppc.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/machine/xbox360_ppc.h rename to deal.II/contrib/tbb30_104oss/include/tbb/machine/xbox360_ppc.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/null_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/null_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/null_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/null_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/null_rw_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/null_rw_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/null_rw_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/null_rw_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_do.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_do.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_do.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_do.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_for.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_for.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_for.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_for.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_for_each.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_for_each.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_for_each.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_for_each.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_invoke.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_invoke.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_invoke.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_invoke.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_reduce.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_reduce.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_reduce.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_reduce.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_scan.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_scan.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_scan.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_scan.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_sort.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_sort.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_sort.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_sort.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_while.h b/deal.II/contrib/tbb30_104oss/include/tbb/parallel_while.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/parallel_while.h rename to deal.II/contrib/tbb30_104oss/include/tbb/parallel_while.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/partitioner.h b/deal.II/contrib/tbb30_104oss/include/tbb/partitioner.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/partitioner.h rename to deal.II/contrib/tbb30_104oss/include/tbb/partitioner.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/pipeline.h b/deal.II/contrib/tbb30_104oss/include/tbb/pipeline.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/pipeline.h rename to deal.II/contrib/tbb30_104oss/include/tbb/pipeline.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/queuing_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/queuing_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/queuing_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/queuing_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/queuing_rw_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/queuing_rw_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/queuing_rw_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/queuing_rw_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/reader_writer_lock.h b/deal.II/contrib/tbb30_104oss/include/tbb/reader_writer_lock.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/reader_writer_lock.h rename to deal.II/contrib/tbb30_104oss/include/tbb/reader_writer_lock.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/recursive_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/recursive_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/recursive_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/recursive_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/scalable_allocator.h b/deal.II/contrib/tbb30_104oss/include/tbb/scalable_allocator.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/scalable_allocator.h rename to deal.II/contrib/tbb30_104oss/include/tbb/scalable_allocator.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/spin_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/spin_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/spin_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/spin_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/spin_rw_mutex.h b/deal.II/contrib/tbb30_104oss/include/tbb/spin_rw_mutex.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/spin_rw_mutex.h rename to deal.II/contrib/tbb30_104oss/include/tbb/spin_rw_mutex.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/task.h b/deal.II/contrib/tbb30_104oss/include/tbb/task.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/task.h rename to deal.II/contrib/tbb30_104oss/include/tbb/task.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_group.h b/deal.II/contrib/tbb30_104oss/include/tbb/task_group.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_group.h rename to deal.II/contrib/tbb30_104oss/include/tbb/task_group.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_scheduler_init.h b/deal.II/contrib/tbb30_104oss/include/tbb/task_scheduler_init.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_scheduler_init.h rename to deal.II/contrib/tbb30_104oss/include/tbb/task_scheduler_init.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_scheduler_observer.h b/deal.II/contrib/tbb30_104oss/include/tbb/task_scheduler_observer.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/task_scheduler_observer.h rename to deal.II/contrib/tbb30_104oss/include/tbb/task_scheduler_observer.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_allocator.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_allocator.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_allocator.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_allocator.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_config.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_config.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_config.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_config.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_exception.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_exception.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_exception.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_exception.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_machine.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_machine.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_machine.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_profiling.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_profiling.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_profiling.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_profiling.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_stddef.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_stddef.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_stddef.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_stddef.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_thread.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbb_thread.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbb_thread.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbb_thread.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbbmalloc_proxy.h b/deal.II/contrib/tbb30_104oss/include/tbb/tbbmalloc_proxy.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tbbmalloc_proxy.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tbbmalloc_proxy.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/include/tbb/tick_count.h b/deal.II/contrib/tbb30_104oss/include/tbb/tick_count.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/include/tbb/tick_count.h rename to deal.II/contrib/tbb30_104oss/include/tbb/tick_count.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/index.html b/deal.II/contrib/tbb30_104oss/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/index.html rename to deal.II/contrib/tbb30_104oss/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt b/deal.II/contrib/tbb30_104oss/src/CMakeLists.txt similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/CMakeLists.txt rename to deal.II/contrib/tbb30_104oss/src/CMakeLists.txt diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/Makefile b/deal.II/contrib/tbb30_104oss/src/Makefile similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/Makefile rename to deal.II/contrib/tbb30_104oss/src/Makefile diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/index.html b/deal.II/contrib/tbb30_104oss/src/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/index.html rename to deal.II/contrib/tbb30_104oss/src/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_queue_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/concurrent_queue_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_queue_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/concurrent_queue_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_queue_v2.h b/deal.II/contrib/tbb30_104oss/src/old/concurrent_queue_v2.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_queue_v2.h rename to deal.II/contrib/tbb30_104oss/src/old/concurrent_queue_v2.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_vector_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/concurrent_vector_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_vector_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/concurrent_vector_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_vector_v2.h b/deal.II/contrib/tbb30_104oss/src/old/concurrent_vector_v2.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/concurrent_vector_v2.h rename to deal.II/contrib/tbb30_104oss/src/old/concurrent_vector_v2.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/spin_rw_mutex_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/spin_rw_mutex_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/spin_rw_mutex_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/spin_rw_mutex_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/spin_rw_mutex_v2.h b/deal.II/contrib/tbb30_104oss/src/old/spin_rw_mutex_v2.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/spin_rw_mutex_v2.h rename to deal.II/contrib/tbb30_104oss/src/old/spin_rw_mutex_v2.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/task_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/task_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/task_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/task_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/test_concurrent_queue_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/test_concurrent_queue_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/test_concurrent_queue_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/test_concurrent_queue_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/test_concurrent_vector_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/test_concurrent_vector_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/test_concurrent_vector_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/test_concurrent_vector_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/old/test_mutex_v2.cpp b/deal.II/contrib/tbb30_104oss/src/old/test_mutex_v2.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/old/test_mutex_v2.cpp rename to deal.II/contrib/tbb30_104oss/src/old/test_mutex_v2.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/fibonacci_cutoff.cpp b/deal.II/contrib/tbb30_104oss/src/perf/fibonacci_cutoff.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/fibonacci_cutoff.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/fibonacci_cutoff.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/fibonacci_impl_tbb.cpp b/deal.II/contrib/tbb30_104oss/src/perf/fibonacci_impl_tbb.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/fibonacci_impl_tbb.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/fibonacci_impl_tbb.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/perf.cpp b/deal.II/contrib/tbb30_104oss/src/perf/perf.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/perf.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/perf.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/perf.h b/deal.II/contrib/tbb30_104oss/src/perf/perf.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/perf.h rename to deal.II/contrib/tbb30_104oss/src/perf/perf.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/perf_sched.cpp b/deal.II/contrib/tbb30_104oss/src/perf/perf_sched.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/perf_sched.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/perf_sched.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/run_statistics.sh b/deal.II/contrib/tbb30_104oss/src/perf/run_statistics.sh similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/run_statistics.sh rename to deal.II/contrib/tbb30_104oss/src/perf/run_statistics.sh diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics.cpp b/deal.II/contrib/tbb30_104oss/src/perf/statistics.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/statistics.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics.h b/deal.II/contrib/tbb30_104oss/src/perf/statistics.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics.h rename to deal.II/contrib/tbb30_104oss/src/perf/statistics.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics_xml.h b/deal.II/contrib/tbb30_104oss/src/perf/statistics_xml.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/statistics_xml.h rename to deal.II/contrib/tbb30_104oss/src/perf/statistics_xml.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_framework.h b/deal.II/contrib/tbb30_104oss/src/perf/time_framework.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_framework.h rename to deal.II/contrib/tbb30_104oss/src/perf/time_framework.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_hash_map.cpp b/deal.II/contrib/tbb30_104oss/src/perf/time_hash_map.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_hash_map.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/time_hash_map.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_hash_map_fill.cpp b/deal.II/contrib/tbb30_104oss/src/perf/time_hash_map_fill.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_hash_map_fill.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/time_hash_map_fill.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_locked_work.cpp b/deal.II/contrib/tbb30_104oss/src/perf/time_locked_work.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_locked_work.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/time_locked_work.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_sandbox.h b/deal.II/contrib/tbb30_104oss/src/perf/time_sandbox.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_sandbox.h rename to deal.II/contrib/tbb30_104oss/src/perf/time_sandbox.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/perf/time_vector.cpp b/deal.II/contrib/tbb30_104oss/src/perf/time_vector.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/perf/time_vector.cpp rename to deal.II/contrib/tbb30_104oss/src/perf/time_vector.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/index.html b/deal.II/contrib/tbb30_104oss/src/rml/client/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/index.html rename to deal.II/contrib/tbb30_104oss/src/rml/client/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/library_assert.h b/deal.II/contrib/tbb30_104oss/src/rml/client/library_assert.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/library_assert.h rename to deal.II/contrib/tbb30_104oss/src/rml/client/library_assert.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/omp_dynamic_link.cpp b/deal.II/contrib/tbb30_104oss/src/rml/client/omp_dynamic_link.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/omp_dynamic_link.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/client/omp_dynamic_link.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/omp_dynamic_link.h b/deal.II/contrib/tbb30_104oss/src/rml/client/omp_dynamic_link.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/omp_dynamic_link.h rename to deal.II/contrib/tbb30_104oss/src/rml/client/omp_dynamic_link.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h b/deal.II/contrib/tbb30_104oss/src/rml/client/rml_factory.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_factory.h rename to deal.II/contrib/tbb30_104oss/src/rml/client/rml_factory.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_omp.cpp b/deal.II/contrib/tbb30_104oss/src/rml/client/rml_omp.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_omp.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/client/rml_omp.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_tbb.cpp b/deal.II/contrib/tbb30_104oss/src/rml/client/rml_tbb.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/client/rml_tbb.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/client/rml_tbb.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/include/index.html b/deal.II/contrib/tbb30_104oss/src/rml/include/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/include/index.html rename to deal.II/contrib/tbb30_104oss/src/rml/include/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_base.h b/deal.II/contrib/tbb30_104oss/src/rml/include/rml_base.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_base.h rename to deal.II/contrib/tbb30_104oss/src/rml/include/rml_base.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_omp.h b/deal.II/contrib/tbb30_104oss/src/rml/include/rml_omp.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_omp.h rename to deal.II/contrib/tbb30_104oss/src/rml/include/rml_omp.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_tbb.h b/deal.II/contrib/tbb30_104oss/src/rml/include/rml_tbb.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/include/rml_tbb.h rename to deal.II/contrib/tbb30_104oss/src/rml/include/rml_tbb.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/index.html b/deal.II/contrib/tbb30_104oss/src/rml/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/index.html rename to deal.II/contrib/tbb30_104oss/src/rml/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/omp_nested.cpp b/deal.II/contrib/tbb30_104oss/src/rml/perfor/omp_nested.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/omp_nested.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/perfor/omp_nested.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/omp_simple.cpp b/deal.II/contrib/tbb30_104oss/src/rml/perfor/omp_simple.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/omp_simple.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/perfor/omp_simple.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/tbb_multi_omp.cpp b/deal.II/contrib/tbb30_104oss/src/rml/perfor/tbb_multi_omp.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/tbb_multi_omp.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/perfor/tbb_multi_omp.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/tbb_simple.cpp b/deal.II/contrib/tbb30_104oss/src/rml/perfor/tbb_simple.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/tbb_simple.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/perfor/tbb_simple.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/thread_level.h b/deal.II/contrib/tbb30_104oss/src/rml/perfor/thread_level.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/perfor/thread_level.h rename to deal.II/contrib/tbb30_104oss/src/rml/perfor/thread_level.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/index.html b/deal.II/contrib/tbb30_104oss/src/rml/server/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/index.html rename to deal.II/contrib/tbb30_104oss/src/rml/server/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/irml.rc b/deal.II/contrib/tbb30_104oss/src/rml/server/irml.rc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/irml.rc rename to deal.II/contrib/tbb30_104oss/src/rml/server/irml.rc diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/job_automaton.h b/deal.II/contrib/tbb30_104oss/src/rml/server/job_automaton.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/job_automaton.h rename to deal.II/contrib/tbb30_104oss/src/rml/server/job_automaton.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/lin-rml-export.def b/deal.II/contrib/tbb30_104oss/src/rml/server/lin-rml-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/lin-rml-export.def rename to deal.II/contrib/tbb30_104oss/src/rml/server/lin-rml-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/rml_server.cpp b/deal.II/contrib/tbb30_104oss/src/rml/server/rml_server.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/rml_server.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/server/rml_server.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/thread_monitor.h b/deal.II/contrib/tbb30_104oss/src/rml/server/thread_monitor.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/thread_monitor.h rename to deal.II/contrib/tbb30_104oss/src/rml/server/thread_monitor.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/wait_counter.h b/deal.II/contrib/tbb30_104oss/src/rml/server/wait_counter.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/wait_counter.h rename to deal.II/contrib/tbb30_104oss/src/rml/server/wait_counter.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/win32-rml-export.def b/deal.II/contrib/tbb30_104oss/src/rml/server/win32-rml-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/win32-rml-export.def rename to deal.II/contrib/tbb30_104oss/src/rml/server/win32-rml-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/server/win64-rml-export.def b/deal.II/contrib/tbb30_104oss/src/rml/server/win64-rml-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/server/win64-rml-export.def rename to deal.II/contrib/tbb30_104oss/src/rml/server/win64-rml-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/rml_omp_stub.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/rml_omp_stub.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/rml_omp_stub.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/rml_omp_stub.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_job_automaton.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/test_job_automaton.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_job_automaton.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_job_automaton.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_mixed.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_mixed.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_mixed.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_mixed.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_omp.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_omp.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_omp.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_omp.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_omp_c_linkage.c b/deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_omp_c_linkage.c similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_omp_c_linkage.c rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_omp_c_linkage.c diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_tbb.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_tbb.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_rml_tbb.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_rml_tbb.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_server.h b/deal.II/contrib/tbb30_104oss/src/rml/test/test_server.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_server.h rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_server.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_thread_monitor.cpp b/deal.II/contrib/tbb30_104oss/src/rml/test/test_thread_monitor.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/rml/test/test_thread_monitor.cpp rename to deal.II/contrib/tbb30_104oss/src/rml/test/test_thread_monitor.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/arena.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/arena.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/arena.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/arena.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/arena.h b/deal.II/contrib/tbb30_104oss/src/tbb/arena.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/arena.h rename to deal.II/contrib/tbb30_104oss/src/tbb/arena.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/cache_aligned_allocator.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/cilk-tbb-interop.h b/deal.II/contrib/tbb30_104oss/src/tbb/cilk-tbb-interop.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/cilk-tbb-interop.h rename to deal.II/contrib/tbb30_104oss/src/tbb/cilk-tbb-interop.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_hash_map.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/concurrent_hash_map.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_hash_map.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/concurrent_hash_map.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_monitor.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/concurrent_monitor.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_monitor.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/concurrent_monitor.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_monitor.h b/deal.II/contrib/tbb30_104oss/src/tbb/concurrent_monitor.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_monitor.h rename to deal.II/contrib/tbb30_104oss/src/tbb/concurrent_monitor.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_queue.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/concurrent_queue.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_queue.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/concurrent_queue.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_vector.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/concurrent_vector.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/concurrent_vector.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/concurrent_vector.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/condition_variable.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/condition_variable.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/condition_variable.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/condition_variable.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/critical_section.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/critical_section.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/critical_section.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/critical_section.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/custom_scheduler.h b/deal.II/contrib/tbb30_104oss/src/tbb/custom_scheduler.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/custom_scheduler.h rename to deal.II/contrib/tbb30_104oss/src/tbb/custom_scheduler.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/dynamic_link.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/dynamic_link.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.h b/deal.II/contrib/tbb30_104oss/src/tbb/dynamic_link.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/dynamic_link.h rename to deal.II/contrib/tbb30_104oss/src/tbb/dynamic_link.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/governor.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/governor.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/governor.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/governor.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/governor.h b/deal.II/contrib/tbb30_104oss/src/tbb/governor.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/governor.h rename to deal.II/contrib/tbb30_104oss/src/tbb/governor.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia32-masm/atomic_support.asm b/deal.II/contrib/tbb30_104oss/src/tbb/ia32-masm/atomic_support.asm similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia32-masm/atomic_support.asm rename to deal.II/contrib/tbb30_104oss/src/tbb/ia32-masm/atomic_support.asm diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia32-masm/lock_byte.asm b/deal.II/contrib/tbb30_104oss/src/tbb/ia32-masm/lock_byte.asm similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia32-masm/lock_byte.asm rename to deal.II/contrib/tbb30_104oss/src/tbb/ia32-masm/lock_byte.asm diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/atomic_support.s b/deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/atomic_support.s similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/atomic_support.s rename to deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/atomic_support.s diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/ia64_misc.s b/deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/ia64_misc.s similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/ia64_misc.s rename to deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/ia64_misc.s diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/lock_byte.s b/deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/lock_byte.s similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/lock_byte.s rename to deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/lock_byte.s diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/log2.s b/deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/log2.s similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/log2.s rename to deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/log2.s diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/pause.s b/deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/pause.s similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ia64-gas/pause.s rename to deal.II/contrib/tbb30_104oss/src/tbb/ia64-gas/pause.s diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/ibm_aix51/atomic_support.c b/deal.II/contrib/tbb30_104oss/src/tbb/ibm_aix51/atomic_support.c similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/ibm_aix51/atomic_support.c rename to deal.II/contrib/tbb30_104oss/src/tbb/ibm_aix51/atomic_support.c diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/index.html b/deal.II/contrib/tbb30_104oss/src/tbb/index.html similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/index.html rename to deal.II/contrib/tbb30_104oss/src/tbb/index.html diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/intel64-masm/atomic_support.asm b/deal.II/contrib/tbb30_104oss/src/tbb/intel64-masm/atomic_support.asm similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/intel64-masm/atomic_support.asm rename to deal.II/contrib/tbb30_104oss/src/tbb/intel64-masm/atomic_support.asm diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/intrusive_list.h b/deal.II/contrib/tbb30_104oss/src/tbb/intrusive_list.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/intrusive_list.h rename to deal.II/contrib/tbb30_104oss/src/tbb/intrusive_list.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/itt_notify.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/itt_notify.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/itt_notify.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/itt_notify.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/itt_notify.h b/deal.II/contrib/tbb30_104oss/src/tbb/itt_notify.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/itt_notify.h rename to deal.II/contrib/tbb30_104oss/src/tbb/itt_notify.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin32-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/lin32-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin32-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/lin32-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin64-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/lin64-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin64-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/lin64-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin64ipf-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/lin64ipf-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/lin64ipf-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/lin64ipf-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/mac32-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/mac32-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/mac32-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/mac32-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/mac64-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/mac64-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/mac64-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/mac64-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/mailbox.h b/deal.II/contrib/tbb30_104oss/src/tbb/mailbox.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/mailbox.h rename to deal.II/contrib/tbb30_104oss/src/tbb/mailbox.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/market.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/market.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/market.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/market.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/market.h b/deal.II/contrib/tbb30_104oss/src/tbb/market.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/market.h rename to deal.II/contrib/tbb30_104oss/src/tbb/market.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/observer_proxy.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/observer_proxy.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/observer_proxy.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/observer_proxy.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/observer_proxy.h b/deal.II/contrib/tbb30_104oss/src/tbb/observer_proxy.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/observer_proxy.h rename to deal.II/contrib/tbb30_104oss/src/tbb/observer_proxy.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/pipeline.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/pipeline.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/pipeline.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/pipeline.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/private_server.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/private_server.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/private_server.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/private_server.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/queuing_mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/queuing_mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/queuing_mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/queuing_mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/queuing_rw_mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/queuing_rw_mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/queuing_rw_mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/queuing_rw_mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/reader_writer_lock.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/reader_writer_lock.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/reader_writer_lock.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/reader_writer_lock.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/recursive_mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/recursive_mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/recursive_mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/recursive_mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/scheduler.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/scheduler.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler.h b/deal.II/contrib/tbb30_104oss/src/tbb/scheduler.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler.h rename to deal.II/contrib/tbb30_104oss/src/tbb/scheduler.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler_common.h b/deal.II/contrib/tbb30_104oss/src/tbb/scheduler_common.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler_common.h rename to deal.II/contrib/tbb30_104oss/src/tbb/scheduler_common.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler_utility.h b/deal.II/contrib/tbb30_104oss/src/tbb/scheduler_utility.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/scheduler_utility.h rename to deal.II/contrib/tbb30_104oss/src/tbb/scheduler_utility.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/semaphore.h b/deal.II/contrib/tbb30_104oss/src/tbb/semaphore.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/semaphore.h rename to deal.II/contrib/tbb30_104oss/src/tbb/semaphore.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/spin_mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/spin_mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/spin_mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/spin_mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/spin_rw_mutex.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/spin_rw_mutex.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/spin_rw_mutex.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/spin_rw_mutex.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/task.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/task.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/task.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/task.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/task_group_context.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/task_group_context.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/task_group_context.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/task_group_context.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/task_stream.h b/deal.II/contrib/tbb30_104oss/src/tbb/task_stream.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/task_stream.h rename to deal.II/contrib/tbb30_104oss/src/tbb/task_stream.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_assert_impl.h b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_assert_impl.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_assert_impl.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_assert_impl.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_main.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_main.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_main.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_main.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_main.h b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_main.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_main.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_main.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_misc.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_misc.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_misc.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_misc.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_misc.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_resource.rc b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_resource.rc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_resource.rc rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_resource.rc diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_statistics.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_statistics.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_statistics.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_statistics.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_statistics.h b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_statistics.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_statistics.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_statistics.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_thread.cpp b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_thread.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_thread.cpp rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_thread.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_version.h b/deal.II/contrib/tbb30_104oss/src/tbb/tbb_version.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tbb_version.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tbb_version.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tls.h b/deal.II/contrib/tbb30_104oss/src/tbb/tls.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tls.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tls.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/disable_warnings.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/disable_warnings.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/disable_warnings.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/disable_warnings.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/internal/ittnotify.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/internal/ittnotify.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/internal/ittnotify.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/internal/ittnotify.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_config.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_config.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_config.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_config.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_static.c b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_static.c similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_static.c rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_static.c diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_static.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_static.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_static.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_static.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_types.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_types.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/ittnotify_types.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/ittnotify_types.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/legacy/ittnotify.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/legacy/ittnotify.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/legacy/ittnotify.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/legacy/ittnotify.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/prototype/ittnotify.h b/deal.II/contrib/tbb30_104oss/src/tbb/tools_api/prototype/ittnotify.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/tools_api/prototype/ittnotify.h rename to deal.II/contrib/tbb30_104oss/src/tbb/tools_api/prototype/ittnotify.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/win32-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/win32-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/win32-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/win32-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/win64-gcc-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/win64-gcc-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/win64-gcc-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/win64-gcc-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/win64-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/win64-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/win64-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/win64-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbb/xbox360-tbb-export.def b/deal.II/contrib/tbb30_104oss/src/tbb/xbox360-tbb-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbb/xbox360-tbb-export.def rename to deal.II/contrib/tbb30_104oss/src/tbb/xbox360-tbb-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/Customize.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/Customize.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/Customize.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/Customize.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/LifoList.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/LifoList.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/LifoList.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/LifoList.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/MapMemory.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/MapMemory.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/MapMemory.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/MapMemory.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/Statistics.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/Statistics.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/Statistics.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/Statistics.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/TypeDefinitions.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/TypeDefinitions.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/TypeDefinitions.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/TypeDefinitions.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/backend.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/backend.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/backend.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/backend.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/backref.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/backref.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/backref.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/backref.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/frontend.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/frontend.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/frontend.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/frontend.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/large_objects.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/large_objects.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/large_objects.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/large_objects.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin32-proxy-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin32-proxy-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin32-proxy-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin32-proxy-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin64-proxy-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin64-proxy-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin64-proxy-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin64-proxy-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin64ipf-proxy-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin64ipf-proxy-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/lin64ipf-proxy-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/lin64ipf-proxy-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/mac32-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/mac32-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/mac32-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/mac32-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/mac64-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/mac64-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/mac64-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/mac64-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/proxy.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/proxy.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/proxy.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/proxy.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/proxy.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/proxy.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/proxy.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/proxy.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbb_function_replacement.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc.cpp b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc.cpp similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc.cpp rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc.cpp diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc.rc b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc.rc similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc.rc rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc.rc diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc_internal.h b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc_internal.h similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/tbbmalloc_internal.h rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/tbbmalloc_internal.h diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win-gcc-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/win-gcc-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win-gcc-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/win-gcc-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win32-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/win32-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win32-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/win32-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win64-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/win64-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/win64-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/win64-tbbmalloc-export.def diff --git a/deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/xbox360-tbbmalloc-export.def b/deal.II/contrib/tbb30_104oss/src/tbbmalloc/xbox360-tbbmalloc-export.def similarity index 100% rename from deal.II/contrib/tbb/tbb30_104oss/src/tbbmalloc/xbox360-tbbmalloc-export.def rename to deal.II/contrib/tbb30_104oss/src/tbbmalloc/xbox360-tbbmalloc-export.def diff --git a/deal.II/contrib/umfpack/README.deal.II b/deal.II/contrib/umfpack/README.deal.II deleted file mode 100644 index 27b46ce5bb..0000000000 --- a/deal.II/contrib/umfpack/README.deal.II +++ /dev/null @@ -1,14 +0,0 @@ -This directory is an almost identical copy of the UMFPACK 5.1 release, -together with the AMD 2.2 and UFconfig 3.0 packages. The only things I have -changed are the Makefiles: they build shared libraries instead of static ones -if deal.II is so configured, and they put the object files somewhere -else. This also allowed us to get rid of the AMD/Make and UMFPACK/Make -subdirectories, since they did by hand what we do more elegantly using -autoconf and friends. Finally, I removed the UMFPACK/Demo directory, since it -is rather big. I assume that people using UMFPACK from inside deal.II are not -interested in this, but they can of course download the full UMFPACK -distribution if they want these files. - -UMFPACK is copyrighted by others than the deal.II authors, but -included by permission. See the AMD/Doc/License and -UMFPACK/Doc/License files for licensing information. \ No newline at end of file diff --git a/deal.II/contrib/umfpack/README.txt b/deal.II/contrib/umfpack/README.txt index cf8ad3c654..e6d206e4aa 100644 --- a/deal.II/contrib/umfpack/README.txt +++ b/deal.II/contrib/umfpack/README.txt @@ -1,3 +1,7 @@ +UMFPACK is copyrighted by others than the deal.II authors, but +included by permission. See the AMD/Doc/License and +UMFPACK/Doc/License files for licensing information. + See UMFPACK/README.txt and AMD/README.txt for details. Documention is in UMFPACK/Doc and AMD/Doc. diff --git a/deal.II/contrib/umfpack/lgpl-2.1.txt b/deal.II/contrib/umfpack/lgpl-2.1.txt new file mode 100644 index 0000000000..4362b49151 --- /dev/null +++ b/deal.II/contrib/umfpack/lgpl-2.1.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/deal.II/contrib/utilities/configure b/deal.II/contrib/utilities/configure deleted file mode 100755 index b5c140be39..0000000000 --- a/deal.II/contrib/utilities/configure +++ /dev/null @@ -1,2839 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. -# -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. -# -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - - - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -test -n "$DJDIR" || exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= - -ac_unique_file="embedding.cc" -ac_subst_vars='LTLIBOBJS -LIBOBJS -DEAL2_DIR -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' -ac_subst_files='' -ac_user_opts=' -enable_option_checking -with_deal -' - ac_precious_vars='build_alias -host_alias -target_alias' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac -fi - -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - # Remove trailing slashes. - case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; - esac - # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-deal=DIR where DIR is the root of the deal.II library - -Report bugs to the package provider. -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -configure -generated by GNU Autoconf 2.68 - -Copyright (C) 2010 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi - -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) - as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done -done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - $as_echo "## ---------------- ## -## Cache variables. ## -## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - $as_echo "## ----------------- ## -## Output variables. ## -## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## -## File substitutions. ## -## ------------------- ##" - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - $as_echo "## ----------- ## -## confdefs.h. ## -## ----------- ##" - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - -# Check whether --with-deal was given. -if test "${with_deal+set}" = set; then : - withval=$with_deal; DEAL2_DIR=$withval -else - if test -r ../../common/Make.global_options ; then - DEAL2_DIR=`pwd`/../.. ; - fi - if test -r ../../deal.II/common/Make.global_options ; then - DEAL2_DIR=`pwd`/../../deal.II ; - fi - if test -r ../../deal/common/Make.global_options ; then - DEAL2_DIR=`pwd`/../../deal ; - fi -fi - - - -ac_config_files="$ac_config_files Makefile" - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} - if test ! -f "$cache_file" || test -h "$cache_file"; then - cat confcache >"$cache_file" - else - case $cache_file in #( - */* | ?:*) - mv -f confcache "$cache_file"$$ && - mv -f "$cache_file"$$ "$cache_file" ;; #( - *) - mv -f confcache "$cache_file" ;; - esac - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} -t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` - - -ac_libobjs= -ac_ltlibobjs= -U= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: "${CONFIG_STATUS=./config.status}" -ac_write_fail=0 -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false - -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null -fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac - - - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. - -Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - -Configuration files: -$config_files - -Report bugs to the package provider." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" - -Copyright (C) 2010 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -test -n "\$AWK" || AWK=awk -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; - - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= ac_tmp= - trap 'exit_status=$? - : "${ac_tmp:=$tmp}" - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -ac_tmp=$tmp - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} -{ - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line -} - -_ACAWK -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// -s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" - - -eval set X " :F $CONFIG_FILES " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$ac_tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} - fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac - - case $ac_tag in - *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ - "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} - - rm -f "$ac_tmp/stdin" - case $ac_file in - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; - esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - ;; - - - - esac - -done # for ac_tag - - -as_fn_exit 0 -_ACEOF -ac_clean_files=$ac_clean_files_save - -test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -fi - diff --git a/deal.II/contrib/utilities/configure.in b/deal.II/contrib/utilities/configure.in deleted file mode 100644 index 7365da7cae..0000000000 --- a/deal.II/contrib/utilities/configure.in +++ /dev/null @@ -1,23 +0,0 @@ -dnl -dnl configure script to find the main deal library -dnl in .. or ../deal.II or ../deal -dnl - -AC_INIT(embedding.cc) - -dnl Supply deal-directory in command line or find it -AC_ARG_WITH(deal, -[ --with-deal=DIR where DIR is the root of the deal.II library], - DEAL2_DIR=$withval, - if test -r ../../common/Make.global_options ; then - DEAL2_DIR=`pwd`/../.. ; - fi - if test -r ../../deal.II/common/Make.global_options ; then - DEAL2_DIR=`pwd`/../../deal.II ; - fi - if test -r ../../deal/common/Make.global_options ; then - DEAL2_DIR=`pwd`/../../deal ; - fi) -AC_SUBST(DEAL2_DIR) - -AC_OUTPUT(Makefile)