Merge master into v2.16 #68
Conversation
Update the develop branch
The current default does not work without modifications in any scenario. This makes it easier to build the adapter in a Debian-based system, after simply getting SPOOLES, ARPACK, and yaml-cpp from APT. For users that have these dependencies elsewhere, they still need to set the dependencies themselves. Furthermore, it sets the suggested location for CCX and the dependencies to `$(HOME)`, a pattern often observed among new users. This also splits each dependency to an *_INCLUDE and an *_LIBS part, making it more flexible.
Use develop branch of systemtests
Add -fallow-argument-mismatch to support GCC 10
Update master with improved Makefile and GCC 10 support
Remove -fallow-argument-mismatch (revert #45)
Bugfix: remove -fallow-argument-mismatch from Makefile (add manually for GCC 10)
…ter into handle2DInterfaces
Add functionality to handle 2D interfaces
Code refinement
Add assertion statement to 2D-3D filtering
Release adapter
Remove Travis CI
|
I currently use the master branch and it all works as it should for me. |
There was a problem hiding this comment.
This works fine for me with CalculiX 2.16. This update is also important so that CalculiX 2.16 can work with our 2D tutorials and so that the building instructions correspond to the documentation.
By the way, since #41 (I guess), I cannot directly build the adapter with CalculiX built from source in its own folder and not installed (my usual development environment). I needed to add:
LIBS = \
$(SPOOLES_LIBS) \
$(PKGCONF_LIBS) \
+ -lprecice \
-lstdc++ \If more of you have a similar issue, maybe we should add it anyway.
I dont need to add |
I am talking about preCICE here, not CalculiX. This is just a problem we need to fix in the pkg-config of preCICE, but it is rather complicated. But maybe it only affects me. |
Okay I misunderstood you previously 😅 still if anything needs to be tested before standardizing the Makefile then I can test it. |
|
But it seems that adding |
It does not impact this PR at all. I just noticed it while reviewing this one. I should have asked on Gitter / open an issue. |
This PR merges the current master branch into branch v2.16.
Recently many changes have been made to the master branch, which currently supports CalculiX v2.16. The branch v2.16 must always remain up-to-date with the latest developments for CalculiX v2.16. The latest version of CalculiX is v2.17. Therefore, the master branch should support v2.17. This requires first that the master branch is merged into v2.16 to keep v2.16 adapter up-to-date.
A follow-up PR will be made to merge the new changes into v2.17.