Commit 730e4f95 authored by Philipp Fensch's avatar Philipp Fensch
Browse files

Merged dpsim changes

parent 65d20312
......@@ -62,7 +62,7 @@ namespace DPsim {
public:
SolveTask(MnaSolverGpu<VarType>& solver, Bool steadyStateInit) :
Task(solver.mName + ".Solve"), mSolver(solver), mSteadyStateInit(steadyStateInit) {
for (auto it : solver.mPowerComponents) {
for (auto it : solver.mMNAComponents) {
if (it->template attribute<Matrix>("right_vector")->get().size() != 0) {
mAttributeDependencies.push_back(it->attribute("right_vector"));
}
......
......@@ -53,12 +53,12 @@ if(WITH_SHMEM)
endif()
if(WITH_CUDA)
list(APPEND SOURCES
list(APPEND DPSIM_SOURCES
MNASolverGpu.cpp
)
list(APPEND INCLUDE_DIRS ${CUDA_INCLUDE_DIRS} ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
list(APPEND LIBRARIES ${CUDA_LIBRARIES} ${CUDA_cusolver_LIBRARY})
list(APPEND DPSIM_INCLUDE_DIRS ${CUDA_INCLUDE_DIRS} ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
list(APPEND DPSIM_LIBRARIES ${CUDA_LIBRARIES} ${CUDA_cusolver_LIBRARY})
endif()
if(WITH_OPENMP)
......
......@@ -137,17 +137,17 @@ template <typename VarType>
Task::List MnaSolverGpu<VarType>::getTasks() {
Task::List l;
for (const auto &comp : this->mPowerComponents) {
for (auto comp : this->mMNAComponents) {
for (auto task : comp->mnaTasks()) {
l.push_back(task);
}
}
for (const auto &node : this->mNodes) {
for (auto node : this->mNodes) {
for (auto task : node->mnaTasks())
l.push_back(task);
}
// TODO signal components should be moved out of MNA solver
for (const auto &comp : this->mSignalComponents) {
for (auto comp : this->mSimSignalComps) {
for (auto task : comp->getTasks()) {
l.push_back(task);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment