[cig-commits] r16722 - in short/3D/PyLith/trunk: . examples/3d/hex8 examples/3d/hex8/mesh examples/bar_shearwave/hex8 examples/bar_shearwave/quad4 examples/bar_shearwave/tri3 examples/greensfns/hex8 libsrc/bc libsrc/meshio modulesrc/meshio pylith/meshio tests_auto/2d/quad4 tests_auto/2d/tri3 unittests/libtests/meshio unittests/pytests/meshio

brad at geodynamics.org brad at geodynamics.org
Sat May 15 16:16:12 PDT 2010


Author: brad
Date: 2010-05-15 16:16:12 -0700 (Sat, 15 May 2010)
New Revision: 16722

Modified:
   short/3D/PyLith/trunk/TODO
   short/3D/PyLith/trunk/examples/3d/hex8/mesh/box_hex8_1000m.exo
   short/3D/PyLith/trunk/examples/3d/hex8/mesh/mesh_hex8_1000m.jou
   short/3D/PyLith/trunk/examples/3d/hex8/step01.cfg
   short/3D/PyLith/trunk/examples/3d/hex8/step02.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/hex8/bar_hex8_200m.exo
   short/3D/PyLith/trunk/examples/bar_shearwave/quad4/dynamicfault.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/quad4/pylithapp.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/quad4/shearwave_kinematicslip.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_sliding.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_stick.cfg
   short/3D/PyLith/trunk/examples/bar_shearwave/tri3/bar_tri3_200m.exo
   short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg
   short/3D/PyLith/trunk/libsrc/bc/BoundaryCondition.cc
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.hh
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.icc
   short/3D/PyLith/trunk/modulesrc/meshio/MeshIOCubit.i
   short/3D/PyLith/trunk/pylith/meshio/MeshIOCubit.py
   short/3D/PyLith/trunk/tests_auto/2d/quad4/axialdisp.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation2.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_compression.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_opening.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_sliding.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_stick.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformrigidbody.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformtraction.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/sheardisp.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_compression.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_opening.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
   short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
   short/3D/PyLith/trunk/tests_auto/2d/tri3/axialdisp.cfg
   short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation.cfg
   short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation2.cfg
   short/3D/PyLith/trunk/tests_auto/2d/tri3/sheardisp.cfg
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
   short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py
Log:
Added ability to use nodeset names in CUBIT Exodus files. Use nodeset names is the default (turn off via use_nodeset_names property in MeshIOCubit).

Modified: short/3D/PyLith/trunk/TODO
===================================================================
--- short/3D/PyLith/trunk/TODO	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/TODO	2010-05-15 23:16:12 UTC (rev 16722)
@@ -25,6 +25,7 @@
     MeshIOAscii
     MeshIOLaGriT
     MeshIOCubit
+      use_nodeset_names Flag for using nodeset names of ids.
     reorder_mesh
     distribution
       partitioner
@@ -102,7 +103,6 @@
 
   * Use node set names in MeshIOCubit. [Brad]
     ns_names for nodesets
-    eb_names for blocks
 
   * Friction template [Brad]
     viscous (velocity proportional friction)

Modified: short/3D/PyLith/trunk/examples/3d/hex8/mesh/box_hex8_1000m.exo
===================================================================
(Binary files differ)

Modified: short/3D/PyLith/trunk/examples/3d/hex8/mesh/mesh_hex8_1000m.jou
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/mesh/mesh_hex8_1000m.jou	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/3d/hex8/mesh/mesh_hex8_1000m.jou	2010-05-15 23:16:12 UTC (rev 16722)
@@ -44,7 +44,7 @@
 group "face_xpos" add node in surface 20
 group "face_xpos" add node in surface 28
 nodeset 11 group face_xpos
-nodeset 11 name "face xpos"
+nodeset 11 name "face_xpos"
 
 # ----------------------------------------------------------------------
 # Create nodeset for -x face
@@ -52,7 +52,7 @@
 group "face_xneg" add node in surface 30
 group "face_xneg" add node in surface 38
 nodeset 12 group face_xneg
-nodeset 12 name "face xneg"
+nodeset 12 name "face_xneg"
 
 # ----------------------------------------------------------------------
 # Create nodeset for +y face
@@ -62,7 +62,7 @@
 group "face_ypos" add node in surface 33
 group "face_ypos" add node in surface 35
 nodeset 13 group face_ypos
