Unverified Commit 40e7ea83 authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #1084 from rbberger/cmake-and-warning-suppression-bugs 

Fixes various compilation issues
parents ed61ed5b a404da02

cmake/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -678,7 +678,9 @@ if(PKG_USER-OMP) 
    set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp

                         ${USER-OMP_SOURCES_DIR}/thr_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/fix_nh_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp)

                         ${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/domain_omp.cpp)

    add_definitions(-DLMP_USER_OMP)

    set_property(GLOBAL PROPERTY "OMP_SOURCES" "${USER-OMP_SOURCES}")



    # detects styles which have USER-OMP version

src/USER-REAXC/reaxc_allocate.cpp

+10 −6
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
   process's box throughout the whole simulation. therefore

   we need to make upper bound estimates for various data structures */

int PreAllocate_Space( reax_system *system, control_params * /*control*/,

                       storage */*workspace*/, MPI_Comm comm )

                       storage * workspace, MPI_Comm comm )

{

  int mincap = system->mincap;

  double safezone = system->safezone;
@@ -60,6 +60,8 @@ int PreAllocate_Space( reax_system *system, control_params */*control*/, 
  workspace->forceReduction = NULL;

  workspace->valence_angle_atom_myoffset = NULL;

  workspace->my_ext_pressReduction = NULL;

#else

  LMP_UNUSED_PARAM(workspace);

#endif



  return SUCCESS;
@@ -204,7 +206,7 @@ void DeAllocate_Workspace( control_params */*control*/, storage *workspace ) 
}





int Allocate_Workspace( reax_system */*system*/, control_params */*control*/,

int Allocate_Workspace( reax_system * /*system*/, control_params * control,

                        storage *workspace, int local_cap, int total_cap,

                        MPI_Comm comm, char * /*msg*/ )

{
@@ -307,6 +309,8 @@ int Allocate_Workspace( reax_system */*system*/, control_params */*control*/, 


  workspace->valence_angle_atom_myoffset = (int *) scalloc(sizeof(int), total_cap, "valence_angle_atom_myoffset", comm);

  workspace->my_ext_pressReduction = (rvec *) calloc(sizeof(rvec), control->nthreads);

#else

  LMP_UNUSED_PARAM(control);

#endif



  return SUCCESS;

src/accelerator_omp.h

+2 −86
Original line number Diff line number Diff line
@@ -17,47 +17,6 @@ 


// true interface to USER-OMP



// this part is used inside the neighbor.h header file to

// add functions to the Neighbor class definition



#ifdef LMP_INSIDE_NEIGHBOR_H



  void half_nsq_no_newton_omp(class NeighList *);

  void half_nsq_no_newton_ghost_omp(class NeighList *);

  void half_nsq_newton_omp(class NeighList *);



  void half_bin_no_newton_omp(class NeighList *);

  void half_bin_no_newton_ghost_omp(class NeighList *);

  void half_bin_newton_omp(class NeighList *);

  void half_bin_newton_tri_omp(class NeighList *);



  void half_multi_no_newton_omp(class NeighList *);

  void half_multi_newton_omp(class NeighList *);

  void half_multi_newton_tri_omp(class NeighList *);



  void full_nsq_omp(class NeighList *);

  void full_nsq_ghost_omp(class NeighList *);

  void full_bin_omp(class NeighList *);

  void full_bin_ghost_omp(class NeighList *);

  void full_multi_omp(class NeighList *);



  void half_from_full_no_newton_omp(class NeighList *);

  void half_from_full_newton_omp(class NeighList *);



  void granular_nsq_no_newton_omp(class NeighList *);

  void granular_nsq_newton_omp(class NeighList *);

  void granular_bin_no_newton_omp(class NeighList *);

  void granular_bin_newton_omp(class NeighList *);

  void granular_bin_newton_tri_omp(class NeighList *);



  void respa_nsq_no_newton_omp(class NeighList *);

  void respa_nsq_newton_omp(class NeighList *);

  void respa_bin_no_newton_omp(class NeighList *);

  void respa_bin_newton_omp(class NeighList *);

  void respa_bin_newton_tri_omp(class NeighList *);



#else /* !LMP_INSIDE_NEIGHBOR_H */



// provide a DomainOMP class with some overrides for Domain

#include "domain.h"
@@ -68,8 +27,8 @@ namespace LAMMPS_NS { 


class DomainOMP : public Domain {

 public:

  DomainOMP(class LAMMPS *lmp) : Domain(lmp) {};

  virtual ~DomainOMP() {};

  DomainOMP(class LAMMPS *lmp) : Domain(lmp) {}

  virtual ~DomainOMP() {}



  // multi-threaded versions

  virtual void pbc();
@@ -81,48 +40,5 @@ class DomainOMP : public Domain { 
}



#endif /* LMP_DOMAIN_OMP_H */

#endif /* !LMP_INSIDE_NEIGHBOR_H */



#else /* !LMP_USER_OMP */



// dummy interface to USER-OMP

// needed for compiling when USER-OMP is not installed



#ifdef LMP_INSIDE_NEIGHBOR_H



  void half_nsq_no_newton_omp(class NeighList *) {}

  void half_nsq_no_newton_ghost_omp(class NeighList *) {}

  void half_nsq_newton_omp(class NeighList *) {}



  void half_bin_no_newton_omp(class NeighList *) {}

  void half_bin_no_newton_ghost_omp(class NeighList *) {}

  void half_bin_newton_omp(class NeighList *) {}

  void half_bin_newton_tri_omp(class NeighList *) {}



  void half_multi_no_newton_omp(class NeighList *) {}

  void half_multi_newton_omp(class NeighList *) {}

  void half_multi_newton_tri_omp(class NeighList *) {}



  void full_nsq_omp(class NeighList *) {}

  void full_nsq_ghost_omp(class NeighList *) {}

  void full_bin_omp(class NeighList *) {}

  void full_bin_ghost_omp(class NeighList *) {}

  void full_multi_omp(class NeighList *) {}



  void half_from_full_no_newton_omp(class NeighList *) {}

  void half_from_full_newton_omp(class NeighList *) {}



  void granular_nsq_no_newton_omp(class NeighList *) {}

  void granular_nsq_newton_omp(class NeighList *) {}

  void granular_bin_no_newton_omp(class NeighList *) {}

  void granular_bin_newton_omp(class NeighList *) {}

  void granular_bin_newton_tri_omp(class NeighList *) {}



  void respa_nsq_no_newton_omp(class NeighList *) {}

  void respa_nsq_newton_omp(class NeighList *) {}

  void respa_bin_no_newton_omp(class NeighList *) {}

  void respa_bin_newton_omp(class NeighList *) {}

  void respa_bin_newton_tri_omp(class NeighList *) {}

#endif



#endif /* !LMP_USER_OMP */

src/image.cpp

+4 −2
Original line number Diff line number Diff line
@@ -992,7 +992,6 @@ void Image::compute_SSAO() 


void Image::write_JPG(FILE *fp)

{

  (void)(fp); // suppress unused parameter warning

#ifdef LAMMPS_JPEG

  struct jpeg_compress_struct cinfo;

  struct jpeg_error_mgr jerr;
@@ -1018,6 +1017,8 @@ void Image::write_JPG(FILE *fp) 


  jpeg_finish_compress(&cinfo);

  jpeg_destroy_compress(&cinfo);

#else

  LMP_UNUSED_PARAM(fp);

#endif

}
@@ -1025,7 +1026,6 @@ void Image::write_JPG(FILE *fp) 


void Image::write_PNG(FILE *fp)

{

  (void)(fp); // suppress unused parameter warning

#ifdef LAMMPS_PNG

  png_structp png_ptr;

  png_infop info_ptr;
@@ -1076,6 +1076,8 @@ void Image::write_PNG(FILE *fp) 


  png_destroy_write_struct(&png_ptr, &info_ptr);

  delete[] row_pointers;

#else

  LMP_UNUSED_PARAM(fp);

#endif

}

src/lmptype.h

+4 −0
Original line number Diff line number Diff line
@@ -213,4 +213,8 @@ typedef int bigint; 
#include "lmpwindows.h"

#endif



// suppress unused parameter warning



#define LMP_UNUSED_PARAM(x) (void)(x)



#endif

src/USER-REAXC/fix_reaxc.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/fix_reaxc_species.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_valence_angles.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MANIFOLD/manifold_plane.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MEAMC/pair_meamc.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMD/fix_smd_move_triangulated_surface.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMD/pair_smd_ulsph.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/rcb.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/SRD/fix_srd.cpp

+4 −4

File changed.

Contains only whitespace changes.

src/USER-DPD/fix_rx.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_bonds.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_traj.cpp

+3 −3

File changed.

Contains only whitespace changes.

src/improper_zero.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/MOLECULE/fix_cmap.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-DPD/pair_multi_lucy.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/angle_charmm_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/intel_buffers.h

+2 −2

File changed.

Contains only whitespace changes.

src/USER-INTEL/pair_eam_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/pppm_disp_intel.cpp

+13 −13

File changed.

Contains only whitespace changes.

src/USER-REAXC/fix_qeq_reax.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MISC/fix_orient_bcc.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-DPD/fix_shardlow.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MANIFOLD/manifold_thylakoid.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/COLLOID/pair_lubricate.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_adp.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_comb.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_nb3b_harmonic.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/dihedral_fourier_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/intel_buffers.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/GRANULAR/pair_gran_hooke_history.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/PERI/pair_peri_lps.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/fix_bond_react.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_forces.cpp

+6 −6

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_lookup.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMD/fix_smd_tlsph_reference_configuration.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SPH/pair_sph_rhosum.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/LATTE/fix_latte.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_comb3.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_eam_cd.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_io_tools.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MC/fix_bond_create.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/PERI/pair_peri_ves.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/improper_cvff_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/pair_meam_spline.cpp

+3 −3

File changed.

Contains only whitespace changes.

src/USER-REAXC/fix_reaxc_bonds.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_eam.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_hydrogen_bonds.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMD/pair_smd_tlsph.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MC/fix_atom_swap.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MC/fix_bond_break.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MISC/xdr_compat.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/bond_harmonic_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/dihedral_opls_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/pair_meam_sw_spline.cpp

+3 −3

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_bond_orders.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_torsion_angles.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-DPD/fix_eos_table_rx.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/improper_harmonic_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/fix_pimd.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_multi_body.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMD/atom_vec_smd.cpp

+8 −8

File changed.

Contains only whitespace changes.

src/QEQ/fix_qeq_dynamic.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/fix_qeq_comb.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/PERI/fix_peri_neigh.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-DPD/pair_multi_lucy_rx.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/pair_ilp_graphene_hbn.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_init_md.cpp

+6 −6

File changed.

Contains only whitespace changes.

src/MEAM/pair_meam.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MISC/fix_orient_fcc.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/QEQ/fix_qeq.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/COLLOID/pair_lubricateU.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/angle_harmonic_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/bond_fene_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/pair_kolmogorov_crespi_full.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-REAXC/reaxc_nonbonded.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/library.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/RIGID/fix_rigid_small.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/RIGID/fix_shake.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-INTEL/dihedral_harmonic_intel.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MISC/fix_filter_corotate.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-SMTBQ/pair_smtbq.cpp

+2 −2

File changed.

Contains only whitespace changes.

src/fix_property_atom.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/BODY/fix_wall_body_polyhedron.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/MANYBODY/pair_eim.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/PERI/pair_peri_eps.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/QEQ/fix_qeq_fire.cpp

+1 −1

File changed.

Contains only whitespace changes.

src/USER-MESO/pair_mdpd_rhosum.cpp

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE