Permalink
Browse files

Merge pull request #1317 from robertodr/modernize-redundant-void-arg

clang-tidy apply modernize-redundant-void-arg fixes
  • Loading branch information...
andysim committed Oct 30, 2018
2 parents 6b5dff0 + 2bae00c commit 5b4f6eaaf4fc34b6de3ee16d6d8557d1d384c90a
Showing with 416 additions and 416 deletions.
  1. +1 −1 psi4/src/core.cc
  2. +1 −1 psi4/src/psi4/cctransort/a_spinad.cc
  3. +1 −1 psi4/src/psi4/cctransort/e_spinad.cc
  4. +14 −14 psi4/src/psi4/detci/civect.cc
  5. +14 −14 psi4/src/psi4/detci/civect.h
  6. +2 −2 psi4/src/psi4/detci/ciwave.cc
  7. +7 −7 psi4/src/psi4/detci/ciwave.h
  8. +1 −1 psi4/src/psi4/detci/compute_cc.cc
  9. +4 −4 psi4/src/psi4/detci/h0block.cc
  10. +1 −1 psi4/src/psi4/detci/olsengraph.cc
  11. +1 −1 psi4/src/psi4/detci/opdm.cc
  12. +3 −3 psi4/src/psi4/detci/params.cc
  13. +2 −2 psi4/src/psi4/detci/slaterd.h
  14. +1 −1 psi4/src/psi4/detci/tpdm.cc
  15. +11 −11 psi4/src/psi4/libdpd/dpd.h
  16. +3 −3 psi4/src/psi4/libdpd/file2_cache.cc
  17. +8 −8 psi4/src/psi4/libdpd/file4_cache.cc
  18. +1 −1 psi4/src/psi4/libdpd/init.cc
  19. +1 −1 psi4/src/psi4/libfock/cubature.cc
  20. +2 −2 psi4/src/psi4/libfock/points.h
  21. +1 −1 psi4/src/psi4/libfock/soscf.h
  22. +1 −1 psi4/src/psi4/libfock/v.h
  23. +1 −1 psi4/src/psi4/libmints/cdsalclist.h
  24. +1 −1 psi4/src/psi4/libmints/element_to_Z.h
  25. +2 −2 psi4/src/psi4/libmints/molecule.h
  26. +3 −3 psi4/src/psi4/libmints/twobody.cc
  27. +3 −3 psi4/src/psi4/libmints/twobody.h
  28. +2 −2 psi4/src/psi4/libmints/wavefunction.h
  29. +1 −1 psi4/src/psi4/liboptions/liboptions.cc
  30. +1 −1 psi4/src/psi4/liboptions/liboptions.h
  31. +1 −1 psi4/src/psi4/libpsio/done.cc
  32. +1 −1 psi4/src/psi4/libpsio/get_numvols.cc
  33. +2 −2 psi4/src/psi4/libpsio/getpid.cc
  34. +1 −1 psi4/src/psi4/libpsio/init.cc
  35. +6 −6 psi4/src/psi4/libpsio/psio.h
  36. +1 −1 psi4/src/psi4/libpsio/psio.hpp
  37. +2 −2 psi4/src/psi4/libqt/qt.h
  38. +2 −2 psi4/src/psi4/libqt/timer.cc
  39. +27 −27 psi4/src/psi4/optking/IRC_data.h
  40. +8 −8 psi4/src/psi4/optking/bend.h
  41. +1 −1 psi4/src/psi4/optking/cart.h
  42. +1 −1 psi4/src/psi4/optking/combo_coordinates.cc
  43. +2 −2 psi4/src/psi4/optking/combo_coordinates.h
  44. +1 −1 psi4/src/psi4/optking/fb_frag.cc
  45. +3 −3 psi4/src/psi4/optking/fb_frag.h
  46. +8 −8 psi4/src/psi4/optking/frag.cc
  47. +42 −42 psi4/src/psi4/optking/frag.h
  48. +1 −1 psi4/src/psi4/optking/frag_H_guess.cc
  49. +1 −1 psi4/src/psi4/optking/frag_natural.cc
  50. +4 −4 psi4/src/psi4/optking/geom_gradients_io.cc
  51. +1 −1 psi4/src/psi4/optking/globals.h
  52. +7 −7 psi4/src/psi4/optking/interfrag.cc
  53. +21 −21 psi4/src/psi4/optking/interfrag.h
  54. +3 −3 psi4/src/psi4/optking/io.h
  55. +2 −2 psi4/src/psi4/optking/lindh_guess.cc
  56. +20 −20 psi4/src/psi4/optking/molecule.cc
  57. +58 −58 psi4/src/psi4/optking/molecule.h
  58. +1 −1 psi4/src/psi4/optking/molecule_backstep.cc
  59. +3 −3 psi4/src/psi4/optking/molecule_fragments.cc
  60. +1 −1 psi4/src/psi4/optking/molecule_irc_step.cc
  61. +1 −1 psi4/src/psi4/optking/molecule_linesearch_step.cc
  62. +1 −1 psi4/src/psi4/optking/molecule_nr_step.cc
  63. +1 −1 psi4/src/psi4/optking/molecule_prfo_step.cc
  64. +2 −2 psi4/src/psi4/optking/molecule_print.cc
  65. +1 −1 psi4/src/psi4/optking/molecule_rfo_step.cc
  66. +1 −1 psi4/src/psi4/optking/molecule_sd_step.cc
  67. +2 −2 psi4/src/psi4/optking/molecule_tests.cc
  68. +6 −6 psi4/src/psi4/optking/opt_data.cc
  69. +37 −37 psi4/src/psi4/optking/opt_data.h
  70. +3 −3 psi4/src/psi4/optking/opt_data_io.cc
  71. +5 −5 psi4/src/psi4/optking/opt_except.h
  72. +11 −11 psi4/src/psi4/optking/optking.cc
  73. +1 −1 psi4/src/psi4/optking/print.cc
  74. +1 −1 psi4/src/psi4/optking/print.h
  75. +2 −2 psi4/src/psi4/optking/set_params.cc
  76. +11 −11 psi4/src/psi4/optking/simple_base.h
  77. +3 −3 psi4/src/psi4/optking/stre.h