-nodeset 13 name "face ypos"
+nodeset 13 name "face_ypos"
 
 # ----------------------------------------------------------------------
 # Create nodeset for -y face
@@ -72,7 +72,7 @@
 group "face_yneg" add node in surface 31
 group "face_yneg" add node in surface 37
 nodeset 14 group face_yneg
-nodeset 14 name "face yneg"
+nodeset 14 name "face_yneg"
 
 # ----------------------------------------------------------------------
 # Create nodeset for -z face
@@ -80,7 +80,7 @@
 group "face_zneg" add node in surface 12
 group "face_zneg" add node in surface 16
 nodeset 15 group face_zneg
-nodeset 15 name "face zneg"
+nodeset 15 name "face_zneg"
 
 # ----------------------------------------------------------------------
 # Create nodeset for -z face w/o fault
@@ -88,7 +88,7 @@
 group "face_zneg_nofault" add node in face_zneg
 group "face_zneg_nofault" remove node in fault
 nodeset 16 group face_zneg_nofault
-nodeset 16 name "face zneg nofault"
+nodeset 16 name "face_zneg_nofault"
 
 # ----------------------------------------------------------------------
 # Create nodeset for +z face
@@ -96,7 +96,7 @@
 group "face_zpos" add node in surface 10
 group "face_zpos" add node in surface 17
 nodeset 17 group face_zpos
-nodeset 17 name "face zpos"
+nodeset 17 name "face_zpos"
 
 # ----------------------------------------------------------------------
 # Export exodus file

Modified: short/3D/PyLith/trunk/examples/3d/hex8/step01.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/step01.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/3d/hex8/step01.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -58,12 +58,12 @@
 # z-displacements on that boundary.
 #
 
-# The label corresponds to the nodeset ID in CUBIT.
+# The label corresponds to the name of the nodeset in CUBIT.
 
 # +x face
 [pylithapp.timedependent.bc.x_pos]
 bc_dof = [0, 1]
-label = 11
+label = face_zpos
 db_initial = spatialdata.spatialdb.SimpleDB
 db_initial.label = Dirichlet BC on +x
 db_initial.iohandler.filename = spatialdb/fixeddisp_axial_shear.spatialdb
@@ -71,7 +71,7 @@
 # -x face
 [pylithapp.timedependent.bc.x_neg]
 bc_dof = [0, 1]
-label = 12
+label = face_xneg
 db_initial = spatialdata.spatialdb.SimpleDB
 db_initial.label = Dirichlet BC on -x
 db_initial.iohandler.filename = spatialdb/fixeddisp_axial_shear.spatialdb
@@ -79,7 +79,7 @@
 # -z face
 [pylithapp.timedependent.bc.z_neg]
 bc_dof = [2]
-label = 15
+label = face_zneg
 db_initial.label = Dirichlet BC on -z
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/3d/hex8/step02.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/step02.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/3d/hex8/step02.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -64,7 +64,7 @@
 # displacements on those boundaries.
 #
 
-# The label corresponds to the nodeset ID in CUBIT.
+# The label corresponds to the name of the nodeset in CUBIT.
 
 # +x face -- first change bc type to Neumann
 [pylithapp.timedependent.bc]
@@ -72,7 +72,7 @@
 
 # +x face
 [pylithapp.timedependent.bc.x_pos]
-label = 11
+label = face_xpos
 db_initial = spatialdata.spatialdb.SimpleDB
 db_initial.label = Neumann BC on +x
 db_initial.iohandler.filename = spatialdb/tractions_axial_shear.spatialdb
@@ -85,13 +85,13 @@
 # -x face
 [pylithapp.timedependent.bc.x_neg]
 bc_dof = [0, 1]
-label = 12
+label = face_xneg
 db_initial.label = Dirichlet BC on -x
 
 # -z face
 [pylithapp.timedependent.bc.z_neg]
 bc_dof = [2]
-label = 15
+label = face_zneg
 db_initial.label = Dirichlet BC on -z
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/hex8/bar_hex8_200m.exo
===================================================================
(Binary files differ)

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/quad4/dynamicfault.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/bar_shearwave/quad4/dynamicfault.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/bar_shearwave/quad4/dynamicfault.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -30,8 +30,7 @@
 [pylithapp.timedependent.bc.x_pos]
 # Absorbing BC on +x face of bar
 
