Commit Graph

1677 Commits

Author SHA1 Message Date
Matthias Hochsteger
e1d7cd879d Don't link TCL/TK to gui lib on MacOS
In case there are multiple versions of tcl/tk available on MacOS, the
system complains about it if we link against one version and
python/tkinter links against another.
Thus don't link with any tcl at all in the gui library. This means the
library will use the version loaded by tkinter.
2017-05-12 13:10:10 +02:00
Matthias Hochsteger
4a331a8a38 Stop TCL timer when GUI quits 2017-05-11 11:50:50 +02:00
Matthias Hochsteger
3eef3a66bc link TCL to gui library 2017-05-11 11:21:55 +02:00
Joachim Schöberl
7c8631cf2e Merge branch 'move_in_delete_element_array' into 'master'
use std::move in delete element of array

See merge request !46
2017-05-11 10:55:55 +02:00
Christopher Lackner
b87e76306f use std::move in delete element of array 2017-05-11 10:25:29 +02:00
Joachim Schöberl
fc00ab36b9 Merge branch 'merge_gui_from_python' into 'master'
GUI support from Python and some cleanup

See merge request !45
2017-05-10 19:47:09 +02:00
Matthias Hochsteger
025f8750be GUI support from Python and some cleanup
Squashed commit of the following:

commit 5058ceb9351548937487aa94073e7f59236ae9fe
Merge: d37f0af 2da1465
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:33:55 2017 +0200

    Merge remote-tracking branch 'origin/master' into native_tcl_macos

commit d37f0afcc1389c0c3ec0899da9c1af158c926ca5
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:27:12 2017 +0200

    link gui to netgen, some fixes

commit 297141455cd4fab81709c13d6253ad8114beee4a
Author: Matthias <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 19:02:47 2017 +0200

    windows fixes

commit 9bf290a60835f29762b15ee3b722da132678f90c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 18:59:53 2017 +0200

    More cleanup, proper code separation

     ... between netgen exectuable and gui library

commit f46d438d3c9dd32f9f94642b4ec00b85611ef1dd
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 14:03:53 2017 +0200

    fix typos

commit b3d301ff4e321189aef469bff77f7cffa7b69e98
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:32:57 2017 +0200

    also link tk to togl on windows...

commit c3519abee7b041e45c913a45999ed2d29d4ff325
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:30:16 2017 +0200

    link TCL to togl on windows

commit 80b607436b45f38f4bac2708a78ef03561ad44e5
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:26:45 2017 +0200

    linkt TCL only to netgen executable

commit 080139a431e949e14cb9f05194e19c5129aca3d3
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:20:36 2017 +0200

    fix dll ex/import

commit dd68efacb01fbbbe3f136168f12fed41fa3c3c8a
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 13:15:39 2017 +0200

    fix dll export

commit 9023b9ca49b4c2b99f228f64564990e2d0246b8c
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:06:14 2017 +0200

    use system tcl/tk on MacOS, but download tcl/tk for windows

commit 16eb4c1b01eb5229f93274791187b2c666bb8b8e
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 12:01:36 2017 +0200

    more cleanup

commit 6df5b82a7d9a1177a755446d563d6c4b98ff6329
Merge: af23786 2b0d3f0
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:42 2017 +0200

    Merge remote-tracking branch 'origin/master' into native_tcl_macos

commit af2378637a6513de3b50841ed6314cd7e12f7205
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Wed May 10 11:45:40 2017 +0200

    some cleanup

commit 81bbe117efe25df53c71f9ae603c50ee4557703a
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 20:14:46 2017 +0200

    tk-gui

commit 387e6da678661dd3b9d75d696733f46fe43d789a
Merge: e658b5b e653d8e
Author: Joachim Schöberl <joachim.schoeberl@tuwien.ac.at>
Date:   Tue May 9 18:49:20 2017 +0200

    Merge remote-tracking branch 'origin/gui_from_python' into native_tcl_macos

