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_conductivity.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_conductivity.c')
-rw-r--r-- | src/get_conductivity.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/get_conductivity.c b/src/get_conductivity.c index 7ef08a8..793987e 100644 --- a/src/get_conductivity.c +++ b/src/get_conductivity.c @@ -1,16 +1,16 @@ #include "fracture.h" -double get_conductivity(finst *inst, double *voltage, cholmod_common *c) { +double get_conductivity(net_t *inst, double *voltage, cholmod_common *c) { if (inst->voltage_bound) { double tot_cur = 0; - for (unsigned int i = 0; i < inst->network->num_spanning_edges; i++) { - unsigned int e = inst->network->spanning_edges[i]; + for (unsigned int i = 0; i < inst->graph->num_spanning_edges; i++) { + unsigned int e = inst->graph->spanning_edges[i]; if (!inst->fuses[e]) { - unsigned int v1 = inst->network->edges_to_verts[2*e]; - unsigned int v2 = inst->network->edges_to_verts[2*e+1]; - double v1y = inst->network->vert_coords[2 * v1 + 1]; - double v2y = inst->network->vert_coords[2 * v2 + 1]; + unsigned int v1 = inst->graph->ev[2*e]; + unsigned int v2 = inst->graph->ev[2*e+1]; + double v1y = inst->graph->vert_coords[2 * v1 + 1]; + double v2y = inst->graph->vert_coords[2 * v2 + 1]; unsigned int s1 = v1y < v2y ? v1 : v2; unsigned int s2 = v1y < v2y ? v2 : v1; tot_cur += voltage[s1] - voltage[s2]; @@ -19,6 +19,6 @@ double get_conductivity(finst *inst, double *voltage, cholmod_common *c) { return fabs(tot_cur); } else { - return 1 / fabs(voltage[inst->network->num_verts] - voltage[inst->network->num_verts + 1]); + return 1 / fabs(voltage[inst->graph->nv] - voltage[inst->graph->nv + 1]); } } |