-# Nodeset id from CUBIT
-label = 11
+label = face_xpos
 
 # Specify label and filename for spatial database with physical properties
 db.label = Absorbing BC +x
@@ -46,8 +45,7 @@
 [pylithapp.timedependent.bc.x_neg]
 # Absorbing BC on -x face of bar
 
-# Nodeset id from CUBIT
-label = 12
+label = face_xneg
 
 # Specify label and filename for spatial database with physical properties
 db.label = Absorbing BC -x
@@ -59,15 +57,6 @@
 quadrature.cell.dimension = 1
 quadrature.cell.quad_order = 2
 
-[pylithapp.timedependent.bc.all_nofault]
-# Dirichlet BC on all vertices except fault vertices
-
-# Pin x and z degrees of freedom
-bc_dof = [0]
-
-# Nodeset id from CUBIT
-label = 13
-
 # ----------------------------------------------------------------------
 # faults
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/quad4/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/bar_shearwave/quad4/pylithapp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/bar_shearwave/quad4/pylithapp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -95,11 +95,11 @@
 [pylithapp.timedependent.bc.all_nofault]
 # Dirichlet boundary condition on all vertices except fault vertices
 
-# Pin x and z degrees of freedom
+# Pin x degree of freedom
 bc_dof = [0]
 
-# Nodeset id from CUBIT
-label = 13
+# Name of nodeset from CUBIT.
+label = vertices_nofault
 
 # ----------------------------------------------------------------------
 # faults
@@ -120,8 +120,8 @@
 # Material id
 id = 100
 
-# Nodeset id from CUBIT
-label = 10
+# Name of nodeset from CUBIT
+label = fault
 
 # Specify the basis functions and quadrature:
 # 1-D Lagrange cell in 2-D space with 2nd order quadrature

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/quad4/shearwave_kinematicslip.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/bar_shearwave/quad4/shearwave_kinematicslip.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/bar_shearwave/quad4/shearwave_kinematicslip.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -42,8 +42,8 @@
 [pylithapp.timedependent.bc.x_pos]
 # Absorbing boundary condition on +x face of bar
 
-# Nodeset id from CUBIT
-label = 11
+# Name of nodeset from CUBIT
+label = face_xpos
 
 # Specify label and filename for spatial database with physical properties
 db.label = Absorbing BC +x
@@ -58,8 +58,8 @@
 [pylithapp.timedependent.bc.x_neg]
 # Absorbing boundary condition on -x face of bar
 
-# Nodeset id from CUBIT
-label = 12
+# Name of nodeset from CUBIT
+label = face_xneg
 
 # Specify label and filename for spatial database with physical properties
 db.label = Absorbing BC -x

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_sliding.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_sliding.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_sliding.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -47,10 +47,9 @@
 [pylithapp.timedependent.bc.x_pos]
 # Dirichlet BC on +x face of bar
 
-# Nodeset id from CUBIT
-label = 11
-
+label = face_xpos
 bc_dof = [1]
+
 db_initial = spatialdata.spatialdb.UniformDB
 db_initial.label = Dirichlet BC +x edge
 db_initial.values = [displacement-x,displacement-y]
@@ -59,9 +58,7 @@
 [pylithapp.timedependent.bc.x_neg]
 # Dirichlet BC on -x face of bar
 
-# Nodeset id from CUBIT
-label = 12
-
+label = face_xneg
 bc_dof = [1]
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_stick.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_stick.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/bar_shearwave/quad4/static_stick.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -47,10 +47,9 @@
 [pylithapp.timedependent.bc.x_pos]
 # Dirichlet BC on +x face of bar
 
-# Nodeset id from CUBIT
-label = 11
-
+label = face_xpos
 bc_dof = [1]
+
 db_initial = spatialdata.spatialdb.UniformDB
 db_initial.label = Dirichlet BC +x edge
 db_initial.values = [displacement-x,displacement-y]
@@ -59,9 +58,7 @@
 [pylithapp.timedependent.bc.x_neg]
 # Dirichlet BC on -x face of bar
 
-# Nodeset id from CUBIT
-label = 12
-
+label = face_xneg
 bc_dof = [1]
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/examples/bar_shearwave/tri3/bar_tri3_200m.exo
===================================================================
(Binary files differ)

