update VILLASnode version in Dockerfiles

Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
sogno-platform · Aug 26, 2024 · cd3857a · cd3857a
1 parent 5f40f09
commit cd3857a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/dpsim-models/include/dpsim-models/DP/DP_Ph1_ProfileVoltageSource.h b/dpsim-models/include/dpsim-models/DP/DP_Ph1_ProfileVoltageSource.h
@@ -16,7 +16,6 @@
 #include <dpsim-models/Solver/DAEInterface.h>
 #include <dpsim-models/Solver/MNAInterface.h>
 #include <filesystem>
-#include <villas/formats/protobuf.hpp>
 #include <villas/sample.hpp>
 
 namespace CPS {

diff --git a/dpsim-models/src/CMakeLists.txt b/dpsim-models/src/CMakeLists.txt
@@ -30,7 +30,6 @@ list(APPEND MODELS_SOURCES
 	DP/DP_Ph1_Resistor.cpp
 	DP/DP_Ph1_Transformer.cpp
 	DP/DP_Ph1_VoltageSource.cpp
-	DP/DP_Ph1_ProfileVoltageSource.cpp
 	DP/DP_Ph1_VoltageSourceRamp.cpp
 	DP/DP_Ph1_VoltageSourceNorton.cpp
 	DP/DP_Ph1_Switch.cpp
@@ -177,6 +176,10 @@ if(WITH_GSL)
 	list(APPEND MODELS_LIBRARIES ${GSL_LIBRARIES})
 endif()
 
+if(WITH_VILLAS)
+	list(APPEND MODELS_SOURCES DP/DP_Ph1_ProfileVoltageSource.cpp)
+endif()
+
 target_link_libraries(dpsim-models PUBLIC ${MODELS_LIBRARIES})
 target_include_directories(dpsim-models PUBLIC ${MODELS_INCLUDE_DIRS})
 target_sources(dpsim-models PRIVATE ${MODELS_SOURCES})

diff --git a/dpsim-models/src/DP/DP_Ph1_ProfileVoltageSource.cpp b/dpsim-models/src/DP/DP_Ph1_ProfileVoltageSource.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 #include <memory>
 #include <villas/format.hpp>
-#include <villas/formats/protobuf.hpp>
+#include <villas/formats/villas.pb-c.h>
 #include <villas/signal_list.hpp>
 #include <villas/signal_type.hpp>
 

diff --git a/packaging/Docker/Dockerfile.dev b/packaging/Docker/Dockerfile.dev
@@ -1,7 +1,7 @@
 FROM fedora:36 AS base
 
 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
-ARG VILLAS_VERSION=411b0ad49e2629ad41c6918d2a6c51e9a72220b4
+ARG VILLAS_VERSION=18cdd2a6364d05fbf413ca699616cd324abfcb54
 
 ARG CMAKE_OPTS
 ARG MAKE_OPTS=-j4

diff --git a/packaging/Docker/Dockerfile.dev-debian b/packaging/Docker/Dockerfile.dev-debian
@@ -1,7 +1,7 @@
 FROM debian:11
 
 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
-ARG VILLAS_VERSION=411b0ad49e2629ad41c6918d2a6c51e9a72220b4
+ARG VILLAS_VERSION=18cdd2a6364d05fbf413ca699616cd324abfcb54
 
 ARG CMAKE_OPTS
 ARG MAKE_OPTS=-j4

diff --git a/packaging/Docker/Dockerfile.manylinux b/packaging/Docker/Dockerfile.manylinux
@@ -6,7 +6,7 @@
 FROM quay.io/pypa/manylinux_2_28_x86_64
 
 ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
-ARG VILLAS_VERSION=411b0ad49e2629ad41c6918d2a6c51e9a72220b4
+ARG VILLAS_VERSION=18cdd2a6364d05fbf413ca699616cd324abfcb54
 
 ARG CMAKE_OPTS
 ARG MAKE_OPTS=-j4