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

r5265 - MOAB/trunk/itaps/igeom
by iulian＠mcs.anl.gov 15 Dec '11

15 Dec '11

Author: iulian Date: 2011-12-15 16:10:30 -0600 (Thu, 15 Dec 2011) New Revision: 5265 Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp Log: more functions implemented: FBiGeom_getEntNrmlSense FBiGeom_getFaceType FBiGeom_getParametric FBiGeom_getEgEvalXYZ Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-15 21:35:46 UTC (rev 5264) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-15 22:10:30 UTC (rev 5265) @@ -825,8 +825,13 @@ // not implemented } -void FBiGeom_getEntNrmlSense(FBiGeom_Instance, iBase_EntityHandle face, +void FBiGeom_getEntNrmlSense(FBiGeom_Instance instance, iBase_EntityHandle face, iBase_EntityHandle region, int* sense_out, int* err) { + moab::EntityHandle mbregion = (moab::EntityHandle) region; + moab::EntityHandle mbface = (moab::EntityHandle) face; + moab::ErrorCode rval = FBE_cast(instance)->getEgFcSense( mbface, mbregion, *sense_out ); + CHKERR(rval,"can't get normal sense "); + RETURN(iBase_SUCCESS); } void FBiGeom_getArrNrmlSense(FBiGeom_Instance, iBase_EntityHandle const* face_handles, int face_handles_size, @@ -888,8 +893,14 @@ RETURN(iBase_SUCCESS); } -void FBiGeom_getFaceType(FBiGeom_Instance, iBase_EntityHandle face_handle, +void FBiGeom_getFaceType(FBiGeom_Instance instance, iBase_EntityHandle face_handle, char* face_type, int* err, int* face_type_length) { + std::string type = "nonplanar"; // for swept faces created with rays between surfaces, + // we could actually create planar surfaces; maybe we should recognize them as such + face_type = new char[type.length()+1]; + strcpy(face_type, type.c_str()); + *face_type_length = type.length()+1; + RETURN(iBase_SUCCESS); } void FBiGeom_getParametric(FBiGeom_Instance instance, int* is_parametric, int* err) { *is_parametric = 0; //(false) @@ -1226,6 +1237,8 @@ void FBiGeom_getNumEntSets(FBiGeom_Instance instance, iBase_EntitySetHandle entity_set_handle, int num_hops, int *num_sets, int *err) { + // TODO here, we should really get only the entity sets that have gents as members + // we have the convention that entity sets of geom dimension 4 iMesh_getNumEntSets(IMESH_INSTANCE(instance), entity_set_handle, num_hops, num_sets, err); } @@ -1235,6 +1248,8 @@ iBase_EntitySetHandle** contained_set_handles, int* contained_set_handles_allocated, int* contained_set_handles_size, int *err) { + // TODO here, we should really get only the entity sets that have gents as members + // we have the convention that entity sets of geom dimension 4 iMesh_getEntSets(IMESH_INSTANCE(instance), entity_set_handle, num_hops,

1 0

r5264 - MOAB/trunk/tools/dagmc
by sjackson＠cae.wisc.edu 15 Dec '11

15 Dec '11

Author: sjackson Date: 2011-12-15 15:35:46 -0600 (Thu, 15 Dec 2011) New Revision: 5264 Modified: MOAB/trunk/tools/dagmc/DagMC.cpp Log: Fix an issue with DagMC's overlap tolerance Remove a printed warning message when overlaps of a certain size are detected. This caused tons of unwanted stdout spam for users who enabled larger overlap tolerances. The message remains, but is relegated to debug mode, which already produces copious output. Modified: MOAB/trunk/tools/dagmc/DagMC.cpp =================================================================== --- MOAB/trunk/tools/dagmc/DagMC.cpp 2011-12-15 17:13:43 UTC (rev 5263) +++ MOAB/trunk/tools/dagmc/DagMC.cpp 2011-12-15 21:35:46 UTC (rev 5264) @@ -715,14 +715,10 @@ history->prev_facets.push_back( facets[exit_idx] ); } - // print a warning if the negative ray length was excessive - if(-0.1 > dists[exit_idx]) { - std:: cout << "WARNING: overlap track length=" << dists[exit_idx] - << " next_surf=" << id_by_index(2, index_by_handle(next_surf)) - << " vol_id=" << id_by_index(3, index_by_handle(vol)) << std::endl; - } - if (debug) { + if( 0 > dists[exit_idx] ){ + std::cout << " OVERLAP track length=" << dists[exit_idx] << std::endl; + } std::cout << " next_surf = " << id_by_index(2, index_by_handle(next_surf)) << ", dist = " << next_surf_dist << " new_pt="; for( int i = 0; i < 3; ++i ){

