ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into varargs-log-error-functions

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-04-26 13:27:58 -04:00
parent e9e0bb71b6 31d244dd80
commit 6b04ebd617
1845 changed files with 3369 additions and 3357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/CMakeLists.txt
View File

@ -7,7 +7,7 @@ add_test(NAME RunLammps
COMMAND $<TARGET_FILE:lmp> -log none -echo none -in in.empty
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set_tests_properties(RunLammps PROPERTIES
ENVIRONMENT "TSAN_OPTIONS='ignore_noninstrumented_modules=1'"
ENVIRONMENT "TSAN_OPTIONS=ignore_noninstrumented_modules=1"
PASS_REGULAR_EXPRESSION "^LAMMPS \\([0-9]+ [A-Za-z]+ 2[0-9][0-9][0-9]\\)")
if(BUILD_MPI)

2
unittest/force-styles/tests/atomic-pair-beck.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:59 2021
epsilon: 5e-13
epsilon: 2e-12
prerequisites: ! |
pair beck
pre_commands: ! ""

2
unittest/force-styles/tests/atomic-pair-table_bitmap.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:09 2021
epsilon: 5e-13
epsilon: 2e-12
prerequisites: ! |
pair table
pre_commands: ! ""

2
unittest/force-styles/tests/atomic-pair-table_linear.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:10 2021
epsilon: 5e-13
epsilon: 2e-12
prerequisites: ! |
pair table
pre_commands: ! ""

2
unittest/force-styles/tests/atomic-pair-table_spline.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:10 2021
epsilon: 5e-13
epsilon: 2e-12
prerequisites: ! |
pair table
pre_commands: ! ""

2
unittest/force-styles/tests/manybody-pair-tersoff.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:20 2021
epsilon: 5e-13
epsilon: 1e-11
prerequisites: ! |
pair tersoff
pre_commands: ! |

2
unittest/force-styles/tests/manybody-pair-tersoff_mod_c_shift.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:09:20 2021
epsilon: 1e-12
epsilon: 2e-11
skip_tests: intel
prerequisites: ! |
pair tersoff/mod/c

2
unittest/force-styles/tests/mol-pair-hybrid-overlay.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 8 Apr 2021
date_generated: Mon Apr 19 08:49:07 2021
epsilon: 7.5e-14
epsilon: 1.5e-13
prerequisites: ! |
atom full
pair lj/cut

2
unittest/force-styles/tests/mol-pair-lj_cut_coul_cut.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:48 2021
epsilon: 1e-13
epsilon: 2e-13
prerequisites: ! |
atom full
pair lj/cut/coul/cut

2
unittest/force-styles/tests/mol-pair-lj_expand.yaml
View File

@ -1,7 +1,7 @@
---
lammps_version: 10 Feb 2021
date_generated: Fri Feb 26 23:08:50 2021
epsilon: 1e-13
epsilon: 5e-13
prerequisites: ! |
atom full
pair lj/expand

32
unittest/formats/test_file_operations.cpp
View File

@ -29,6 +29,7 @@ using namespace LAMMPS_NS;
using testing::MatchesRegex;
using testing::StrEq;
using utils::read_lines_from_file;
using utils::sfgets;
using utils::sfread;
using utils::split_words;
@ -125,6 +126,37 @@ TEST_F(FileOperationsTest, safe_fread)
fclose(fp);
}
TEST_F(FileOperationsTest, read_lines_from_file)
{
char *buf = new char[MAX_BUF_SIZE];
FILE *fp = nullptr;
MPI_Comm world = MPI_COMM_WORLD;
int me, rv;
memset(buf, 0, MAX_BUF_SIZE);
rv = utils::read_lines_from_file(nullptr, 1, MAX_BUF_SIZE, buf, me, world);
ASSERT_EQ(rv, 1);
MPI_Comm_rank(world, &me);
if (me == 0) {
fp = fopen("safe_file_read_test.txt", "r");
ASSERT_NE(fp, nullptr);
} else
ASSERT_EQ(fp, nullptr);
rv = utils::read_lines_from_file(fp, 2, MAX_BUF_SIZE / 2, buf, me, world);
ASSERT_EQ(rv, 0);
ASSERT_THAT(buf, StrEq("one line\ntwo_lines\n"));
rv = utils::read_lines_from_file(fp, 2, MAX_BUF_SIZE / 2, buf, me, world);
ASSERT_EQ(rv, 0);
ASSERT_THAT(buf, StrEq("\nno newline\n"));
rv = utils::read_lines_from_file(fp, 2, MAX_BUF_SIZE / 2, buf, me, world);
ASSERT_EQ(rv, 1);
delete[] buf;
}
TEST_F(FileOperationsTest, logmesg)
{
char buf[64];