commit e658b5b2c1ac3264f4165b5f6d2b821b3b1b0926
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Tue May 9 18:30:35 2017 +0200

    use native tcl on macos

commit e653d8e6789d20e24b16a68bf760415940e881f8
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:37:23 2017 +0200

    next fix

commit f663c80b00754d141a02fa6abde2077c841bbafb
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 16:23:21 2017 +0200

    Fix symbol export on windows

commit 70d99782423d33d3fa6f80e758a7377d0cb52840
Author: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date:   Mon May 8 15:14:56 2017 +0200

    GUI support from Python

    Enables experimental support for starting the Netgen GUI from Python
    directly.
    To use it, just import the gui module:
    > import netgen.gui
2017-05-10 19:34:42 +02:00
Joachim Schöberl
2da1465d52 get surface element from face 2017-05-10 17:41:44 +02:00
Joachim Schöberl
2b0d3f02ba load opengl buffer-functions only if USE_BUFFERS is set 2017-05-08 21:20:36 +02:00
Joachim Schöberl
74fa8d1888 Merge branch 'merge_gui_from_python' into 'master'
GUI support from Python

See merge request !44
2017-05-08 16:45:38 +02:00
Matthias Hochsteger
990d0fce78 GUI support from Python
Enables experimental support for starting the Netgen GUI from Python
directly.
To use it, just import the gui module:
> import netgen.gui
2017-05-08 16:42:49 +02:00
Joachim Schöberl
94fd57154f disable VBO on windows 2017-04-26 12:15:19 +02:00
Matthias Hochsteger
9fb7fcacfc Revert interface code to preserve compatibility with NGSolve 2017-04-20 17:55:56 +02:00
Matthias Hochsteger
247afdb1bd Define NG_INLINE and use it in ngsimd.hpp (works around a bug in gcc5) 2017-04-20 16:22:50 +02:00
Matthias Hochsteger
9247c89fd7 add missing function HSum(a,b) for SIMD<double,1> 2017-04-20 11:41:23 +02:00
Joachim Schöberl
f92bbbf805 Merge branch 'avx512_merge_request' into 'master'
Add support for AVX512

See merge request !43
2017-04-20 07:07:45 +02:00
Matthias Hochsteger
643c89538d Add support for AVX512
Restructure mysimd.hpp and add support for AVX512. Changes include

  - Move mysimd.hpp to ngsimd.hpp
  - Expose ngsimd.hpp to NGSolve
  - New namespace ngsimd
  - Second template parameter (width) for SIMD class, default to the
    largest width available
  - Avoid raw avx register types in the interface, use SIMD<> instead
2017-04-19 18:02:27 +02:00
Joachim Schöberl
70da438d6d on mesh loading, set dummy-geometry if no geometry in mesh-file 2017-04-18 15:06:40 +02:00
Joachim Schöberl
5ed3de978b default constructable/movable tet for bisection-refinement 2017-04-18 08:43:23 +02:00
Joachim Schöberl
ec20b74722 make Element default constructable/movable 2017-04-13 10:40:47 +02:00
Joachim Schöberl
7027df2f73 fix 1->2 simd trafos 2017-04-12 16:44:02 +02:00
Joachim Schöberl
c50bd79beb default constructors assignment operators, cheaper Array-Resize 2017-04-11 21:06:30 +02:00
Joachim Schöberl
5e320a5556 dll-header ? 2017-04-11 10:51:08 +02:00
Joachim Schöberl
e464fe9771 parallel trig-marking for bisection 2017-04-11 10:45:31 +02:00
Joachim Schöberl
0074d8b407 inline GetTimeStamp 2017-04-11 10:45:11 +02:00
Joachim Schöberl
4382fc1168 fix hashtable 2017-04-11 10:04:33 +02:00
Joachim Schöberl
e6b853e995 hashtables roundup to power of 2, optimize bisect 2017-04-11 09:01:36 +02:00
Matthias Hochsteger
85a79f0ca1 Enable TkDND on MacOS 2017-04-07 16:52:01 +02:00
Matthias Hochsteger
8bdd94dab3 gitlab-ci: disable 32bit builds 2017-04-07 10:14:00 +02:00
Joachim Schöberl
b68bfdcc73 more parallel 2017-04-06 21:41:26 +02:00
Joachim Schöberl
e9fc64acc6 Merge branch 'multipointevaluation_for_isosurf' into 'master'
MultiPoint evaluation for DrawIsoSurface

