Release radf-1.0.1

Edited shared library
This commit is contained in:
arcan1s
2013-08-03 02:09:24 +04:00
parent 0523b2f7fa
commit e9e0e82c4d
8 changed files with 92 additions and 46 deletions

View File

@ -93,6 +93,7 @@ int main (int argc, char *argv[])
* @return 1 - error in error_checking
* @return 2 - input file does not exist
* @return 3 - memory error
* @return 4 - unknown flag
* @return 0 - exit without errors
*/
{
@ -142,11 +143,13 @@ int main (int argc, char *argv[])
// reading number of interactions
for (i=1; i<argc; i++)
if ((argv[i][0] == '-') && (argv[i][1] == 'r'))
if ((argv[i][0] == '-') && (argv[i][1] == 'r') && (argv[i][2] == '\0'))
num_of_inter++;
if (num_of_inter > 0)
{
crit = (float *) malloc ( 16 * num_of_inter * sizeof (float));
if (crit == NULL)
return 3;
for (i=0; i<16*num_of_inter; i++)
crit[i] = 0.0;
num_of_inter = 0;
@ -155,7 +158,7 @@ int main (int argc, char *argv[])
// reading arguments
for (i=1; i<argc; i++)
{
if ((argv[i][0] == '-') && (argv[i][1] == 'h'))
if ((argv[i][0] == '-') && (argv[i][1] == 'h') && (argv[i][2] == '\0'))
{
sprintf (tmp_str, " statgen\n");
sprintf (tmp_str, "%sProgram for analyze molecular dynamic trajectories\n", tmp_str);
@ -180,13 +183,13 @@ int main (int argc, char *argv[])
fputs (tmp_str, stdout);
return 0;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'i'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'i') && (argv[i][2] == '\0'))
// mask of input files
{
strcpy (input, argv[i+1]);
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 's'))
else if ((argv[i][0] == '-') && (argv[i][1] == 's') && (argv[i][2] == '\0'))
// steps
{
sscanf (argv[i+1], "%i,%i", &from, &to);
@ -199,13 +202,13 @@ int main (int argc, char *argv[])
step = to - from + 1;
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'c'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'c') && (argv[i][2] == '\0'))
// cell size
{
sscanf (argv[i+1], "%f,%f,%f", &cell[0], &cell[1], &cell[2]);
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'a'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'a') && (argv[i][2] == '\0'))
// atom types
{
type_inter = 1;
@ -234,7 +237,7 @@ int main (int argc, char *argv[])
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'r'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'r') && (argv[i][2] == '\0'))
// criteria
{
index = 0;
@ -253,30 +256,35 @@ int main (int argc, char *argv[])
num_of_inter++;
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'o'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'o') && (argv[i][2] == '\0'))
// output file
{
strcpy (output, argv[i+1]);
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'g'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'g') && (argv[i][2] == '\0'))
// graph isomorphism scan
{
sscanf (argv[i+1], "%i", &max_depth);
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'l'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'l') && (argv[i][2] == '\0'))
// log mode
{
log = 1;
strcpy (logfile, argv[i+1]);
i++;
}
else if ((argv[i][0] == '-') && (argv[i][1] == 'q'))
else if ((argv[i][0] == '-') && (argv[i][1] == 'q') && (argv[i][2] == '\0'))
// quiet mode
{
quiet = 1;
}
else
// unknown flag
{
return 4;
}
}
if (log == 1)

View File

@ -21,6 +21,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
* @param text additional text
* @param output output file (may be stdout)
*
* @return 1 - unknown mode
* @return 0 - exit without errors
*/
{
@ -40,7 +41,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
switch (mode)
{
case 0:
sprintf (out, "Starting program: '%s'\n", text);
sprintf (out, "Start program: '%s'\n", text);
break;
case 1:
sprintf (out, "Checking errors\n");
@ -82,7 +83,7 @@ int message (const int log, const int mode, const char *text, FILE *output)
sprintf (out, "End of processing\n");
break;
case 14:
sprintf (out, "Printing summary statistic to file '%s'\n", text);
sprintf (out, "Print result to file '%s'\n", text);
break;
case 15:
sprintf (out, "Free memory\n");
@ -105,6 +106,12 @@ int message (const int log, const int mode, const char *text, FILE *output)
case 21:
sprintf (out, "%6cEnvironment was selected successfully\n", ' ');
break;
case 22:
sprintf (out, "%6cRADF was appended successfully\n", ' ');
break;
default:
return 1;
break;
}
fputs (out, output);