Merge branch 'develop' into ci_experimental_py

AMICI-dev · Feb 12, 2021 · bf29e62 · bf29e62
2 parents 67e6b97 + dc26399
commit bf29e62
Show file tree

Hide file tree

Showing 7 changed files with 473 additions and 432 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,6 +135,7 @@ set(AMICI_SRC_LIST
     ${CMAKE_SOURCE_DIR}/src/model.cpp
     ${CMAKE_SOURCE_DIR}/src/model_ode.cpp
     ${CMAKE_SOURCE_DIR}/src/model_dae.cpp
+    ${CMAKE_SOURCE_DIR}/src/model_state.cpp
     ${CMAKE_SOURCE_DIR}/src/newton_solver.cpp
     ${CMAKE_SOURCE_DIR}/src/forwardproblem.cpp
     ${CMAKE_SOURCE_DIR}/src/steadystateproblem.cpp