From 0f6782c9e5a9171d69d8e62dff33a558ba542d58 Mon Sep 17 00:00:00 2001 From: pants Date: Wed, 31 Aug 2016 11:57:40 -0400 Subject: did some refactoring --- src/homo_voronoi_fracture.c | 113 ++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 68 deletions(-) (limited to 'src/homo_voronoi_fracture.c') diff --git a/src/homo_voronoi_fracture.c b/src/homo_voronoi_fracture.c index 4e2d67a..65a25f8 100644 --- a/src/homo_voronoi_fracture.c +++ b/src/homo_voronoi_fracture.c @@ -6,12 +6,14 @@ int main(int argc, char *argv[]) { int opt; // defining variables to be (potentially) set by command line flags - unsigned int N, L, filename_len; + uint8_t filename_len; + uint64_t N; + uint_t L; double beta, inf, cutoff; - boundary_type boundary; bool include_breaking, save_cluster_dist, use_voltage_boundaries, use_dual, save_network, - save_crit_stress, save_toughness, save_corr, save_conductivity, + save_crit_stress, save_toughness, save_conductivity, save_damage; + bound_t boundary; filename_len = 100; @@ -28,11 +30,10 @@ int main(int argc, char *argv[]) { save_network = false; save_crit_stress = false; save_damage = false; - save_corr = false; save_conductivity = false; save_toughness = false; - int boundary_int; + uint8_t bound_i; char boundc2 = 'f'; while ((opt = getopt(argc, argv, "n:L:b:B:dVcoNsCrtD")) != -1) { @@ -47,8 +48,8 @@ int main(int argc, char *argv[]) { beta = atof(optarg); break; case 'B': - boundary_int = atoi(optarg); - switch (boundary_int) { + bound_i = atoi(optarg); + switch (bound_i) { case 0: boundary = FREE_BOUND; boundc2 = 'f'; @@ -64,6 +65,7 @@ int main(int argc, char *argv[]) { break; default: printf("boundary specifier must be 0 (FREE_BOUND), 1 (CYLINDER_BOUND), or 2 (TORUS_BOUND).\n"); + exit(EXIT_FAILURE); } break; case 'd': @@ -87,9 +89,6 @@ int main(int argc, char *argv[]) { case 's': save_crit_stress = true; break; - case 'C': - save_corr = true; - break; case 'r': save_conductivity = true; //inf = 1; @@ -114,20 +113,26 @@ int main(int argc, char *argv[]) { free(break_filename); } - unsigned int voronoi_max_verts = 4 * pow(L, 2); - unsigned int c_dist_size = voronoi_max_verts; - unsigned int a_dist_size = voronoi_max_verts; + uint_t voronoi_max_verts, c_dist_size, a_dist_size; + + voronoi_max_verts = 4 * pow(L, 2); + c_dist_size = voronoi_max_verts; + a_dist_size = voronoi_max_verts; + + if (voronoi_max_verts > CINT_MAX) { + exit(EXIT_FAILURE); + } // define arrays for saving cluster and avalanche distributions - unsigned int *cluster_size_dist; - unsigned int *avalanche_size_dist; + uint64_t *cluster_size_dist; + uint64_t *avalanche_size_dist; char *c_filename; char *a_filename; if (save_cluster_dist) { cluster_size_dist = - (unsigned int *)malloc(c_dist_size * sizeof(unsigned int)); + (uint64_t *)malloc(c_dist_size * sizeof(uint64_t)); avalanche_size_dist = - (unsigned int *)malloc(a_dist_size * sizeof(unsigned int)); + (uint64_t *)malloc(a_dist_size * sizeof(uint64_t)); c_filename = (char *)malloc(filename_len * sizeof(char)); a_filename = (char *)malloc(filename_len * sizeof(char)); @@ -138,11 +143,11 @@ int main(int argc, char *argv[]) { FILE *avalanche_out = fopen(a_filename, "rb"); if (cluster_out != NULL) { - fread(cluster_size_dist, sizeof(unsigned int), c_dist_size, cluster_out); + fread(cluster_size_dist, sizeof(uint64_t), c_dist_size, cluster_out); fclose(cluster_out); } if (avalanche_out != NULL) { - fread(avalanche_size_dist, sizeof(unsigned int), a_dist_size, avalanche_out); + fread(avalanche_size_dist, sizeof(uint64_t), a_dist_size, avalanche_out); fclose(avalanche_out); } } @@ -152,23 +157,17 @@ int main(int argc, char *argv[]) { crit_stress = (double *)malloc(N * sizeof(double)); } - double *avg_corr; - unsigned int **dists = NULL; - if (save_corr) { - avg_corr = (double *)calloc(voronoi_max_verts, sizeof(double)); - } - double *conductivity; if (save_conductivity) { conductivity = (double *)malloc(N * sizeof(double)); } // define arrays for saving damage distributions - unsigned int *damage; + uint64_t *damage; char *d_filename; if (save_damage) { damage = - (unsigned int *)malloc(a_dist_size * sizeof(unsigned int)); + (uint64_t *)malloc(a_dist_size * sizeof(uint64_t)); d_filename = (char *)malloc(filename_len * sizeof(char)); snprintf(d_filename, filename_len, "damg_v_%c_%c_%d_%g.dat", boundc, boundc2, L, beta); @@ -176,7 +175,7 @@ int main(int argc, char *argv[]) { FILE *damage_out = fopen(d_filename, "rb"); if (damage_out != NULL) { - fread(damage, sizeof(unsigned int), a_dist_size, damage_out); + fread(damage, sizeof(uint64_t), a_dist_size, damage_out); fclose(damage_out); } } @@ -204,22 +203,21 @@ int main(int argc, char *argv[]) { printf("\n"); - for (unsigned int i = 0; i < N; i++) { - printf("\033[F\033[JFRACTURE: %0*d / %d\n", (int)log10(N) + 1, i + 1, N); + for (uint64_t i = 0; i < N; i++) { + printf("\033[F\033[JFRACTURE: %0*d / %d\n", (uint8_t)log10(N) + 1, i + 1, N); fnet *network = ini_voronoi_network(L, boundary, use_dual, genfunc_hyperuniform, &c); finst *perm_instance = create_instance(network, inf, use_voltage_boundaries, true, &c); double *fuse_thres = gen_fuse_thres(network->num_edges, network->edge_coords, beta, beta_scaling_flat); finst *instance = copy_instance(perm_instance, &c); break_data *breaking_data = fracture_network(instance, fuse_thres, &c, cutoff); - bool debug_stop = instance->debug_stop; free_instance(instance, &c); free(fuse_thres); - unsigned int max_pos = 0; + uint_t max_pos = 0; double max_val = 0; - for (unsigned int j = 0; j < breaking_data->num_broken; j++) { + for (uint_t j = 0; j < breaking_data->num_broken; j++) { double val = breaking_data->extern_field[j]; if (val > max_val) { @@ -235,9 +233,9 @@ int main(int argc, char *argv[]) { finst *tmp_instance = copy_instance(perm_instance, &c); - unsigned int av_size = 0; + uint_t av_size = 0; double cur_val = 0; - for (unsigned int j = 0; j < max_pos; j++) { + for (uint_t j = 0; j < max_pos; j++) { break_edge(tmp_instance, breaking_data->break_list[j], &c); double val = breaking_data->extern_field[j]; @@ -269,7 +267,7 @@ int main(int argc, char *argv[]) { if (max_pos > 0) { double sigma1 = breaking_data->extern_field[0]; double epsilon1 = sigma1 / breaking_data->conductivity[0]; - for (unsigned int j = 0; j < max_pos - 1; j++) { + for (uint_t j = 0; j < max_pos - 1; j++) { double sigma2 = breaking_data->extern_field[j+1]; double epsilon2 = sigma2 / breaking_data->conductivity[j+1]; if (epsilon2 > epsilon1) { @@ -286,44 +284,36 @@ int main(int argc, char *argv[]) { } if (save_cluster_dist) { - unsigned int *tmp_cluster_dist = get_cluster_dist(tmp_instance, &c); - for (unsigned int j = 0; j < tmp_instance->network->num_dual_verts; j++) { + uint_t *tmp_cluster_dist = get_cluster_dist(tmp_instance, &c); + for (uint_t j = 0; j < tmp_instance->network->num_dual_verts; j++) { cluster_size_dist[j] += tmp_cluster_dist[j]; } free(tmp_cluster_dist); } - if (save_corr) { - double *tmp_corr = get_corr(tmp_instance, dists, &c); - for (unsigned int j = 0; j < tmp_instance->network->num_dual_verts; j++) { - avg_corr[i] += tmp_corr[j] / N; - } - free(tmp_corr); - } - if (save_network) { FILE *net_out = fopen("network.txt", "w"); - for (unsigned int j = 0; j < network->num_verts; j++) { + for (uint_t j = 0; j < network->num_verts; j++) { fprintf(net_out, "%f %f ", network->vert_coords[2 * j], tmp_instance->network->vert_coords[2 * j + 1]); } fprintf(net_out, "\n"); - for (unsigned int j = 0; j < tmp_instance->network->num_edges; j++) { + for (uint_t j = 0; j < tmp_instance->network->num_edges; j++) { fprintf(net_out, "%u %u ", tmp_instance->network->edges_to_verts[2 * j], tmp_instance->network->edges_to_verts[2 * j + 1]); } fprintf(net_out, "\n"); - for (unsigned int j = 0; j < tmp_instance->network->num_dual_verts; j++) { + for (uint_t j = 0; j < tmp_instance->network->num_dual_verts; j++) { fprintf(net_out, "%f %f ", tmp_instance->network->dual_vert_coords[2 * j], tmp_instance->network->dual_vert_coords[2 * j + 1]); } fprintf(net_out, "\n"); - for (unsigned int j = 0; j < tmp_instance->network->num_edges; j++) { + for (uint_t j = 0; j < tmp_instance->network->num_edges; j++) { fprintf(net_out, "%u %u ", tmp_instance->network->dual_edges_to_verts[2 * j], tmp_instance->network->dual_edges_to_verts[2 * j + 1]); } fprintf(net_out, "\n"); - for (unsigned int j = 0; j < tmp_instance->network->num_edges; j++) { + for (uint_t j = 0; j < tmp_instance->network->num_edges; j++) { fprintf(net_out, "%d ", tmp_instance->fuses[j]); } fclose(net_out); @@ -334,7 +324,7 @@ int main(int argc, char *argv[]) { free_fnet(network, &c); if (include_breaking) { - for (unsigned int j = 0; j < breaking_data->num_broken; j++) { + for (uint_t j = 0; j < breaking_data->num_broken; j++) { fprintf(break_out, "%u %g %g ", breaking_data->break_list[j], breaking_data->extern_field[j], breaking_data->conductivity[j]); } @@ -350,8 +340,8 @@ int main(int argc, char *argv[]) { FILE *cluster_out = fopen(c_filename, "wb"); FILE *avalanche_out = fopen(a_filename, "wb"); - fwrite(cluster_size_dist, sizeof(unsigned int), c_dist_size, cluster_out); - fwrite(avalanche_size_dist, sizeof(unsigned int), a_dist_size, avalanche_out); + fwrite(cluster_size_dist, sizeof(uint64_t), c_dist_size, cluster_out); + fwrite(avalanche_size_dist, sizeof(uint64_t), a_dist_size, avalanche_out); fclose(cluster_out); fclose(avalanche_out); @@ -362,19 +352,6 @@ int main(int argc, char *argv[]) { free(avalanche_size_dist); } - if (save_corr) { - char *corr_filename = (char *)malloc(filename_len * sizeof(char)); - snprintf(corr_filename, filename_len, "corr_v_%c_%c_%d_%g.txt", boundc, boundc2, L, - beta); - FILE *corr_file = fopen(corr_filename, "w"); - for (unsigned int i = 0; i < voronoi_max_verts; i++) { - fprintf(corr_file, "%g ", avg_corr[i]); - } - fclose(corr_file); - free(corr_filename); - free(avg_corr); - } - if (save_conductivity) { char *cond_filename = (char *)malloc(filename_len * sizeof(char)); snprintf(cond_filename, filename_len, "cond_v_%c_%c_%d_%g.dat", boundc, boundc2, L, beta); @@ -397,7 +374,7 @@ int main(int argc, char *argv[]) { if (save_damage) { FILE *hdam_file = fopen(d_filename, "wb"); - fwrite(damage, sizeof(unsigned int), a_dist_size, hdam_file); + fwrite(damage, sizeof(uint64_t), a_dist_size, hdam_file); fclose(hdam_file); free(d_filename); free(damage); -- cgit v1.2.3-70-g09d2