@@ -90,7 +90,7 @@ extern std::map<std::string, plugin_info> plugins;
namespace opt {
psi::PsiReturnType optking(psi::Options&);
void opt_clean(void);
void opt_clean();
}
// Forward declare /src/bin/ methods
namespace psi {
@@ -31,7 +31,7 @@
namespace psi {
namespace cctransort {
void a_spinad(void) {
void a_spinad() {
dpdbuf4 A;
global_dpd_->buf4_init(&A, PSIF_CC_AINTS, 0, 0, 0, 0, 0, 0, "A <ij|kl>");
@@ -31,7 +31,7 @@
namespace psi {
namespace cctransort {
void e_spinad(void) {
void e_spinad() {
dpdbuf4 E;
global_dpd_->buf4_init(&E, PSIF_CC_EINTS, 0, 11, 0, 11, 0, 0, "E <ai|jk>");
@@ -121,7 +121,7 @@ CIvect::CIvect(int incor, int maxvect, int nunits, int funit, struct ci_blks *CI
}
}
void CIvect::common_init(void) {
void CIvect::common_init() {
vectlen_ = 0;
num_blocks_ = 0;
icore_ = 1;
@@ -458,7 +458,7 @@ CIvect::~CIvect() {
** Returns:
** pointer to memory buffer (double *)
*/
double *CIvect::buf_malloc(void) {
double *CIvect::buf_malloc() {
double *tmp;
tmp = init_array(buffer_size_);
@@ -1597,7 +1597,7 @@ void CIvect::buf_lock(double *a) {
** Parameters: none
** Returns: none
*/
void CIvect::buf_unlock(void) {
void CIvect::buf_unlock() {
buf_locked_ = 0;
blocks_[0][0] = nullptr;
buffer_ = nullptr;
@@ -2058,7 +2058,7 @@ int CIvect::schmidt_add2(CIvect &c, int first_vec, int last_vec, int source_vec,
** Parameters: none
** Returns: none
**/
void CIvect::zero(void) { zero_arr(buffer_, (int)buffer_size_); }
void CIvect::zero() { zero_arr(buffer_, (int)buffer_size_); }
/*
** CIvect::sigma_renorm()
@@ -2689,7 +2689,7 @@ void CIvect::transp_block(int iblock, double **tmparr) {
** Return the maximum RAS subblock size as a long size_teger
**
*/
size_t CIvect::get_max_blk_size(void) {
size_t CIvect::get_max_blk_size() {
int i;
size_t blksize, maxblksize = 0;
@@ -2706,7 +2706,7 @@ size_t CIvect::get_max_blk_size(void) {
**
** Check the norm of a CI vector
*/
double CIvect::checknorm(void) {
double CIvect::checknorm() {
double tval, dotprod = 0.0;
for (int buf = 0; buf < buf_per_vect_; buf++) {
@@ -2853,7 +2853,7 @@ void CIvect::print_fptrs() {
** Initialize H0block stuff pertaining to buffers
**
*/
void CIvect::h0block_buf_init(void) {
void CIvect::h0block_buf_init() {
int i, cnt, irrep, buf, blk;
int *tmparr;
@@ -3167,7 +3167,7 @@ void CIvect::set_zero_block(int blocknum, int value) {
zero_blocks_[blocknum] = value;
}
void CIvect::set_zero_blocks_all(void) {
void CIvect::set_zero_blocks_all() {
int i;
for (i = 0; i < num_blocks_; i++) zero_blocks_[i] = 1;
@@ -3182,7 +3182,7 @@ void CIvect::copy_zero_blocks(CIvect &src) {
}
}
void CIvect::print_zero_blocks(void) {
void CIvect::print_zero_blocks() {
int i;
for (i = 0; i < num_blocks_; i++) {
@@ -3302,7 +3302,7 @@ double CIvect::dcalc_evangelisti(int rootnum, int num_vecs, double lambda, CIvec
** changed so that it is a little easier to deal with two logical CIvectors
** which point to the same physical CIvector (as happens if nodfile).
*/
void CIvect::write_new_first_buf(void) {
void CIvect::write_new_first_buf() {
int unit;
unit = first_unit_;
@@ -3317,7 +3317,7 @@ void CIvect::write_new_first_buf(void) {
** which point to the same physical CIvector (as happens if nodfile).
** Return -1 if "New First Buffer" is not stored in the file yet.
*/
int CIvect::read_new_first_buf(void) {
int CIvect::read_new_first_buf() {
int unit;
int nfb;
@@ -3340,7 +3340,7 @@ void CIvect::set_new_first_buf(int nfb) { new_first_buf_ = nfb; }
** Read the number of valid vectors in this object. That will be stored
** in the first unit.
*/
int CIvect::read_num_vecs(void) {
int CIvect::read_num_vecs() {
int unit;
int nv;
@@ -3369,7 +3369,7 @@ void CIvect::write_num_vecs(int nv) {
** done filling it up, it will be wiped out by the next write but written
** again at the new end of file next time we call this function.
*/
void CIvect::write_toc(void) {
void CIvect::write_toc() {
int i, unit;
for (i = 0; i < nunits_; i++) {
@@ -3380,7 +3380,7 @@ void CIvect::write_toc(void) {
/*
** Print libpsio debug info
*/
void CIvect::civect_psio_debug(void) {
void CIvect::civect_psio_debug() {
int i, unit;
/* psio_tocprint not available right now in PSI4; re-enable it if you
@@ -146,7 +146,7 @@ class CIvect {
void shift(double a, int tvec);
void copy(SharedCIVector src, int tvec, int ovec);
void divide(SharedCIVector denom, double min_val, int tvec, int ovec);
void zero(void);
void zero();
double vdot(SharedCIVector b, int tvec, int ovec);
double norm(int tvec);
@@ -163,8 +163,8 @@ class CIvect {
int read(int tvec, int ibuf);
int write(int tvec, int ibuf);
void buf_lock(double *a);
void buf_unlock(void);
double *buf_malloc(void);
void buf_unlock();
double *buf_malloc();
void set_nvect(int i);
// Questionable functions and/or should be private
@@ -215,34 +215,34 @@ class CIvect {
void civ_xeay(double a, CIvect &Y, int xvect, int yvect);
void civ_xpeay(double a, CIvect &Y, int xvect, int yvect);
void transp_block(int iblock, double **tmparr);
size_t get_max_blk_size(void);
double checknorm(void);
size_t get_max_blk_size();
double checknorm();
void copy(CIvect &Src, int targetvec, int srcvec);
void restart_gather(int ivec, int nvec, int nroot, double **alpha, double *buffer1, double *buffer2);
void gather(int ivec, int nvec, int nroot, double **alpha, CIvect &C);
void restart_reord_fp(int L);
void print_fptrs(void);
void print_fptrs();
double calc_ssq(double *buffer1, double *buffer2, struct stringwr **alplist, struct stringwr **betlist,
int vec_num);
void h0block_buf_init(void);
void h0block_buf_init();
void h0block_buf_ols(double *norm, double *ovrlap, double *c1norm, double E_est);
void h0block_buf_precon(double *norm, int root);
void h0block_gather_vec(int vecode);
void h0block_gather_multivec(double *vec);
int check_zero_block(int blocknum);
void set_zero_block(int blocknum, int value);
void set_zero_blocks_all(void);
void set_zero_blocks_all();
void copy_zero_blocks(CIvect &src);
void print_zero_blocks(void);
void print_zero_blocks();
void scale_sigma(CIvect &Hd, CIvect &C, struct stringwr **alplist, struct stringwr **betlist, int i, double *buf1,
double *buf2);
int read_new_first_buf(void);
void write_new_first_buf(void);
int read_new_first_buf();
void write_new_first_buf();
void set_new_first_buf(int nfb);
int read_num_vecs(void);
int read_num_vecs();
void write_num_vecs(int nv);
void write_toc(void);
void civect_psio_debug(void);
void write_toc();
void civect_psio_debug();
void pt_correction(struct stringwr **alplist, struct stringwr **betlist);
double compute_follow_overlap(int troot, int ncoef, double *coef, int *Iac, int *Iaridx, int *Ibc, int *Ibridx);
@@ -442,7 +442,7 @@ SharedMatrix CIWavefunction::get_tpdm(const std::string& spin, bool symmetrize)
/*
** cleanup(): Free any allocated memory that wasn't already freed elsewhere
*/
void CIWavefunction::cleanup_ci(void) {
void CIWavefunction::cleanup_ci() {
// Make sure we dont double clean
if (!cleaned_up_ci_) {
// Free Bendazzoli OV arrays
@@ -475,7 +475,7 @@ void CIWavefunction::cleanup_ci(void) {
cleaned_up_ci_ = true;
}
}
void CIWavefunction::cleanup_dpd(void) {
void CIWavefunction::cleanup_dpd() {
if (ints_init_) {
ints_.reset();
ints_init_ = false;
@@ -107,7 +107,7 @@ class CIWavefunction : public Wavefunction {
/**!
* Transform the one and two electron integrals for a CI computation.
*/
void transform_ci_integrals(void);
void transform_ci_integrals();
/**!
* Transform the one and two electron integrals for a MCSCF computation.
@@ -378,16 +378,16 @@ class CIWavefunction : public Wavefunction {
/// => H0block functions <= //
void H0block_init(size_t size);
void H0block_free(void);
void H0block_print(void);
void H0block_free();
void H0block_print();
int H0block_calc(double E);
void H0block_gather(double **mat, int al, int bl, int cscode, int mscode, int phase);
void H0block_xy(double *x, double *y, double E);
void H0block_setup(int num_blocks, int *Ia_code, int *Ib_code);
void H0block_pairup(int guess);
void H0block_spin_cpl_chk(void);
void H0block_filter_setup(void);
void H0block_fill(void);
void H0block_spin_cpl_chk();
void H0block_filter_setup();
void H0block_fill();
void H0block_coupling_calc(double E);
std::string print_config(int nbf, int num_alp_el, int num_bet_el, struct stringwr *stralp, struct stringwr *strbet,
int num_drc_orbs);
@@ -422,7 +422,7 @@ class CIWavefunction : public Wavefunction {
/// => Sigma Calculations <= //
struct sigma_data *SigmaData_;
void sigma_init(CIvect &C, CIvect &S);
void sigma_free(void);
void sigma_free();
void sigma(CIvect &C, CIvect &S, double *oei, double *tei, int ivec);
void sigma_a(struct stringwr **alplist, struct stringwr **betlist, CIvect &C, CIvect &S, double *oei, double *tei,
@@ -58,7 +58,7 @@ namespace detci {
** computation
**
*/
void CIWavefunction::compute_cc(void) { outfile->Printf("compute_cc: Not yet available\n"); }
void CIWavefunction::compute_cc() { outfile->Printf("compute_cc: Not yet available\n"); }
} // namespace detci
} // namespace psi
@@ -106,7 +106,7 @@ void CIWavefunction::H0block_init(size_t size) {
}
}
void CIWavefunction::H0block_free(void) {
void CIWavefunction::H0block_free() {
if (H0block_->osize) {
free_matrix(H0block_->H0b, H0block_->osize);
if (Parameters_->precon == PRECON_GEN_DAVIDSON) {
@@ -145,7 +145,7 @@ void CIWavefunction::H0block_free(void) {
}
}
void CIWavefunction::H0block_print(void) {
void CIWavefunction::H0block_print() {
int i;
outfile->Printf("\nMembers of H0 block:\n\n");
@@ -484,7 +484,7 @@ void CIWavefunction::H0block_pairup(int guess) {
** Substantial modifications by David Sherrill, October 1998
**
*/
void CIWavefunction::H0block_spin_cpl_chk(void) {
void CIWavefunction::H0block_spin_cpl_chk() {
int i, newsize;
double zero = 1E-13;
double diff = 0.0, spin_cpl_vals2;
@@ -592,7 +592,7 @@ void CIWavefunction::H0block_spin_cpl_chk(void) {
**
** C. David Sherrill, July 2003
*/
void CIWavefunction::H0block_filter_setup(void) {
void CIWavefunction::H0block_filter_setup() {
int Iac, Ibc, Iaridx, Ibridx;
int Jac, Jbc, Jaridx, Jbridx;
int i, found1, found2, replace;
@@ -77,7 +77,7 @@ void og_print(struct olsen_graph *Graph);
** graph for every irrep * (num el in RAS I) * (num el in RAS III)
**
*/
void CIWavefunction::form_strings(void) {
void CIWavefunction::form_strings() {
int i, nlists, nirreps, ncodes;
int irrep, code, listnum;
int *occs;
@@ -57,7 +57,7 @@ namespace detci {
#define INDEX(i, j) ((i > j) ? (ioff[(i)] + (j)) : (ioff[(j)] + (i)))
#define TOL 1E-14
void CIWavefunction::form_opdm(void) {
void CIWavefunction::form_opdm() {
// if we're trying to follow a root, figure out which one here
// CDS help: Why is this here and where can we move it?
if (Parameters_->follow_vec_num > 0) {
@@ -677,7 +677,7 @@ void CIWavefunction::get_parameters(Options &options) {
** print_parameters(): Function prints the program's running parameters
** found in the Parameters structure.
*/
void CIWavefunction::print_parameters(void) {
void CIWavefunction::print_parameters() {
int i;
outfile->Printf("\n");
@@ -896,7 +896,7 @@ void CIWavefunction::print_parameters(void) {
** (i.e. fermi level, etc).
**
*/
void CIWavefunction::set_ras_parameters(void) {
void CIWavefunction::set_ras_parameters() {
int i, j, cnt;
int errcod;
int tot_expl_el, nras2alp, nras2bet, betsocc;
@@ -1291,7 +1291,7 @@ std::string _concat_dim(std::string label, size_t spacer1, Dimension dim, size_t
** (i.e. fermi level, etc).
**
*/
void CIWavefunction::print_ras_parameters(void) {
void CIWavefunction::print_ras_parameters() {
outfile->Printf(" ==> CI Orbital and Space information <==\n\n");
// Print out any specific space info
@@ -86,8 +86,8 @@ class SlaterDeterminant {
if (Occs_[1] != nullptr) free(Occs_[1]);
}
void set(size_t nalp, unsigned char* alpoccs, size_t nbet, unsigned char* betoccs);
void print(void);
void print_config(void);
void print();
void print_config();
SlaterDeterminant& operator=(const SlaterDeterminant& s);
friend int operator==(SlaterDeterminant& s1, SlaterDeterminant& s2);
friend double matrix_element(SlaterDeterminant* I, SlaterDeterminant* J);
@@ -52,7 +52,7 @@ namespace detci {
#define INDEX(i, j) ((i > j) ? (ioff[(i)] + (j)) : (ioff[(j)] + (i)))
// DGAS this is still awkward, I think the TPDM code can be less general than the OPDM one for now.
void CIWavefunction::form_tpdm(void) {
void CIWavefunction::form_tpdm() {
SharedCIVector Ivec = new_civector(Parameters_->num_roots, Parameters_->d_filenum);
Ivec->init_io_files(true);
SharedCIVector Jvec = new_civector(Parameters_->num_roots, Parameters_->d_filenum);
Oops, something went wrong.

0 comments on commit 5b4f6ea

Please sign in to comment.