diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2017-07-07 14:43:56 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2017-07-07 14:43:56 -0400 |
| commit | 0752118cac317bf7af628de5c693724989c30bca (patch) | |
| tree | b11e40814dcf4a5121c25985b4931f6807d721ce /src | |
| parent | 0492bba1c50c1da1a9048f1212cd933674e48b2a (diff) | |
| parent | 3ece960188d478d71a880339dba70407a5d0f034 (diff) | |
| download | fuse_networks-0752118cac317bf7af628de5c693724989c30bca.tar.gz fuse_networks-0752118cac317bf7af628de5c693724989c30bca.tar.bz2 fuse_networks-0752118cac317bf7af628de5c693724989c30bca.zip | |
merged
Diffstat (limited to 'src')
| -rw-r--r-- | src/fracture.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/fracture.c b/src/fracture.c index 6d1c768..3203804 100644 --- a/src/fracture.c +++ b/src/fracture.c @@ -161,6 +161,7 @@ int main(int argc, char *argv[]) { } char boundc; +<<<<<<< HEAD if (use_voltage_boundaries) { boundc = 'v'; } else { @@ -168,6 +169,14 @@ int main(int argc, char *argv[]) { }FILE *data_out; +======= + if (use_voltage_boundaries) + boundc = 'v'; + else + boundc = 'c'; + + FILE *data_out; +>>>>>>> 3ece960188d478d71a880339dba70407a5d0f034 if (save_data) { char *data_filename = (char *)malloc(filename_len * sizeof(char)); snprintf(data_filename, filename_len, "data_%c_%c_%c_%c_%u_%g_%g.txt", @@ -326,9 +335,14 @@ int main(int argc, char *argv[]) { } } +<<<<<<< HEAD if (save_crit_stress) { crit_stress[i] = data->extern_field[max_pos]; } +======= + if (save_crit_stress) + crit_stress[i] = data->extern_field[max_pos]; +>>>>>>> 3ece960188d478d71a880339dba70407a5d0f034 if (save_conductivity) { if (max_pos > 0) { |