diff options
author | pants <jaron@kent-dobias.com> | 2016-09-06 15:05:27 -0400 |
---|---|---|
committer | pants <jaron@kent-dobias.com> | 2016-09-06 15:05:27 -0400 |
commit | 4c4ebb87ead363d6d6e11a8b95b07a0f93af5c88 (patch) | |
tree | 9cdaaf27917c2b1562740dec501d013e47a25dd1 /src/get_current.c | |
parent | fd14c5e39d962be94a1f68b0d4cacb7a4aa9c3e7 (diff) | |
download | fuse_networks-4c4ebb87ead363d6d6e11a8b95b07a0f93af5c88.tar.gz fuse_networks-4c4ebb87ead363d6d6e11a8b95b07a0f93af5c88.tar.bz2 fuse_networks-4c4ebb87ead363d6d6e11a8b95b07a0f93af5c88.zip |
finished implementing embedded systems, refactored a bunch
Diffstat (limited to 'src/get_current.c')
-rw-r--r-- | src/get_current.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/get_current.c b/src/get_current.c index 5360054..bc786f9 100644 --- a/src/get_current.c +++ b/src/get_current.c @@ -1,7 +1,7 @@ #include "fracture.h" -double *get_voltage(const finst *instance, cholmod_common *c) { +double *get_voltage(const net_t *instance, cholmod_common *c) { cholmod_dense *b = instance->boundary_cond; cholmod_factor *factor = instance->factor; @@ -22,12 +22,12 @@ double *get_voltage(const finst *instance, cholmod_common *c) { return field; } -double *get_current(const finst *instance, cholmod_common *c) { - unsigned int num_edges = instance->network->num_edges; - unsigned int num_verts = instance->network->num_verts_break; - unsigned int num_gverts = instance->network->break_dim; - unsigned int num_bounds = instance->network->num_bounds; - cholmod_sparse *voltcurmat = instance->network->voltcurmat; +double *get_current(const net_t *instance, cholmod_common *c) { + unsigned int num_edges = instance->graph->ne; + unsigned int num_verts = instance->graph->nv_break; + unsigned int num_gverts = instance->graph->break_dim; + unsigned int num_bounds = instance->graph->num_bounds; + cholmod_sparse *voltcurmat = instance->graph->voltcurmat; double *voltages = get_voltage(instance, c); if (voltages == NULL) { @@ -63,12 +63,12 @@ double *get_current(const finst *instance, cholmod_common *c) { } -double *get_current_v(const finst *instance, double *voltages, cholmod_common *c) { - unsigned int num_edges = instance->network->num_edges; - unsigned int num_verts = instance->network->num_verts_break; - unsigned int num_gverts = instance->network->break_dim; - unsigned int num_bounds = instance->network->num_bounds; - cholmod_sparse *voltcurmat = instance->network->voltcurmat; +double *get_current_v(const net_t *instance, double *voltages, cholmod_common *c) { + unsigned int num_edges = instance->graph->ne; + unsigned int num_verts = instance->graph->nv_break; + unsigned int num_gverts = instance->graph->break_dim; + unsigned int num_bounds = instance->graph->num_bounds; + cholmod_sparse *voltcurmat = instance->graph->voltcurmat; cholmod_dense *x = CHOL_F(allocate_dense)( num_gverts, 1, num_gverts, CHOLMOD_REAL, c); |