QPMS
/
qpms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compiler warnings, doxygen fixes 

Former-commit-id: 2686ab2db0a61327db1ef5ce3799f3e88fea0f49
This commit is contained in:
Marek Nečada 2019-08-16 11:17:59 +03:00
parent 03188d43f7
commit 3e6f004605
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qpms/CMakeLists.txt
View File

@ -26,6 +26,8 @@ target_link_libraries (qpms
) )
target_include_directories (qpms PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories (qpms PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_options(qpms PRIVATE -Wall -Wno-return-type)
install(TARGETS qpms install(TARGETS qpms
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

2
qpms/lattices.h
View File

@ -333,7 +333,7 @@ static inline PGenReturnDataBulk PGen_fetch_any(struct PGen *g, size_t nmemb,
if (res1.flags & PGEN_NOTDONE) { if (res1.flags & PGEN_NOTDONE) {
target[res.generated] = res1.point; target[res.generated] = res1.point;
// The coordinate system generated by next() must be consistent: // The coordinate system generated by next() must be consistent:
assert(!res.generated || (res1.flags & PGEN_COORDS_BITRANGE == res.flags & PGEN_COORDS_BITRANGE)); assert(!res.generated || ((res1.flags & PGEN_COORDS_BITRANGE) == (res.flags & PGEN_COORDS_BITRANGE)));
res.flags |= res1.flags & PGEN_COORDS_BITRANGE; res.flags |= res1.flags & PGEN_COORDS_BITRANGE;
} else { } else {
res.flags &= ~PGEN_NOTDONE; res.flags &= ~PGEN_NOTDONE;

5
qpms/tmatrices.h
View File

@ -1,4 +1,4 @@
/* \file tmatrices.h /*! \file tmatrices.h
* \brief T-matrices for scattering systems. * \brief T-matrices for scattering systems.
*/ */
#ifndef TMATRICES_H #ifndef TMATRICES_H
@ -371,8 +371,7 @@ static inline qpms_tmatrix_t *qpms_tmatrix_spherical(
return t; return t;
} }
/// Convenience function to calculate T-matrix of a non-magnetic spherical \ /// Convenience function to calculate T-matrix of a non-magnetic spherical particle using the permittivity values, replacing existing T-matrix data.
particle using the permittivity values, replacing existing T-matrix data.
qpms_errno_t qpms_tmatrix_spherical_mu0_fill( qpms_errno_t qpms_tmatrix_spherical_mu0_fill(
qpms_tmatrix_t *t, ///< T-matrix whose contents are to be replaced. Not NULL. qpms_tmatrix_t *t, ///< T-matrix whose contents are to be replaced. Not NULL.
double a, ///< Radius of the sphere. double a, ///< Radius of the sphere.

2
qpms/vectors.h
View File

@ -530,7 +530,7 @@ static inline cart2_t anycoord2cart2(anycoord_point_t p, qpms_coord_system_t t)
/** See @ref coord_conversions for the conversion definitions. /** See @ref coord_conversions for the conversion definitions.
*/ */
static inline double anycoord2cart1(anycoord_point_t p, qpms_coord_system_t t) { static inline double anycoord2cart1(anycoord_point_t p, qpms_coord_system_t t) {
if (t & QPMS_COORDS_BITRANGE == QPMS_COORDS_CART1) if ((t & QPMS_COORDS_BITRANGE) == QPMS_COORDS_CART1)
return p.z; return p.z;
else else
QPMS_PR_ERROR("Implicit conversion from nD (n > 1)" QPMS_PR_ERROR("Implicit conversion from nD (n > 1)"