November 2009 - moab-dev - mailman3.cels.anl.gov

ITAPS and string handling
by Jed Brown 17 Nov '09

17 Nov '09

In Fortran, the size of the buffer is passed explicitly and the extra characters are padded with ' '. There should be no NULL characters. None of CGM's iGeom interface, nor iMesh_createTag, iMesh_getTagName, or iMesh_getTagHandle correctly handles the trailing whitespace. In C, ITAPS requires us to explicitly pass the "length" which one might expect to be the size of the buffer. Then std::string(char*,size_t) picks up the NULL character and undefined garbage following it in the buffer. This causes inconsistency particularly when mixing C and C++ string handling. MOAB and CGM pad with NULL (though not consistently, e.g. iMesh_getTagName, iMesh_getError, and iGeom_load may not even null terminate), write a character off the end of the array (iMesh_getDescription), read off the end of Fortran arrays (iMesh_createTag and iMesh_getTagHandle), and can leave a junk character at the end of the array (iMesh_getDescription). Also, iMesh_setError can overwrite it's field and will reliably fail to null-terminate the result when called from Fortran. Even if the obvious string-handling bugs are fixed and we assume that the Fortran runtime doesn't mind the NULL characters, we still have the problem of improperly truncating Fortran strings (to ensure that they are NULL terminated). That is, a Fortran developer would expect to be able to allocate a string of exactly the correct length and have all the characters used. The current state is that the interface is awkward to use from C and (even if implemented consistently) cannot behave as expected from Fortran. I would be strongly in favor of adding one level of indirection to the calls that involve string handling, thus allowing a native interface from C and Fortran. [*] Note that in Fortran the string length is passed by value, therefore the iGeom_getFaceType() declaration is wrong. Since it is almost a guaranteed seg-fault, I suspect that this function has never been called from Fortran with any implementation. Jed [*] Actually, I would put the indirection in for every call from Fortran because it's more pleasant to use a native interface and the runtime cost of wrappers like void foo_(double*a,int*b,double*c,int*d,int*e) { *e = Foo(a,*b,c,*d); } is very small. On my machine the fastest calling convention is to pass by value and return the error code, it costs four extra cycles to pass by reference (i.e. to call foo_() with Foo() inlined instead of calling Foo() directly), and an additional 6 if Foo() is not inlined. The exact counts are sensitive to stack alignment, but it will always be less than 10 cycles and it would take a very contrived ITAPS use case for this to be measurable.

2 1

r3360 - MOAB/trunk/tools/iMesh
by kraftche＠cae.wisc.edu 17 Nov '09

17 Nov '09