Modified: short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -33,6 +33,7 @@
 [pylithapp.mesh_generator.reader]
 # Set filename of mesh to import.
 filename = box_hex8_1000m.exo
+use_nodeset_names = False
 
 # ----------------------------------------------------------------------
 # problem

Modified: short/3D/PyLith/trunk/libsrc/bc/BoundaryCondition.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/BoundaryCondition.cc	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/libsrc/bc/BoundaryCondition.cc	2010-05-15 23:16:12 UTC (rev 16722)
@@ -50,7 +50,7 @@
   if (!sieveMesh->hasIntSection(_label)) {
     std::ostringstream msg;
     msg << "Mesh missing group of vertices '" << _label
-	<< " for boundary condition.";
+	<< "' for boundary condition.";
     throw std::runtime_error(msg.str());
   } // if
 } // verifyConfiguration

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2010-05-15 23:16:12 UTC (rev 16722)
@@ -31,7 +31,8 @@
 // ----------------------------------------------------------------------
 // Constructor
 pylith::meshio::MeshIOCubit::MeshIOCubit(void) :
-  _filename("")
+  _filename(""),
+  _useNodesetNames(true)
 { // constructor
 } // constructor
 
@@ -291,6 +292,32 @@
   bool ok = ns_prop1->get(&ids[0], counts);
   delete[] counts; counts = 0;
       
+  string_vector groupNames(numGroups);
+  if (_useNodesetNames) {
+    NcVar* ns_names = ncfile.get_var("ns_names");
+    if (0 == ns_names) 
+      throw std::runtime_error("Could not get variable 'ns_names'.");
+    long* counts = ns_names->edges();
+    if (ns_names->num_dims() != 2)
+      throw std::runtime_error("Expected variable 'ns_names' to have "
+			       "2 dimensions.");
+    const int bufferSize = counts[1];
+    char* buffer = (bufferSize > 0) ? new char[bufferSize] : 0;
+    for (int i=0; i < numGroups; ++i) {
+      ns_names->set_cur(i);
+      bool ok = ns_names->get(buffer, 1, bufferSize, 0, 0, 0);
+      if (!ok) {
+	std::ostringstream msg;
+	msg << "Could not read name of nodeset " << ids[i] << ".";
+	throw std::runtime_error(msg.str());
+      } // if
+      groupNames[i] = buffer;
+      std::cout << "GROUP: '" << groupNames[i] << "'." << std::endl;
+    } // for
+    delete[] buffer; buffer = 0;
+    delete[] counts; counts = 0;
+  } // if
+
   for (int iGroup=0; iGroup < numGroups; ++iGroup) {
     std::valarray<int> points;
 	
@@ -314,9 +341,13 @@
     points -= 1; // use zero index
 
     GroupPtType type = VERTEX;
-    std::ostringstream name;
-    name << ids[iGroup];
-    _setGroup(name.str().c_str(), type, points);
+    if (_useNodesetNames)
+      _setGroup(groupNames[iGroup], type, points);
+    else {
+      std::ostringstream name;
+      name << ids[iGroup];
+      _setGroup(name.str().c_str(), type, points);
+    } // if/else
   } // for  
 } // _readGroups
 

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.hh	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.hh	2010-05-15 23:16:12 UTC (rev 16722)
@@ -57,6 +57,12 @@
    */
   const char* filename(void) const;
 
+  /** Set flag on whether to use nodeset ids or names.
+   *
+   * @param flag True to use node set names.
+   */
+  void useNodesetNames(const bool flag);
+
 // PROTECTED METHODS ////////////////////////////////////////////////////
 protected :
 
@@ -136,6 +142,7 @@
 private :
 
   std::string _filename; ///< Name of file
+  bool _useNodesetNames; ///< True to use node set names instead of ids.
 
 }; // MeshIOCubit
 

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.icc	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.icc	2010-05-15 23:16:12 UTC (rev 16722)
@@ -28,6 +28,13 @@
   return _filename.c_str();
 }
 
+// Set flag on whether to use nodeset ids or names.
+inline
+void
+pylith::meshio::MeshIOCubit::useNodesetNames(const bool flag) {
+  _useNodesetNames = flag;
+}
+
 #endif
 
 // End of file

