From b5adad93ec3867efd27a8ecd29a064bd4bff2f65 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 11 Nov 2013 16:17:31 +0000 Subject: [PATCH] Reorganize the licensing stuff a bit. Add some last license headers and pointers git-svn-id: https://svn.dealii.org/trunk@31628 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/LICENSE | 8 +-- deal.II/doc/README.doc | 12 ++-- deal.II/examples/README.example | 4 ++ deal.II/examples/step-25/doc/animate.sh | 22 ++++++- deal.II/source/dummy.cc | 2 +- .../tests/mesh_converter/meshes/README.txt | 66 +++++++++++++++++++ 6 files changed, 100 insertions(+), 14 deletions(-) create mode 100644 deal.II/examples/README.example create mode 100644 deal.II/tests/mesh_converter/meshes/README.txt diff --git a/deal.II/LICENSE b/deal.II/LICENSE index 8b89d07dc6..4ef81d521a 100644 --- a/deal.II/LICENSE +++ b/deal.II/LICENSE @@ -12,10 +12,10 @@ License as published by the Free Software Foundation; either version The full text of the GNU Lesser General Public version 2.1 is quoted below. -The subdirectory "bundled/" is not licensed by the deal.II authors. PLEASE -NOTE THAT THE SOFTWARE THERE IS COPYRIGHTED BY OTHERS THAN THE deal.II -AUTHORS, but is included by permission. For details, consult the stated -licenses there. +The subdirectories "bundled/" and "contrib/" contain third party software. +PLEASE NOTE THAT THE SOFTWARE THERE IS COPYRIGHTED BY OTHERS THAN THE +deal.II AUTHORS, but is included by permission. For details, consult the +stated licenses there. ---------------------------------------------------------------------- diff --git a/deal.II/doc/README.doc b/deal.II/doc/README.doc index c2b56533b9..b3b1fd0c96 100644 --- a/deal.II/doc/README.doc +++ b/deal.II/doc/README.doc @@ -1,13 +1,9 @@ This folder contains the html documentation of deal.II -With the exception of the content under publications/* and reports/* the -documentation is covered by the same license as the deal.II library itself, -namely LGPL-2.1+. +The documentation is generally covered by the same license as the deal.II +library itself, namely LGPL-2.1+. -Unclear license status: +Exceptions: - external-libraries/p4est-setup.sh - doxygen/doxygen.sty - doxygen/options.dox.in - reports/* + external-libraries/p4est-setup.sh - coming from the p4est project, GPL-2+ diff --git a/deal.II/examples/README.example b/deal.II/examples/README.example new file mode 100644 index 0000000000..1f4f838258 --- /dev/null +++ b/deal.II/examples/README.example @@ -0,0 +1,4 @@ +This folder contains example programs for deal.II + +They are distributed under the same license as the deal.II library itself, +namely LGPL-2.1+. diff --git a/deal.II/examples/step-25/doc/animate.sh b/deal.II/examples/step-25/doc/animate.sh index 31807c2625..c3a7cf9fb0 100755 --- a/deal.II/examples/step-25/doc/animate.sh +++ b/deal.II/examples/step-25/doc/animate.sh @@ -1,4 +1,24 @@ #!/bin/sh +## --------------------------------------------------------------------- +## $Id$ +## +## Copyright (C) 2006 - 2013 by the deal.II authors +## +## This file is part of the deal.II library. +## +## The deal.II library is free software; you can use it, 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. +## The full text of the license can be found in the file LICENSE at +## the top level of the deal.II distribution. +## +## --------------------------------------------------------------------- + +# +# Author: Ivan Christov, Wolfgang Bangerth, Texas A&M University, 2006 +# + dim=1 tstep=0 tstepinc=20 @@ -35,4 +55,4 @@ done gnuplot -persist $batchfile # use ImageMagick to create an animated gif from the PNG files -convert -delay 0 -loop 0 "solution-"$dim"d-*.png" "solution-"$dim"d.gif" \ No newline at end of file +convert -delay 0 -loop 0 "solution-"$dim"d-*.png" "solution-"$dim"d.gif" diff --git a/deal.II/source/dummy.cc b/deal.II/source/dummy.cc index f7cb351468..dc760cd36b 100644 --- a/deal.II/source/dummy.cc +++ b/deal.II/source/dummy.cc @@ -21,5 +21,5 @@ * the generated Xcode project. */ -const int _global_symbol_42 = 42; +const int global_symbol_42 = 42; diff --git a/deal.II/tests/mesh_converter/meshes/README.txt b/deal.II/tests/mesh_converter/meshes/README.txt new file mode 100644 index 0000000000..9bc70cb14b --- /dev/null +++ b/deal.II/tests/mesh_converter/meshes/README.txt @@ -0,0 +1,66 @@ +==================================================== +MESH CONVERSION TOOL +v. 1.2 + +Use: Convert an ABAQUS .inp file to an AVS UCD file. + +Author: Jean-Paul Pelteret + jppelteret.uct@gmail.com + modified by: Timo Heister, heister@clemson.edu +=================================================== + + +This tool is intended to support converting ABAQUS .inp files into a +format that deal.II can read. To use this tool, you need to configure +deal.II using the "-DDEAL_II_COMPONENT_MESH_CONVERTER=ON" argument +when calling 'cmake'. The resulting executable will then be placed in +the installation directory. + + + +Cubit features captured by ABAQUS .inp files: +--------------------------------------------- +1. Multiple material-id's can be defined in the mesh. This is done by specifying blocksets in the pre-processor. +2. Arbitrary surface boundaries can be defined in the mesh. This is done by specifying sidesets in the pre-processor. In particular, boundaries are not confined to just surfaces (in 3d) - individual element faces can be added to the sideset as well. This is useful when a boundary condition is to be applied on a complex shape boundary that is difficult to define using "surfaces" alone. Similar can be done in 2d. + +How to use: +----------- +1. It is necessary to save the mesh as an Abaqus input file .inp. In Cubit, this is done as follows: +1.1. Go to "Analysis setup mode" by clicking on the disc icon in the toolbar on the right. +1.2. Select "Export Mesh" under "Operation" by clicking on the necessary icon in the toolbar on the right. +1.3. Select an output file. I have found that in Cubit version 11.0 and 12.0 that it is necessary to click on the browse button and type it in the dialogue that pops up. +1.4. Select the dimension to output in. +1.5. Tick the overwrite box. +1.6. If using Cubit v12.0 onwards, uncheck the box "Export using Cubit ID's". The conversion process will encounter errors if box if left checked. +1.7. Click apply. + +2. Converting the mesh +IMPORTANT NOTE: From v12.0 onwards, the format of the Abaqus file that Cubit outputted changed. This has been accounted for but an requires a flag to be passed to the conversion program. + I describe outputs from before v12.0 as "Abaqus OLD" and v12.0 an on (up to v12.1 at this point) as "Abaqus NEW". +2.1. Compile the program using 'make' or another suitable tool +2.2. Run the program with the following command line arguments: + './convert_mesh /path/to/input_file.inp /path/to/output_file.ucd' + + The first input argument is the spatial dimension of the input file, the second is the path to the read-in Abaqus .inp file, and the third is the name of the file to which you wish to write the output AVS .ucd file to. + An example of the correct program usage is: +e.g. './convert_mesh 3 mesh/3d/test_in.inp mesh/3d/test_out.ucd' + + +Notes: +------ +1. A few example / test meshes are provided in the directory "mesh". The .inp files that have been generated are all of the Abaqus OLD format except for one - CC.cub has been converted into both the "new" and "old" formats and both subsequently converted into deal.II readable meshes. + +Copyright: +---------- +This program is distributed under the GNU GPL v2.0 copyright. Details can be found at: +http://www.gnu.org/licenses/gpl-2.0.html + +This copyright is extended to the example mesh files distributed with this program, namely +./mesh/2d/2d_test.* +./mesh/2d/quad.* +./mesh/3d/CC.* +./mesh/3d/CC_cubit_new.* +./mesh/3d/CC_cubit_old.* +./mesh/3d/test_cube_1.* +./mesh/3d/test_cube_pave_1.* +./mesh/3d/test_cube_two_materials.* -- 2.39.5