See merge request !42
2017-04-04 15:28:43 +02:00
Gerhard Kitzler
dda40cf1f4 MultiPoint evaluation for DrawIsoSurface 2017-04-04 11:49:32 +02:00
Joachim Schöberl
65a474b8ef avoid shared-ptr copy 2017-04-04 11:34:24 +02:00
Joachim Schöberl
701d6a2369 inline GetCD2NamePtr 2017-04-03 18:15:34 +02:00
Joachim Schöberl
e1917c8d8a fix warnings 2017-04-03 17:40:01 +02:00
Joachim Schöberl
029de72eb3 Merge branch 'fix_element_data_types' into 'master'
Fix data types for Python exports in python_mesh.cpp

See merge request !41
2017-04-03 16:58:44 +02:00
Gerhard Kitzler
8f936f82ea Fix data types for Python exports in python_mesh.cpp 2017-04-03 16:24:56 +02:00
Joachim Schöberl
619f9ff47f GetElement returns Facet-Array. Since for 1D these are point numbers, and point numbers are (still) 1-based, we have to return also the base 2017-04-03 11:17:47 +02:00
Joachim Schöberl
240a132078 avoid size_t-int narrowing in nginterfacev2 - GetElement 2017-04-01 21:00:12 +02:00
Joachim Schöberl
8e7c043ef4 Merge branch 'fix_el_mat_bbnd' into 'master'
fix el.mat for bbnd elements in 3D

See merge request !40
2017-03-30 15:37:35 +02:00
Christopher Lackner
794d1b6598 fix el.mat for bbnd elements in 3D 2017-03-30 15:22:19 +02:00
Joachim Schöberl
f9612d0b59 Merge branch 'revert-6894a8c9' into 'master'
Revert "Merge branch 'neighbouringdomains' into 'master'"

See merge request !39
2017-03-29 15:02:54 +02:00
Joachim Schöberl
3d3a2ca186 Revert "Merge branch 'neighbouringdomains' into 'master'"
This reverts merge request !38
2017-03-29 15:02:36 +02:00
Joachim Schöberl
6894a8c915 Merge branch 'neighbouringdomains' into 'master'
add implementation of GetBoundaryNeighbouringDomains

See merge request !38
2017-03-29 11:41:31 +02:00
Christoph Wintersteiger
9a48710988 add implementation of GetBoundaryNeighbouringDomains 2017-03-29 11:22:29 +02:00
Joachim Schöberl
2d835e25cc add prototype GetBoundaryNeightbouringDomains 2017-03-27 15:12:52 +02:00
Joachim Schöberl
dceed125d8 Merge branch 'fix_warnings_intel' into 'master'
Fix warnings (Intel compiler)

See merge request !37
2017-03-23 16:35:11 +01:00
Matthias Hochsteger
5e2d2f685c Fix warnings (Intel compiler)
ICC complains about ambigous variable 'i' applying old/new scoping rules.
Therefore, use local loop variables in for loops.
2017-03-23 15:56:08 +01:00
Lukas Kogler
d24b996c8f Merge branch 'master' into par_fixes 2017-03-22 14:03:11 +01:00
Matthias Hochsteger
079406f615 Include <functional> (gcc7 was complaining here) 2017-03-17 21:09:27 +01:00