[MOAB-dev] r4645 - in MOAB/trunk: examples src src/moab tools

[Tim Tautges]

Note I negotiated this with Iulian ahead of time, so he's not brazenly trampling over the MK tests.

- tim

On 03/25/2011 10:54 AM, iulian at mcs.anl.gov wrote:
> 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";
>

-- 
================================================================
"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 at mcs.anl.gov)      (telecommuting from UW-Madison)
          phone: (608) 263-8485      1500 Engineering Dr.
            fax: (608) 263-4499      Madison, WI 53706