Changeset 11202 for issm/trunk-jpl/src
- Timestamp:
- 01/25/12 10:52:04 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 103 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/io/Disk/diskio.h
r9340 r11202 13 13 class Parameters; 14 14 15 FILE* pfopen(char* filename,c har* format);15 FILE* pfopen(char* filename,const char* format); 16 16 void pfclose(FILE* fid,char* filename); 17 17 -
issm/trunk-jpl/src/c/io/Disk/pfopen.cpp
r9320 r11202 13 13 #include "../../include/include.h" 14 14 15 FILE* pfopen(char* filename,c har* format){15 FILE* pfopen(char* filename,const char* format){ 16 16 17 17 FILE* fid=NULL; -
issm/trunk-jpl/src/c/io/Matlab/WriteMatlabData.cpp
r10205 r11202 177 177 178 178 /*output: */ 179 mxArray * dataref=NULL;180 mwSize nfields;181 c onst char** fnames=NULL;182 mwSize 183 mwSize ndim=2;179 mxArray *dataref = NULL; 180 mwSize nfields; 181 char **fnames = NULL; 182 mwSize onebyone[2] = {1,1}; 183 mwSize ndim = 2; 184 184 185 185 /*intermediary: */ … … 188 188 /*Recover data from the parameters dataset: */ 189 189 nfields=(mwSize)parameters->Size(); 190 fnames=(c onst char**)xmalloc(nfields*sizeof(char*));190 fnames=(char**)xmalloc(nfields*sizeof(char*)); 191 191 192 192 /*Build structure in matlab workspace with all the parameter fields: */ 193 193 for(i=0;i<nfields;i++){ 194 194 param=(Param*)parameters->GetObjectByOffset(i); 195 fnames[i]=param->GetParameterName();195 param->GetParameterName(&fnames[i]); 196 196 } 197 197 /*Initialize structure: */ 198 dataref=mxCreateStructArray( ndim,onebyone,nfields, fnames);198 dataref=mxCreateStructArray( ndim,onebyone,nfields,(const char**)fnames); 199 199 200 200 /*Fill each field: */ -
issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp
r11192 r11202 12 12 #include "./EnumToStringx.h" 13 13 14 c har* EnumToStringx(int en){14 const char* EnumToStringx(int en){ 15 15 16 16 switch(en){ … … 438 438 } 439 439 } 440 void EnumToStringx(char** pstring,int enum_in){ 441 char *string = NULL; 442 int len = 0; 443 444 len=strlen(EnumToStringx(enum_in)); 445 string=(char*)xmalloc((len+1)*sizeof(char)); 446 memcpy(string,EnumToStringx(enum_in),(len+1)*sizeof(char)); 447 448 /*Assign output pointer*/ 449 *pstring=string; 450 } -
issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.h
r8224 r11202 6 6 #ifndef _ENUM_TO_STRINGX_ 7 7 8 char *EnumToStringx(int enum_in); 8 const char* EnumToStringx(int enum_in); 9 void EnumToStringx(char** string,int enum_in); 9 10 10 11 #endif -
issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp
r10989 r11202 28 28 bool io_gather; 29 29 int solutiontype; 30 char* solutiontypestring = NULL; 30 31 Results *results = NULL; 31 32 bool dakota_analysis = false; … … 62 63 if(my_rank==0){ 63 64 parameters->FindParam(&solutiontype,SolutionTypeEnum); 64 results->AddObject(new StringExternalResult(results->Size()+1,SolutionTypeEnum,EnumToStringx(solutiontype),1,0)); 65 EnumToStringx(&solutiontypestring,solutiontype); 66 results->AddObject(new StringExternalResult(results->Size()+1,SolutionTypeEnum,solutiontypestring,1,0)); 67 xfree((void**)&solutiontypestring); 65 68 } 66 69 -
issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp
r10703 r11202 16 16 #include "../modules.h" 17 17 18 void Responsex(double* responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,c har* response_descriptor,bool process_units,int weight_index){18 void Responsex(double* responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* response_descriptor,bool process_units,int weight_index){ 19 19 20 20 switch (StringToEnumx(response_descriptor)){ -
issm/trunk-jpl/src/c/modules/Responsex/Responsex.h
r8607 r11202 9 9 #include "../../Container/Container.h" 10 10 11 void Responsex(double* presponse,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,c har* response_descriptor,bool process_units,int weight_index);11 void Responsex(double* presponse,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* response_descriptor,bool process_units,int weight_index); 12 12 13 13 #endif /* _RESPONSESXX_H */ -
issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp
r11192 r11202 12 12 #include "./StringToEnumx.h" 13 13 14 int StringToEnumx(c har* name){14 int StringToEnumx(const char* name){ 15 15 16 16 if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum; -
issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.h
r8224 r11202 6 6 #ifndef _STRING_TO_ENUMX_ 7 7 8 int StringToEnumx(c har* string_in);8 int StringToEnumx(const char* string_in); 9 9 10 10 #endif -
issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp
r9883 r11202 150 150 int type; 151 151 int size; 152 char *name = NULL;153 152 double boolean; 154 153 extern int my_rank; 154 char* name = NULL; 155 155 156 156 /*return if now on cpu 0: */ … … 158 158 159 159 /*First write enum: */ 160 name=EnumToStringx(this->enum_type);160 EnumToStringx(&name,this->enum_type); 161 161 length=(strlen(name)+1)*sizeof(char); 162 162 fwrite(&length,sizeof(int),1,fid); … … 180 180 /*}}}1*/ 181 181 /*FUNCTION BoolExternalResult::GetResultName{{{1*/ 182 char* BoolExternalResult::GetResultName(void){183 return EnumToStringx(this->enum_type);182 void BoolExternalResult::GetResultName(char** pname){ 183 EnumToStringx(pname,this->enum_type); 184 184 } 185 185 /*}}}*/ … … 189 189 190 190 char* name=NULL; 191 name=this->GetResultName();191 this->GetResultName(&name); 192 192 193 193 mxSetField( dataref, this->step-1, name,mxCreateDoubleScalar((double)value)); -
issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h
r9883 r11202 58 58 int InstanceEnum(){return enum_type;} 59 59 void WriteData(FILE* fid,bool io_gather); 60 char* GetResultName(void);60 void GetResultName(char**); 61 61 #ifdef _SERIAL_ 62 62 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp
r9883 r11202 157 157 158 158 /*First write enum: */ 159 name=EnumToStringx(this->enum_type);159 EnumToStringx(&name,this->enum_type); 160 160 length=(strlen(name)+1)*sizeof(char); 161 161 fwrite(&length,sizeof(int),1,fid); … … 176 176 /*}}}1*/ 177 177 /*FUNCTION DoubleExternalResult::GetResultName{{{1*/ 178 char* DoubleExternalResult::GetResultName(void){179 return EnumToStringx(this->enum_type);178 void DoubleExternalResult::GetResultName(char** pname){ 179 EnumToStringx(pname,this->enum_type); 180 180 } 181 181 /*}}}*/ … … 185 185 186 186 char* name=NULL; 187 name=this->GetResultName();187 this->GetResultName(&name); 188 188 mxSetField( dataref,this->step-1, name,mxCreateDoubleScalar(value)); 189 189 mxSetField( dataref, this->step-1, "time",mxCreateDoubleScalar((double)this->time)); -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h
r9883 r11202 59 59 int InstanceEnum(){return enum_type;} 60 60 void WriteData(FILE* fid,bool io_gather); 61 char* GetResultName(void);61 void GetResultName(char**); 62 62 #ifdef _SERIAL_ 63 63 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
r9883 r11202 196 196 197 197 /*First write enum: */ 198 name=EnumToStringx(this->enum_type);198 EnumToStringx(&name,this->enum_type); 199 199 length=(strlen(name)+1)*sizeof(char); 200 200 fwrite(&length,sizeof(int),1,fid); … … 217 217 /*}}}1*/ 218 218 /*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/ 219 char* DoubleMatExternalResult::GetResultName(void){220 return EnumToStringx(this->enum_type);219 void DoubleMatExternalResult::GetResultName(char** pname){ 220 EnumToStringx(pname,this->enum_type); 221 221 } 222 222 /*}}}*/ … … 235 235 236 236 /*recover name: */ 237 name=this->GetResultName();237 this->GetResultName(&name); 238 238 239 239 /*create matlab matrix: */ -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h
r9883 r11202 60 60 int InstanceEnum(){return enum_type;} 61 61 void WriteData(FILE* fid,bool io_gather); 62 char* GetResultName(void);62 void GetResultName(char**); 63 63 #ifdef _SERIAL_ 64 64 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp
r10989 r11202 182 182 183 183 /*First write enum: */ 184 name=EnumToStringx(this->enum_type);184 EnumToStringx(&name,this->enum_type); 185 185 length=(strlen(name)+1)*sizeof(char); 186 186 fwrite(&length,sizeof(int),1,fid); … … 201 201 /*}}}1*/ 202 202 /*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/ 203 char* DoubleVecExternalResult::GetResultName(void){204 return EnumToStringx(this->enum_type);203 void DoubleVecExternalResult::GetResultName(char** pname){ 204 EnumToStringx(pname,this->enum_type); 205 205 } 206 206 /*}}}*/ … … 219 219 220 220 /*recover name: */ 221 name=this->GetResultName();221 this->GetResultName(&name); 222 222 223 223 /*create matlab matrix: */ -
issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h
r9883 r11202 59 59 int InstanceEnum(){return enum_type;} 60 60 void WriteData(FILE* fid,bool io_gather); 61 char* GetResultName(void);61 void GetResultName(char**); 62 62 #ifdef _SERIAL_ 63 63 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h
r9883 r11202 32 32 virtual int InstanceEnum()=0; 33 33 virtual void WriteData(FILE* fid,bool io_gather)=0; 34 virtual char* GetResultName(void)=0;34 virtual void GetResultName(char**)=0; 35 35 #ifdef _SERIAL_ 36 36 virtual void SetMatlabField(mxArray* dataref)=0; -
issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp
r9883 r11202 158 158 159 159 /*First write enum: */ 160 name=EnumToStringx(this->enum_type);160 EnumToStringx(&name,this->enum_type); 161 161 length=(strlen(name)+1)*sizeof(char); 162 162 fwrite(&length,sizeof(int),1,fid); … … 180 180 /*}}}1*/ 181 181 /*FUNCTION IntExternalResult::GetResultName{{{1*/ 182 char* IntExternalResult::GetResultName(void){183 return EnumToStringx(this->enum_type);182 void IntExternalResult::GetResultName(char** pname){ 183 EnumToStringx(pname,this->enum_type); 184 184 } 185 185 /*}}}*/ … … 189 189 190 190 char* name=NULL; 191 name=this->GetResultName();191 this->GetResultName(&name); 192 192 193 193 mxSetField( dataref, this->step-1, name,mxCreateDoubleScalar(value)); -
issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h
r9883 r11202 57 57 int InstanceEnum(){return enum_type;} 58 58 void WriteData(FILE* fid,bool io_gather); 59 char* GetResultName(void);59 void GetResultName(char**); 60 60 #ifdef _SERIAL_ 61 61 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp
r9883 r11202 218 218 219 219 /*First write enum: */ 220 name=EnumToStringx(this->enum_type);220 EnumToStringx(&name,this->enum_type); 221 221 length=(strlen(name)+1)*sizeof(char); 222 222 fwrite(&length,sizeof(int),1,fid); … … 239 239 /*}}}1*/ 240 240 /*FUNCTION PetscVecExternalResult::GetResultName{{{1*/ 241 char* PetscVecExternalResult::GetResultName(void){242 return EnumToStringx(this->enum_type);241 void PetscVecExternalResult::GetResultName(char**pname){ 242 EnumToStringx(pname,this->enum_type); 243 243 } 244 244 /*}}}*/ … … 254 254 VecToMPISerial(&doublevec,value); 255 255 VecGetSize(value,&M); 256 name=this->GetResultName();256 this->GetResultName(&name); 257 257 258 258 pfield=mxCreateDoubleMatrix(0,0,mxREAL); -
issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h
r9883 r11202 59 59 int InstanceEnum(){return enum_type;} 60 60 void WriteData(FILE* fid,bool io_gather); 61 char* GetResultName(void);61 void GetResultName(char**); 62 62 #ifdef _SERIAL_ 63 63 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp
r9883 r11202 172 172 173 173 /*First write enum: */ 174 name=EnumToStringx(this->enum_type);174 EnumToStringx(&name,this->enum_type); 175 175 length=(strlen(name)+1)*sizeof(char); 176 176 fwrite(&length,sizeof(int),1,fid); … … 192 192 /*}}}1*/ 193 193 /*FUNCTION StringExternalResult::GetResultName{{{1*/ 194 char* StringExternalResult::GetResultName(void){195 return EnumToStringx(this->enum_type);194 void StringExternalResult::GetResultName(char**pname){ 195 EnumToStringx(pname,this->enum_type); 196 196 } 197 197 /*}}}*/ … … 202 202 char* name=NULL; 203 203 204 name=this->GetResultName();204 this->GetResultName(&name); 205 205 206 206 mxSetField( dataref, this->step-1, name, mxCreateString(value)); -
issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h
r9883 r11202 57 57 int InstanceEnum(){return enum_type;} 58 58 void WriteData(FILE* fid,bool io_gather); 59 char* GetResultName(void);59 void GetResultName(char**); 60 60 #ifdef _SERIAL_ 61 61 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp
r11201 r11202 78 78 /*}}}*/ 79 79 /*FUNCTION KML_Attribute::Write {{{1*/ 80 void KML_Attribute::Write(FILE* filout,c har* indent){80 void KML_Attribute::Write(FILE* filout,const char* indent){ 81 81 82 82 // attributes always written in keyword line of kml_object -
issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h
r11201 r11202 40 40 41 41 /*virtual functions: */ 42 void Write(FILE* fid,c har* indent);42 void Write(FILE* fid,const char* indent); 43 43 void Read(FILE* fid,char* kstr); 44 44 void Alloc(const char* namei,const char* valuei); -
issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp
r11200 r11202 75 75 /*}}}*/ 76 76 /*FUNCTION KML_ColorStyle::Write {{{1*/ 77 void KML_ColorStyle::Write(FILE* filout,c har* indent){77 void KML_ColorStyle::Write(FILE* filout,const char* indent){ 78 78 79 79 KML_SubStyle::Write(filout,indent); -
issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h
r11200 r11202 33 33 void DeepEcho(); 34 34 void DeepEcho(const char* indent); 35 void Write(FILE* fid,c har* indent);35 void Write(FILE* fid,const char* indent); 36 36 void Read(FILE* fid,char* kstr); 37 37 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp
r11201 r11202 70 70 /*}}}*/ 71 71 /*FUNCTION KML_Comment::Write {{{1*/ 72 void KML_Comment::Write(FILE* filout,c har* indent){72 void KML_Comment::Write(FILE* filout,const char* indent){ 73 73 74 74 if (strncmp(&value[0] ,"<!--",4)) -
issm/trunk-jpl/src/c/objects/KML/KML_Comment.h
r11201 r11202 40 40 41 41 /*virtual functions: */ 42 void Write(FILE* fid,c har* indent);42 void Write(FILE* fid,const char* indent); 43 43 void Read(FILE* fid,char* kstr); 44 44 void Alloc(const char* valuei); -
issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp
r11201 r11202 90 90 /*}}}*/ 91 91 /*FUNCTION KML_Container::Write {{{1*/ 92 void KML_Container::Write(FILE* filout,c har* indent){92 void KML_Container::Write(FILE* filout,const char* indent){ 93 93 94 94 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_Container.h
r11201 r11202 30 30 void DeepEcho(); 31 31 void DeepEcho(const char* indent); 32 void Write(FILE* fid,c har* indent);32 void Write(FILE* fid,const char* indent); 33 33 void Read(FILE* fid,char* kstr); 34 34 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp
r11201 r11202 73 73 74 74 /*FUNCTION KML_Document::Write {{{1*/ 75 void KML_Document::Write(FILE* filout,c har* indent){75 void KML_Document::Write(FILE* filout,const char* indent){ 76 76 77 77 fprintf(filout,"%s<Document",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_Document.h
r11201 r11202 28 28 void DeepEcho(); 29 29 void DeepEcho(const char* indent); 30 void Write(FILE* fid,c har* indent);30 void Write(FILE* fid,const char* indent); 31 31 void Read(FILE* fid,char* kstr); 32 32 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp
r11201 r11202 113 113 114 114 /*FUNCTION KML_Feature::Write {{{1*/ 115 void KML_Feature::Write(FILE* filout,c har* indent){115 void KML_Feature::Write(FILE* filout,const char* indent){ 116 116 117 117 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_Feature.h
r11201 r11202 42 42 void DeepEcho(); 43 43 void DeepEcho(const char* indent); 44 void Write(FILE* fid,c har* indent);44 void Write(FILE* fid,const char* indent); 45 45 void Read(FILE* fid,char* kstr); 46 46 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_File.cpp
r11201 r11202 92 92 /*}}}*/ 93 93 /*FUNCTION KML_File::Write {{{1*/ 94 void KML_File::Write(FILE* filout,c har* indent){94 void KML_File::Write(FILE* filout,const char* indent){ 95 95 96 96 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_File.h
r11201 r11202 30 30 void DeepEcho(); 31 31 void DeepEcho(const char* indent); 32 void Write(FILE* fid,c har* indent);32 void Write(FILE* fid,const char* indent); 33 33 void Read(FILE* fid,char* kstr); 34 34 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp
r11201 r11202 73 73 74 74 /*FUNCTION KML_Folder::Write {{{1*/ 75 void KML_Folder::Write(FILE* filout,c har* indent){75 void KML_Folder::Write(FILE* filout,const char* indent){ 76 76 77 77 fprintf(filout,"%s<Folder",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_Folder.h
r11201 r11202 28 28 void DeepEcho(); 29 29 void DeepEcho(const char* indent); 30 void Write(FILE* fid,c har* indent);30 void Write(FILE* fid,const char* indent); 31 31 void Read(FILE* fid,char* kstr); 32 32 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Geometry.cpp
r11201 r11202 66 66 67 67 /*FUNCTION KML_Geometry::Write {{{1*/ 68 void KML_Geometry::Write(FILE* filout,c har* indent){68 void KML_Geometry::Write(FILE* filout,const char* indent){ 69 69 70 70 KML_Object::Write(filout,indent); -
issm/trunk-jpl/src/c/objects/KML/KML_Geometry.h
r11201 r11202 27 27 void DeepEcho(); 28 28 void DeepEcho(const char* indent); 29 void Write(FILE* fid,c har* indent);29 void Write(FILE* fid,const char* indent); 30 30 void Read(FILE* fid,char* kstr); 31 31 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp
r11201 r11202 95 95 96 96 /*FUNCTION KML_GroundOverlay::Write {{{1*/ 97 void KML_GroundOverlay::Write(FILE* filout,c har* indent){97 void KML_GroundOverlay::Write(FILE* filout,const char* indent){ 98 98 99 99 char indent2[81]; -
issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.h
r11201 r11202 34 34 void DeepEcho(); 35 35 void DeepEcho(const char* indent); 36 void Write(FILE* fid,c har* indent);36 void Write(FILE* fid,const char* indent); 37 37 void Read(FILE* fid,char* kstr); 38 38 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp
r11201 r11202 98 98 99 99 /*FUNCTION KML_Icon::Write {{{1*/ 100 void KML_Icon::Write(FILE* filout,c har* indent){100 void KML_Icon::Write(FILE* filout,const char* indent){ 101 101 102 102 fprintf(filout,"%s<Icon",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_Icon.h
r11201 r11202 42 42 void DeepEcho(); 43 43 void DeepEcho(const char* indent); 44 void Write(FILE* fid,c har* indent);44 void Write(FILE* fid,const char* indent); 45 45 void Read(FILE* fid,char* kstr); 46 46 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp
r11201 r11202 89 89 90 90 /*FUNCTION KML_LatLonBox::Write {{{1*/ 91 void KML_LatLonBox::Write(FILE* filout,c har* indent){91 void KML_LatLonBox::Write(FILE* filout,const char* indent){ 92 92 93 93 fprintf(filout,"%s<LatLonBox",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.h
r11201 r11202 33 33 void DeepEcho(); 34 34 void DeepEcho(const char* indent); 35 void Write(FILE* fid,c har* indent);35 void Write(FILE* fid,const char* indent); 36 36 void Read(FILE* fid,char* kstr); 37 37 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp
r11201 r11202 93 93 /*}}}*/ 94 94 /*FUNCTION KML_LineString::Write {{{1*/ 95 void KML_LineString::Write(FILE* filout,c har* indent){95 void KML_LineString::Write(FILE* filout,const char* indent){ 96 96 97 97 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_LineString.h
r11201 r11202 35 35 void DeepEcho(); 36 36 void DeepEcho(const char* indent); 37 void Write(FILE* fid,c har* indent);37 void Write(FILE* fid,const char* indent); 38 38 void Read(FILE* fid,char* kstr); 39 39 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.cpp
r11201 r11202 78 78 79 79 /*FUNCTION KML_LineStyle::Write {{{1*/ 80 void KML_LineStyle::Write(FILE* filout,c har* indent){80 void KML_LineStyle::Write(FILE* filout,const char* indent){ 81 81 82 82 fprintf(filout,"%s<LineStyle",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.h
r11201 r11202 29 29 void DeepEcho(); 30 30 void DeepEcho(const char* indent); 31 void Write(FILE* fid,c har* indent);31 void Write(FILE* fid,const char* indent); 32 32 void Read(FILE* fid,char* kstr); 33 33 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp
r11201 r11202 96 96 97 97 /*FUNCTION KML_LinearRing::Write {{{1*/ 98 void KML_LinearRing::Write(FILE* filout,c har* indent){98 void KML_LinearRing::Write(FILE* filout,const char* indent){ 99 99 100 100 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h
r11201 r11202 35 35 void DeepEcho(); 36 36 void DeepEcho(const char* indent); 37 void Write(FILE* fid,c har* indent);37 void Write(FILE* fid,const char* indent); 38 38 void Read(FILE* fid,char* kstr); 39 39 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp
r11201 r11202 95 95 96 96 /*FUNCTION KML_MultiGeometry::Write {{{1*/ 97 void KML_MultiGeometry::Write(FILE* filout,c har* indent){97 void KML_MultiGeometry::Write(FILE* filout,const char* indent){ 98 98 99 99 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h
r11201 r11202 31 31 void DeepEcho(); 32 32 void DeepEcho(const char* indent); 33 void Write(FILE* fid,c har* indent);33 void Write(FILE* fid,const char* indent); 34 34 void Read(FILE* fid,char* kstr); 35 35 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp
r11201 r11202 94 94 /*}}}*/ 95 95 /*FUNCTION KML_Object::Write {{{1*/ 96 void KML_Object::Write(FILE* filout,c har* indent){96 void KML_Object::Write(FILE* filout,const char* indent){ 97 97 98 98 // attributes always written in keyword line of derived classes … … 173 173 /*}}}*/ 174 174 /*FUNCTION KML_Object::WriteAttrib {{{1*/ 175 void KML_Object::WriteAttrib(FILE* filout,char* indent){ 176 177 int i; 175 void KML_Object::WriteAttrib(FILE* filout,const char* indent){ 178 176 179 177 // attributes always written in keyword line of kml_object … … 182 180 183 181 if (attrib->Size()) 184 for (i =0; i<attrib->Size(); i++)182 for (int i=0; i<attrib->Size(); i++) 185 183 ((KML_Attribute *)attrib->GetObjectByOffset(i))->Write(filout,indent); 186 184 … … 234 232 /*}}}*/ 235 233 /*FUNCTION KML_Object::WriteCommnt {{{1*/ 236 void KML_Object::WriteCommnt(FILE* filout,c har* indent){234 void KML_Object::WriteCommnt(FILE* filout,const char* indent){ 237 235 238 236 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_Object.h
r11201 r11202 40 40 41 41 /*virtual functions: */ 42 virtual void Write(FILE* fid,c har* indent)=0;42 virtual void Write(FILE* fid,const char* indent)=0; 43 43 virtual void Read(FILE* fid,char* kstr)=0; 44 44 virtual void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); 45 45 virtual void AddAttrib(const char* name,const char* value); 46 46 virtual void FindAttrib(char** pvalue,char* name,char* deflt); 47 virtual void WriteAttrib(FILE* fid,c har* indent);47 virtual void WriteAttrib(FILE* fid,const char* indent); 48 48 virtual void AddCommnt(int ncom,char** pcom); 49 49 virtual void AddCommnt(char* value); 50 50 virtual void FindCommnt(char** pvalue,int inum); 51 virtual void WriteCommnt(FILE* fid,c har* indent);51 virtual void WriteCommnt(FILE* fid,const char* indent); 52 52 53 53 }; -
issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp
r11201 r11202 94 94 95 95 /*FUNCTION KML_Overlay::Write {{{1*/ 96 void KML_Overlay::Write(FILE* filout,c har* indent){96 void KML_Overlay::Write(FILE* filout,const char* indent){ 97 97 98 98 char indent2[81]; -
issm/trunk-jpl/src/c/objects/KML/KML_Overlay.h
r11201 r11202 34 34 void DeepEcho(); 35 35 void DeepEcho(const char* indent); 36 void Write(FILE* fid,c har* indent);36 void Write(FILE* fid,const char* indent); 37 37 void Read(FILE* fid,char* kstr); 38 38 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp
r11201 r11202 92 92 /*}}}*/ 93 93 /*FUNCTION KML_Placemark::Write {{{1*/ 94 void KML_Placemark::Write(FILE* filout,c har* indent){94 void KML_Placemark::Write(FILE* filout,const char* indent){ 95 95 96 96 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h
r11201 r11202 31 31 void DeepEcho(); 32 32 void DeepEcho(const char* indent); 33 void Write(FILE* fid,c har* indent);33 void Write(FILE* fid,const char* indent); 34 34 void Read(FILE* fid,char* kstr); 35 35 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp
r11201 r11202 84 84 /*}}}*/ 85 85 /*FUNCTION KML_Point::Write {{{1*/ 86 void KML_Point::Write(FILE* filout,c har* indent){86 void KML_Point::Write(FILE* filout,const char* indent){ 87 87 88 88 fprintf(filout,"%s<Point",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_Point.h
r11201 r11202 33 33 void DeepEcho(); 34 34 void DeepEcho(const char* indent); 35 void Write(FILE* fid,c har* indent);35 void Write(FILE* fid,const char* indent); 36 36 void Read(FILE* fid,char* kstr); 37 37 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp
r11201 r11202 81 81 82 82 /*FUNCTION KML_PolyStyle::Write {{{1*/ 83 void KML_PolyStyle::Write(FILE* filout,c har* indent){83 void KML_PolyStyle::Write(FILE* filout,const char* indent){ 84 84 85 85 fprintf(filout,"%s<PolyStyle",indent); -
issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.h
r11201 r11202 30 30 void DeepEcho(); 31 31 void DeepEcho(const char* indent); 32 void Write(FILE* fid,c har* indent);32 void Write(FILE* fid,const char* indent); 33 33 void Read(FILE* fid,char* kstr); 34 34 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp
r11201 r11202 117 117 /*}}}*/ 118 118 /*FUNCTION KML_Polygon::Write {{{1*/ 119 void KML_Polygon::Write(FILE* filout,c har* indent){119 void KML_Polygon::Write(FILE* filout,const char* indent){ 120 120 121 121 int i; -
issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h
r11201 r11202 37 37 void DeepEcho(); 38 38 void DeepEcho(const char* indent); 39 void Write(FILE* fid,c har* indent);39 void Write(FILE* fid,const char* indent); 40 40 void Read(FILE* fid,char* kstr); 41 41 void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); -
issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp
r11201 r11202 142 142 143 143 /*FUNCTION KML_Style::Write {{{1*/ 144 void KML_Style::Write(FILE* filout,c har* indent){144 void KML_Style::Write(FILE* filout,const char* indent){ 145 145 146 146 char indent2[81]; -
issm/trunk-jpl/src/c/objects/KML/KML_Style.h
r11201 r11202 36 36 void DeepEcho(); 37 37 void DeepEcho(const char* indent); 38 void Write(FILE* fid,c har* indent);38 void Write(FILE* fid,const char* indent); 39 39 void Read(FILE* fid,char* kstr); 40 40 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.cpp
r11201 r11202 66 66 67 67 /*FUNCTION KML_StyleSelector::Write {{{1*/ 68 void KML_StyleSelector::Write(FILE* filout,c har* indent){68 void KML_StyleSelector::Write(FILE* filout,const char* indent){ 69 69 70 70 KML_Object::Write(filout,indent); -
issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.h
r11201 r11202 27 27 void DeepEcho(); 28 28 void DeepEcho(const char* indent); 29 void Write(FILE* fid,c har* indent);29 void Write(FILE* fid,const char* indent); 30 30 void Read(FILE* fid,char* kstr); 31 31 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.cpp
r11201 r11202 66 66 67 67 /*FUNCTION KML_SubStyle::Write {{{1*/ 68 void KML_SubStyle::Write(FILE* filout,c har* indent){68 void KML_SubStyle::Write(FILE* filout,const char* indent){ 69 69 70 70 KML_Object::Write(filout,indent); -
issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.h
r11201 r11202 27 27 void DeepEcho(); 28 28 void DeepEcho(const char* indent); 29 void Write(FILE* fid,c har* indent);29 void Write(FILE* fid,const char* indent); 30 30 void Read(FILE* fid,char* kstr); 31 31 int Id(){_error_("Not implemented yet.");}; -
issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp
r9883 r11202 130 130 /*BoolParam virtual functions definitions: */ 131 131 /*FUNCTION BoolParam::GetParameterName{{{1*/ 132 char* BoolParam::GetParameterName(void){133 return EnumToStringx(this->enum_type);132 void BoolParam::GetParameterName(char**pname){ 133 EnumToStringx(pname,this->enum_type); 134 134 } 135 135 /*}}}*/ … … 138 138 void BoolParam::SetMatlabField(mxArray* dataref){ 139 139 char* name=NULL; 140 name=this->GetParameterName();140 this->GetParameterName(&name); 141 141 mxSetField( dataref, 0, name,mxCreateDoubleScalar((double)value)); 142 142 } -
issm/trunk-jpl/src/c/objects/Params/BoolParam.h
r9883 r11202 80 80 void UnitConversion(int direction_enum); 81 81 82 char* GetParameterName(void);82 void GetParameterName(char**pname); 83 83 #ifdef _SERIAL_ 84 84 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp
r9883 r11202 304 304 /*}}}*/ 305 305 /*FUNCTION DoubleMatArrayParam::GetParameterName{{{1*/ 306 char* DoubleMatArrayParam::GetParameterName(void){307 return EnumToStringx(this->enum_type);306 void DoubleMatArrayParam::GetParameterName(char**pname){ 307 EnumToStringx(pname,this->enum_type); 308 308 } 309 309 /*}}}*/ … … 321 321 mxArray* pfield3=NULL; 322 322 323 name=this->GetParameterName();323 this->GetParameterName(&name); 324 324 dims[0]=this->M; 325 325 dims[1]=1; -
issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h
r9883 r11202 83 83 void UnitConversion(int direction_enum); 84 84 85 char* GetParameterName(void);85 void GetParameterName(char**pname); 86 86 #ifdef _SERIAL_ 87 87 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp
r9883 r11202 186 186 /*}}}*/ 187 187 /*FUNCTION DoubleMatParam::GetParameterName{{{1*/ 188 char* DoubleMatParam::GetParameterName(void){189 return EnumToStringx(this->enum_type);188 void DoubleMatParam::GetParameterName(char**pname){ 189 EnumToStringx(pname,this->enum_type); 190 190 } 191 191 /*}}}*/ … … 199 199 char* name=NULL; 200 200 201 name=this->GetParameterName();201 this->GetParameterName(&name); 202 202 this->GetParameterValue(&doublemat,NULL,NULL); 203 203 -
issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h
r10660 r11202 83 83 double* GetPointer(void); 84 84 85 char* GetParameterName(void);85 void GetParameterName(char**pname); 86 86 #ifdef _SERIAL_ 87 87 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp
r9883 r11202 127 127 /*DoubleParam virtual functions definitions: */ 128 128 /*FUNCTION DoubleParam::GetParameterName{{{1*/ 129 char* DoubleParam::GetParameterName(void){130 return EnumToStringx(this->enum_type);129 void DoubleParam::GetParameterName(char**pname){ 130 EnumToStringx(pname,this->enum_type); 131 131 } 132 132 /*}}}*/ … … 224 224 225 225 char* name=NULL; 226 name=this->GetParameterName();226 this->GetParameterName(&name); 227 227 mxSetField( dataref, 0, name,mxCreateDoubleScalar(value)); 228 228 } -
issm/trunk-jpl/src/c/objects/Params/DoubleParam.h
r9883 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp
r10584 r11202 198 198 /*}}}*/ 199 199 /*FUNCTION DoubleVecParam::GetParameterName{{{1*/ 200 char* DoubleVecParam::GetParameterName(void){201 return EnumToStringx(this->enum_type);200 void DoubleVecParam::GetParameterName(char**pname){ 201 EnumToStringx(pname,this->enum_type); 202 202 } 203 203 /*}}}*/ … … 211 211 212 212 this->GetParameterValue(&doublevec,NULL); 213 name=this->GetParameterName();213 this->GetParameterName(&name); 214 214 215 215 pfield=mxCreateDoubleMatrix(0,0,mxREAL); -
issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h
r10584 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/FileParam.cpp
r9883 r11202 97 97 /*FileParam virtual functions definitions: */ 98 98 /*FUNCTION FileParam::GetParameterName{{{1*/ 99 char* FileParam::GetParameterName(void){100 return EnumToStringx(this->enum_type);99 void FileParam::GetParameterName(char**pname){ 100 EnumToStringx(pname,this->enum_type); 101 101 } 102 102 /*}}}*/ -
issm/trunk-jpl/src/c/objects/Params/FileParam.h
r9883 r11202 80 80 void UnitConversion(int direction_enum); 81 81 82 char* GetParameterName(void);82 void GetParameterName(char**pname); 83 83 #ifdef _SERIAL_ 84 84 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp
r11197 r11202 168 168 /*}}}*/ 169 169 /*FUNCTION IntMatParam::GetParameterName{{{1*/ 170 char* IntMatParam::GetParameterName(void){171 return EnumToStringx(this->enum_type);170 void IntMatParam::GetParameterName(char**pname){ 171 EnumToStringx(pname,this->enum_type); 172 172 } 173 173 /*}}}*/ … … 183 183 184 184 this->GetParameterValue(&intarray,NULL,NULL); 185 name=this->GetParameterName();185 this->GetParameterName(&name); 186 186 187 187 /*cast intarray into doublearray for Matlab*/ -
issm/trunk-jpl/src/c/objects/Params/IntMatParam.h
r9883 r11202 82 82 void UnitConversion(int direction_enum); 83 83 84 char* GetParameterName(void);84 void GetParameterName(char**pname); 85 85 #ifdef _SERIAL_ 86 86 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/IntParam.cpp
r9883 r11202 130 130 /*IntParam virtual functions definitions: */ 131 131 /*FUNCTION IntParam::GetParameterName{{{1*/ 132 char* IntParam::GetParameterName(void){133 return EnumToStringx(this->enum_type);132 void IntParam::GetParameterName(char**pname){ 133 EnumToStringx(pname,this->enum_type); 134 134 } 135 135 /*}}}*/ … … 139 139 140 140 char* name=NULL; 141 name=this->GetParameterName();141 this->GetParameterName(&name); 142 142 mxSetField( dataref, 0, name,mxCreateDoubleScalar((double)value)); 143 143 } -
issm/trunk-jpl/src/c/objects/Params/IntParam.h
r9883 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp
r11197 r11202 181 181 /*}}}*/ 182 182 /*FUNCTION IntVecParam::GetParameterName{{{1*/ 183 char* IntVecParam::GetParameterName(void){184 return EnumToStringx(this->enum_type);183 void IntVecParam::GetParameterName(char**pname){ 184 EnumToStringx(pname,this->enum_type); 185 185 } 186 186 /*}}}*/ … … 195 195 196 196 this->GetParameterValue(&intvec,NULL); 197 name=this->GetParameterName();197 this->GetParameterName(&name); 198 198 199 199 /*cast intvec into doublevec for Matlab*/ -
issm/trunk-jpl/src/c/objects/Params/IntVecParam.h
r9883 r11202 82 82 void UnitConversion(int direction_enum); 83 83 84 char* GetParameterName(void);84 void GetParameterName(char**pname); 85 85 #ifdef _SERIAL_ 86 86 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/Param.h
r9883 r11202 59 59 virtual void SetValue(double** array, int M, int* mdim_array, int* ndim_array)=0; 60 60 virtual void UnitConversion(int direction_enum)=0; 61 62 virtual char* GetParameterName(void)=0; 61 virtual void GetParameterName(char**pname)=0; 63 62 #ifdef _SERIAL_ 64 63 virtual void SetMatlabField(mxArray* dataref)=0; -
issm/trunk-jpl/src/c/objects/Params/PetscMatParam.cpp
r9883 r11202 201 201 /*}}}*/ 202 202 /*FUNCTION PetscMatParam::GetParameterName{{{1*/ 203 char* PetscMatParam::GetParameterName(void){204 return EnumToStringx(this->enum_type);203 void PetscMatParam::GetParameterName(char**pname){ 204 EnumToStringx(pname,this->enum_type); 205 205 } 206 206 /*}}}*/ … … 216 216 MatToSerial(&doublemat,value); 217 217 MatGetSize(value,&M,&N); 218 name=this->GetParameterName();218 this->GetParameterName(&name); 219 219 220 220 pfield=mxCreateDoubleMatrix(0,0,mxREAL); -
issm/trunk-jpl/src/c/objects/Params/PetscMatParam.h
r9883 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/PetscVecParam.cpp
r9883 r11202 194 194 /*}}}*/ 195 195 /*FUNCTION PetscVecParam::GetParameterName{{{1*/ 196 char* PetscVecParam::GetParameterName(void){197 return EnumToStringx(this->enum_type);196 void PetscVecParam::GetParameterName(char**pname){ 197 EnumToStringx(pname,this->enum_type); 198 198 } 199 199 /*}}}*/ … … 209 209 VecToMPISerial(&doublevec,value); 210 210 VecGetSize(value,&M); 211 name=this->GetParameterName();211 this->GetParameterName(&name); 212 212 213 213 pfield=mxCreateDoubleMatrix(0,0,mxREAL); -
issm/trunk-jpl/src/c/objects/Params/PetscVecParam.h
r9883 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp
r9883 r11202 232 232 /*}}}*/ 233 233 /*FUNCTION StringArrayParam::GetParameterName{{{1*/ 234 char* StringArrayParam::GetParameterName(void){235 return EnumToStringx(this->enum_type);234 void StringArrayParam::GetParameterName(char**pname){ 235 EnumToStringx(pname,this->enum_type); 236 236 } 237 237 /*}}}*/ … … 245 245 mxArray* pfield=NULL; 246 246 247 name=this->GetParameterName();247 this->GetParameterName(&name); 248 248 249 249 dims[0]=this->numstrings; -
issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h
r9883 r11202 83 83 void UnitConversion(int direction_enum); 84 84 85 char* GetParameterName(void);85 void GetParameterName(char**pname); 86 86 #ifdef _SERIAL_ 87 87 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/objects/Params/StringParam.cpp
r9883 r11202 160 160 /*}}}*/ 161 161 /*FUNCTION StringParam::GetParameterName{{{1*/ 162 char* StringParam::GetParameterName(void){163 return EnumToStringx(this->enum_type);162 void StringParam::GetParameterName(char**pname){ 163 EnumToStringx(pname,this->enum_type); 164 164 } 165 165 /*}}}*/ … … 170 170 char* name=NULL; 171 171 172 name=this->GetParameterName();172 this->GetParameterName(&name); 173 173 mxSetField( dataref, 0, name, mxCreateString(value)); 174 174 } -
issm/trunk-jpl/src/c/objects/Params/StringParam.h
r9883 r11202 81 81 void UnitConversion(int direction_enum); 82 82 83 char* GetParameterName(void);83 void GetParameterName(char**pname); 84 84 #ifdef _SERIAL_ 85 85 void SetMatlabField(mxArray* dataref); -
issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp
r8301 r11202 24 24 25 25 for (i=0;i<nseg;i++){ 26 A= *(segments+3*i+0);27 B= *(segments+3*i+1);28 el= *(segments+3*i+2)-1; //after AssociateSegmentToElement, el was a matlab index, we need the c index now.26 A=segments[3*i+0]; 27 B=segments[3*i+1]; 28 el=(int)segments[3*i+2]-1; //after AssociateSegmentToElement, el was a matlab index, we need the c index now. 29 29 30 if ( *(index+3*el+0)==A){31 if ( *(index+3*el+2)==B){32 *(segments+3*i+0)=B;33 *(segments+3*i+1)=A;30 if (index[3*el+0]==A){ 31 if (index[3*el+2]==B){ 32 segments[3*i+0]=B; 33 segments[3*i+1]=A; 34 34 } 35 35 } 36 else if ( *(index+3*el+1)==A){37 if ( *(index+3*el+0)==B){38 *(segments+3*i+0)=B;39 *(segments+3*i+1)=A;36 else if (index[3*el+1]==A){ 37 if (index[3*el+0]==B){ 38 segments[3*i+0]=B; 39 segments[3*i+1]=A; 40 40 } 41 41 } 42 42 else{ 43 if ( *(index+3*el+1)==B){44 *(segments+3*i+0)=B;45 *(segments+3*i+1)=A;43 if (index[3*el+1]==B){ 44 segments[3*i+0]=B; 45 segments[3*i+1]=A; 46 46 } 47 47 }
Note:
See TracChangeset
for help on using the changeset viewer.