[MOAB-dev] r5843 - in MOAB/trunk: src/lotte src/moab/point_locater/lotte test/parallel tools/mbcoupler tools/mbcslam

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-31 11:13:51 -0500 (Wed, 31 Oct 2012)
New Revision: 5843

Modified:
   MOAB/trunk/src/lotte/findpt.c
   MOAB/trunk/src/moab/point_locater/lotte/extrafindpt.h
   MOAB/trunk/test/parallel/ucdtrvpart.cpp
   MOAB/trunk/tools/mbcoupler/ElemUtil.cpp
   MOAB/trunk/tools/mbcoupler/ElemUtil.hpp
   MOAB/trunk/tools/mbcoupler/ElementTest.cpp
   MOAB/trunk/tools/mbcslam/IntxUtils.cpp
   MOAB/trunk/tools/mbcslam/IntxUtils.hpp
Log:
compute gl points for a spectral quad
add a test in ElementTest in mbcoupler
add some utilities in mbcslam, not tested yet, to convert to/from spherical
coordinates


Modified: MOAB/trunk/src/lotte/findpt.c
===================================================================
--- MOAB/trunk/src/lotte/findpt.c	2012-10-30 16:52:27 UTC (rev 5842)
+++ MOAB/trunk/src/lotte/findpt.c	2012-10-31 16:13:51 UTC (rev 5843)
@@ -1580,34 +1580,8 @@
 
 #undef DIAGNOSTICS
 
-/*--------------------------------------------------------------------------
-   
-   2 - D
-     
-  --------------------------------------------------------------------------*/
 
-typedef struct {
-  unsigned constraints;
-  unsigned de, d1;
-  real *x[2], *fd1[2];
-} opt_edge_data_2;
-
-typedef struct {
-  unsigned constraints;
-  real x[2], jac[4];
-} opt_point_data_2;
-
-typedef struct {
-  lagrange_data *ld;
-  unsigned size[3];
-  const real *elx[2];
-  opt_edge_data_2 ed;
-  opt_point_data_2 pd;
-  real *work;
-  real x[2], jac[4];
-} opt_data_2;
-
-static void opt_alloc_2(opt_data_2 *p, lagrange_data *ld)
+void opt_alloc_2(opt_data_2 *p, lagrange_data *ld)
 {
   const unsigned nr = ld[0].n, ns = ld[1].n,
                  ne = umax_2(nr,ns),
@@ -1623,7 +1597,7 @@
   p->ed.fd1[1] = p->ed.fd1[0] + ne; 
 }
 
-static void opt_free_2(opt_data_2 *p)
+void opt_free_2(opt_data_2 *p)
 {
   free(p->work);
 }
@@ -1758,7 +1732,7 @@