Separated nonlinear and linear system and the corresponding solver in two classes

-adapted Newton,Kinsol,Umfpack,Hybrj,Broyden  for new linear and nonlinear System/AlgLoopDefaultImplementation.cpp
 -separted AlgLoopDefaultImplementation in two classes
 -adapted cpp and fmu cpp tempalted to new linear and nonlinear System/AlgLoopDefaultImplementation.cpp

Author: niklwors

Compiler/SimCode/SimCodeUtil.mo

@@ -3354,7 +3354,7 @@ algorithm
       (beqs, sources) = BackendDAEUtil.getEqnSysRhs(inEquationArray, inVars, SOME(inFuncs));
       beqs = listReverse(beqs);
       simJac = List.map1(jac, jacToSimjac, inVars);
-      //simJac = List.sort(simJac,simJacCSRToCSC);
+      simJac = List.sort(simJac,simJacCSRToCSC);
 
     then ({SimCode.SES_LINEAR(SimCode.LINEARSYSTEM(iuniqueEqIndex, mixedEvent, simVars, beqs, simJac, {}, NONE(), sources, 0), NONE())}, iuniqueEqIndex+1, itempvars);
 

Compiler/Template/CodegenCpp.tpl

@@ -677,7 +677,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /MD - link with MSVCRT.LIB
   # /link - [linker options and libraries]
   # /LIBPATH: - Directories where libs can be found
-  OMCPP_SOLVER_LIBS=OMCppNewton_static.lib OMCppDgesv_static.lib
+  OMCPP_SOLVER_LIBS=OMCppNewton_static.lib OMCppDgesv_static.lib OMCppDgesvSolver_static.lib
   EXTRA_LIBS=<%dirExtra%> <%libsExtra%>
   LDFLAGS=/link /DLL /NOENTRY /LIBPATH:"<%makefileParams.omhome%>/lib/omc/cpp/msvc" /LIBPATH:"<%makefileParams.omhome%>/bin" OMCppSystem_static.lib OMCppMath_static.lib OMCppExtensionUtilities_static.lib OMCppFMU_static.lib $(OMCPP_SOLVER_LIBS) ModelicaExternalC.lib ModelicaStandardTables.lib OMCppModelicaUtilities_static.lib $(EXTRA_LIBS)
   PLATFORM="<%makefileParams.platform%>"
@@ -766,7 +766,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   CALCHELPERMAINFILE=OMCpp<%fileNamePrefix%>CalcHelperMain.cpp
 
   # CVode can be used for Co-Simulation FMUs, Kinsol is available to handle non linear equation systems
-  OMCPP_SOLVER_LIBS=-lOMCppNewton_static
+  OMCPP_SOLVER_LIBS=-lOMCppNewton_static -lOMCppDgesvSolver_static
   ifeq ($(USE_FMU_SUNDIALS),ON)
   $(eval OMCPP_SOLVER_LIBS=$(OMCPP_SOLVER_LIBS) -lOMCppKinsol_static $(SUNDIALS_LIBRARIES))
   $(eval CFLAGS=-DENABLE_SUNDIALS_STATIC $(CFLAGS))

Compiler/Template/CodegenFMUCpp.tpl

@@ -3348,6 +3348,7 @@ package Flags
   constant DebugFlag MULTIRATE_PARTITION;
   constant ConfigFlag DAE_MODE;
   constant ConfigFlag EQUATIONS_PER_FILE;
+  constant ConfigFlag GENERATE_SYMBOLIC_JACOBIAN;
 
   function set
     input DebugFlag inFlag;

Compiler/Template/SimCodeTV.mo

@@ -76,6 +76,7 @@ OPTION(USE_BOOST_REALPATHS "USE_BOOST_REALPATHS" OFF)
 OPTION(RUNTIME_PROFILING "RUNTIME_PROFILING" OFF)
 OPTION(FMU_SUNDIALS "FMU_SUNDIALS" OFF)
 OPTION(SUNDIALS_ROOT "SUNDIALS ROOT" "")
