- collected commits for improving non-linear solver newton.

OpenModelica · Jul 15, 2015 · 35e6782 · 35e6782
1 parent 4a8e668
commit 35e6782
Show file tree

Hide file tree

Showing 9 changed files with 975 additions and 635 deletions.
diff --git a/SimulationRuntime/c/Makefile.objs b/SimulationRuntime/c/Makefile.objs
@@ -33,7 +33,7 @@ MATH_HFILES = blaswrap.h
 
 SOLVER_OBJS_MINIMAL=delay$(OBJ_EXT) events$(OBJ_EXT) external_input$(OBJ_EXT) linearSystem$(OBJ_EXT) linearSolverLapack$(OBJ_EXT) linearSolverTotalPivot$(OBJ_EXT) mixedSystem$(OBJ_EXT) mixedSearchSolver$(OBJ_EXT) model_help$(OBJ_EXT) nonlinearSystem$(OBJ_EXT) nonlinearSolverHomotopy$(OBJ_EXT) omc_math$(OBJ_EXT) solver_main$(OBJ_EXT) stateset$(OBJ_EXT)
 ifeq ($(OMC_MINIMAL_RUNTIME),)
-SOLVER_OBJS=$(SOLVER_OBJS_MINIMAL) kinsolSolver$(OBJ_EXT) linearSolverLis$(OBJ_EXT) linearSolverUmfpack$(OBJ_EXT) dassl$(OBJ_EXT) radau$(OBJ_EXT) nonlinearSolverHybrd$(OBJ_EXT) nonlinearSolverNewton$(OBJ_EXT)
+SOLVER_OBJS=$(SOLVER_OBJS_MINIMAL) kinsolSolver$(OBJ_EXT) linearSolverLis$(OBJ_EXT) linearSolverUmfpack$(OBJ_EXT) dassl$(OBJ_EXT) radau$(OBJ_EXT) nonlinearSolverHybrd$(OBJ_EXT) nonlinearSolverNewton$(OBJ_EXT) newtonIteration$(OBJ_EXT)
 else
 SOLVER_OBJS=$(SOLVER_OBJS_MINIMAL)
 endif

diff --git a/SimulationRuntime/c/simulation/solver/CMakeLists.txt b/SimulationRuntime/c/simulation/solver/CMakeLists.txt
@@ -11,15 +11,15 @@ SET(solver_sources
 ../../../../3rdParty/Cdaskr/solver/daux.c
 ../../../../3rdParty/Cdaskr/solver/dlinpk.c
 dassl.c           kinsolSolver.c            linearSystem.c             nonlinearSolverHybrd.c   radau.c
-delay.c           linearSolverLapack.c      mixedSearchSolver.c        nonlinearSolverNewton.c  solver_main.c
-linearSolverLis.c         mixedSystem.c              nonlinearSystem.c        stateset.c
+delay.c           linearSolverLapack.c      mixedSearchSolver.c        nonlinearSolverNewton.c  newtonIteration.c solver_main.c
+linearSolverLis.c mixedSystem.c             nonlinearSystem.c          stateset.c
 events.c          linearSolverTotalPivot.c  model_help.c               omc_math.c
 external_input.c  linearSolverUmfpack.c     nonlinearSolverHomotopy.c)
 
 SET(solver_headers ../../../../3rdParty/Cdaskr/solver/ddaskr_types.h
 dassl.h    external_input.h          linearSolverUmfpack.h  nonlinearSolverHomotopy.h  radau.h
 delay.h    kinsolSolver.h            linearSystem.h         nonlinearSolverHybrd.h     solver_main.h
-linearSolverLapack.h      mixedSearchSolver.h    nonlinearSolverNewton.h    stateset.h
+linearSolverLapack.h      mixedSearchSolver.h    nonlinearSolverNewton.h newtonIteration.h   stateset.h
 epsilon.h  linearSolverLis.h         mixedSystem.h          nonlinearSystem.h
 events.h   linearSolverTotalPivot.h  model_help.h           omc_math.h)