Skip to content

Commit

Permalink
- initialization: update some function descriptions for better docume…
Browse files Browse the repository at this point in the history
…ntation

- Initialization: remove redundant data-structs
- initialization: minor fixes (e.g. memory leaks)
- initialization: do not longer handle hybrid system different for each initialization method
- testsuite: initialization: add new testcase for discrete changes during initialization
- testsuite: ThermoSysPro: update simulation results
- testsuite: fix failing tests regarding the number of intervals
- SimulationRuntime/c: avoid warnings


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@13582 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
lochel committed Oct 23, 2012
1 parent c438ad5 commit adcf54a
Show file tree
Hide file tree
Showing 16 changed files with 594 additions and 583 deletions.
8 changes: 4 additions & 4 deletions SimulationRuntime/c/meta/gc/roots.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ int mmc_GC_unwind_roots_state(mmc_GC_local_state_type local_GC_state)
mmc_GC_state->roots.rootsStackIndex = roots_index.rootsStackIndex;

/* decrease the roots size if we can */
//mmc_GC_state->roots = roots_decrease(mmc_GC_state->roots, mmc_GC_state->settings.roots_size);
/* mmc_GC_state->roots = roots_decrease(mmc_GC_state->roots, mmc_GC_state->settings.roots_size); */
/* decrease the stack size if we can */
//mmc_GC_state->roots.marks = stack_decrease(mmc_GC_state->roots.marks, mmc_GC_state->settings.roots_marks_size);
/* mmc_GC_state->roots.marks = stack_decrease(mmc_GC_state->roots.marks, mmc_GC_state->settings.roots_marks_size); */

return 0;

Expand Down Expand Up @@ -355,9 +355,9 @@ int mmc_GC_undo_roots_state(mmc_GC_local_state_type local_GC_state)
mmc_GC_state->roots.rootsStackIndex = roots_index.rootsStackIndex;

/* decrease the roots size if we can */
//mmc_GC_state->roots = roots_decrease(mmc_GC_state->roots, mmc_GC_state->settings.roots_size);
/* mmc_GC_state->roots = roots_decrease(mmc_GC_state->roots, mmc_GC_state->settings.roots_size); */
/* decrease the stack size if we can */
//mmc_GC_state->roots.marks = stack_decrease(mmc_GC_state->roots.marks, mmc_GC_state->settings.roots_marks_size);
/* mmc_GC_state->roots.marks = stack_decrease(mmc_GC_state->roots.marks, mmc_GC_state->settings.roots_marks_size); */

return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions SimulationRuntime/c/meta/meta_modelica_builtin_boxptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#define META_MODELICA_BUILTIN_BOXPTR__H

#ifdef GEN_META_MODELICA_BUILTIN_BOXPTR
#define boxptr_unOp(name,box,unbox,op) void* name(void* a) {return box(op(unbox(a)));}
#define boxptr_binOp(name,box,unbox,op) void* name(void* a, void* b) {return box((unbox(a)) op (unbox(b)));}
#define boxptr_binFn(name,box,unbox,fn) void* name(void* a, void* b) {return box(fn((unbox(a)),(unbox(b))));}
#define boxptr_unOp(name,box,unbox,op) void* name(void* a) {return (void*)box(op(unbox(a)));}
#define boxptr_binOp(name,box,unbox,op) void* name(void* a, void* b) {return (void*)box((unbox(a)) op (unbox(b)));}
#define boxptr_binFn(name,box,unbox,fn) void* name(void* a, void* b) {return (void*)box(fn((unbox(a)),(unbox(b))));}
#else
#define boxptr_unOp(name,box,unbox,op) void* name(void*);
#define boxptr_binOp(name,box,unbox,op) void* name(void*,void*);
Expand Down

0 comments on commit adcf54a

Please sign in to comment.