-updated VxWorks makefile

-some experimental changes to improve sparseMatrices

Author: RuedKamp

Compiler/Template/CodegenCpp.tpl

@@ -62,6 +62,7 @@ SET(IDAName ${LIBPREFIX}IDA)
 SET(PeerName ${LIBPREFIX}Peer)
 SET(RTRKName ${LIBPREFIX}RTRK)
 SET(EulerName ${LIBPREFIX}Euler)
+SET(kluName ${LIBPREFIX}klu)
 SET(RTEulerName ${LIBPREFIX}RTEuler)
 SET(IdaName ${LIBPREFIX}Ida)
 SET(IdasName ${LIBPREFIX}Idas)
@@ -433,6 +434,10 @@ message(STATUS "Boost dirs '${Boost_LIBRARY_DIRS}', '${Boost_INCLUDE_DIR}'")
 #build of simulation.core
 include_directories ("Include")
 include_directories ("Solver")
+include_directories ("Include/Solver/KLU")
+
+add_subdirectory (Solver/KLU)
+
 add_subdirectory (Core/Modelica)
 add_subdirectory (Core/Math)
 add_subdirectory (SimCoreFactory/OMCFactory)
@@ -453,6 +458,7 @@ add_subdirectory (Core/SimController)
 
 #add  Euler solver project
 add_subdirectory (Solver/Euler)
+
 add_subdirectory (Solver/RTEuler)
 add_subdirectory (Solver/Newton)
 add_subdirectory (Solver/Hybrj)
@@ -515,6 +521,9 @@ GET_FILENAME_COMPONENT(libUmfPackName ${libUmfPack} NAME)
 GET_TARGET_PROPERTY(libEuler ${EulerName} LOCATION)
 GET_FILENAME_COMPONENT(libEulerName ${libEuler} NAME)
 
+GET_TARGET_PROPERTY(libKlu ${kluName} LOCATION)
+GET_FILENAME_COMPONENT(libKluName ${libKlu} NAME)
+
 GET_TARGET_PROPERTY(libRTEuler ${RTEulerName} LOCATION)
 GET_FILENAME_COMPONENT(libRTEulerName ${libRTEuler} NAME)
 
@@ -552,6 +561,7 @@ GET_FILENAME_COMPONENT(libSimObjFactoryName ${libSimObjFactory} NAME)
 GET_TARGET_PROPERTY(libFMU ${FMUName} LOCATION)
 GET_FILENAME_COMPONENT(libFMUName ${libFMU} NAME)
 
+set (KLU_LIB ${libKluName})
 set (EULER_LIB ${libEulerName})
 set (RTEULER_LIB ${libRTEulerName})
 set (SETTINGSFACTORY_LIB ${libSetFactoryName})

SimulationRuntime/cpp/CMakeLists.txt

@@ -7,13 +7,17 @@
 #include <Core/System/FactoryExport.h>
 #include <Core/System/AlgLoopDefaultImplementation.h>
 
-
+bool BOOST_EXTENSION_EXPORT_DECL mycompare ( mytuple lhs, mytuple rhs)
+{
+	return lhs.ele1 < rhs.ele1;
+}
 
 AlgLoopDefaultImplementation::AlgLoopDefaultImplementation()
   : _dimAEq         (0)
   , _constraintType(IAlgLoop::UNDEF)
   ,__xd(NULL)
   ,_xd_init(NULL)
+  ,_AData(NULL)
 {
 }
 
@@ -49,6 +53,8 @@ void AlgLoopDefaultImplementation::initialize()
     delete [] _xd_init;
   __xd     = new double[_dimAEq];
   _xd_init = new double[_dimAEq];
+  memset(__xd,0,_dimAEq*sizeof(double));
+  memset(_xd_init,0,_dimAEq*sizeof(double));
 };
 
 /// Output routine (to be called by the solver after every successful integration step)
@@ -73,4 +79,8 @@ void AlgLoopDefaultImplementation::getRHS(double* res)
 {
   memcpy(res, __xd, sizeof(double) * _dimAEq);
 }
+//void AlgLoopDefaultImplementation::getSparseAdata(double* data, int nonzeros)
+//{
+//  memcpy(data, _AData, sizeof(double) * nonzeros);
+//}
 /** @} */ // end of coreSystem

SimulationRuntime/cpp/Core/System/AlgLoopDefaultImplementation.cpp

@@ -32,6 +32,27 @@ install (FILES  ${CMAKE_SOURCE_DIR}/Include/Core/Utils/extension/measure_time.hp
                 ${CMAKE_SOURCE_DIR}/Include/Core/Utils/extension/logger.hpp
          DESTINATION include/omc/cpp/Core/Utils/extension)
 
+#install (FILES  ${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/utils.h
+#         DESTINATION include/omc/cpp/Core/Utils/numeric)
+#install (FILES  ${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas.hpp
+#         DESTINATION include/omc/cpp/Core/Utils/numeric/bindings)
+#install (FILES  ${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas.hpp
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/banded.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/hermitian.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/matrix.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/matrix_expression.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/matrix_proxy.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/matrix_sparse.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/scalar_vector.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/storage.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/symmetric.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/triangular.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/vector.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/vector_expression.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/vector_proxy.hpp>
+#				${CMAKE_SOURCE_DIR}/Include/Core/Utils/numeric/bindings/ublas/vector_sparse.hpp>
+ #        DESTINATION include/omc/cpp/Core/Utils/numeric/bindings/ublas)
+
 IF(PAPI_FOUND)
 	add_library("${ExtensionUtilitiesName}_papi" SHARED measure_time_papi.cpp)
 

SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt

@@ -1,9 +1,6 @@
 #pragma once
 
 
-using std::map;
-using std::pair;
-using std::make_pair;
 
 struct BOOST_EXTENSION_EXPORT_DECL sparse_inserter  {
     struct t2 {

SimulationRuntime/cpp/Include/Core/Math/SparseMatrix.h

@@ -133,4 +133,5 @@ typedef ublas::matrix<double, ublas::column_major> matrix_t;
 #include <Core/DataExchange/Policies/BufferReaderWriter.h>
 #include <Core/HistoryImpl.h>
 #include <Core/DataExchange/SimDouble.h>
+
 /** @} */ // end of group1

SimulationRuntime/cpp/Include/Core/Modelica.h

@@ -18,6 +18,38 @@ Services for the implementation of an algebraic loop in open modelica.
 Copyright (c) 2008, OSMC
 *****************************************************************************/
 
+//using std::map;
+//using std::pair;
+//using std::make_pair;
+
+//#include <string>
+//#include <vector>
+#include <boost/tuple/tuple.hpp>
+
+//#include <Core/Utils/numeric/bindings/ublas.hpp>
+//#include <Core/Utils/numeric/utils.h>
+
+//#include <algorithm>
+
+//typedef boost::tuple<int,int> mytuple;
+
+class mytuple
+{
+public:
+	 mytuple(int a, int b)
+	 {
+		ele1 = a;
+		ele2 = b;
+	 };
+	~mytuple(){};
+	int ele1;
+	int ele2;
+};
+
+
+
+bool BOOST_EXTENSION_EXPORT_DECL mycompare ( mytuple lhs, mytuple rhs);
+
 /// Enumeration to control the output
 enum OUTPUT
 {
@@ -63,6 +95,8 @@ class BOOST_EXTENSION_ALGLOOPDEFAULTIMPL_DECL AlgLoopDefaultImplementation
   /// Provide the right hand side (according to the index)
   void getRHS(double* res);
 
+  //void getSparseAdata(double* data, int nonzeros);
+
 
   /// Output routine (to be called by the solver after every successful integration step)
   void writeOutput(const OUTPUT command = UNDEF_OUTPUT);
@@ -81,7 +115,8 @@ class BOOST_EXTENSION_ALGLOOPDEFAULTIMPL_DECL AlgLoopDefaultImplementation
   double* __xd;
 
   IAlgLoop::CONSTRTYPE
-    _constraintType;                ///< Typ der Bindungsgleichungen (analog, digital, binär)
+  _constraintType;                ///< Typ der Bindungsgleichungen (analog, digital, binär)
+  double * _AData;
 
 };
 /** @} */ // end of coreSystem

SimulationRuntime/cpp/Include/Core/System/AlgLoopDefaultImplementation.h

@@ -17,6 +17,7 @@ Abstract interface class for algebraic loop in equations in open modelica.
 Copyright (c) 2008, OSMC
 *****************************************************************************/
 
+
 class IAlgLoop
 {
 public:
@@ -54,6 +55,8 @@ class IAlgLoop
   /// Provide the right hand side (according to the index)
   virtual void getRHS(double* res) = 0;
 
+  virtual void getSparseAdata(double* data, int nonzeros) = 0;
+
 
   virtual const matrix_t& getSystemMatrix()  = 0;
   virtual const sparsematrix_t& getSystemSparseMatrix()  = 0;
@@ -73,5 +76,6 @@ class IAlgLoop
   /// Definiert die übergebene Größe als Schnittgröße
   void addConstraint(double& constr_value);
   */
+  //public : double * _AData;
 };
 /** @} */ // end of coreSystem

SimulationRuntime/cpp/Include/Core/System/IAlgLoop.h

@@ -3,11 +3,16 @@
  *
  *  @{
  */
-
-
-
-
-
+#if defined(__vxworks)
+#include <klu.h>
+#else
+#include <Solver/KLU/klu.h>
+#endif
+/*
+class klu_symbolic;
+class klu_numeric  ;
+class klu_common  ;
+*/
 
 class Kinsol : public IAlgLoopSolver
 {
@@ -52,7 +57,7 @@ class Kinsol : public IAlgLoopSolver
 
   long int
     _dimSys;              ///< Temp   - Number of unknowns (=dimension of system of equations)
-
+  int _dim;
   bool
     _firstCall;           ///< Temp   - Denotes the first call to the solver, init() is called
   long int *_ihelpArray,
@@ -100,5 +105,17 @@ class Kinsol : public IAlgLoopSolver
     _currentIterateNorm;
 
    int _counter;
+   //required for klu linear solver
+   bool _sparse;
+
+   klu_symbolic* _kluSymbolic ;
+   klu_numeric* _kluNumeric ;
+   klu_common* _kluCommon ;
+   int* _Ai;
+   int* _Ap;
+   double* _Ax;
+   int _nonzeros;
+
+
 };
 /** @} */ // end of solverKinsol

SimulationRuntime/cpp/Include/Solver/Kinsol/Kinsol.h

@@ -1,3 +1,4 @@
+#define KLU_LIB "@KLU_LIB@"
 
 #define EULER_LIB "@EULER_LIB@"
 #define RTEULER_LIB "@RTEULER_LIB@"