"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/expat/gamgi_expat_import_object.c" between
gamgi-all-0.17.4x.tar.gz and gamgi-all-0.17.5x.tar.gz

About: GAMGI (General Atomistic Modelling Graphic Interface) is a program to build, view, and analyze atomic strucures such as molecules, crystals, glasses, liquids, etc. (tarball using only the GLX library).

gamgi_expat_import_object.c  (gamgi-all-0.17.4x)	:	gamgi_expat_import_object.c  (gamgi-all-0.17.5x)
skipping to change at line 3166		skipping to change at line 3166
fileline, gml->ml.window);		fileline, gml->ml.window);
if (o4 != FALSE && cell->origin_vectors == GAMGI_PHYS_PRIMITIVE)		if (o4 != FALSE && cell->origin_vectors == GAMGI_PHYS_PRIMITIVE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (o4 != FALSE && gamgi_math_node_check (cell->lattice, o4) == FALSE)		if (o4 != FALSE && gamgi_math_node_check (cell->lattice, o4) == FALSE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
/*********************************************************		/****************************************
* the 3 angles together cannot be too close to 0 or 360 *		* Wigner-Seitz cells are not available *
* *		* yet for these more complex lattices *
* each angle cannot be larger than the sum of the other *		****************************************/
* two, or smaller than the difference of the other two *
*********************************************************/		if (cell->model == GAMGI_PHYS_WIGNER)
		{
		if (cell->lattice == GAMGI_PHYS_TRICLINIC_P ||
		cell->lattice == GAMGI_PHYS_MONOCLINIC_P ||
		cell->lattice == GAMGI_PHYS_MONOCLINIC_C)
		return gamgi_io_error_incompatible (gml->ml.filename,
		fileline, gml->ml.window);
		}
if (cell->model == GAMGI_PHYS_PARALLELEPIPED)		if (cell->model == GAMGI_PHYS_PARALLELEPIPED)
{		{
		/*********************************************************
		* the 3 angles together cannot be too close to 0 or 360 *
		* *
		* each angle cannot be larger than the sum of the other *
		* two, or smaller than the difference of the other two *
		*********************************************************/
if (cell->v12 + cell->v13 + cell->v23 > 360.0 - GAMGI_MATH_TOLERANCE_ANGLE)		if (cell->v12 + cell->v13 + cell->v23 > 360.0 - GAMGI_MATH_TOLERANCE_ANGLE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->v12 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v13 + cell->v23		if (cell->v12 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v13 + cell->v23
|| cell->v13 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v12 + cell->v23		|| cell->v13 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v12 + cell->v23
|| cell->v23 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v12 + cell->v13)		|| cell->v23 + GAMGI_MATH_TOLERANCE_ANGLE > cell->v12 + cell->v13)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
skipping to change at line 3202		skipping to change at line 3216
if (cell->model != GAMGI_PHYS_PARALLELEPIPED &&		if (cell->model != GAMGI_PHYS_PARALLELEPIPED &&
cell->model != GAMGI_PHYS_SPHERE && volume != 0)		cell->model != GAMGI_PHYS_SPHERE && volume != 0)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->model == GAMGI_PHYS_SPHERE && volume != 1)		if (cell->model == GAMGI_PHYS_SPHERE && volume != 1)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->model == GAMGI_PHYS_PARALLELEPIPED		if (cell->model == GAMGI_PHYS_PARALLELEPIPED
|| cell->model == GAMGI_PHYS_SPHERE		|| cell->model == GAMGI_PHYS_SPHERE)
|| cell->model == GAMGI_PHYS_PROJECTION)
{		{
		if (number != 0)
		return gamgi_io_error_incompatible (gml->ml.filename,
		fileline, gml->ml.window);
if (cell->borders == GAMGI_PHYS_ALL		if (cell->borders == GAMGI_PHYS_ALL
|| cell->borders == GAMGI_PHYS_FACES)		|| cell->borders == GAMGI_PHYS_FACES)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->faces == TRUE)		if (cell->faces == TRUE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
		}
		if (cell->model == GAMGI_PHYS_PROJECTION)
		{
if (number != 0)		if (number != 0)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
}
if (cell->model == GAMGI_PHYS_WIGNER)		if (cell->reciprocal != 0.0)
{
if (cell->lattice == GAMGI_PHYS_TRICLINIC_P ||
cell->lattice == GAMGI_PHYS_MONOCLINIC_P ||
cell->lattice == GAMGI_PHYS_MONOCLINIC_C)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
}
if (cell->model == GAMGI_PHYS_PROJECTION)		if (cell->axes == TRUE)
{
if (cell->reciprocal != 0.0)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (borders == 1 && cell->borders != GAMGI_PHYS_EDGES)		if (o123 != 0 || o4 != FALSE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->nodes == TRUE)		if (borders == 1 && cell->borders != GAMGI_PHYS_EDGES)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (cell->axes == TRUE)		cell->borders = GAMGI_PHYS_EDGES;
		if (cell->faces == TRUE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
if (o123 != 0 || o4 != FALSE)		if (nodes == 1 && cell->nodes != FALSE)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
		cell->nodes = FALSE;
}		}
if (cell->faces == TRUE && cell->borders == GAMGI_PHYS_ALL)		if (cell->faces == TRUE && cell->borders == GAMGI_PHYS_ALL)
return gamgi_io_error_incompatible (gml->ml.filename,		return gamgi_io_error_incompatible (gml->ml.filename,
fileline, gml->ml.window);		fileline, gml->ml.window);
/*****************************************		/*****************************************
* Something in the cell must be visible *		* Something in the cell must be visible *
*****************************************/		*****************************************/
End of changes. 15 change blocks.
22 lines changed or deleted		38 lines changed or added

---