more refactoring

1 files changed, 0 insertions, 35 deletions

diff --git a/src/get_conductivity.c b/src/get_conductivity.c
deleted file mode 100644
index 23b7056..0000000
--- a/src/get_conductivity.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#include "fracture.h"
-
-double get_conductivity(net_t *net, double *voltages, cholmod_common *c) {
-	if (net->voltage_bound) {
-		// the voltage drop across the network is fixed to one with voltage
-		// boundary conditions, so the conductivity is the total current flowing
-		double tot_cur = 0;
-		for (uint_t i = 0; i < net->graph->num_spanning_edges; i++) {
-			uint_t e = net->graph->spanning_edges[i];
-
-			if (!net->fuses[e]) {
-				uint_t v1, v2, s1, s2;
-				double v1y, v2y;
-
-				v1 = net->graph->ev[2 * e];
-				v2 = net->graph->ev[2 * e + 1];
-
-				v1y = net->graph->vx[2 * v1 + 1];
-				v2y = net->graph->vx[2 * v2 + 1];
-
-				s1 = v1y < v2y ? v1 : v2;
-				s2 = v1y < v2y ? v2 : v1;
-
-				tot_cur += voltages[s1] - voltages[s2];
-			}
-		}
-
-		return fabs(tot_cur);
-	} else {
-		// the current across the network is fixed to one with current boundary
-		// conditions, so the conductivity is the inverse of the total voltage drop
-		return 1 / fabs(voltages[net->graph->nv] - voltages[net->graph->nv + 1]);
-	}
-}