March 2011 - moab-dev - mailman3.cels.anl.gov

Re: [MOAB-dev] r4696 - MOAB/trunk/src/io
by Steve Jackson 01 Apr '11

01 Apr '11

R4696 seems to fix the problem, and DagMC is working again. Thank you for such a quick fix, Iulian! ~S On Mar 30, 2011, at 22:00 , Iulian Grindeanu wrote: > Hi Steve, > Can you please check if this fixes dagmc? > I am not sure ... > > Thanks, > Iulian > > ----- Forwarded Message ----- >> Author: iulian >> Date: 2011-03-30 21:58:48 -0500 (Wed, 30 Mar 2011) >> New Revision: 4696 >> >> Modified: >> MOAB/trunk/src/io/ReadCGM.cpp >> Log: >> the convention for senses is now changed: +1 is forward, -1 is >> reverse, >> 0 is both senses >> >> >> >> Modified: MOAB/trunk/src/io/ReadCGM.cpp >> =================================================================== >> --- MOAB/trunk/src/io/ReadCGM.cpp 2011-03-30 22:46:58 UTC (rev 4695) >> +++ MOAB/trunk/src/io/ReadCGM.cpp 2011-03-31 02:58:48 UTC (rev 4696) >> @@ -273,12 +273,12 @@ >> } >> >> if (forward) { >> - rval = myGeomTool->set_sense( ci->second, entmap[3][forward], true >> ); >> + rval = myGeomTool->set_sense( ci->second, entmap[3][forward], 1 ); >> if (MB_SUCCESS != rval) >> return rval; >> } >> if (reverse) { >> - rval = myGeomTool->set_sense( ci->second, entmap[3][reverse], false >> ); >> + rval = myGeomTool->set_sense( ci->second, entmap[3][reverse], -1 ); >> if (MB_SUCCESS != rval) >> return rval; >> } >> @@ -298,12 +298,12 @@ >> if (ce->get_sense() == CUBIT_UNKNOWN || >> ce->get_sense() != edge->get_curve_ptr()->bridge_sense()) { >> ents.push_back(face); >> - senses.push_back(CUBIT_REVERSED); >> + senses.push_back(-1); >> } >> if (ce->get_sense() == CUBIT_UNKNOWN || >> ce->get_sense() == edge->get_curve_ptr()->bridge_sense()) { >> ents.push_back(face); >> - senses.push_back(CUBIT_FORWARD); >> + senses.push_back(1); >> } >> }

1 1

r4707 - MOAB/trunk/src/io
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 18:30:30 -0500 (Thu, 31 Mar 2011) New Revision: 4707 Modified: MOAB/trunk/src/io/ReadHDF5.cpp Log: propogate correct error code to caller in ReadHDF5, and a little more error output Modified: MOAB/trunk/src/io/ReadHDF5.cpp =================================================================== --- MOAB/trunk/src/io/ReadHDF5.cpp 2011-03-31 23:30:02 UTC (rev 4706) +++ MOAB/trunk/src/io/ReadHDF5.cpp 2011-03-31 23:30:30 UTC (rev 4707) @@ -561,8 +561,11 @@ if (MB_SUCCESS == rval) dbgOut.tprint(1, "Read finished.\n"); - else - dbgOut.tprintf(1,"READ FAILED (ERROR CODE %d)\n", (int)rval); + else { + std::string msg; + iFace->get_last_error(msg); + dbgOut.tprintf(1,"READ FAILED (ERROR CODE %s): %s\n", ErrorCodeStr[rval], msg.c_str()); + } if (H5P_DEFAULT != collIO) H5Pclose( collIO ); @@ -3236,10 +3239,8 @@ rval = iFace->tag_set_data( tag_handle, ents, dataBuffer ); if (MB_SUCCESS != rval) { - std::string err; - iFace->get_last_error(err); - dbgOut.printf(1,"Internal error setting data for tag \"%s\": %s\n", tn.c_str(), err.c_str()); - return error(MB_FAILURE); + dbgOut.printf(1,"Internal error setting data for tag \"%s\"\n", tn.c_str()); + return error(rval); } } }