Modified: short/3D/PyLith/trunk/modulesrc/meshio/MeshIOCubit.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/MeshIOCubit.i	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/modulesrc/meshio/MeshIOCubit.i	2010-05-15 23:16:12 UTC (rev 16722)
@@ -46,6 +46,12 @@
        */
       const char* filename(void) const;
       
+      /** Set flag on whether to use nodeset ids or names.
+       *
+       * @param flag True to use node set names.
+       */
+      void useNodesetNames(const bool flag);
+
       // PROTECTED METHODS ////////////////////////////////////////////////////
     protected :
       

Modified: short/3D/PyLith/trunk/pylith/meshio/MeshIOCubit.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/MeshIOCubit.py	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/pylith/meshio/MeshIOCubit.py	2010-05-15 23:16:12 UTC (rev 16722)
@@ -49,6 +49,9 @@
     filename = pyre.inventory.str("filename", default="mesh.exo")
     filename.meta['tip'] = "Name of Cubit Exodus file."
 
+    useNames = pyre.inventory.bool("use_nodeset_names", default=True)
+    useNames.meta['tip'] = "Use nodeset names instead of ids."
+
     from spatialdata.geocoords.CSCart import CSCart
     coordsys = pyre.inventory.facility("coordsys", family="coordsys",
                                        factory=CSCart)
@@ -73,7 +76,8 @@
     """
     MeshIOObj._configure(self)
     self.coordsys = self.inventory.coordsys
-    self.filename(self.inventory.filename)
+    ModuleMeshIOCubit.filename(self, self.inventory.filename)
+    ModuleMeshIOCubit.useNodesetNames(self, self.inventory.useNames)
     return
 
 

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/axialdisp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/axialdisp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [axialdisp.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [dislocation.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation2.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation2.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/dislocation2.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -31,6 +31,7 @@
 
 [pylithapp.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_compression.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_compression.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_compression.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -28,6 +28,7 @@
 
 [friction_compression.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_opening.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_opening.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_opening.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [friction_opening.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_sliding.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_sliding.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [friction_shear_sliding.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_stick.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_stick.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/friction_shear_stick.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [friction_shear_stick.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformrigidbody.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformrigidbody.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformrigidbody.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [lgdeformrigidbody.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformtraction.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformtraction.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/lgdeformtraction.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [lgdeformtraction.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/sheardisp.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/sheardisp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/sheardisp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [sheardisp.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_compression.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_compression.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_compression.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -28,6 +28,7 @@
 
 [slipweakening_compression.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_opening.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_opening.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_opening.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [slipweakening_opening.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [slipweakening_shear_sliding.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_stick.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/slipweakening_shear_stick.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -35,6 +35,7 @@
 # the mesh.
 [slipweakening_shear_stick.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/tri3/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/tri3/axialdisp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/tri3/axialdisp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [axialdisp.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -23,6 +23,7 @@
 
 [dislocation.mesh_generator.reader]
 filename = box_tri3_100m.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation2.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation2.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/tri3/dislocation2.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -23,6 +23,7 @@
 
 [dislocation2.mesh_generator.reader]
 filename = box_tri3_100m.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/tests_auto/2d/tri3/sheardisp.cfg
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/tri3/sheardisp.cfg	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/tests_auto/2d/tri3/sheardisp.cfg	2010-05-15 23:16:12 UTC (rev 16722)
@@ -26,6 +26,7 @@
 
 [sheardisp.mesh_generator.reader]
 filename = mesh.exo
+use_nodeset_names = False
 coordsys.space_dim = 2
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc	2010-05-15 23:16:12 UTC (rev 16722)
@@ -118,6 +118,7 @@
 { // _testRead
   MeshIOCubit iohandler;
   iohandler.filename(filename);
+  iohandler.useNodesetNames(false);
 
   // Read mesh
   topology::Mesh mesh;

Modified: short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py	2010-05-15 23:01:07 UTC (rev 16721)
+++ short/3D/PyLith/trunk/unittests/pytests/meshio/TestMeshIOCubit.py	2010-05-15 23:16:12 UTC (rev 16722)
@@ -60,6 +60,7 @@
     # For now, we only test reading the file.
     io = MeshIOCubit()
     io.inventory.filename = filenameIn
+    io.inventory.useNames = False
     io._configure()
     
     from spatialdata.units.Nondimensional import Nondimensional



More information about the CIG-COMMITS mailing list