Changeset 3961


Ignore:
Timestamp:
05/26/10 16:32:25 (15 years ago)
Author:
Mathieu Morlighem
Message:

Added folds

Location:
issm/trunk/src/c/io
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/io/FetchData.cpp

    r3775 r3961  
    1313#include "../include/include.h"
    1414
     15#ifdef _SERIAL_
    1516/***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************
    1617                                                                                                          Serial Fetch Data Routines, all overloaded.
    1718**************** **************** **************** **************** **************** **************** **************** **************** **************** *****************/
    18 
    19 #ifdef _SERIAL_
    20 
    2119#include <mex.h>
    22 
     20/*FUNCTION FetchData(DataSet** pdataset,const mxArray* dataref){{{1*/
    2321void FetchData(DataSet** pdataset,const mxArray* dataref){
    2422
    … …  
    5351        *pdataset=outdataset;
    5452}
    55 
     53/*}}}*/
     54/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/
    5655void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){
    5756
    … …  
    9291
    9392}
    94 
     93/*}}}*/
     94/*FUNCTION FetchData(Mat* pmatrix,const mxArray* dataref){{{1*/
    9595void FetchData(Mat* pmatrix,const mxArray* dataref){
    9696       
    … …  
    122122        *pmatrix=outmatrix;
    123123}
    124 
     124/*}}}*/
     125/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{1*/
    125126void FetchData(double** pvector,int* pM,const mxArray* dataref){
    126127
    … …  
    148149        if (pM)*pM=outvector_rows;
    149150}
    150 
     151/*}}}*/
     152/*FUNCTION FetchData(Vec* pvector,const mxArray* dataref){{{1*/
    151153void FetchData(Vec* pvector,const mxArray* dataref){
    152154
    … …  
    171173        *pvector=vector;
    172174}
    173 
     175/*}}}*/
     176/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{1*/
    174177void FetchData(char** pstring,const mxArray* dataref){
    175178
    … …  
    193196        *pstring=outstring;
    194197}
    195 
     198/*}}}*/
     199/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{1*/
    196200void FetchData(double* pscalar,const mxArray* dataref){
    197201
    … …  
    209213        *pscalar=scalar;
    210214}
    211 
     215/*}}}*/
     216/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{1*/
    212217void FetchData(int* pinteger,const mxArray* dataref){
    213218
    … …  
    225230        *pinteger=integer;
    226231}
    227 
    228 
     232/*}}}*/
     233/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{1*/
     234void FetchData(bool* pboolean,const mxArray* dataref){
     235
     236        bool boolean;
     237
     238        if (!mxIsDouble(dataref)){
     239                ISSMERROR("input data_type is not a scalar!");
     240        }
     241        else{
     242                /*Recover the double: */
     243                boolean=(bool)mxGetScalar(dataref);
     244        }
     245
     246        /*Assign output pointers:*/
     247        *pboolean=boolean;
     248}
     249/*}}}*/
    229250#endif
    230251
    231252#if defined(_PARALLEL_) && defined(_HAVE_PETSC_)
    232 
    233253/***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************
    234254                                                                                                          Parallel Fetch Data Routines, all overloaded.
    235255**************** **************** **************** **************** **************** **************** **************** **************** **************** *****************/
    236 
     256/*FUNCTION FetchData(double** pmatrix, int* pM,int* pN,FILE* fid){{{1*/
    237257void FetchData(double** pmatrix, int* pM,int* pN,FILE* fid){
    238258
    … …  
    276296
    277297}
    278 
     298/*}}}*/
     299/*FUNCTION FetchData(char** pstring,FILE* fid){{{1*/
    279300void FetchData(char** pstring,FILE* fid){
    280301
    … …  
    313334        *pstring=string;
    314335}
    315 
    316 
     336/*}}}*/
     337/*FUNCTION FetchData(double* pscalar,FILE* fid){{{1*/
    317338void FetchData(double* pscalar,FILE* fid){
    318339
    … …  
    333354                 
    334355}
    335 
     356/*}}}*/
     357/*FUNCTION FetchData(int* pinteger,FILE* fid){{{1*/
    336358void FetchData(int* pinteger,FILE* fid){
    337359
    … …  
    353375
    354376}
    355 
    356 
     377/*}}}*/
    357378#endif

  • issm/trunk/src/c/io/IoModelFetchData.cpp

    r3685 r3961  
    1515                                                                                                          Serial IoModelFetch Data Routines, all overloaded.
    1616**************** **************** **************** **************** **************** **************** **************** **************** **************** *****************/
    17 
     17/*FUNCTION IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name){{{1*/
    1818void IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name){
    1919
    … …  
    2121
    2222}
     23/*}}}*/
     24/*FUNCTION IoModelFetchData(double** pmatrix,int* pM,int *pN,ConstDataHandle model_handle,char* data_name){{{1*/
    2325void IoModelFetchData(double** pmatrix,int* pM,int *pN,ConstDataHandle model_handle,char* data_name){
    2426       
    … …  
    2628
    2729}
     30/*}}}*/
     31/*FUNCTION IoModelFetchData(Mat* pmatrix,ConstDataHandle model_handle,char* data_name){{{1*/
    2832void IoModelFetchData(Mat* pmatrix,ConstDataHandle model_handle,char* data_name){
    2933       
    … …  
    3135
    3236}
     37/*}}}*/
     38/*FUNCTION IoModelFetchData(double** pvector,int* pM,ConstDataHandle model_handle,char* data_name){{{1*/
    3339void IoModelFetchData(double** pvector,int* pM,ConstDataHandle model_handle,char* data_name){
    3440       
    … …  
    3642
    3743}
     44/*}}}*/
     45/*FUNCTION IoModelFetchData(Vec* pvector,ConstDataHandle model_handle,char* data_name){{{1*/
    3846void IoModelFetchData(Vec* pvector,ConstDataHandle model_handle,char* data_name){
    3947       
    … …  
    4149
    4250}
     51/*}}}*/
     52/*FUNCTION IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){{{1*/
    4353void IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){
    4454       
    … …  
    4656
    4757}
     58/*}}}*/
     59/*FUNCTION IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){{{1*/
    4860void IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){
    4961       
    … …  
    5163
    5264}
     65/*}}}*/
     66/*FUNCTION IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){{{1*/
    5367void IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){
    5468
    5569        FetchData(pinteger,mxGetAssignedField(model_handle,0,data_name));
    5670}
     71/*}}}*/
    5772#endif
    5873
    59 
    60 
     74#ifdef _PARALLEL_
    6175/***************** **************** **************** **************** **************** **************** **************** **************** **************** ****************
    6276                                                                                                          Parallel IoModelFetch Data Routines, all overloaded.
    6377**************** **************** **************** **************** **************** **************** **************** **************** **************** *****************/
    64 #ifdef _PARALLEL_
     78/*FUNCTION SetFilePointerToData(ConstDataHandle model_handle,char* data_name){{{1*/
    6579FILE* SetFilePointerToData(ConstDataHandle model_handle,char* data_name){
    6680
    … …  
    125139        return fid;
    126140}
    127 
     141/*}}}*/
     142/*FUNCTION IoModelFetchData(double** pmatrix,int* pM,int* pN,ConstDataHandle model_handle,char* data_name){{{1*/
    128143void  IoModelFetchData(double** pmatrix,int* pM,int* pN,ConstDataHandle model_handle,char* data_name){
    129144       
    … …  
    137152
    138153}
     154/*}}}*/
     155/*FUNCTION IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){{{1*/
    139156void  IoModelFetchData(char** pstring,ConstDataHandle model_handle,char* data_name){
    140157
    … …  
    147164        FetchData(pstring,fid);
    148165}
    149 
     166/*}}}*/
     167/*FUNCTION IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){{{1*/
    150168void  IoModelFetchData(double* pscalar,ConstDataHandle model_handle,char* data_name){
    151169
    … …  
    158176        FetchData(pscalar,fid);
    159177}
    160 
     178/*}}}*/
     179/*FUNCTION IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){{{1*/
    161180void  IoModelFetchData(int* pinteger,ConstDataHandle model_handle,char* data_name){
    162181
    … …  
    169188        FetchData(pinteger,fid);
    170189}
     190/*}}}*/
    171191#endif

  • issm/trunk/src/c/io/WriteData.cpp

    r3775 r3961  
    1414
    1515#ifdef _SERIAL_
    16 
    1716#include <mex.h>
    18 
    1917/*Several prototypes for WriteData, according to type: */
    20 
    21 /*DataSet: */
     18/*FUNCTION WriteData(mxArray** pdataref,DataSet* dataset){{{1*/
    2219void WriteData(mxArray** pdataref,DataSet* dataset){
    2320
    … …  
    4441       
    4542}
    46 
     43/*}}}*/
     44/*FUNCTION WriteData(mxArray** pdataref,Mat matrix){{{1*/
    4745void WriteData(mxArray** pdataref,Mat matrix){
    4846               
    … …  
    6058        *pdataref=dataref;
    6159}
    62 
     60/*}}}*/
     61/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{1*/
    6362void WriteData(mxArray** pdataref,double* matrix, int M,int N){
    6463       
    … …  
    8281        *pdataref=dataref;
    8382}
    84 
    85 
     83/*}}}*/
     84/*FUNCTION WriteData(mxArray** pdataref,Vec vector){{{1*/
    8685void WriteData(mxArray** pdataref,Vec vector){
    8786       
    … …  
    9998
    10099}
    101 
    102 
     100/*}}}*/
     101/*FUNCTION WriteData(mxArray** pdataref,DofVec* dofvec){{{1*/
    103102void WriteData(mxArray** pdataref,DofVec* dofvec){
    104103       
    … …  
    140139        *pdataref=dataref;
    141140}
    142 
     141/*}}}*/
     142/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{1*/
    143143void WriteData(mxArray** pdataref,double* vector, int M){
    144144       
    … …  
    159159        *pdataref=dataref;
    160160}
    161 
     161/*}}}*/
     162/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{1*/
    162163void WriteData(mxArray** pdataref,double scalar){
    163164
    164165        *pdataref=mxCreateDoubleScalar(scalar);
    165166}
    166 
     167/*}}}*/
     168/*FUNCTION WriteData(mxArray** pdataref,int integer){{{1*/
    167169void WriteData(mxArray** pdataref,int integer){
    168170
    … …  
    170172
    171173}
    172 
     174/*}}}*/
     175/*FUNCTION WriteData(mxArray** pdataref,char* string){{{1*/
    173176void WriteData(mxArray** pdataref,char* string){
    174177
    175178                *pdataref=mxCreateString(string);
    176179}
    177 
     180/*}}}*/
     181/*FUNCTION WriteData(mxArray** pbamgmesh_mat,BamgMesh* bm){{{1*/
    178182void WriteData(mxArray** pbamgmesh_mat,BamgMesh* bm){
    179183
    … …  
    228232        *pbamgmesh_mat=bamgmesh_mat;
    229233}
    230 
     234/*}}}*/
     235/*FUNCTION WriteData(mxArray** pbamggeom_mat, BamgGeom* bg){{{1*/
    231236void WriteData(mxArray** pbamggeom_mat, BamgGeom* bg){
    232237
    … …  
    272277        *pbamggeom_mat=bamggeom_mat;
    273278}
     279/*}}}*/
    274280
    275281#else
     282/*FUNCTION WriteData(int* pdummy,void* data,char* data_type){{{1*/
    276283void WriteData(int* pdummy,void* data,char* data_type){
    277284       
    278285        /*In parallel mode, WriteData is not used, instead we access the data directly through pointers in the solution sequences. */
    279286}
     287/*}}}*/
    280288#endif

  • issm/trunk/src/c/io/io.h

    r3775 r3961  
    4040void FetchData(double* pscalar,const mxArray* dataref);
    4141void FetchData(int* pinteger,const mxArray* dataref);
    42 
     42void FetchData(bool* pbool,const mxArray* dataref);
    4343
    4444void IoModelFetchData(DataSet** pdataset,ConstDataHandle model_handle,char* data_name);
Note: See TracChangeset for help on using the changeset viewer.