Line
Link Here
|
0 |
-- ./ngsolve/basiclinalg/calcinverse.cpp |
0 |
++ ./ngsolve/basiclinalg/calcinverse.cpp |
Lines 9-15
Link Here
|
9 |
{ |
9 |
{ |
10 |
double sum = 0; |
10 |
double sum = 0; |
11 |
for (int i = 0; i < N; i++) |
11 |
for (int i = 0; i < N; i++) |
12 |
sum += abs(m(i,i)); |
12 |
sum += std::abs(m(i,i)); |
13 |
return sum; |
13 |
return sum; |
14 |
} |
14 |
} |
15 |
inline double abs (double a) |
15 |
inline double abs (double a) |
16 |
-- ./ng.tcl |
16 |
++ ./ng.tcl |
Lines 7-13
Link Here
|
7 |
|
7 |
|
8 |
set progname "NETGEN" |
8 |
set progname "NETGEN" |
9 |
|
9 |
|
10 |
set ngdir "" |
10 |
set ngdir "/usr/share/netgen" |
11 |
if { [lsearch [array names env] NETGENDIR] != -1 } { |
11 |
if { [lsearch [array names env] NETGENDIR] != -1 } { |
12 |
set ngdir $env(NETGENDIR) |
12 |
set ngdir $env(NETGENDIR) |
13 |
} |
13 |
} |
14 |
-- ./togl/LICENSE.togl |
14 |
++ ./togl/LICENSE.togl |
Line 0
Link Here
|
0 |
-- ./togl/license.terms |
1 |
This software is copyrighted by Brian Paul (brian@mesa3d.org) |
|
|
2 |
and Benjamin Bederson (bederson@cs.umd.edu). The following |
3 |
terms apply to all files associated with the software unless explicitly |
4 |
disclaimed in individual files. |
5 |
|
6 |
The authors hereby grant permission to use, copy, modify, distribute, |
7 |
and license this software and its documentation for any purpose, provided |
8 |
that existing copyright notices are retained in all copies and that this |
9 |
notice is included verbatim in any distributions. No written agreement, |
10 |
license, or royalty fee is required for any of the authorized uses. |
11 |
Modifications to this software may be copyrighted by their authors |
12 |
and need not follow the licensing terms described here, provided that |
13 |
the new terms are clearly indicated on the first page of each file where |
14 |
they apply. |
15 |
|
16 |
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY |
17 |
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES |
18 |
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY |
19 |
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE |
20 |
POSSIBILITY OF SUCH DAMAGE. |
21 |
|
22 |
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, |
23 |
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, |
24 |
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE |
25 |
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE |
26 |
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR |
27 |
MODIFICATIONS. |
|
|
28 |
++ ./togl/license.terms |
Line 0
Link Here
|
0 |
-- ./ngtcltk/ngappinit.cpp |
1 |
This software is copyrighted by the Regents of the University of |
|
|
2 |
California, Sun Microsystems, Inc., Scriptics Corporation, |
3 |
and other parties. The following terms apply to all files associated |
4 |
with the software unless explicitly disclaimed in individual files. |
5 |
|
6 |
The authors hereby grant permission to use, copy, modify, distribute, |
7 |
and license this software and its documentation for any purpose, provided |
8 |
that existing copyright notices are retained in all copies and that this |
9 |
notice is included verbatim in any distributions. No written agreement, |
10 |
license, or royalty fee is required for any of the authorized uses. |
11 |
Modifications to this software may be copyrighted by their authors |
12 |
and need not follow the licensing terms described here, provided that |
13 |
the new terms are clearly indicated on the first page of each file where |
14 |
they apply. |
15 |
|
16 |
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY |
17 |
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES |
18 |
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY |
19 |
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE |
20 |
POSSIBILITY OF SUCH DAMAGE. |
21 |
|
22 |
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, |
23 |
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, |
24 |
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE |
25 |
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE |
26 |
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR |
27 |
MODIFICATIONS. |
28 |
|
29 |
GOVERNMENT USE: If you are acquiring this software on behalf of the |
30 |
U.S. government, the Government shall have only "Restricted Rights" |
31 |
in the software and related documentation as defined in the Federal |
32 |
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you |
33 |
are acquiring the software on behalf of the Department of Defense, the |
34 |
software shall be classified as "Commercial Computer Software" and the |
35 |
Government shall have only "Restricted Rights" as defined in Clause |
36 |
252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the |
37 |
authors grant the U.S. Government and others acting in its behalf |
38 |
permission to use and distribute the software in accordance with the |
39 |
terms specified in this license. |
|
|
40 |
++ ./ngtcltk/ngappinit.cpp |
Lines 77-83
Link Here
|
77 |
if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) |
77 |
if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR"))) |
78 |
ngdir = getenv ("NETGENDIR"); |
78 |
ngdir = getenv ("NETGENDIR"); |
79 |
else |
79 |
else |
80 |
ngdir = "."; |
80 |
ngdir = "/usr/share/netgen"; |
81 |
|
81 |
|
82 |
verbose = parameters.GetDefineFlag ("V"); |
82 |
verbose = parameters.GetDefineFlag ("V"); |
83 |
|
83 |
|
84 |
-- ./ngtcltk/nghelp.tcl |
84 |
++ ./ngtcltk/nghelp.tcl |
Lines 1-6
Link Here
|
1 |
proc print_commandline_help { } { |
1 |
proc print_commandline_help { } { |
2 |
|
2 |
|
3 |
puts "Usage: ng { options }" |
3 |
puts "Usage: netgen { options }" |
4 |
|
4 |
|
5 |
puts "-geofile=filename Input geometry file (alternative: ng filename)" |
5 |
puts "-geofile=filename Input geometry file (alternative: ng filename)" |
6 |
puts "-meshfile=filename Output mesh file" |
6 |
puts "-meshfile=filename Output mesh file" |
7 |
-- ./libsrc/visualization/mvdraw.hpp |
7 |
++ ./libsrc/visualization/mvdraw.hpp |
Lines 250-255
Link Here
|
250 |
int seltria; |
250 |
int seltria; |
251 |
}; |
251 |
}; |
252 |
|
252 |
|
|
|
253 |
extern VisualSceneSTLMeshing vsstlmeshing; |
253 |
|
254 |
|
254 |
|
255 |
|
255 |
|
256 |
|
256 |
-- ./ngsolve/comp/postproc.cpp |
257 |
++ ./ngsolve/comp/postproc.cpp |
Lines 9-14
Link Here
|
9 |
*/ |
9 |
*/ |
10 |
|
10 |
|
11 |
#include <comp.hpp> |
11 |
#include <comp.hpp> |
|
|
12 |
#include <fem.hpp> |
12 |
|
13 |
|
13 |
namespace ngcomp |
14 |
namespace ngcomp |
14 |
{ |
15 |
{ |
Lines 274-281
Link Here
|
274 |
if (dimflux > 1) |
275 |
if (dimflux > 1) |
275 |
{ |
276 |
{ |
276 |
FlatMatrix<SCAL> elmat(dnumsflux.Size(), lh); |
277 |
FlatMatrix<SCAL> elmat(dnumsflux.Size(), lh); |
277 |
dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli) |
278 |
BlockBilinearFormIntegrator const& fluxbli_ref = dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli); |
278 |
. Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); |
279 |
fluxbli_ref . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); |
279 |
CholeskyFactors<SCAL> invelmat(elmat); |
280 |
CholeskyFactors<SCAL> invelmat(elmat); |
280 |
|
281 |
|
281 |
FlatVector<SCAL> hv1(dnumsflux.Size(), lh); |
282 |
FlatVector<SCAL> hv1(dnumsflux.Size(), lh); |
282 |
-- ./ngsolve/linalg/order.cpp |
283 |
++ ./ngsolve/linalg/order.cpp |
Lines 54-60
Link Here
|
54 |
return ball.Alloc(); |
54 |
return ball.Alloc(); |
55 |
} |
55 |
} |
56 |
|
56 |
|
57 |
void CliqueEl :: operator delete (void * p, size_t) |
57 |
void CliqueEl :: operator delete (void * p) |
58 |
{ |
58 |
{ |
59 |
ball.Free (p); |
59 |
ball.Free (p); |
60 |
} |
60 |
} |
61 |
-- ./ngsolve/linalg/order.hpp |
61 |
++ ./ngsolve/linalg/order.hpp |
Lines 118-124
Link Here
|
118 |
/// |
118 |
/// |
119 |
void * operator new(size_t); |
119 |
void * operator new(size_t); |
120 |
/// |
120 |
/// |
121 |
void operator delete (void *, size_t); |
121 |
void operator delete (void *); |
122 |
}; |
122 |
}; |
123 |
|
123 |
|
124 |
|
124 |
|
125 |
-- ./ngsolve/basiclinalg/expr3.hpp |
125 |
++ ./ngsolve/basiclinalg/expr3.hpp |
Lines 851-856
Link Here
|
851 |
/** |
851 |
/** |
852 |
Inner product |
852 |
Inner product |
853 |
*/ |
853 |
*/ |
|
|
854 |
inline double InnerProduct ( const double& a, const double& b ) |
855 |
{ |
856 |
return a * b; |
857 |
} |
858 |
|
859 |
inline Complex InnerProduct ( const Complex& a, const Complex b) |
860 |
{ |
861 |
return a * b; |
862 |
} |
863 |
|
854 |
template <class TA, class TB> |
864 |
template <class TA, class TB> |
855 |
inline typename TA::TSCAL |
865 |
inline typename TA::TSCAL |
856 |
InnerProduct (const MatExpr<TA> & a, const MatExpr<TB> & b) |
866 |
InnerProduct (const MatExpr<TA> & a, const MatExpr<TB> & b) |
Lines 862-876
Link Here
|
862 |
return sum; |
872 |
return sum; |
863 |
} |
873 |
} |
864 |
|
874 |
|
865 |
inline double InnerProduct (double a, double b) |
|
|
866 |
{ |
867 |
return a * b; |
868 |
} |
869 |
|
870 |
inline Complex InnerProduct (Complex a, Complex b) |
871 |
{ |
872 |
return a * b; |
873 |
} |
874 |
|
875 |
|
875 |
|
876 |
|
876 |
/* **************************** Trace **************************** */ |
877 |
/* **************************** Trace **************************** */ |
Lines 889-894
Link Here
|
889 |
/* **************************** L2Norm **************************** */ |
890 |
/* **************************** L2Norm **************************** */ |
890 |
|
891 |
|
891 |
/// Euklidean norm squared |
892 |
/// Euklidean norm squared |
|
|
893 |
inline double L2Norm2 (const double& v) |
894 |
{ |
895 |
return v*v; |
896 |
} |
897 |
|
898 |
inline double L2Norm2 (Complex v) |
899 |
{ |
900 |
return v.real()*v.real()+v.imag()*v.imag(); |
901 |
} |
902 |
|
892 |
template <class TA> |
903 |
template <class TA> |
893 |
inline double L2Norm2 (const MatExpr<TA> & v) |
904 |
inline double L2Norm2 (const MatExpr<TA> & v) |
894 |
{ |
905 |
{ |
Lines 899-915
Link Here
|
899 |
return sum; |
910 |
return sum; |
900 |
} |
911 |
} |
901 |
|
912 |
|
902 |
|
|
|
903 |
inline double L2Norm2 (double v) |
904 |
{ |
905 |
return v*v; |
906 |
} |
907 |
|
908 |
inline double L2Norm2 (Complex v) |
909 |
{ |
910 |
return v.real()*v.real()+v.imag()*v.imag(); |
911 |
} |
912 |
|
913 |
template <class TA> |
913 |
template <class TA> |
914 |
inline double L2Norm (const MatExpr<TA> & v) |
914 |
inline double L2Norm (const MatExpr<TA> & v) |
915 |
{ |
915 |
{ |
916 |
-- ./Makefile |
916 |
++ ./Makefile |
Lines 29-35
Link Here
|
29 |
# tcltklib = -ltix8.2 -ltk8.4 -ltcl8.4 |
29 |
# tcltklib = -ltix8.2 -ltk8.4 -ltcl8.4 |
30 |
# |
30 |
# |
31 |
# |
31 |
# |
32 |
syslib = $(tcltklib) -lGL -lGLU -lX11 -lXi -lm -ldl -lpthread $(SYSLIB2) |
32 |
syslib = $(tcltklib) -lGL -lGLU -lX11 -lm -ldl -lpthread $(SYSLIB2) |
33 |
# (maybe you have to remove -ldl) |
33 |
# (maybe you have to remove -ldl) |
34 |
# |
34 |
# |
35 |
# |
35 |
# |
Lines 49-54
Link Here
|
49 |
|
49 |
|
50 |
# add libs in makefile.mach.$(MACHINE) |
50 |
# add libs in makefile.mach.$(MACHINE) |
51 |
# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL |
51 |
# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL |
|
|
52 |
occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool -lXxf86vm |
52 |
# |
53 |
# |
53 |
include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) |
54 |
include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) |
54 |
# |
55 |
# |
Lines 117-123
Link Here
|
117 |
# |
120 |
# |
118 |
.PHONY : clean |
121 |
.PHONY : clean |
119 |
clean: |
122 |
clean: |
120 |
-@rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o |
123 |
-rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o ng |
121 |
# |
124 |
# |
122 |
# |
125 |
# |
123 |
.PHONY : cleanapp |
126 |
.PHONY : cleanapp |
124 |
-- ./libsrc/makefile.mach.LINUX |
127 |
++ ./libsrc/makefile.mach.LINUX |
Lines 16-21
Link Here
|
16 |
|
16 |
|
17 |
LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++ |
17 |
LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++ |
18 |
|
18 |
|
|
|
19 |
OCC_DIR=/opt/OpenCASCADE5.2 |
20 |
OCCINC_DIR=$(OCC_DIR)/ros/inc |
21 |
OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib |
22 |
CPLUSPLUSFLAGS2 += -DOCCGEOMETRY -DOCC52 -DUSE_STL_STREAM -DHAVE_IOSTREAM -DHAVE_LIMITS -I$(OCCINC_DIR) |
23 |
LINKFLAGS2 += -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool |
19 |
|
24 |
|
20 |
goalngs=goalngs |
25 |
goalngs=goalngs |
21 |
|
26 |
|
22 |
-- ./ngsolve/solve/shapetester.cpp |
27 |
++ ./ngsolve/solve/shapetester.cpp |
Lines 1-6
Link Here
|
1 |
|
1 |
|
2 |
#include <solve.hpp> |
2 |
#include <solve.hpp> |
3 |
// #include <nginterface.h> |
3 |
// #include <nginterface.h> |
|
|
4 |
#include <cstdlib> |
4 |
|
5 |
|
5 |
|
6 |
|
6 |
namespace ngsolve |
7 |
namespace ngsolve |
7 |
-- ./ngsolve/comp/fespace.cpp |
8 |
++ ./ngsolve/comp/fespace.cpp |
Lines 10-15
Link Here
|
10 |
|
10 |
|
11 |
#include <comp.hpp> |
11 |
#include <comp.hpp> |
12 |
#include <multigrid.hpp> |
12 |
#include <multigrid.hpp> |
|
|
13 |
#include <cstdlib> |
14 |
|
13 |
using namespace ngmg; |
15 |
using namespace ngmg; |
14 |
|
16 |
|
15 |
namespace ngcomp |
17 |
namespace ngcomp |