mirror of
https://github.com/arcan1s/moldyn.git
synced 2025-07-04 09:35:46 +00:00
Removed nested conditions
This commit is contained in:
@ -248,6 +248,7 @@ int main(int argc, char *argv[])
|
|||||||
print_message (quiet, stdout, log, f_log, 8, tmp_str);
|
print_message (quiet, stdout, log, f_log, 8, tmp_str);
|
||||||
// reading coordinates
|
// reading coordinates
|
||||||
print_message (quiet, stdout, log, f_log, 7, input);
|
print_message (quiet, stdout, log, f_log, 7, input);
|
||||||
|
error = 1;
|
||||||
error = reading_coords (2, input, num_needed_mol, needed_mol, cell, &num_mol,
|
error = reading_coords (2, input, num_needed_mol, needed_mol, cell, &num_mol,
|
||||||
&num_atoms, true_label_mol, label_mol, tmp_int, coords,
|
&num_atoms, true_label_mol, label_mol, tmp_int, coords,
|
||||||
ch_type_atoms);
|
ch_type_atoms);
|
||||||
@ -257,6 +258,7 @@ int main(int argc, char *argv[])
|
|||||||
print_message (quiet, stderr, log, f_log, 19, argv[0]);
|
print_message (quiet, stderr, log, f_log, 19, argv[0]);
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// analyze
|
// analyze
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
@ -266,22 +268,22 @@ int main(int argc, char *argv[])
|
|||||||
print_message (quiet, stdout, log, f_log, 8, tmp_str);
|
print_message (quiet, stdout, log, f_log, 8, tmp_str);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = set_center (num_atoms, num_mol, label_mol, coords, centr_coords);
|
error = set_center (num_atoms, num_mol, label_mol, coords, centr_coords);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stderr, log, f_log, 20, argv[0]);
|
print_message (quiet, stderr, log, f_log, 20, argv[0]);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = select_molecule (centr_coords, num_needed_mol, needed_mol);
|
error = select_molecule (centr_coords, num_needed_mol, needed_mol);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stderr, log, f_log, 4, argv[0]);
|
print_message (quiet, stderr, log, f_log, 4, argv[0]);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = print_structure (output, num_needed_mol, needed_mol, num_atoms,
|
error = print_structure (output, num_needed_mol, needed_mol, num_atoms,
|
||||||
label_mol, ch_type_atoms, coords);
|
label_mol, ch_type_atoms, coords);
|
||||||
|
}
|
||||||
|
if (error == 0)
|
||||||
print_message (quiet, stderr, log, f_log, 12, output);
|
print_message (quiet, stderr, log, f_log, 12, output);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print_message (quiet, stderr, log, f_log, 13, argv[0]);
|
print_message (quiet, stderr, log, f_log, 13, argv[0]);
|
||||||
|
|
||||||
|
@ -249,6 +249,7 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
// reading coordinates
|
// reading coordinates
|
||||||
print_message (quiet, stdout, log, f_log, 7, input);
|
print_message (quiet, stdout, log, f_log, 7, input);
|
||||||
|
error = 1;
|
||||||
error = reading_coords (1, input, tmp_int[0], tmp_int, cell, &num_mol, &num_atoms,
|
error = reading_coords (1, input, tmp_int[0], tmp_int, cell, &num_mol, &num_atoms,
|
||||||
true_label_mol, label_mol, tmp_int, coords, ch_type_atoms);
|
true_label_mol, label_mol, tmp_int, coords, ch_type_atoms);
|
||||||
centr_coords = (float *) malloc (3 * 8 * num_mol * sizeof (float));
|
centr_coords = (float *) malloc (3 * 8 * num_mol * sizeof (float));
|
||||||
@ -272,22 +273,23 @@ int main(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
error = 1;
|
error = 1;
|
||||||
error = set_center (num_atoms, num_mol, label_mol, coords, centr_coords);
|
error = set_center (num_atoms, num_mol, label_mol, coords, centr_coords);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stderr, log, f_log, 20, argv[0]);
|
print_message (quiet, stderr, log, f_log, 20, argv[0]);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = search_envir (num_of_mol, num_mol, centr_coords, rad, needed_mol,
|
error = search_envir (num_of_mol, num_mol, centr_coords, rad, needed_mol,
|
||||||
&num_needed_mol);
|
&num_needed_mol);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stderr, log, f_log, 21, argv[0]);
|
print_message (quiet, stderr, log, f_log, 21, argv[0]);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = print_structure (output, num_needed_mol, needed_mol, num_atoms,
|
error = print_structure (output, num_needed_mol, needed_mol, num_atoms,
|
||||||
label_mol, ch_type_atoms, coords);
|
label_mol, ch_type_atoms, coords);
|
||||||
|
}
|
||||||
|
if (error == 0)
|
||||||
print_message (quiet, stderr, log, f_log, 12, output);
|
print_message (quiet, stderr, log, f_log, 12, output);
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
||||||
|
|
||||||
|
@ -393,10 +393,10 @@ needed_at[1], needed_at[2], needed_at[3], needed_at[4], needed_at[5]);
|
|||||||
r_step, ang_min, ang_max, ang_step, radf);
|
r_step, ang_min, ang_max, ang_step, radf);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
print_message (quiet, stdout, log, f_log, 22, argv[0]);
|
print_message (quiet, stdout, log, f_log, 22, argv[0]);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
||||||
print_message (quiet, stdout, log, f_log, 14, output);
|
print_message (quiet, stdout, log, f_log, 14, output);
|
||||||
|
@ -414,22 +414,22 @@ int main (int argc, char *argv[])
|
|||||||
error = 1;
|
error = 1;
|
||||||
error = create_matrix (num_mol, num_atoms, label_mol, type_atoms, coords,
|
error = create_matrix (num_mol, num_atoms, label_mol, type_atoms, coords,
|
||||||
num_of_inter, crit, connect);
|
num_of_inter, crit, connect);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stdout, log, f_log, 10, argv[0]);
|
print_message (quiet, stdout, log, f_log, 10, argv[0]);
|
||||||
error = 1;
|
error = 1;
|
||||||
error = proc_matrix (num_mol, connect, num_mol_agl, agl, stat, stat_all);
|
error = proc_matrix (num_mol, connect, num_mol_agl, agl, stat, stat_all);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
{
|
{
|
||||||
print_message (quiet, stdout, log, f_log, 11, argv[0]);
|
print_message (quiet, stdout, log, f_log, 11, argv[0]);
|
||||||
error = printing_agl (filename, output, connect, num_mol, true_label_mol,
|
error = printing_agl (filename, output, connect, num_mol, true_label_mol,
|
||||||
num_mol_agl, agl, stat, max_depth, type_agl);
|
num_mol_agl, agl, stat, max_depth, type_agl);
|
||||||
|
}
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
print_message (quiet, stdout, log, f_log, 12, output);
|
print_message (quiet, stdout, log, f_log, 12, output);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
print_message (quiet, stdout, log, f_log, 13, argv[0]);
|
||||||
print_message (quiet, stdout, log, f_log, 14, output);
|
print_message (quiet, stdout, log, f_log, 14, output);
|
||||||
|
Reference in New Issue
Block a user