Changeset 11197
- Timestamp:
- 01/25/12 08:36:48 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/include/types.h
r9320 r11197 27 27 28 28 /*here are our abstracted types: inspired on petsc */ 29 #if defined(ISSM_USE_64BIT_INDICES)29 #if ISSM_USE_64BIT_INDICES == 1 30 30 typedef long long IssmInt; 31 31 //#define MPIU_INT MPI_LONG_LONG_INT already define in petsc -
issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp
r10522 r11197 68 68 iomodel->DeleteData(2,DiagnosticSpcvzEnum,FlowequationBorderstokesEnum); 69 69 70 cleanup_and_return:71 72 70 /*Assign output pointer: */ 73 71 *pconstraints=constraints; -
issm/trunk-jpl/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp
r4573 r11197 30 30 xfree((void**)&thickness); 31 31 xfree((void**)&bed); 32 return 1; 32 33 } -
issm/trunk-jpl/src/c/objects/Inputs/TransientInput.cpp
r10135 r11197 352 352 infnorm=input->InfinityNorm(); 353 353 354 delete input; 355 354 /*Clean-up and return*/ 355 delete input; 356 return infnorm; 356 357 } 357 358 /*}}}*/ … … 391 392 maxabs=input->MaxAbs(); 392 393 393 delete input;394 394 /*Clean-up and return*/ 395 delete input; 395 396 return maxabs; 396 397 … … 412 413 min=input->Min(); 413 414 414 delete input;415 415 /*Clean-up and return*/ 416 delete input; 416 417 return min; 417 418 … … 433 434 minabs=input->MinAbs(); 434 435 435 delete input;436 436 /*Clean-up and return*/ 437 delete input; 437 438 return minabs; 438 439 } -
issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp
r11196 r11197 162 162 printf(" friction: %g\n",friction); 163 163 printf(" fraction: %g\n",fraction); 164 printf(" fractionincrement: % i\n",fractionincrement);164 printf(" fractionincrement: %g\n",fractionincrement); 165 165 printf(" state: %i\n",state); 166 166 printf(" frozen: %s\n",frozen ? "true":"false"); … … 771 771 /*assign output pointer: */ 772 772 *punstable=unstable; 773 return 1; 773 774 } 774 775 /*}}}1*/ … … 850 851 /*assign output pointer: */ 851 852 *ppenetration=penetration; 852 853 return 1; 853 854 } 854 855 /*}}}1*/ … … 889 890 /*assign output pointer: */ 890 891 *ppenetration=penetration; 891 892 return 1; 892 893 } 893 894 /*}}}1*/ … … 942 943 /*assign output pointer: */ 943 944 *punstable=unstable; 945 return 1; 944 946 } 945 947 /*}}}1*/ … … 1006 1008 /*assign output pointer: */ 1007 1009 *punstable=unstable; 1010 return 1; 1008 1011 } 1009 1012 /*}}}1*/ -
issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp
r9883 r11197 64 64 for(i=0;i<this->M;i++){ 65 65 for(i=0;i<this->N;i++){ 66 printf(" %i %i %g\n",i,j,*(this->value+N*i+j));66 printf("(%i,%i) %i\n",i,j,*(this->value+N*i+j)); 67 67 } 68 68 } -
issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp
r9883 r11197 78 78 printf(" vector size: %i\n",this->M); 79 79 for(i=0;i<this->M;i++){ 80 printf("%i % g\n",i,this->values[i]);80 printf("%i %i\n",i,this->values[i]); 81 81 } 82 82 } -
issm/trunk-jpl/src/c/objects/Vertex.cpp
r11001 r11197 71 71 printf(" z: %g\n",z); 72 72 printf(" sigma: %g\n",sigma); 73 printf(" connectivity: % g\n",connectivity);73 printf(" connectivity: %i\n",connectivity); 74 74 printf(" dof: %i\n",dof); 75 75 printf(" clone: %i\n",clone); -
issm/trunk-jpl/src/c/shared/Elements/GetVerticesCoordinates.cpp
r6412 r11197 5 5 #include "./elements.h" 6 6 7 intGetVerticesCoordinates(double* xyz, Node** nodes, int numvertices){7 void GetVerticesCoordinates(double* xyz, Node** nodes, int numvertices){ 8 8 9 9 /*In debugging mode, check that nodes is not a NULL pointer*/ -
issm/trunk-jpl/src/c/shared/Elements/elements.h
r10529 r11197 13 13 double Paterson(double temperature); 14 14 double Arrhenius(double temperature,double depth,double n); 15 intGetVerticesCoordinates(double* xyz, Node** nodes, int numvertices);15 void GetVerticesCoordinates(double* xyz, Node** nodes, int numvertices); 16 16 int GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum); 17 17 int* GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum); -
issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp
r10601 r11197 30 30 int thermal_penalty_threshold; 31 31 int thermal_maxiter; 32 bool reset_penalties;33 32 34 33 /*parameters:*/ … … 49 48 50 49 _printf_(VerboseSolution(),"%s\n","starting direct shooting method"); 51 InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,reset_penalties,ResetPenaltiesEnum);52 InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials,femmodel->parameters,false,ConvergedEnum);50 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum); 51 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum); 53 52 UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters); 54 53 … … 62 61 MatFree(&Kff);VecFree(&pf);VecFree(&tg); VecFree(&df); 63 62 Mergesolutionfromftogx(&tg, tf,ys,femmodel->nodes,femmodel->parameters); VecFree(&ys); 64 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials,femmodel->parameters,tg);63 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,tg); 65 64 66 65 ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); -
issm/trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp
r9826 r11197 123 123 /*Assign output pointers:*/ 124 124 *poutmatrix=outmatrix; 125 return 1; 125 126 }
Note:
See TracChangeset
for help on using the changeset viewer.