Changeset 15269

Timestamp:

06/13/13 19:35:41 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed some header files

Location:

issm/trunk-jpl/src/wrappers/matlab/io

Files:

• ApiPrintf.cpp (modified) (1 diff)
• CheckNumMatlabArguments.cpp (modified) (1 diff)
• FetchMatlabData.cpp (modified) (1 diff)
• MatlabMatrixToDoubleMatrix.cpp (modified) (1 diff)
• MatlabMatrixToIssmMat.cpp (modified) (1 diff)
• MatlabMatrixToMatrix.cpp (modified) (1 diff)
• MatlabNArrayToNArray.cpp (modified) (1 diff)
• MatlabVectorToDoubleVector.cpp (modified) (1 diff)
• MatlabVectorToIssmSeqVec.cpp (modified) (1 diff)
• MatlabVectorToIssmVec.cpp (modified) (1 diff)
• MatlabVectorToPetscVec.cpp (modified) (1 diff)
• MatlabVectorToVector.cpp (modified) (1 diff)
• OptionParse.cpp (modified) (1 diff)
• WriteMatlabData.cpp (modified) (1 diff)
• matlabio.h (modified) (1 diff)

issm/trunk-jpl/src/wrappers/matlab/io/ApiPrintf.cpp

@@ -10 +10 @@
 
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 /*Matlab printf i/o: */

issm/trunk-jpl/src/wrappers/matlab/io/CheckNumMatlabArguments.cpp

@@ -4 +4 @@
 
 #include "./matlabio.h"
-#include "../../c/shared/Exceptions/exceptions.h"
 
 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void )){

issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

@@ -10 +10 @@
 
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 /*Primitive data types*/

issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToDoubleMatrix.cpp

@@ -11 +11 @@
 /*Matlab includes: */
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 int MatlabMatrixToDoubleMatrix(double** pmatrix,int* pmatrix_rows,int* pmatrix_cols,const mxArray* mxmatrix){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToIssmMat.cpp

@@ -9 +9 @@
 #endif
 
-#include <stdio.h>
-#include <string.h>
 #include "./matlabio.h"
-#include "../../c/toolkits/toolkits.h"
-#include "../../c/shared/shared.h"
 
 IssmMat<double>* MatlabMatrixToIssmMat(const mxArray* dataref){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToMatrix.cpp

@@ -8 +8 @@
 #endif
 
-#include <stdio.h>
-#include <string.h>
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
-#include "../../c/toolkits/toolkits.h"
 
 Matrix<double>* MatlabMatrixToMatrix(const mxArray* mxmatrix){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabNArrayToNArray.cpp

@@ -10 +10 @@
 
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 /*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/

issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToDoubleVector.cpp

@@ -9 +9 @@
 #endif
 
-#include <string.h>
-
 /*Matlab includes: */
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 int MatlabVectorToDoubleVector(double** pvector,int* pvector_rows,const mxArray* mxvector){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToIssmSeqVec.cpp

@@ -3 +3 @@
 
 /*Headers:*/
-#include <mex.h>
-#include <stdio.h>
-#include <string.h>
 #include "./matlabio.h"
-#include "../../c/toolkits/toolkits.h"
-#include "../../c/shared/shared.h"
 
 IssmSeqVec<double>* MatlabVectorToIssmSeqVec(const mxArray* dataref){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToIssmVec.cpp

@@ -3 +3 @@
 
 /*Headers:*/
-#include <mex.h>
-#include <stdio.h>
-#include <string.h>
 #include "./matlabio.h"
-#include "../../c/toolkits/toolkits.h"
-#include "../../c/shared/shared.h"
 
 IssmVec<double>* MatlabVectorToIssmVec(const mxArray* dataref){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToPetscVec.cpp

@@ -9 +9 @@
 #endif
 
-/*Petsc includes: */
-#include <petscmat.h>
-#include <petscvec.h>
-#include <petscksp.h>
-
 /*Matlab includes: */
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
 
 PetscVec* MatlabVectorToPetscVec(const mxArray* mxvector){

issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToVector.cpp

@@ -8 +8 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-#include <stdio.h>
-#include <string.h>
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
-#include "../../c/toolkits/toolkits.h"
 
 Vector<double>* MatlabVectorToVector(const mxArray* mxvector){

issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp

@@ -10 +10 @@
 #include <cstring> 
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
-#include "../../c/shared/io/io.h"
 
 GenericOption<double>* OptionDoubleParse( char* name, const mxArray* prhs[]){ /*{{{*/

issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

@@ -10 +10 @@
 
 #include "./matlabio.h"
-#include "../../c/shared/shared.h"
+#include "./../../../c/datastructures/datastructures.h"
 
 /*Primitive data types*/

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -13 +13 @@
 
 #include "../include/matlabincludes.h"
-#include "../../c/bamg/bamgobjects.h"
-#include "../../c/classes/classes.h"
-#include "../../c/toolkits/toolkits.h"
-#include "../../c/shared/shared.h"
+#include "../../../c/bamg/bamgobjects.h"
+#include "../../../c/classes/classes.h"
+#include "../../../c/toolkits/toolkits.h"
+#include "../../../c/shared/shared.h"
 
 void WriteData(mxArray** pdataref,IssmDenseMat<double>* matrix);