diff --git a/src/include/file_io.h b/src/include/file_io.h
index 27ef8129eef0de7bbb6b473eaf8f7c45f2cee8d8..a39401dd1fcaea4473543adbc166ad278e260471 100644
--- a/src/include/file_io.h
+++ b/src/include/file_io.h
@@ -29,6 +29,7 @@ class FileSchema {
*
* \param num_rec: `int` Number of records in the file.
* \param rec_types: `string *` Description of the records in the file.
+ * \param rec_names: `string *` Names of the records in the file.
*/
FileSchema(int num_rec, std::string *rec_types, std::string *rec_names=NULL);
diff --git a/src/include/sph_subs.h b/src/include/sph_subs.h
index f0afd2dff43f125b98dbaf4da5126da62991d37f..9526b34341f85fc4a8be09a3ba259b655a05982a 100644
--- a/src/include/sph_subs.h
+++ b/src/include/sph_subs.h
@@ -35,7 +35,7 @@ void aps(double ****zpv, int li, int nsph, C1 *c1, double sqk, double *gaps);
* backward recurrence. This is the `CSPHJ` implementation of the `specfun` library.
*
* \param n: `int` Order of the function.
- * \param z: `complex<double>` Argumento of the function.
+ * \param z: `complex<double>` Argument of the function.
* \param nm: `int &` Highest computed order.
* \param csj: Vector of complex. The desired function \f$j\f$.
*/
@@ -140,7 +140,7 @@ int msta1(double x, int mp);
* This function determines the starting point for backward recurrence such that
* all \f$J\f$ and \f$j\f$ functions have `mp` significant digits.
*
- * \param x: `double` Absolute value of the argumetn to \f$J\f$ or \$j\f$.
+ * \param x: `double` Absolute value of the argumetn to \f$J\f$ or \f$j\f$.
* \param n: `int` Order of the function.
* \param mp: `int` Requested number of significant digits.
* \return result: `int` The necessary starting point.
diff --git a/src/include/tra_subs.h b/src/include/tra_subs.h
index 33d9781bed4c081c8ee34e2e7d322034f6148350..82594bd0744878f8109bf16003686c2f992a7341 100644
--- a/src/include/tra_subs.h
+++ b/src/include/tra_subs.h
@@ -97,7 +97,6 @@ void ffrf(
* \param ffte: `double *`. QUESTION: definition?
* \param ffts: `double *`. QUESTION: definition?
* \param cil: `CIL *` Pointer to a CIL structure.
- * \param ccr: `CCR *` Pointer to a CCR structure.
*/
void ffrt(
std::complex<double> *ac, std::complex<double> *ws, double *ffte, double *ffts,
diff --git a/src/libnptm/TransitionMatrix.cpp b/src/libnptm/TransitionMatrix.cpp
index 70a8393d3245408040c8bdbcdcd0f9fb860983d2..29efb578a47e6a61abf6cea6b3b105f8700d77ef 100644
--- a/src/libnptm/TransitionMatrix.cpp
+++ b/src/libnptm/TransitionMatrix.cpp
@@ -48,8 +48,8 @@ TransitionMatrix::TransitionMatrix(
}
TransitionMatrix::TransitionMatrix(
- int _lm, double _vk, double _exri, complex<double> **_rmi,
- complex<double> **_rei, double _sphere_radius
+ int _lm, double _vk, double _exri, std::complex<double> **_rmi,
+ std::complex<double> **_rei, double _sphere_radius
) {
is = 1111;
shape = new int[2];
diff --git a/src/libnptm/clu_subs.cpp b/src/libnptm/clu_subs.cpp
index b516e576ce250e6259d33e7b8141c1efb19270dd..777aebd48812ab0cf8d41aed018aa463f1381ca0 100644
--- a/src/libnptm/clu_subs.cpp
+++ b/src/libnptm/clu_subs.cpp
@@ -19,8 +19,8 @@
using namespace std;
void apc(
- double ****zpv, int le, complex<double> **am0m, complex<double> **w,
- double sqk, double **gapr, complex<double> **gapp
+ double ****zpv, int le, std::complex<double> **am0m, std::complex<double> **w,
+ double sqk, double **gapr, std::complex<double> **gapp
) {
complex<double> **ac, **gap;
const complex<double> cc0(0.0, 0.0);
@@ -137,8 +137,8 @@ void apc(
}
void apcra(
- double ****zpv, const int le, complex<double> **am0m, int inpol, double sqk,
- double **gaprm, complex<double> **gappm
+ double ****zpv, const int le, std::complex<double> **am0m, int inpol, double sqk,
+ double **gaprm, std::complex<double> **gappm
) {
const complex<double> cc0(0.0, 0.0);
const complex<double> uim(0.0, 1.0);
@@ -358,7 +358,7 @@ void apcra(
}
complex<double> cdtp(
- complex<double> z, complex<double> **am, int i, int jf,
+ std::complex<double> z, std::complex<double> **am, int i, int jf,
int k, int nj
) {
/* NOTE: the original FORTRAN code treats the AM matrix as a
@@ -409,7 +409,7 @@ double cgev(int ipamo, int mu, int l, int m) {
return result;
}
-void cms(complex<double> **am, C1 *c1, C1_AddOns *c1ao, C4 *c4, C6 *c6) {
+void cms(std::complex<double> **am, C1 *c1, C1_AddOns *c1ao, C4 *c4, C6 *c6) {
complex<double> dm, de, cgh, cgk;
const complex<double> cc0(0.0, 0.0);
int ndi = c4->nsph * c4->nlim;
@@ -823,7 +823,7 @@ complex<double> ghit(
}
void hjv(
- double exri, double vk, int &jer, int &lcalc, complex<double> &arg,
+ double exri, double vk, int &jer, int &lcalc, std::complex<double> &arg,
C1 *c1, C1_AddOns *c1ao, C4 *c4
) {
int nsphmo = c4->nsph - 1;
@@ -892,7 +892,7 @@ void hjv(
delete[] rfn;
}
-void lucin(complex<double> **am, const int nddmst, int n, int &ier) {
+void lucin(std::complex<double> **am, const int nddmst, int n, int &ier) {
/* NDDMST FIRST DIMENSION OF AM AS DECLARED IN DIMENSION
* STATEMENT.
* N NUMBER OF ROWS IN AM.
@@ -997,7 +997,7 @@ void lucin(complex<double> **am, const int nddmst, int n, int &ier) {
delete[] v;
}
-void mextc(double vk, double exri, complex<double> **fsac, double **cextlr, double **cext) {
+void mextc(double vk, double exri, std::complex<double> **fsac, double **cextlr, double **cext) {
double fa11r = fsac[0][0].real();
double fa11i = fsac[0][0].imag();
double fa21r = fsac[1][0].real();
@@ -1538,8 +1538,8 @@ void r3jmr(int j1, int j2, int j3, int m1, C6 *c6) {
}
void raba(
- int le, complex<double> **am0m, complex<double> **w, double **tqce,
- complex<double> **tqcpe, double **tqcs, complex<double> **tqcps
+ int le, std::complex<double> **am0m, std::complex<double> **w, double **tqce,
+ std::complex<double> **tqcpe, double **tqcs, std::complex<double> **tqcps
) {
complex<double> **a, **ctqce, **ctqcs;
complex<double> acw, acwp, aca, acap, c1, c2, c3;
@@ -1901,7 +1901,7 @@ void tqr(
tsk = u[0] * tqsv[0] + u[1] * tqsv[1] + u[2] * tqsv[2];
}
-void ztm(complex<double> **am, C1 *c1, C1_AddOns *c1ao, C4 *c4, C6 *c6, C9 * c9) {
+void ztm(std::complex<double> **am, C1 *c1, C1_AddOns *c1ao, C4 *c4, C6 *c6, C9 * c9) {
complex<double> gie, gle, a1, a2, a3, a4, sum1, sum2, sum3, sum4;
const complex<double> cc0(0.0, 0.0);
int ndi = c4->nsph * c4->nlim;
diff --git a/src/libnptm/sph_subs.cpp b/src/libnptm/sph_subs.cpp
index 99aa4d7f25981421648ca34267e322db332c59aa..30e31bf9ec78e83a8e545a408d93c22fb6a267af 100644
--- a/src/libnptm/sph_subs.cpp
+++ b/src/libnptm/sph_subs.cpp
@@ -64,7 +64,7 @@ void aps(double ****zpv, int li, int nsph, C1 *c1, double sqk, double *gaps) {
}
}
-void cbf(int n, complex<double> z, int &nm, complex<double> csj[]) {
+void cbf(int n, std::complex<double> z, int &nm, std::complex<double> csj[]) {
/*
* FROM CSPHJY OF LIBRARY specfun
*
@@ -177,7 +177,7 @@ double cg1(int lmpml, int mu, int l, int m) {
return result;
}
-complex<double> dconjg(complex<double> z) {
+complex<double> dconjg(std::complex<double> z) {
double zreal = z.real();
double zimag = z.imag();
return complex<double>(zreal, -zimag);
@@ -204,7 +204,7 @@ void diel(int npntmo, int ns, int i, int ic, double vk, C1 *c1, C2 *c2) {
void dme(
int li, int i, int npnt, int npntts, double vk, double exdc, double exri,
- C1 *c1, C2 *c2, int &jer, int &lcalc, complex<double> &arg
+ C1 *c1, C2 *c2, int &jer, int &lcalc, std::complex<double> &arg
) {
const int lipo = li + 1;
const int lipt = li + 2;
@@ -353,7 +353,7 @@ double envj(int n, double x) {
return result;
}
-void mmulc(complex<double> *vint, double **cmullr, double **cmul) {
+void mmulc(std::complex<double> *vint, double **cmullr, double **cmul) {
double sm2 = vint[0].real();
double s24 = vint[1].real();
double d24 = vint[1].imag();
@@ -481,7 +481,7 @@ void orunve( double *u1, double *u2, double *u3, int iorth, double torth) {
}
void pwma(
- double *up, double *un, complex<double> *ylm, int inpol, int lw,
+ double *up, double *un, std::complex<double> *ylm, int inpol, int lw,
int isq, C1 *c1
) {
const double four_pi = 8.0 * acos(0.0);
@@ -560,8 +560,8 @@ void pwma(
}
void rabas(
- int inpol, int li, int nsph, C1 *c1, double **tqse, complex<double> **tqspe,
- double **tqss, complex<double> **tqsps
+ int inpol, int li, int nsph, C1 *c1, double **tqse, std::complex<double> **tqspe,
+ double **tqss, std::complex<double> **tqsps
) {
complex<double> cc0 = complex<double>(0.0, 0.0);
complex<double> uim = complex<double>(0.0, 1.0);
@@ -672,9 +672,9 @@ void rbf(int n, double x, int &nm, double sj[]) {
}
void rkc(
- int npntmo, double step, complex<double> dcc, double &x, int lpo,
- complex<double> &y1, complex<double> &y2, complex<double> &dy1,
- complex<double> &dy2
+ int npntmo, double step, std::complex<double> dcc, double &x, int lpo,
+ std::complex<double> &y1, std::complex<double> &y2, std::complex<double> &dy1,
+ std::complex<double> &dy2
) {
complex<double> cy1, cdy1, c11, cy23, yc2, c12, c13;
complex<double> cy4, yy, c14, c21, c22, c23, c24;
@@ -710,8 +710,8 @@ void rkc(
}
void rkt(
- int npntmo, double step, double &x, int lpo, complex<double> &y1,
- complex<double> &y2, complex<double> &dy1, complex<double> &dy2,
+ int npntmo, double step, double &x, int lpo, std::complex<double> &y1,
+ std::complex<double> &y2, std::complex<double> &dy1, std::complex<double> &dy2,
C2 *c2
) {
complex<double> cy1, cdy1, c11, cy23, cdy23, yc2, c12, c13;
@@ -804,7 +804,7 @@ void rnf(int n, double x, int &nm, double sy[]) {
void sphar(
double cosrth, double sinrth, double cosrph, double sinrph,
- int ll, complex<double> *ylm
+ int ll, std::complex<double> *ylm
) {
const int rmp_size = ll;
const int plegn_size = (ll + 1) * ll / 2 + ll + 1;
@@ -881,7 +881,7 @@ void sphar(
goto label40;
}
-void sscr0(complex<double> &tfsas, int nsph, int lm, double vk, double exri, C1 *c1) {
+void sscr0(std::complex<double> &tfsas, int nsph, int lm, double vk, double exri, C1 *c1) {
complex<double> sum21, rm, re, csam;
const complex<double> cc0 = complex<double>(0.0, 0.0);
const double exdc = exri * exri;
@@ -923,7 +923,7 @@ void sscr0(complex<double> &tfsas, int nsph, int lm, double vk, double exri, C1
}
void sscr2(int nsph, int lm, double vk, double exri, C1 *c1) {
- complex<double> s11, s21, s12, s22, rm, re, csam, cc;
+ std::complex<double> s11, s21, s12, s22, rm, re, csam, cc;
const complex<double> cc0(0.0, 0.0);
double ccs = 1.0 / (vk * vk);
csam = -(ccs / (exri * vk)) * complex<double>(0.0, 0.5);
diff --git a/src/libnptm/tra_subs.cpp b/src/libnptm/tra_subs.cpp
index 792ed3feaaa38f22b25c727d3f52def65a7da2ca..aef2de470a5c3fe0b68aa95f05c0dbdac9d63615 100644
--- a/src/libnptm/tra_subs.cpp
+++ b/src/libnptm/tra_subs.cpp
@@ -21,7 +21,7 @@
using namespace std;
void camp(
- complex<double> *ac, complex<double> **am0m, complex<double> *ws,
+ std::complex<double> *ac, std::complex<double> **am0m, std::complex<double> *ws,
CIL *cil
) {
for (int j = 0; j < cil->nlemt; j++) {
@@ -32,8 +32,8 @@ void camp(
}
void czamp(
- complex<double> *ac, complex<double> **amd, int **indam,
- complex<double> *ws, CIL *cil
+ std::complex<double> *ac, std::complex<double> **amd, int **indam,
+ std::complex<double> *ws, CIL *cil
) {
const complex<double> cc0(0.0, 0.0);
const complex<double> uim(0.0, 1.0);
@@ -61,7 +61,7 @@ void czamp(
}
void ffrf(
- double ****zpv, complex<double> *ac, complex<double> *ws, double *fffe,
+ double ****zpv, std::complex<double> *ac, std::complex<double> *ws, double *fffe,
double *fffs, CIL *cil, CCR *ccr
) {
const complex<double> cc0(0.0, 0.0);
@@ -178,7 +178,7 @@ void ffrf(
}
void ffrt(
- complex<double> *ac, complex<double> *ws, double *ffte, double *ffts,
+ std::complex<double> *ac, std::complex<double> *ws, double *ffte, double *ffts,
CIL *cil
) {
const complex<double> cc0(0.0, 0.0);
@@ -282,7 +282,7 @@ void frfmer(
delete[] wk;
}
-void pwmalp(complex<double> **w, double *up, double *un, complex<double> *ylm, int lw) {
+void pwmalp(std::complex<double> **w, double *up, double *un, std::complex<double> *ylm, int lw) {
complex<double> cp1, cm1, cp2, cm2, cl;
const complex<double> uim(0.0, 1.0);
const double four_pi = acos(0.0) * 8.0;
@@ -320,8 +320,8 @@ void pwmalp(complex<double> **w, double *up, double *un, complex<double> *ylm, i
}
void samp(
- complex<double> *ac, complex<double> *tmsm, complex<double> *tmse,
- complex<double> *ws, CIL *cil
+ std::complex<double> *ac, std::complex<double> *tmsm, std::complex<double> *tmse,
+ std::complex<double> *ws, CIL *cil
) {
int i = 0;
for (int l20 = 0; l20 < cil->le; l20++) {
@@ -337,7 +337,7 @@ void samp(
}
void sampoa(
- complex<double> *ac, complex<double> **tms, complex<double> *ws,
+ std::complex<double> *ac, std::complex<double> **tms, std::complex<double> *ws,
CIL *cil
) {
complex<double> **tm = new complex<double>*[2];
@@ -364,7 +364,7 @@ void sampoa(
}
void wamff(
- complex<double> *wk, double x, double y, double z, int lm, double apfafa,
+ std::complex<double> *wk, double x, double y, double z, int lm, double apfafa,
double tra, double spd, double rir, double ftcn, int lmode, double pmf
) {
const int nlmm = lm * (lm + 2);
diff --git a/src/trapping/np_trapping.cpp b/src/trapping/np_trapping.cpp
index 236013a77f4e65254139589dcd957e7467b0cd88..99b1f7898e900cd852113f427b926152cce08c91 100644
--- a/src/trapping/np_trapping.cpp
+++ b/src/trapping/np_trapping.cpp
@@ -10,7 +10,7 @@ using namespace std;
extern void frfme(string data_file, string output_path);
extern void lffft(string data_file, string output_path);
-/* \brief Main program execution body.
+/*! \brief Main program execution body.
*
* \param argc: `int`
* \param argv: `char **`