Remove trilinos nox solver as it is not used.

  - Can be brought back if needed.

Makefile.omdev.mingw

@@ -56,7 +56,7 @@ BUILDTYPE=Debug
 endif
 
 
-.PHONY: omc omc-diff omlibrary-core omplot omedit omedit-testsuite omparser omsimulator omnotebook omshell omoptim omsens omsens_qt qtclientsDLLs qtclientsDLLs simulationruntimecmsvc runtimeCPPinstall runtimeCPPmsvcinstall OMSICPPinstall all-runtimes nox test fast-test testsuite-depends libs-for-testing
+.PHONY: omc omc-diff omlibrary-core omplot omedit omedit-testsuite omparser omsimulator omnotebook omshell omoptim omsens omsens_qt qtclientsDLLs qtclientsDLLs simulationruntimecmsvc runtimeCPPinstall runtimeCPPmsvcinstall OMSICPPinstall all-runtimes test fast-test testsuite-depends libs-for-testing
 
 all: omc testsuite-depends omlibrary-core
 
@@ -258,9 +258,6 @@ all-runtimes:
 	$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) BUILDTYPE=$(BUILDTYPE) runtimeCPPmsvcinstall
 	$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) BUILDTYPE=$(BUILDTYPE) simulationruntimecmsvc
 
-nox:
-	$(MAKE) -C OMCompiler -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR) BUILDTYPE=$(BUILDTYPE) nox
-
 testlogwindows:
 	$(MAKE) -C testsuite -f Makefile ReferenceFiles > testsuite/testsuite-trace.txt
 	$(MAKE) -C testsuite/libs-for-testing -f Makefile >> testsuite/testsuite-trace.txt

OMCompiler/Makefile.common

@@ -671,22 +671,6 @@ $(builddir_lib_omc)/libsundials_ida.a: 3rdParty/sundials-5.4.0/CMakeLists.txt
 clean-sundials:
 	rm -rf 3rdParty/sundials-5.4.0/build "$(OMBUILDDIR)/include/omc/cpp/sundials" "$(builddir_lib_omc)/libsundials"* "$(builddir_inc)/sundials"
 