1 0

r4706 - MOAB/trunk/src
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 18:30:02 -0500 (Thu, 31 Mar 2011) New Revision: 4706 Modified: MOAB/trunk/src/VarLenDenseTag.cpp Log: return correct error code for memory allocation failure Modified: MOAB/trunk/src/VarLenDenseTag.cpp =================================================================== --- MOAB/trunk/src/VarLenDenseTag.cpp 2011-03-31 22:30:08 UTC (rev 4705) +++ MOAB/trunk/src/VarLenDenseTag.cpp 2011-03-31 23:30:02 UTC (rev 4706) @@ -140,7 +140,7 @@ mem = seq->data()->allocate_tag_array( mySequenceArray, sizeof(VarLenTag) ); if (!mem) { error->set_last_error( "Memory allocation for var-len tag data failed" ); - return MB_FAILURE; + return MB_MEMORY_ALLOCATION_FAILED; } memset( mem, 0, sizeof(VarLenTag) * seq->data()->size() );

1 0

r4705 - in MOAB/trunk: src src/io src/parallel src/parallel/moab test
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 17:30:08 -0500 (Thu, 31 Mar 2011) New Revision: 4705 Modified: MOAB/trunk/src/BitTag.cpp MOAB/trunk/src/BitTag.hpp MOAB/trunk/src/Core.cpp MOAB/trunk/src/DenseTag.cpp MOAB/trunk/src/DenseTag.hpp MOAB/trunk/src/MeshTag.cpp MOAB/trunk/src/MeshTag.hpp MOAB/trunk/src/SequenceManager.cpp MOAB/trunk/src/SequenceManager.hpp MOAB/trunk/src/SparseTag.cpp MOAB/trunk/src/SparseTag.hpp MOAB/trunk/src/TagInfo.cpp MOAB/trunk/src/TagInfo.hpp MOAB/trunk/src/TypeSequenceManager.cpp MOAB/trunk/src/TypeSequenceManager.hpp MOAB/trunk/src/VarLenDenseTag.cpp MOAB/trunk/src/VarLenDenseTag.hpp MOAB/trunk/src/VarLenSparseTag.cpp MOAB/trunk/src/VarLenSparseTag.hpp MOAB/trunk/src/io/ReadHDF5.cpp MOAB/trunk/src/parallel/ParallelComm.cpp MOAB/trunk/src/parallel/moab/ParallelComm.hpp MOAB/trunk/test/MBTest.cpp MOAB/trunk/test/TestTypeSequenceManager.cpp Log: better error reporting for tag code (and a couple other spots) Modified: MOAB/trunk/src/BitTag.cpp =================================================================== --- MOAB/trunk/src/BitTag.cpp 2011-03-31 20:06:33 UTC (rev 4704) +++ MOAB/trunk/src/BitTag.cpp 2011-03-31 22:30:08 UTC (rev 4705) @@ -3,12 +3,13 @@ #include "moab/Range.hpp" #include "TagCompare.hpp" #include "SequenceManager.hpp" +#include "Error.hpp" #include <stdlib.h> #include <string.h> namespace moab { -BitTag::~BitTag() { release_all_data(0,true); } +BitTag::~BitTag() { release_all_data(0,0,true); } TagType BitTag::get_storage_type() const { return MB_TAG_BIT; } @@ -49,7 +50,7 @@ return MB_SUCCESS; } -ErrorCode BitTag::release_all_data(SequenceManager*, bool) +ErrorCode BitTag::release_all_data(SequenceManager*, Error*, bool) { for (EntityType t = (EntityType)0; t != MBMAXTYPE; ++t) { for (size_t i = 0; i < pageList[t].size(); ++i) @@ -60,6 +61,7 @@ } ErrorCode BitTag::get_data( const SequenceManager*, + Error*, const EntityHandle* handles, size_t num_handles, void* gen_data ) const @@ -80,11 +82,12 @@ } ErrorCode BitTag::set_data( SequenceManager* seqman, + Error* error, const EntityHandle* handles, size_t num_handles, const void* gen_data ) { - ErrorCode rval = seqman->check_valid_entities( handles, num_handles, true ); + ErrorCode rval = seqman->check_valid_entities( error, handles, num_handles, true ); if (MB_SUCCESS != rval) return rval; @@ -104,6 +107,7 @@