Author: kraftche Date: 2009-11-17 11:11:48 -0600 (Tue, 17 Nov 2009) New Revision: 3360 Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp Log: fix bug: createEnt should create lower-dim entities if createEntArr would have Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp =================================================================== --- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-17 17:07:43 UTC (rev 3359) +++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-17 17:11:48 UTC (rev 3360) @@ -1969,6 +1969,12 @@ *new_entity_handle = reinterpret_cast<iBase_EntityHandle>(tmp_ent); *err = *status; + + if (MB_SUCCESS == result && (MBimesh->AdjTable[5] || MBimesh->AdjTable[10])) { + MBRange set_ents; + set_ents.insert( tmp_ent ); + create_int_ents(MBI, set_ents); + } } void iMesh_deleteEnt(iMesh_Instance instance,

1 0

r3359 - MOAB/trunk/tools/iMesh
by kraftche＠cae.wisc.edu 17 Nov '09

17 Nov '09

Author: kraftche Date: 2009-11-17 11:07:43 -0600 (Tue, 17 Nov 2009) New Revision: 3359 Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp Log: fix bug: iMesh_getEntities does not preserve order for list-type entity sets Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp =================================================================== --- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-17 16:47:01 UTC (rev 3358) +++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-17 17:07:43 UTC (rev 3359) @@ -2535,7 +2535,7 @@ bool use_type = false; // initialize just to get rid of compiler warning MBEntityType type = mb_topology_table[iMesh_ALL_TOPOLOGIES]; - MBRange out_entities; + std::vector<MBEntityHandle> out_entities; if (entity_topology >= iMesh_POINT && entity_topology < iMesh_ALL_TOPOLOGIES) { @@ -2572,24 +2572,27 @@ RETURN(iBase_ERROR_MAP[result]); } - int num_ents = out_entities.size() - out_entities.num_of_type(MBENTITYSET); + // remove entity sets from the result list + std::vector<MBEntityHandle>::iterator iter, end_iter; + if (iBase_ALL_TYPES == entity_type && iMesh_ALL_TOPOLOGIES == entity_topology) { + for (iter = out_entities.begin(); iter != out_entities.end() && + TYPE_FROM_HANDLE(*iter) != MBENTITYSET; ++iter); + for (end_iter = iter; iter != out_entities.end(); ++iter) + if (TYPE_FROM_HANDLE(*iter) != MBENTITYSET) + *(end_iter++) = *iter; + out_entities.erase( end_iter, out_entities.end() ); + } + + int num_ents = out_entities.size(); CHECK_SIZE(*entity_handles, *entity_handles_allocated, num_ents, iBase_EntityHandle, iBase_MEMORY_ALLOCATION_FAILED); - MBRange::iterator iter = out_entities.begin(); - MBRange::iterator end_iter = out_entities.end(); int k = 0; // filter out entity sets here - if (iBase_ALL_TYPES == entity_type && iMesh_ALL_TOPOLOGIES == entity_topology) { - for (; iter != end_iter && MBI->type_from_handle(*iter) != MBENTITYSET; iter++) - (*entity_handles)[k++] = (iBase_EntityHandle)*iter; - } - else { - for (; iter != end_iter; iter++) - (*entity_handles)[k++] = (iBase_EntityHandle)*iter; - } + for (iter = out_entities.begin(); iter != out_entities.end(); iter++) + (*entity_handles)[k++] = (iBase_EntityHandle)*iter; // now it's safe to set the size; set it to k, not out_entities.size(), to // account for sets which might have been removed

1 0

hdf5 file read
by Lukasz Kaczmarczyk 17 Nov '09

17 Nov '09

Hello I have problem with reading attached file in moab format. I created file with mbImpl->write_file(file, "MOAB" , "PARALLEL=WRITE_PART", &PostProcTrefftzMeshSet,1) Couple days ago, before svn update everything works ok. Can someone help me find the problem, I made quite big analysis, and I could not open hdf files with results. I hope that I don't have to recompute it once again. Kind regards, Lukasz

2 3

r3358 - MOAB/trunk/mhdf/src
by kraftche＠cae.wisc.edu 17 Nov '09

17 Nov '09

Author: kraftche Date: 2009-11-17 10:47:01 -0600 (Tue, 17 Nov 2009) New Revision: 3358 Modified: MOAB/trunk/mhdf/src/file-desc.c Log: fix memory corruption when reading h5m file containing many tags Modified: MOAB/trunk/mhdf/src/file-desc.c =================================================================== --- MOAB/trunk/mhdf/src/file-desc.c 2009-11-17 16:18:15 UTC (rev 3357) +++ MOAB/trunk/mhdf/src/file-desc.c 2009-11-17 16:47:01 UTC (rev 3358) @@ -28,8 +28,8 @@ { void* result_ptr; struct mhdf_FileDesc* const input_ptr = *data; - unsigned char* const mem_ptr = (unsigned char*)input_ptr; - size_t new_size; + unsigned char* mem_ptr = (unsigned char*)input_ptr; + size_t new_size, orig_size = input_ptr->offset - mem_ptr; if (mem_ptr + input_ptr->total_size < input_ptr->offset + append_bytes) { if (append_bytes < input_ptr->total_size) @@ -42,10 +42,13 @@ if (*data != input_ptr) mhdf_fixFileDesc( *data, input_ptr ); + + mem_ptr = (unsigned char*)(*data); + (*data)->offset = mem_ptr + orig_size; } - result_ptr = input_ptr->offset; - input_ptr->offset += append_bytes; + result_ptr = (*data)->offset; + (*data)->offset += append_bytes; return result_ptr; }

1 0

r3357 - MOAB/trunk/tools/iMesh
by kraftche＠cae.wisc.edu 17 Nov '09

17 Nov '09

Author: kraftche Date: 2009-11-17 10:18:15 -0600 (Tue, 17 Nov 2009) New Revision: 3357 Modified: MOAB/trunk/tools/iMesh/testc_cbind.c Log: orderd set regression test from Jed Brown Modified: MOAB/trunk/tools/iMesh/testc_cbind.c =================================================================== --- MOAB/trunk/tools/iMesh/testc_cbind.c 2009-11-17 00:17:15 UTC (rev 3356) +++ MOAB/trunk/tools/iMesh/testc_cbind.c 2009-11-17 16:18:15 UTC (rev 3357) @@ -2155,7 +2155,7 @@ } free(adj); - adj_alloc = adj = 0; + adj_alloc = 0; adj = 0; iMesh_getEntAdj(mesh,line,iBase_ALL_TYPES,&adj,&adj_alloc,&adj_size, &err); if (iBase_SUCCESS != err) return 0; @@ -2165,10 +2165,43 @@ return 0; } free(adj); - + free(verts); + iMesh_dtor(mesh,&err); + if (iBase_SUCCESS != err) return 0; return 1; } +#define CHK(err) if (err != iBase_SUCCESS) \ + do {printf("%s:%d ITAPS error %d\n",__FILE__,__LINE__,err); return 0;} while (0) +static int ordered_set_regression( iMesh_Instance mesh ) +{ + double coords[] = { 0,0,0, 1,1,1 }; + iBase_EntityHandle line,*p,verts[2],ents_in[3],ents_out[3]; + iBase_EntitySetHandle set; + int i,err,status,two=2,three=3; + + iMesh_newMesh("",&mesh,&err,0);CHK(err); + p = verts; + iMesh_createVtxArr(mesh,2,iBase_INTERLEAVED,coords,6,&p,&two,&two,&err);CHK(err); + iMesh_createEnt(mesh,iMesh_LINE_SEGMENT,verts,2,&line,&status,&err);CHK(err); + if (status != iBase_NEW) return 0; + iMesh_createEntSet(mesh,1,&set,&err);CHK(err); + ents_in[0] = verts[1]; + ents_in[1] = line; + ents_in[2] = verts[0]; + iMesh_addEntArrToSet(mesh,ents_in,three,set,&err);CHK(err); + p = ents_out; + iMesh_getEntities(mesh,set,iBase_ALL_TYPES,iMesh_ALL_TOPOLOGIES,&p,&three,&three,&err);CHK(err); + for (i=0; i<three; i++) { + if (ents_in[i] != ents_out[i]) { + printf("Ordered set does not preserve order\n"); + return 0; + } + } + iMesh_dtor(mesh,&err);CHK(err); + return 1; +} + int main( int argc, char *argv[] ) { /* Check command line arg */ @@ -2314,6 +2347,15 @@ number_tests++; printf("\n"); + /* regression test for ordered sets not preserving order */ + printf(" ordered_set_regression: "); + result = ordered_set_regression(mesh); + handle_error_code(result, &number_tests_failed, + &number_tests_not_implemented, + &number_tests_successful); + number_tests++; + printf("\n"); + /* summary */ printf("\nTSTT TEST SUMMARY: \n");

