fix in array operations sum_array and dot_array

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22475 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: niklwors

SimulationRuntime/cpp/Core/Math/ArrayOperations.cpp

@@ -246,7 +246,9 @@ template < typename T>
 T sum_array ( BaseArray<T> & leftArray )
 {
    T val;
-   val = std::accumulate( leftArray.getData(), leftArray.getData() + leftArray.getNumElems() ,0 );
+   T* data = leftArray.getData();
+   unsigned int dim = leftArray.getNumElems();
+   val = std::accumulate( data, data + dim ,0.0 );
    return val;
 }
 
@@ -263,7 +265,7 @@ T dot_array( BaseArray<T> & a ,  BaseArray<T> & b  )
   T* data1 = a.getData();
   unsigned int nelems = a.getNumElems();
   T* data2 = b.getData();
-  T r = std::inner_product(data1, data1 + nelems, data2, 0);
+  T r = std::inner_product(data1, data1 + nelems, data2, 0.0);
   return r;
 };
 

SimulationRuntime/cpp/Include/Core/DataExchange/Policies/MatfileWriter.h

@@ -22,7 +22,6 @@ class MatFileWriter : public Writer<dim_1, dim_2, dim_3, dim_4>
  public:
     MatFileWriter(unsigned long size, string output_path, string file_name)
             : Writer<dim_1, dim_2, dim_3, dim_4>(),
-              _output_stream(0),
               _dataHdrPos(),
               _dataEofPos(),
               _curser_position(0),

SimulationRuntime/cpp/Solver/CVode/FactoryExport.h

@@ -9,7 +9,7 @@
 #define BOOST_EXTENSION_SOLVER_DECL BOOST_EXTENSION_IMPORT_DECL
 #define BOOST_EXTENSION_STATESELECT_DECL BOOST_EXTENSION_IMPORT_DECL
 #define BOOST_EXTENSION_SOLVERSETTINGS_DECL BOOST_EXTENSION_IMPORT_DECL
-#define BOOST_EXTENSION_MONITOR_DECL BOOST_EXTENSION_EXPORT_DECL
+#define BOOST_EXTENSION_MONITOR_DECL BOOST_EXTENSION_IMPORT_DECL
 #else
     error "operating system not supported"
 #endif

SimulationRuntime/cpp/Solver/Euler/Euler.cpp

@@ -116,18 +116,15 @@ void Euler::initialize()
         if( _eulerSettings->getDenseOutput())
         {
             // Ausgabeschrittweite
-            _hOut        =  dynamic_cast<ISolverSettings*>(_eulerSettings)->getGlobalSettings()->gethOutput();
-
+            _hOut		=  dynamic_cast<ISolverSettings*>(_eulerSettings)->getGlobalSettings()->gethOutput();
+			_h=_hOut;
         }
-     _h = std::max(std::min(_h, dynamic_cast<ISolverSettings*>(_eulerSettings)->getUpperLimit()), dynamic_cast<ISolverSettings*>(_eulerSettings)->getLowerLimit());
-     double hout = dynamic_cast<ISolverSettings*>(_eulerSettings)->getGlobalSettings()->gethOutput();
-    _outputStp = hout/_h ;
+		else
+		{
+			_h = std::max(std::min(_h, dynamic_cast<ISolverSettings*>(_eulerSettings)->getUpperLimit()), dynamic_cast<ISolverSettings*>(_eulerSettings)->getLowerLimit());
+		}
     _tZero=-1;
-    if(_outputStp<1)
-    {
-       _outputStp=1;
-        dynamic_cast<ISolverSettings*>(_eulerSettings)->setUpperLimit(hout);
-    }
+   
     }
 }
   void Euler::setTimeOut(unsigned int time_out)

SimulationRuntime/cpp/Solver/Euler/FactoryExport.cpp

@@ -18,7 +18,8 @@ extern "C" ISolverSettings* createEulerSettings(IGlobalSettings* globalSettings)
 }
 
 #elif defined(SIMSTER_BUILD)
-
+#include <Modelica.h>
+#include <Policies/FactoryConfig.h>
 #include "Euler.h"
 #include "EulerSettings.h"