Changeset 16314 for issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
- Timestamp:
- 10/07/13 15:52:03 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
r16313 r16314 6022 6022 if(IsOnBed()){ 6023 6023 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6024 tria->GradjDragGradient(gradient, resp,control_index);6024 tria->GradjDragGradient(gradient,control_index); 6025 6025 delete tria->material; delete tria; 6026 6026 } … … 6029 6029 if(IsOnBed()){ 6030 6030 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6031 tria->GradjBGradient(gradient, resp,control_index);6031 tria->GradjBGradient(gradient,control_index); 6032 6032 delete tria->material; delete tria; 6033 6033 } … … 6417 6417 /*}}}*/ 6418 6418 /*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/ 6419 IssmDouble Penta::SurfaceAverageVelMisfit( int weight_index){6419 IssmDouble Penta::SurfaceAverageVelMisfit(void){ 6420 6420 6421 6421 int approximation; … … 6440 6440 * and compute SurfaceAverageVelMisfit*/ 6441 6441 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6442 J=tria->SurfaceAverageVelMisfit( weight_index);6442 J=tria->SurfaceAverageVelMisfit(); 6443 6443 delete tria->material; delete tria; 6444 6444 return J; … … 6447 6447 6448 6448 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. 6449 J=tria->SurfaceAverageVelMisfit( weight_index);6449 J=tria->SurfaceAverageVelMisfit(); 6450 6450 delete tria->material; delete tria; 6451 6451 return J; … … 6454 6454 /*}}}*/ 6455 6455 /*FUNCTION Penta::SurfaceAbsVelMisfit {{{*/ 6456 IssmDouble Penta::SurfaceAbsVelMisfit( int weight_index){6456 IssmDouble Penta::SurfaceAbsVelMisfit(void){ 6457 6457 6458 6458 int approximation; … … 6477 6477 * and compute SurfaceAbsVelMisfit*/ 6478 6478 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6479 J=tria->SurfaceAbsVelMisfit( weight_index);6479 J=tria->SurfaceAbsVelMisfit(); 6480 6480 delete tria->material; delete tria; 6481 6481 return J; … … 6484 6484 6485 6485 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. 6486 J=tria->SurfaceAbsVelMisfit( weight_index);6486 J=tria->SurfaceAbsVelMisfit(); 6487 6487 delete tria->material; delete tria; 6488 6488 return J; … … 6491 6491 /*}}}*/ 6492 6492 /*FUNCTION Penta::SurfaceLogVelMisfit {{{*/ 6493 IssmDouble Penta::SurfaceLogVelMisfit( int weight_index){6493 IssmDouble Penta::SurfaceLogVelMisfit(void){ 6494 6494 6495 6495 int approximation; … … 6514 6514 * and compute SurfaceLogVelMisfit*/ 6515 6515 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6516 J=tria->SurfaceLogVelMisfit( weight_index);6516 J=tria->SurfaceLogVelMisfit(); 6517 6517 delete tria->material; delete tria; 6518 6518 return J; … … 6521 6521 6522 6522 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. 6523 J=tria->SurfaceLogVelMisfit( weight_index);6523 J=tria->SurfaceLogVelMisfit(); 6524 6524 delete tria->material; delete tria; 6525 6525 return J; … … 6528 6528 /*}}}*/ 6529 6529 /*FUNCTION Penta::SurfaceLogVxVyMisfit {{{*/ 6530 IssmDouble Penta::SurfaceLogVxVyMisfit( int weight_index){6530 IssmDouble Penta::SurfaceLogVxVyMisfit(void){ 6531 6531 6532 6532 IssmDouble J; … … 6553 6553 * and compute SurfaceLogVxVyMisfit*/ 6554 6554 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6555 J=tria->SurfaceLogVxVyMisfit( weight_index);6555 J=tria->SurfaceLogVxVyMisfit(); 6556 6556 delete tria->material; delete tria; 6557 6557 return J; … … 6560 6560 6561 6561 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. 6562 J=tria->SurfaceLogVxVyMisfit( weight_index);6562 J=tria->SurfaceLogVxVyMisfit(); 6563 6563 delete tria->material; delete tria; 6564 6564 return J; … … 6567 6567 /*}}}*/ 6568 6568 /*FUNCTION Penta::SurfaceRelVelMisfit {{{*/ 6569 IssmDouble Penta::SurfaceRelVelMisfit( int weight_index){6569 IssmDouble Penta::SurfaceRelVelMisfit(void){ 6570 6570 6571 6571 int approximation; … … 6590 6590 * and compute SurfaceRelVelMisfit*/ 6591 6591 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1. 6592 J=tria->SurfaceRelVelMisfit( weight_index);6592 J=tria->SurfaceRelVelMisfit(); 6593 6593 delete tria->material; delete tria; 6594 6594 return J; … … 6597 6597 6598 6598 tria=(Tria*)SpawnTria(1); //lower face is 0, upper face is 1. 6599 J=tria->SurfaceRelVelMisfit( weight_index);6599 J=tria->SurfaceRelVelMisfit(); 6600 6600 delete tria->material; delete tria; 6601 6601 return J; … … 6604 6604 /*}}}*/ 6605 6605 /*FUNCTION Penta::ThicknessAbsGradient{{{*/ 6606 IssmDouble Penta::ThicknessAbsGradient( int weight_index){6606 IssmDouble Penta::ThicknessAbsGradient(void){ 6607 6607 6608 6608 _error_("Not implemented yet"); … … 6610 6610 /*}}}*/ 6611 6611 /*FUNCTION Penta::ThicknessAbsMisfit {{{*/ 6612 IssmDouble Penta::ThicknessAbsMisfit( int weight_index){6612 IssmDouble Penta::ThicknessAbsMisfit(void){ 6613 6613 6614 6614 int approximation; … … 6624 6624 6625 6625 tria=(Tria*)SpawnTria(0); 6626 J=tria->ThicknessAbsMisfit( weight_index);6626 J=tria->ThicknessAbsMisfit(); 6627 6627 delete tria->material; delete tria; 6628 6628 return J; … … 6630 6630 /*}}}*/ 6631 6631 /*FUNCTION Penta::DragCoefficientAbsGradient{{{*/ 6632 IssmDouble Penta::DragCoefficientAbsGradient( int weight_index){6632 IssmDouble Penta::DragCoefficientAbsGradient(void){ 6633 6633 6634 6634 IssmDouble J; … … 6639 6639 6640 6640 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1 6641 J=tria->DragCoefficientAbsGradient( weight_index);6641 J=tria->DragCoefficientAbsGradient(); 6642 6642 delete tria->material; delete tria; 6643 6643 return J; … … 6645 6645 /*}}}*/ 6646 6646 /*FUNCTION Penta::RheologyBbarAbsGradient{{{*/ 6647 IssmDouble Penta::RheologyBbarAbsGradient( int weight_index){6647 IssmDouble Penta::RheologyBbarAbsGradient(void){ 6648 6648 6649 6649 IssmDouble J; … … 6654 6654 6655 6655 tria=(Tria*)SpawnTria(0); //lower face is 0, upper face is 1 6656 J=tria->RheologyBbarAbsGradient( weight_index);6656 J=tria->RheologyBbarAbsGradient(); 6657 6657 delete tria->material; delete tria; 6658 6658 return J;
Note:
See TracChangeset
for help on using the changeset viewer.