1 0

[PATCH] Add regression test for ordered sets preserving order
by Jed Brown 17 Nov '09

17 Nov '09

--- tools/iMesh/testc_cbind.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 2 deletions(-)

1 0

r3355 - in MOAB/trunk: . tools/iMesh
by kraftche＠cae.wisc.edu 16 Nov '09

16 Nov '09

Author: kraftche Date: 2009-11-16 16:49:48 -0600 (Mon, 16 Nov 2009) New Revision: 3355 Modified: MOAB/trunk/MBCore.cpp MOAB/trunk/MBCore.hpp MOAB/trunk/MBInterface.hpp MOAB/trunk/MBTest.cpp MOAB/trunk/MBTypes.h MOAB/trunk/TestUtil.hpp MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp MOAB/trunk/tools/iMesh/testc_cbind.c Log: o Add new error code: MB_UNHANDLED_OPTION o Make MBCore::load_file and MBCore::write_file return MB_UNHANDLED_OPTION if the file read/write succeeded but there was an unrecognized name in the options strings. o Change some declarations that depend on MBErrorCode values such that it is more likely to see a compiler error or warning if MBErrorCode is changed without updating the array. o Add some unit tests that should catch a failure to update certain arrays after adding to the MBErrorCode values. Modified: MOAB/trunk/MBCore.cpp =================================================================== --- MOAB/trunk/MBCore.cpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/MBCore.cpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -77,24 +77,6 @@ using namespace std; -const char *MBCore::errorStrings[] = { - "MB_SUCCESS", - "MB_INDEX_OUT_OF_RANGE", - "MB_TYPE_OUT_OF_RANGE", - "MB_MEMORY_ALLOCATION_FAILED", - "MB_ENTITY_NOT_FOUND", - "MB_MULTIPLE_ENTITIES_FOUND", - "MB_TAG_NOT_FOUND", - "MB_FILE_DOES_NOT_EXIST", - "MB_FILE_WRITE_ERROR", - "MB_NOT_IMPLEMENTED", - "MB_ALREADY_ALLOCATED", - "MB_VARIABLE_DATA_LENGTH", - "MB_INVALID_SIZE", - "MB_UNSUPPORTED_OPERATION", - "MB_FAILURE", -}; - static inline const MBMeshSet* get_mesh_set( const SequenceManager* sm, MBEntityHandle h ) { @@ -416,7 +398,7 @@ mError->set_last_error( "Unrecognized option: \"%s\"", bad_opt.c_str() ); else mError->set_last_error( "Unrecognized option." ); - rval = MB_FAILURE; + rval = MB_UNHANDLED_OPTION; } return rval; @@ -598,7 +580,7 @@ mError->set_last_error( "Unrecognized option: \"%s\"", bad_opt.c_str() ); else mError->set_last_error( "Unrecognized option." ); - rval = MB_FAILURE; + rval = MB_UNHANDLED_OPTION; } return rval; @@ -2941,6 +2923,25 @@ std::string MBCore::get_error_string(const MBErrorCode code) const { + static const char* errorStrings[MB_FAILURE+1] = { + "MB_SUCCESS", + "MB_INDEX_OUT_OF_RANGE", + "MB_TYPE_OUT_OF_RANGE", + "MB_MEMORY_ALLOCATION_FAILED", + "MB_ENTITY_NOT_FOUND", + "MB_MULTIPLE_ENTITIES_FOUND", + "MB_TAG_NOT_FOUND", + "MB_FILE_DOES_NOT_EXIST", + "MB_FILE_WRITE_ERROR", + "MB_NOT_IMPLEMENTED", + "MB_ALREADY_ALLOCATED", + "MB_VARIABLE_DATA_LENGTH", + "MB_INVALID_SIZE", + "MB_UNSUPPORTED_OPERATION", + "MB_UNHANDLED_OPTION", + "MB_FAILURE", + }; + return errorStrings[code]; } Modified: MOAB/trunk/MBCore.hpp =================================================================== --- MOAB/trunk/MBCore.hpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/MBCore.hpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -1187,9 +1187,6 @@ MBReaderWriterSet* readerWriterSet; MBError* mError; - - static const char *errorStrings[]; - }; Modified: MOAB/trunk/MBInterface.hpp =================================================================== --- MOAB/trunk/MBInterface.hpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/MBInterface.hpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -198,9 +198,10 @@ *\param file_set Output: a handle to a new set containing all entities * read or imported from the file. *\param options A list of string options, separated by semicolons (;). - * See README.IO for more information. Typical options - * include the file type, parallel options, and options - * specific to certain file formats. + * See README.IO for more information. Options are typically + * format-specific options or parallel options. If an + * option value is unrecognized but the file read otherwise + * succeeded, MB_UNHANDLED_OPTION will be returned. *\param set_tag_name The name of a tag used to designate the subset * of the file to read. The name must correspond to * data in the file that will be instantiated in MOAB Modified: MOAB/trunk/MBTest.cpp =================================================================== --- MOAB/trunk/MBTest.cpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/MBTest.cpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -6811,6 +6811,35 @@ return MB_SUCCESS; } +#define TEST_ERROR_CODE(E) \ + if (mb->get_error_string(E) != #E) { \ + std::cerr << "Invalid error string from get_error_string for " \ + << #E << ": " << mb->get_error_string(E) << std::endl;\ + return MB_FAILURE; \ + } + +MBErrorCode mb_enum_string_test( MBInterface* mb ) +{ + TEST_ERROR_CODE( MB_SUCCESS ); + TEST_ERROR_CODE( MB_INDEX_OUT_OF_RANGE ); + TEST_ERROR_CODE( MB_TYPE_OUT_OF_RANGE ); + TEST_ERROR_CODE( MB_MEMORY_ALLOCATION_FAILED ); + TEST_ERROR_CODE( MB_ENTITY_NOT_FOUND ); + TEST_ERROR_CODE( MB_MULTIPLE_ENTITIES_FOUND ); + TEST_ERROR_CODE( MB_TAG_NOT_FOUND ); + TEST_ERROR_CODE( MB_FILE_DOES_NOT_EXIST ); + TEST_ERROR_CODE( MB_FILE_WRITE_ERROR ); + TEST_ERROR_CODE( MB_NOT_IMPLEMENTED ); + TEST_ERROR_CODE( MB_ALREADY_ALLOCATED ); + TEST_ERROR_CODE( MB_VARIABLE_DATA_LENGTH ); + TEST_ERROR_CODE( MB_INVALID_SIZE ); + TEST_ERROR_CODE( MB_UNSUPPORTED_OPERATION ); + TEST_ERROR_CODE( MB_UNHANDLED_OPTION ); + TEST_ERROR_CODE( MB_FAILURE ); + + return MB_SUCCESS; +} + int number_tests = 0; int number_tests_failed = 0; #define RUN_TEST( A ) _run_test( (A), #A ) @@ -6944,6 +6973,7 @@ RUN_TEST( mb_skin_volume_test ); RUN_TEST( mb_skin_volume_adj_test ); RUN_TEST( mb_read_fail_test ); + RUN_TEST( mb_enum_string_test ); RUN_TEST( mb_merge_update_test ); RUN_TEST( mb_merge_test ); if (stress_test) RUN_TEST( mb_stress_test ); Modified: MOAB/trunk/MBTypes.h =================================================================== --- MOAB/trunk/MBTypes.h 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/MBTypes.h 2009-11-16 22:49:48 UTC (rev 3355) @@ -53,6 +53,7 @@ MB_VARIABLE_DATA_LENGTH, MB_INVALID_SIZE, MB_UNSUPPORTED_OPERATION, + MB_UNHANDLED_OPTION, MB_FAILURE}; /** Misc. integer constants, declared in enum for portability */ Modified: MOAB/trunk/TestUtil.hpp =================================================================== --- MOAB/trunk/TestUtil.hpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/TestUtil.hpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -373,6 +373,7 @@ case MB_VARIABLE_DATA_LENGTH : return "Variable Data Length"; case MB_INVALID_SIZE : return "Invalid Size"; case MB_UNSUPPORTED_OPERATION : return "Unsupported Operation"; + case MB_UNHANDLED_OPTION : return "Unhandled Option"; case MB_FAILURE : return "Failure"; default : return "(unknown)"; } Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp =================================================================== --- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -161,7 +161,7 @@ iBase_ENTITY_HANDLE }; -const iBase_ErrorType iBase_ERROR_MAP[] = +const iBase_ErrorType iBase_ERROR_MAP[MB_FAILURE+1] = { iBase_SUCCESS, // MB_SUCCESS = 0, iBase_INVALID_ENTITY_HANDLE, // MB_INDEX_OUT_OF_RANGE, @@ -177,6 +177,7 @@ iBase_FAILURE, // MB_VARIABLE_DATA_LENGTH, iBase_FAILURE, // MB_INVALID_SIZE, iBase_NOT_SUPPORTED, // MB_UNSUPPORTED_OPERATION, + iBase_INVALID_ARGUMENT, // MB_UNHANDLED_OPTION iBase_FAILURE // MB_FAILURE}; }; Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp =================================================================== --- MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp 2009-11-16 22:49:48 UTC (rev 3355) @@ -20,7 +20,7 @@ extern const iBase_TagValueType tstt_data_type_table[MB_MAX_DATA_TYPE+1]; /* map from MOAB's MBErrorCode to tstt's */ -extern const iBase_ErrorType iBase_ERROR_MAP[MB_FAILURE+1]; +extern "C" const iBase_ErrorType iBase_ERROR_MAP[MB_FAILURE+1]; /* Create ITAPS iterator */ iMesh_EntityIterator create_itaps_iterator( MBRange& swap_range, Modified: MOAB/trunk/tools/iMesh/testc_cbind.c =================================================================== --- MOAB/trunk/tools/iMesh/testc_cbind.c 2009-11-16 21:37:43 UTC (rev 3354) +++ MOAB/trunk/tools/iMesh/testc_cbind.c 2009-11-16 22:49:48 UTC (rev 3355) @@ -60,7 +60,10 @@ #include <string.h> #include <stdlib.h> #include "iMesh.h" +#include "MBTypes.h" +extern enum iBase_ErrorType iBase_ERROR_MAP[MB_FAILURE+1]; + #define FALSE 0 #define TRUE 1 @@ -121,6 +124,26 @@ return TRUE; } +#define TEST_ERROR_CODE( A, B ) \ + if (iBase_ERROR_MAP[(A)] != (B)) { \ + printf("ERROR: Invalid mapping for MOAB error code %s\n", #A); \ + printf(" Expected %d, actual is %d\n", (int)iBase_ERROR_MAP[(A)], (int)(B) ); \ + return FALSE; \ + } + +int error_code_test(iMesh_Instance mesh) { + TEST_ERROR_CODE( MB_SUCCESS, iBase_SUCCESS ) + TEST_ERROR_CODE( MB_TYPE_OUT_OF_RANGE, iBase_INVALID_ENTITY_TYPE ) + TEST_ERROR_CODE( MB_MEMORY_ALLOCATION_FAILED, iBase_MEMORY_ALLOCATION_FAILED ) + TEST_ERROR_CODE( MB_ENTITY_NOT_FOUND, iBase_INVALID_ENTITY_HANDLE ) + TEST_ERROR_CODE( MB_TAG_NOT_FOUND, iBase_TAG_NOT_FOUND ) + TEST_ERROR_CODE( MB_FILE_DOES_NOT_EXIST, iBase_FILE_NOT_FOUND ) + TEST_ERROR_CODE( MB_UNSUPPORTED_OPERATION, iBase_NOT_SUPPORTED ) + TEST_ERROR_CODE( MB_UNHANDLED_OPTION, iBase_INVALID_ARGUMENT ) + TEST_ERROR_CODE( MB_FAILURE, iBase_FAILURE ) + return TRUE; +} + /*! @test TSTT topology dimension Test @@ -2283,6 +2306,14 @@ number_tests++; printf("\n"); + printf(" error_code_test: "); + result = error_code_test(mesh); + handle_error_code(result, &number_tests_failed, + &number_tests_not_implemented, + &number_tests_successful); + number_tests++; + printf("\n"); + /* summary */ printf("\nTSTT TEST SUMMARY: \n");

