- added makefile dependency from runtimeCPPinstall to omc, because th…

…e suitesparse libraries should be used by the cpp-runtime

- the "--nls_continue" flag is now working again, if the kinsol solver is used

Makefile.common

@@ -174,7 +174,7 @@ runtimeCPP: CMinpack
 CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
 
 
-runtimeCPPinstall: CMinpack copycppheader
+runtimeCPPinstall: CMinpack copycppheader omc
 	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)" install ANALYZATION_MODE="$(ANALYZATION_MODE)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)
 	test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppCVode.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppCVode.dylib
 	test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppDataExchange.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppDataExchange.dylib

SimulationRuntime/cpp/Solver/Kinsol/Kinsol.cpp

@@ -549,7 +549,6 @@ void Kinsol::solve()
 
     if(_iterationStatus == SOLVERERROR && !_eventRetry)
     {
-      /*Always throw an exception if kinsol stops with error
       if(_kinsolSettings->getContinueOnError())
       {
         if(!_solverErrorNotificationGiven)
@@ -559,7 +558,6 @@ void Kinsol::solve()
         }
       }
       else
-      */
         throw ModelicaSimulationError(ALGLOOP_SOLVER,"Nonlinear solver failed!");
     }
 	}