[MOAB-dev] r4017 - MOAB/trunk/tools/dagmc

[wilsonp at engr.wisc.edu]

Author: wilsonp
Date: 2010-06-24 06:31:05 -0500 (Thu, 24 Jun 2010)
New Revision: 4017

Modified:
   MOAB/trunk/tools/dagmc/DagMC.cpp
   MOAB/trunk/tools/dagmc/DagMC.hpp
Log:
Add support for Tripoli4 v7.

Primary changes are to provide more access to metadata and/or support
different metadata.  A method was added to get all the metadata for a
volume, but this probably needs to be replaced by a more generic
lightweight access to tags across the DAGMC interface.

Added support for "composition" definitions that are different from
MCNP materials: cubit group "comp_COMPNAME" (Note: the implicit
complement is assigned a material with "comp_COMPNAME_comp".)

Added support for testing whether a specific surface has a specular or
white reflecting boundary condition and whether a specific volume is
part of the graveyard.

Changed the order of the definition of discard_ and add_ tolerance so
that the add_tolerance can be defined as 100*discard_tolerance as
default.



Modified: MOAB/trunk/tools/dagmc/DagMC.cpp
===================================================================
--- MOAB/trunk/tools/dagmc/DagMC.cpp	2010-06-23 19:44:46 UTC (rev 4016)
+++ MOAB/trunk/tools/dagmc/DagMC.cpp	2010-06-24 11:31:05 UTC (rev 4017)
@@ -34,19 +34,23 @@
 #endif
 
 #define MB_OBB_TREE_TAG_NAME "OBB_TREE"
+#define FACETING_TOL_TAG_NAME "FACETING_TOL"
 #define CATEGORY_TAG_LENGTH 32
+#define COMP_NAME_TAG_LENGTH 64
 
 #define MAT_GROUP 0
 #define BC_SPEC 1
 #define BC_WHITE 2
 #define IMP_ZERO 3
 #define TALLY_GROUP 4
+#define COMP_GROUP 5
 
 #define MATERIAL_TAG_NAME "DAGMC_MATERIAL_ID"
 #define DENSITY_TAG_NAME  "DAGMC_MATERIAL_DENSITY"
 #define BC_TAG_NAME       "DAGMC_BOUNDARY_CONDITION"
 #define IMP_TAG_NAME      "DAGMC_IMPORTANCE"
 #define TALLY_TAG_NAME    "DAGMC_TALLY"
+#define COMP_TAG_NAME     "DAGMC_COMPOSITION"
 
 
 #define MBI moab_instance()
@@ -93,6 +97,8 @@
   geomTag = get_tag( GEOM_DIMENSION_TAG_NAME, sizeof(int), MB_TAG_DENSE, MB_TYPE_INTEGER );
 
   obbTag = get_tag( MB_OBB_TREE_TAG_NAME, sizeof(EntityHandle), MB_TAG_DENSE, MB_TYPE_HANDLE );
+
+  facetingTolTag = get_tag(FACETING_TOL_TAG_NAME, sizeof(double), MB_TAG_SPARSE, MB_TYPE_DOUBLE );
   
     // get sense of surfaces wrt volumes
   senseTag = get_tag( "GEOM_SENSE_2", 2*sizeof(EntityHandle), MB_TAG_DENSE, MB_TYPE_HANDLE );
@@ -101,6 +107,7 @@
   const void *def_matid = &matid;
   matTag   = get_tag(MATERIAL_TAG_NAME, sizeof(int), MB_TAG_DENSE, MB_TYPE_INTEGER, def_matid );
   densTag  = get_tag(DENSITY_TAG_NAME, sizeof(double), MB_TAG_DENSE, MB_TYPE_DOUBLE );
+  compTag  = get_tag(COMP_TAG_NAME, COMP_NAME_TAG_LENGTH, MB_TAG_SPARSE, MB_TYPE_OPAQUE );
   bcTag    = get_tag(BC_TAG_NAME, sizeof(int), MB_TAG_SPARSE, MB_TYPE_INTEGER);
 
   double imp_one = 1;
@@ -119,6 +126,8 @@
 			   const double facet_tolerance)
 {
   ErrorCode rval;
+
+  std::cout << "Requested faceting tolerance: " << facet_tolerance << std::endl;