summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fracture.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/fracture.c b/src/fracture.c
index 3203804..41bd056 100644
--- a/src/fracture.c
+++ b/src/fracture.c
@@ -161,22 +161,14 @@ int main(int argc, char *argv[]) {
}
char boundc;
-<<<<<<< HEAD
if (use_voltage_boundaries) {
boundc = 'v';
} else {
boundc = 'c';
-
+ }
-}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",
@@ -335,14 +327,9 @@ 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) {