[cig-commits] r21830 - in short/3D/PyLith/trunk/libsrc/pylith: . meshio
brad at geodynamics.org
brad at geodynamics.org
Thu Apr 11 17:48:43 PDT 2013
Author: brad
Date: 2013-04-11 17:48:43 -0700 (Thu, 11 Apr 2013)
New Revision: 21830
Removed:
short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.cc
short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.hh
short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.icc
Modified:
short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
short/3D/PyLith/trunk/libsrc/pylith/meshio/Makefile.am
Log:
Remove obsolete and untested MeshIOSieve.
Modified: short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/Makefile.am 2013-04-12 00:26:42 UTC (rev 21829)
+++ short/3D/PyLith/trunk/libsrc/pylith/Makefile.am 2013-04-12 00:48:43 UTC (rev 21830)
@@ -133,7 +133,6 @@
meshio/MeshIO.cc \
meshio/MeshIOAscii.cc \
meshio/MeshIOLagrit.cc \
- meshio/MeshIOSieve.cc \
meshio/PsetFile.cc \
meshio/PsetFileAscii.cc \
meshio/PsetFileBinary.cc \
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/Makefile.am 2013-04-12 00:26:42 UTC (rev 21829)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/Makefile.am 2013-04-12 00:48:43 UTC (rev 21830)
@@ -36,8 +36,6 @@
MeshIOAscii.icc \
MeshIOLagrit.hh \
MeshIOLagrit.icc \
- MeshIOSieve.hh \
- MeshIOSieve.icc \
OutputManager.hh \
OutputManager.cc \
OutputSolnSubset.hh \
Deleted: short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.cc 2013-04-12 00:26:42 UTC (rev 21829)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.cc 2013-04-12 00:48:43 UTC (rev 21830)
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard, U.S. Geological Survey
-// Charles A. Williams, GNS Science
-// Matthew G. Knepley, University of Chicago
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2012 University of California, Davis
-//
-// See COPYING for license information.
-//
-// ======================================================================
-//
-
-#include <portinfo>
-
-#include "MeshIOSieve.hh" // implementation of class methods
-
-#include "petscdmmesh.hh"
-
-#include "MeshBuilder.hh" // USES MeshBuilder
-#include "pylith/topology/Mesh.hh" // USES Mesh
-
-#include <stdexcept> // USES std::runtime_error
-
-// ----------------------------------------------------------------------
-// Constructor
-pylith::meshio::MeshIOSieve::MeshIOSieve(void) :
- _filename("")
-{ // constructor
-} // constructor
-
-// ----------------------------------------------------------------------
-// Destructor
-pylith::meshio::MeshIOSieve::~MeshIOSieve(void)
-{ // destructor
- deallocate();
-} // destructor
-
-// ----------------------------------------------------------------------
-// Deallocate PETSc and local data structures.
-void
-pylith::meshio::MeshIOSieve::deallocate(void)
-{ // deallocate
- MeshIO::deallocate();
-} // deallocate
-
-// ----------------------------------------------------------------------
-// Read mesh.
-void
-pylith::meshio::MeshIOSieve::_read(void)
-{ // _read
- _mesh->createSieveMesh(3);
- const ALE::Obj<topology::Mesh::SieveMesh>& sieveMesh = _mesh->sieveMesh();
- assert(!sieveMesh.isNull());
-
- ALE::Obj<topology::Mesh::SieveMesh::sieve_type> sieve =
- new topology::Mesh::SieveMesh::sieve_type(_mesh->comm());
- sieveMesh->setSieve(sieve);
- ALE::MeshSerializer::loadMesh(_filename, *sieveMesh);
-} // read
-
-// ----------------------------------------------------------------------
-// Write mesh to file.
-void
-pylith::meshio::MeshIOSieve::_write(void) const
-{ // write
- ALE::MeshSerializer::writeMesh(_filename, *_mesh->sieveMesh());
-} // write
-
-
-// End of file
Deleted: short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.hh 2013-04-12 00:26:42 UTC (rev 21829)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.hh 2013-04-12 00:48:43 UTC (rev 21830)
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard, U.S. Geological Survey
-// Charles A. Williams, GNS Science
-// Matthew G. Knepley, University of Chicago
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2012 University of California, Davis
-//
-// See COPYING for license information.
-//
-// ======================================================================
-//
-
-/**
- * @file libsrc/meshio/MeshIOSieve.hh
- *
- * @brief C++ input/output manager for Sieve mesh files.
- */
-
-#if !defined(pylith_meshio_meshiosieve_hh)
-#define pylith_meshio_meshiosieve_hh
-
-// Include directives ---------------------------------------------------
-#include "MeshIO.hh" // ISA MeshIO
-
-// MeshIOSieve ----------------------------------------------------------
-/// C++ input/output manager for Sieve mesh files.
-class pylith::meshio::MeshIOSieve : public MeshIO
-{ // MeshIOSieve
- friend class TestMeshIOSieve; // unit testing
-
-// PUBLIC METHODS ///////////////////////////////////////////////////////
-public :
-
- /// Constructor
- MeshIOSieve(void);
-
- /// Destructor
- ~MeshIOSieve(void);
-
- /// Deallocate PETSc and local data structures.
- void deallocate(void);
-
- /** Set filename for Sieve mesh file.
- *
- * @param filename Name of file
- */
- void filename(const char* name);
-
- /** Get filename of Sieve mesh file.
- *
- * @returns Name of file
- */
- const char* filename(void) const;
-
-// PROTECTED METHODS ////////////////////////////////////////////////////
-protected :
-
- /// Write mesh
- void _write(void) const;
-
- /// Read mesh
- void _read(void);
-
-
-// PRIVATE MEMBERS //////////////////////////////////////////////////////
-private :
-
- std::string _filename; ///< Name of file
-
-}; // MeshIOSieve
-
-#include "MeshIOSieve.icc" // inline methods
-
-#endif // pylith_meshio_meshiosieve_hh
-
-// End of file
Deleted: short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.icc 2013-04-12 00:26:42 UTC (rev 21829)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/MeshIOSieve.icc 2013-04-12 00:48:43 UTC (rev 21830)
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard, U.S. Geological Survey
-// Charles A. Williams, GNS Science
-// Matthew G. Knepley, University of Chicago
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2011 University of California, Davis
-//
-// See COPYING for license information.
-//
-// ======================================================================
-//
-
-#if !defined(pylith_meshio_meshiosieve_hh)
-#error "MeshIOSieve.icc must be included only from MeshIOSieve.icc"
-#else
-
-// Set filename for Sieve mesh file.
-inline
-void
-pylith::meshio::MeshIOSieve::filename(const char* name) {
- _filename = name;
-}
-
-// Get filename of Sieve mesh file.
-inline
-const char*
-pylith::meshio::MeshIOSieve::filename(void) const {
- return _filename.c_str();
-}
-
-#endif
-
-// End of file
More information about the CIG-COMMITS
mailing list