Skip to content

Commit

Permalink
- fix the previous commit
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12966 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Willi Braun committed Sep 18, 2012
1 parent af1ba77 commit d4fcfd4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions Compiler/BackEnd/SimCodeUtil.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2472,10 +2472,10 @@ algorithm
list<SimCode.SimEqSystem> eqs, rest, res;
list<DAE.ComponentRef> crefs;
SimCode.SimEqSystem eq,cont;
list<SimCode.SimVar> discVars;
list<SimCode.SimEqSystem> discEqs;
list<Integer> values;
list<Integer> value_dims;
list<SimCode.SimVar> discVars;
list<SimCode.SimEqSystem> discEqs;
list<Integer> values;
list<Integer> value_dims;
case ({},_)
then ({},inIndex);
case(SimCode.SES_NONLINEAR(index, eqs, crefs, _)::rest,_)
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/c/math-support/nonlinearSolverHybrd.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ void wrapper_fvec_hybrd(int* n, double* x, double* f, int* iflag, void* data){

/*! \fn solve non-linear system with hybrd method
*
* \param [in] [data]
* [sysNumber] index of the corresponing non-linear system
* \param [in] [data]
* [sysNumber] index of the corresponing non-linear system
*
* \author wbraun
*/
Expand Down
18 changes: 9 additions & 9 deletions SimulationRuntime/c/math-support/nonlinearSystem.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,24 +103,24 @@ int freeNonlinearSystem(DATA *data){

/*! \fn solve non-linear systems
*
* \param [in] [data]
* [sysNumber] index of corresponding non-linear System
* \param [in] [data]
* [sysNumber] index of corresponding non-linear System
*
* \author wbraun
*/
int solve_nonlinear_system(DATA *data, int sysNumber)
{
/* NONLINEAR_SYSTEM_DATA* system = &(data->simulationInfo.nonlinearSystemData[sysNumber]); */
data->simulationInfo.currentNonlinearSystemIndex = sysNumber;
/* strategy for solving nonlinear system
*
*
*
*/
/* strategy for solving nonlinear system
*
*
*
*/


/* for now just use hybrd solver as before */
solveHybrd(data, sysNumber);
solveHybrd(data, sysNumber);

return 0;
return 0;
}
2 changes: 1 addition & 1 deletion SimulationRuntime/c/openmodelica_func.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ extern void callExternalObjectDestructors(DATA *_data);
*
* \param [ref] [data]
*/
extern int initialNonLinearSystem(NONLINEAR_SYSTEM_DATA *data);
extern void initialNonLinearSystem(NONLINEAR_SYSTEM_DATA *data);

/* functionODE contains those equations that are needed
* to calculate the dynamic part of the system */
Expand Down

0 comments on commit d4fcfd4

Please sign in to comment.