source: issm/oecreview/Archive/14312-15392/ISSM-14982-14983.diff

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

NEW: adding Archive/14312-15392 for oecreview
File size: 1.3 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/c/shared/Matrix/matrix.h
2===================================================================
3--- ../trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14982)
4+++ ../trunk-jpl/src/c/shared/Matrix/matrix.h (revision 14983)
5@@ -5,7 +5,7 @@
6 #ifndef _MATRIXUTILS_H_
7 #define _MATRIXUTILS_H_
8
9-#include "../../shared/Numerics/types.h"
10+#include "../Numerics/types.h"
11
12 int TripleMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd);
13 int MatrixMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc );
14Index: ../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp
15===================================================================
16--- ../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 14982)
17+++ ../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 14983)
18@@ -13,7 +13,6 @@
19 #include <stdio.h>
20 #include <string.h>
21 #include <ctype.h>
22-#include "../shared.h"
23 #include "../../shared/Enum/Enum.h"
24
25 int DescriptorIndex(char* root, int* pindex,char* descriptor){ //We assume root has already been allocated, and we just have to copy into it.
Note: See TracBrowser for help on using the repository browser.