[cig-commits] r17894 - in short/3D/PyLith/branches/pylith-scecdynrup: . libsrc/topology modulesrc/mpi
brad at geodynamics.org
brad at geodynamics.org
Thu Feb 17 12:05:00 PST 2011
Author: brad
Date: 2011-02-17 12:05:00 -0800 (Thu, 17 Feb 2011)
New Revision: 17894
Added:
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/mpi/mpi_error.i
Modified:
short/3D/PyLith/branches/pylith-scecdynrup/TODO
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/topology/RefineVol8Face4Edges2.cc
Log:
Merge from trunk.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/TODO
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/TODO 2011-02-17 20:03:46 UTC (rev 17893)
+++ short/3D/PyLith/branches/pylith-scecdynrup/TODO 2011-02-17 20:05:00 UTC (rev 17894)
@@ -2,11 +2,6 @@
CURRENT ISSUES/PRIORITIES (1.6.0)
======================================================================
-* error trapping
-
- Need top-level exception handling so that exceptions thrown on one
- processor trigger error signals on all processors.
-
* GenMaxwellQpQs
How to define viscosity and combinations?????
@@ -30,11 +25,6 @@
Will this work for [#timesteps, #points, fiberDim]?
-* preprocess mesh
-
- Adjust topology, reorder cells, partition
- Write partitioned mesh.
-
* Reimplement Fields to use a single section.
Fields
@@ -74,26 +64,31 @@
* Optimization
+ inline methods (what isn't getting inlined) -Winline
- + Specialized elasticity integrator objects for Quad4, Hex8
+ + Specialized elasticity integrator objects for Quad4, Hex8?
- Add for lgdeform, implicit time integration?
-* Incompressibility, temperature/heat
+* Interpolated meshes + temperature field
+ No fault, linear elasticity
+ Benchmark memory use and speed
+
+ Incompressibility, temperature/heat
+
+
* Cleanup of materials [stable]
- Account for initial strain in viscoelastic models
+ + Account for initial strain in viscoelastic models
+
+ + Cleanup documentation
+ + Move formulations not used to Appendix
+ + Cleanup notation
+
* Testing
+ Need full-scale test with variation in physical properties
within a material.
-* Lumped elasticity formulation for large deformations
-
* Add output of initial fields (initial stress and initial strain).
-* Interpolated meshes + temperature field
- No fault, linear elasticity
- Benchmark memory use and speed
-
* Combined kinematic and dynamic fault implementation
FaultCohesiveKinDyn
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/topology/RefineVol8Face4Edges2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/topology/RefineVol8Face4Edges2.cc 2011-02-17 20:03:46 UTC (rev 17893)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/topology/RefineVol8Face4Edges2.cc 2011-02-17 20:05:00 UTC (rev 17894)
@@ -363,7 +363,7 @@
// Put it in section with point being the lowest numbered vertex and value (other endpoints, new vertex)
Obj<ALE::Section<point_type, FaceType> > newFaceVerticesSection = new ALE::Section<point_type, FaceType>(oldMesh->comm());
assert(!newFaceVerticesSection.isNull());
- std::map<FaceType, std::vector<int> > bndryFaceToRank;
+ std::map<FaceType, std::vector<int>, FaceCmp<point_type> > bndryFaceToRank;
for(std::map<FaceType, point_type>::const_iterator f_iter = _faceToVertex.begin(); f_iter != _faceToVertex.end(); ++f_iter) {
bool isRemote = true;
Copied: short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/mpi/mpi_error.i (from rev 17893, short/3D/PyLith/trunk/modulesrc/mpi/mpi_error.i)
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/mpi/mpi_error.i (rev 0)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/mpi/mpi_error.i 2011-02-17 20:05:00 UTC (rev 17894)
@@ -0,0 +1,30 @@
+// -*- 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 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+// ----------------------------------------------------------------------
+// mpi_abort
+%inline %{
+ void
+ mpi_abort(MPI_Comm comm, int err) {
+ MPI_Abort(comm, err);
+ } // mpi_abort
+%}
+
+
+// End of file
+
More information about the CIG-COMMITS
mailing list