+OPTION(KLU_ROOT "KLU ROOT" "")
 OPTION(USE_CPP_03 "USE_CPP_03" OFF)
 
 #Set Variables
@@ -116,6 +117,8 @@ SET(RTEulerName ${LIBPREFIX}RTEuler${LIBSUFFIX})
 SET(IdaName ${LIBPREFIX}Ida${LIBSUFFIX})
 SET(IdasName ${LIBPREFIX}Idas${LIBSUFFIX})
 SET(KinsolName ${LIBPREFIX}Kinsol${LIBSUFFIX})
+SET(LinearSolverName ${LIBPREFIX}LinearSolver${LIBSUFFIX})
+SET(DgesvSolverName ${LIBPREFIX}DgesvSolver${LIBSUFFIX})
 SET(ModelicaName ${LIBPREFIX}Modelica${LIBSUFFIX})
 SET(NewtonName ${LIBPREFIX}Newton${LIBSUFFIX})
 SET(BroydenName ${LIBPREFIX}Broyden${LIBSUFFIX})
@@ -130,6 +133,7 @@ SET(FMUName ${LIBPREFIX}FMU${LIBSUFFIX})
 SET(DgesvName ${LIBPREFIX}Dgesv) # only static version
 
 SET(USE_MICO OFF)
+SET(USE_KLU OFF)
 SET(REDUCE_DAE OFF)
 IF(NOT FMU_TARGET OR FMU_SUNDIALS)
   SET(USE_SUNDIALS ON)
@@ -566,6 +570,56 @@ IF(USE_SUNDIALS)
   ENDIF(WIN32)
 ENDIF(USE_SUNDIALS)
 
