source: issm/oecreview/Archive/12678-13393/ISSM-12861-12862.diff@ 20498

Last change on this file since 20498 was 13394, checked in by Mathieu Morlighem, 13 years ago

Added 12678-13393
File size: 3.0 KB
RevLine 
[13394]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12861)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12862)
5@@ -1,41 +0,0 @@
6-/* \file alloc_module.h
7- */
8-
9-
10-#ifdef HAVE_CONFIG_H
11- #include <config.h>
12-#else
13-#error "Cannot compile without HAVE_CONFIG_H symbol! run configure first!"
14-#endif
15-
16-#include <stdio.h>
17-#include <stdlib.h>
18-
19-#include "./alloc_module.h"
20-#include "../Exceptions/exceptions.h"
21-#include "../../include/include.h"
22-#include "../../classes/objects/objects.h"
23-
24-void xdelete_module(Matrix** pv){
25-
26- if (pv && *pv){
27- /*Actually, still get rid of internal Petsc matrix. Quick fix until Matlab handles C++
28- * correctly: */
29- #ifdef _HAVE_PETSC_
30- MatFree(&(*pv)->pmatrix->matrix);
31- #endif
32- *pv=NULL;
33- }
34-}
35-
36-void xdelete_module(Vector** pv){
37-
38- if (pv && *pv){
39- /*Actually, still get rid of internal Petsc vector. Quick fix until Matlab handles C++
40- * correctly: */
41- #ifdef _HAVE_PETSC_
42- VecFree(&(*pv)->pvector->vector);
43- #endif
44- *pv=NULL;
45- }
46-}
47Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h
48===================================================================
49--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h (revision 12861)
50+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h (revision 12862)
51@@ -1,11 +0,0 @@
52-/* \file alloc.h
53- */
54-
55-#ifndef _ALLOC_MODULE_H_
56-#define _ALLOC_MODULE_H_
57-class Matrix;
58-class Vector;
59-void xdelete_module(Matrix** pvptr);
60-void xdelete_module(Vector** pvptr);
61-
62-#endif
63Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h
64===================================================================
65--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12861)
66+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12862)
67@@ -6,7 +6,6 @@
68 #define _SHARED_H_
69
70 #include "Alloc/alloc.h"
71-#include "Alloc/alloc_module.h"
72 #include "Alloc/xNewDelete.h"
73 #include "Bamg/shared.h"
74 #include "Elements/elements.h"
75Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am
76===================================================================
77--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12861)
78+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12862)
79@@ -838,9 +838,7 @@
80
81 #}}}
82 #Modules sources{{{
83-module_sources= ./shared/Alloc/alloc_module.h\
84- ./shared/Alloc/alloc_module.cpp\
85- ./shared/Threads/issm_threads.h\
86+module_sources= ./shared/Threads/issm_threads.h\
87 ./shared/Threads/LaunchThread.cpp\
88 ./shared/Threads/PartitionRange.cpp\
89 ./shared/Exp/exp.h\
Note: See TracBrowser for help on using the repository browser.