source: issm/oecreview/Archive/13393-13976/ISSM-13759-13760.diff@ 13980

Last change on this file since 13980 was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 4.1 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/c/toolkits/issm/SeqMat.h
2===================================================================
3--- ../trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 13759)
4+++ ../trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 13760)
5@@ -63,8 +63,6 @@
6 /*FUNCTION SeqMat(doubletype* serial_mat,int M,int N,doubletype sparsity){{{*/
7 SeqMat(doubletype* serial_mat,int pM,int pN,doubletype sparsity){
8
9- int i,j;
10-
11 this->M=pM;
12 this->N=pN;
13 this->matrix=NULL;
14Index: ../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp
15===================================================================
16--- ../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13759)
17+++ ../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13760)
18@@ -18,12 +18,12 @@
19 /*inv_A does not yet exist, inv_A was just allocated, that's all*/
20
21 /*Error management*/
22- int i,j;
23+ int i;
24
25 /*input*/
26 int mA,nA;
27 int local_mA,local_nA;
28- int lower_row,upper_row,range,this_range,this_lower_row;
29+ int lower_row,upper_row,range;
30 MatType type;
31
32 /*Plapack: */
33@@ -40,11 +40,7 @@
34 /*Petsc to Plapack: */
35 double *arrayA=NULL;
36 int* idxnA=NULL;
37- int d_nz,o_nz;
38
39- /*Feedback to client*/
40- int computation_status;
41-
42 /*Verify that A is square*/
43 MatGetSize(*A,&mA,&nA);
44 MatGetLocalSize(*A,&local_mA,&local_nA);
45Index: ../trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp
46===================================================================
47--- ../trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp (revision 13759)
48+++ ../trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp (revision 13760)
49@@ -46,7 +46,7 @@
50 /*error management*/
51
52 int local_m,local_n;
53- int lower_row,upper_row,range;
54+ int range;
55 int result=1;
56 int sumresult;
57 int num_procs;
58Index: ../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp
59===================================================================
60--- ../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13759)
61+++ ../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13760)
62@@ -30,7 +30,6 @@
63 char* second=NULL;
64 char* final=NULL;
65 size_t len;
66- int ignore_second;
67 int first_token=1;
68
69 PetscTokenCreate(options_string,' ',&token);
70Index: ../trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp
71===================================================================
72--- ../trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp (revision 13759)
73+++ ../trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp (revision 13760)
74@@ -20,13 +20,12 @@
75
76 void PetscMatrixToDoubleMatrix(double** pmatrix, int* prows, int* pcols,Mat petsc_matrix){
77
78- int i,j,k;
79-
80 /*output: */
81 double* matrix=NULL;
82 int rows,cols;
83
84 /*intermediary: */
85+ int i;
86 int* idxm=NULL;
87 int* idxn=NULL;
88
89Index: ../trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp
90===================================================================
91--- ../trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp (revision 13759)
92+++ ../trunk-jpl/src/c/toolkits/petsc/patches/NewVec.cpp (revision 13760)
93@@ -18,7 +18,6 @@
94
95 Vec NewVec(int size,COMM comm,bool fromlocalsize){
96
97- int ierr;
98 int local_size;
99
100 /*output: */
101Index: ../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp
102===================================================================
103--- ../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 13759)
104+++ ../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 13760)
105@@ -89,7 +89,6 @@
106 /*parameters: */
107 int m,n;
108 int d_nz,o_nz;
109- int nnz;
110
111 #if _PETSC_MAJOR_ >= 3
112 const MatType type;
113Index: ../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp
114===================================================================
115--- ../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13759)
116+++ ../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13760)
117@@ -28,7 +28,7 @@
118 double* values=NULL;
119
120 /*Vector sizes: */
121- int MA,MB;
122+ int MB;
123
124 VecGetSize(B,&MB);
125
Note: See TracBrowser for help on using the repository browser.