Author: janehu Date: 2013-02-18 12:26:18 -0600 (Mon, 18 Feb 2013) New Revision: 6010 Modified: cgm/branches/merge-cubit14.0/geom/parallel/CABodies.cpp cgm/branches/merge-cubit14.0/geom/parallel/CABodies.hpp cgm/branches/merge-cubit14.0/geom/parallel/CGMParallelComm.cpp cgm/branches/merge-cubit14.0/geom/parallel/CGMReadParallel.cpp cgm/branches/merge-cubit14.0/geom/parallel/CGMReadParallel.hpp cgm/branches/merge-cubit14.0/geom/parallel/Makefile.am cgm/branches/merge-cubit14.0/geom/parallel/ProcData.hpp cgm/branches/merge-cubit14.0/geom/parallel/TDParallel.cpp cgm/branches/merge-cubit14.0/geom/parallel/TDParallel.hpp Log: Another try to checking parallel updates for cubit14.0. passed parallel make check test for cgm on occ6.5.3. Modified: cgm/branches/merge-cubit14.0/geom/parallel/CABodies.cpp =================================================================== --- cgm/branches/merge-cubit14.0/geom/parallel/CABodies.cpp 2013-02-16 16:28:56 UTC (rev 6009) +++ cgm/branches/merge-cubit14.0/geom/parallel/CABodies.cpp 2013-02-18 18:26:18 UTC (rev 6010) @@ -1,7 +1,6 @@ //- Class: CABodies //- Description: Cubit Attribute for a list of bodies the entity is part of. //- Author: Hong-Jun Kim -//- Checked By: Tim Tautges //- Version: #include "CABodies.hpp" @@ -11,25 +10,18 @@ #include "CastTo.hpp" #include "TDParallel.hpp" -CubitAttrib* CABodies_creator(RefEntity* entity, CubitSimpleAttrib *p_csa) +CubitAttrib* CABodies_creator(RefEntity* entity, const CubitSimpleAttrib& p_csa) { CABodies *new_attrib = NULL; - if (NULL == p_csa) - { - new_attrib = new CABodies(entity); - } - else - { - new_attrib = new CABodies(entity, p_csa); - } - + CubitSimpleAttrib csa = p_csa; + new_attrib = new CABodies(entity, &csa); return new_attrib; } CABodies::CABodies(RefEntity* new_attrib_owner, - CubitSimpleAttrib *csa_ptr) - : CubitAttrib(new_attrib_owner) + CubitSimpleAttrib *csa_ptr) + : CubitAttrib(new_attrib_owner) { assert ( csa_ptr != NULL ); if (DEBUG_FLAG(138)) @@ -39,19 +31,44 @@ (attribOwnerEntity ? attribOwnerEntity->id() : 0)); } - //initialize(); - - DLIList<int*> *i_list = csa_ptr->int_data_list(); + std::vector<int> i_list = csa_ptr->int_data_list();