-added broyden solver

OpenModelica · Oct 19, 2015 · e64c913 · e64c913
1 parent 22f67d2
commit e64c913
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/NonLinSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/NonLinSolverOMCFactory.h
@@ -45,6 +45,18 @@ struct NonLinSolverOMCFactory : virtual public  ObjectFactory<CreationPolicy>
             }
             nonlin_solver_key.assign("extension_export_newton");
         }
+        if(nonlin_solver.compare("broyden")==0)
+        {
+            PATH broyden_path = ObjectFactory<CreationPolicy>::_library_path;
+            PATH broyden_name(BROYDEN_LIB);
+            broyden_path/=broyden_name;
+            LOADERRESULT result = ObjectFactory<CreationPolicy>::_factory->LoadLibrary(broyden_path.string(),*_non_linsolver_type_map);
+            if (result != LOADER_SUCCESS)
+            {
+                throw ModelicaSimulationError(MODEL_FACTORY,"Failed loading Broyden solver library!");
+            }
+            nonlin_solver_key.assign("extension_export_broyden");
+        }
         else if(nonlin_solver.compare("kinsol")==0)
         {
               PATH kinsol_path = ObjectFactory<CreationPolicy>::_library_path;

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/NonLinSolverVxWorksFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/NonLinSolverVxWorksFactory.h
@@ -26,6 +26,8 @@ struct NonLinSolverVxWorksFactory : virtual public  ObjectFactory<CreationPolicy
         string nonlin_solver;
         if(solver_name.compare("newton")==0)
             nonlin_solver_key.assign("createNewtonSettings");
+        else if(solver_name.compare("broyden")==0)
+            nonlin_solver_key.assign("createBroydenSettings");
         else if(solver_name.compare("kinsol")==0)
             nonlin_solver_key.assign("createKinsolSettings");
         else if(solver_name.compare("Hybrj")==0)
@@ -44,6 +46,8 @@ struct NonLinSolverVxWorksFactory : virtual public  ObjectFactory<CreationPolicy
             string nonlin_solver_key;
             if(solver_name.compare("newton")==0)
                 nonlin_solver_key.assign("createNewton");
+            if(solver_name.compare("broyden")==0)
+                nonlin_solver_key.assign("createBroyden");
             else if(solver_name.compare("kinsol")==0)
                 nonlin_solver_key.assign("createKinsol");
             else if(solver_name.compare("Hybrj")==0)