1 0

r3352 - MOAB/trunk/tools/dagmc
by sjackson＠cae.wisc.edu 16 Nov '09

16 Nov '09

Author: sjackson Date: 2009-11-16 15:32:41 -0600 (Mon, 16 Nov 2009) New Revision: 3352 Modified: MOAB/trunk/tools/dagmc/DagMC.cpp Log: Workaround for h5m loading failures within DagMC. Modified: MOAB/trunk/tools/dagmc/DagMC.cpp =================================================================== --- MOAB/trunk/tools/dagmc/DagMC.cpp 2009-11-16 20:59:08 UTC (rev 3351) +++ MOAB/trunk/tools/dagmc/DagMC.cpp 2009-11-16 21:32:41 UTC (rev 3352) @@ -899,6 +899,18 @@ // what if we are using default faceting tolerance??? char options[120] = "CGM_ATTRIBS=yes;FACET_DISTANCE_TOLERANCE="; strcat(options,facetTolStr); + + // As of r3273, loading fails if we pass options that a file reader can't recognize. + // In particular, the h5m reader does not recognize the options given above. + // As a temporary workaround, check for an .h5m filename and throw + // away the options if one is found. -- sjackson, 11/16/09 + { + std::string filename(cfile); + if( filename.length() > 4 && filename.substr(filename.length()-4) == ".h5m"){ + options[0]='\0'; + } + } + rval = MBI->load_file(cfile, 0, options, NULL, 0, 0); if (MB_SUCCESS != rval) {

1 0

r3351 - MOAB/trunk/mhdf
by kraftche＠cae.wisc.edu 16 Nov '09

16 Nov '09

Author: kraftche Date: 2009-11-16 14:59:08 -0600 (Mon, 16 Nov 2009) New Revision: 3351 Modified: MOAB/trunk/mhdf/Makefile.am Log: work around libtool bug Modified: MOAB/trunk/mhdf/Makefile.am =================================================================== --- MOAB/trunk/mhdf/Makefile.am 2009-11-16 15:56:07 UTC (rev 3350) +++ MOAB/trunk/mhdf/Makefile.am 2009-11-16 20:59:08 UTC (rev 3351) @@ -20,7 +20,7 @@ src/util.h h5minfo_SOURCES = include/mhdf.h example/info.c -h5minfo_LDADD = libmhdf.la +h5minfo_LDADD = libmhdf.la $(HDF5_LIBS) DEFS = -I$(srcdir)/include

1 0