-# Build Nox
-nox: 3rdParty/trilinos-nox/CMakeLists.txt $(SUITESPARSE_TARGET)
-	mkdir -p 3rdParty/trilinos-nox/build
-	cd 3rdParty/trilinos-nox/build && $(CMAKE) .. -G $(CMAKE_TARGET) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_INSTALL_PREFIX="`pwd`" -DKLU_ENABLE:Bool=ON -DKLU_LIBRARY_DIR="$(builddir_lib_omc)" -DKLU_INCLUDE_DIR="$(OMBUILDDIR)/include/omc/c/suitesparse" -DCMAKE_C_FLAGS="$(CFLAGS) -lm -L $(builddir_lib_omc)" $(SUITESPARSE_LIBS) $(IS_MINGW32) $(IS_MINGW64) -DOMDEV_DIR="$(OMDEVMSYS)"
-	$(MAKE) -C 3rdParty/trilinos-nox/build install
-	rm -r 3rdParty/trilinos-nox/build/lib/cmake
-	mkdir -p "$(builddir_lib_omc)/cpp"
-	(test `uname` = Darwin || test `uname` = Linux) \
-	  && cp -pf 3rdParty/trilinos-nox/build/lib/* "$(builddir_lib_omc)/cpp" \
-	  || cp -pf 3rdParty/trilinos-nox/build/bin/* "$(builddir_lib_omc)/cpp"
-
-clean-nox:
-	test -d 3rdParty/trilinos-nox/build && cd 3rdParty/trilinos-nox/build && $(MAKE) clean
-	rm -rf $(OMBUILDDIR)/include/omc/cpp/trilinos-nox
-	rm -f $(builddir_lib_omc)/cpp/lib{belos,loca,ml,nox,teuchos}*
-
 # Build libffi
 LIBFFI=3rdParty/libffi
 libffi: $(LIBFFI)

OMCompiler/Makefile.omdev.mingw

@@ -115,7 +115,7 @@ SEMLA_LIB=semla
 SEMLA_CLEAN=semla-clean
 endif
 
-main.PHONY: simulationruntimecmsvc runtimeCPPinstall runtimeCPPmsvcinstall OMSICPPinstall nox getMSVCversion omdev_extra_dlls install-openturns copycppheader copycppmsvcheader boehm-gc-lib fmil_msvc sundials_msvc CMinpack_msvc suitesparse_msvc runtimeOMSIBaseMSVCInstall omcCAPImsvcinstall
+main.PHONY: simulationruntimecmsvc runtimeCPPinstall runtimeCPPmsvcinstall OMSICPPinstall getMSVCversion omdev_extra_dlls install-openturns copycppheader copycppmsvcheader boehm-gc-lib fmil_msvc sundials_msvc CMinpack_msvc suitesparse_msvc runtimeOMSIBaseMSVCInstall omcCAPImsvcinstall
 
 include Makefile.common
 include Makefile.omsi.common
@@ -497,31 +497,6 @@ $(OMBUILDDIR)/lib/omc/msvc/sundials_ida.dll: getMSVCversion 3rdParty/sundials-5.
 	mkdir -p $(OMBUILDDIR)/bin/msvc
 	(cp -puf 3rdParty/sundials-5.4.0/build_msvc/lib/*.dll $(OMBUILDDIR)/bin/msvc)
 
-# build trilinos nox
-nox_msvc: getMSVCversion 3rdParty/trilinos-nox/CMakeLists.txt
-	rm -f $(OMBUILDDIR)/lib/omc/msvc/nox*
-	rm -f $(OMBUILDDIR)/bin/nox*
-	#rm -rf 3rdParty/trilinos-nox/build_msvc
-	mkdir -p $(OMBUILDDIR)/lib/omc/msvc/
-	# Goto build msvc directory
-	test -d 3rdParty/trilinos-nox
-	mkdir -p 3rdParty/trilinos-nox/build_msvc
-	# Create batch file, that builds with CMake and Visual Studio
-	test -f """${VSCOMNTOOLS}/../../VC/vcvarsall.bat"""
-	echo 'Building trilinos-nox with MSVC'
-	echo @echo on > 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo echo Calling CMake >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. ../ -G  "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe" -DOMDEV_DIR="$(OMDEVMSYS) ' >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo echo Building trilinos-nox >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo @echo on >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo set MAKE= >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo set MAKEFLAGS= >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> 3rdParty/trilinos-nox/build_msvc/build.bat
-	# Change into directory and run batch file
-	cd ./3rdParty/trilinos-nox/build_msvc; echo "change to 3rdParty/trilinos-nox/build_msvc";\
-	cmd /c build.bat
-
 omcCAPImsvcinstall:
 	$(MAKE) -C SimulationRuntime/OMSICpp/ -f Makefile.omdev.mingw omcCAPImsvc OMBUILDDIR=$(OMBUILDDIR)
 

OMCompiler/SimulationRuntime/OMSI/Makefile.omdev.mingw

@@ -89,13 +89,6 @@ else
 	USE_LOGGER_COMMAND=-DUSE_LOGGER:BOOL=OFF
 endif
 
-USE_TRILINOS="false"
-ifeq ($(USE_TRILINOS),"true")
-	USE_TRILINOS_COMMAND=-DUSE_TRILINOS:BOOL=ON
-else
-	USE_TRILINOS_COMMAND=-DUSE_TRILINOS:BOOL=OFF
-endif
-
 USE_KLU="false"
 ifeq ($(USE_KLU),"true")
 	USE_KLU_COMMAND=-DUSE_KLU:BOOL=ON
@@ -145,20 +138,20 @@ endif
 endif
 endif
 
-CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_STATIC_LINKING_COMMAND) $(BOOST_REALPATHS_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(USE_SCOREP_COMMAND) $(SCOREP_HOME_COMMAND) 
+CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_STATIC_LINKING_COMMAND) $(BOOST_REALPATHS_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(USE_SCOREP_COMMAND) $(SCOREP_HOME_COMMAND)
 
 OMSIBaseMSVC: getMSVCversion
 	test -f """${VSCOMNTOOLS}/../../VC/vcvarsall.bat"""
 	echo 'Build the OMSI base runtime with MSVC' buildtype: $(BUILDTYPE);
 	#rm -rf Build_MSVC
-	mkdir -p Build_MSVC 
-	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > Build_MSVC/build.bat 
-	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake'  for OMSI base build >> Build_MSVC/build.bat 
+	mkdir -p Build_MSVC
+	echo call '"${VSCOMNTOOLS}\\..\\..\\VC\\vcvarsall.bat" ${VCVARS_PARAMS}' > Build_MSVC/build.bat
+	echo echo Running CMake from '%OMDEV%\\bin\\cmake\\bin\\cmake'  for OMSI base build >> Build_MSVC/build.bat
 	echo '%OMDEV%\\bin\\cmake\\bin\\cmake -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DPLATFORM="static" $(CMAKE_FLAGS) -DIS_MINGW32=OFF -DIS_MINGW64=OFF -DCMAKE_INSTALL_PREFIX:PATH=./tmp -DLIB_OMC=$(LIB_OMC) -DOMBUILDDIR=$(OMBUILDDIR) -G "NMake Makefiles JOM" -D"CMAKE_MAKE_PROGRAM:PATH=%OMDEV%\\tools\\jom\\jom.exe" ../' >> Build_MSVC/build.bat
 
 	# for some reason, the environment variable 'MAKEFLAGS' was set to 'w' on my and Niklas' machine?!
 	echo set MAKEFLAGS="" >> Build_MSVC/build.bat
 	echo echo Running NMake JOM >> Build_MSVC/build.bat
 	echo %OMDEV%\\tools\\jom\\jom.exe /f Makefile install >> Build_MSVC/build.bat
 	cd ./Build_MSVC &&	cmd /c build.bat
-	
+

OMCompiler/SimulationRuntime/OMSICpp/CMakeLists.txt

@@ -29,7 +29,6 @@
 #     if the logger should be completely disabled or used                          -DUSE_LOGGER=OFF [default: ON]
 #     specify target platform for compilation                                      -DPLATFORM=<dynamic, static or platform triple> [default: "dynamic"]
 #     use Klu sparse liner solver                                                    -DUSE_KLU [default: OFF]
-#     use NOX non linear solver from trilinos library                              -DUSE_TRILINOS [default: OFF]
 #     Example: "cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo" to create statically linked libraries
 #
 # The used defines are stored in the SYSTEM_CFLAGS variable, which is passed to the ModelicaConfig.inc and written in the PrecompiledHeader.cmake
@@ -56,14 +55,12 @@ OPTION(RUNTIME_PROFILING "RUNTIME_PROFILING" OFF)
 OPTION(FMU_SUNDIALS "FMU_SUNDIALS" OFF)
 OPTION(USE_OMSI "Enable omsi nonlinear and linear solver interface" ON)
 OPTION(KLU_ROOT "KLU ROOT" "")
-OPTION(TRILINOS_ROOT "TRILINOS ROOT" "")
 OPTION(USE_CPP_03 "USE_CPP_03" OFF)
 OPTION(USE_FMILIB "use fmi library" ON)
 OPTION(REDUCE_DAE "Use reduce dae method" OFF)
 
 SET(USE_MICO OFF)
 SET(USE_KLU CACHE BOOL OFF)
-SET(USE_TRILINOS CACHE BOOL OFF)
 
 IF(NOT FMU_TARGET OR FMU_SUNDIALS)
   SET(USE_SUNDIALS ON)
@@ -126,7 +123,6 @@ OPTION(USE_BOOST_REALPATHS "USE_BOOST_REALPATHS" OFF)
 OPTION(RUNTIME_PROFILING "RUNTIME_PROFILING" OFF)
 OPTION(FMU_SUNDIALS "FMU_SUNDIALS" OFF)
 OPTION(KLU_ROOT "KLU ROOT" "")
-OPTION(TRILINOS_ROOT "TRILINOS ROOT" "")
 OPTION(USE_CPP_03 "USE_CPP_03" OFF)
 OPTION(USE_ZEROMQ "USE zeromq and cppzmq" ON)
 OPTION(USE_PRECOMPILEDHEADER  OFF)
@@ -182,7 +178,6 @@ SET(RTEulerName ${LIBPREFIX}RTEuler${LIBSUFFIX})
 SET(IdaName ${LIBPREFIX}Ida${LIBSUFFIX})
 SET(IdasName ${LIBPREFIX}Idas${LIBSUFFIX})
 SET(KinsolName ${LIBPREFIX}Kinsol${LIBSUFFIX})
-SET(NoxName ${LIBPREFIX}Nox${LIBSUFFIX})
 SET(LinearSolverName ${LIBPREFIX}LinearSolver${LIBSUFFIX})
 SET(DgesvSolverName ${LIBPREFIX}DgesvSolver${LIBSUFFIX})
 SET(ModelicaName ${LIBPREFIX}Modelica${LIBSUFFIX})
@@ -201,7 +196,6 @@ SET(ReduceDAEName ${LIBPREFIX}ReduceDAE) # only static version
 
 SET(USE_MICO OFF)
 SET(USE_KLU CACHE BOOL OFF)
-SET(USE_TRILINOS CACHE BOOL OFF)
 
 IF(NOT FMU_TARGET OR FMU_SUNDIALS)
   SET(USE_SUNDIALS ON)
@@ -781,96 +775,6 @@ IF(USE_KLU)
 ENDIF(USE_KLU)
 
 
-
-# Find Trilinos/Nox solvers
-IF(USE_TRILINOS)
-  IF(MSVC)
-    SET(Trilinos_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/trilinos-nox/build_msvc")
-  ELSE(MSVC)
-    SET(Trilinos_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/trilinos-nox/build")
-  ENDIF(MSVC)
-  SET(TRILINOS_INLCUDE_HOME  ${Trilinos_Path}/include)
-  IF(WIN32)
-    SET(TRILINOS_LIBRARY_RELEASE_HOME  ${Trilinos_Path}/bin)
-  ELSE(WIN32)
-    SET(TRILINOS_LIBRARY_RELEASE_HOME  ${Trilinos_Path}/lib)
-  ENDIF(WIN32)
-  MESSAGE(STATUS "Trilinos include:")
-  MESSAGE(STATUS "${TRILINOS_INLCUDE_HOME}")
-  MESSAGE(STATUS "Trilinos library:")
-  MESSAGE(STATUS "${TRILINOS_LIBRARY_RELEASE_HOME}")
-
-  FIND_PATH(TRILINOS_INCLUDE_DIR NOX.H PATHS ${TRILINOS_INLCUDE_HOME} $ENV{TRILINOS_ROOT}/include)
-  IF (NOT TRILINOS_INCLUDE_DIR)
-    MESSAGE(FATAL_ERROR "Could not find Trilinos, specify environment variable TRILINOS_ROOT")
-  ELSE(NOT TRILINOS_INCLUDE_DIR)
-    INCLUDE_DIRECTORIES(${TRILINOS_INCLUDE_DIR})
-  ENDIF(NOT TRILINOS_INCLUDE_DIR)
-
-  FIND_LIBRARY(NOX_LIB "nox" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT NOX_LIB)
-    MESSAGE(FATAL_ERROR "Could not find nox library!")
-  ENDIF()
-
-  FIND_LIBRARY(NOXLAPACK_LIB "noxlapack" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT NOXLAPACK_LIB)
-    MESSAGE(FATAL_ERROR "Could not find noxlapack library!")
-  ENDIF()
-
-  FIND_LIBRARY(BELOS_LIB "belos" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT BELOS_LIB)
-    MESSAGE(FATAL_ERROR "Could not find belos library!")
-  ENDIF()
-
-  FIND_LIBRARY(LOCA_LIB "loca" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT LOCA_LIB)
-    MESSAGE(FATAL_ERROR "Could not find loca library!")
-  ENDIF()
-
-  FIND_LIBRARY(LOCALAPACK_LIB "localapack" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT LOCALAPACK_LIB)
-    MESSAGE(FATAL_ERROR "Could not find localapack library!")
-  ENDIF()
-
-  FIND_LIBRARY(ML_LIB "ml" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT ML_LIB)
-    MESSAGE(FATAL_ERROR "Could not find ml library!")
-  ENDIF()
-
-  FIND_LIBRARY(TEUCHOSCOMM_LIB "teuchoscomm" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT TEUCHOSCOMM_LIB)
-    MESSAGE(FATAL_ERROR "Could not find teuchoscomm library!")
-  ENDIF()
-
-  FIND_LIBRARY(TEUCHOSCORE_LIB "teuchoscore" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT TEUCHOSCORE_LIB)
-    MESSAGE(FATAL_ERROR "Could not find teuchoscore library!")
-  ENDIF()
-
-  FIND_LIBRARY(TEUCHOSNUMERICS_LIB "teuchosnumerics" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT TEUCHOSNUMERICS_LIB)
-    MESSAGE(FATAL_ERROR "Could not find teuchosnumerics library!")
-  ENDIF()
-
-  FIND_LIBRARY(TEUCHOSPARAMETERLIST_LIB "teuchosparameterlist" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT TEUCHOSPARAMETERLIST_LIB)
-    MESSAGE(FATAL_ERROR "Could not find teuchosparameterlist library!")
-  ENDIF()
-
-  FIND_LIBRARY(TEUCHOSREMAINDER_LIB "teuchosremainder" NO_DEFAULT_PATH NO_SYSTEM_ENVIRONMENT_PATH PATHS ${TRILINOS_LIBRARY_RELEASE_HOME} $ENV{TRILINOS_ROOT}/lib)
-  IF(NOT TEUCHOSREMAINDER_LIB)
-    MESSAGE(FATAL_ERROR "Could not find teuchosremainder library!")
-  ENDIF()
-
-  SET(TRILINOS_LIBRARIES ${NOX_LIB} ${NOXLAPACK_LIB} ${BELOS_LIB} ${LOCA_LIB} ${LOCALAPACK_LIB} ${ML_LIB} ${TEUCHOSCOMM_LIB} ${TEUCHOSCORE_LIB} ${TEUCHOSNUMERICS_LIB} ${TEUCHOSPARAMETERLIST_LIB} ${TEUCHOSREMAINDER_LIB} )
-
-  MESSAGE(STATUS "Trilinos Libraries:")
-  MESSAGE(STATUS "${TRILINOS_LIBRARIES}")
-
-  ADD_DEFINITIONS(-Dtrilinos)
-ENDIF(USE_TRILINOS)
-
-
 #Handle umfpack
 #FIND_PACKAGE(SuiteSparse)
 IF(SUITESPARSE_UMFPACK_FOUND)
@@ -984,7 +888,6 @@ SET(RTEulerName ${LIBPREFIX}RTEuler${LIBSUFFIX})
 SET(IdaName ${LIBPREFIX}Ida${LIBSUFFIX})
 SET(IdasName ${LIBPREFIX}Idas${LIBSUFFIX})
 SET(KinsolName ${LIBPREFIX}Kinsol${LIBSUFFIX})
-SET(NoxName ${LIBPREFIX}Nox${LIBSUFFIX})
 SET(LinearSolverName ${LIBPREFIX}LinearSolver${LIBSUFFIX})
 SET(DgesvSolverName ${LIBPREFIX}DgesvSolver${LIBSUFFIX})
 SET(ModelicaName ${LIBPREFIX}Modelica${LIBSUFFIX})
@@ -1040,15 +943,6 @@ IF(USE_SUNDIALS)
   #set(IDA_LIB ${libIdaName})
 ENDIF(USE_SUNDIALS)
 
-IF(USE_TRILINOS)
-  ADD_SUBDIRECTORY(Solver/Nox)
-
-  GET_TARGET_PROPERTY(libNox ${NoxName} LOCATION)
-  GET_FILENAME_COMPONENT(libNoxName ${libNox} NAME)
-
-  SET(NOX_LIB ${libNoxName})
-ENDIF(USE_TRILINOS)
-
 GET_TARGET_PROPERTY(libLinearSolver ${LinearSolverName} LOCATION)
 GET_FILENAME_COMPONENT(libLinearSolverName ${libLinearSolver} NAME)
 

OMCompiler/SimulationRuntime/OMSICpp/Makefile.omdev.mingw

@@ -89,13 +89,6 @@ else
 	USE_LOGGER_COMMAND=-DUSE_LOGGER:BOOL=OFF
 endif
 
-USE_TRILINOS="false"
-ifeq ($(USE_TRILINOS),"true")
-	USE_TRILINOS_COMMAND=-DUSE_TRILINOS:BOOL=ON
-else
-	USE_TRILINOS_COMMAND=-DUSE_TRILINOS:BOOL=OFF
-endif
-
 USE_KLU="false"
 ifeq ($(USE_KLU),"true")
 	USE_KLU_COMMAND=-DUSE_KLU:BOOL=ON
@@ -148,7 +141,7 @@ endif
 endif
 endif
 
-CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_STATIC_LINKING_COMMAND) $(BOOST_REALPATHS_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(USE_SCOREP_COMMAND) $(SCOREP_HOME_COMMAND) $(FMU_SUNDIALS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(USE_LOGGER_COMMAND) $(USE_TRILINOS_COMMAND) $(USE_KLU_COMMAND)
+CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE) $(BOOST_STATIC_LINKING_COMMAND) $(BOOST_REALPATHS_COMMAND) $(RUNTIME_PROFILING_COMMAND) $(USE_SCOREP_COMMAND) $(SCOREP_HOME_COMMAND) $(FMU_SUNDIALS_COMMAND) $(PARALLEL_OUTPUT_COMMAND) $(USE_LOGGER_COMMAND) $(USE_KLU_COMMAND)
 
 runtimeCpp: omcCAPIinstall
 	$(foreach PLATFORM, $(PLATFORMS), \
@@ -217,7 +210,7 @@ omcCAPIinstall:
 	mkdir -p tmp; \
 	  cmake -G "MSYS Makefiles"  -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE   $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DBUILD_SHARED_LIBS=TRUE -DPLATFORM=$(PLATFORM)  -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DLIB_OMC=$(LIB_OMC) -DOMC_PATH="$(OMBUILDDIR)"  -DCMAKE_INSTALL_PREFIX:PATH="./tmp"  -DOMCAPI_ROOT="../../Build_CAPI/tmp" MAKE_CXX_COMPILER=g++ ../omcWrapper/; \
 	   $(MAKE) install; )
-	
+
 	(cp -puf Build_CAPI/tmp/lib/*.dll* $(OMBUILDDIR)/bin/)
 	(cp -puf Build_CAPI/tmp/lib/*.dll* $(OMBUILDDIR)/lib/omc/)
 	(cp -puf Build_CAPI/tmp/bin/*.exe* $(OMBUILDDIR)/bin)

OMCompiler/SimulationRuntime/OMSICpp/README

@@ -38,7 +38,6 @@ to configure. The following arguments are available at the moment:
   USE_LOGGER
   BUILDTYPE
   CPP_03
-  USE_TRILINOS
   USE_KLU
 
 e.g.: configure --with-cppruntime --with-cppruntime-args=BUILDTYPE=Debug,RUNTIME_PROFILING,CPP_03
@@ -63,7 +62,6 @@ because not all libraries are available on both systems.
   PARALLEL_OUTPUT="true"
   USE_LOGGER="false"
   BUILDTYPE=[Release,Debug]
-  USE_TRILINOS=["true","false"]
   USE_KLU=["true","false"]
 e.g.: make -f Makefile.omdev.mingw runtimeCPPmsvcinstall BOOST_STATIC_LINKING="true" USE_LOGGER="false"
 

OMCompiler/SimulationRuntime/OMSICpp/runtime/include/Core/Utils/Modelica/ModelicaSimulationError.h

@@ -11,7 +11,7 @@ enum SIMULATION_ERROR
     SOLVER,
     //all errors occur in solver (Euler,CVode)
     ALGLOOP_SOLVER,
-    //all errors occur in non-,lin-solver (Nox,Kinsol,Newton,Hybrj)
+    //all errors occur in non-,lin-solver (Kinsol,Newton,Hybrj)
     MODEL_EQ_SYSTEM,
     //all errors occur in model system class during simulation
     ALGLOOP_EQ_SYSTEM,

OMCompiler/SimulationRuntime/OMSICpp/runtime/include/SimCoreFactory/Policies/NonLinSolverOMCFactory.h

@@ -81,19 +81,6 @@ struct NonLinSolverOMCFactory : virtual public ObjectFactory<CreationPolicy>
             }
             nonlin_solver_key.assign("extension_export_hybrj");
         }
-        else if (nonlin_solver.compare("nox") == 0)
-        {
-            fs::path nox_path = ObjectFactory<CreationPolicy>::_library_path;
-            fs::path nox_name(NOX_LIB);
-            nox_path /= nox_name;
-            LOADERRESULT result = ObjectFactory<CreationPolicy>::_factory->LoadLibrary(
-                nox_path.string(), *_non_linsolver_type_map);
-            if (result != LOADER_SUCCESS)
-            {
-                throw ModelicaSimulationError(MODEL_FACTORY, "Failed loading Nox solver library!");
-            }
-            nonlin_solver_key.assign("extension_export_nox");
-        }
         else
             throw ModelicaSimulationError(MODEL_FACTORY, "Selected nonlinear solver is not available");
         _last_selected_solver = nonlin_solver;