1 0

r4645 - in MOAB/trunk: examples src src/moab tools
by iulian＠mcs.anl.gov 31 Mar '11

31 Mar '11

Author: iulian Date: 2011-03-25 10:54:42 -0500 (Fri, 25 Mar 2011) New Revision: 4645 Modified: MOAB/trunk/examples/GeomSetHierarchy.cpp MOAB/trunk/src/GeomTopoTool.cpp MOAB/trunk/src/moab/GeomTopoTool.hpp MOAB/trunk/src/moab/Types.hpp MOAB/trunk/tools/gsets.cc Log: sense tags modifications; some cleanup required meshkit tests do not pass now (test_scdmesh, test_copygeom, FAIL: test_triadvance FAIL: test_mbgeom FAIL: test_paver FAIL: test_tetmesher ) Old methods for senses are commented out, they will be completely removed Modified: MOAB/trunk/examples/GeomSetHierarchy.cpp =================================================================== --- MOAB/trunk/examples/GeomSetHierarchy.cpp 2011-03-25 13:59:51 UTC (rev 4644) +++ MOAB/trunk/examples/GeomSetHierarchy.cpp 2011-03-25 15:54:42 UTC (rev 4645) @@ -28,7 +28,7 @@ std::vector<int> senses, pgids; int dim, pgid, chgid; void *dim_ptr = &dim; - bool sense; + int sense; moab::GeomTopoTool gt(mb, true); @@ -59,7 +59,7 @@ if (moab::MB_SUCCESS != rval) continue; std::cout << ent_names[dim+1] << " " << pgid << ", " << ent_names[dim] << " " << chgid << " sense is: "; - if (sense) std::cout << "FORWARD" << std::endl; + if (1==sense) std::cout << "FORWARD" << std::endl; else std::cout << "REVERSE" << std::endl; } } @@ -72,9 +72,9 @@ rval = mb->tag_get_data(gid_tag, &sense_ents[i], 1, &pgid); std::cout << ent_names[dim+1] << " " << pgid << ", " << ent_names[dim] << " " << chgid << " sense is: "; - if (1 == senses[i]) std::cout << "REVERSED" << std::endl; - else if (0 == senses[i]) std::cout << "FORWARD" << std::endl; - else if (-1 == senses[i]) std::cout << "UNKNOWN" << std::endl; + if (-1 == senses[i]) std::cout << "REVERSED" << std::endl; + else if (0 == senses[i]) std::cout << "BOTH" << std::endl; + else if (1 == senses[i]) std::cout << "FORWARD" << std::endl; else std::cout << "(invalid)" << std::endl; } } Modified: MOAB/trunk/src/GeomTopoTool.cpp =================================================================== --- MOAB/trunk/src/GeomTopoTool.cpp 2011-03-25 13:59:51 UTC (rev 4644) +++ MOAB/trunk/src/GeomTopoTool.cpp 2011-03-25 15:54:42 UTC (rev 4645) @@ -31,546 +31,832 @@ // forward and reverse volumes, respectively. If a surface // is non-manifold in a single volume, the same volume will // be listed for both the forward and reverse slots. - const char GEOM_SENSE_2_TAG_NAME[] = "GEOM_SENSE_2"; +const char GEOM_SENSE_2_TAG_NAME[] = "GEOM_SENSE_2"; - const char GEOM_SENSE_N_ENTS_TAG_NAME[] = "GEOM_SENSE_N_ENTS"; - const char GEOM_SENSE_N_SENSES_TAG_NAME[] = "GEOM_SENSE_N_SENSES"; +const char GEOM_SENSE_N_ENTS_TAG_NAME[] = "GEOM_SENSE_N_ENTS"; +const char GEOM_SENSE_N_SENSES_TAG_NAME[] = "GEOM_SENSE_N_SENSES";

5 8

