[cig-commits] r5474 - in mc/3D/CitcomS/trunk: CitcomS module visual

[leif at geodynamics.org]

Author: leif
Date: 2006-12-05 17:08:58 -0800 (Tue, 05 Dec 2006)
New Revision: 5474

Removed:
   mc/3D/CitcomS/trunk/module/Regionalmodule.c
Modified:
   mc/3D/CitcomS/trunk/CitcomS/Makefile.am
   mc/3D/CitcomS/trunk/visual/Makefile.am
Log:
Adding missing files to tarball ("make dist"), including the
'Mayavi2' directory, which is now installed under share/CitcomS.
Also deleted 'Regionalmodule.c', which is no longer used.


Modified: mc/3D/CitcomS/trunk/CitcomS/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Makefile.am	2006-12-06 00:49:49 UTC (rev 5473)
+++ mc/3D/CitcomS/trunk/CitcomS/Makefile.am	2006-12-06 01:08:58 UTC (rev 5474)
@@ -48,6 +48,7 @@
 	CoupledApp.py \
 	Coupler/__init__.py \
 	Coupler/ContainingCoupler.py \
+	Coupler/Coupler.py \
 	Coupler/EmbeddedCoupler.py \
 	Coupler/Inlet.py \
 	Coupler/Outlet.py \

Deleted: mc/3D/CitcomS/trunk/module/Regionalmodule.c
===================================================================
--- mc/3D/CitcomS/trunk/module/Regionalmodule.c	2006-12-06 00:49:49 UTC (rev 5473)
+++ mc/3D/CitcomS/trunk/module/Regionalmodule.c	2006-12-06 01:08:58 UTC (rev 5474)
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-// 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// 
-//<LicenseText>
-//
-// CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-// Copyright (C) 2002-2005, California Institute of Technology.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-//</LicenseText>
-// 
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// 
-
-#include <Python.h>
-
-#include "exceptions.h"
-#include "bindings.h"
-
-
-char pyRegional_module__doc__[] = "";
-
-// Initialization function for the module (*must* be called initRegional)
-extern "C"
-void
-initRegional()
-{
-    // create the module and add the functions
-    PyObject * m = Py_InitModule4(
-        "Regional", pyCitcom_methods,
-        pyRegional_module__doc__, 0, PYTHON_API_VERSION);
-
-    // get its dictionary
-    PyObject * d = PyModule_GetDict(m);
-
-    // check for errors
-    if (PyErr_Occurred()) {
-        Py_FatalError("can't initialize module Regional");
-    }
-
-    // install the module exceptions
-    pyCitcom_runtimeError = PyErr_NewException("Regional.runtime", 0, 0);
-    PyDict_SetItemString(d, "RuntimeException", pyCitcom_runtimeError);
-
-    return;
-}
-
-// version
-// $Id$
-
-// End of file

Modified: mc/3D/CitcomS/trunk/visual/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/Makefile.am	2006-12-06 00:49:49 UTC (rev 5473)
+++ mc/3D/CitcomS/trunk/visual/Makefile.am	2006-12-06 01:08:58 UTC (rev 5474)
@@ -36,6 +36,7 @@
 	batchcombine.py \
 	batchpaste.sh \
 	batchsurf.py \
+	citcoms_datadir \
 	combine.py \
 	combinesurf.py \
 	dxgeneral.sh \
@@ -55,6 +56,28 @@
 	zslice.py
 
 nobase_dist_visual_DATA = \
+	Mayavi2/plugins/plugin_defs/mayavi_ui_plugin_definition.py \
+	Mayavi2/plugins/CitcomHDFThread.py \
+	Mayavi2/plugins/filter/CitcomSFilterActions.py \
+	Mayavi2/plugins/filter/CitcomSSphere.py \
+	Mayavi2/plugins/filter/CitcomSreduce.py \
+	Mayavi2/plugins/filter/CitcomSshowCaps.py \
+	Mayavi2/plugins/filter/CitcomSshowSurface.py \
+	Mayavi2/plugins/filter/__init__.py \
+	Mayavi2/plugins/CitcomSHDFUgrid.py \
+	Mayavi2/plugins/__init__.py \
+	Mayavi2/plugins/CitcomS_hdf_file_reader.py \
+	Mayavi2/plugins/CitcomS_vtk_file_reader.py \
+	Mayavi2/plugins/OpenCitcomSFILES.py \
+	Mayavi2/__init__.py \
+	Mayavi2/Citcoms_HdfDisplay.py \
+	Mayavi2/Citcoms_Hdf2Vtk.py \
+	Mayavi2/citcoms_display/mayavi_custom_ui.py \
+	Mayavi2/citcoms_display/__init__.py \
+	Mayavi2/citcoms_display/actions.py \
+	Mayavi2/Citcoms_VtkDisplay.py \
+	Mayavi2/Citcoms_Hdf2Vtk.c \
+	Mayavi2/README \
 	samples/cookbook1.h5 \
 	samples/cookbook1.100.h5 \
 	samples/fulltest.cap00.100 \
@@ -117,8 +140,8 @@
 
 if COND_HDF5
     bin_PROGRAMS = h5tocap h5tovelo
-    h5tocap_SOURCES = h5tocap.c h5util.c
-    h5tovelo_SOURCES = h5tovelo.c h5util.c
+    h5tocap_SOURCES = h5tocap.c h5util.c h5util.h
+    h5tovelo_SOURCES = h5tovelo.c h5util.c h5util.h
     h5tovelo_LDADD = $(LIBHDF5)
 endif