[MOAB-dev] r5822 - in MOAB/trunk/tools: mbcoupler mcnpmit

[Tim Tautges]

Yeah, unfortunately this will have to wait until I sort out and unify some of the point locator stuff that was done this 
summer.  Which has to wait until after the current coupling milestone is done.

- tim

On 10/22/2012 05:43 PM, vijaysm at mcs.anl.gov wrote:
> Author: vijaysm
> Date: 2012-10-22 17:43:38 -0500 (Mon, 22 Oct 2012)
> New Revision: 5822
>
> Modified:
>     MOAB/trunk/tools/mbcoupler/ElemUtil.hpp
>     MOAB/trunk/tools/mcnpmit/Makefile.am
> Log:
> Reverting previous change to ElemUtil since the compilation errors occurred due to mcnpmit tool not having the right include path and not how mbcoupler was compiled.
>
> Modified: MOAB/trunk/tools/mbcoupler/ElemUtil.hpp
> ===================================================================
> --- MOAB/trunk/tools/mbcoupler/ElemUtil.hpp	2012-10-22 22:14:39 UTC (rev 5821)
> +++ MOAB/trunk/tools/mbcoupler/ElemUtil.hpp	2012-10-22 22:43:38 UTC (rev 5822)
> @@ -7,12 +7,12 @@
>
>   // to access data structures for spectral elements
>   extern "C"{
> -#include "point_locater/lotte/types.h"
> -#include "point_locater/lotte/poly.h"
> -#include "point_locater/lotte/tensor.h"
> -#include "point_locater/lotte/findpt.h"
> -#include "point_locater/lotte/extrafindpt.h"
> -#include "point_locater/lotte/errmem.h"
> +#include "types.h"
> +#include "poly.h"
> +#include "tensor.h"
> +#include "findpt.h"
> +#include "extrafindpt.h"
> +#include "errmem.h"
>   }
>
>   namespace moab {
>
> Modified: MOAB/trunk/tools/mcnpmit/Makefile.am
> ===================================================================
> --- MOAB/trunk/tools/mcnpmit/Makefile.am	2012-10-22 22:14:39 UTC (rev 5821)
> +++ MOAB/trunk/tools/mcnpmit/Makefile.am	2012-10-22 22:43:38 UTC (rev 5822)
> @@ -1,7 +1,7 @@
>   LDADD = $(top_builddir)/src/libMOAB.la \
>           $(top_builddir)/tools/mbcoupler/libmbcoupler.la
>
> -AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/tools/mbcoupler
> +AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/tools/mbcoupler -I$(top_builddir)/src/moab/point_locater/lotte
>
>   bin_PROGRAMS = mcnpmit
>   mcnpmit_SOURCES = mcnpmit.hpp mcnpmit.cpp main.cpp
>
>

-- 
================================================================
"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 (gvoice): (608) 354-1459      1500 Engineering Dr.
             fax: (608) 263-4499      Madison, WI 53706