[cig-commits] r9223 - in mc/3D/CitcomS/trunk: examples module visual
tan2 at geodynamics.org
tan2 at geodynamics.org
Mon Feb 4 15:21:19 PST 2008
Author: tan2
Date: 2008-02-04 15:21:19 -0800 (Mon, 04 Feb 2008)
New Revision: 9223
Modified:
mc/3D/CitcomS/trunk/examples/Makefile.am
mc/3D/CitcomS/trunk/module/misc.c
mc/3D/CitcomS/trunk/visual/Makefile.am
Log:
Fixed potential memory leak
Modified: mc/3D/CitcomS/trunk/examples/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/examples/Makefile.am 2008-02-04 23:13:23 UTC (rev 9222)
+++ mc/3D/CitcomS/trunk/examples/Makefile.am 2008-02-04 23:21:19 UTC (rev 9223)
@@ -33,65 +33,6 @@
Cookbook4/coor.dat \
Cookbook5/cookbook5.cfg \
Cookbook5/coor.dat \
- Cookbook5/ic/cookbook5.velo.0.0 \
- Cookbook5/ic/cookbook5.velo.1.0 \
- Cookbook5/velocity/bvel.dat0 \
- Cookbook5/velocity/bvel.dat1 \
- Cookbook5/velocity/bvel.dat10 \
- Cookbook5/velocity/bvel.dat11 \
- Cookbook5/velocity/bvel.dat12 \
- Cookbook5/velocity/bvel.dat13 \
- Cookbook5/velocity/bvel.dat14 \
- Cookbook5/velocity/bvel.dat15 \
- Cookbook5/velocity/bvel.dat16 \
- Cookbook5/velocity/bvel.dat17 \
- Cookbook5/velocity/bvel.dat18 \
- Cookbook5/velocity/bvel.dat19 \
- Cookbook5/velocity/bvel.dat2 \
- Cookbook5/velocity/bvel.dat20 \
- Cookbook5/velocity/bvel.dat21 \
- Cookbook5/velocity/bvel.dat22 \
- Cookbook5/velocity/bvel.dat23 \
- Cookbook5/velocity/bvel.dat24 \
- Cookbook5/velocity/bvel.dat25 \
- Cookbook5/velocity/bvel.dat26 \
- Cookbook5/velocity/bvel.dat27 \
- Cookbook5/velocity/bvel.dat28 \
- Cookbook5/velocity/bvel.dat29 \
- Cookbook5/velocity/bvel.dat3 \
- Cookbook5/velocity/bvel.dat30 \
- Cookbook5/velocity/bvel.dat31 \
- Cookbook5/velocity/bvel.dat32 \
- Cookbook5/velocity/bvel.dat33 \
- Cookbook5/velocity/bvel.dat34 \
- Cookbook5/velocity/bvel.dat35 \
- Cookbook5/velocity/bvel.dat36 \
- Cookbook5/velocity/bvel.dat37 \
- Cookbook5/velocity/bvel.dat38 \
- Cookbook5/velocity/bvel.dat39 \
- Cookbook5/velocity/bvel.dat4 \
- Cookbook5/velocity/bvel.dat40 \
- Cookbook5/velocity/bvel.dat41 \
- Cookbook5/velocity/bvel.dat42 \
- Cookbook5/velocity/bvel.dat43 \
- Cookbook5/velocity/bvel.dat44 \
- Cookbook5/velocity/bvel.dat45 \
- Cookbook5/velocity/bvel.dat46 \
- Cookbook5/velocity/bvel.dat47 \
- Cookbook5/velocity/bvel.dat48 \
- Cookbook5/velocity/bvel.dat49 \
- Cookbook5/velocity/bvel.dat5 \
- Cookbook5/velocity/bvel.dat50 \
- Cookbook5/velocity/bvel.dat51 \
- Cookbook5/velocity/bvel.dat52 \
- Cookbook5/velocity/bvel.dat53 \
- Cookbook5/velocity/bvel.dat54 \
- Cookbook5/velocity/bvel.dat55 \
- Cookbook5/velocity/bvel.dat56 \
- Cookbook5/velocity/bvel.dat6 \
- Cookbook5/velocity/bvel.dat7 \
- Cookbook5/velocity/bvel.dat8 \
- Cookbook5/velocity/bvel.dat9 \
Cookbook6/cookbook6.cfg \
Cookbook6/coord.dat \
Cookbook6/README \
@@ -99,21 +40,11 @@
Cookbook8/cookbook8.cfg \
Cookbook8/coord.dat \
Cookbook9/cookbook9.cfg \
- Cookbook9/ic/cntn.velo.0.0 \
- Cookbook9/ic/cntn.velo.1.0 \
- Cookbook9/ic/embd.velo.0.0 \
- Cookbook9/ic/embd.velo.1.0 \
- Cookbook9/velocity/bvel.dat0 \
- Cookbook9/velocity/bvel.dat1 \
example0.cfg \
example1.cfg \
Full/input.sample \
Full/machine.sample \
- Full/velbc/README \
- Full/velbc/velbc_full.tar.gz \
Regional/input.sample \
- Regional/machines.sample \
- Regional/velbc/README \
- Regional/velbc/velbc_regional.tar.gz
+ Regional/machines.sample
## end of Makefile.am
Modified: mc/3D/CitcomS/trunk/module/misc.c
===================================================================
--- mc/3D/CitcomS/trunk/module/misc.c 2008-02-04 23:13:23 UTC (rev 9222)
+++ mc/3D/CitcomS/trunk/module/misc.c 2008-02-04 23:21:19 UTC (rev 9223)
@@ -123,6 +123,13 @@
// This section is for finished implementation
////////////////////////////////////////////////////////////////////////*/
+
+void deleteE(struct All_variables *E)
+{
+ free(E);
+}
+
+
char pyCitcom_citcom_init__doc__[] = "";
char pyCitcom_citcom_init__name__[] = "citcom_init";
@@ -148,9 +155,9 @@
"%s: 'libCitcomSCommon.citcom_init' failed",
pyCitcom_citcom_init__name__);
- cobj = PyCObject_FromVoidPtr(E, NULL);
+ cobj = PyCObject_FromVoidPtr(E, deleteE);
- return Py_BuildValue("O", cobj);
+ return Py_BuildValue("N", cobj);
}
Modified: mc/3D/CitcomS/trunk/visual/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/visual/Makefile.am 2008-02-04 23:13:23 UTC (rev 9222)
+++ mc/3D/CitcomS/trunk/visual/Makefile.am 2008-02-04 23:21:19 UTC (rev 9223)
@@ -55,50 +55,6 @@
zslice.py
nobase_dist_visual_DATA = \
- Mayavi2/citcoms_plugins/__init__.py \
- Mayavi2/citcoms_plugins/plugins/__init__.py \
- Mayavi2/citcoms_plugins/plugins/CitcomS_hdf_file_reader.py \
- Mayavi2/citcoms_plugins/plugins/CitcomSHDFUgrid.py \
- Mayavi2/citcoms_plugins/plugins/OpenCitcomSFILES.py \
- Mayavi2/citcoms_plugins/plugins/filter/CitcomSFilterActions.py \
- Mayavi2/citcoms_plugins/plugins/filter/__init__.py \
- Mayavi2/citcoms_plugins/plugins/filter/CitcomSshowSurface.py \
- Mayavi2/citcoms_plugins/plugins/filter/CitcomSSphere.py \
- Mayavi2/citcoms_plugins/plugins/filter/CitcomsCapFilter.py \
- Mayavi2/citcoms_plugins/plugins/filter/CitcomsReduceFilter.py \
- Mayavi2/citcoms_plugins/utils.py \
- Mayavi2/citcoms_plugins/custom_ui.py \
- Mayavi2/citcoms_plugins/README \
- Mayavi2/README \
- Mayavi2/mayavi_custom_ui.py \
- samples/cookbook1.h5 \
- samples/cookbook1.100.h5 \
- samples/fulltest.cap00.100 \
- samples/fulltest.cap00.100.general \
- samples/fulltest.cap01.100 \
- samples/fulltest.cap01.100.general \
- samples/fulltest.cap02.100 \
- samples/fulltest.cap02.100.general \
- samples/fulltest.cap03.100 \
- samples/fulltest.cap03.100.general \
- samples/fulltest.cap04.100 \
- samples/fulltest.cap04.100.general \
- samples/fulltest.cap05.100 \
- samples/fulltest.cap05.100.general \
- samples/fulltest.cap06.100 \
- samples/fulltest.cap06.100.general \
- samples/fulltest.cap07.100 \
- samples/fulltest.cap07.100.general \
- samples/fulltest.cap08.100 \
- samples/fulltest.cap08.100.general \
- samples/fulltest.cap09.100 \
- samples/fulltest.cap09.100.general \
- samples/fulltest.cap10.100 \
- samples/fulltest.cap10.100.general \
- samples/fulltest.cap11.100 \
- samples/fulltest.cap11.100.general \
- samples/regtest.cap00.100 \
- samples/regtest.cap00.100.general \
visFull.cfg \
visRegional.cfg \
visRegionalSurface.cfg
More information about the cig-commits
mailing list