summaryrefslogtreecommitdiff
path: root/src/compare_voronoi_fracture.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/compare_voronoi_fracture.c')
-rw-r--r--src/compare_voronoi_fracture.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compare_voronoi_fracture.c b/src/compare_voronoi_fracture.c
index 2edcae2..91fdcea 100644
--- a/src/compare_voronoi_fracture.c
+++ b/src/compare_voronoi_fracture.c
@@ -66,10 +66,10 @@ int main(int argc, char *argv[]) {
(&c)->supernodal = CHOLMOD_SIMPLICIAL;
- graph_t *network = ini_voronoi_network(L, false, boundary, genfunc_hyperuniform, &c);
+ graph_t *network = ini_voro_graph(L, false, boundary, genfunc_hyperuniform, &c);
net_t *perm_voltage_instance = create_instance(network, inf, true, true, &c);
net_t *perm_current_instance = create_instance(network, inf, false, true, &c);
- double *fuse_thres = gen_fuse_thres(network->ne, network->edge_coords, beta, beta_scaling_flat);
+ double *fuse_thres = gen_fuse_thres(network->ne, network->ex, beta, beta_scaling_flat);
net_t *voltage_instance = copy_instance(perm_voltage_instance, &c);
net_t *current_instance = copy_instance(perm_current_instance, &c);
data_t *breaking_data_voltage = fracture_network(voltage_instance, fuse_thres, &c, cutoff);
@@ -82,8 +82,8 @@ int main(int argc, char *argv[]) {
FILE *net_out = fopen("network.txt", "w");
for (unsigned int j = 0; j < network->nv; j++) {
- fprintf(net_out, "%f %f ", network->vert_coords[2 * j],
- network->vert_coords[2 * j + 1]);
+ fprintf(net_out, "%f %f ", network->vx[2 * j],
+ network->vx[2 * j + 1]);
}
fprintf(net_out, "\n");
for (unsigned int j = 0; j < network->ne; j++) {
@@ -92,8 +92,8 @@ int main(int argc, char *argv[]) {
}
fprintf(net_out, "\n");
for (unsigned int j = 0; j < network->dnv; j++) {
- fprintf(net_out, "%f %f ", network->dual_vert_coords[2 * j],
- network->dual_vert_coords[2 * j + 1]);
+ fprintf(net_out, "%f %f ", network->dvx[2 * j],
+ network->dvx[2 * j + 1]);
}
fprintf(net_out, "\n");
for (unsigned int j = 0; j < network->ne; j++) {