1 0

r5263 - MOAB/trunk/tools/mbzoltan
by hongjun＠mcs.anl.gov 15 Dec '11

15 Dec '11

Author: hongjun Date: 2011-12-15 11:13:43 -0600 (Thu, 15 Dec 2011) New Revision: 5263 Modified: MOAB/trunk/tools/mbzoltan/mbpart.cpp Log: o Bug fixed o Geometry partition mesh size option is used incorreclty Modified: MOAB/trunk/tools/mbzoltan/mbpart.cpp =================================================================== --- MOAB/trunk/tools/mbzoltan/mbpart.cpp 2011-12-15 07:11:01 UTC (rev 5262) +++ MOAB/trunk/tools/mbzoltan/mbpart.cpp 2011-12-15 17:13:43 UTC (rev 5263) @@ -149,7 +149,7 @@ clock_t t = clock(); const char* options = NULL; - if (part_geom_mesh_size) options = "FACET_DISTANCE_TOLERANCE=0.1"; + if (part_geom_mesh_size > 0.) options = "FACET_DISTANCE_TOLERANCE=0.1"; ErrorCode rval = mb.load_file( input_file.c_str(), 0, options ); if (MB_SUCCESS != rval) { std::cerr << input_file << " : failed to read file." << std::endl;

1 0

r5262 - MOAB/trunk/itaps/igeom
by iulian＠mcs.anl.gov 15 Dec '11

15 Dec '11

Author: iulian Date: 2011-12-15 01:11:01 -0600 (Thu, 15 Dec 2011) New Revision: 5262 Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp Log: forgot functions needed by advancing front meshers in meshkit. (one for tangent at u on an edge, one for evaluation close to a surface) Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-14 06:36:12 UTC (rev 5261) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-15 07:11:01 UTC (rev 5262) @@ -1024,8 +1024,12 @@ int parameters_size, double** normals, int* normals_allocated, int* normals_size, int* err) { } -void FBiGeom_getEntTgntU(FBiGeom_Instance, iBase_EntityHandle entity_handle, +void FBiGeom_getEntTgntU(FBiGeom_Instance instance, iBase_EntityHandle entity_handle, double u, double* tgnt_i, double* tgnt_j, double* tgnt_k, int* err) { + ErrorCode rval = FBE_cast(instance)->getEntTgntU( (moab::EntityHandle)entity_handle , u, + *tgnt_i, *tgnt_j, *tgnt_k); + CHKERR(rval, "Failed to get tangent from u"); + RETURN(iBase_SUCCESS); } void FBiGeom_getArrTgntU(FBiGeom_Instance, iBase_EntityHandle const* edge_handles, int edge_handles_size, int storage_order, double const* parameters, @@ -1760,7 +1764,29 @@ double* cvtr2_k, int* err ) { - RETURN(iBase_FAILURE); + /* + moab::ErrorCode rval = _fbEngine->getFcEvalXYZ( (moab::EntityHandle) face, + x, y, z, + on_x, on_y, on_z, + nrml_i, nrml_j, nrml_k, + cvtr1_i, cvtr1_j, cvtr1_k, + cvtr2_i, cvtr2_j, cvtr2_k );*/ + // camal really does not use curvatures + // the most it is calling for normals and for closest point + // return all curvatures = 0 for the time being, because we + // know camal is not requesting them + + *cvtr1_i=*cvtr1_j=*cvtr1_k= *cvtr2_i= *cvtr2_j= *cvtr2_k=0.; + // first get closest point, then normal, separately + moab::ErrorCode rval = FBE_cast(instance)->getEntClosestPt((moab::EntityHandle) face_handle, + x, y, z, + on_x, on_y, on_z ); + CHKERR(rval,"can't get closest point on surface "); + rval = FBE_cast(instance)->getEntNrmlXYZ( (moab::EntityHandle) face_handle, + x, y, z, + nrml_i, nrml_j, nrml_k ); // some inconsistency here, we use pointers, not refs + CHKERR(rval,"can't get normal on closest point on surface "); + RETURN(iBase_SUCCESS); } void FBiGeom_getArrEgEvalXYZ( FBiGeom_Instance instance,

1 0

Fwd: Re: Problems compiling Lasso with CUBIT-linked CGM and MOAB
by Tim Tautges 14 Dec '11

14 Dec '11

[Forwarding in case others are seeing issues...] -------- Original Message -------- Subject: Re: Problems compiling Lasso with CUBIT-linked CGM and MOAB Date: Wed, 14 Dec 2011 09:12:54 -0600 From: Tim Tautges <tautges(a)mcs.anl.gov> To: Michael Fladerer <fladerer(a)fnb.tu-darmstadt.de> Are you grabbing the nightly source tarballs for CGM, Lasso, and MOAB? The error you're having below looks like your Lasso is out of date. For you MOAB build, if you'll be linking with CGM through Lasso later, I suggest configuring *MOAB* without CGM, though I don't know whether that will always fail (I doubt it, assuming you're using the same version of CGM). The only other thing I see that might be an issue is that your path (PATH) env variable should include cubit's bin directory. For each of the libraries, make sure to run 'make check' after building, to make sure the build worked (for that to work, though, MOAB needs to be configured with netcdf). One other simplification is that, in your makefile, you can include iRel-Defs.inc, then use IMESH_INCLUDES, IGEOM_INCLUDES, and IREL_INCLUDES make variables on your compile line, and IXXX_LIBS on your link line (XXX=GEOM, MESH, REL); that'll pull in the proper include/lib search paths and other options. - tim On 12/14/2011 08:58 AM, Michael Fladerer wrote: > Dear Mr. Tautges, > > my name is Michael Fladerer and I work as a system administrator for > the Chair of Numerical Methods in Mechanical Engineering at Technische > Universitï¿½t Darmstadt, Germany. A couple of months ago obtained a > license for the software CUBIT from Sandia. > > Now I'm trying to compile and install CGM, MOAB, Lasso, Mesquite and > EBMeshKit with as much interfaces to each other as possible, but when I > try to compile Lasso from scratch I run into the following error: > > libtool: compile: mpiCC -DHAVE_CONFIG_H -DUSE_MPI -DIGEOM -DIMESH -I. -I. -I. -I. -I/data/software/cgm_cubit/include -I/data/software/moab_cubit/include -DSRCDIR=. -DENABLE_IGEOM -DENABLE_IMESH -I/data/software/moab_cubit/include -I/data/software/cgm_cubit/include -Wall -pipe -pedantic -Wno-long-long -O2 -DNDEBUG -MT Lasso.lo -MD -MP -MF .deps/Lasso.Tpo -c Lasso.cpp -fPIC -DPIC -o .libs/Lasso.o > MeshAssocPairSide.cpp: In member function 'virtual int MeshAssocPairSide::get_iterator(iBase_EntitySetHandle_Private*, iBase_EntityIterator_Private**)': > MeshAssocPairSide.cpp:258: error: invalid conversion from 'int' to 'iBase_EntityIterator_Private**' > MeshAssocPairSide.cpp:258: error: cannot convert 'iBase_EntityIterator_Private**' to 'int*' for argument '6' to 'void imesh_initentiter_(iMesh_Instance_Private*, iBase_EntitySetHandle_Private*, int, int, iBase_EntityIterator_Private**, int*)' > make[2]: *** [MeshAssocPairSide.lo] Error 1 > > > CGM v12.2.0b2pre was configured to install to the local directory > '/data/software/cgm_cubit' and to link against CUBIT v12.2 build 44970. > > Next MOAB v4.1.0pre was configured to install to > '/data/software/moab_cubit' and to link against this CGM installation. > > With these two installed I first tried to configure and compile Lasso > v3.0pre which failed with the above error message. Unfortunately, > compiling Lasso v2.5 also failed, but with a different error message: > > libtool: compile: mpiCC -DHAVE_CONFIG_H -DUSE_MPI -DIGEOM -DIMESH -I. -I. -I. -I. -I/data/software/moab_cubit/include -I/data/software/cgm_cubit/include -I/data/software/moab_cubit/include -I/data/software/cgm_cubit/include -O2 -DNDEBUG -MT AssocPairC.lo -MD -MP -MF .deps/AssocPairC.Tpo -c AssocPairC.cpp -fPIC -DPIC -o .libs/AssocPairC.o > In file included from AssocPair.hpp:4, > from AssocPair.cpp:1: > iRel_Lasso.hpp:7: error: 'iBase_Error' does not name a type > iRel_Lasso.hpp: In function 'int iRel_processError(int, const char*)': > iRel_Lasso.hpp:28: error: 'iRel_LAST_ERROR' was not declared in this scope > > > The following environment variables are set to specify the additional > libraries and includes from CUBIT, CGM and MOAB: > > LD_RUN_PATH=/data/software/moab_cubit/lib:/data/software/cgm_cubit/lib:/data/software/cubit-12.2-44970/bin > > LD_LIBRARY_PATH=/data/software/moab_cubit/lib:/data/software/cgm_cubit/lib:/data/software/cubit-12.2-44970/bin > > LDFLAGS='-Wl,-rpath -Wl,/data/software/moab_cubit/lib -Wl,-rpath -Wl,/data/software/cgm_cubit/lib -Wl,-rpath -Wl,/data/software/cubit-12.2-44970/bin > > CPPFLAGS='-I/data/software/moab_cubit/include -I/data/software/cgm_cubit/include' > > > Any advice would be highly appreciated. > > Regards, > Michael Fladerer > -- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory (tautges(a)mcs.anl.gov) (telecommuting from UW-Madison) phone (gvoice): (608) 354-1459 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706

2 1

Re: [MOAB-dev] Problems compiling Lasso with CUBIT-linked CGM and MOAB
by Tim Tautges 14 Dec '11

14 Dec '11

On 12/14/2011 10:44 AM, Michael Fladerer wrote: > Hi Tim, > > thanks for your quick response! > > On Wed Dec 14, 2011 at 09:12:54 -0600, Tim Tautges wrote: >> Are you grabbing the nightly source tarballs for CGM, Lasso, and >> MOAB? The error you're having below looks like your Lasso is out of >> date. >> > yes, I just grabbed the nightly-lasso.tar.gz[1] linked on the ITAPS > website. So, I think Lasso should be up-to-date, shouldn't it? > You should probably grab it from the Lasso wiki, at http://trac.mcs.anl.gov/projects/ITAPS/wiki/Lasso. >> For you MOAB build, if you'll be linking with CGM through Lasso >> later, I suggest configuring *MOAB* without CGM, though I don't know >> whether that will always fail (I doubt it, assuming you're using the >> same version of CGM). >> > OK, I'll check that next. I thought there was a strict installation > order (like CGM frist, then MOAB and then Lasso), because of the > available configuration options (--with-igeom --with-imesh --with-irel). > MOAB and CGM can be installed independent of each other, in either order. When you make MOAB dependent on CGM, you simply enable a MOAB reader that reads geometric model facets and geometric topology into MOAB and represents them as entity sets. If you do enable that option, then you need to build CGM before MOAB. >> The only other thing I see that might be an issue is that your path >> (PATH) env variable should include cubit's bin directory. >> > Right, my PATH didn't contain cubit's bin dir. I thought it was > unnecessary for building each of the software, but maybe it's not, so > I'll correct that befor the next build attempt. > >> For each of the libraries, make sure to run 'make check' after >> building, to make sure the build worked (for that to work, though, >> MOAB needs to be configured with netcdf). >> > Netcdf was already installed before I started compiling. However, I > didn't run the check for all the packages, as they seemed to compile and > install without giving a real error. But, of course, I'll run them now > and from now on, to make sure everything is alright. Never a bad idea. We use our make check pretty frequently, so they're designed to run relatively fast (if anything, we probably need more tests...) > >> One other simplification is that, in your makefile, you can include >> iRel-Defs.inc, then use IMESH_INCLUDES, IGEOM_INCLUDES, and >> IREL_INCLUDES make variables on your compile line, and IXXX_LIBS on >> your link line (XXX=GEOM, MESH, REL); that'll pull in the proper >> include/lib search paths and other options. >> > Ah, good to know, thanks! I already did that when I compiled mesquite > as it was already documented in the readme file. I'll give it try for > Lasso, too. > > Again, thank you very much! You bet, let us know if you have any problems. - tim > > Cheers, > Michael > -- ================================================================ "You will keep in perfect peace him whose mind is steadfast, because he trusts in you." Isaiah 26:3 Tim Tautges Argonne National Laboratory (tautges(a)mcs.anl.gov) (telecommuting from UW-Madison) phone (gvoice): (608) 354-1459 1500 Engineering Dr. fax: (608) 263-4499 Madison, WI 53706

1 0

r5261 - MOAB/trunk/itaps/igeom
by iulian＠mcs.anl.gov 14 Dec '11

14 Dec '11

Author: iulian Date: 2011-12-14 00:36:12 -0600 (Wed, 14 Dec 2011) New Revision: 5261 Added: MOAB/trunk/itaps/igeom/testSmooth2.cc Modified: MOAB/trunk/itaps/igeom/FBiGeom.h MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp MOAB/trunk/itaps/igeom/FBiGeom_MOAB.hpp MOAB/trunk/itaps/igeom/Makefile.am Log: an example of the new FBiGeom instantiation, that will take as input an iMesh instance (moab) and a "model root" set this function is a special brand, it makes a direct connection between iMesh and iGeom; right now, it can't be easily declared in FBiGeom.h, because it has the iMesh_Instance as input parameter. The implementation of this new function (FBiGeom_newGeomFromMesh) is in FBiGeom_MOAB.cpp, but its declaration should be maybe somewhere else (for the example to run, I just declared it extern in the test itself :( ) Modified: MOAB/trunk/itaps/igeom/FBiGeom.h =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom.h 2011-12-13 15:38:07 UTC (rev 5260) +++ MOAB/trunk/itaps/igeom/FBiGeom.h 2011-12-14 06:36:12 UTC (rev 5261) @@ -59,6 +59,7 @@ #include "iBase.h" #include "FBiGeom_protos.h" +//#include "iMesh.h" #ifdef __cplusplus extern "C" { #endif @@ -104,6 +105,21 @@ int* err, int options_len ); + /**\brief Construct a new FBiGeom instance + * + * Construct a new FBiGeom instance, using an existing moab iMesh instance + * and a root set that encapsulates the topological model + * \param mesh iMesh_Instance + * \param set root set for the mesh based geometry + * \param options Pointer to implementation-specific options string + * \param instance Pointer to FBiGeom instance handle returned from function + * \param *err Pointer to error type returned from function + * \param options_len Length of the character string pointed to by options + */ + +/* void FBiGeom_newGeomFromMesh( iMesh_Instance mesh, iBase_EntitySetHandle set, + const char *options, FBiGeom_Instance *geom, + int *err, int options_len);*/ /**\brief Destroy an FBiGeom instance * * Destroy an FBiGeom instance Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-13 15:38:07 UTC (rev 5260) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-14 06:36:12 UTC (rev 5261) @@ -75,6 +75,29 @@ *err = iBase_SUCCESS; } +void FBiGeom_newGeomFromMesh(iMesh_Instance mesh, iBase_EntitySetHandle set, + const char *options, FBiGeom_Instance *geom, + int *err, int options_len) +{ + MBiMesh * mbimesh = reinterpret_cast<MBiMesh *>(mesh); + moab::Interface * mbi = mbimesh->mbImpl; + moab::EntityHandle rootSet = reinterpret_cast<moab::EntityHandle> (set); + moab::GeomTopoTool * gtt = new moab::GeomTopoTool(mbi, true, rootSet);

1 0

r5259 - MOAB/trunk/itaps/igeom
by iulian＠mcs.anl.gov 12 Dec '11

12 Dec '11

Author: iulian Date: 2011-12-12 16:58:49 -0600 (Mon, 12 Dec 2011) New Revision: 5259 Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp Log: add the missing methods (not implemented yet) With this change, FBiGeom.hpp in MeshKit can be very similar to iGeom.hpp Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-12 20:16:34 UTC (rev 5258) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-12 22:58:49 UTC (rev 5259) @@ -1064,12 +1064,6 @@ int* err) { } -void FBiGeom_getArrTolerance(FBiGeom_Instance, - iBase_EntityHandle const* entity_handles, int entity_handles_size, - double** tolerances, int* tolerances_allocated, int* tolerances_size, - int* err) { -} - void FBiGeom_initEntIter(FBiGeom_Instance, iBase_EntitySetHandle entity_set_handle, int entity_dimension, iBase_EntityIterator* entity_iterator, int* err) { } @@ -1645,4 +1639,204 @@ iBase_EntitySetHandle* result_entity_set, int *err) { } +// TODO methods not yet implemented +void FBiGeom_getEntClosestPtTrimmed( FBiGeom_Instance instance, + iBase_EntityHandle entity_handle, + double near_x, + double near_y, + double near_z, + double* on_x, + double* on_y, + double* on_z, + int* err ) +{ + RETURN(iBase_FAILURE); +} +void FBiGeom_getFcCvtrXYZ( FBiGeom_Instance instance, + iBase_EntityHandle face_handle, + double x, + double y, + double z, + double* cvtr1_i, + double* cvtr1_j, + double* cvtr1_k, + double* cvtr2_i, + double* cvtr2_j, + double* cvtr2_k, + int* err ) +{ + RETURN(iBase_FAILURE); +} +

