Changeset 11936


Ignore:
Timestamp:
04/05/12 14:50:41 (13 years ago)
Author:
Eric.Larour
Message:

New FetchDAta and WriteData routines

Location:
issm/trunk-jpl/src/c/objects
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp

    r11868 r11936  
    2323BamgGeom::BamgGeom(mxArray* matlab_struct){
    2424
    25         FetchMatlabData(&this->Vertices,        &this->VerticesSize[0],        &this->VerticesSize[1],        mxGetAssignedField(matlab_struct,0,"Vertices"));
    26         FetchMatlabData(&this->Edges,           &this->EdgesSize[0],           &this->EdgesSize[1],           mxGetAssignedField(matlab_struct,0,"Edges"));
     25        FetchData(&this->Vertices,        &this->VerticesSize[0],        &this->VerticesSize[1],        mxGetAssignedField(matlab_struct,0,"Vertices"));
     26        FetchData(&this->Edges,           &this->EdgesSize[0],           &this->EdgesSize[1],           mxGetAssignedField(matlab_struct,0,"Edges"));
    2727        this->TangentAtEdgesSize[0]=0,    this->TangentAtEdgesSize[1]=0;    this->TangentAtEdges=NULL;
    28         FetchMatlabData(&this->Corners,         &this->CornersSize[0],         &this->CornersSize[1],         mxGetAssignedField(matlab_struct,0,"Corners"));
    29         FetchMatlabData(&this->RequiredVertices,&this->RequiredVerticesSize[0],&this->RequiredVerticesSize[1],mxGetAssignedField(matlab_struct,0,"RequiredVertices"));
    30         FetchMatlabData(&this->RequiredEdges,   &this->RequiredEdgesSize[0],   &this->RequiredEdgesSize[1],   mxGetAssignedField(matlab_struct,0,"RequiredEdges"));
    31         FetchMatlabData(&this->CrackedEdges,    &this->CrackedEdgesSize[0],    &this->CrackedEdgesSize[1],    mxGetAssignedField(matlab_struct,0,"CrackedEdges"));
    32         FetchMatlabData(&this->SubDomains,      &this->SubDomainsSize[0],      &this->SubDomainsSize[1],      mxGetAssignedField(matlab_struct,0,"SubDomains"));
     28        FetchData(&this->Corners,         &this->CornersSize[0],         &this->CornersSize[1],         mxGetAssignedField(matlab_struct,0,"Corners"));
     29        FetchData(&this->RequiredVertices,&this->RequiredVerticesSize[0],&this->RequiredVerticesSize[1],mxGetAssignedField(matlab_struct,0,"RequiredVertices"));
     30        FetchData(&this->RequiredEdges,   &this->RequiredEdgesSize[0],   &this->RequiredEdgesSize[1],   mxGetAssignedField(matlab_struct,0,"RequiredEdges"));
     31        FetchData(&this->CrackedEdges,    &this->CrackedEdgesSize[0],    &this->CrackedEdgesSize[1],    mxGetAssignedField(matlab_struct,0,"CrackedEdges"));
     32        FetchData(&this->SubDomains,      &this->SubDomainsSize[0],      &this->SubDomainsSize[1],      mxGetAssignedField(matlab_struct,0,"SubDomains"));
    3333
    3434}

  • issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp

    r11868 r11936  
    3838        int lines,cols;
    3939
    40         FetchMatlabData(&this->Vertices,            &this->VerticesSize[0],            &this->VerticesSize[1],            mxGetAssignedField(matlab_struct,0,"Vertices"));
    41         FetchMatlabData(&this->Edges,               &this->EdgesSize[0],               &this->EdgesSize[1],               mxGetAssignedField(matlab_struct,0,"Edges"));
    42         FetchMatlabData(&this->Triangles,           &this->TrianglesSize[0],           &this->TrianglesSize[1],           mxGetAssignedField(matlab_struct,0,"Triangles"));
     40        FetchData(&this->Vertices,            &this->VerticesSize[0],            &this->VerticesSize[1],            mxGetAssignedField(matlab_struct,0,"Vertices"));
     41        FetchData(&this->Edges,               &this->EdgesSize[0],               &this->EdgesSize[1],               mxGetAssignedField(matlab_struct,0,"Edges"));
     42        FetchData(&this->Triangles,           &this->TrianglesSize[0],           &this->TrianglesSize[1],           mxGetAssignedField(matlab_struct,0,"Triangles"));
    4343        this->QuadrilateralsSize[0]=0,        this->QuadrilateralsSize[1]=0;     this->Quadrilaterals=NULL;
    4444
    … …  
    4646        this->SubDomainsFromGeomSize[0]=0,    this->SubDomainsFromGeomSize[1]=0; this->SubDomainsFromGeom=NULL;
    4747        this->CrackedVerticesSize[0]=0,       this->CrackedVerticesSize[1]=0;    this->CrackedVertices=NULL;
    48         FetchMatlabData(&this->CrackedEdges,        &this->CrackedEdgesSize[0],        &this->CrackedEdgesSize[1],        mxGetAssignedField(matlab_struct,0,"CrackedEdges"));
     48        FetchData(&this->CrackedEdges,        &this->CrackedEdgesSize[0],        &this->CrackedEdgesSize[1],        mxGetAssignedField(matlab_struct,0,"CrackedEdges"));
    4949
    50         FetchMatlabData(&this->VerticesOnGeomEdge,  &this->VerticesOnGeomEdgeSize[0],  &this->VerticesOnGeomEdgeSize[1],  mxGetAssignedField(matlab_struct,0,"VerticesOnGeomEdge"));
    51         FetchMatlabData(&this->VerticesOnGeomVertex,&this->VerticesOnGeomVertexSize[0],&this->VerticesOnGeomVertexSize[1],mxGetAssignedField(matlab_struct,0,"VerticesOnGeomVertex"));
    52         FetchMatlabData(&this->EdgesOnGeomEdge,     &this->EdgesOnGeomEdgeSize[0],     &this->EdgesOnGeomEdgeSize[1],     mxGetAssignedField(matlab_struct,0,"EdgesOnGeomEdge"));
     50        FetchData(&this->VerticesOnGeomEdge,  &this->VerticesOnGeomEdgeSize[0],  &this->VerticesOnGeomEdgeSize[1],  mxGetAssignedField(matlab_struct,0,"VerticesOnGeomEdge"));
     51        FetchData(&this->VerticesOnGeomVertex,&this->VerticesOnGeomVertexSize[0],&this->VerticesOnGeomVertexSize[1],mxGetAssignedField(matlab_struct,0,"VerticesOnGeomVertex"));
     52        FetchData(&this->EdgesOnGeomEdge,     &this->EdgesOnGeomEdgeSize[0],     &this->EdgesOnGeomEdgeSize[1],     mxGetAssignedField(matlab_struct,0,"EdgesOnGeomEdge"));
    5353
    5454        this->IssmEdgesSize[0]=0,             this->IssmEdgesSize[1]=0;          this->IssmEdges=NULL;
    55         FetchMatlabData(&this->IssmSegments,        &this->IssmSegmentsSize[0],        &this->IssmSegmentsSize[1],        mxGetAssignedField(matlab_struct,0,"IssmSegments"));
     55        FetchData(&this->IssmSegments,        &this->IssmSegmentsSize[0],        &this->IssmSegmentsSize[1],        mxGetAssignedField(matlab_struct,0,"IssmSegments"));
    5656
    5757        this->ElementConnectivitySize[0]=0,      this->ElementConnectivitySize[1]=0;      this->ElementConnectivity=NULL;

  • issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp

    r11861 r11936  
    4545BamgOpts::BamgOpts(mxArray* matlab_struct){
    4646
    47         FetchMatlabData(&this->anisomax,mxGetField(matlab_struct,0,"anisomax"));
    48         FetchMatlabData(&this->cutoff,mxGetField(matlab_struct,0,"cutoff"));
    49         FetchMatlabData(&this->coeff,mxGetField(matlab_struct,0,"coeff"));
    50         FetchMatlabData(&this->errg,mxGetField(matlab_struct,0,"errg"));
    51         FetchMatlabData(&this->gradation,mxGetField(matlab_struct,0,"gradation"));
    52         FetchMatlabData(&this->Hessiantype,mxGetField(matlab_struct,0,"Hessiantype"));
    53         FetchMatlabData(&this->MaxCornerAngle,mxGetField(matlab_struct,0,"MaxCornerAngle"));
    54         FetchMatlabData(&this->maxnbv,mxGetField(matlab_struct,0,"maxnbv"));
    55         FetchMatlabData(&this->maxsubdiv,mxGetField(matlab_struct,0,"maxsubdiv"));
    56         FetchMatlabData(&this->Metrictype,mxGetField(matlab_struct,0,"Metrictype"));
    57         FetchMatlabData(&this->nbjacobi,mxGetField(matlab_struct,0,"nbjacobi"));
    58         FetchMatlabData(&this->nbsmooth,mxGetField(matlab_struct,0,"nbsmooth"));
    59         FetchMatlabData(&this->omega,mxGetField(matlab_struct,0,"omega"));
    60         FetchMatlabData(&this->power,mxGetField(matlab_struct,0,"power"));
    61         FetchMatlabData(&this->verbose,mxGetField(matlab_struct,0,"verbose"));
     47        FetchData(&this->anisomax,mxGetField(matlab_struct,0,"anisomax"));
     48        FetchData(&this->cutoff,mxGetField(matlab_struct,0,"cutoff"));
     49        FetchData(&this->coeff,mxGetField(matlab_struct,0,"coeff"));
     50        FetchData(&this->errg,mxGetField(matlab_struct,0,"errg"));
     51        FetchData(&this->gradation,mxGetField(matlab_struct,0,"gradation"));
     52        FetchData(&this->Hessiantype,mxGetField(matlab_struct,0,"Hessiantype"));
     53        FetchData(&this->MaxCornerAngle,mxGetField(matlab_struct,0,"MaxCornerAngle"));
     54        FetchData(&this->maxnbv,mxGetField(matlab_struct,0,"maxnbv"));
     55        FetchData(&this->maxsubdiv,mxGetField(matlab_struct,0,"maxsubdiv"));
     56        FetchData(&this->Metrictype,mxGetField(matlab_struct,0,"Metrictype"));
     57        FetchData(&this->nbjacobi,mxGetField(matlab_struct,0,"nbjacobi"));
     58        FetchData(&this->nbsmooth,mxGetField(matlab_struct,0,"nbsmooth"));
     59        FetchData(&this->omega,mxGetField(matlab_struct,0,"omega"));
     60        FetchData(&this->power,mxGetField(matlab_struct,0,"power"));
     61        FetchData(&this->verbose,mxGetField(matlab_struct,0,"verbose"));
    6262
    63         FetchMatlabData(&this->Crack,mxGetField(matlab_struct,0,"Crack"));
    64         FetchMatlabData(&this->geometricalmetric,mxGetField(matlab_struct,0,"geometricalmetric"));
    65         FetchMatlabData(&this->KeepVertices,mxGetField(matlab_struct,0,"KeepVertices"));
    66         FetchMatlabData(&this->splitcorners,mxGetField(matlab_struct,0,"splitcorners"));
     63        FetchData(&this->Crack,mxGetField(matlab_struct,0,"Crack"));
     64        FetchData(&this->geometricalmetric,mxGetField(matlab_struct,0,"geometricalmetric"));
     65        FetchData(&this->KeepVertices,mxGetField(matlab_struct,0,"KeepVertices"));
     66        FetchData(&this->splitcorners,mxGetField(matlab_struct,0,"splitcorners"));
    6767
    68         FetchMatlabData(&this->hmin,mxGetField(matlab_struct,0,"hmin"));
    69         FetchMatlabData(&this->hmax,mxGetField(matlab_struct,0,"hmax"));
    70         FetchMatlabData(&this->hminVertices,&this->hminVerticesSize[0],&this->hminVerticesSize[1],mxGetField(matlab_struct,0,"hminVertices"));
    71         FetchMatlabData(&this->hmaxVertices,&this->hmaxVerticesSize[0],&this->hmaxVerticesSize[1],mxGetField(matlab_struct,0,"hmaxVertices"));
    72         FetchMatlabData(&this->hVertices,&this->hVerticesSize[0],&this->hVerticesSize[1],mxGetField(matlab_struct,0,"hVertices"));
    73         FetchMatlabData(&this->metric,&this->metricSize[0],&this->metricSize[1],mxGetField(matlab_struct,0,"metric"));
    74         FetchMatlabData(&this->field,&this->fieldSize[0],&this->fieldSize[1],mxGetField(matlab_struct,0,"field"));
    75         FetchMatlabData(&this->err,&this->errSize[0],&this->errSize[1],mxGetField(matlab_struct,0,"err"));
     68        FetchData(&this->hmin,mxGetField(matlab_struct,0,"hmin"));
     69        FetchData(&this->hmax,mxGetField(matlab_struct,0,"hmax"));
     70        FetchData(&this->hminVertices,&this->hminVerticesSize[0],&this->hminVerticesSize[1],mxGetField(matlab_struct,0,"hminVertices"));
     71        FetchData(&this->hmaxVertices,&this->hmaxVerticesSize[0],&this->hmaxVerticesSize[1],mxGetField(matlab_struct,0,"hmaxVertices"));
     72        FetchData(&this->hVertices,&this->hVerticesSize[0],&this->hVerticesSize[1],mxGetField(matlab_struct,0,"hVertices"));
     73        FetchData(&this->metric,&this->metricSize[0],&this->metricSize[1],mxGetField(matlab_struct,0,"metric"));
     74        FetchData(&this->field,&this->fieldSize[0],&this->fieldSize[1],mxGetField(matlab_struct,0,"field"));
     75        FetchData(&this->err,&this->errSize[0],&this->errSize[1],mxGetField(matlab_struct,0,"err"));
    7676
    7777        /*Additional checks*/

  • issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp

    r11861 r11936  
    6868}
    6969/*}}}*/
    70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     70#ifdef _SERIAL_
    7171/*FUNCTION BoolExternalResult::Marshall{{{1*/
    7272void  BoolExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h

    r11861 r11936  
    4747                int   Id();
    4848                int   MyRank();
    49                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     49                #ifdef _SERIAL_
    5050                void  Marshall(char** pmarshalled_dataset);
    5151                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp

    r11861 r11936  
    6868}
    6969/*}}}*/
    70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     70#ifdef _SERIAL_
    7171/*FUNCTION DoubleExternalResult::Marshall{{{1*/
    7272void  DoubleExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h

    r11861 r11936  
    4848                int   Id();
    4949                int   MyRank();
    50                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     50                #ifdef _SERIAL_
    5151                void  Marshall(char** pmarshalled_dataset);
    5252                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

    r11861 r11936  
    9696}
    9797/*}}}*/
    98 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     98#ifdef _SERIAL_
    9999/*FUNCTION DoubleMatExternalResult::Marshall{{{1*/
    100100void  DoubleMatExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h

    r11861 r11936  
    4949                int   Id();
    5050                int   MyRank();
    51                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     51                #ifdef _SERIAL_
    5252                void  Marshall(char** pmarshalled_dataset);
    5353                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

    r11861 r11936  
    8787}
    8888/*}}}*/
    89 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     89#ifdef _SERIAL_
    9090/*FUNCTION DoubleVecExternalResult::Marshall{{{1*/
    9191void  DoubleVecExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h

    r11861 r11936  
    4848                int   Id();
    4949                int   MyRank();
    50                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     50                #ifdef _SERIAL_
    5151                void  Marshall(char** pmarshalled_dataset);
    5252                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp

    r11861 r11936  
    6868}
    6969/*}}}*/
    70 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     70#ifdef _SERIAL_
    7171/*FUNCTION IntExternalResult::Marshall{{{1*/
    7272void  IntExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h

    r11861 r11936  
    4646                int   Id();
    4747                int   MyRank();
    48                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     48                #ifdef _SERIAL_
    4949                void  Marshall(char** pmarshalled_dataset);
    5050                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp

    r11861 r11936  
    8080}
    8181/*}}}*/
    82 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     82#ifdef _SERIAL_
    8383/*FUNCTION PetscVecExternalResult::Marshall{{{1*/
    8484void  PetscVecExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h

    r11861 r11936  
    4848                int   Id();
    4949                int   MyRank();
    50                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     50                #ifdef _SERIAL_
    5151                void  Marshall(char** pmarshalled_dataset);
    5252                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp

    r11861 r11936  
    7171}
    7272/*}}}*/
    73 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     73#ifdef _SERIAL_
    7474/*FUNCTION StringExternalResult::Marshall{{{1*/
    7575void  StringExternalResult::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h

    r11861 r11936  
    4848                int   Id();
    4949                int   MyRank();
     50                #ifdef _SERIAL_
    5051                void  Marshall(char** pmarshalled_dataset);
    5152                int   MarshallSize();
    5253                void  Demarshall(char** pmarshalled_dataset);
     54                #endif
    5355                int   ObjectEnum();
    5456                Object* copy();

  • issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp

    r11861 r11936  
    6868        int     i;
    6969
     70
    7071        int* idxm=(int*)xmalloc(M*sizeof(int));
    7172        int* idxn=(int*)xmalloc(N*sizeof(int));
    … …  
    275276}
    276277/*}}}*/
     278/*FUNCTION Matrix::Convert{{{1*/
     279void Matrix::Convert(MatrixType type){
     280
     281        #ifdef _HAVE_PETSC_
     282                MatConvert(this->matrix,ISSMToPetscMatrixType(type),MAT_REUSE_MATRIX,&this->matrix);
     283        #else
     284                this->matrix->Convert(type);
     285        #endif
     286}
     287/*}}}*/

  • issm/trunk-jpl/src/c/objects/Numerics/Matrix.h

    r11861 r11936  
    6262                double* ToSerial(void);
    6363                void SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode);
     64                void Convert(MatrixType type);
    6465                /*}}}*/
    6566

  • issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp

    r11861 r11936  
    6262}
    6363/*}}}*/
    64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     64#ifdef _SERIAL_
    6565/*FUNCTION BoolParam::Marshall{{{1*/
    6666void  BoolParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/BoolParam.h

    r11861 r11936  
    4141                int   Id();
    4242                int   MyRank();
    43                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     43                #ifdef _SERIAL_
    4444                void  Marshall(char** pmarshalled_dataset);
    4545                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp

    r11861 r11936  
    127127}
    128128/*}}}*/
    129 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     129#ifdef _SERIAL_
    130130/*FUNCTION DoubleMatArrayParam::Marshall{{{1*/
    131131void  DoubleMatArrayParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h

    r11861 r11936  
    4444                int   Id();
    4545                int   MyRank();
    46                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     46                #ifdef _SERIAL_
    4747                void  Marshall(char** pmarshalled_dataset);
    4848                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp

    r11861 r11936  
    7878}
    7979/*}}}*/
    80 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     80#ifdef _SERIAL_
    8181/*FUNCTION DoubleMatParam::Marshall{{{1*/
    8282void  DoubleMatParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h

    r11861 r11936  
    4343                int   Id();
    4444                int   MyRank();
    45                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     45                #ifdef _SERIAL_
    4646                void  Marshall(char** pmarshalled_dataset);
    4747                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp

    r11861 r11936  
    5959}
    6060/*}}}*/
    61 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     61#ifdef _SERIAL_
    6262/*FUNCTION DoubleParam::Marshall{{{1*/
    6363void  DoubleParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/DoubleParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp

    r11861 r11936  
    7575}
    7676/*}}}*/
    77 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     77#ifdef _SERIAL_
    7878/*FUNCTION DoubleVecParam::Marshall{{{1*/
    7979void  DoubleVecParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/FileParam.cpp

    r11861 r11936  
    6262}
    6363/*}}}*/
    64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     64#ifdef _SERIAL_
    6565/*FUNCTION FileParam::Marshall{{{1*/
    6666void  FileParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/FileParam.h

    r11861 r11936  
    4141                int   Id();
    4242                int   MyRank();
    43                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     43                #ifdef _SERIAL_
    4444                void  Marshall(char** pmarshalled_dataset);
    4545                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp

    r11861 r11936  
    7878}
    7979/*}}}*/
    80 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     80#ifdef _SERIAL_
    8181/*FUNCTION IntMatParam::Marshall{{{1*/
    8282void  IntMatParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/IntMatParam.h

    r11861 r11936  
    4343                int   Id();
    4444                int   MyRank();
    45                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     45                #ifdef _SERIAL_
    4646                void  Marshall(char** pmarshalled_dataset);
    4747                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/IntParam.cpp

    r11861 r11936  
    6262}
    6363/*}}}*/
    64 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     64#ifdef _SERIAL_
    6565/*FUNCTION IntParam::Marshall{{{1*/
    6666void  IntParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/IntParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp

    r11861 r11936  
    9191}
    9292/*}}}*/
    93 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     93#ifdef _SERIAL_
    9494/*FUNCTION IntVecParam::Marshall{{{1*/
    9595void  IntVecParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/IntVecParam.h

    r11861 r11936  
    4343                int   Id();
    4444                int   MyRank();
    45                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     45                #ifdef _SERIAL_
    4646                void  Marshall(char** pmarshalled_dataset);
    4747                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp

    r11861 r11936  
    7070}
    7171/*}}}*/
    72 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     72#ifdef _SERIAL_
    7373/*FUNCTION MatrixParam::Marshall{{{1*/
    7474void  MatrixParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/MatrixParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp

    r11861 r11936  
    9292}
    9393/*}}}*/
    94 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     94#ifdef _SERIAL_
    9595/*FUNCTION StringArrayParam::Marshall{{{1*/
    9696void  StringArrayParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h

    r11861 r11936  
    4444                int   Id();
    4545                int   MyRank();
    46                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     46                #ifdef _SERIAL_
    4747                void  Marshall(char** pmarshalled_dataset);
    4848                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/StringParam.cpp

    r11861 r11936  
    6464}
    6565/*}}}*/
    66 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     66#ifdef _SERIAL_
    6767/*FUNCTION StringParam::Marshall{{{1*/
    6868void  StringParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/StringParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();

  • issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp

    r11861 r11936  
    7272}
    7373/*}}}*/
    74 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     74#ifdef _SERIAL_
    7575/*FUNCTION VectorParam::Marshall{{{1*/
    7676void  VectorParam::Marshall(char** pmarshalled_dataset){

  • issm/trunk-jpl/src/c/objects/Params/VectorParam.h

    r11861 r11936  
    4242                int   Id();
    4343                int   MyRank();
    44                 #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
     44                #ifdef _SERIAL_
    4545                void  Marshall(char** pmarshalled_dataset);
    4646                int   MarshallSize();
Note: See TracChangeset for help on using the changeset viewer.