Skip to content

Commit ad19076

Browse files
authored
Merge pull request #2728 from jwpeterson/disable_exodus_fix
Fix: testPeriodicLagrange2() unit test requires Exodus
2 parents e9c1591 + eb36756 commit ad19076

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

src/mesh/nemesis_io.C

+14
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,9 @@ void Nemesis_IO::read (const std::string & base_filename)
11751175

11761176
// We've been setting unique_ids by hand; let's make sure that later
11771177
// ones are consistent with them.
1178+
#ifdef LIBMESH_ENABLE_UNIQUE_ID
11781179
mesh.set_next_unique_id(mesh.parallel_max_unique_id()+1);
1180+
#endif
11791181
}
11801182

11811183
#else
@@ -1806,6 +1808,18 @@ void Nemesis_IO::write_information_records ( const std::vector<std::string> & )
18061808
libmesh_error_msg("ERROR, Nemesis API is not defined.");
18071809
}
18081810

1811+
const std::vector<std::string> & Nemesis_IO::get_nodal_var_names()
1812+
{
1813+
libmesh_error_msg("ERROR, Nemesis API is not defined.");
1814+
1815+
// Prevent potential compiler warnings about missing return statement
1816+
return _output_variables;
1817+
}
1818+
1819+
void Nemesis_IO::copy_nodal_solution(System &, std::string, std::string, unsigned int)
1820+
{
1821+
libmesh_error_msg("ERROR, Nemesis API is not defined.");
1822+
}
18091823

18101824
#endif // #if defined(LIBMESH_HAVE_EXODUS_API) && defined(LIBMESH_HAVE_NEMESIS_API)
18111825

tests/mesh/write_vec_and_scalar.C

+2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ public:
2626
CPPUNIT_TEST_SUITE(WriteVecAndScalar);
2727

2828
#if LIBMESH_DIM > 1
29+
#if defined(LIBMESH_HAVE_EXODUS_API) && defined(LIBMESH_HAVE_NEMESIS_API)
2930
CPPUNIT_TEST(testWriteExodusDistributed);
3031
CPPUNIT_TEST(testWriteExodusReplicated);
3132
CPPUNIT_TEST(testWriteNemesisDistributed);
3233
CPPUNIT_TEST(testWriteNemesisReplicated);
34+
#endif
3335
#endif
3436

3537
CPPUNIT_TEST_SUITE_END();

tests/systems/periodic_bc_test.C

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public:
163163
CPPUNIT_TEST_SUITE( PeriodicBCTest );
164164

165165
#if LIBMESH_DIM > 1
166-
#ifdef LIBMESH_HAVE_SOLVER
166+
#if defined(LIBMESH_HAVE_SOLVER) && defined(LIBMESH_HAVE_EXODUS_API)
167167
CPPUNIT_TEST( testPeriodicLagrange2 );
168168
#endif
169169
#endif // LIBMESH_DIM > 1

0 commit comments

Comments
 (0)