Changeset 11861
- Timestamp:
- 04/02/12 15:44:28 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 94 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/c/Container/Options.cpp ¶
r11853 r11861 20 20 #include "../shared/shared.h" 21 21 #include "../EnumDefinitions/EnumDefinitions.h" 22 #if def_SERIAL_22 #if _SERIAL_ 23 23 #include "../io/io.h" 24 24 #endif … … 31 31 } 32 32 /*}}}*/ 33 #if def _SERIAL_33 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 34 34 /*FUNCTION Options::Options(int istart, int nrhs, const mxArray* prhs[]){{{1*/ 35 35 Options::Options(int istart, int nrhs, const mxArray* prhs[]){ -
TabularUnified issm/trunk-jpl/src/c/Container/Options.h ¶
r11853 r11861 15 15 /*constructors, destructors*/ 16 16 Options(); 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 Options(int istart, int nrhs, const mxArray* prhs[]); 19 19 #endif -
TabularUnified issm/trunk-jpl/src/c/Container/Results.cpp ¶
r11853 r11861 65 65 /*}}}*/ 66 66 /*FUNCTION Results::Write{{{1*/ 67 #if def _SERIAL_67 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 68 68 void Results::Write(mxArray** pdataref){ 69 69 -
TabularUnified issm/trunk-jpl/src/c/Container/Results.h ¶
r11853 r11861 26 26 /*numerics: {{{1*/ 27 27 Results* SpawnTriaResults(int* indices); 28 #if def _SERIAL_28 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 29 29 void Write(mxArray** pdataref); 30 30 #else -
TabularUnified issm/trunk-jpl/src/c/include/types.h ¶
r11853 r11861 16 16 17 17 /*Define abstract type for I/O: */ 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 typedef const mxArray* ConstDataHandle; //serially, we are reading data from a matlab array. -
TabularUnified issm/trunk-jpl/src/c/io/Matlab/FetchMatlabData.cpp ¶
r11853 r11861 12 12 #include "../../include/include.h" 13 13 14 #if def _SERIAL_14 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 15 15 #include <mex.h> 16 16 /*FUNCTION FetchMatlabData(DataSet** pdataset,const mxArray* dataref){{{1*/ -
TabularUnified issm/trunk-jpl/src/c/io/Matlab/OptionParse.cpp ¶
r11853 r11861 13 13 #include "./matlabio.h" 14 14 15 #if def _SERIAL_15 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 16 16 #include <mex.h> 17 17 -
TabularUnified issm/trunk-jpl/src/c/io/Matlab/WriteMatlabData.cpp ¶
r11853 r11861 12 12 #include "../../shared/shared.h" 13 13 14 #if def _SERIAL_14 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 15 15 #include <mex.h> 16 16 -
TabularUnified issm/trunk-jpl/src/c/io/Matlab/matlabio.h ¶
r11853 r11861 13 13 class Parameters; 14 14 15 #if def _SERIAL_15 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 16 16 #include <mex.h> 17 17 void WriteMatlabData(mxArray** pdataref,DataSet* dataset); -
TabularUnified issm/trunk-jpl/src/c/io/io.h ¶
r11853 r11861 15 15 #include "./Disk/diskio.h" 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include "./Matlab/matlabio.h" 19 19 #endif -
TabularUnified issm/trunk-jpl/src/c/modules/Dakotax/Dakotax.cpp ¶
r11853 r11861 51 51 #endif 52 52 53 #if def _SERIAL_53 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 54 54 void Dakotax(mxArray* femmodel){ 55 55 #else … … 69 69 70 70 /*Retrieve parameters: */ 71 #if def _SERIAL_71 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 72 72 FetchMatlabData((Parameters**)¶meters,mxGetField((mxArray*)femmodel,0,"parameters")); 73 73 #else … … 86 86 // Instantiate/initialize the parallel library and problem description 87 87 // database objects. 88 #if def _SERIAL_88 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 89 89 Dakota::ParallelLibrary parallel_lib; //use Dakota's standard library mode constructor 90 90 #else … … 143 143 xfree((void**)&dakota_output_file); 144 144 145 #if def _SERIAL_145 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 146 146 delete parameters; 147 147 #endif -
TabularUnified issm/trunk-jpl/src/c/modules/Dakotax/Dakotax.h ¶
r11853 r11861 13 13 int DescriptorIndex(char* root, int* pindex,char* descriptor); 14 14 15 #if def _SERIAL_15 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 16 16 void Dakotax(mxArray* femmodel); 17 17 void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* femmodel,int counter); -
TabularUnified issm/trunk-jpl/src/c/modules/Dakotax/SpawnCore.cpp ¶
r11853 r11861 21 21 /*Branch into a serial SpawnCore and a parallel SpawnCore: */ 22 22 23 #if def _SERIAL_23 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 24 24 SpawnCoreSerial(responses, numresponses, variables, variables_descriptors,numvariables, (mxArray*)femmodel, counter); 25 25 #else -
TabularUnified issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreSerial.cpp ¶
r11853 r11861 18 18 #include "../../include/include.h" 19 19 20 #if def _SERIAL_20 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 21 21 void SpawnCoreSerial(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, mxArray* femmodel, int counter){ 22 22 -
TabularUnified issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp ¶
r11853 r11861 16 16 #include "../../objects/objects.h" 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){ 20 20 #else … … 31 31 bool dakota_analysis = false; 32 32 33 #if def _SERIAL_33 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 34 34 const char **fnames = NULL; 35 35 mwSize onebyone[2] = {0,0}; … … 43 43 if(dakota_analysis){ 44 44 //no need to output anything, Dakota analysis has different outputs 45 #if def _SERIAL_45 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 46 46 *pdataref=mxCreateStructArray( ndim,onebyone,nfields,fnames); 47 47 #endif … … 91 91 92 92 /*Write results to disk (in parallel), or to memory (in serial mode): */ 93 #if def _SERIAL_93 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 94 94 results->Write(pdataref); 95 95 #else -
TabularUnified issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.h ¶
r11853 r11861 14 14 #include "../../Container/Container.h" 15 15 16 #if def _SERIAL_16 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 17 17 #include <mex.h> 18 18 void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, Results* results); -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp ¶
r11853 r11861 19 19 /*}}}*/ 20 20 /*FUNCTION BamgGeom::BamgGeom(mxArray* matlab_struct){{{1*/ 21 #if def _SERIAL_21 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 22 22 BamgGeom::BamgGeom(mxArray* matlab_struct){ 23 23 … … 51 51 /*Methods*/ 52 52 /*FUNCTION BamgGeom::SetMatlabStructureFields{{{1*/ 53 #if def _SERIAL_53 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 54 54 void BamgGeom::SetMatlabStructureFields(mxArray** matlab_struct){ 55 55 … … 94 94 /*}}}*/ 95 95 /*FUNCTION BamgGeom::SetMatlabStructureField{{{1*/ 96 #if def _SERIAL_96 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 97 97 void BamgGeom::SetMatlabStructureField(mxArray* matlab_struct,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer){ 98 98 -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.h ¶
r11853 r11861 5 5 #define _BAMGGEOM_H_ 6 6 7 #if def _SERIAL_7 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 8 8 #include <mex.h> 9 9 #endif … … 30 30 31 31 BamgGeom(); 32 #if def _SERIAL_32 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 33 33 BamgGeom(mxArray* matlab_struct); 34 34 #endif 35 35 ~BamgGeom(); 36 36 37 #if def _SERIAL_37 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 38 38 void SetMatlabStructureFields(mxArray** matlab_struct); 39 39 void SetMatlabStructureField(mxArray* matlab_struct,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer); -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp ¶
r11853 r11861 32 32 /*}}}*/ 33 33 /*FUNCTION BamgMesh::BamgMesh(mxArray* matlab_struct){{{1*/ 34 #if def _SERIAL_34 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 35 35 BamgMesh::BamgMesh(mxArray* matlab_struct){ 36 36 … … 91 91 /*Methods*/ 92 92 /*FUNCTION BamgMesh::SetMatlabStructureFields{{{1*/ 93 #if def _SERIAL_93 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 94 94 void BamgMesh::SetMatlabStructureFields(mxArray** matlab_struct){ 95 95 … … 152 152 /*}}}*/ 153 153 /*FUNCTION BamgMesh::SetMatlabStructureField{{{1*/ 154 #if def _SERIAL_154 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 155 155 void BamgMesh::SetMatlabStructureField(mxArray* matlab_struct,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer){ 156 156 -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.h ¶
r11853 r11861 5 5 #define _BAMGMESH_H_ 6 6 7 #if def _SERIAL_7 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 8 8 #include <mex.h> 9 9 #endif … … 51 51 52 52 BamgMesh(); 53 #if def _SERIAL_53 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 54 54 BamgMesh(mxArray* matlab_struct); 55 55 #endif 56 56 ~BamgMesh(); 57 57 58 #if def _SERIAL_58 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 59 59 void SetMatlabStructureFields(mxArray** matlab_struct); 60 60 void SetMatlabStructureField(mxArray* matlab_struct,const char* fieldname,int fieldrows,int fieldcols,double* fieldpointer); -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp ¶
r11853 r11861 42 42 /*}}}*/ 43 43 /*FUNCTION BamgOpts::BamgOpts(mxArray* matlab_struct){{{1*/ 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 BamgOpts::BamgOpts(mxArray* matlab_struct){ 46 46 -
TabularUnified issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.h ¶
r11853 r11861 6 6 #define _BAMGOPTS_H_ 7 7 8 #if def _SERIAL_8 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 9 9 #include <mex.h> 10 10 #endif … … 54 54 55 55 BamgOpts(); 56 #if def _SERIAL_56 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 57 57 BamgOpts(mxArray* matlab_struct); 58 58 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp ¶
r11853 r11861 68 68 } 69 69 /*}}}*/ 70 #if def _SERIAL_70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 71 71 /*FUNCTION BoolExternalResult::Marshall{{{1*/ 72 72 void BoolExternalResult::Marshall(char** pmarshalled_dataset){ … … 186 186 /*}}}*/ 187 187 /*FUNCTION BoolExternalResult::SetMatlabField{{{1*/ 188 #if def _SERIAL_188 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 189 189 void BoolExternalResult::SetMatlabField(mxArray* dataref){ 190 190 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 47 47 int Id(); 48 48 int MyRank(); 49 #if def _SERIAL_49 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 50 50 void Marshall(char** pmarshalled_dataset); 51 51 int MarshallSize(); … … 59 59 void WriteData(FILE* fid,bool io_gather); 60 60 void GetResultName(char**); 61 #if def _SERIAL_61 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 62 62 void SetMatlabField(mxArray* dataref); 63 63 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp ¶
r11853 r11861 68 68 } 69 69 /*}}}*/ 70 #if def _SERIAL_70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 71 71 /*FUNCTION DoubleExternalResult::Marshall{{{1*/ 72 72 void DoubleExternalResult::Marshall(char** pmarshalled_dataset){ … … 182 182 /*}}}*/ 183 183 /*FUNCTION DoubleExternalResult::SetMatlabField{{{1*/ 184 #if def _SERIAL_184 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 185 185 void DoubleExternalResult::SetMatlabField(mxArray* dataref){ 186 186 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 48 48 int Id(); 49 49 int MyRank(); 50 #if def _SERIAL_50 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 51 51 void Marshall(char** pmarshalled_dataset); 52 52 int MarshallSize(); … … 60 60 void WriteData(FILE* fid,bool io_gather); 61 61 void GetResultName(char**); 62 #if def _SERIAL_62 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 63 63 void SetMatlabField(mxArray* dataref); 64 64 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp ¶
r11853 r11861 96 96 } 97 97 /*}}}*/ 98 #if def _SERIAL_98 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 99 99 /*FUNCTION DoubleMatExternalResult::Marshall{{{1*/ 100 100 void DoubleMatExternalResult::Marshall(char** pmarshalled_dataset){ … … 223 223 /*}}}*/ 224 224 /*FUNCTION DoubleMatExternalResult::SetMatlabField{{{1*/ 225 #if def _SERIAL_225 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 226 226 void DoubleMatExternalResult::SetMatlabField(mxArray* dataref){ 227 227 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 49 49 int Id(); 50 50 int MyRank(); 51 #if def _SERIAL_51 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 52 52 void Marshall(char** pmarshalled_dataset); 53 53 int MarshallSize(); … … 61 61 void WriteData(FILE* fid,bool io_gather); 62 62 void GetResultName(char**); 63 #if def _SERIAL_63 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 64 64 void SetMatlabField(mxArray* dataref); 65 65 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp ¶
r11853 r11861 87 87 } 88 88 /*}}}*/ 89 #if def _SERIAL_89 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 90 90 /*FUNCTION DoubleVecExternalResult::Marshall{{{1*/ 91 91 void DoubleVecExternalResult::Marshall(char** pmarshalled_dataset){ … … 207 207 /*}}}*/ 208 208 /*FUNCTION DoubleVecExternalResult::SetMatlabField{{{1*/ 209 #if def _SERIAL_209 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 210 210 void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){ 211 211 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 48 48 int Id(); 49 49 int MyRank(); 50 #if def _SERIAL_50 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 51 51 void Marshall(char** pmarshalled_dataset); 52 52 int MarshallSize(); … … 60 60 void WriteData(FILE* fid,bool io_gather); 61 61 void GetResultName(char**); 62 #if def _SERIAL_62 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 63 63 void SetMatlabField(mxArray* dataref); 64 64 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 33 33 virtual void WriteData(FILE* fid,bool io_gather)=0; 34 34 virtual void GetResultName(char**)=0; 35 #if def _SERIAL_35 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 36 36 virtual void SetMatlabField(mxArray* dataref)=0; 37 37 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp ¶
r11853 r11861 68 68 } 69 69 /*}}}*/ 70 #if def _SERIAL_70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 71 71 /*FUNCTION IntExternalResult::Marshall{{{1*/ 72 72 void IntExternalResult::Marshall(char** pmarshalled_dataset){ … … 186 186 /*}}}*/ 187 187 /*FUNCTION IntExternalResult::SetMatlabField{{{1*/ 188 #if def _SERIAL_188 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 189 189 void IntExternalResult::SetMatlabField(mxArray* dataref){ 190 190 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 46 46 int Id(); 47 47 int MyRank(); 48 #if def _SERIAL_48 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 49 49 void Marshall(char** pmarshalled_dataset); 50 50 int MarshallSize(); … … 58 58 void WriteData(FILE* fid,bool io_gather); 59 59 void GetResultName(char**); 60 #if def _SERIAL_60 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 61 61 void SetMatlabField(mxArray* dataref); 62 62 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp ¶
r11853 r11861 80 80 } 81 81 /*}}}*/ 82 #if def _SERIAL_82 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 83 83 /*FUNCTION PetscVecExternalResult::Marshall{{{1*/ 84 84 void PetscVecExternalResult::Marshall(char** pmarshalled_dataset){ … … 245 245 /*}}}*/ 246 246 /*FUNCTION PetscVecExternalResult::SetMatlabField{{{1*/ 247 #if def _SERIAL_247 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 248 248 void PetscVecExternalResult::SetMatlabField(mxArray* dataref){ 249 249 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 48 48 int Id(); 49 49 int MyRank(); 50 #if def _SERIAL_50 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 51 51 void Marshall(char** pmarshalled_dataset); 52 52 int MarshallSize(); … … 60 60 void WriteData(FILE* fid,bool io_gather); 61 61 void GetResultName(char**); 62 #if def _SERIAL_62 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 63 63 void SetMatlabField(mxArray* dataref); 64 64 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp ¶
r11853 r11861 71 71 } 72 72 /*}}}*/ 73 #if def _SERIAL_73 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 74 74 /*FUNCTION StringExternalResult::Marshall{{{1*/ 75 75 void StringExternalResult::Marshall(char** pmarshalled_dataset){ … … 198 198 /*}}}*/ 199 199 /*FUNCTION StringExternalResult::SetMatlabField{{{1*/ 200 #if def _SERIAL_200 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 201 201 void StringExternalResult::SetMatlabField(mxArray* dataref){ 202 202 -
TabularUnified issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 58 58 void WriteData(FILE* fid,bool io_gather); 59 59 void GetResultName(char**); 60 #if def _SERIAL_60 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 61 61 void SetMatlabField(mxArray* dataref); 62 62 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp ¶
r11853 r11861 140 140 /*}}}*/ 141 141 142 #if def _SERIAL_142 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 143 143 /*FUNCTION Matrix::ToMatlabMatrix{{{1*/ 144 144 mxArray* Matrix::ToMatlabMatrix(void){ -
TabularUnified issm/trunk-jpl/src/c/objects/Numerics/Matrix.h ¶
r11853 r11861 21 21 #endif 22 22 23 #if def _SERIAL_23 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 24 24 #include "mex.h" 25 25 #endif … … 51 51 /*Matrix specific routines {{{1*/ 52 52 void Echo(void); 53 #if def _SERIAL_53 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 54 54 mxArray* ToMatlabMatrix(void); 55 55 #endif … … 66 66 }; 67 67 /*API: */ 68 #if def _SERIAL_68 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 69 69 Matrix* MatlabMatrixToMatrix(const mxArray* mxmatrix); 70 70 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp ¶
r11853 r11861 133 133 /*}}}*/ 134 134 135 #if def _SERIAL_135 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 136 136 /*FUNCTION Vector::ToMatlabVector{{{1*/ 137 137 mxArray* Vector::ToMatlabVector(void){ -
TabularUnified issm/trunk-jpl/src/c/objects/Numerics/Vector.h ¶
r11853 r11861 21 21 #endif 22 22 23 #if def _SERIAL_23 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 24 24 #include "mex.h" 25 25 #endif … … 54 54 /*Vector specific routines {{{1*/ 55 55 void Echo(void); 56 #if def _SERIAL_56 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 57 57 mxArray* ToMatlabVector(void); 58 58 #endif … … 78 78 79 79 /*API: */ 80 #if def _SERIAL_80 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 81 81 Vector* MatlabVectorToVector(const mxArray* mxvector); 82 82 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/OptArgs.h ¶
r11853 r11861 6 6 #define _OPTARGS_H_ 7 7 8 #if def _SERIAL_8 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 9 9 10 10 #include "mex.h" -
TabularUnified issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp ¶
r11853 r11861 62 62 } 63 63 /*}}}*/ 64 #if def _SERIAL_64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 65 65 /*FUNCTION BoolParam::Marshall{{{1*/ 66 66 void BoolParam::Marshall(char** pmarshalled_dataset){ … … 135 135 /*}}}*/ 136 136 /*FUNCTION BoolParam::SetMatlabField{{{1*/ 137 #if def _SERIAL_137 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 138 138 void BoolParam::SetMatlabField(mxArray* dataref){ 139 139 char* name=NULL; -
TabularUnified issm/trunk-jpl/src/c/objects/Params/BoolParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 41 41 int Id(); 42 42 int MyRank(); 43 #if def _SERIAL_43 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 44 44 void Marshall(char** pmarshalled_dataset); 45 45 int MarshallSize(); … … 81 81 82 82 void GetParameterName(char**pname); 83 #if def _SERIAL_83 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 84 84 void SetMatlabField(mxArray* dataref); 85 85 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp ¶
r11853 r11861 127 127 } 128 128 /*}}}*/ 129 #if def _SERIAL_129 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 130 130 /*FUNCTION DoubleMatArrayParam::Marshall{{{1*/ 131 131 void DoubleMatArrayParam::Marshall(char** pmarshalled_dataset){ … … 309 309 /*}}}*/ 310 310 /*FUNCTION StringArrayParam::SetMatlabField{{{1*/ 311 #if def _SERIAL_311 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 312 312 void DoubleMatArrayParam::SetMatlabField(mxArray* dataref){ 313 313 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 44 44 int Id(); 45 45 int MyRank(); 46 #if def _SERIAL_46 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 47 47 void Marshall(char** pmarshalled_dataset); 48 48 int MarshallSize(); … … 84 84 85 85 void GetParameterName(char**pname); 86 #if def _SERIAL_86 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 87 87 void SetMatlabField(mxArray* dataref); 88 88 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp ¶
r11853 r11861 78 78 } 79 79 /*}}}*/ 80 #if def _SERIAL_80 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 81 81 /*FUNCTION DoubleMatParam::Marshall{{{1*/ 82 82 void DoubleMatParam::Marshall(char** pmarshalled_dataset){ … … 169 169 /*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ 170 170 void DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ 171 #if def _SERIAL_171 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 172 172 int* output=NULL; 173 173 int i; … … 191 191 /*}}}*/ 192 192 /*FUNCTION DoubleMatParam::SetMatlabField{{{1*/ 193 #if def _SERIAL_193 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 194 194 void DoubleMatParam::SetMatlabField(mxArray* dataref){ 195 195 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 43 43 int Id(); 44 44 int MyRank(); 45 #if def _SERIAL_45 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 46 46 void Marshall(char** pmarshalled_dataset); 47 47 int MarshallSize(); … … 84 84 85 85 void GetParameterName(char**pname); 86 #if def _SERIAL_86 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 87 87 void SetMatlabField(mxArray* dataref); 88 88 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp ¶
r11853 r11861 59 59 } 60 60 /*}}}*/ 61 #if def _SERIAL_61 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 62 62 /*FUNCTION DoubleParam::Marshall{{{1*/ 63 63 void DoubleParam::Marshall(char** pmarshalled_dataset){ … … 133 133 /*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{1*/ 134 134 void DoubleParam::GetParameterValue(int* pinteger){ 135 #if def _SERIAL_135 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 136 136 *pinteger=(int)value; 137 137 #else … … 142 142 /*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{1*/ 143 143 void DoubleParam::GetParameterValue(bool* pbool){ 144 #if def _SERIAL_144 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 145 145 146 146 /*If debugging mode, cheeck that the double is 0 or 1*/ … … 155 155 /*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{1*/ 156 156 void DoubleParam::GetParameterValue(int** pintarray,int* pM){ 157 #if def _SERIAL_157 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 158 158 int* output=NULL; 159 159 … … 171 171 /*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ 172 172 void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){ 173 #if def _SERIAL_173 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 174 174 int* output=NULL; 175 175 … … 188 188 /*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ 189 189 void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){ 190 #if def _SERIAL_190 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 191 191 double* output=NULL; 192 192 … … 204 204 /*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ 205 205 void DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ 206 #if def _SERIAL_206 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 207 207 double* output=NULL; 208 208 … … 220 220 /*}}}*/ 221 221 /*FUNCTION DoubleParam::SetMatlabField{{{1*/ 222 #if def _SERIAL_222 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 223 223 void DoubleParam::SetMatlabField(mxArray* dataref){ 224 224 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp ¶
r11853 r11861 75 75 } 76 76 /*}}}*/ 77 #if def _SERIAL_77 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 78 78 /*FUNCTION DoubleVecParam::Marshall{{{1*/ 79 79 void DoubleVecParam::Marshall(char** pmarshalled_dataset){ … … 181 181 /*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/ 182 182 void DoubleVecParam::GetParameterValue(int** pintarray,int* pM){ 183 #if def _SERIAL_183 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 184 184 int* output=NULL; 185 185 int i; … … 203 203 /*}}}*/ 204 204 /*FUNCTION DoubleVecParam::SetMatlabField{{{1*/ 205 #if def _SERIAL_205 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 206 206 void DoubleVecParam::SetMatlabField(mxArray* dataref){ 207 207 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/FileParam.cpp ¶
r11853 r11861 62 62 } 63 63 /*}}}*/ 64 #if def _SERIAL_64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 65 65 /*FUNCTION FileParam::Marshall{{{1*/ 66 66 void FileParam::Marshall(char** pmarshalled_dataset){ … … 102 102 /*}}}*/ 103 103 /*FUNCTION FileParam::SetMatlabField{{{1*/ 104 #if def _SERIAL_104 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 105 105 void FileParam::SetMatlabField(mxArray* dataref){ 106 106 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/FileParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 41 41 int Id(); 42 42 int MyRank(); 43 #if def _SERIAL_43 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 44 44 void Marshall(char** pmarshalled_dataset); 45 45 int MarshallSize(); … … 81 81 82 82 void GetParameterName(char**pname); 83 #if def _SERIAL_83 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 84 84 void SetMatlabField(mxArray* dataref); 85 85 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp ¶
r11853 r11861 78 78 } 79 79 /*}}}*/ 80 #if def _SERIAL_80 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 81 81 /*FUNCTION IntMatParam::Marshall{{{1*/ 82 82 void IntMatParam::Marshall(char** pmarshalled_dataset){ … … 173 173 /*}}}*/ 174 174 /*FUNCTION IntMatParam::SetMatlabField{{{1*/ 175 #if def _SERIAL_175 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 176 176 void IntMatParam::SetMatlabField(mxArray* dataref){ 177 177 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntMatParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 43 43 int Id(); 44 44 int MyRank(); 45 #if def _SERIAL_45 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 46 46 void Marshall(char** pmarshalled_dataset); 47 47 int MarshallSize(); … … 83 83 84 84 void GetParameterName(char**pname); 85 #if def _SERIAL_85 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 86 86 void SetMatlabField(mxArray* dataref); 87 87 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntParam.cpp ¶
r11853 r11861 62 62 } 63 63 /*}}}*/ 64 #if def _SERIAL_64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 65 65 /*FUNCTION IntParam::Marshall{{{1*/ 66 66 void IntParam::Marshall(char** pmarshalled_dataset){ … … 135 135 /*}}}*/ 136 136 /*FUNCTION IntParam::SetMatlabField{{{1*/ 137 #if def _SERIAL_137 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 138 138 void IntParam::SetMatlabField(mxArray* dataref){ 139 139 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp ¶
r11853 r11861 91 91 } 92 92 /*}}}*/ 93 #if def _SERIAL_93 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 94 94 /*FUNCTION IntVecParam::Marshall{{{1*/ 95 95 void IntVecParam::Marshall(char** pmarshalled_dataset){ … … 186 186 /*}}}*/ 187 187 /*FUNCTION IntVecParam::SetMatlabField{{{1*/ 188 #if def _SERIAL_188 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 189 189 void IntVecParam::SetMatlabField(mxArray* dataref){ 190 190 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/IntVecParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 43 43 int Id(); 44 44 int MyRank(); 45 #if def _SERIAL_45 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 46 46 void Marshall(char** pmarshalled_dataset); 47 47 int MarshallSize(); … … 83 83 84 84 void GetParameterName(char**pname); 85 #if def _SERIAL_85 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 86 86 void SetMatlabField(mxArray* dataref); 87 87 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp ¶
r11853 r11861 70 70 } 71 71 /*}}}*/ 72 #if def _SERIAL_72 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 73 73 /*FUNCTION MatrixParam::Marshall{{{1*/ 74 74 void MatrixParam::Marshall(char** pmarshalled_dataset){ … … 191 191 /*}}}*/ 192 192 /*FUNCTION MatrixParam::SetMatlabField{{{1*/ 193 #if def _SERIAL_193 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 194 194 void MatrixParam::SetMatlabField(mxArray* dataref){ 195 195 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/MatrixParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/Param.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include <mex.h> 20 20 #endif … … 60 60 virtual void UnitConversion(int direction_enum)=0; 61 61 virtual void GetParameterName(char**pname)=0; 62 #if def _SERIAL_62 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 63 63 virtual void SetMatlabField(mxArray* dataref)=0; 64 64 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp ¶
r11853 r11861 92 92 } 93 93 /*}}}*/ 94 #if def _SERIAL_94 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 95 95 /*FUNCTION StringArrayParam::Marshall{{{1*/ 96 96 void StringArrayParam::Marshall(char** pmarshalled_dataset){ … … 237 237 /*}}}*/ 238 238 /*FUNCTION StringArrayParam::SetMatlabField{{{1*/ 239 #if def _SERIAL_239 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 240 240 void StringArrayParam::SetMatlabField(mxArray* dataref){ 241 241 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 44 44 int Id(); 45 45 int MyRank(); 46 #if def _SERIAL_46 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 47 47 void Marshall(char** pmarshalled_dataset); 48 48 int MarshallSize(); … … 84 84 85 85 void GetParameterName(char**pname); 86 #if def _SERIAL_86 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 87 87 void SetMatlabField(mxArray* dataref); 88 88 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/StringParam.cpp ¶
r11853 r11861 64 64 } 65 65 /*}}}*/ 66 #if def _SERIAL_66 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 67 67 /*FUNCTION StringParam::Marshall{{{1*/ 68 68 void StringParam::Marshall(char** pmarshalled_dataset){ … … 165 165 /*}}}*/ 166 166 /*FUNCTION StringParam::SetMatlabField{{{1*/ 167 #if def _SERIAL_167 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 168 168 void StringParam::SetMatlabField(mxArray* dataref){ 169 169 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/StringParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp ¶
r11853 r11861 72 72 } 73 73 /*}}}*/ 74 #if def _SERIAL_74 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 75 75 /*FUNCTION VectorParam::Marshall{{{1*/ 76 76 void VectorParam::Marshall(char** pmarshalled_dataset){ … … 189 189 /*}}}*/ 190 190 /*FUNCTION VectorParam::SetMatlabField{{{1*/ 191 #if def _SERIAL_191 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 192 192 void VectorParam::SetMatlabField(mxArray* dataref){ 193 193 -
TabularUnified issm/trunk-jpl/src/c/objects/Params/VectorParam.h ¶
r11853 r11861 15 15 #endif 16 16 17 #if def _SERIAL_17 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 18 18 #include <mex.h> 19 19 #endif … … 42 42 int Id(); 43 43 int MyRank(); 44 #if def _SERIAL_44 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 45 45 void Marshall(char** pmarshalled_dataset); 46 46 int MarshallSize(); … … 82 82 83 83 void GetParameterName(char**pname); 84 #if def _SERIAL_84 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 85 85 void SetMatlabField(mxArray* dataref); 86 86 #endif -
TabularUnified issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp ¶
r11853 r11861 125 125 if(!size)_error_("attempting to realloc to zero"); 126 126 127 #if def _SERIAL_127 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 128 128 value = (void*)mxRealloc(pv,size); 129 129 #else -
TabularUnified issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp ¶
r11853 r11861 11 11 #include "../shared.h" 12 12 #include "../../include/include.h" 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 #include "mex.h" 15 15 #endif … … 45 45 } 46 46 else{ 47 #if def _SERIAL_47 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 48 48 mexErrMsgTxt(exprintf("\n??? Error using ==> %s at %i\n%s error message: %s\n", 49 49 file_name.c_str(),file_line,function_name.c_str(),what())); -
TabularUnified issm/trunk-jpl/src/c/shared/Matlab/PrintfFunction.cpp ¶
r9324 r11861 9 9 #include "../../include/include.h" 10 10 11 #if def _SERIAL_11 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 12 12 #include "mex.h" 13 13 #endif -
TabularUnified issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h ¶
r11853 r11861 9 9 10 10 11 #if def _SERIAL_11 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 12 12 int ModuleBoot(void); 13 13 int ModuleEnd(void); 14 14 #endif 15 15 16 #if def _SERIAL_16 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 17 17 #include "mex.h" 18 18 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field); -
TabularUnified issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp ¶
r11853 r11861 9 9 10 10 11 #if def _SERIAL_11 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 12 12 13 13 #include "mex.h" -
TabularUnified issm/trunk-jpl/src/c/shared/Numerics/OptFunc.cpp ¶
r11853 r11861 13 13 #include "../../include/include.h" 14 14 15 #if def _SERIAL_15 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 16 16 #include "mex.h" 17 17 double OptFunc(double scalar, OptArgs* optargs){ -
TabularUnified issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp ¶
r11702 r11861 30 30 parameters->FindParam(&strings,&numanalyses,PetscOptionsStringsEnum); 31 31 32 #if def _SERIAL_//do not take this away, because ISSM loads analyses as a Double Param instead of a DoubleVec Param when running with only 1 analysis32 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) //do not take this away, because ISSM loads analyses as a Double Param instead of a DoubleVec Param when running with only 1 analysis 33 33 if(numanalyses==1){ analyses=(double*)xmalloc(1*sizeof(double)); parameters->FindParam(analyses,PetscOptionsAnalysesEnum); 34 34 } -
TabularUnified issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp ¶
r11853 r11861 18 18 #include "../../include/macros.h" 19 19 #include "../Exceptions/exceptions.h" 20 #if def _SERIAL_20 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 21 21 #include <mex.h> 22 22 #endif … … 39 39 if(level<0) _error_("vebosity level should be a positive integer (user provided %i)",level); 40 40 41 #if def _SERIAL_41 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 42 42 43 43 mxArray* output=NULL; … … 54 54 /*FUNCTION GetVerbosityLevel {{{*/ 55 55 int GetVerbosityLevel(void){ 56 #if def _SERIAL_56 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 57 57 58 58 mxArray* output=NULL; -
TabularUnified issm/trunk-jpl/src/c/toolkits/double/MatlabMatrixToDoubleMatrix.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 /*Matlab includes: */ -
TabularUnified issm/trunk-jpl/src/c/toolkits/double/MatlabVectorToDoubleVector.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 #include <string.h> -
TabularUnified issm/trunk-jpl/src/c/toolkits/double/double.h ¶
r11853 r11861 6 6 #define _DOUBLE_H_ 7 7 8 #if def _SERIAL_8 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 9 9 #include "mex.h" 10 10 int MatlabMatrixToDoubleMatrix(double** pmatrix,int* pmatrix_rows,int* pmatrix_cols,const mxArray* mxmatrix); -
TabularUnified issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp ¶
r11853 r11861 93 93 /*}}}*/ 94 94 95 #if def _SERIAL_95 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 96 96 /*FUNCTION SeqMat::ToMatlabMatrix{{{1*/ 97 97 mxArray* SeqMat::ToMatlabMatrix(void){ -
TabularUnified issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h ¶
r11853 r11861 16 16 #include "../toolkitsenums.h" 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include "mex.h" 20 20 #endif … … 40 40 /*SeqMat specific routines {{{1*/ 41 41 void Echo(void); 42 #if def _SERIAL_42 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 43 43 mxArray* ToMatlabMatrix(void); 44 44 #endif … … 56 56 57 57 /*API :*/ 58 #if def _SERIAL_58 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 59 59 SeqMat* MatlabMatrixToSeqMat(const mxArray* dataref); 60 60 #endif -
TabularUnified issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp ¶
r11855 r11861 66 66 /*}}}*/ 67 67 68 #if def _SERIAL_68 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 69 69 /*FUNCTION SeqVec::ToMatlabVector{{{1*/ 70 70 mxArray* SeqVec::ToMatlabVector(void){ -
TabularUnified issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h ¶
r11853 r11861 16 16 #include "../toolkitsenums.h" 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include "mex.h" 20 20 #endif … … 37 37 /*SeqVec specific routines {{{1*/ 38 38 void Echo(void); 39 #if def _SERIAL_39 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 40 40 mxArray* ToMatlabVector(void); 41 41 #endif … … 61 61 62 62 /*API :*/ 63 #if def _SERIAL_63 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 64 64 SeqVec* MatlabVectorToSeqVec(const mxArray* dataref); 65 65 #endif -
TabularUnified issm/trunk-jpl/src/c/toolkits/matlab/MatlabNArrayToNArray.cpp ¶
r11853 r11861 13 13 #include "../../include/include.h" 14 14 15 #if def _SERIAL_15 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 16 16 #include <mex.h> 17 17 -
TabularUnified issm/trunk-jpl/src/c/toolkits/matlab/matlabincludes.h ¶
r11853 r11861 6 6 #define _MATLAB_INCLUDES_H_ 7 7 8 #if def _SERIAL_8 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 9 9 #include <mex.h> 10 10 class Matrix; -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/MatInvert.cpp ¶
r9826 r11861 56 56 MatAssemblyEnd(inv,MAT_FINAL_ASSEMBLY); 57 57 58 #if def _SERIAL_58 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 59 59 MatConvert(inv, MATSEQAIJ,MAT_REUSE_MATRIX,&inv); 60 60 #else -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/MatlabMatrixToPetscMatrix.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 /*Petsc includes: */ -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/MatlabVectorToPetscVector.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 /*Petsc includes: */ -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 /*Petsc includes: */ -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToMatlabVector.cpp ¶
r11853 r11861 11 11 12 12 13 #if def _SERIAL_13 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 14 14 15 15 /*Petsc includes: */ … … 64 64 } 65 65 66 #endif //#if def _SERIAL_66 #endif //#if defined(_HAVE_MATLAB_) && defined(_SERIAL_) -
TabularUnified issm/trunk-jpl/src/c/toolkits/petsc/patches/petscpatches.h ¶
r11853 r11861 16 16 class Parameters; 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include "mex.h" 20 20 int MatlabMatrixToPetscMatrix(Mat* matrix,int* prows,int* pcols, const mxArray* mxmatrix); -
TabularUnified issm/trunk-jpl/src/c/toolkits/toolkits.h ¶
r11853 r11861 16 16 #endif 17 17 18 #if def _SERIAL_18 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_) 19 19 #include "./matlab/matlabincludes.h" 20 20 #endif 21 21 22 #if def _HAVE_PYTHON_22 #if defined(_HAVE_PYTHON_) && defined(_SERIAL_) 23 23 #include "./python/pythonincludes.h" 24 24 #endif
Note:
See TracChangeset
for help on using the changeset viewer.