48aa45f7f0
Resolved Conflicts (i hope): src/REPLICA/neb.cpp src/REPLICA/prd.cpp src/REPLICA/tad.cpp src/REPLICA/verlet_split.cpp src/USER-CUDA/atom_vec_angle_cuda.h src/USER-CUDA/atom_vec_atomic_cuda.h src/USER-CUDA/atom_vec_charge_cuda.h src/USER-CUDA/atom_vec_full_cuda.h src/USER-CUDA/compute_pe_cuda.h src/USER-CUDA/compute_pressure_cuda.h src/USER-CUDA/compute_temp_cuda.h src/USER-CUDA/compute_temp_partial_cuda.h src/USER-CUDA/cuda.cpp src/USER-CUDA/cuda.h src/USER-CUDA/cuda_data.h src/USER-CUDA/cuda_neigh_list.h src/USER-CUDA/fft3d_cuda.h src/USER-CUDA/fft3d_wrap_cuda.h src/USER-CUDA/fix_addforce_cuda.h src/USER-CUDA/fix_aveforce_cuda.h src/USER-CUDA/fix_enforce2d_cuda.h src/USER-CUDA/fix_freeze_cuda.h src/USER-CUDA/fix_gravity_cuda.h src/USER-CUDA/fix_nve_cuda.h src/USER-CUDA/fix_set_force_cuda.h src/USER-CUDA/fix_temp_berendsen_cuda.h src/USER-CUDA/fix_temp_rescale_cuda.h src/USER-CUDA/fix_temp_rescale_limit_cuda.h src/USER-CUDA/fix_viscous_cuda.h src/USER-CUDA/pair_born_coul_long_cuda.h src/USER-CUDA/pair_buck_coul_cut_cuda.h src/USER-CUDA/pair_buck_coul_long_cuda.h src/USER-CUDA/pair_buck_cuda.h src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h src/USER-CUDA/pair_cg_cmm_cuda.cpp src/USER-CUDA/pair_cg_cmm_cuda.h src/USER-CUDA/pair_eam_cuda.h src/USER-CUDA/pair_gran_hooke_cuda.h src/USER-CUDA/pair_lj96_cut_cuda.h src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.h src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.h src/USER-CUDA/pair_lj_charmm_coul_long_cuda.h src/USER-CUDA/pair_lj_class2_coul_cut_cuda.h src/USER-CUDA/pair_lj_class2_coul_long_cuda.h src/USER-CUDA/pair_lj_class2_cuda.h src/USER-CUDA/pair_lj_cut_coul_cut_cuda.h src/USER-CUDA/pair_lj_cut_coul_debye_cuda.h src/USER-CUDA/pair_lj_cut_coul_long_cuda.h src/USER-CUDA/pair_lj_cut_cuda.h src/USER-CUDA/pair_lj_cut_experimental_cuda.h src/USER-CUDA/pair_lj_expand_cuda.h src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.h src/USER-CUDA/pair_lj_gromacs_cuda.h src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h src/USER-CUDA/pair_lj_sdk_cuda.h src/USER-CUDA/pair_lj_smooth_cuda.h src/USER-CUDA/pair_morse_cuda.h src/USER-CUDA/pair_sw_cuda.h src/USER-CUDA/pair_tersoff_cuda.h src/USER-CUDA/pair_tersoff_zbl_cuda.h src/USER-CUDA/pppm_cuda.h src/USER-CUDA/verlet_cuda.cpp src/USER-CUDA/verlet_cuda.h src/comm.cpp src/finish.cpp src/fix_rigid_nvt.h src/respa.cpp src/run.cpp
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
/* ----------------------------------------------------------------------
|
|
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
|
|
http://lammps.sandia.gov, Sandia National Laboratories
|
|
Steve Plimpton, sjplimp@sandia.gov
|
|
|
|
Copyright (2003) Sandia Corporation. Under the terms of Contract
|
|
DE-AC04-94AL85000 with Sandia Corporation, the U.S. Government retains
|
|
certain rights in this software. This software is distributed under
|
|
the GNU General Public License.
|
|
|
|
See the README file in the top-level LAMMPS directory.
|
|
------------------------------------------------------------------------- */
|
|
|
|
#include "stdlib.h"
|
|
#include "minimize.h"
|
|
#include "domain.h"
|
|
#include "update.h"
|
|
#include "min.h"
|
|
#include "finish.h"
|
|
#include "timer.h"
|
|
#include "error.h"
|
|
|
|
using namespace LAMMPS_NS;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
Minimize::Minimize(LAMMPS *lmp) : Pointers(lmp) {}
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
void Minimize::command(int narg, char **arg)
|
|
{
|
|
if (narg != 4) error->all(FLERR,"Illegal minimize command");
|
|
|
|
if (domain->box_exist == 0)
|
|
error->all(FLERR,"Minimize command before simulation box is defined");
|
|
|
|
update->etol = atof(arg[0]);
|
|
update->ftol = atof(arg[1]);
|
|
update->nsteps = atoi(arg[2]);
|
|
update->max_eval = atoi(arg[3]);
|
|
|
|
if (update->etol < 0.0 || update->ftol < 0.0)
|
|
error->all(FLERR,"Illegal minimize command");
|
|
|
|
update->whichflag = 2;
|
|
update->beginstep = update->firststep = update->ntimestep;
|
|
update->endstep = update->laststep = update->firststep + update->nsteps;
|
|
if (update->laststep < 0 || update->laststep > MAXBIGINT)
|
|
error->all(FLERR,"Too many iterations");
|
|
|
|
lmp->init();
|
|
update->minimize->setup();
|
|
|
|
timer->init();
|
|
timer->barrier_start(Timer::LOOP);
|
|
update->minimize->run(update->nsteps);
|
|
timer->barrier_stop(Timer::LOOP);
|
|
|
|
update->minimize->cleanup();
|
|
|
|
Finish finish(lmp);
|
|
finish.end(1);
|
|
|
|
update->whichflag = 0;
|
|
update->firststep = update->laststep = 0;
|
|
update->beginstep = update->endstep = 0;
|
|
}
|