Changeset 4526
- Timestamp:
- 07/12/10 11:13:40 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/io/WriteData.cpp
r4166 r4526 74 74 75 75 //transpose 76 mexCallMATLAB(1,&dataref,1,&tdataref, " '");76 mexCallMATLAB(1,&dataref,1,&tdataref, "transpose"); 77 77 } 78 78 else{ -
issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp
r4410 r4526 23 23 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 24 24 25 _printf_(" Configuring elements...\n");25 //_printf_(" Configuring elements...\n"); 26 26 for (i=0;i<elements->Size();i++){ 27 27 element=(Element*)elements->GetObjectByOffset(i); 28 28 element->Configure(elements,loads,nodes,materials,parameters); 29 29 } 30 _printf_(" Configuring loads...\n");30 //_printf_(" Configuring loads...\n"); 31 31 for (i=0;i<loads->Size();i++){ 32 32 load=(Load*)loads->GetObjectByOffset(i); … … 35 35 } 36 36 } 37 _printf_(" Configuring nodes...\n");37 //_printf_(" Configuring nodes...\n"); 38 38 for (i=0;i<nodes->Size();i++){ 39 39 node=(Node*)nodes->GetObjectByOffset(i); -
issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
r4321 r4526 240 240 241 241 /*transpose the matrix, from c to matlab format */ 242 mexCallMATLAB(1,&pfield2, 1, &pfield, " '");242 mexCallMATLAB(1,&pfield2, 1, &pfield, "transpose"); 243 243 244 244 /*set tranpose matrix inside the dataref structure: */ -
issm/trunk/src/c/objects/Params/DoubleMatParam.cpp
r4352 r4526 192 192 193 193 //transpose the matrix, written directly to matlab! from C to matlab. 194 mexCallMATLAB(1,&pfield2, 1, &pfield, " '");194 mexCallMATLAB(1,&pfield2, 1, &pfield, "transpose"); 195 195 mxSetField( dataref, 0, name,pfield2); 196 196 } -
issm/trunk/src/c/toolkits/petsc/patches/PetscMatrixToMatlabMatrix.cpp
r3595 r4526 135 135 136 136 /*Transpose matrcol_indes: */ 137 mexCallMATLAB(1,&tdataref,1,&dataref, " '");137 mexCallMATLAB(1,&tdataref,1,&dataref, "transpose"); 138 138 139 139 -
issm/trunk/src/mex/Solver/Solver.cpp
r4525 r4526 48 48 array[0]=KFF; 49 49 array[1]=PF; 50 mexCallMATLAB(1,UF,2,array," \\");50 mexCallMATLAB(1,UF,2,array,"mldivide"); 51 51 } 52 52 -
issm/trunk/src/mex/TriMesh/TriMesh.cpp
r4453 r4526 275 275 mxSetN(pmxa_array,out.numberoftriangles); 276 276 mxSetPr(pmxa_array,index); 277 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, " '");277 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose"); 278 278 279 279 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 281 281 mxSetN(pmxa_array,out.numberofpoints); 282 282 mxSetPr(pmxa_array,x); 283 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, " '");283 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose"); 284 284 285 285 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 287 287 mxSetN(pmxa_array,out.numberofpoints); 288 288 mxSetPr(pmxa_array,y); 289 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, " '");289 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose"); 290 290 291 291 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 293 293 mxSetN(pmxa_array,out.numberofsegments); 294 294 mxSetPr(pmxa_array,segments); 295 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, " '");295 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose"); 296 296 297 297 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 299 299 mxSetN(pmxa_array,out.numberofsegments); 300 300 mxSetPr(pmxa_array,segmentmarkerlist); 301 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, " '");301 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose"); 302 302 303 303 return; -
issm/trunk/src/mex/TriMeshNoDensity/TriMeshNoDensity.cpp
r4453 r4526 264 264 mxSetN(pmxa_array,out.numberoftriangles); 265 265 mxSetPr(pmxa_array,index); 266 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, " '");266 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose"); 267 267 268 268 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 270 270 mxSetN(pmxa_array,out.numberofpoints); 271 271 mxSetPr(pmxa_array,x); 272 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, " '");272 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose"); 273 273 274 274 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 276 276 mxSetN(pmxa_array,out.numberofpoints); 277 277 mxSetPr(pmxa_array,y); 278 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, " '");278 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose"); 279 279 280 280 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 282 282 mxSetN(pmxa_array,out.numberofsegments); 283 283 mxSetPr(pmxa_array,segments); 284 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, " '");284 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose"); 285 285 286 286 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 288 288 mxSetN(pmxa_array,out.numberofsegments); 289 289 mxSetPr(pmxa_array,segmentmarkerlist); 290 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, " '");290 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose"); 291 291 292 292 return; -
issm/trunk/src/mex/TriMeshProcessRifts/TriMeshProcessRifts.cpp
r4453 r4526 198 198 mxSetN(pmxa_array,nel); 199 199 mxSetPr(pmxa_array,index_in); 200 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, " '");200 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose"); 201 201 202 202 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 204 204 mxSetN(pmxa_array,nods); 205 205 mxSetPr(pmxa_array,x_in); 206 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, " '");206 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose"); 207 207 208 208 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 210 210 mxSetN(pmxa_array,nods); 211 211 mxSetPr(pmxa_array,y_in); 212 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, " '");212 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose"); 213 213 214 214 … … 217 217 mxSetN(pmxa_array,num_seg); 218 218 mxSetPr(pmxa_array,segments_in); 219 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, " '");219 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose"); 220 220 221 221 … … 224 224 mxSetN(pmxa_array,num_seg); 225 225 mxSetPr(pmxa_array,segmentmarkers_in); 226 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, " '");226 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose"); 227 227 228 228 if(riftflag){ … … 249 249 mxSetN(pmxa_array2,out_riftsnumsegments[i]); 250 250 mxSetPr(pmxa_array2,out_riftssegments[i]); 251 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, " '");251 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose"); 252 252 253 253 mxSetField(pmxa_array,i,"segments",pmxa_array3); … … 259 259 mxSetN(pmxa_array2,out_riftsnumpairs[i]); 260 260 mxSetPr(pmxa_array2,out_riftspairs[i]); 261 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, " '");261 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose"); 262 262 263 263 mxSetField(pmxa_array,i,"pairs",pmxa_array3); … … 278 278 mxSetN(pmxa_array2,out_riftsnumpenaltypairs[i]); 279 279 mxSetPr(pmxa_array2,out_riftspenaltypairs[i]); 280 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, " '");280 mexCallMATLAB( 1, &pmxa_array3, 1, &pmxa_array2, "transpose"); 281 281 282 282 mxSetField(pmxa_array,i,"penaltypairs",pmxa_array3); -
issm/trunk/src/mex/TriMeshRefine/TriMeshRefine.cpp
r4453 r4526 285 285 mxSetN(pmxa_array,out.numberoftriangles); 286 286 mxSetPr(pmxa_array,index); 287 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, " '");287 mexCallMATLAB( 1, &plhs[0], 1, &pmxa_array, "transpose"); 288 288 289 289 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 291 291 mxSetN(pmxa_array,out.numberofpoints); 292 292 mxSetPr(pmxa_array,x); 293 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, " '");293 mexCallMATLAB( 1, &plhs[1], 1, &pmxa_array, "transpose"); 294 294 295 295 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 297 297 mxSetN(pmxa_array,out.numberofpoints); 298 298 mxSetPr(pmxa_array,y); 299 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, " '");299 mexCallMATLAB( 1, &plhs[2], 1, &pmxa_array, "transpose"); 300 300 301 301 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 303 303 mxSetN(pmxa_array,out.numberofsegments); 304 304 mxSetPr(pmxa_array,segments); 305 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, " '");305 mexCallMATLAB( 1, &plhs[3], 1, &pmxa_array, "transpose"); 306 306 307 307 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL); … … 309 309 mxSetN(pmxa_array,out.numberofsegments); 310 310 mxSetPr(pmxa_array,segmentmarkerlist); 311 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, " '");311 mexCallMATLAB( 1, &plhs[4], 1, &pmxa_array, "transpose"); 312 312 313 313 return;
Note:
See TracChangeset
for help on using the changeset viewer.