1 0

r5256 - in MOAB/trunk: itaps/igeom src
by iulian＠mcs.anl.gov 11 Dec '11

11 Dec '11

Author: iulian Date: 2011-12-11 23:14:53 -0600 (Sun, 11 Dec 2011) New Revision: 5256 Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp MOAB/trunk/src/FBEngine.cpp Log: the iGeom method getNumOfType can take as input type = 4, which means all, vertex through volume also, modify correspnding FBEngine method to be more efficient, and to take advantage of the moab::get_entities_by_type_and_tag, to filter the geo sets from the beginning Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-09 18:35:34 UTC (rev 5255) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-12 05:14:53 UTC (rev 5256) @@ -179,7 +179,7 @@ void FBiGeom_getNumOfType(FBiGeom_Instance instance, iBase_EntitySetHandle set_handle, int entity_type, int* num_out, int* err) { - if (0 > entity_type || 3 < entity_type) { + if (0 > entity_type || 4 < entity_type) { ERROR(iBase_INVALID_ENTITY_TYPE, "Bad entity type."); } ErrorCode rval = FBE_cast(instance)->getNumOfType((EntityHandle)set_handle, entity_type, num_out); Modified: MOAB/trunk/src/FBEngine.cpp =================================================================== --- MOAB/trunk/src/FBEngine.cpp 2011-12-09 18:35:34 UTC (rev 5255) +++ MOAB/trunk/src/FBEngine.cpp 2011-12-12 05:14:53 UTC (rev 5256) @@ -482,22 +482,37 @@ ErrorCode FBEngine::getNumOfType(EntityHandle set, int ent_type, int * pNum) { - if (0 > ent_type || 3 < ent_type) { + if (0 > ent_type || 4 < ent_type) { std::cout << "Invalid type\n"; return MB_FAILURE; } - int num_sets; - ErrorCode rval = MBI->get_number_entities_by_type(set, MBENTITYSET, num_sets); + // get sets of geom dimension tag from here, and intersect with the gentities from goe + // ranges - MBERRORR(rval, "Failed to get number of sets in the original set."); + // get the geom dimensions sets in the set (AKA gentities) + Range geom_sets; + Tag geom_tag; + ErrorCode rval = _mbImpl->tag_get_handle(GEOM_DIMENSION_TAG_NAME, 1, MB_TYPE_INTEGER, geom_tag, + MB_TAG_SPARSE|MB_TAG_CREAT); + MBERRORR(rval, "Failed to get geom tag."); + rval = _mbImpl->get_entities_by_type_and_tag(set, MBENTITYSET, &geom_tag, NULL, 1, geom_sets, + Interface::UNION); + MBERRORR(rval, "Failed to get gentities from set"); - // get also all sets in the set - Range sets; - rval = _mbImpl->get_entities_by_type(set, MBENTITYSET, sets, false); // nonrecursive - - // see how many are in the range - sets = intersect(sets, _my_geomTopoTool->geoRanges()[ent_type]); - *pNum = sets.size(); + if (ent_type==4)

1 0

r5250 - MOAB/trunk/itaps/igeom
by iulian＠mcs.anl.gov 08 Dec '11

08 Dec '11

Author: iulian Date: 2011-12-08 23:07:34 -0600 (Thu, 08 Dec 2011) New Revision: 5250 Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp Log: error in using the CHECK_SIZE macro Modified: MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-08 22:04:21 UTC (rev 5249) +++ MOAB/trunk/itaps/igeom/FBiGeom_MOAB.cpp 2011-12-09 05:07:34 UTC (rev 5250) @@ -201,7 +201,8 @@ void FBiGeom_getArrType(FBiGeom_Instance instance, iBase_EntityHandle const* entity_handles, int entity_handles_size, int** type, int* type_allocated, int* type_size, int* err) { - CHECK_SIZE(*type, *type_allocated, *type_size, int, NULL); + CHECK_SIZE(*type, *type_allocated, entity_handles_size, int, NULL); + *type_size=entity_handles_size; int tmp_err;

1 0