mirror of
https://github.com/NGSolve/netgen.git
synced 2024-12-24 21:10:33 +05:00
mesh rendering fixes
This commit is contained in:
parent
06d6e9af37
commit
5dc124a709
340
COPYING
340
COPYING
@ -1,340 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library 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.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
|
||||
|
||||
<signature of Ty Coon>, 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 Library General
|
||||
Public License instead of this License.
|
504
LICENSE
Normal file
504
LICENSE
Normal file
@ -0,0 +1,504 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1990
|
||||
Ty Coon, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
|
||||
|
BIN
doc/ng4.pdf
BIN
doc/ng4.pdf
Binary file not shown.
@ -1192,11 +1192,6 @@ namespace netgen
|
||||
double EllipticCylinder :: MaxCurvatureLoc (const Point<3> & /* c */,
|
||||
double /* rad */) const
|
||||
{
|
||||
#ifdef JOACHIMxxx
|
||||
cout << "max curv local" << endl;
|
||||
return 0.02;
|
||||
#endif
|
||||
|
||||
// saubere Loesung wird noch notwendig !!!
|
||||
double aa = vs.Length();
|
||||
double bb = vl.Length();
|
||||
|
@ -5,20 +5,20 @@
|
||||
namespace netgen
|
||||
{
|
||||
|
||||
GeneralizedCylinder :: GeneralizedCylinder (ExplicitCurve2d & acrosssection,
|
||||
GeneralizedCylinder :: GeneralizedCylinder (ExplicitCurve2d & acrosssection,
|
||||
Point<3> ap, Vec<3> ae1, Vec<3> ae2)
|
||||
: crosssection(acrosssection)
|
||||
{
|
||||
{
|
||||
planep = ap;
|
||||
planee1 = ae1;
|
||||
planee2 = ae2;
|
||||
planee3 = Cross (planee1, planee2);
|
||||
(*testout) << "Vecs = " << planee1 << " " << planee2 << " " << planee3 << endl;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
void GeneralizedCylinder :: Project (Point<3> & p) const
|
||||
{
|
||||
void GeneralizedCylinder :: Project (Point<3> & p) const
|
||||
{
|
||||
Point<2> p2d;
|
||||
double z;
|
||||
|
||||
@ -28,10 +28,10 @@ void GeneralizedCylinder :: Project (Point<3> & p) const
|
||||
crosssection.Project (p2d);
|
||||
|
||||
p = planep + p2d(0) * planee1 + p2d(1) * planee2 + z * planee3;
|
||||
}
|
||||
}
|
||||
|
||||
int GeneralizedCylinder ::BoxInSolid (const BoxSphere<3> & box) const
|
||||
{
|
||||
int GeneralizedCylinder ::BoxInSolid (const BoxSphere<3> & box) const
|
||||
{
|
||||
Point<3> p3d;
|
||||
Point<2> p2d, projp;
|
||||
double t;
|
||||
@ -56,10 +56,10 @@ int GeneralizedCylinder ::BoxInSolid (const BoxSphere<3> & box) const
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
double GeneralizedCylinder :: CalcFunctionValue (const Point<3> & point) const
|
||||
{
|
||||
double GeneralizedCylinder :: CalcFunctionValue (const Point<3> & point) const
|
||||
{
|
||||
Point<2> p2d, projp;
|
||||
double t;
|
||||
Vec<2> tan, n;
|
||||
@ -75,10 +75,10 @@ double GeneralizedCylinder :: CalcFunctionValue (const Point<3> & point) const
|
||||
|
||||
n /= n.Length();
|
||||
return n * (p2d - projp);
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralizedCylinder :: CalcGradient (const Point<3> & point, Vec<3> & grad) const
|
||||
{
|
||||
void GeneralizedCylinder :: CalcGradient (const Point<3> & point, Vec<3> & grad) const
|
||||
{
|
||||
Point<2> p2d, projp;
|
||||
double t;
|
||||
Vec<2> tan, n;
|
||||
@ -94,11 +94,11 @@ void GeneralizedCylinder :: CalcGradient (const Point<3> & point, Vec<3> & grad)
|
||||
|
||||
n /= n.Length();
|
||||
grad = n(0) * planee1 + n(1) * planee2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void GeneralizedCylinder :: CalcHesse (const Point<3> & point, Mat<3> & hesse) const
|
||||
{
|
||||
void GeneralizedCylinder :: CalcHesse (const Point<3> & point, Mat<3> & hesse) const
|
||||
{
|
||||
Point<2> p2d, projp;
|
||||
double t, dist, val;
|
||||
Point<2> curvp;
|
||||
@ -135,75 +135,45 @@ void GeneralizedCylinder :: CalcHesse (const Point<3> & point, Mat<3> & hesse) c
|
||||
val += vmat(i,k) * h2d(k,l) * vmat(j,l);
|
||||
hesse(i,j) = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
double GeneralizedCylinder :: HesseNorm () const
|
||||
{
|
||||
double GeneralizedCylinder :: HesseNorm () const
|
||||
{
|
||||
return crosssection.MaxCurvature();
|
||||
}
|
||||
}
|
||||
|
||||
double GeneralizedCylinder :: MaxCurvatureLoc (const Point<3> & c, double rad) const
|
||||
{
|
||||
double GeneralizedCylinder :: MaxCurvatureLoc (const Point<3> & c, double rad) const
|
||||
{
|
||||
Point<2> c2d = Point<2> (planee1 * (c - planep), planee2 * (c - planep));
|
||||
return crosssection.MaxCurvatureLoc(c2d, rad);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Point<3> GeneralizedCylinder :: GetSurfacePoint () const
|
||||
{
|
||||
Point<3> GeneralizedCylinder :: GetSurfacePoint () const
|
||||
{
|
||||
Point<2> p2d;
|
||||
p2d = crosssection.Eval(0);
|
||||
return planep + p2d(0) * planee1 + p2d(1) * planee2;
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralizedCylinder :: Reduce (const BoxSphere<3> & box)
|
||||
{
|
||||
void GeneralizedCylinder :: Reduce (const BoxSphere<3> & box)
|
||||
{
|
||||
Point<2> c2d = Point<2> (planee1 * (box.Center() - planep),
|
||||
planee2 * (box.Center() - planep));
|
||||
crosssection.Reduce (c2d, box.Diam()/2);
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralizedCylinder :: UnReduce ()
|
||||
{
|
||||
void GeneralizedCylinder :: UnReduce ()
|
||||
{
|
||||
crosssection.UnReduce ();
|
||||
}
|
||||
}
|
||||
|
||||
void GeneralizedCylinder :: Print (ostream & str) const
|
||||
{
|
||||
void GeneralizedCylinder :: Print (ostream & str) const
|
||||
{
|
||||
str << "Generalized Cylinder" << endl;
|
||||
crosssection.Print (str);
|
||||
}
|
||||
|
||||
#ifdef MYGRAPH
|
||||
void GeneralizedCylinder :: Plot (const class ROT3D & rot) const
|
||||
{
|
||||
Point<2> p2d;
|
||||
Point<3> p, oldp;
|
||||
double t, tmin, tmax, dt;
|
||||
|
||||
tmin = crosssection.MinParam();
|
||||
tmax = crosssection.MaxParam();
|
||||
dt = (tmax - tmin)/ 500;
|
||||
|
||||
p2d = crosssection.Eval(tmin);
|
||||
p = planep + p2d(0) * planee1 + p2d(1) * planee2;
|
||||
|
||||
for (t = tmin; t <= tmax+dt; t += dt)
|
||||
{
|
||||
if (crosssection.SectionUsed (t))
|
||||
MySetColor (RED);
|
||||
else
|
||||
MySetColor (BLUE);
|
||||
|
||||
oldp = p;
|
||||
p2d = crosssection.Eval(t);
|
||||
p = planep + p2d(0) * planee1 + p2d(1) * planee2;
|
||||
MyLine3D (p, oldp, rot);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
@ -556,10 +556,8 @@ namespace netgen
|
||||
|
||||
PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
|
||||
|
||||
#ifdef OPENGL
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
}
|
||||
|
||||
mesh.Compress();
|
||||
@ -636,10 +634,8 @@ namespace netgen
|
||||
PrintMessage (3, (mesh.GetNSE() - oldnf), " elements, ", mesh.GetNP(), " points");
|
||||
}
|
||||
|
||||
#ifdef OPENGL
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
}
|
||||
while (changed);
|
||||
|
||||
|
@ -253,11 +253,8 @@ namespace netgen
|
||||
mesh -> SetNextMajorTimeStamp();
|
||||
|
||||
|
||||
#ifdef OPENGL
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -2632,6 +2632,7 @@ namespace netgen
|
||||
PrintMessage(1,"Mesh bisection");
|
||||
PushStatus("Mesh bisection");
|
||||
|
||||
|
||||
static int localizetimer = NgProfiler::CreateTimer("localize edgepoints");
|
||||
NgProfiler::RegionTimer * loct = new NgProfiler::RegionTimer(localizetimer);
|
||||
LocalizeEdgePoints(mesh);
|
||||
@ -2701,7 +2702,6 @@ namespace netgen
|
||||
*/
|
||||
|
||||
|
||||
|
||||
if (opt.refine_p)
|
||||
{
|
||||
int ne = mesh.GetNE();
|
||||
@ -3170,8 +3170,6 @@ namespace netgen
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
int hangingvol, hangingsurf, hangingedge;
|
||||
|
||||
//cout << "write?" << endl;
|
||||
@ -3824,8 +3822,6 @@ namespace netgen
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// Repair works only for tets!
|
||||
bool do_repair = mesh.PureTetMesh ();
|
||||
|
||||
@ -3841,7 +3837,8 @@ namespace netgen
|
||||
{
|
||||
if(isnewpoint.Test(ii) && mesh.mlbetweennodes[ii][0] > 0)
|
||||
{
|
||||
mesh.Point(ii) = Center(mesh.Point(mesh.mlbetweennodes[ii][0]),mesh.Point(mesh.mlbetweennodes[ii][1]));
|
||||
mesh.Point(ii) = Center(mesh.Point(mesh.mlbetweennodes[ii][0]),
|
||||
mesh.Point(mesh.mlbetweennodes[ii][1]));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3872,7 +3869,7 @@ namespace netgen
|
||||
}
|
||||
|
||||
|
||||
if(do_repair)
|
||||
if(do_repair) // by Markus W
|
||||
{
|
||||
const double max_worsening = 1;
|
||||
|
||||
@ -3951,16 +3948,15 @@ namespace netgen
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
for(i=0; i<idmaps.Size(); i++)
|
||||
delete idmaps[i];
|
||||
idmaps.DeleteAll();
|
||||
|
||||
mesh.UpdateTopology();
|
||||
|
||||
|
||||
|
||||
|
||||
if(refelementinfofilewrite != "")
|
||||
{
|
||||
PrintMessage(3,"writing marked-elements information to \"",refelementinfofilewrite,"\"");
|
||||
@ -3972,6 +3968,8 @@ namespace netgen
|
||||
}
|
||||
|
||||
|
||||
mesh.CalcSurfacesOfNode();
|
||||
|
||||
PrintMessage (1, "Bisection done");
|
||||
|
||||
PopStatus();
|
||||
|
@ -194,7 +194,6 @@ public:
|
||||
void ClearVolumeElements()
|
||||
{
|
||||
volelements.SetSize(0);
|
||||
// eltyps.SetSize(0);
|
||||
timestamp = NextTimeStamp();
|
||||
}
|
||||
|
||||
@ -237,7 +236,7 @@ public:
|
||||
segments.Elem(segnr).p1 = PointIndex::BASE-1;
|
||||
segments.Elem(segnr).p2 = PointIndex::BASE-1;
|
||||
}
|
||||
void FullDeleteSegment (int segnr)
|
||||
void FullDeleteSegment (int segnr) // von wem ist das ???
|
||||
{
|
||||
segments.Delete(segnr-PointIndex::BASE);
|
||||
}
|
||||
@ -302,21 +301,9 @@ public:
|
||||
|
||||
|
||||
|
||||
|
||||
// ELEMENTTYPE ElementType (int i) const { return eltyps.Get(i); }
|
||||
|
||||
|
||||
// ELEMENTTYPE ElementType (int i) const
|
||||
// { return (volelements.Get(i).fixed) ? FIXEDELEMENT : FREEELEMENT; }
|
||||
|
||||
ELEMENTTYPE ElementType (ElementIndex i) const
|
||||
{ return (volelements[i].flags.fixed) ? FIXEDELEMENT : FREEELEMENT; }
|
||||
|
||||
/*
|
||||
ELEMENTTYPE ElementType (int i) const { return eltyps.Get(i); }
|
||||
ELEMENTTYPE ElementType (ElementIndex i) const { return eltyps[i]; }
|
||||
*/
|
||||
|
||||
const T_VOLELEMENTS & VolumeElements() const { return volelements; }
|
||||
T_VOLELEMENTS & VolumeElements() { return volelements; }
|
||||
|
||||
@ -335,7 +322,6 @@ public:
|
||||
/// Returns number of domains
|
||||
int GetNDomains() const;
|
||||
|
||||
|
||||
///
|
||||
int GetDimension() const
|
||||
{ return dimension; }
|
||||
@ -508,14 +494,6 @@ public:
|
||||
const ARRAY< Vec<3>* > & nv,
|
||||
OPTIMIZEGOAL goal = OPT_QUALITY,
|
||||
const ARRAY< ARRAY<int,PointIndex::BASE>* > * idmaps = NULL);
|
||||
/*
|
||||
#ifdef SOLIDGEOM
|
||||
/// old
|
||||
void ImproveMesh (const CSGeometry & surfaces,
|
||||
OPTIMIZEGOAL goal = OPT_QUALITY);
|
||||
#endif
|
||||
*/
|
||||
|
||||
/**
|
||||
free nodes in environment of openelements
|
||||
for optimiztion
|
||||
|
@ -667,10 +667,9 @@ void STLSurfaceMeshing1 (STLGeometry & geom,
|
||||
(*testout) << "start meshing with h = " << h << endl;
|
||||
*/
|
||||
meshing.GenerateMesh (mesh, h, fnr); // face index
|
||||
#ifdef OPENGL
|
||||
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -25,7 +25,7 @@ int EdgeUsed(int p1, int p2, ARRAY<INDEX_2>& edges, INDEX_2_HASHTABLE<int>& hash
|
||||
Point<3> STLGeometry :: PointBetween(const Point<3> & ap1, int t1,
|
||||
const Point<3> & ap2, int t2)
|
||||
{
|
||||
//funktioniert nicht in allen Fällen!
|
||||
//funktioniert nicht in allen Fällen!
|
||||
|
||||
PrintWarning("Point between");
|
||||
|
||||
@ -732,8 +732,8 @@ void STLGeometry :: RestrictLocalHCurv(class Mesh & mesh, double gh)
|
||||
// mesh.SetGlobalH(gh);
|
||||
|
||||
double mincalch = 1E10;
|
||||
double maxcalch = -1E10;
|
||||
|
||||
double maxcalch = -1E10
|
||||
;
|
||||
double objectsize = bb.Diam();
|
||||
double geometryignoreedgelength = objectsize * 1e-5;
|
||||
|
||||
@ -923,7 +923,7 @@ void STLGeometry :: RestrictLocalH(class Mesh & mesh, double gh)
|
||||
if (stlparam.resthcloseedgeenable)
|
||||
{
|
||||
PushStatusF("Restrict H due to close edges");
|
||||
//geht nicht für spiralen!!!!!!!!!!!!!!!!!!
|
||||
//geht nicht für spiralen!!!!!!!!!!!!!!!!!!
|
||||
|
||||
double disttohfact = sqr(10.0 / stlparam.resthcloseedgefac);
|
||||
int k,l;
|
||||
@ -1455,10 +1455,8 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
|
||||
(*statout) << GetTime() << " & ";
|
||||
#endif
|
||||
|
||||
#ifdef OPENGL
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
}
|
||||
stlgeometry->surfaceoptimized = 1;
|
||||
}
|
||||
@ -1573,11 +1571,8 @@ int STLMeshingDummy (STLGeometry* stlgeometry, Mesh*& mesh,
|
||||
<< mesh->GetNP() << " " << '\\' << '\\' << " \\" << "hline" << endl;
|
||||
#endif
|
||||
|
||||
#ifdef OPENGL
|
||||
extern void Render();
|
||||
Render();
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -21,9 +21,6 @@ namespace netgen
|
||||
#include "mvdraw.hpp"
|
||||
|
||||
|
||||
// #define FAST3DELEMENTS
|
||||
|
||||
|
||||
|
||||
extern AutoPtr<Mesh> mesh;
|
||||
extern STLGeometry * stlgeometry;
|
||||
@ -77,8 +74,6 @@ namespace netgen
|
||||
}
|
||||
|
||||
|
||||
// ARRAY<Point3d> drawel;
|
||||
|
||||
void VisualSceneMesh :: DrawScene ()
|
||||
{
|
||||
if (!mesh)
|
||||
@ -369,11 +364,10 @@ namespace netgen
|
||||
center = mesh->Point (vispar.centerpoint);
|
||||
else
|
||||
center = Center (pmin, pmax);
|
||||
|
||||
rad = 0.5 * Dist (pmin, pmax);
|
||||
if(rad == 0) rad = 1;
|
||||
if(rad == 0) rad = 1e-6;
|
||||
|
||||
if (rad > 1.5 * oldrad ||
|
||||
if (rad > 1.2 * oldrad ||
|
||||
mesh->GetMajorTimeStamp() > vstimestamp ||
|
||||
zoomall)
|
||||
{
|
||||
@ -1752,262 +1746,6 @@ namespace netgen
|
||||
void VisualSceneMesh :: BuildTetList()
|
||||
{
|
||||
|
||||
|
||||
#ifdef FAST3DELEMENTS
|
||||
|
||||
|
||||
int i, j;
|
||||
ARRAY<Element2d> faces;
|
||||
|
||||
if (tettimestamp > mesh->GetTimeStamp () &&
|
||||
tettimestamp > vispar.clipplanetimestamp )
|
||||
return;
|
||||
|
||||
if (!lock)
|
||||
{
|
||||
lock = new NgLock (mesh->Mutex());
|
||||
lock -> Lock();
|
||||
}
|
||||
|
||||
tettimestamp = NextTimeStamp();
|
||||
|
||||
if (tetlist)
|
||||
glDeleteLists (tetlist, 1);
|
||||
|
||||
|
||||
tetlist = glGenLists (1);
|
||||
glNewList (tetlist, GL_COMPILE);
|
||||
|
||||
|
||||
BitArray shownode(mesh->GetNP());
|
||||
if (vispar.clipenable)
|
||||
{
|
||||
shownode.Clear();
|
||||
for (i = 1; i <= shownode.Size(); i++)
|
||||
{
|
||||
Point3d p = mesh->Point(i);
|
||||
|
||||
double val =
|
||||
p.X() * clipplane[0] +
|
||||
p.Y() * clipplane[1] +
|
||||
p.Z() * clipplane[2] +
|
||||
clipplane[3];
|
||||
|
||||
if (val > 0)
|
||||
shownode.Set (i);
|
||||
}
|
||||
}
|
||||
else
|
||||
shownode.Set();
|
||||
|
||||
#ifdef PARALLEL
|
||||
static float tetcols[][8] =
|
||||
{
|
||||
{ 1.0f, 1.0f, 0.0f, 1.0f },
|
||||
{ 1.0f, 0.0f, 0.0f, 1.0f },
|
||||
{ 0.0f, 1.0f, 0.0f, 1.0f },
|
||||
{ 0.0f, 0.0f, 1.0f, 1.0f },
|
||||
{ 1.0f, 1.0f, 0.0f, 0.3f },
|
||||
{ 1.0f, 0.0f, 0.0f, 0.3f },
|
||||
{ 0.0f, 1.0f, 0.0f, 0.3f },
|
||||
{ 0.0f, 0.0f, 1.0f, 0.3f }
|
||||
};
|
||||
|
||||
#else
|
||||
static float tetcols[][4] =
|
||||
{
|
||||
{ 1.0f, 1.0f, 0.0f, 1.0f },
|
||||
{ 1.0f, 0.0f, 0.0f, 1.0f },
|
||||
{ 0.0f, 1.0f, 0.0f, 1.0f },
|
||||
{ 0.0f, 0.0f, 1.0f, 1.0f }
|
||||
};
|
||||
#endif
|
||||
|
||||
ARRAY<int> elfaces;
|
||||
|
||||
const MeshTopology & top = mesh->GetTopology();
|
||||
CurvedElements & curv = mesh->GetCurvedElements();
|
||||
|
||||
ARRAY<int> displayface(top.GetNFaces());
|
||||
for (i = 0; i < top.GetNFaces(); i++)
|
||||
displayface[i] = -1;
|
||||
|
||||
|
||||
for (i = 1; i <= mesh->GetNE(); i++)
|
||||
{
|
||||
if (vispar.drawtetsdomain > 0 &&
|
||||
vispar.drawtetsdomain != mesh->VolumeElement(i).GetIndex())
|
||||
continue;
|
||||
|
||||
Element el = (*mesh)[(ElementIndex) (i-1)];
|
||||
|
||||
if (el.GetType() == TET)
|
||||
{
|
||||
if (el.PNum(1))
|
||||
{
|
||||
bool drawtet = 1;
|
||||
for (j = 1; j <= el.GetNP(); j++)
|
||||
if (!shownode.Test(el.PNum(j)))
|
||||
drawtet = 0;
|
||||
if (!drawtet) continue;
|
||||
|
||||
{
|
||||
top.GetElementFaces (i, elfaces);
|
||||
|
||||
for (j = 0; j < 4; j++)
|
||||
displayface[elfaces[j]-1] *= -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (i = 1; i <= mesh->GetNE(); i++)
|
||||
{
|
||||
if (vispar.drawtetsdomain > 0 &&
|
||||
vispar.drawtetsdomain != mesh->VolumeElement(i).GetIndex())
|
||||
continue;
|
||||
|
||||
if (mesh->VolumeElement(i).GetType() == TET)
|
||||
{
|
||||
// copy to be thread-safe
|
||||
Element el = mesh->VolumeElement (i);
|
||||
el.GetSurfaceTriangles (faces);
|
||||
|
||||
if (el.PNum(1))
|
||||
{
|
||||
bool drawtet = 1;
|
||||
for (j = 1; j <= el.GetNP(); j++)
|
||||
if (!shownode.Test(el.PNum(j)))
|
||||
drawtet = 0;
|
||||
if (!drawtet) continue;
|
||||
|
||||
int ind = el.GetIndex() % 4;
|
||||
if (vispar.drawmetispartition && (el.GetPartition()!=-1))
|
||||
ind = el.GetPartition() % 4;
|
||||
(*testout) << "ind (" << i << ") = " << ind << endl;
|
||||
|
||||
#ifdef PARALLEL
|
||||
if ( mesh -> VolumeElement(i).IsGhost() )
|
||||
{
|
||||
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, tetcols[ind+4]);
|
||||
}
|
||||
else
|
||||
{
|
||||
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, tetcols[ind]);
|
||||
}
|
||||
#else
|
||||
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, tetcols[ind]);
|
||||
#endif
|
||||
|
||||
top.GetElementFaces (i, elfaces);
|
||||
|
||||
glBegin (GL_TRIANGLES);
|
||||
|
||||
for (j = 0; j < faces.Size(); j++)
|
||||
{
|
||||
if (displayface[elfaces[j]-1] == -1) continue;
|
||||
|
||||
Element2d & face = faces.Elem(j+1);
|
||||
|
||||
if (curv.IsHighOrder()) // && curv.IsElementCurved(i-1))
|
||||
{
|
||||
int hoplotn = 1 << vispar.subdivisions;
|
||||
// int hoplotn = curv.GetNVisualSubsecs();
|
||||
|
||||
const Point3d * facepoint = MeshTopology :: GetVertices (TET);
|
||||
const ELEMENT_FACE * elface = MeshTopology :: GetFaces(TET);
|
||||
|
||||
Vec<3> x0,x1,d0,d1;
|
||||
Point<3> xg;
|
||||
x0 = facepoint[face.PNum(3)-1] - facepoint[face.PNum(1)-1];
|
||||
x1 = facepoint[face.PNum(2)-1] - facepoint[face.PNum(1)-1];
|
||||
x0.Normalize();
|
||||
x1.Normalize();
|
||||
|
||||
for (int m0 = 0; m0 < hoplotn; m0++)
|
||||
for (int m1 = 0; m1 < hoplotn-m0; m1++)
|
||||
for (int k = 0; k < 2; k++)
|
||||
{
|
||||
Vec<3> dx, dy, dz, n;
|
||||
Point<4> la[3];
|
||||
int l;
|
||||
for (l = 0; l<3; l++) la[l] = Point<4>(0.,0.,0.,0.);
|
||||
|
||||
if (k == 0)
|
||||
{
|
||||
la[0](face.PNum(1)-1) = (m0 )/(double)hoplotn;
|
||||
la[0](face.PNum(2)-1) = (m1 )/(double)hoplotn;
|
||||
la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
|
||||
|
||||
la[1](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
|
||||
la[1](face.PNum(2)-1) = (m1 )/(double)hoplotn;
|
||||
la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
|
||||
|
||||
la[2](face.PNum(1)-1) = (m0 )/(double)hoplotn;
|
||||
la[2](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
|
||||
la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
|
||||
} else
|
||||
{
|
||||
if (m1 == hoplotn-m0-1) continue;
|
||||
la[0](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
|
||||
la[0](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
|
||||
la[0](face.PNum(3)-1) = 1-la[0](face.PNum(1)-1)-la[0](face.PNum(2)-1);
|
||||
|
||||
la[1](face.PNum(1)-1) = (m0 )/(double)hoplotn;
|
||||
la[1](face.PNum(2)-1) = (m1+1)/(double)hoplotn;
|
||||
la[1](face.PNum(3)-1) = 1-la[1](face.PNum(1)-1)-la[1](face.PNum(2)-1);
|
||||
|
||||
la[2](face.PNum(1)-1) = (m0+1)/(double)hoplotn;
|
||||
la[2](face.PNum(2)-1) = (m1 )/(double)hoplotn;
|
||||
la[2](face.PNum(3)-1) = 1-la[2](face.PNum(1)-1)-la[2](face.PNum(2)-1);
|
||||
}
|
||||
|
||||
for (l = 0; l<3; l++)
|
||||
{
|
||||
Mat<3,3> dxdxi;
|
||||
Point<3> xr( la[l](0), la[l](1), la[l](2) );
|
||||
curv.CalcElementTransformation (xr, i-1, xg, dxdxi);
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
dx(i) = dxdxi(i,0);
|
||||
dy(i) = dxdxi(i,1);
|
||||
dz(i) = dxdxi(i,2);
|
||||
}
|
||||
|
||||
d0 = x0(0)*dx + x0(1)*dy + x0(2)*dz;
|
||||
d1 = x1(0)*dx + x1(1)*dy + x1(2)*dz;
|
||||
n = Cross (d0, d1);
|
||||
glNormal3d ( n(0), n(1), n(2));
|
||||
glVertex3d (xg(0), xg(1), xg(2));
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
const Point3d & lp1 = mesh->Point (el.PNum(face.PNum(1)));
|
||||
const Point3d & lp2 = mesh->Point (el.PNum(face.PNum(2)));
|
||||
const Point3d & lp3 = mesh->Point (el.PNum(face.PNum(3)));
|
||||
Vec3d n = Cross (Vec3d (lp1, lp3), Vec3d (lp1, lp2));
|
||||
n /= (n.Length()+1e-12);
|
||||
glNormal3d (n.X(), n.Y(), n.Z());
|
||||
glVertex3d (lp1.X(), lp1.Y(), lp1.Z());
|
||||
glVertex3d (lp2.X(), lp2.Y(), lp2.Z());
|
||||
glVertex3d (lp3.X(), lp3.Y(), lp3.Z());
|
||||
}
|
||||
}
|
||||
|
||||
glEnd();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
glEndList ();
|
||||
|
||||
|
||||
|
||||
|
||||
#else
|
||||
|
||||
if (tettimestamp > mesh->GetTimeStamp () &&
|
||||
tettimestamp > vispar.clipplanetimestamp )
|
||||
return;
|
||||
@ -2288,8 +2026,6 @@ namespace netgen
|
||||
}
|
||||
|
||||
glEndList ();
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -158,16 +158,16 @@ proc meshingoptionsdialog { } {
|
||||
pack $f.elementorder
|
||||
|
||||
|
||||
tixControl $f.memory -label "Large Memory \[MB\]: " -integer true \
|
||||
-variable options.memory -min 0 -max 2000 \
|
||||
-options {
|
||||
entry.width 5
|
||||
label.width 20
|
||||
label.anchor e
|
||||
}
|
||||
# tixControl $f.memory -label "Large Memory \[MB\]: " -integer true \
|
||||
\# -variable options.memory -min 0 -max 2000 \
|
||||
\# -options {
|
||||
# entry.width 5
|
||||
# label.width 20
|
||||
# label.anchor e
|
||||
# }
|
||||
|
||||
global userlevel
|
||||
if { $userlevel >= 3} { pack $f.memory }
|
||||
# global userlevel
|
||||
# if { $userlevel >= 3} { pack $f.memory }
|
||||
|
||||
|
||||
# Mesh - Size options
|
||||
@ -3415,7 +3415,7 @@ proc paralleldialog { } {
|
||||
#wm withdraw $w
|
||||
|
||||
proc runtestdialog { } {
|
||||
source $::ngdir/ngtcltk/ngshell.tcl
|
||||
source $::ngdir/ngshell.tcl
|
||||
set w .runtest_dlg
|
||||
|
||||
if {[winfo exists .runtest_dlg] == 1} {
|
||||
|
@ -290,7 +290,7 @@ if { [catch { load libngsolve.so ngsolve } result ] } {
|
||||
# puts "cannot load ngsolve"
|
||||
# puts "error: $result"
|
||||
} {
|
||||
source ${ngdir}/ngsolve.tcl
|
||||
catch { source ${ngdir}/ngsolve.tcl }
|
||||
}
|
||||
|
||||
|
||||
|
11
ng/ngpkg.cpp
11
ng/ngpkg.cpp
@ -7,11 +7,12 @@ The interface between the GUI and the netgen library
|
||||
|
||||
#include <mystdlib.h>
|
||||
|
||||
/*
|
||||
#ifdef LINUX
|
||||
#include <fenv.h>
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
||||
*/
|
||||
|
||||
#include <myadt.hpp>
|
||||
#include <linalg.hpp>
|
||||
@ -1862,8 +1863,8 @@ namespace netgen
|
||||
printmessage_importance = atoi (Tcl_GetVar (interp, "::options.printmsg", 0));
|
||||
printdots = (printmessage_importance >= 4);
|
||||
|
||||
BaseMoveableMem::totalsize =
|
||||
1048576 * atoi (Tcl_GetVar (interp, "::options.memory", 0));
|
||||
BaseMoveableMem::totalsize = 0;
|
||||
// 1048576 * atoi (Tcl_GetVar (interp, "::options.memory", 0));
|
||||
if (mesh.Ptr())
|
||||
{
|
||||
mesh->SetGlobalH (mparam.maxh);
|
||||
@ -3024,8 +3025,6 @@ namespace netgen
|
||||
|
||||
void SetVisualScene (Tcl_Interp * interp)
|
||||
{
|
||||
#ifdef OPENGL
|
||||
#ifndef SMALLLIB
|
||||
const char * vismode = vispar.selectvisual;
|
||||
// Tcl_GetVar (interp, "selectvisual", 0);
|
||||
vs = &vscross;
|
||||
@ -3066,8 +3065,6 @@ namespace netgen
|
||||
if (strcmp (vismode, "specpoints") == 0) vs = &vsspecpoints;
|
||||
// if (strcmp (vismode, "solution") == 0) vs = &vssolution;
|
||||
}
|
||||
#endif // !SMALLLIB
|
||||
#endif // OPENGL
|
||||
}
|
||||
|
||||
|
||||
|
@ -54,7 +54,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
puts "\n*** performing in2d file tests ***"
|
||||
puts " ** writing results to $f"
|
||||
puts "\n ** testing in2d files in examples/ **"
|
||||
set testdir "$::ngdir/examples"
|
||||
set testdir "$::ngdir/../examples"
|
||||
set in2dfiles { beam2d hyperbolic piezo2dround rectangle
|
||||
squareincl squareinsquare }
|
||||
foreach {tfile} $in2dfiles {
|
||||
@ -64,7 +64,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
}
|
||||
|
||||
puts "\n ** testing in2d files in tutorials/ **"
|
||||
set testdir "$::ngdir/tutorials"
|
||||
set testdir "$::ngdir/../tutorials"
|
||||
set in2dfiles { demo2d newin2d square v2in2d }
|
||||
foreach {tfile} $in2dfiles {
|
||||
if {$f != ""} { puts " * meshing file tutorials/$tfile.in2d..." }
|
||||
@ -76,7 +76,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
puts "\n*** performing geo file tests ***"
|
||||
puts " ** writing results to $f"
|
||||
puts "\n ** testing geo files in examples/ **"
|
||||
set testdir "$::ngdir/examples"
|
||||
set testdir "$::ngdir/../examples"
|
||||
set geofiles { beam cylsphere rboxcyl thinc
|
||||
boxcyl fichera period saw_3d thinplate
|
||||
coilshield gamm3d plate shaft tripelpendel
|
||||
@ -89,7 +89,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
}
|
||||
|
||||
puts "\n ** testing geo files in tutorials/ **"
|
||||
set testdir "$::ngdir/tutorials"
|
||||
set testdir "$::ngdir/../tutorials"
|
||||
set geofiles { boxcyl cubemcyl extrusion revolution trafo
|
||||
circle_on_cube cubemsphere fichera sculpture twobricks
|
||||
cone cylinder lshape3d shaft twocubes
|
||||
@ -107,7 +107,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
# set logfile [open stltest.log "w"]
|
||||
puts " ** writing results to $f"
|
||||
puts "\n ** testing stl files in examples/ **"
|
||||
set testdir "$::ngdir/examples"
|
||||
set testdir "$::ngdir/../examples"
|
||||
set stlfiles { crankshaft hinge1 }
|
||||
foreach {tfile} $stlfiles {
|
||||
if {$f != ""} { puts " * meshing file examples/$tfile.stl..." }
|
||||
@ -116,7 +116,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
}
|
||||
|
||||
puts "\n ** testing stl files in tutorials/ **"
|
||||
set testdir "$::ngdir/tutorials"
|
||||
set testdir "$::ngdir/../tutorials"
|
||||
set stlfiles { hinge part1 }
|
||||
foreach {tfile} $stlfiles {
|
||||
if {$f != ""} { puts " * meshing file tutorials/$tfile.stl..." }
|
||||
@ -130,7 +130,7 @@ proc ngtest { {t all} {f ""}} {
|
||||
puts " ** writing results to $f"
|
||||
|
||||
puts "\n ** testing pde files in ngsolve/pde_tutorial/ **"
|
||||
set testdir "$::ngdir/ngsolve/pde_tutorial"
|
||||
set testdir "$::ngdir/../ngsolve/pde_tutorial"
|
||||
set pdefiles { d1_square.pde d2_chip.pde d3_helmholtz.pde d4_cube.pde
|
||||
d5_beam.pde d6_shaft.pde d7_coil.pde d8_coilshield.pde }
|
||||
|
||||
|
@ -400,7 +400,7 @@ proc saveoptions { } {
|
||||
puts $datei "options.elsizeweight ${options.elsizeweight}"
|
||||
puts $datei "options.secondorder ${options.secondorder}"
|
||||
puts $datei "options.elementorder ${options.elementorder}"
|
||||
puts $datei "options.memory ${options.memory}"
|
||||
# puts $datei "options.memory ${options.memory}"
|
||||
puts $datei "options.quad ${options.quad}"
|
||||
puts $datei "options.inverttets ${options.inverttets}"
|
||||
puts $datei "options.inverttrigs ${options.inverttrigs}"
|
||||
|
@ -1,8 +1,8 @@
|
||||
# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@ -60,7 +60,6 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||
libnglib_la_DEPENDENCIES = \
|
||||
$(top_builddir)/libsrc/interface/libinterface.la \
|
||||
$(top_builddir)/libsrc/occ/libocc.la \
|
||||
$(top_builddir)/libsrc/geom2d/libgeom2d.la \
|
||||
$(top_builddir)/libsrc/csg/libcsg.la \
|
||||
$(top_builddir)/libsrc/stlgeom/libstl.la \
|
||||
@ -79,7 +78,7 @@ PROGRAMS = $(bin_PROGRAMS)
|
||||
am_ng_vol_OBJECTS = ng_vol.$(OBJEXT)
|
||||
ng_vol_OBJECTS = $(am_ng_vol_OBJECTS)
|
||||
ng_vol_DEPENDENCIES = libnglib.la
|
||||
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
|
||||
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||
depcomp = $(SHELL) $(top_srcdir)/depcomp
|
||||
am__depfiles_maybe = depfiles
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
@ -258,7 +257,6 @@ lib_LTLIBRARIES = libnglib.la
|
||||
libnglib_la_SOURCES = nglib.cpp
|
||||
libnglib_la_LIBADD = \
|
||||
$(top_builddir)/libsrc/interface/libinterface.la \
|
||||
$(top_builddir)/libsrc/occ/libocc.la \
|
||||
$(top_builddir)/libsrc/geom2d/libgeom2d.la \
|
||||
$(top_builddir)/libsrc/csg/libcsg.la \
|
||||
$(top_builddir)/libsrc/stlgeom/libstl.la \
|
||||
@ -312,8 +310,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||||
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||
if test -f $$p; then \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
|
||||
$(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
|
||||
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
|
||||
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
@ -321,8 +319,8 @@ uninstall-libLTLIBRARIES:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
|
||||
p=$(am__strip_dir) \
|
||||
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
||||
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
||||
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
|
||||
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
|
||||
done
|
||||
|
||||
clean-libLTLIBRARIES:
|
||||
@ -344,8 +342,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
|| test -f $$p1 \
|
||||
; then \
|
||||
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
|
||||
else :; fi; \
|
||||
done
|
||||
|
||||
@ -425,8 +423,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
mkid -fID $$unique
|
||||
tags: TAGS
|
||||
|
||||
@ -438,8 +436,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
@ -449,13 +447,12 @@ ctags: CTAGS
|
||||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
|
@ -591,4 +591,10 @@ void MyBeep (int i)
|
||||
;
|
||||
}
|
||||
|
||||
void Render()
|
||||
{
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user