r4704 - MOAB/trunk/src/io
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 15:06:33 -0500 (Thu, 31 Mar 2011) New Revision: 4704 Modified: MOAB/trunk/src/io/ReadHDF5.cpp Log: more informative error output for ReadHDF5 Modified: MOAB/trunk/src/io/ReadHDF5.cpp =================================================================== --- MOAB/trunk/src/io/ReadHDF5.cpp 2011-03-31 20:06:16 UTC (rev 4703) +++ MOAB/trunk/src/io/ReadHDF5.cpp 2011-03-31 20:06:33 UTC (rev 4704) @@ -91,7 +91,7 @@ { if (MB_SUCCESS != code) { if (dbgOut) - dbgOut->printf(1,"Failure with error code %d at %s:%d\n", (int)code, file, line); + dbgOut->printf(1,"Failure with error code %s at %s:%d\n", ErrorCodeStr[code], file, line); #if defined(WITH_MPI) && !defined(NDEBUG) MPI_Abort( MPI_COMM_WORLD ): #endif

1 0

r4703 - MOAB/trunk/src/moab
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 15:06:16 -0500 (Thu, 31 Mar 2011) New Revision: 4703 Modified: MOAB/trunk/src/moab/Types.hpp Log: Fix previous checkin of string arrays for enums: they are not available to C code If Types.hpp is included in C (not C++) code the declarations appear in the global namespace rather than the 'moab' one. However, the actual array implementations in Types.cpp are always in the 'moab' namespace. So C code trying to use them will encounter link errors. Wrap the array declarations in Types.hpp in "#ifdef __cpluscplus" so it is obvious at compile time that they will not be available to C code. Modified: MOAB/trunk/src/moab/Types.hpp =================================================================== --- MOAB/trunk/src/moab/Types.hpp 2011-03-31 19:58:10 UTC (rev 4702) +++ MOAB/trunk/src/moab/Types.hpp 2011-03-31 20:06:16 UTC (rev 4703) @@ -49,7 +49,9 @@ MB_STRUCTURED_MESH, MB_FAILURE}; +#ifdef __cplusplus extern const char* const ErrorCodeStr[]; +#endif /** Misc. integer constants, declared in enum for portability */ enum Constants { @@ -83,7 +85,9 @@ MB_MAX_DATA_TYPE = MB_TYPE_HANDLE }; +#ifdef __cplusplus extern const char* const DataTypeStr[]; +#endif /** Used to reference tags; since they're so different from entities, we * use void** instead of a uint to prevent them from being confused as @@ -108,7 +112,9 @@ SENSE_FORWARD = 1 /**< forward */ }; +#ifdef __cplusplus extern const char* const* const SenseTypeStr; +#endif #ifdef __cplusplus } /* namespace moab */

1 0

r4702 - in MOAB/trunk/src: . moab
by kraftche＠cae.wisc.edu 31 Mar '11

31 Mar '11

Author: kraftche Date: 2011-03-31 14:58:10 -0500 (Thu, 31 Mar 2011) New Revision: 4702 Added: MOAB/trunk/src/Types.cpp Modified: MOAB/trunk/src/Core.cpp MOAB/trunk/src/Makefile.am MOAB/trunk/src/moab/Types.hpp Log: add static arrays for enum to string conversion for enums in Types.hpp that are not bit flags Modified: MOAB/trunk/src/Core.cpp =================================================================== --- MOAB/trunk/src/Core.cpp 2011-03-31 19:47:38 UTC (rev 4701) +++ MOAB/trunk/src/Core.cpp 2011-03-31 19:58:10 UTC (rev 4702) @@ -3250,29 +3250,9 @@ return mError->get_last_error(info); } -#define MB_CASE_STRING(A) case A: return #A; std::string Core::get_error_string(const ErrorCode code) const { - switch (code) { - MB_CASE_STRING(MB_SUCCESS); - MB_CASE_STRING(MB_INDEX_OUT_OF_RANGE); - MB_CASE_STRING(MB_TYPE_OUT_OF_RANGE); - MB_CASE_STRING(MB_MEMORY_ALLOCATION_FAILED); - MB_CASE_STRING(MB_ENTITY_NOT_FOUND); - MB_CASE_STRING(MB_MULTIPLE_ENTITIES_FOUND); - MB_CASE_STRING(MB_TAG_NOT_FOUND); - MB_CASE_STRING(MB_FILE_DOES_NOT_EXIST); - MB_CASE_STRING(MB_FILE_WRITE_ERROR); - MB_CASE_STRING(MB_NOT_IMPLEMENTED); - MB_CASE_STRING(MB_ALREADY_ALLOCATED); - MB_CASE_STRING(MB_VARIABLE_DATA_LENGTH); - MB_CASE_STRING(MB_INVALID_SIZE); - MB_CASE_STRING(MB_UNSUPPORTED_OPERATION); - MB_CASE_STRING(MB_UNHANDLED_OPTION); - MB_CASE_STRING(MB_STRUCTURED_MESH); - MB_CASE_STRING(MB_FAILURE); - default: assert(!"unknown error code"); return "(UNKNOWN ERROR CODE)"; - } + return (unsigned)code <= (unsigned)MB_FAILURE ? ErrorCodeStr[code] : "INVALID ERROR CODE"; } void Core::print(const EntityHandle ms_handle, const char *prefix, Modified: MOAB/trunk/src/Makefile.am =================================================================== --- MOAB/trunk/src/Makefile.am 2011-03-31 19:47:38 UTC (rev 4701) +++ MOAB/trunk/src/Makefile.am 2011-03-31 19:58:10 UTC (rev 4702) @@ -114,6 +114,7 @@ TagCompare.hpp \ TagInfo.cpp \ TagInfo.hpp \ + Types.cpp \ TypeSequenceManager.cpp \ TypeSequenceManager.hpp \ UnstructuredElemSeq.cpp \ Added: MOAB/trunk/src/Types.cpp ===================================================================

