[cig-commits] r7354 - in short/3D/PyLith/trunk: . doc/userguide
libsrc libsrc/meshio libsrc/utils modulesrc/bc
modulesrc/faults modulesrc/feassemble modulesrc/materials
modulesrc/meshio modulesrc/solver modulesrc/topology
unittests/libtests/bc/data unittests/libtests/meshio
unittests/libtests/topology
brad at geodynamics.org
brad at geodynamics.org
Thu Jun 21 14:15:24 PDT 2007
Author: brad
Date: 2007-06-21 14:15:24 -0700 (Thu, 21 Jun 2007)
New Revision: 7354
Removed:
short/3D/PyLith/trunk/libsrc/utils/LineParser.cc
short/3D/PyLith/trunk/libsrc/utils/LineParser.hh
Modified:
short/3D/PyLith/trunk/TODO
short/3D/PyLith/trunk/doc/userguide/TODO
short/3D/PyLith/trunk/libsrc/Makefile.am
short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc
short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh
short/3D/PyLith/trunk/libsrc/utils/Makefile.am
short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
short/3D/PyLith/trunk/modulesrc/solver/Makefile.am
short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
short/3D/PyLith/trunk/unittests/libtests/bc/data/line2.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
short/3D/PyLith/trunk/unittests/libtests/topology/Makefile.am
Log:
Updated to better LineParser that is now in spatialdata. Fixed bugs in reading groups for MeshIOAscii with LineParser (allow multiple values per line).
Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/TODO 2007-06-21 21:15:24 UTC (rev 7354)
@@ -4,7 +4,11 @@
1. Debug mesh distribution. [MATT]
- 3. Need PETSc settings for absolute convergence (i.e., don't want to
+ 2. Add unit test for reading MeshIOAscii file with comments.
+
+ 3. Add unit test for reading SimpleIOAscii file with comments.
+
+ 4. Need PETSc settings for absolute convergence (i.e., don't want to
max out iterations when there is no increment in displacement).
----------------------------------------------------------------------
@@ -38,8 +42,8 @@
add check in fields manager when returning solution (solution name
shouldn't be empty)
-add ability to have comments in spatial data files (if easy
-to do, would use '//' as delimiter).
+check test routines that create mesh to make sure they clear factory
+(*mesh)->getFactory()->clear();
Add check to make sure every material supplied by user exists in the
mesh.
@@ -54,10 +58,9 @@
hex (CUBIT)
FaultCohesiveKin
- multiple cohesive cells for hex8 mesh
+ unit test for multiple cohesive cells for hex8 mesh
+ normal okay with rollover of fault dip?
- normal okay with rollover of fault dip?
-
1. Additional unit tests
b. ElasticityExplicit and ElasticityImplicit
Modified: short/3D/PyLith/trunk/doc/userguide/TODO
===================================================================
--- short/3D/PyLith/trunk/doc/userguide/TODO 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/doc/userguide/TODO 2007-06-21 21:15:24 UTC (rev 7354)
@@ -2,8 +2,6 @@
1. Cover
- Replace with new benchmark image if we have one in time.
-
5. Preface (should be able to mostly copy from PyLith 0.8) [Charles]
DONE
@@ -12,17 +10,11 @@
Figures
PyLith Diagram [future: Brad]
-
Pyre
-
PyLith
-
Faults, Topology, BC, FEAssemble, Problems, MeshIO, Solver, Materials
-
PETSc
-
Sieve
-
MPI
7. Governing equations [MOSTLY DONE]
@@ -104,9 +96,9 @@
b. Existing material models.
- * ElasticStrain1D [Brad]
+ * ElasticStrain1D [DONE]
- * ElasticStress1D [Brad]
+ * ElasticStress1D [DONE]
* ElasticPlaneStrain [Brad]
Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -78,12 +78,12 @@
meshio/PsetFileBinary.cc \
meshio/SolutionIO.cc \
meshio/SolutionIOVTK.cc \
- topology/FieldsManager.cc \
- utils/LineParser.cc
+ topology/FieldsManager.cc
#libpylith_la_LDFLAGS = -no-undefined $(PYTHON_LA_LDFLAGS)
libpylith_la_LDFLAGS = $(PYTHON_LA_LDFLAGS)
libpylith_la_LIBADD = \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.cc 2007-06-21 21:15:24 UTC (rev 7354)
@@ -15,7 +15,7 @@
#include "MeshIOAscii.hh" // implementation of class methods
#include "pylith/utils/array.hh" // USES double_array, int_array, string_vector
-#include "pylith/utils/LineParser.hh" // USES LineParser
+#include "spatialdata/utils/LineParser.hh" // USES LineParser
#include "journal/info.h" // USES journal::info_t
@@ -44,7 +44,6 @@
{ // destructor
} // destructor
-#include <iostream>
// ----------------------------------------------------------------------
// Unpickle mesh
void
@@ -71,7 +70,8 @@
throw std::runtime_error(msg.str());
} // if
- utils::LineParser parser(filein, "//");
+ spatialdata::utils::LineParser parser(filein, "//");
+ parser.eatwhitespace(true);
std::string token;
std::istringstream buffer;
@@ -91,7 +91,6 @@
bool builtMesh = false;
try {
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -123,7 +122,6 @@
if (!builtMesh)
throw std::runtime_error("Both 'vertices' and 'cells' must "
"precede any groups in mesh file.");
- //buffer.ignore(maxIgnore, '{');
_readGroup(parser, &points, &type, &name);
_setGroup(name, type, points);
} else {
@@ -140,7 +138,6 @@
builtMesh = true;
} // if
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -153,17 +150,19 @@
msg << "Error occurred while reading PyLith mesh ASCII file '"
<< _filename << "'.\n"
<< err.what();
+ throw std::runtime_error(msg.str());
} catch (...) {
std::ostringstream msg;
msg << "Unknown I/O error while reading PyLith mesh ASCII file '"
<< _filename << "'.\n";
+ throw std::runtime_error(msg.str());
} // catch
filein.close();
} else {
_buildMesh(coordinates, numVertices, spaceDim,
cells, numCells, numCorners, meshDim);
_setMaterials(materialIds);
- }
+ } // if/else
_distributeGroups();
} // read
@@ -201,7 +200,7 @@
// ----------------------------------------------------------------------
// Read mesh vertices.
void
-pylith::meshio::MeshIOAscii::_readVertices(utils::LineParser& parser,
+pylith::meshio::MeshIOAscii::_readVertices(spatialdata::utils::LineParser& parser,
double_array* coordinates,
int* numVertices,
int* numDims) const
@@ -213,7 +212,6 @@
std::string token;
std::istringstream buffer;
const int maxIgnore = 1024;
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -246,7 +244,6 @@
msg << "Could not parse '" << token << "' into a vertices setting.";
throw std::runtime_error(msg.str());
} // else
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -288,7 +285,7 @@
// ----------------------------------------------------------------------
// Read mesh cells.
void
-pylith::meshio::MeshIOAscii::_readCells(utils::LineParser& parser,
+pylith::meshio::MeshIOAscii::_readCells(spatialdata::utils::LineParser& parser,
int_array* cells,
int_array* materialIds,
int* numCells,
@@ -304,7 +301,6 @@
std::string token;
std::istringstream buffer;
const int maxIgnore = 1024;
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -359,7 +355,6 @@
msg << "Could not parse '" << token << "' into an cells setting.";
throw std::runtime_error(msg.str());
} // else
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -417,7 +412,7 @@
// ----------------------------------------------------------------------
// Read mesh group.
void
-pylith::meshio::MeshIOAscii::_readGroup(utils::LineParser& parser,
+pylith::meshio::MeshIOAscii::_readGroup(spatialdata::utils::LineParser& parser,
int_array* points,
GroupPtType* type,
std::string* name) const
@@ -430,7 +425,6 @@
std::istringstream buffer;
const int maxIgnore = 1024;
int numPoints = -1;
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
@@ -464,10 +458,14 @@
throw std::runtime_error(msg.str());
} // if
points->resize(numPoints);
+ buffer.str(parser.next());
+ buffer.clear();
for (int i=0; i < numPoints; ++i) {
- buffer.str(parser.next());
- buffer.clear();
- buffer >> (*points)[i];
+ buffer >> (*points)[i];
+ if (!buffer.good() && i < numPoints-1) {
+ buffer.str(parser.next());
+ buffer.clear();
+ } // if
} // for
parser.ignore('}');
} else {
@@ -475,13 +473,15 @@
msg << "Could not parse '" << token << "' into a group setting.";
throw std::runtime_error(msg.str());
} // else
- parser.eatws();
buffer.str(parser.next());
buffer.clear();
buffer >> token;
} // while
- if (token != "}")
- throw std::runtime_error("I/O error while parsing group settings.");
+ if (token != "}") {
+ std::ostringstream msg;
+ msg << "I/O error while parsing group '" << *name << "'.";
+ throw std::runtime_error(msg.str());
+ } // if
} // _readGroup
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOAscii.hh 2007-06-21 21:15:24 UTC (rev 7354)
@@ -22,7 +22,9 @@
namespace meshio {
class MeshIOAscii;
} // meshio
+} // pylith
+namespace spatialdata {
namespace utils {
class LineParser;
} // utils
@@ -72,7 +74,7 @@
* @param numVertices Pointer to number of vertices
* @param spaceDim Pointer to dimension of coordinates vector space
*/
- void _readVertices(utils::LineParser& parser,
+ void _readVertices(spatialdata::utils::LineParser& parser,
double_array* coordinates,
int* numVertices,
int* spaceDim) const;
@@ -91,7 +93,7 @@
* @param pNumCells Pointer to number of cells
* @param pNumCorners Pointer to number of corners
*/
- void _readCells(utils::LineParser& parser,
+ void _readCells(spatialdata::utils::LineParser& parser,
int_array* pCells,
int_array* pMaterialIds,
int* numCells,
@@ -111,7 +113,7 @@
* @param parser Input parser.
* @param mesh The mesh
*/
- void _readGroup(utils::LineParser& parser,
+ void _readGroup(spatialdata::utils::LineParser& parser,
int_array* points,
GroupPtType* type,
std::string* name) const;
Deleted: short/3D/PyLith/trunk/libsrc/utils/LineParser.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/LineParser.cc 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/utils/LineParser.cc 2007-06-21 21:15:24 UTC (rev 7354)
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-#include <portinfo>
-
-#include "LineParser.hh" // implementation of class methods
-
-#include <iostream>
-#include <sstream>
-
-
-// ----------------------------------------------------------------------
-pylith::utils::LineParser::LineParser(std::istream& sin,
- const char* delimiter,
- const size_t bufsize) :
- _in(sin),
- _delimiter(delimiter),
- _bufsize(bufsize),
- _buffer(0)
-{ // constructor
- _buffer = new char[bufsize];
-} // constructor
-
-// ----------------------------------------------------------------------
-pylith::utils::LineParser::~LineParser(void)
-{ // destructor
- delete[] _buffer; _buffer = 0;
-} // destructor
-
-// ----------------------------------------------------------------------
-const std::string&
-pylith::utils::LineParser::next(void) {
- _in.getline(_buffer, _bufsize);
- _value = _buffer;
- size_t pos = _value.find(_delimiter);
- while (0 == pos && !_in.eof() && _in.good()) {
- _in.getline(_buffer, _bufsize);
- _value = _buffer;
- pos = _value.find(_delimiter);
- } // while
- const size_t last = (pos == std::string::npos) ? _value.length() : pos;
- _value = _value.substr(0, last);
- return _value;
-} // next
-
-// ----------------------------------------------------------------------
-// Ignore input until character read.
-void
-pylith::utils::LineParser::ignore(const char marker)
-{ // ignore
- _in.ignore(_bufsize, marker);
-} // ignore
-
-// ----------------------------------------------------------------------
-// Eat whitespace.
-void
-pylith::utils::LineParser::eatws(void)
-{ // eatws
- _in >> std::ws;
-} // eatws
-
-
-// End of file
Deleted: short/3D/PyLith/trunk/libsrc/utils/LineParser.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/LineParser.hh 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/utils/LineParser.hh 2007-06-21 21:15:24 UTC (rev 7354)
@@ -1,86 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-/**
- * @file pylith/utils/LineParser.hh
- *
- * @brief C++ implementation of a simple text parser that removes
- * comments and ignores input up to a given character.
- */
-
-#if !defined(pylith_utils_lineparser_hh)
-#define pylith_utils_lineparser_hh
-
-#include <string> // HASA std::string
-#include <iosfwd> // USES std::istream
-
-namespace pylith {
- namespace utils {
- class LineParser;
- } // utils
-} // pylith
-
-class pylith::utils::LineParser
-{ // LineParser
-
-// PUBLIC METHODS ///////////////////////////////////////////////////////
-public :
-
- /** Constructor.
- *
- * @param sin Input stream.
- * @param delimiter Comment that marks beginning of comment.
- * @param bufsize Maximum size of line
- */
- LineParser(std::istream& sin,
- const char* delimiter ="#",
- const size_t bufsize =1024);
-
- // Destructor.
- ~LineParser(void);
-
- /** Get next non-comment line from file.
- *
- * @returns String with next non-comment information.
- */
- const std::string& next(void);
-
- /** Ignore input until character read.
- *
- * @param Character flagging to stop reading.
- */
- void ignore(const char marker);
-
- /// Eat whitespace.
- void eatws(void);
-
-// NOT IMPLEMENTED //////////////////////////////////////////////////////
-private :
-
- LineParser(const LineParser&); ///< Not implemented
- const LineParser& operator=(const LineParser&); ///< Not implemented
-
-// PRIVATE MEMBERS //////////////////////////////////////////////////////
-private :
-
- std::istream& _in; ///< Input stream.
- std::string _value; ///< Value for output.
- std::string _delimiter; ///< Comment delimiter.
- const int _bufsize; ///< Size of buffer for line input.
- char* _buffer; ///< Buffer for line input.
-
-}; // LineParser
-
-#endif // pylith_utils_lineparser_hh
-
-
-// End of file
Modified: short/3D/PyLith/trunk/libsrc/utils/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/utils/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/libsrc/utils/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -19,8 +19,7 @@
macrodefs.h \
petscfwd.h \
sievefwd.hh \
- sievetypes.hh \
- LineParser.hh
+ sievetypes.hh
noinst_HEADERS =
Modified: short/3D/PyLith/trunk/modulesrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/bc/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
bcmodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
faultsmodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
feassemblemodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/materials/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/materials/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
materialsmodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
meshiomodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/solver/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/solver/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/solver/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
solvermodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/modulesrc/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/modulesrc/topology/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -25,6 +25,7 @@
topologymodule_la_LIBADD = \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/data/line2.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/data/line2.mesh 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/data/line2.mesh 2007-06-21 21:15:24 UTC (rev 7354)
@@ -1,33 +1,55 @@
-mesh = {
- dimension = 1
+// This is a comment
+mesh = { // more commetns
+// another
+ dimension = 1 // here
use-index-zero = true
+// there
+
vertices = {
+// yes
dimension = 1
count = 3
+ // no
coordinates = {
0 -1.0
+ // maybe
1 0.0
- 2 1.0
- }
- }
+ 2 1.0 // yes
+ // nod
+ } // do
+ } // au
+ // di
+// df
cells = {
+ // jdf
+// dsf
count = 2
num-corners = 2
- simplices = {
+ simplices = { // sdf
+ // sdf
0 0 1
+ // sdf
1 1 2
+// dfj
}
material-ids = {
- 0 0
+ 0 0 // sdfjdsf
+ // sdfdskf
1 0
}
}
+// sdfsd
group = {
name = bc0
- type = vertices
- count = 2
+// sdfs
+ type = vertices // sdfjsf
+ count = 2 // sfsdfk
+// sdfjsdf
+// sdjflsdjf
indices = {
0 2
}
+// sjflskdf
}
+// sjdfs
}
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -67,6 +67,7 @@
testmeshio_LDADD = \
-lcppunit -ldl \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
if ENABLE_CUBIT
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/Makefile.am 2007-06-21 21:09:20 UTC (rev 7353)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/Makefile.am 2007-06-21 21:15:24 UTC (rev 7354)
@@ -39,6 +39,7 @@
testtopology_LDADD = \
-lcppunit -ldl \
$(top_builddir)/libsrc/libpylith.la \
+ -lspatialdata \
$(PETSC_LIB) $(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
if ENABLE_CUBIT
More information about the cig-commits
mailing list