From d985c71f05491670750540a39dce5316cf310f91 Mon Sep 17 00:00:00 2001 From: Hubertus van Dam Date: Fri, 24 Jan 2025 17:31:50 +0100 Subject: [PATCH 1/4] Update applyInitialConditions.cc Use full name space for ZeroFunction --- src/ellipticBVP/applyInitialConditions.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ellipticBVP/applyInitialConditions.cc b/src/ellipticBVP/applyInitialConditions.cc index 0ce8a5a1..9d645f36 100644 --- a/src/ellipticBVP/applyInitialConditions.cc +++ b/src/ellipticBVP/applyInitialConditions.cc @@ -7,7 +7,7 @@ void ellipticBVP::applyInitialConditions(){ //pcout << "applying the default zero initial condition\n"; //default method to apply zero initial conditions on all fields VectorTools::interpolate (dofHandler, - ZeroFunction(dim), + dealii::Functions::ZeroFunction(dim), solution); } #include "../../include/ellipticBVP_template_instantiations.h" From 98362d09115dd34208b81b457330b877c7aa2c3f Mon Sep 17 00:00:00 2001 From: Hubertus van Dam Date: Fri, 24 Jan 2025 19:01:56 +0100 Subject: [PATCH 2/4] Update main.cc --- applications/crystalPlasticity/main.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/applications/crystalPlasticity/main.cc b/applications/crystalPlasticity/main.cc index a4a6e280..12692479 100644 --- a/applications/crystalPlasticity/main.cc +++ b/applications/crystalPlasticity/main.cc @@ -3,7 +3,9 @@ #include #include #include -using namespace std; + +// Using namespace std gets GCC confused in the Boost geometry point_xy.hpp +//using namespace std; #include "../../include/crystalPlasticity.h" From f57e5acebf87e48e39389f5ec4fa1f717a939b49 Mon Sep 17 00:00:00 2001 From: Hubertus van Dam Date: Fri, 24 Jan 2025 19:17:26 +0100 Subject: [PATCH 3/4] Adding additional information --- applications/crystalPlasticity/main.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/crystalPlasticity/main.cc b/applications/crystalPlasticity/main.cc index 12692479..36395047 100644 --- a/applications/crystalPlasticity/main.cc +++ b/applications/crystalPlasticity/main.cc @@ -5,6 +5,7 @@ #include // Using namespace std gets GCC confused in the Boost geometry point_xy.hpp +// See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110636 //using namespace std; #include "../../include/crystalPlasticity.h" From ed45cbf4243d1bd412b5114aab2a71402f755b69 Mon Sep 17 00:00:00 2001 From: Hubertus van Dam Date: Fri, 24 Jan 2025 19:50:19 +0100 Subject: [PATCH 4/4] Trying to add a sensible name for the installed executable --- applications/crystalPlasticity/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/crystalPlasticity/CMakeLists.txt b/applications/crystalPlasticity/CMakeLists.txt index d8a138a9..302358c1 100644 --- a/applications/crystalPlasticity/CMakeLists.txt +++ b/applications/crystalPlasticity/CMakeLists.txt @@ -73,3 +73,6 @@ elseif(${CMAKE_BUILD_TYPE} STREQUAL "DebugRelease") else() TARGET_LINK_LIBRARIES(main ${CMAKE_SOURCE_DIR}/../../libprisms_cp_debug.a) endif() + +set_target_properties(main PROPERTIES OUTPUT_NAME "crystalPlasticity") +install(TARGETS main RUNTIME)