1 0

r4701 - MOAB/branches/Version4.0
by jvporter＠wisc.edu 31 Mar '11

31 Mar '11

Author: jvporter Date: 2011-03-31 14:47:38 -0500 (Thu, 31 Mar 2011) New Revision: 4701 Modified: MOAB/branches/Version4.0/Makefile.am Log: Add README.IMESH to doc_DATA Modified: MOAB/branches/Version4.0/Makefile.am =================================================================== --- MOAB/branches/Version4.0/Makefile.am 2011-03-31 19:47:06 UTC (rev 4700) +++ MOAB/branches/Version4.0/Makefile.am 2011-03-31 19:47:38 UTC (rev 4701) @@ -23,7 +23,8 @@ build-check: $(MAKE) 'TESTS_ENVIRONMENT=: ' check -doc_DATA = ANNOUNCE KNOWN_ISSUES LICENSE README README.IO RELEASE_NOTES +doc_DATA = ANNOUNCE KNOWN_ISSUES LICENSE README README.IO README.IMESH \ + RELEASE_NOTES EXTRA_DIST = $(doc_DATA)

1 0

r4700 - MOAB/trunk
by jvporter＠wisc.edu 31 Mar '11

31 Mar '11

Author: jvporter Date: 2011-03-31 14:47:06 -0500 (Thu, 31 Mar 2011) New Revision: 4700 Modified: MOAB/trunk/Makefile.am Log: Add README.IMESH to doc_DATA Modified: MOAB/trunk/Makefile.am =================================================================== --- MOAB/trunk/Makefile.am 2011-03-31 18:37:02 UTC (rev 4699) +++ MOAB/trunk/Makefile.am 2011-03-31 19:47:06 UTC (rev 4700) @@ -23,7 +23,8 @@ build-check: $(MAKE) 'TESTS_ENVIRONMENT=: ' check -doc_DATA = ANNOUNCE KNOWN_ISSUES LICENSE README README.IO RELEASE_NOTES +doc_DATA = ANNOUNCE KNOWN_ISSUES LICENSE README README.IO README.IMESH \ + RELEASE_NOTES EXTRA_DIST = $(doc_DATA)

1 0