Removing unused KinsolLapack

OpenModelica · Nov 4, 2021 · 4c1b7b5 · 4c1b7b5
1 parent b1113d9
commit 4c1b7b5
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 429 deletions.
diff --git a/OMCompiler/3rdParty b/OMCompiler/3rdParty
diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/include/Solver/Kinsol/KinsolLapack.h b/OMCompiler/SimulationRuntime/OMSICpp/runtime/include/Solver/Kinsol/KinsolLapack.h
diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/CMakeLists.txt b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 2.8.9)
 project(${KinsolName})
 IF(DGESV_FOUND)
  include_directories (${DGESV_INCLUDE_DIR})
- add_library(${KinsolName} Kinsol.cpp KinsolLapack.cpp KinsolSettings.cpp FactoryExport.cpp  ${DGESV_SRCS})
+ add_library(${KinsolName} Kinsol.cpp KinsolSettings.cpp FactoryExport.cpp  ${DGESV_SRCS})
  target_link_libraries(${KinsolName}  ${SolverName}  ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${SUNDIALS_LIBRARIES}  ${ModelicaName} )
 ELSE()
  #use full Lapack
- add_library(${KinsolName} Kinsol.cpp KinsolLapack.cpp KinsolSettings.cpp FactoryExport.cpp)
+ add_library(${KinsolName} Kinsol.cpp KinsolSettings.cpp FactoryExport.cpp)
  target_link_libraries(${KinsolName}  ${SolverName}  ${ExtensionUtilitiesName} ${Boost_LIBRARIES} ${SUNDIALS_LIBRARIES}  ${ModelicaName} ${LAPACK_LIBRARIES})
 ENDIF(DGESV_FOUND)
 

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/Kinsol.cpp b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/Kinsol.cpp
@@ -25,7 +25,6 @@
 #include <sunlinsol/sunlinsol_spbcgs.h>     /* Scaled, Preconditioned, Bi-Conjugate Gradient, Stabilized iterative linear solver */
 
 #include <Core/Utils/extension/logger.hpp>
-#include <Solver/Kinsol/KinsolLapack.h>
 #include <Solver/Kinsol/Kinsol.h>
 #include <Solver/Kinsol/KinsolSettings.h>
 
@@ -489,43 +488,6 @@ void Kinsol::solve()
         return;
     }
 
-    // Try complete pivoting
-    ///////////////////////////////////////
-    //_usedCompletePivoting = true;
-    //
-
-    //KINLapackCompletePivoting(_kinMem, _dimSys);
-    //
-    //for(int i=0;i<_dimSys;i++) // Reset Scaling
-    //    _fScale[i] = 1.0;
-
-    //_iterationStatus = CONTINUE;
-    //solveNLS();
-    //if(_iterationStatus == DONE)
-    //    return;
-    //else  // Try Scaling
-    //{
-    //    _iterationStatus = CONTINUE;
-    //    _algLoop->setReal(_y0);
-    //    _algLoop->evaluate();
-    //    _algLoop->getRHS(_fScale);
-    //    for(int i=0;i<_dimSys;i++)
-    //    {
-    //
-    //        if(abs(_fScale[i]) >1.0)
-    //        _fScale[i] = abs(1/_fScale[i]);
-    //        else
-    //        _fScale[i] = 1;
-
-    //
-    //    }
-    //    _iterationStatus = CONTINUE;
-    //    solveNLS();
-    //}
-    //
-    //if(_iterationStatus == DONE)
-    //    return;
-
     // Try SPGMR solver
     // Scaled, Preconditioned, Generalized Minimum Residual iterative linear solver
     /////////////////////////////////

diff --git a/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/KinsolLapack.cpp b/OMCompiler/SimulationRuntime/OMSICpp/runtime/src/Solver/Kinsol/KinsolLapack.cpp
diff --git a/OMCompiler/SimulationRuntime/cpp/Solver/CMakeLists.txt b/OMCompiler/SimulationRuntime/cpp/Solver/CMakeLists.txt
@@ -77,7 +77,6 @@ install(TARGETS OMCppDgesvSolver_static)
 #####################################################################################################
 # OMCppKinsol
 set(OMC_SIMRT_CPP_SOLVER_KINSOL_SOURCES Kinsol/Kinsol.cpp
-                                        Kinsol/KinsolLapack.cpp
                                         Kinsol/KinsolSettings.cpp
                                         Kinsol/FactoryExport.cpp)
 

diff --git a/OMCompiler/SimulationRuntime/cpp/Solver/Kinsol/CMakeLists.txt b/OMCompiler/SimulationRuntime/cpp/Solver/Kinsol/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.9)
 
 project(${KinsolName})
 
-add_library(${KinsolName} Kinsol.cpp KinsolLapack.cpp KinsolSettings.cpp FactoryExport.cpp)
+add_library(${KinsolName} Kinsol.cpp KinsolSettings.cpp FactoryExport.cpp)
 
 if(NOT BUILD_SHARED_LIBS)
   set_target_properties(${KinsolName} PROPERTIES COMPILE_DEFINITIONS "RUNTIME_STATIC_LINKING;ENABLE_SUNDIALS_STATIC")

diff --git a/OMCompiler/SimulationRuntime/cpp/Solver/Kinsol/Kinsol.cpp b/OMCompiler/SimulationRuntime/cpp/Solver/Kinsol/Kinsol.cpp
@@ -47,7 +47,6 @@
 #include <sunlinsol/sunlinsol_spbcgs.h>     // Scaled, Preconditioned, Bi-Conjugate Gradient, Stabilized iterative linear solver
 
 #include <Solver/Kinsol/FactoryExport.h>
-#include <Solver/Kinsol/KinsolLapack.h>
 #include <Solver/Kinsol/Kinsol.h>
 #include <Solver/Kinsol/KinsolSettings.h>