From 63d89155623f5752347ac1271b58b897bad3fe28 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 12 Feb 2025 21:47:02 -0500 Subject: [PATCH] make use of SafeFilePtr --- src/create_atoms.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp index 1a8318e315..dc00e2e1d1 100644 --- a/src/create_atoms.cpp +++ b/src/create_atoms.cpp @@ -34,6 +34,7 @@ #include "random_mars.h" #include "random_park.h" #include "region.h" +#include "safe_pointers.h" #include "special.h" #include "text_file_reader.h" #include "variable.h" @@ -1082,8 +1083,9 @@ void CreateAtoms::add_mesh(const char *filename) molid = maxmol + 1; } - FILE *fp = fopen(filename, "rb"); - if (fp == nullptr) error->one(FLERR, "Cannot open file {}: {}", filename, utils::getsyserror()); + SafeFilePtr fp = fopen(filename, "rb"); + if (fp == nullptr) + error->one(FLERR, "Cannot open STL mesh file {}: {}", filename, utils::getsyserror()); // first try reading the file in ASCII format @@ -1184,7 +1186,7 @@ void CreateAtoms::add_mesh(const char *filename) } } } else { - error->all(FLERR, "Error reading triangles from file {}: {}", filename, e.what()); + error->all(FLERR, "Error reading triangles from STL mesh file {}: {}", filename, e.what()); } } @@ -1195,7 +1197,6 @@ void CreateAtoms::add_mesh(const char *filename) utils::logmesg(lmp, " read {} triangles with {:.2f} atoms per triangle added in {} mode\n", ntriangle, ratio, mesh_name[mesh_style]); } - if (fp) fclose(fp); } /* ----------------------------------------------------------------------