remove -DLAMMPS_EXCEPTIONS and always enable the corresponding code paths

This commit is contained in:
Axel Kohlmeyer
2023-04-15 17:49:08 -04:00
parent e506dd738b
commit 0cd5ae5f2e
17 changed files with 58 additions and 208 deletions

View File

@ -13,13 +13,10 @@
#include "lammps.h"
#include "exceptions.h"
#include "input.h"
#include "library.h"
#if defined(LAMMPS_EXCEPTIONS)
#include "exceptions.h"
#endif
#include <cstdlib>
#include <mpi.h>
@ -75,7 +72,6 @@ int main(int argc, char **argv)
feenableexcept(FE_OVERFLOW);
#endif
#ifdef LAMMPS_EXCEPTIONS
try {
auto lammps = new LAMMPS(argc, argv, lammps_comm);
lammps->input->file();
@ -99,18 +95,6 @@ int main(int argc, char **argv)
MPI_Abort(MPI_COMM_WORLD, 1);
exit(1);
}
#else
try {
auto lammps = new LAMMPS(argc, argv, lammps_comm);
lammps->input->file();
delete lammps;
} catch (fmt::format_error &fe) {
fprintf(stderr, "fmt::format_error: %s\n", fe.what());
finalize();
MPI_Abort(MPI_COMM_WORLD, 1);
exit(1);
}
#endif
finalize();
MPI_Barrier(lammps_comm);
MPI_Finalize();