+# Find Klu solvers
+IF(USE_KLU)
+  #set klu solvers include and library directories
+  IF(MSVC)
+    SET(Klu_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/SuiteSparse/install_msvc")
+  ELSE(MSVC)
+    SET(Klu_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/SuiteSparse/build")
+  ENDIF(MSVC)
+  SET(KLU_INLCUDE_HOME  ${Klu_Path}/include/omc/c/suitesparse/Include)
+  SET(KLU_LIBRARY_RELEASE_HOME  ${Klu_Path}/lib/omc)
+  MESSAGE(STATUS "Klu include:")
+  MESSAGE(STATUS "${KLU_INLCUDE_HOME}")
+  MESSAGE(STATUS "Klu library:")
+  MESSAGE(STATUS "${KLU_LIBRARY_RELEASE_HOME}")
+
+  FIND_PATH(KLU_INCLUDE_DIR klu.h PATHS ${KLU_INLCUDE_HOME} $ENV{KLU_ROOT}/include)
+  IF (NOT KLU_INCLUDE_DIR)
+    MESSAGE(FATAL_ERROR "Could not find Klu, specify environment variable KLU_ROOT")
+  ELSE(NOT KLU_INCLUDE_DIR)
+    INCLUDE_DIRECTORIES(${KLU_INCLUDE_DIR})
+  ENDIF(NOT KLU_INCLUDE_DIR)
+
+  FIND_LIBRARY(KLU_LIB "klu" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${KLU_LIBRARY_RELEASE_HOME} $ENV{SUNDIALS_ROOT}/lib)
+  IF(NOT KLU_LIB)
+    MESSAGE(FATAL_ERROR "Could not find klu library!")
+  ENDIF()
+
+  FIND_LIBRARY(AMD_LIB "amd" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${KLU_LIBRARY_RELEASE_HOME} $ENV{SUNDIALS_ROOT}/lib)
+  IF(NOT AMD_LIB)
+    MESSAGE(FATAL_ERROR "Could not find klu amd library!")
+  ENDIF()
+
+  FIND_LIBRARY(BTF "btf" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${KLU_LIBRARY_RELEASE_HOME} $ENV{SUNDIALS_ROOT}/lib)
+  IF(NOT BTF)
+    MESSAGE(FATAL_ERROR "Could not find klu btf library!")
+  ENDIF()
+
+   FIND_LIBRARY(COLAMD "colamd" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${KLU_LIBRARY_RELEASE_HOME} $ENV{SUNDIALS_ROOT}/lib)
+  IF(NOT COLAMD)
+    MESSAGE(FATAL_ERROR "Could not find klu colamd library!")
+  ENDIF()
+
+  SET(KLU_LIBRARIES ${KLU_LIB} ${AMD_LIB} ${BTF} ${COLAMD})
+
+  MESSAGE(STATUS "Klu Libraries:")
+  MESSAGE(STATUS "${KNU_LIBRARIES}")
+
+  ADD_DEFINITIONS(-Dklu)
+ENDIF(USE_KLU)
+
 #Handle umfpack
 #FIND_PACKAGE(SuiteSparse)
 IF(SUITESPARSE_UMFPACK_FOUND)
@@ -659,7 +713,7 @@ if(NOT FMU_TARGET)
   add_subdirectory(Solver/Hybrj)
   add_subdirectory(Solver/UmfPack)
   add_subdirectory(Solver/Peer)
-
+  add_subdirectory(Solver/LinearSolver)
   # add simulation solvers
   add_subdirectory(Solver/Euler)
   add_subdirectory(Solver/RK12)
@@ -704,6 +758,13 @@ IF(USE_SUNDIALS)
 
   GET_TARGET_PROPERTY(libKinsol ${KinsolName} LOCATION)
   GET_FILENAME_COMPONENT(libKinsolName ${libKinsol} NAME)
+
+  GET_TARGET_PROPERTY(libLinearSolver ${LinearSolverName} LOCATION)
+  GET_FILENAME_COMPONENT(libLinearSolverName ${libLinearSolver} NAME)
+
+  GET_TARGET_PROPERTY(libDgesvSolver ${DgesvSolverName} LOCATION)
+  GET_FILENAME_COMPONENT(libDgesvSolverName ${libDgesvSolver} NAME)
+
   #GET_TARGET_PROPERTY(libIdas ${IdasName} LOCATION)
   #GET_FILENAME_COMPONENT(libIdasName ${libIdas} NAME)
   #GET_TARGET_PROPERTY(libIda ${IdaName} LOCATION)
@@ -796,6 +857,8 @@ set (CPPDASSL_LIB ${libCppDASSLName})
 set (RTRK_LIB ${libRTRKName})
 set (SYSTEM_LIB ${libSystemName})
 set (SOLVER_LIB ${libSolverName})
+SET (LINEARSOLVER_LIB ${libLinearSolverName})
+SET (DGESVSOLVER_LIB ${libDgesvSolverName})
 set (MATH_LIB ${libMathName})
 set (HYBRJ_LIB ${libHybrjName})
 set (SIMOBJFACTORY_LIB ${libSimObjFactoryName})

SimulationRuntime/cpp/CMakeLists.txt

@@ -158,10 +158,6 @@ int pivot(double *A, int n_rows, int n_cols, int *rowInd, int *colInd)
   /* all fine */
   return 0;
 }
-void getSparseMatrixData(sparsematrix_t& A, double** px)
-{
-  *px = bindings::begin_value(A);
-}
 
 
 /** @} */ // end of math

SimulationRuntime/cpp/Core/Math/Functions.cpp

@@ -15,7 +15,7 @@ GlobalSettings::GlobalSettings()
   , _emitResults(EMIT_ALL)
   , _infoOutput(true)
   , _selected_solver("Euler")
-  , _selected_lin_solver("Newton")
+  , _selected_lin_solver("linearSolver")
   , _selected_nonlin_solver("Newton")
   , _resultsfile_name("results.csv")
   , _endless_sim(false)