Changeset 4546
- Timestamp:
- 07/13/10 08:46:04 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 51 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Constraints/Rgb.cpp
r4248 r4546 2 2 * \brief: implementation of the Rgb object 3 3 */ 4 5 4 6 5 #ifdef HAVE_CONFIG_H … … 19 18 20 19 /*Rgb constructors and destructor*/ 21 /*FUNCTION Rgb:: constructor{{{1*/20 /*FUNCTION Rgb::Rgb(){{{1*/ 22 21 Rgb::Rgb(){ 23 22 return; 24 23 } 25 24 /*}}}1*/ 26 /*FUNCTION Rgb:: creation{{{1*/25 /*FUNCTION Rgb::Rgb(int rgb_id,int rgb_nodeid1,...){{{1*/ 27 26 Rgb::Rgb(int rgb_id,int rgb_nodeid1,int rgb_nodeid2, int rgb_dof,int rgb_analysis_type){ 28 27 … … 36 35 } 37 36 /*}}}1*/ 38 /*FUNCTION Rgb:: destructor{{{1*/37 /*FUNCTION Rgb::~Rgb{{{1*/ 39 38 Rgb::~Rgb(){ 40 39 return; … … 166 165 } 167 166 /*}}}1*/ 168 /*FUNCTION Rgb::InAnalysis (int analysis_type){{{1*/167 /*FUNCTION Rgb::InAnalysis{{{1*/ 169 168 bool Rgb::InAnalysis(int in_analysis_type){ 170 169 if (in_analysis_type==this->analysis_type)return true; … … 172 171 } 173 172 /*}}}*/ 174 -
issm/trunk/src/c/objects/Constraints/Spc.cpp
r4248 r4546 2 2 * \brief: implementation of the Spc object 3 3 */ 4 5 4 6 5 #ifdef HAVE_CONFIG_H … … 18 17 #include "../objects.h" 19 18 20 21 19 /*Spc constructors and destructor*/ 22 /*FUNCTION Spc:: constructor{{{1*/20 /*FUNCTION Spc::Spc(){{{1*/ 23 21 Spc::Spc(){ 24 22 return; 25 23 } 26 24 /*}}}1*/ 27 /*FUNCTION Spc:: creation{{{1*/25 /*FUNCTION Spc::Spc(int spc_sid,int spc_nodeid,...){{{1*/ 28 26 Spc::Spc(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){ 29 27 … … 37 35 } 38 36 /*}}}1*/ 39 /*FUNCTION Spc:: destructor{{{1*/37 /*FUNCTION Spc::~Spc{{{1*/ 40 38 Spc::~Spc(){ 41 39 return; … … 166 164 } 167 165 /*}}}1*/ 168 /*FUNCTION Spc::InAnalysis (int analysis_type){{{1*/166 /*FUNCTION Spc::InAnalysis{{{1*/ 169 167 bool Spc::InAnalysis(int in_analysis_type){ 170 168 if (in_analysis_type==this->analysis_type) return true; -
issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp
r4248 r4546 136 136 /*}}}*/ 137 137 138 139 138 /*ElementResult management*/ 140 139 /*FUNCTION BeamVertexElementResult::EnumType{{{1*/ … … 145 144 } 146 145 /*}}}*/ 147 /*FUNCTION BeamVertexElementResult::ProcessUnits (Parameters* parameters){{{1*/146 /*FUNCTION BeamVertexElementResult::ProcessUnits{{{1*/ 148 147 void BeamVertexElementResult::ProcessUnits(Parameters* parameters){ 149 148 … … 152 151 } 153 152 /*}}}*/ 154 /*FUNCTION BeamVertexElementResult::NumberOfNodalValues (void){{{1*/153 /*FUNCTION BeamVertexElementResult::NumberOfNodalValues{{{1*/ 155 154 int BeamVertexElementResult::NumberOfNodalValues(void){ 156 155 return 2; 157 156 } 158 157 /*}}}*/ 159 /*FUNCTION BeamVertexElementResult:: BeamVertexElementResult::PatchFill(int row, Patch* patch){{{1*/158 /*FUNCTION BeamVertexElementResult::PatchFill{{{1*/ 160 159 void BeamVertexElementResult::PatchFill(int row, Patch* patch){ 161 160 -
issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp
r4248 r4546 194 194 } 195 195 /*}}}*/ 196 /*FUNCTION DoubleElementResult::ProcessUnits (Parameters* parameters){{{1*/196 /*FUNCTION DoubleElementResult::ProcessUnits{{{1*/ 197 197 void DoubleElementResult::ProcessUnits(Parameters* parameters){ 198 198 … … 201 201 } 202 202 /*}}}*/ 203 /*FUNCTION DoubleElementResult::NumberOfNodalValues (void){{{1*/203 /*FUNCTION DoubleElementResult::NumberOfNodalValues{{{1*/ 204 204 int DoubleElementResult::NumberOfNodalValues(void){ 205 205 return 1; 206 206 } 207 207 /*}}}*/ 208 /*FUNCTION DoubleElementResult:: DoubleElementResult::PatchFill(int row, Patch* patch){{{1*/208 /*FUNCTION DoubleElementResult::PatchFill{{{1*/ 209 209 void DoubleElementResult::PatchFill(int row, Patch* patch){ 210 210 -
issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp
r4248 r4546 137 137 /*}}}*/ 138 138 139 140 139 /*ElementResult management*/ 141 140 /*FUNCTION PentaVertexElementResult::EnumType{{{1*/ … … 211 210 } 212 211 /*}}}*/ 213 /*FUNCTION PentaVertexElementResult::ProcessUnits (Parameters* parameters){{{1*/212 /*FUNCTION PentaVertexElementResult::ProcessUnits{{{1*/ 214 213 void PentaVertexElementResult::ProcessUnits(Parameters* parameters){ 215 214 … … 218 217 } 219 218 /*}}}*/ 220 /*FUNCTION PentaVertexElementResult::NumberOfNodalValues (void){{{1*/219 /*FUNCTION PentaVertexElementResult::NumberOfNodalValues{{{1*/ 221 220 int PentaVertexElementResult::NumberOfNodalValues(void){ 222 221 return 6; 223 222 } 224 223 /*}}}*/ 225 /*FUNCTION PentaVertexElementResult::P entaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/224 /*FUNCTION PentaVertexElementResult::PatchFill{{{1*/ 226 225 void PentaVertexElementResult::PatchFill(int row, Patch* patch){ 227 226 -
issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp
r4248 r4546 136 136 137 137 /*ElementResult virtual functions definitions*/ 138 /*FUNCTION SingVertexElementResult::ProcessUnits (Parameters* parameters){{{1*/138 /*FUNCTION SingVertexElementResult::ProcessUnits{{{1*/ 139 139 void SingVertexElementResult::ProcessUnits(Parameters* parameters){ 140 140 … … 143 143 } 144 144 /*}}}*/ 145 /*FUNCTION SingVertexElementResult::NumberOfNodalValues (void){{{1*/145 /*FUNCTION SingVertexElementResult::NumberOfNodalValues{{{1*/ 146 146 int SingVertexElementResult::NumberOfNodalValues(void){ 147 147 return 1; 148 148 } 149 149 /*}}}*/ 150 /*FUNCTION SingVertexElementResult:: SingVertexElementResult::PatchFill(int row, Patch* patch){{{1*/150 /*FUNCTION SingVertexElementResult::PatchFill{{{1*/ 151 151 void SingVertexElementResult::PatchFill(int row, Patch* patch){ 152 152 -
issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp
r4248 r4546 137 137 /*}}}*/ 138 138 139 140 139 /*ElementResult management*/ 141 140 /*FUNCTION TriaVertexElementResult::EnumType{{{1*/ … … 200 199 } 201 200 /*}}}*/ 202 /*FUNCTION TriaVertexElementResult::ProcessUnits (Parameters* parameters){{{1*/201 /*FUNCTION TriaVertexElementResult::ProcessUnits{{{1*/ 203 202 void TriaVertexElementResult::ProcessUnits(Parameters* parameters){ 204 203 … … 207 206 } 208 207 /*}}}*/ 209 /*FUNCTION TriaVertexElementResult::NumberOfNodalValues (void){{{1*/208 /*FUNCTION TriaVertexElementResult::NumberOfNodalValues{{{1*/ 210 209 int TriaVertexElementResult::NumberOfNodalValues(void){ 211 210 return 3; 212 211 } 213 212 /*}}}*/ 214 /*FUNCTION TriaVertexElementResult:: TriaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/213 /*FUNCTION TriaVertexElementResult::PatchFill{{{1*/ 215 214 void TriaVertexElementResult::PatchFill(int row, Patch* patch){ 216 215 -
issm/trunk/src/c/objects/Elements/Beam.cpp
r4532 r4546 319 319 } 320 320 /*}}}*/ 321 /*FUNCTION Beam::GetSolutionFromInputs (Vec solution);{{{1*/321 /*FUNCTION Beam::GetSolutionFromInputs{{{1*/ 322 322 void Beam::GetSolutionFromInputs(Vec solution){ 323 323 ISSMERROR(" not supported yet!"); … … 329 329 } 330 330 /*}}}*/ 331 /*FUNCTION Beam::GetVectorFromInputs (Vec vector,int NameEnum){{{1*/331 /*FUNCTION Beam::GetVectorFromInputs{{{1*/ 332 332 void Beam::GetVectorFromInputs(Vec vector,int NameEnum){ 333 333 … … 363 363 } 364 364 /*}}}*/ 365 /*FUNCTION Beam::InputAXPY (int YEnum, double scalar, int XEnum);{{{1*/365 /*FUNCTION Beam::InputAXPY{{{1*/ 366 366 void Beam::InputAXPY(int YEnum, double scalar, int XEnum){ 367 367 … … 381 381 } 382 382 /*}}}*/ 383 /*FUNCTION Beam::InputControlConstrain (int control_type, double cm_min, double cm_max){{{1*/383 /*FUNCTION Beam::InputControlConstrain{{{1*/ 384 384 void Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){ 385 385 … … 397 397 } 398 398 /*}}}*/ 399 /*FUNCTION Beam::InputConvergence (int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/399 /*FUNCTION Beam::InputConvergence{{{1*/ 400 400 void Beam::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ 401 401 … … 426 426 } 427 427 /*}}}*/ 428 /*FUNCTION Beam::InputDuplicate (int original_enum,int new_enum){{{1*/428 /*FUNCTION Beam::InputDuplicate{{{1*/ 429 429 void Beam::InputDuplicate(int original_enum,int new_enum){ 430 430 … … 443 443 } 444 444 /*}}}*/ 445 /*FUNCTION Beam::InputScale (int enum_type,double scale_factor){{{1*/445 /*FUNCTION Beam::InputScale{{{1*/ 446 446 void Beam::InputScale(int enum_type,double scale_factor){ 447 447 … … 455 455 } 456 456 /*}}}*/ 457 /*FUNCTION Beam::InputToResult (int enum_type,int step,double time){{{1*/457 /*FUNCTION Beam::InputToResult{{{1*/ 458 458 void Beam::InputToResult(int enum_type,int step,double time){ 459 459 ISSMERROR(" not supported yet!"); … … 465 465 } 466 466 /*}}}*/ 467 /*FUNCTION Beam::MaxAbsVx (double* pmaxabsvx, bool process_units);{{{1*/467 /*FUNCTION Beam::MaxAbsVx{{{1*/ 468 468 void Beam::MaxAbsVx(double* pmaxabsvx, bool process_units){ 469 469 … … 491 491 } 492 492 /*}}}*/ 493 /*FUNCTION Beam::MaxAbsVy (double* pmaxabsvy, bool process_units);{{{1*/493 /*FUNCTION Beam::MaxAbsVy{{{1*/ 494 494 void Beam::MaxAbsVy(double* pmaxabsvy, bool process_units){ 495 495 … … 517 517 } 518 518 /*}}}*/ 519 /*FUNCTION Beam::MaxAbsVz (double* pmaxabsvz, bool process_units);{{{1*/519 /*FUNCTION Beam::MaxAbsVz{{{1*/ 520 520 void Beam::MaxAbsVz(double* pmaxabsvz, bool process_units){ 521 521 … … 543 543 } 544 544 /*}}}*/ 545 /*FUNCTION Beam::MaxVel (double* pmaxvel, bool process_units);{{{1*/545 /*FUNCTION Beam::MaxVel{{{1*/ 546 546 void Beam::MaxVel(double* pmaxvel, bool process_units){ 547 547 … … 570 570 } 571 571 /*}}}*/ 572 /*FUNCTION Beam::MaxVx (double* pmaxvx, bool process_units);{{{1*/572 /*FUNCTION Beam::MaxVx{{{1*/ 573 573 void Beam::MaxVx(double* pmaxvx, bool process_units){ 574 574 … … 597 597 } 598 598 /*}}}*/ 599 /*FUNCTION Beam::MaxVy (double* pmaxvy, bool process_units);{{{1*/599 /*FUNCTION Beam::MaxVy{{{1*/ 600 600 void Beam::MaxVy(double* pmaxvy, bool process_units){ 601 601 … … 624 624 } 625 625 /*}}}*/ 626 /*FUNCTION Beam::MaxVz (double* pmaxvz, bool process_units);{{{1*/626 /*FUNCTION Beam::MaxVz{{{1*/ 627 627 void Beam::MaxVz(double* pmaxvz, bool process_units){ 628 628 … … 651 651 } 652 652 /*}}}*/ 653 /*FUNCTION Beam::MinVel (double* pminvel, bool process_units);{{{1*/653 /*FUNCTION Beam::MinVel{{{1*/ 654 654 void Beam::MinVel(double* pminvel, bool process_units){ 655 655 … … 678 678 } 679 679 /*}}}*/ 680 /*FUNCTION Beam::MinVx (double* pminvx, bool process_units);{{{1*/680 /*FUNCTION Beam::MinVx{{{1*/ 681 681 void Beam::MinVx(double* pminvx, bool process_units){ 682 682 … … 705 705 } 706 706 /*}}}*/ 707 /*FUNCTION Beam::MinVy (double* pminvy, bool process_units);{{{1*/707 /*FUNCTION Beam::MinVy{{{1*/ 708 708 void Beam::MinVy(double* pminvy, bool process_units){ 709 709 … … 732 732 } 733 733 /*}}}*/ 734 /*FUNCTION Beam::MinVz (double* pminvz, bool process_units);{{{1*/734 /*FUNCTION Beam::MinVz{{{1*/ 735 735 void Beam::MinVz(double* pminvz, bool process_units){ 736 736 … … 764 764 } 765 765 /*}}}*/ 766 /*FUNCTION Beam::PatchFill (int* pcount, Patch* patch){{{1*/766 /*FUNCTION Beam::PatchFill{{{1*/ 767 767 void Beam::PatchFill(int* pcount, Patch* patch){ 768 768 … … 770 770 } 771 771 /*}}}*/ 772 /*FUNCTION Beam::PatchSize (int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/772 /*FUNCTION Beam::PatchSize{{{1*/ 773 773 void Beam::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ 774 774 … … 777 777 } 778 778 /*}}}*/ 779 /*FUNCTION Beam::ProcessResultsUnits (void){{{1*/779 /*FUNCTION Beam::ProcessResultsUnits{{{1*/ 780 780 void Beam::ProcessResultsUnits(void){ 781 781 ISSMERROR(" not supported yet!"); … … 787 787 } 788 788 /*}}}*/ 789 /*FUNCTION Beam::Update (int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/789 /*FUNCTION Beam::Update{{{1*/ 790 790 void Beam::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ 791 791 ISSMERROR(" not supported yet!"); -
issm/trunk/src/c/objects/Elements/Penta.cpp
r4532 r4546 898 898 } 899 899 /*}}}*/ 900 /*FUNCTION Penta::GetSolutionFromInputs (Vec solution){{{1*/900 /*FUNCTION Penta::GetSolutionFromInputs{{{1*/ 901 901 void Penta::GetSolutionFromInputs(Vec solution){ 902 902 … … 930 930 } 931 931 /*}}}*/ 932 /*FUNCTION Penta::GetVectorFromInputs (Vec vector,int NameEnum){{{1*/932 /*FUNCTION Penta::GetVectorFromInputs{{{1*/ 933 933 void Penta::GetVectorFromInputs(Vec vector,int NameEnum){ 934 934 … … 1020 1020 } 1021 1021 /*}}}*/ 1022 /*FUNCTION Penta::InputAXPY (int YEnum, double scalar, int XEnum);{{{1*/1022 /*FUNCTION Penta::InputAXPY{{{1*/ 1023 1023 void Penta::InputAXPY(int YEnum, double scalar, int XEnum){ 1024 1024 … … 1038 1038 } 1039 1039 /*}}}*/ 1040 /*FUNCTION Penta::InputControlConstrain (int control_type, double cm_min, double cm_max){{{1*/1040 /*FUNCTION Penta::InputControlConstrain{{{1*/ 1041 1041 void Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){ 1042 1042 … … 1054 1054 } 1055 1055 /*}}}*/ 1056 /*FUNCTION Penta::InputConvergence (int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/1056 /*FUNCTION Penta::InputConvergence{{{1*/ 1057 1057 void Penta::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ 1058 1058 … … 1166 1166 } 1167 1167 /*}}}*/ 1168 /*FUNCTION Penta::InputDuplicate (int original_enum,int new_enum){{{1*/1168 /*FUNCTION Penta::InputDuplicate{{{1*/ 1169 1169 void Penta::InputDuplicate(int original_enum,int new_enum){ 1170 1170 … … 1184 1184 } 1185 1185 /*}}}*/ 1186 /*FUNCTION Penta::InputScale (int enum_type,double scale_factor){{{1*/1186 /*FUNCTION Penta::InputScale{{{1*/ 1187 1187 void Penta::InputScale(int enum_type,double scale_factor){ 1188 1188 … … 1197 1197 } 1198 1198 /*}}}*/ 1199 /*FUNCTION Penta::InputToResult (int enum_type,int step,double time){{{1*/1199 /*FUNCTION Penta::InputToResult{{{1*/ 1200 1200 void Penta::InputToResult(int enum_type,int step,double time){ 1201 1201 … … 1224 1224 } 1225 1225 /*}}}*/ 1226 /*FUNCTION Penta::MaxAbsVx (double* pmaxabsvx, bool process_units);{{{1*/1226 /*FUNCTION Penta::MaxAbsVx{{{1*/ 1227 1227 void Penta::MaxAbsVx(double* pmaxabsvx, bool process_units){ 1228 1228 … … 1250 1250 } 1251 1251 /*}}}*/ 1252 /*FUNCTION Penta::MaxAbsVy (double* pmaxabsvy, bool process_units);{{{1*/1252 /*FUNCTION Penta::MaxAbsVy{{{1*/ 1253 1253 void Penta::MaxAbsVy(double* pmaxabsvy, bool process_units){ 1254 1254 … … 1276 1276 } 1277 1277 /*}}}*/ 1278 /*FUNCTION Penta::MaxAbsVz (double* pmaxabsvz, bool process_units);{{{1*/1278 /*FUNCTION Penta::MaxAbsVz{{{1*/ 1279 1279 void Penta::MaxAbsVz(double* pmaxabsvz, bool process_units){ 1280 1280 … … 1302 1302 } 1303 1303 /*}}}*/ 1304 /*FUNCTION Penta::MaxVel (double* pmaxvel, bool process_units);{{{1*/1304 /*FUNCTION Penta::MaxVel{{{1*/ 1305 1305 void Penta::MaxVel(double* pmaxvel, bool process_units){ 1306 1306 … … 1329 1329 } 1330 1330 /*}}}*/ 1331 /*FUNCTION Penta::MaxVx (double* pmaxvx, bool process_units);{{{1*/1331 /*FUNCTION Penta::MaxVx{{{1*/ 1332 1332 void Penta::MaxVx(double* pmaxvx, bool process_units){ 1333 1333 … … 1356 1356 } 1357 1357 /*}}}*/ 1358 /*FUNCTION Penta::MaxVy (double* pmaxvy, bool process_units);{{{1*/1358 /*FUNCTION Penta::MaxVy{{{1*/ 1359 1359 void Penta::MaxVy(double* pmaxvy, bool process_units){ 1360 1360 … … 1383 1383 } 1384 1384 /*}}}*/ 1385 /*FUNCTION Penta::MaxVz (double* pmaxvz, bool process_units);{{{1*/1385 /*FUNCTION Penta::MaxVz{{{1*/ 1386 1386 void Penta::MaxVz(double* pmaxvz, bool process_units){ 1387 1387 … … 1410 1410 } 1411 1411 /*}}}*/ 1412 /*FUNCTION Penta::MinVel (double* pminvel, bool process_units);{{{1*/1412 /*FUNCTION Penta::MinVel{{{1*/ 1413 1413 void Penta::MinVel(double* pminvel, bool process_units){ 1414 1414 … … 1437 1437 } 1438 1438 /*}}}*/ 1439 /*FUNCTION Penta::MinVx (double* pminvx, bool process_units);{{{1*/1439 /*FUNCTION Penta::MinVx{{{1*/ 1440 1440 void Penta::MinVx(double* pminvx, bool process_units){ 1441 1441 … … 1464 1464 } 1465 1465 /*}}}*/ 1466 /*FUNCTION Penta::MinVy (double* pminvy, bool process_units);{{{1*/1466 /*FUNCTION Penta::MinVy{{{1*/ 1467 1467 void Penta::MinVy(double* pminvy, bool process_units){ 1468 1468 … … 1491 1491 } 1492 1492 /*}}}*/ 1493 /*FUNCTION Penta::MinVz (double* pminvz, bool process_units);{{{1*/1493 /*FUNCTION Penta::MinVz{{{1*/ 1494 1494 void Penta::MinVz(double* pminvz, bool process_units){ 1495 1495 … … 1563 1563 } 1564 1564 /*}}}*/ 1565 /*FUNCTION Penta::PatchFill (int* pcount, Patch* patch){{{1*/1565 /*FUNCTION Penta::PatchFill{{{1*/ 1566 1566 void Penta::PatchFill(int* pcount, Patch* patch){ 1567 1567 … … 1591 1591 /*Assign output pointers:*/ 1592 1592 *pcount=count; 1593 } 1594 /*FUNCTION Penta::PatchSize (int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/1593 }/*}}}*/ 1594 /*FUNCTION Penta::PatchSize{{{1*/ 1595 1595 void Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ 1596 1596 … … 1619 1619 } 1620 1620 /*}}}*/ 1621 /*FUNCTION Penta::ProcessResultsUnits (void){{{1*/1621 /*FUNCTION Penta::ProcessResultsUnits{{{1*/ 1622 1622 void Penta::ProcessResultsUnits(void){ 1623 1623 … … 2619 2619 } 2620 2620 /*}}}*/ 2621 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz (Vec solution){{{1*/2621 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/ 2622 2622 void Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ 2623 2623 … … 2655 2655 } 2656 2656 /*}}}*/ 2657 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert (Vec solution){{{1*/2657 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{1*/ 2658 2658 void Penta::GetSolutionFromInputsDiagnosticVert(Vec solution){ 2659 2659 … … 2687 2687 } 2688 2688 /*}}}*/ 2689 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes (Vec solution){{{1*/2689 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{1*/ 2690 2690 void Penta::GetSolutionFromInputsDiagnosticStokes(Vec solution){ 2691 2691 -
issm/trunk/src/c/objects/Elements/PentaHook.cpp
r4412 r4546 60 60 } 61 61 /*}}}*/ 62 /*FUNCTION PentaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/ 62 63 /*FUNCTION PentaHook::SetHookNodes{{{1*/ 63 64 void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){ 64 65 this->hnodes[analysis_counter]= new Hook(node_ids,6); … … 66 67 } 67 68 /*}}}*/ 68 /*FUNCTION PentaHook::InitHookNeighbors (int* element_ids){{{1*/69 /*FUNCTION PentaHook::InitHookNeighbors{{{1*/ 69 70 void PentaHook::InitHookNeighbors(int* element_ids){ 70 71 this->hneighbors=new Hook(element_ids,2); … … 72 73 } 73 74 /*}}}*/ 74 /*FUNCTION PentaHook::SpawnTriaHook (TriaHook* triahook,int* indices);{{{1*/75 /*FUNCTION PentaHook::SpawnTriaHook{{{1*/ 75 76 void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){ 76 77 -
issm/trunk/src/c/objects/Elements/Sing.cpp
r4532 r4546 288 288 } 289 289 /*}}}*/ 290 /*FUNCTION Sing::GetSolutionFromInputs (Vec solution);{{{1*/290 /*FUNCTION Sing::GetSolutionFromInputs{{{1*/ 291 291 void Sing::GetSolutionFromInputs(Vec solution){ 292 292 ISSMERROR(" not supported yet!"); … … 298 298 } 299 299 /*}}}*/ 300 /*FUNCTION Sing::GetVectorFromInputs (Vec vector,int NameEnum){{{1*/300 /*FUNCTION Sing::GetVectorFromInputs{{{1*/ 301 301 void Sing::GetVectorFromInputs(Vec vector,int NameEnum){ 302 302 … … 332 332 } 333 333 /*}}}*/ 334 /*FUNCTION Sing::InputAXPY (int YEnum, double scalar, int XEnum);{{{1*/334 /*FUNCTION Sing::InputAXPY{{{1*/ 335 335 void Sing::InputAXPY(int YEnum, double scalar, int XEnum){ 336 336 … … 350 350 } 351 351 /*}}}*/ 352 /*FUNCTION Sing::InputControlConstrain (int control_type, double cm_min, double cm_max){{{1*/352 /*FUNCTION Sing::InputControlConstrain{{{1*/ 353 353 void Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){ 354 354 … … 366 366 } 367 367 /*}}}*/ 368 /*FUNCTION Sing::InputConvergence (int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/368 /*FUNCTION Sing::InputConvergence{{{1*/ 369 369 void Sing::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ 370 370 … … 395 395 } 396 396 /*}}}*/ 397 /*FUNCTION Sing::InputDuplicate (int original_enum,int new_enum){{{1*/397 /*FUNCTION Sing::InputDuplicate{{{1*/ 398 398 void Sing::InputDuplicate(int original_enum,int new_enum){ 399 399 … … 412 412 } 413 413 /*}}}*/ 414 /*FUNCTION Sing::InputScale (int enum_type,double scale_factor){{{1*/414 /*FUNCTION Sing::InputScale{{{1*/ 415 415 void Sing::InputScale(int enum_type,double scale_factor){ 416 416 … … 424 424 } 425 425 /*}}}*/ 426 /*FUNCTION Sing::InputToResult (int enum_type,int step,double time){{{1*/426 /*FUNCTION Sing::InputToResult{{{1*/ 427 427 void Sing::InputToResult(int enum_type,int step,double time){ 428 428 ISSMERROR(" not supported yet!"); … … 434 434 } 435 435 /*}}}*/ 436 /*FUNCTION Sing::MaxAbsVx (double* pmaxabsvx, bool process_units);{{{1*/436 /*FUNCTION Sing::MaxAbsVx{{{1*/ 437 437 void Sing::MaxAbsVx(double* pmaxabsvx, bool process_units){ 438 438 … … 451 451 } 452 452 /*}}}*/ 453 /*FUNCTION Sing::MaxAbsVy (double* pmaxabsvy, bool process_units);{{{1*/453 /*FUNCTION Sing::MaxAbsVy{{{1*/ 454 454 void Sing::MaxAbsVy(double* pmaxabsvy, bool process_units){ 455 455 … … 468 468 } 469 469 /*}}}*/ 470 /*FUNCTION Sing::MaxAbsVz (double* pmaxabsvz, bool process_units);{{{1*/470 /*FUNCTION Sing::MaxAbsVz{{{1*/ 471 471 void Sing::MaxAbsVz(double* pmaxabsvz, bool process_units){ 472 472 … … 485 485 } 486 486 /*}}}*/ 487 /*FUNCTION Sing::MaxVel (double* pmaxvel, bool process_units);{{{1*/487 /*FUNCTION Sing::MaxVel{{{1*/ 488 488 void Sing::MaxVel(double* pmaxvel, bool process_units){ 489 489 … … 502 502 } 503 503 /*}}}*/ 504 /*FUNCTION Sing::MaxVx (double* pmaxvx, bool process_units);{{{1*/504 /*FUNCTION Sing::MaxVx{{{1*/ 505 505 void Sing::MaxVx(double* pmaxvx, bool process_units){ 506 506 … … 519 519 } 520 520 /*}}}*/ 521 /*FUNCTION Sing::MaxVy (double* pmaxvy, bool process_units);{{{1*/521 /*FUNCTION Sing::MaxVy{{{1*/ 522 522 void Sing::MaxVy(double* pmaxvy, bool process_units){ 523 523 … … 536 536 } 537 537 /*}}}*/ 538 /*FUNCTION Sing::MaxVz (double* pmaxvz, bool process_units);{{{1*/538 /*FUNCTION Sing::MaxVz{{{1*/ 539 539 void Sing::MaxVz(double* pmaxvz, bool process_units){ 540 540 … … 553 553 } 554 554 /*}}}*/ 555 /*FUNCTION Sing::MinVel (double* pminvel, bool process_units);{{{1*/555 /*FUNCTION Sing::MinVel{{{1*/ 556 556 void Sing::MinVel(double* pminvel, bool process_units){ 557 557 … … 570 570 } 571 571 /*}}}*/ 572 /*FUNCTION Sing::MinVx (double* pminvx, bool process_units);{{{1*/572 /*FUNCTION Sing::MinVx{{{1*/ 573 573 void Sing::MinVx(double* pminvx, bool process_units){ 574 574 … … 587 587 } 588 588 /*}}}*/ 589 /*FUNCTION Sing::MinVy (double* pminvy, bool process_units);{{{1*/589 /*FUNCTION Sing::MinVy{{{1*/ 590 590 void Sing::MinVy(double* pminvy, bool process_units){ 591 591 … … 604 604 } 605 605 /*}}}*/ 606 /*FUNCTION Sing::MinVz (double* pminvz, bool process_units);{{{1*/606 /*FUNCTION Sing::MinVz{{{1*/ 607 607 void Sing::MinVz(double* pminvz, bool process_units){ 608 608 … … 626 626 } 627 627 /*}}}*/ 628 /*FUNCTION Sing::PatchFill (int* pcount, Patch* patch){{{1*/628 /*FUNCTION Sing::PatchFill{{{1*/ 629 629 void Sing::PatchFill(int* pcount, Patch* patch){ 630 630 … … 632 632 } 633 633 /*}}}*/ 634 /*FUNCTION Sing::PatchSize (int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/634 /*FUNCTION Sing::PatchSize{{{1*/ 635 635 void Sing::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ 636 636 … … 639 639 } 640 640 /*}}}*/ 641 /*FUNCTION Sing::ProcessResultsUnits (void){{{1*/641 /*FUNCTION Sing::ProcessResultsUnits{{{1*/ 642 642 void Sing::ProcessResultsUnits(void){ 643 643 ISSMERROR(" not supported yet!"); … … 649 649 } 650 650 /*}}}*/ 651 /*FUNCTION Sing::Update (int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/651 /*FUNCTION Sing::Update{{{1*/ 652 652 void Sing::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ 653 653 ISSMERROR(" not supported yet!"); -
issm/trunk/src/c/objects/Elements/Tria.cpp
r4532 r4546 1005 1005 } 1006 1006 /*}}}*/ 1007 /*FUNCTION Tria::GetSolutionFromInputs (Vec solution){{{1*/1007 /*FUNCTION Tria::GetSolutionFromInputs{{{1*/ 1008 1008 void Tria::GetSolutionFromInputs(Vec solution){ 1009 1009 … … 1032 1032 } 1033 1033 /*}}}*/ 1034 /*FUNCTION Tria::GetVectorFromInputs (Vec vector,int NameEnum){{{1*/1034 /*FUNCTION Tria::GetVectorFromInputs{{{1*/ 1035 1035 void Tria::GetVectorFromInputs(Vec vector,int NameEnum){ 1036 1036 … … 1379 1379 } 1380 1380 /*}}}*/ 1381 /*FUNCTION Tria::InputAXPY (int YEnum, double scalar, int XEnum);{{{1*/1381 /*FUNCTION Tria::InputAXPY{{{1*/ 1382 1382 void Tria::InputAXPY(int YEnum, double scalar, int XEnum){ 1383 1383 … … 1396 1396 } 1397 1397 /*}}}*/ 1398 /*FUNCTION Tria::InputControlConstrain (int control_type, double cm_min, double cm_max){{{1*/1398 /*FUNCTION Tria::InputControlConstrain{{{1*/ 1399 1399 void Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){ 1400 1400 … … 1412 1412 } 1413 1413 /*}}}*/ 1414 /*FUNCTION Tria::InputConvergence (int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/1414 /*FUNCTION Tria::InputConvergence{{{1*/ 1415 1415 void Tria::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ 1416 1416 … … 1461 1461 } 1462 1462 /*}}}*/ 1463 /*FUNCTION Tria::InputDuplicate (int original_enum,int new_enum){{{1*/1463 /*FUNCTION Tria::InputDuplicate{{{1*/ 1464 1464 void Tria::InputDuplicate(int original_enum,int new_enum){ 1465 1465 … … 1479 1479 } 1480 1480 /*}}}*/ 1481 /*FUNCTION Tria::InputScale (int enum_type,double scale_factor){{{1*/1481 /*FUNCTION Tria::InputScale{{{1*/ 1482 1482 void Tria::InputScale(int enum_type,double scale_factor){ 1483 1483 … … 1492 1492 } 1493 1493 /*}}}*/ 1494 /*FUNCTION Tria::InputToResult (int enum_type,int step,double time){{{1*/1494 /*FUNCTION Tria::InputToResult{{{1*/ 1495 1495 void Tria::InputToResult(int enum_type,int step,double time){ 1496 1496 … … 1574 1574 } 1575 1575 /*}}}*/ 1576 /*FUNCTION Tria::MaxAbsVx (double* pmaxabsvx, bool process_units);{{{1*/1576 /*FUNCTION Tria::MaxAbsVx{{{1*/ 1577 1577 void Tria::MaxAbsVx(double* pmaxabsvx, bool process_units){ 1578 1578 … … 1600 1600 } 1601 1601 /*}}}*/ 1602 /*FUNCTION Tria::MaxAbsVy (double* pmaxabsvy, bool process_units);{{{1*/1602 /*FUNCTION Tria::MaxAbsVy{{{1*/ 1603 1603 void Tria::MaxAbsVy(double* pmaxabsvy, bool process_units){ 1604 1604 … … 1626 1626 } 1627 1627 /*}}}*/ 1628 /*FUNCTION Tria::MaxAbsVz (double* pmaxabsvz, bool process_units);{{{1*/1628 /*FUNCTION Tria::MaxAbsVz{{{1*/ 1629 1629 void Tria::MaxAbsVz(double* pmaxabsvz, bool process_units){ 1630 1630 … … 1652 1652 } 1653 1653 /*}}}*/ 1654 /*FUNCTION Tria::MaxVel (double* pmaxvel, bool process_units);{{{1*/1654 /*FUNCTION Tria::MaxVel{{{1*/ 1655 1655 void Tria::MaxVel(double* pmaxvel, bool process_units){ 1656 1656 … … 1679 1679 } 1680 1680 /*}}}*/ 1681 /*FUNCTION Tria::MaxVx (double* pmaxvx, bool process_units);{{{1*/1681 /*FUNCTION Tria::MaxVx{{{1*/ 1682 1682 void Tria::MaxVx(double* pmaxvx, bool process_units){ 1683 1683 … … 1706 1706 } 1707 1707 /*}}}*/ 1708 /*FUNCTION Tria::MaxVy (double* pmaxvy, bool process_units);{{{1*/1708 /*FUNCTION Tria::MaxVy{{{1*/ 1709 1709 void Tria::MaxVy(double* pmaxvy, bool process_units){ 1710 1710 … … 1733 1733 } 1734 1734 /*}}}*/ 1735 /*FUNCTION Tria::MaxVz (double* pmaxvz, bool process_units);{{{1*/1735 /*FUNCTION Tria::MaxVz{{{1*/ 1736 1736 void Tria::MaxVz(double* pmaxvz, bool process_units){ 1737 1737 … … 1760 1760 } 1761 1761 /*}}}*/ 1762 /*FUNCTION Tria::MinVel (double* pminvel, bool process_units);{{{1*/1762 /*FUNCTION Tria::MinVel{{{1*/ 1763 1763 void Tria::MinVel(double* pminvel, bool process_units){ 1764 1764 … … 1787 1787 } 1788 1788 /*}}}*/ 1789 /*FUNCTION Tria::MinVx (double* pminvx, bool process_units);{{{1*/1789 /*FUNCTION Tria::MinVx{{{1*/ 1790 1790 void Tria::MinVx(double* pminvx, bool process_units){ 1791 1791 … … 1814 1814 } 1815 1815 /*}}}*/ 1816 /*FUNCTION Tria::MinVy (double* pminvy, bool process_units);{{{1*/1816 /*FUNCTION Tria::MinVy{{{1*/ 1817 1817 void Tria::MinVy(double* pminvy, bool process_units){ 1818 1818 … … 1841 1841 } 1842 1842 /*}}}*/ 1843 /*FUNCTION Tria::MinVz (double* pminvz, bool process_units);{{{1*/1843 /*FUNCTION Tria::MinVz{{{1*/ 1844 1844 void Tria::MinVz(double* pminvz, bool process_units){ 1845 1845 … … 2060 2060 } 2061 2061 /*}}}*/ 2062 /*FUNCTION Tria::PatchFill (int* prow, Patch* patch){{{1*/2062 /*FUNCTION Tria::PatchFill{{{1*/ 2063 2063 void Tria::PatchFill(int* prow, Patch* patch){ 2064 2064 … … 2090 2090 } 2091 2091 /*}}}*/ 2092 /*FUNCTION Tria::PatchSize (int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/2092 /*FUNCTION Tria::PatchSize{{{1*/ 2093 2093 void Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ 2094 2094 … … 2117 2117 } 2118 2118 /*}}}*/ 2119 /*FUNCTION Tria::ProcessResultsUnits (void){{{1*/2119 /*FUNCTION Tria::ProcessResultsUnits{{{1*/ 2120 2120 void Tria::ProcessResultsUnits(void){ 2121 2121 … … 5225 5225 } 5226 5226 /*}}}*/ 5227 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz (Vec solution){{{1*/5227 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/ 5228 5228 void Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ 5229 5229 … … 5261 5261 } 5262 5262 /*}}}*/ 5263 /*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz (Vec solution){{{1*/5263 /*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz{{{1*/ 5264 5264 void Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){ 5265 5265 -
issm/trunk/src/c/objects/Elements/TriaHook.cpp
r4412 r4546 57 57 } 58 58 /*}}}*/ 59 /*FUNCTION TriaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/ 59 60 /*FUNCTION TriaHook::SetHookNodes{{{1*/ 60 61 void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){ 61 62 -
issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp
r4321 r4546 142 142 143 143 /*BoolExternalResult management: */ 144 /*FUNCTION BoolExternalResult::WriteData (FILE* fid){{{1*/144 /*FUNCTION BoolExternalResult::WriteData{{{1*/ 145 145 void BoolExternalResult::WriteData(FILE* fid){ 146 146 … … 177 177 } 178 178 /*}}}1*/ 179 /*FUNCTION BoolExternalResult::GetResultName (void);{{{1*/179 /*FUNCTION BoolExternalResult::GetResultName{{{1*/ 180 180 char* BoolExternalResult::GetResultName(void){ 181 181 return EnumAsString(this->enum_type); 182 182 } 183 183 /*}}}*/ 184 /*FUNCTION BoolExternalResult::SetMatlabField (mxArray* dataref);{{{1*/184 /*FUNCTION BoolExternalResult::SetMatlabField{{{1*/ 185 185 #ifdef _SERIAL_ 186 186 void BoolExternalResult::SetMatlabField(mxArray* dataref){ … … 195 195 #endif 196 196 /*}}}*/ 197 /*FUNCTION BoolExternalResult::GetStep (void);{{{1*/197 /*FUNCTION BoolExternalResult::GetStep{{{1*/ 198 198 int BoolExternalResult::GetStep(void){ 199 199 -
issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp
r4321 r4546 142 142 143 143 /*DoubleExternalResult management: */ 144 /*FUNCTION DoubleExternalResult::WriteData (FILE* fid){{{1*/144 /*FUNCTION DoubleExternalResult::WriteData{{{1*/ 145 145 void DoubleExternalResult::WriteData(FILE* fid){ 146 146 … … 173 173 } 174 174 /*}}}1*/ 175 /*FUNCTION DoubleExternalResult::GetResultName (void);{{{1*/175 /*FUNCTION DoubleExternalResult::GetResultName{{{1*/ 176 176 char* DoubleExternalResult::GetResultName(void){ 177 177 return EnumAsString(this->enum_type); 178 178 } 179 179 /*}}}*/ 180 /*FUNCTION DoubleExternalResult::SetMatlabField (mxArray* dataref);{{{1*/180 /*FUNCTION DoubleExternalResult::SetMatlabField{{{1*/ 181 181 #ifdef _SERIAL_ 182 182 void DoubleExternalResult::SetMatlabField(mxArray* dataref){ … … 191 191 #endif 192 192 /*}}}*/ 193 /*FUNCTION DoubleExternalResult::GetStep (void);{{{1*/193 /*FUNCTION DoubleExternalResult::GetStep{{{1*/ 194 194 int DoubleExternalResult::GetStep(void){ 195 195 -
issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp
r4526 r4546 179 179 180 180 /*DoubleMatExternalResult management: */ 181 /*FUNCTION DoubleMatExternalResult::WriteData (FILE* fid){{{1*/181 /*FUNCTION DoubleMatExternalResult::WriteData{{{1*/ 182 182 void DoubleMatExternalResult::WriteData(FILE* fid){ 183 183 … … 212 212 } 213 213 /*}}}1*/ 214 /*FUNCTION DoubleMatExternalResult::GetResultName (void);{{{1*/214 /*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/ 215 215 char* DoubleMatExternalResult::GetResultName(void){ 216 216 return EnumAsString(this->enum_type); 217 217 } 218 218 /*}}}*/ 219 /*FUNCTION DoubleMatExternalResult::SetMatlabField (mxArray* dataref);{{{1*/219 /*FUNCTION DoubleMatExternalResult::SetMatlabField{{{1*/ 220 220 #ifdef _SERIAL_ 221 221 void DoubleMatExternalResult::SetMatlabField(mxArray* dataref){ … … 250 250 #endif 251 251 /*}}}*/ 252 /*FUNCTION DoubleMatExternalResult::GetStep (void);{{{1*/252 /*FUNCTION DoubleMatExternalResult::GetStep{{{1*/ 253 253 int DoubleMatExternalResult::GetStep(void){ 254 254 -
issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp
r4321 r4546 167 167 168 168 /*DoubleVecExternalResult management: */ 169 /*FUNCTION DoubleVecExternalResult::WriteData (FILE* fid){{{1*/169 /*FUNCTION DoubleVecExternalResult::WriteData{{{1*/ 170 170 void DoubleVecExternalResult::WriteData(FILE* fid){ 171 171 … … 198 198 } 199 199 /*}}}1*/ 200 /*FUNCTION DoubleVecExternalResult::GetResultName (void);{{{1*/200 /*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/ 201 201 char* DoubleVecExternalResult::GetResultName(void){ 202 202 return EnumAsString(this->enum_type); 203 203 } 204 204 /*}}}*/ 205 /*FUNCTION DoubleVecExternalResult::SetMatlabField (mxArray* dataref);{{{1*/205 /*FUNCTION DoubleVecExternalResult::SetMatlabField{{{1*/ 206 206 #ifdef _SERIAL_ 207 207 void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){ … … 232 232 #endif 233 233 /*}}}*/ 234 /*FUNCTION DoubleVecExternalResult::GetStep (void);{{{1*/234 /*FUNCTION DoubleVecExternalResult::GetStep{{{1*/ 235 235 int DoubleVecExternalResult::GetStep(void){ 236 236 -
issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp
r4321 r4546 142 142 143 143 /*IntExternalResult management: */ 144 /*FUNCTION IntExternalResult::WriteData (FILE* fid){{{1*/144 /*FUNCTION IntExternalResult::WriteData{{{1*/ 145 145 void IntExternalResult::WriteData(FILE* fid){ 146 146 … … 177 177 } 178 178 /*}}}1*/ 179 /*FUNCTION IntExternalResult::GetResultName (void);{{{1*/179 /*FUNCTION IntExternalResult::GetResultName{{{1*/ 180 180 char* IntExternalResult::GetResultName(void){ 181 181 return EnumAsString(this->enum_type); 182 182 } 183 183 /*}}}*/ 184 /*FUNCTION IntExternalResult::SetMatlabField (mxArray* dataref);{{{1*/184 /*FUNCTION IntExternalResult::SetMatlabField{{{1*/ 185 185 #ifdef _SERIAL_ 186 186 void IntExternalResult::SetMatlabField(mxArray* dataref){ … … 196 196 #endif 197 197 /*}}}*/ 198 /*FUNCTION IntExternalResult::GetStep (void);{{{1*/198 /*FUNCTION IntExternalResult::GetStep{{{1*/ 199 199 int IntExternalResult::GetStep(void){ 200 200 -
issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp
r4321 r4546 198 198 199 199 /*PetscVecExternalResult management: */ 200 /*FUNCTION PetscVecExternalResult::WriteData (FILE* fid){{{1*/200 /*FUNCTION PetscVecExternalResult::WriteData{{{1*/ 201 201 void PetscVecExternalResult::WriteData(FILE* fid){ 202 202 … … 235 235 } 236 236 /*}}}1*/ 237 /*FUNCTION PetscVecExternalResult::GetResultName (void);{{{1*/237 /*FUNCTION PetscVecExternalResult::GetResultName{{{1*/ 238 238 char* PetscVecExternalResult::GetResultName(void){ 239 239 return EnumAsString(this->enum_type); 240 240 } 241 241 /*}}}*/ 242 /*FUNCTION PetscVecExternalResult::SetMatlabField (mxArray* dataref);{{{1*/242 /*FUNCTION PetscVecExternalResult::SetMatlabField{{{1*/ 243 243 #ifdef _SERIAL_ 244 244 void PetscVecExternalResult::SetMatlabField(mxArray* dataref){ … … 265 265 #endif 266 266 /*}}}*/ 267 /*FUNCTION PetscVecExternalResult::GetStep (void);{{{1*/267 /*FUNCTION PetscVecExternalResult::GetStep{{{1*/ 268 268 int PetscVecExternalResult::GetStep(void){ 269 269 -
issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp
r4321 r4546 157 157 158 158 /*StringExternalResult management: */ 159 /*FUNCTION StringExternalResult::WriteData (FILE* fid){{{1*/159 /*FUNCTION StringExternalResult::WriteData{{{1*/ 160 160 void StringExternalResult::WriteData(FILE* fid){ 161 161 … … 188 188 } 189 189 /*}}}1*/ 190 /*FUNCTION StringExternalResult::GetResultName (void);{{{1*/190 /*FUNCTION StringExternalResult::GetResultName{{{1*/ 191 191 char* StringExternalResult::GetResultName(void){ 192 192 return EnumAsString(this->enum_type); 193 193 } 194 194 /*}}}*/ 195 /*FUNCTION StringExternalResult::SetMatlabField (mxArray* dataref);{{{1*/195 /*FUNCTION StringExternalResult::SetMatlabField{{{1*/ 196 196 #ifdef _SERIAL_ 197 197 void StringExternalResult::SetMatlabField(mxArray* dataref){ … … 208 208 #endif 209 209 /*}}}*/ 210 /*FUNCTION StringExternalResult::GetStep (void);{{{1*/210 /*FUNCTION StringExternalResult::GetStep{{{1*/ 211 211 int StringExternalResult::GetStep(void){ 212 212 -
issm/trunk/src/c/objects/Hook.cpp
r4400 r4546 208 208 } 209 209 /*}}}*/ 210 /*FUNCTION Hook::copy (void){{{1*/210 /*FUNCTION Hook::copy {{{1*/ 211 211 Object* Hook::copy(void){ 212 212 -
issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp
r4248 r4546 200 200 void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 201 201 /*}}}*/ 202 /*FUNCTION BeamVertexInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/202 /*FUNCTION BeamVertexInput::GetParameterValues{{{1*/ 203 203 void BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ 204 204 /*It is assumed that output has been correctly allocated*/ … … 216 216 } 217 217 /*}}}*/ 218 /*FUNCTION BeamVertexInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/218 /*FUNCTION BeamVertexInput::GetParameterDerivativeValue{{{1*/ 219 219 void BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} 220 220 /*}}}*/ 221 /*FUNCTION BeamVertexInput::ChangeEnum (int newenumtype){{{1*/221 /*FUNCTION BeamVertexInput::ChangeEnum{{{1*/ 222 222 void BeamVertexInput::ChangeEnum(int newenumtype){ 223 223 this->enum_type=newenumtype; 224 224 } 225 225 /*}}}*/ 226 /*FUNCTION BeamVertexInput::GetParameterAverage (double* pvalue){{{1*/226 /*FUNCTION BeamVertexInput::GetParameterAverage{{{1*/ 227 227 void BeamVertexInput::GetParameterAverage(double* pvalue){ 228 228 *pvalue=1./2.*(values[0]+values[1]); 229 229 } 230 230 /*}}}*/ 231 /*FUNCTION BeamVertexInput::SquareMin (double* psquaremin, bool process_units){{{1*/231 /*FUNCTION BeamVertexInput::SquareMin{{{1*/ 232 232 void BeamVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 233 233 … … 252 252 } 253 253 /*}}}*/ 254 /*FUNCTION BeamVertexInput::Scale (double scale_factor){{{1*/254 /*FUNCTION BeamVertexInput::Scale{{{1*/ 255 255 void BeamVertexInput::Scale(double scale_factor){ 256 256 … … 261 261 } 262 262 /*}}}*/ 263 /*FUNCTION BeamVertexInput::AXPY (Input* xinput,double scalar);{{{1*/263 /*FUNCTION BeamVertexInput::AXPY{{{1*/ 264 264 void BeamVertexInput::AXPY(Input* xinput,double scalar){ 265 265 … … 284 284 } 285 285 /*}}}*/ 286 /*FUNCTION BeamVertexInput::Constrain (double cm_min, double cm_max){{{1*/286 /*FUNCTION BeamVertexInput::Constrain{{{1*/ 287 287 void BeamVertexInput::Constrain(double cm_min, double cm_max){ 288 288 … … 295 295 } 296 296 /*}}}*/ 297 /*FUNCTION BeamVertexInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/297 /*FUNCTION BeamVertexInput::GetVectorFromInputs{{{1*/ 298 298 void BeamVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ 299 299 … … 304 304 } 305 305 /*}}}*/ 306 /*FUNCTION BeamVertexInput::GetValuesPtr (double* pvalues,int* pnum_values);{{{1*/306 /*FUNCTION BeamVertexInput::GetValuesPtr{{{1*/ 307 307 void BeamVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ 308 308 -
issm/trunk/src/c/objects/Inputs/BoolInput.cpp
r4248 r4546 208 208 void BoolInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 209 209 /*}}}*/ 210 /*FUNCTION BoolInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/210 /*FUNCTION BoolInput::GetParameterValues{{{1*/ 211 211 void BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} 212 212 /*}}}*/ 213 /*FUNCTION BoolInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/213 /*FUNCTION BoolInput::GetParameterDerivativeValue{{{1*/ 214 214 void BoolInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} 215 215 /*}}}*/ 216 /*FUNCTION BoolInput::ChangeEnum (int newenumtype){{{1*/216 /*FUNCTION BoolInput::ChangeEnum{{{1*/ 217 217 void BoolInput::ChangeEnum(int newenumtype){ 218 218 this->enum_type=newenumtype; 219 219 } 220 220 /*}}}*/ 221 /*FUNCTION BoolInput::SquareMin (double* psquaremin, bool process_units){{{1*/221 /*FUNCTION BoolInput::SquareMin{{{1*/ 222 222 void BoolInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 223 223 /*square of a bool is the bool itself: */ … … 225 225 } 226 226 /*}}}*/ 227 /*FUNCTION BoolInput::Scale (double scale_factor){{{1*/227 /*FUNCTION BoolInput::Scale{{{1*/ 228 228 void BoolInput::Scale(double scale_factor){ 229 229 /*a bool cannot be scaled: */ 230 230 } 231 231 /*}}}*/ 232 /*FUNCTION BoolInput::AXPY (Input* xinput,double scalar);{{{1*/232 /*FUNCTION BoolInput::AXPY{{{1*/ 233 233 void BoolInput::AXPY(Input* xinput,double scalar){ 234 234 … … 251 251 } 252 252 /*}}}*/ 253 /*FUNCTION BoolInput::Constrain (double cm_min, double cm_max){{{1*/253 /*FUNCTION BoolInput::Constrain{{{1*/ 254 254 void BoolInput::Constrain(double cm_min, double cm_max){ 255 255 … … 259 259 } 260 260 /*}}}*/ 261 /*FUNCTION BoolInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/261 /*FUNCTION BoolInput::GetVectorFromInputs{{{1*/ 262 262 void BoolInput::GetVectorFromInputs(Vec vector,int* doflist){ 263 263 … … 266 266 } 267 267 /*}}}*/ 268 /*FUNCTION BoolInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/268 /*FUNCTION BoolInput::GetValuesPtr{{{1*/ 269 269 void BoolInput::GetValuesPtr(double** pvalues,int* pnum_values){ 270 270 -
issm/trunk/src/c/objects/Inputs/DoubleInput.cpp
r4528 r4546 221 221 void DoubleInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 222 222 /*}}}*/ 223 /*FUNCTION DoubleInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/223 /*FUNCTION DoubleInput::GetParameterValues{{{1*/ 224 224 void DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} 225 225 /*}}}*/ 226 /*FUNCTION DoubleInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/226 /*FUNCTION DoubleInput::GetParameterDerivativeValue{{{1*/ 227 227 void DoubleInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} 228 228 /*}}}*/ 229 /*FUNCTION DoubleInput::ChangeEnum (int newenumtype){{{1*/229 /*FUNCTION DoubleInput::ChangeEnum{{{1*/ 230 230 void DoubleInput::ChangeEnum(int newenumtype){ 231 231 this->enum_type=newenumtype; 232 232 } 233 233 /*}}}*/ 234 /*FUNCTION DoubleInput::SquareMin (double* psquaremin, bool process_units){{{1*/234 /*FUNCTION DoubleInput::SquareMin{{{1*/ 235 235 void DoubleInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 236 236 … … 239 239 } 240 240 /*}}}*/ 241 /*FUNCTION DoubleInput::Scale (double scale_factor){{{1*/241 /*FUNCTION DoubleInput::Scale{{{1*/ 242 242 void DoubleInput::Scale(double scale_factor){ 243 243 value=value*scale_factor; 244 244 } 245 245 /*}}}*/ 246 /*FUNCTION DoubleInput::AXPY (Input* xinput,double scalar);{{{1*/246 /*FUNCTION DoubleInput::AXPY{{{1*/ 247 247 void DoubleInput::AXPY(Input* xinput,double scalar){ 248 248 … … 265 265 } 266 266 /*}}}*/ 267 /*FUNCTION DoubleInput::Constrain (double cm_min, double cm_max){{{1*/267 /*FUNCTION DoubleInput::Constrain{{{1*/ 268 268 void DoubleInput::Constrain(double cm_min, double cm_max){ 269 269 … … 273 273 } 274 274 /*}}}*/ 275 /*FUNCTION DoubleInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/275 /*FUNCTION DoubleInput::GetVectorFromInputs{{{1*/ 276 276 void DoubleInput::GetVectorFromInputs(Vec vector,int* doflist){ 277 277 … … 280 280 } 281 281 /*}}}*/ 282 /*FUNCTION DoubleInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/282 /*FUNCTION DoubleInput::GetValuesPtr{{{1*/ 283 283 void DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values){ 284 284 -
issm/trunk/src/c/objects/Inputs/IntInput.cpp
r4353 r4546 207 207 void IntInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 208 208 /*}}}*/ 209 /*FUNCTION IntInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/209 /*FUNCTION IntInput::GetParameterValues{{{1*/ 210 210 void IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} 211 211 /*}}}*/ 212 /*FUNCTION IntInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/212 /*FUNCTION IntInput::GetParameterDerivativeValue{{{1*/ 213 213 void IntInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} 214 214 /*}}}*/ 215 /*FUNCTION IntInput::ChangeEnum (int newenumtype){{{1*/215 /*FUNCTION IntInput::ChangeEnum{{{1*/ 216 216 void IntInput::ChangeEnum(int newenumtype){ 217 217 this->enum_type=newenumtype; 218 218 } 219 219 /*}}}*/ 220 /*FUNCTION IntInput::SquareMin (double* psquaremin, bool process_units){{{1*/220 /*FUNCTION IntInput::SquareMin{{{1*/ 221 221 void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 222 222 … … 225 225 } 226 226 /*}}}*/ 227 /*FUNCTION IntInput::Scale (double scale_factor){{{1*/227 /*FUNCTION IntInput::Scale{{{1*/ 228 228 void IntInput::Scale(double scale_factor){ 229 229 double dvalue=(double)value*scale_factor; … … 231 231 } 232 232 /*}}}*/ 233 /*FUNCTION IntInput::AXPY (Input* xinput,int scalar);{{{1*/233 /*FUNCTION IntInput::AXPY{{{1*/ 234 234 void IntInput::AXPY(Input* xinput,double scalar){ 235 235 … … 254 254 } 255 255 /*}}}*/ 256 /*FUNCTION IntInput::Constrain (double cm_min, double cm_max){{{1*/256 /*FUNCTION IntInput::Constrain{{{1*/ 257 257 void IntInput::Constrain(double cm_min, double cm_max){ 258 258 … … 262 262 } 263 263 /*}}}*/ 264 /*FUNCTION IntInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/264 /*FUNCTION IntInput::GetVectorFromInputs{{{1*/ 265 265 void IntInput::GetVectorFromInputs(Vec vector,int* doflist){ 266 266 … … 269 269 } 270 270 /*}}}*/ 271 /*FUNCTION IntInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/271 /*FUNCTION IntInput::GetValuesPtr{{{1*/ 272 272 void IntInput::GetValuesPtr(double** pvalues,int* pnum_values){ 273 273 -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp
r4502 r4546 243 243 void PentaVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 244 244 /*}}}*/ 245 /*FUNCTION PentaVertexInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/245 /*FUNCTION PentaVertexInput::GetParameterValues{{{1*/ 246 246 void PentaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ 247 247 /*It is assumed that output values has been correctly allocated*/ … … 260 260 } 261 261 /*}}}*/ 262 /*FUNCTION PentaVertexInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/262 /*FUNCTION PentaVertexInput::GetParameterDerivativeValue{{{1*/ 263 263 void PentaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){ 264 264 /*From grid values of parameter p (p_list[0], p_list[1], p_list[2], p_list[3], p_list[4] and p_list[4]), return parameter derivative value at gaussian point specified by gauss_coord: … … 283 283 } 284 284 /*}}}*/ 285 /*FUNCTION PentaVertexInput::GetVxStrainRate3d (double* epsilonvx,double* xyz_list, double* gauss){{{1*/285 /*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/ 286 286 void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ 287 287 int i,j; … … 328 328 } 329 329 /*}}}*/ 330 /*FUNCTION PentaVertexInput::GetVyStrainRate3d (double* epsilonvy,double* xyz_list, double* gauss){{{1*/330 /*FUNCTION PentaVertexInput::GetVyStrainRate3d{{{1*/ 331 331 void PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ 332 332 int i,j; … … 373 373 } 374 374 /*}}}*/ 375 /*FUNCTION PentaVertexInput::GetVzStrainRate3d (double* epsilonvz,double* xyz_list, double* gauss){{{1*/375 /*FUNCTION PentaVertexInput::GetVzStrainRate3d{{{1*/ 376 376 void PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ 377 377 int i,j; … … 419 419 } 420 420 /*}}}*/ 421 /*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn (double* epsilonvx,double* xyz_list, double* gauss){{{1*/421 /*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn{{{1*/ 422 422 void PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ 423 423 … … 444 444 } 445 445 /*}}}*/ 446 /*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn (double* epsilonvy,double* xyz_list, double* gauss){{{1*/446 /*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn{{{1*/ 447 447 void PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ 448 448 … … 469 469 } 470 470 /*}}}*/ 471 /*FUNCTION PentaVertexInput::ChangeEnum (int newenumtype){{{1*/471 /*FUNCTION PentaVertexInput::ChangeEnum{{{1*/ 472 472 void PentaVertexInput::ChangeEnum(int newenumtype){ 473 473 this->enum_type=newenumtype; 474 474 } 475 475 /*}}}*/ 476 /*FUNCTION PentaVertexInput::GetParameterAverage (double* pvalue){{{1*/476 /*FUNCTION PentaVertexInput::GetParameterAverage{{{1*/ 477 477 void PentaVertexInput::GetParameterAverage(double* pvalue){ 478 478 *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); … … 1016 1016 } 1017 1017 /*}}}*/ 1018 /*FUNCTION PentaVertexInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/1018 /*FUNCTION PentaVertexInput::GetVectorFromInputs{{{1*/ 1019 1019 void PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ 1020 1020 … … 1023 1023 1024 1024 } /*}}}*/ 1025 /*FUNCTION PentaVertexInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/1025 /*FUNCTION PentaVertexInput::GetValuesPtr{{{1*/ 1026 1026 void PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ 1027 1027 -
issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp
r4248 r4546 191 191 void SingVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} 192 192 /*}}}*/ 193 /*FUNCTION SingVertexInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/193 /*FUNCTION SingVertexInput::GetParameterValues{{{1*/ 194 194 void SingVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} 195 195 /*}}}*/ 196 /*FUNCTION SingVertexInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/196 /*FUNCTION SingVertexInput::GetParameterDerivativeValue{{{1*/ 197 197 void SingVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} 198 198 /*}}}*/ 199 /*FUNCTION SingVertexInput::ChangeEnum (int newenumtype){{{1*/199 /*FUNCTION SingVertexInput::ChangeEnum{{{1*/ 200 200 void SingVertexInput::ChangeEnum(int newenumtype){ 201 201 this->enum_type=newenumtype; 202 202 } 203 203 /*}}}*/ 204 /*FUNCTION SingVertexInput::GetParameterAverage (double* pvalue){{{1*/204 /*FUNCTION SingVertexInput::GetParameterAverage{{{1*/ 205 205 void SingVertexInput::GetParameterAverage(double* pvalue){ 206 206 *pvalue=value; 207 207 } 208 208 /*}}}*/ 209 /*FUNCTION SingVertexInput::SquareMin (double* psquaremin, bool process_units){{{1*/209 /*FUNCTION SingVertexInput::SquareMin{{{1*/ 210 210 void SingVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 211 211 … … 226 226 } 227 227 /*}}}*/ 228 /*FUNCTION SingVertexInput::Scale (double scale_factor){{{1*/228 /*FUNCTION SingVertexInput::Scale{{{1*/ 229 229 void SingVertexInput::Scale(double scale_factor){ 230 230 value=value*scale_factor; 231 231 } 232 232 /*}}}*/ 233 /*FUNCTION SingVertexInput::AXPY (Input* xinput,double scalar);{{{1*/233 /*FUNCTION SingVertexInput::AXPY{{{1*/ 234 234 void SingVertexInput::AXPY(Input* xinput,double scalar){ 235 235 … … 252 252 } 253 253 /*}}}*/ 254 /*FUNCTION SingVertexInput::Constrain (double cm_min, double cm_max){{{1*/254 /*FUNCTION SingVertexInput::Constrain{{{1*/ 255 255 void SingVertexInput::Constrain(double cm_min, double cm_max){ 256 256 … … 260 260 } 261 261 /*}}}*/ 262 /*FUNCTION SingVertexInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/262 /*FUNCTION SingVertexInput::GetVectorFromInputs{{{1*/ 263 263 void SingVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ 264 264 … … 269 269 } 270 270 /*}}}*/ 271 /*FUNCTION SingVertexInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/271 /*FUNCTION SingVertexInput::GetValuesPtr{{{1*/ 272 272 void SingVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ 273 273 -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp
r4502 r4546 196 196 197 197 /*Object functions*/ 198 /*FUNCTION TriaVertexInput::GetParameterValue (double* pvalue,double* gauss){{{1*/198 /*FUNCTION TriaVertexInput::GetParameterValue{{{1*/ 199 199 void TriaVertexInput::GetParameterValue(double* pvalue,double* gauss){ 200 200 /*P1 interpolation on Gauss point*/ … … 211 211 } 212 212 /*}}}*/ 213 /*FUNCTION TriaVertexInput::GetParameterValues (double* values,double* gauss_pointers, int numgauss){{{1*/213 /*FUNCTION TriaVertexInput::GetParameterValues{{{1*/ 214 214 void TriaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ 215 215 /*It is assumed that output values has been correctly allocated*/ … … 229 229 } 230 230 /*}}}*/ 231 /*FUNCTION TriaVertexInput::GetParameterDerivativeValue (double* derivativevalues, double* xyz_list, double* gauss){{{1*/231 /*FUNCTION TriaVertexInput::GetParameterDerivativeValue{{{1*/ 232 232 void TriaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){ 233 233 /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian … … 251 251 } 252 252 /*}}}*/ 253 /*FUNCTION TriaVertexInput::GetVxStrainRate2d (double* epsilonvx,double* xyz_list, double* gauss){{{1*/253 /*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ 254 254 void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ 255 255 … … 275 275 } 276 276 /*}}}*/ 277 /*FUNCTION TriaVertexInput::GetVyStrainRate2d (double* epsilonvy,double* xyz_list, double* gauss){{{1*/277 /*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/ 278 278 void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ 279 279 … … 299 299 } 300 300 /*}}}*/ 301 /*FUNCTION TriaVertexInput::ChangeEnum (int newenumtype){{{1*/301 /*FUNCTION TriaVertexInput::ChangeEnum{{{1*/ 302 302 void TriaVertexInput::ChangeEnum(int newenumtype){ 303 303 this->enum_type=newenumtype; 304 304 } 305 305 /*}}}*/ 306 /*FUNCTION TriaVertexInput::GetParameterAverage (double* pvalue){{{1*/306 /*FUNCTION TriaVertexInput::GetParameterAverage{{{1*/ 307 307 void TriaVertexInput::GetParameterAverage(double* pvalue){ 308 308 *pvalue=1./3.*(values[0]+values[1]+values[2]); … … 452 452 } 453 453 /*}}}*/ 454 /*FUNCTION TriaVertexInput::SquareMin (double* psquaremin, bool process_units){{{1*/454 /*FUNCTION TriaVertexInput::SquareMin{{{1*/ 455 455 void TriaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ 456 456 … … 475 475 } 476 476 /*}}}*/ 477 /*FUNCTION TriaVertexInput::Scale (double scale_factor){{{1*/477 /*FUNCTION TriaVertexInput::Scale{{{1*/ 478 478 void TriaVertexInput::Scale(double scale_factor){ 479 479 … … 484 484 } 485 485 /*}}}*/ 486 /*FUNCTION TriaVertexInput::AXPY (Input* xinput,double scalar);{{{1*/486 /*FUNCTION TriaVertexInput::AXPY{{{1*/ 487 487 void TriaVertexInput::AXPY(Input* xinput,double scalar){ 488 488 … … 507 507 } 508 508 /*}}}*/ 509 /*FUNCTION TriaVertexInput::Constrain (double cm_min, double cm_max){{{1*/509 /*FUNCTION TriaVertexInput::Constrain{{{1*/ 510 510 void TriaVertexInput::Constrain(double cm_min, double cm_max){ 511 511 … … 518 518 } 519 519 /*}}}*/ 520 /*FUNCTION TriaVertexInput::GetVectorFromInputs (Vec vector,int* doflist){{{1*/520 /*FUNCTION TriaVertexInput::GetVectorFromInputs{{{1*/ 521 521 void TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ 522 522 … … 525 525 526 526 } /*}}}*/ 527 /*FUNCTION TriaVertexInput::GetValuesPtr (double** pvalues,int* pnum_values);{{{1*/527 /*FUNCTION TriaVertexInput::GetValuesPtr{{{1*/ 528 528 void TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ 529 529 -
issm/trunk/src/c/objects/IoModel.cpp
r4382 r4546 221 221 } 222 222 /*}}}*/ 223 /*FUNCTION IoModel::IoModelInit (void){{{1*/223 /*FUNCTION IoModel::IoModelInit{{{1*/ 224 224 void IoModel::IoModelInit(void){ 225 225 … … 387 387 } 388 388 /*}}}*/ 389 /*FUNCTION IoModel::Echo (int which_part,int rank){{{1*/389 /*FUNCTION IoModel::Echo{{{1*/ 390 390 void IoModel::Echo(int which_part,int rank) { 391 391 -
issm/trunk/src/c/objects/Loads/Friction.cpp
r4461 r4546 20 20 /*}}}*/ 21 21 22 /* methods:*/22 /*Constructors/destructors*/ 23 23 /*FUNCTION Friction::Friction() {{{1*/ 24 24 Friction::Friction(){ … … 44 44 } 45 45 /*}}}*/ 46 47 /*methods: */ 46 48 /*FUNCTION Friction::Echo {{{1*/ 47 49 void Friction::Echo(void){ … … 53 55 } 54 56 /*}}}*/ 55 /*FUNCTION Friction::GetAlpha2 (double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){{{1*/57 /*FUNCTION Friction::GetAlpha2{{{1*/ 56 58 void Friction::GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){ 57 59 -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r4456 r4546 323 323 } 324 324 /*}}}*/ 325 /*FUNCTION Icefront::InAnalysis (int analysis_type){{{1*/325 /*FUNCTION Icefront::InAnalysis{{{1*/ 326 326 bool Icefront::InAnalysis(int in_analysis_type){ 327 327 if (in_analysis_type==this->analysis_type)return true; … … 361 361 } 362 362 /*}}}*/ 363 /*FUNCTION Icefront::InputUpdateFromSolution (double* solution){{{1*/363 /*FUNCTION Icefront::InputUpdateFromSolution{{{1*/ 364 364 void Icefront::InputUpdateFromSolution(double* solution){ 365 365 /*Nothing updated yet*/ -
issm/trunk/src/c/objects/Loads/Numericalflux.cpp
r4456 r4546 343 343 } 344 344 /*}}}*/ 345 /*FUNCTION Numericalflux::InAnalysis (int analysis_type){{{1*/345 /*FUNCTION Numericalflux::InAnalysis{{{1*/ 346 346 bool Numericalflux::InAnalysis(int in_analysis_type){ 347 347 if (in_analysis_type==this->analysis_type) return true; -
issm/trunk/src/c/objects/Loads/Pengrid.cpp
r4492 r4546 319 319 } 320 320 /*}}}1*/ 321 /*FUNCTION Pengrid::InAnalysis (int analysis_type){{{1*/321 /*FUNCTION Pengrid::InAnalysis{{{1*/ 322 322 bool Pengrid::InAnalysis(int in_analysis_type){ 323 323 if (in_analysis_type==this->analysis_type)return true; … … 370 370 } 371 371 /*}}}*/ 372 /*FUNCTION Pengrid::InputUpdateFromSolution (double* solution){{{1*/372 /*FUNCTION Pengrid::InputUpdateFromSolution{{{1*/ 373 373 void Pengrid::InputUpdateFromSolution(double* solution){ 374 374 /*Nothing updated yet*/ -
issm/trunk/src/c/objects/Loads/Penpair.cpp
r4396 r4546 210 210 } 211 211 /*}}}1*/ 212 /*FUNCTION Penpair::InAnalysis (int analysis_type){{{1*/212 /*FUNCTION Penpair::InAnalysis{{{1*/ 213 213 bool Penpair::InAnalysis(int in_analysis_type){ 214 214 if (in_analysis_type==this->analysis_type)return true; -
issm/trunk/src/c/objects/Loads/Riftfront.cpp
r4456 r4546 541 541 } 542 542 /*}}}1*/ 543 /*FUNCTION Riftfront::InAnalysis (int analysis_type){{{1*/543 /*FUNCTION Riftfront::InAnalysis{{{1*/ 544 544 bool Riftfront::InAnalysis(int in_analysis_type){ 545 545 if (in_analysis_type==this->analysis_type) return true; -
issm/trunk/src/c/objects/Materials/Material.cpp
r3683 r4546 3 3 * the Object derived class Material. 4 4 */ 5 6 5 7 6 #include "../objects.h" … … 12 11 return MaterialEnum; 13 12 } 14 15 -
issm/trunk/src/c/objects/Materials/Matice.cpp
r4248 r4546 27 27 } 28 28 /*}}}*/ 29 /*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/ 30 Matice::Matice(int matice_mid,int i, IoModel* iomodel){ 31 32 int j; 33 34 /*needed for Init routine:*/ 35 double matice_B; 36 double matice_n; 37 int num_vertices; 38 39 /*intermediary: */ 40 double B_avg; 41 42 /*2d or 3d? */ 43 if(iomodel->dim==2){ 44 num_vertices=3; //tria elements 45 } 46 else if(iomodel->dim==3){ 47 num_vertices=6; //penta elements 48 } 49 else ISSMERROR(" Mesh type not supported yet!"); 50 51 /*Compute B on the element if provided*/ 52 if (iomodel->rheology_B){ 53 B_avg=0; 54 for(j=0;j<num_vertices;j++){ 55 B_avg+=*(iomodel->rheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1)); 56 } 57 B_avg=B_avg/num_vertices; 58 matice_B=B_avg; 59 } 60 else matice_B=UNDEF; 61 62 if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i); 63 else matice_n=UNDEF; 64 65 this->Init(matice_mid,matice_B,matice_n); 66 } 67 /*}}}*/ 68 /*FUNCTION Matice::~Matice(){{{1*/ 69 Matice::~Matice(){ 70 return; 71 } 72 /*}}}*/ 29 73 /*FUNCTION Matice::Init {{{1*/ 30 74 void Matice::Init(int in_mid,double in_B,double in_n){ … … 32 76 this->B=in_B; 33 77 this->n=in_n; 34 }35 /*}}}*/36 /*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/37 Matice::Matice(int matice_mid,int i, IoModel* iomodel){38 39 int j;40 41 /*needed for Init routine:*/42 double matice_B;43 double matice_n;44 int num_vertices;45 46 /*intermediary: */47 double B_avg;48 49 /*2d or 3d? */50 if(iomodel->dim==2){51 num_vertices=3; //tria elements52 }53 else if(iomodel->dim==3){54 num_vertices=6; //penta elements55 }56 else ISSMERROR(" Mesh type not supported yet!");57 58 /*Compute B on the element if provided*/59 if (iomodel->rheology_B){60 B_avg=0;61 for(j=0;j<num_vertices;j++){62 B_avg+=*(iomodel->rheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1));63 }64 B_avg=B_avg/num_vertices;65 matice_B=B_avg;66 }67 else matice_B=UNDEF;68 69 if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i);70 else matice_n=UNDEF;71 72 this->Init(matice_mid,matice_B,matice_n);73 }74 /*}}}*/75 /*FUNCTION Matice::~Matice(){{{1*/76 Matice::~Matice(){77 return;78 78 } 79 79 /*}}}*/ … … 471 471 } 472 472 /*}}}*/ 473 /*FUNCTION Matice::InputUpdateFromSolution (double* solution){{{1*/473 /*FUNCTION Matice::InputUpdateFromSolution{{{1*/ 474 474 void Matice::InputUpdateFromSolution(double* solution){ 475 475 /*Nothing updated yet*/ -
issm/trunk/src/c/objects/Materials/Matpar.cpp
r4532 r4546 2 2 * \brief: implementation of the Matpar object 3 3 */ 4 5 4 6 5 #ifdef HAVE_CONFIG_H … … 16 15 #include "../../include/include.h" 17 16 #include "../../EnumDefinitions/EnumDefinitions.h" 18 19 17 20 18 /*Matpar constructors and destructor*/ … … 286 284 } 287 285 /*}}}*/ 288 /*FUNCTION Matpar::InputUpdateFromSolution (double* solution){{{1*/286 /*FUNCTION Matpar::InputUpdateFromSolution{{{1*/ 289 287 void Matpar::InputUpdateFromSolution(double* solution){ 290 288 /*Nothing updated yet*/ -
issm/trunk/src/c/objects/Node.cpp
r4401 r4546 18 18 #include "../include/include.h" 19 19 /*}}}*/ 20 /*Node constructors and destructors: {{{1*/ 21 /*FUNCTION Node::Node() default constructor {{{2*/ 20 21 /*Node constructors and destructors:*/ 22 /*FUNCTION Node::Node() default constructor {{{1*/ 22 23 Node::Node(){ 23 24 this->inputs=NULL; … … 27 28 } 28 29 /*}}}*/ 29 /*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{ 2*/30 /*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{1*/ 30 31 Node::Node(int node_id,int node_sid, int node_vertex_id, int node_upper_node_id, int node_numdofs): 31 32 indexing(node_numdofs){ … … 40 41 } 41 42 /*}}}*/ 42 /*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{ 2*/43 /*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{1*/ 43 44 Node::Node(int node_id,int node_sid, DofIndexing* node_indexing, Hook* node_vertex, Hook* node_upper_node,Inputs* node_inputs,int analysis_type): 44 45 indexing(node_indexing), … … 59 60 } 60 61 /*}}}*/ 61 /*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{ 2*/62 /*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{1*/ 62 63 Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type){ 63 64 … … 173 174 } 174 175 /*}}}*/ 175 /*FUNCTION Node::~Node(){{{ 2*/176 /*FUNCTION Node::~Node(){{{1*/ 176 177 Node::~Node(){ 177 178 delete inputs; … … 181 182 } 182 183 /*}}}*/ 183 /*}}}*/ 184 /*Object virtual functions definitions: {{{1*/185 /*FUNCTION Node::Echo{{{ 2*/184 185 /*Object virtual functions definitions:*/ 186 /*FUNCTION Node::Echo{{{1*/ 186 187 void Node::Echo(void){ 187 188 … … 198 199 } 199 200 /*}}}*/ 200 /*FUNCTION Node::DeepEcho{{{ 2*/201 /*FUNCTION Node::DeepEcho{{{1*/ 201 202 void Node::DeepEcho(void){ 202 203 … … 216 217 } 217 218 /*}}}*/ 218 /*FUNCTION Node::Id{{{ 2*/219 /*FUNCTION Node::Id{{{1*/ 219 220 int Node::Id(void){ return id; } 220 221 /*}}}*/ 221 /*FUNCTION Node::MyRank{{{ 2*/222 /*FUNCTION Node::MyRank{{{1*/ 222 223 int Node::MyRank(void){ 223 224 extern int my_rank; … … 226 227 } 227 228 /*}}}*/ 228 /*FUNCTION Node::Marshall{{{ 2*/229 /*FUNCTION Node::Marshall{{{1*/ 229 230 void Node::Marshall(char** pmarshalled_dataset){ 230 231 … … 266 267 } 267 268 /*}}}*/ 268 /*FUNCTION Node::MarshallSize{{{ 2*/269 /*FUNCTION Node::MarshallSize{{{1*/ 269 270 int Node::MarshallSize(){ 270 271 … … 279 280 } 280 281 /*}}}*/ 281 /*FUNCTION Node::Demarshall{{{ 2*/282 /*FUNCTION Node::Demarshall{{{1*/ 282 283 void Node::Demarshall(char** pmarshalled_dataset){ 283 284 … … 307 308 } 308 309 /*}}}*/ 309 /*FUNCTION Node::Enum{{{ 2*/310 /*FUNCTION Node::Enum{{{1*/ 310 311 int Node::Enum(void){ 311 312 … … 314 315 } 315 316 /*}}}*/ 316 /*FUNCTION Node::copy {{{ 2*/317 /*FUNCTION Node::copy {{{1*/ 317 318 Object* Node::copy() { 318 319 … … 322 323 323 324 /*}}}*/ 324 /*}}}*/ 325 /*Node management: {{{1*/326 /*FUNCTION Node::Configure {{{ 2*/325 326 /*Node management:*/ 327 /*FUNCTION Node::Configure {{{1*/ 327 328 void Node::Configure(DataSet* nodesin,Vertices* verticesin){ 328 329 … … 335 336 336 337 } 337 /*FUNCTION Node::GetDof {{{ 2*/338 /*FUNCTION Node::GetDof {{{1*/ 338 339 int Node::GetDof(int dofindex){ 339 340 … … 342 343 } 343 344 /*}}}*/ 344 /*FUNCTION Node::GetDofList1{{{ 2*/345 /*FUNCTION Node::GetDofList1{{{1*/ 345 346 int Node::GetDofList1(void){ 346 347 … … 352 353 } 353 354 /*}}}*/ 354 /*FUNCTION Node::GetDofList{{{ 2*/355 /*FUNCTION Node::GetDofList{{{1*/ 355 356 void Node::GetDofList(int* outdoflist,int* pnumberofdofspernode){ 356 357 … … 363 364 } 364 365 /*}}}*/ 365 /*FUNCTION Node::Sid{{{ 2*/366 /*FUNCTION Node::Sid{{{1*/ 366 367 int Node::Sid(void){ return sid; } 367 368 /*}}}*/ 368 /*FUNCTION Node::GetVertexId {{{ 2*/369 /*FUNCTION Node::GetVertexId {{{1*/ 369 370 int Node::GetVertexId(void){ 370 371 … … 375 376 } 376 377 /*}}}*/ 377 /*FUNCTION Node::GetVertexDof {{{ 2*/378 /*FUNCTION Node::GetVertexDof {{{1*/ 378 379 int Node::GetVertexDof(void){ 379 380 … … 384 385 } 385 386 /*}}}*/ 386 /*FUNCTION Node::SetVertexDof {{{ 2*/387 /*FUNCTION Node::SetVertexDof {{{1*/ 387 388 void Node::SetVertexDof(int in_dof){ 388 389 … … 394 395 } 395 396 /*}}}*/ 396 /*FUNCTION Node::InAnalysis (int analysis_type){{{2*/397 /*FUNCTION Node::InAnalysis{{{1*/ 397 398 bool Node::InAnalysis(int in_analysis_type){ 398 399 if (in_analysis_type==this->analysis_type) return true; … … 400 401 } 401 402 /*}}}*/ 402 /*}}}*/ 403 /*Node numerics: {{{1*/404 /*FUNCTION Node::ApplyConstraints{{{ 2*/403 404 /*Node numerics:*/ 405 /*FUNCTION Node::ApplyConstraints{{{1*/ 405 406 void Node::ApplyConstraint(Vec yg,int dof,double value){ 406 407 … … 425 426 } 426 427 /*}}}*/ 427 /*FUNCTION Node::CreateVecSets {{{ 2*/428 /*FUNCTION Node::CreateVecSets {{{1*/ 428 429 void Node::CreateVecSets(Vec pv_g,Vec pv_m,Vec pv_n,Vec pv_f,Vec pv_s){ 429 430 … … 459 460 } 460 461 /*}}}*/ 461 /*FUNCTION Node::DofInMSet{{{ 2*/462 /*FUNCTION Node::DofInMSet{{{1*/ 462 463 void Node::DofInMSet(int dof){ 463 464 … … 470 471 } 471 472 /*}}}*/ 472 /*FUNCTION Node::DofInSSet {{{ 2*/473 /*FUNCTION Node::DofInSSet {{{1*/ 473 474 void Node::DofInSSet(int dof){ 474 475 … … 482 483 } 483 484 /*}}}*/ 484 /*FUNCTION Node::DofIsInMSet{{{ 2*/485 /*FUNCTION Node::DofIsInMSet{{{1*/ 485 486 int Node::DofIsInMSet(int dof){ 486 487 … … 490 491 } 491 492 /*}}}*/ 492 /*FUNCTION Node::FieldAverageOntoVertices{{{ 2*/493 /*FUNCTION Node::FieldAverageOntoVertices{{{1*/ 493 494 void Node::FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field){ 494 495 … … 514 515 } 515 516 /*}}}*/ 516 /*FUNCTION Node::FieldDepthAverageAtBase{{{ 2*/517 /*FUNCTION Node::FieldDepthAverageAtBase{{{1*/ 517 518 void Node::FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname){ 518 519 … … 643 644 } 644 645 /*}}}*/ 645 /*FUNCTION Node::VecExtrude {{{ 2*/646 /*FUNCTION Node::VecExtrude {{{1*/ 646 647 void Node::VecExtrude(Vec vector,double* vector_serial){ 647 648 … … 684 685 } 685 686 /*}}}*/ 686 /*FUNCTION Node::FreezeDof{{{ 2*/687 /*FUNCTION Node::FreezeDof{{{1*/ 687 688 void Node::FreezeDof(int dof){ 688 689 … … 691 692 } 692 693 /*}}}*/ 693 /*FUNCTION Node::GetConnectivity {{{ 2*/694 /*FUNCTION Node::GetConnectivity {{{1*/ 694 695 int Node::GetConnectivity(){ 695 696 int connectivity; … … 701 702 } 702 703 /*}}}*/ 703 /*FUNCTION Node::GetNumberOfDofs{{{ 2*/704 /*FUNCTION Node::GetNumberOfDofs{{{1*/ 704 705 int Node::GetNumberOfDofs(){ 705 706 … … 708 709 } 709 710 /*}}}*/ 710 /*FUNCTION Node::GetSigma {{{ 2*/711 /*FUNCTION Node::GetSigma {{{1*/ 711 712 double Node::GetSigma(){ 712 713 Vertex* vertex=NULL; … … 716 717 } 717 718 /*}}}*/ 718 /*FUNCTION Node::GetUpperNode {{{ 2*/719 /*FUNCTION Node::GetUpperNode {{{1*/ 719 720 Node* Node::GetUpperNode(){ 720 721 Node* upper_node=NULL; … … 723 724 } 724 725 /*}}}*/ 725 /*FUNCTION Node::GetX {{{ 2*/726 /*FUNCTION Node::GetX {{{1*/ 726 727 double Node::GetX(){ 727 728 Vertex* vertex=NULL; … … 731 732 } 732 733 /*}}}*/ 733 /*FUNCTION Node::GetY {{{ 2*/734 /*FUNCTION Node::GetY {{{1*/ 734 735 double Node::GetY(){ 735 736 Vertex* vertex=NULL; … … 739 740 } 740 741 /*}}}*/ 741 /*FUNCTION Node::GetZ {{{ 2*/742 /*FUNCTION Node::GetZ {{{1*/ 742 743 double Node::GetZ(){ 743 744 Vertex* vertex=NULL; … … 747 748 } 748 749 /*}}}*/ 749 /*FUNCTION Node::IsClone {{{ 2*/750 /*FUNCTION Node::IsClone {{{1*/ 750 751 int Node::IsClone(){ 751 752 … … 754 755 } 755 756 /*}}}*/ 756 /*FUNCTION Node::IsOnBed {{{ 2*/757 /*FUNCTION Node::IsOnBed {{{1*/ 757 758 int Node::IsOnBed(){ 758 759 … … 765 766 } 766 767 /*}}}*/ 767 /*FUNCTION Node::IsOnSheet {{{ 2*/768 /*FUNCTION Node::IsOnSheet {{{1*/ 768 769 int Node::IsOnSheet(){ 769 770 … … 776 777 } 777 778 /*}}}*/ 778 /*FUNCTION Node::IsOnShelf {{{ 2*/779 /*FUNCTION Node::IsOnShelf {{{1*/ 779 780 int Node::IsOnShelf(){ 780 781 … … 787 788 } 788 789 /*}}}*/ 789 /*FUNCTION Node::IsOnSurface {{{ 2*/790 /*FUNCTION Node::IsOnSurface {{{1*/ 790 791 int Node::IsOnSurface(){ 791 792 … … 798 799 } 799 800 /*}}}*/ 800 /*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{ 2*/801 /*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{1*/ 801 802 void Node::InputUpdateFromVector(double* vector, int name, int type){ 802 803 … … 804 805 } 805 806 /*}}}*/ 806 /*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{ 2*/807 /*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{1*/ 807 808 void Node::InputUpdateFromVector(int* vector, int name, int type){ 808 809 … … 810 811 } 811 812 /*}}}*/ 812 /*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{ 2*/813 /*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{1*/ 813 814 void Node::InputUpdateFromVector(bool* vector, int name, int type){ 814 815 … … 816 817 } 817 818 /*}}}*/ 818 /*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{ 2*/819 /*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{1*/ 819 820 void Node::InputUpdateFromConstant(double constant, int name){ 820 821 … … 822 823 } 823 824 /*}}}*/ 824 /*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{ 2*/825 /*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{1*/ 825 826 void Node::InputUpdateFromConstant(int constant, int name){ 826 827 … … 828 829 } 829 830 /*}}}*/ 830 /*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{ 2*/831 /*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{1*/ 831 832 void Node::InputUpdateFromConstant(bool constant, int name){ 832 833 … … 834 835 } 835 836 /*}}}*/ 836 /*}}}*/ 837 /* DofObject routines: {{{1*/838 /*FUNCTION Node::DistributeDofs{{{ 2*/837 838 /* DofObject routines:*/ 839 /*FUNCTION Node::DistributeDofs{{{1*/ 839 840 void Node::DistributeDofs(int* pdofcount){ 840 841 … … 861 862 } 862 863 /*}}}*/ 863 /*FUNCTION Node::OffsetDofs{{{ 2*/864 /*FUNCTION Node::OffsetDofs{{{1*/ 864 865 void Node::OffsetDofs(int dofcount){ 865 866 … … 878 879 } 879 880 /*}}}*/ 880 /*FUNCTION Node::ShowTrueDofs{{{ 2*/881 /*FUNCTION Node::ShowTrueDofs{{{1*/ 881 882 void Node::ShowTrueDofs(int* truedofs){ 882 883 … … 894 895 } 895 896 /*}}}*/ 896 /*FUNCTION Node::UpdateCloneDofs{{{ 2*/897 /*FUNCTION Node::UpdateCloneDofs{{{1*/ 897 898 void Node::UpdateCloneDofs(int* alltruedofs){ 898 899 … … 910 911 } 911 912 /*}}}*/ 912 /*FUNCTION Node::SetClone {{{ 2*/913 /*FUNCTION Node::SetClone {{{1*/ 913 914 void Node::SetClone(int* minranks){ 914 915 … … 926 927 } 927 928 /*}}}*/ 928 /*FUNCTION Node::CreatePartition{{{ 2*/929 /*FUNCTION Node::CreatePartition{{{1*/ 929 930 void Node::CreatePartition(Vec partition){ 930 931 … … 933 934 } 934 935 /*}}}*/ 935 /*}}}*/ -
issm/trunk/src/c/objects/NodeSets.cpp
r3775 r4546 7 7 #include "./objects.h" 8 8 9 /*-------------------------------------------------- 10 Construtor 11 --------------------------------------------------*/ 9 /*constructors and destructors*/ 10 /*FUNCTION NodeSets::NodeSets{{{1*/ 12 11 NodeSets::NodeSets( double* nodesets_pv_m,double* nodesets_pv_n,double* nodesets_pv_f,double* nodesets_pv_s, 13 12 int nodesets_gsize,int nodesets_msize,int nodesets_nsize,int nodesets_fsize,int nodesets_ssize){ … … 24 23 pv_s=nodesets_pv_s; 25 24 26 } 27 28 29 30 /*-------------------------------------------------- 31 Destructor: 32 --------------------------------------------------*/ 33 25 }/*}}}*/ 26 /*FUNCTION NodeSets::~NodeSets{{{1*/ 34 27 NodeSets::~NodeSets(void){ 35 28 … … 39 32 xfree((void**)&pv_s); 40 33 41 } 34 }/*}}}*/ 42 35 43 /*-------------------------------------------------- 44 Echo 45 --------------------------------------------------*/ 46 36 /*Object management*/ 37 /*FUNCTION NodeSets::Echo{{{1*/ 47 38 void NodeSets::Echo(void){ 48 39 … … 83 74 } 84 75 } 85 } 86 87 88 /*Access to internals: */ 89 int NodeSets::GetGSize(){ return gsize;} 90 int NodeSets::GetMSize(){ return msize;} 91 int NodeSets::GetNSize(){ return nsize;} 92 int NodeSets::GetFSize(){ return fsize;} 93 int NodeSets::GetSSize(){ return ssize;} 94 double* NodeSets::GetPV_M(){ return pv_m;} 95 double* NodeSets::GetPV_N(){ return pv_n;} 96 double* NodeSets::GetPV_F(){ return pv_f;} 97 double* NodeSets::GetPV_S(){ return pv_s;} 98 99 76 }/*}}}*/ 77 /*FUNCTION NodeSets::GetGSize{{{1*/ 78 int NodeSets::GetGSize(){ 79 return gsize; 80 }/*}}}*/ 81 /*FUNCTION NodeSets::GetMSize{{{1*/ 82 int NodeSets::GetMSize(){ 83 return msize; 84 }/*}}}*/ 85 /*FUNCTION NodeSets::GetNSize{{{1*/ 86 int NodeSets::GetNSize(){ 87 return nsize; 88 }/*}}}*/ 89 /*FUNCTION NodeSets::GetFSize{{{1*/ 90 int NodeSets::GetFSize(){ 91 return fsize; 92 }/*}}}*/ 93 /*FUNCTION NodeSets::GetSSize{{{1*/ 94 int NodeSets::GetSSize(){ 95 return ssize; 96 }/*}}}*/ 97 /*FUNCTION NodeSets::GetPV_M{{{1*/ 98 double* NodeSets::GetPV_M(){ 99 return pv_m; 100 }/*}}}*/ 101 /*FUNCTION NodeSets::GetPV_N{{{1*/ 102 double* NodeSets::GetPV_N(){ 103 return pv_n; 104 }/*}}}*/ 105 /*FUNCTION NodeSets::GetPV_F{{{1*/ 106 double* NodeSets::GetPV_F(){ 107 return pv_f; 108 }/*}}}*/ 109 /*FUNCTION NodeSets::GetPV_S{{{1*/ 110 double* NodeSets::GetPV_S(){ 111 return pv_s; 112 }/*}}}*/ -
issm/trunk/src/c/objects/Params/BoolParam.cpp
r4248 r4546 127 127 128 128 /*BoolParam virtual functions definitions: */ 129 /*FUNCTION BoolParam::GetParameterName (void);{{{1*/129 /*FUNCTION BoolParam::GetParameterName{{{1*/ 130 130 char* BoolParam::GetParameterName(void){ 131 131 return EnumAsString(this->enum_type); 132 132 } 133 133 /*}}}*/ 134 /*FUNCTION BoolParam::SetMatlabField (mxArray* dataref);{{{1*/134 /*FUNCTION BoolParam::SetMatlabField{{{1*/ 135 135 #ifdef _SERIAL_ 136 136 void BoolParam::SetMatlabField(mxArray* dataref){ -
issm/trunk/src/c/objects/Params/DoubleMatParam.cpp
r4526 r4546 152 152 153 153 /*DoubleMatParam virtual functions definitions: */ 154 /*FUNCTION DoubleMatParam::GetParameterValue (double** pdoublearray,int* pM,int* pN){{{1*/154 /*FUNCTION DoubleMatParam::GetParameterValue{{{1*/ 155 155 void DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ 156 156 double* output=NULL; … … 168 168 } 169 169 /*}}}*/ 170 /*FUNCTION DoubleMatParam::GetParameterName (void);{{{1*/170 /*FUNCTION DoubleMatParam::GetParameterName{{{1*/ 171 171 char* DoubleMatParam::GetParameterName(void){ 172 172 return EnumAsString(this->enum_type); 173 173 } 174 174 /*}}}*/ 175 /*FUNCTION DoubleMatParam::SetMatlabField (mxArray* dataref);{{{1*/175 /*FUNCTION DoubleMatParam::SetMatlabField{{{1*/ 176 176 #ifdef _SERIAL_ 177 177 void DoubleMatParam::SetMatlabField(mxArray* dataref){ … … 197 197 #endif 198 198 /*}}}*/ 199 /*FUNCTION DoubleMatParam::SetValue (double* doublearray,int M,int N);{{{1*/199 /*FUNCTION DoubleMatParam::SetValue{{{1*/ 200 200 void DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){ 201 201 -
issm/trunk/src/c/objects/Params/DoubleParam.cpp
r4528 r4546 124 124 125 125 /*DoubleParam virtual functions definitions: */ 126 /*FUNCTION DoubleParam::GetParameterName (void);{{{1*/126 /*FUNCTION DoubleParam::GetParameterName{{{1*/ 127 127 char* DoubleParam::GetParameterName(void){ 128 128 return EnumAsString(this->enum_type); 129 129 } 130 130 /*}}}*/ 131 /*FUNCTION DoubleParam::GetParameterValue (int* pinteger){{{1*/131 /*FUNCTION DoubleParam::GetParameterValue{{{1*/ 132 132 void DoubleParam::GetParameterValue(int* pinteger){ 133 133 #ifdef _SERIAL_ … … 138 138 } 139 139 /*}}}*/ 140 /*FUNCTION DoubleParam::GetParameterValue (bool* pbool){{{1*/140 /*FUNCTION DoubleParam::GetParameterValue{{{1*/ 141 141 void DoubleParam::GetParameterValue(bool* pbool){ 142 142 #ifdef _SERIAL_ … … 151 151 } 152 152 /*}}}*/ 153 /*FUNCTION DoubleParam::SetMatlabField (mxArray* dataref);{{{1*/153 /*FUNCTION DoubleParam::SetMatlabField{{{1*/ 154 154 #ifdef _SERIAL_ 155 155 void DoubleParam::SetMatlabField(mxArray* dataref){ -
issm/trunk/src/c/objects/Params/DoubleVecParam.cpp
r4352 r4546 146 146 147 147 /*DoubleVecParam virtual functions definitions: */ 148 /*FUNCTION DoubleVecParam::GetParameterValue (double** pdoublearray,int* pM){{{1*/148 /*FUNCTION DoubleVecParam::GetParameterValue{{{1*/ 149 149 void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){ 150 150 double* output=NULL; … … 160 160 } 161 161 /*}}}*/ 162 /*FUNCTION DoubleVecParam::GetParameterName (void);{{{1*/162 /*FUNCTION DoubleVecParam::GetParameterName{{{1*/ 163 163 char* DoubleVecParam::GetParameterName(void){ 164 164 return EnumAsString(this->enum_type); 165 165 } 166 166 /*}}}*/ 167 /*FUNCTION DoubleVecParam::SetMatlabField (mxArray* dataref);{{{1*/167 /*FUNCTION DoubleVecParam::SetMatlabField{{{1*/ 168 168 #ifdef _SERIAL_ 169 169 void DoubleVecParam::SetMatlabField(mxArray* dataref){ … … 186 186 #endif 187 187 /*}}}*/ 188 /*FUNCTION DoubleVecParam::SetValue (double* doublearray,int M);{{{1*/188 /*FUNCTION DoubleVecParam::SetValue{{{1*/ 189 189 void DoubleVecParam::SetValue(double* doublearray,int in_M){ 190 190 -
issm/trunk/src/c/objects/Params/IntParam.cpp
r4248 r4546 127 127 128 128 /*IntParam virtual functions definitions: */ 129 /*FUNCTION IntParam::GetParameterName (void);{{{1*/129 /*FUNCTION IntParam::GetParameterName{{{1*/ 130 130 char* IntParam::GetParameterName(void){ 131 131 return EnumAsString(this->enum_type); 132 132 } 133 133 /*}}}*/ 134 /*FUNCTION IntParam::SetMatlabField (mxArray* dataref);{{{1*/134 /*FUNCTION IntParam::SetMatlabField{{{1*/ 135 135 #ifdef _SERIAL_ 136 136 void IntParam::SetMatlabField(mxArray* dataref){ -
issm/trunk/src/c/objects/Params/PetscMatParam.cpp
r4248 r4546 188 188 189 189 /*PetscMatParam virtual functions definitions: */ 190 /*FUNCTION PetscMatParam::GetParameterValue (Mat* pvalue){{{1*/190 /*FUNCTION PetscMatParam::GetParameterValue{{{1*/ 191 191 void PetscMatParam::GetParameterValue(Mat* poutput){ 192 192 Mat output=NULL; … … 198 198 } 199 199 /*}}}*/ 200 /*FUNCTION PetscMatParam::GetParameterName (void);{{{1*/200 /*FUNCTION PetscMatParam::GetParameterName{{{1*/ 201 201 char* PetscMatParam::GetParameterName(void){ 202 202 return EnumAsString(this->enum_type); 203 203 } 204 204 /*}}}*/ 205 /*FUNCTION PetscMatParam::SetMatlabField (mxArray* dataref);{{{1*/205 /*FUNCTION PetscMatParam::SetMatlabField{{{1*/ 206 206 #ifdef _SERIAL_ 207 207 void PetscMatParam::SetMatlabField(mxArray* dataref){ … … 224 224 #endif 225 225 /*}}}*/ 226 /*FUNCTION PetscMatParam::SetValue (Mat matrix){{{1*/226 /*FUNCTION PetscMatParam::SetValue{{{1*/ 227 227 void PetscMatParam::SetValue(Mat matrix){ 228 228 -
issm/trunk/src/c/objects/Params/PetscVecParam.cpp
r4248 r4546 180 180 181 181 /*PetscVecParam virtual functions definitions: */ 182 /*FUNCTION PetscVecParam::GetParameterValue (Vec* pvalue){{{1*/182 /*FUNCTION PetscVecParam::GetParameterValue{{{1*/ 183 183 void PetscVecParam::GetParameterValue(Vec* poutput){ 184 184 Vec output=NULL; … … 191 191 } 192 192 /*}}}*/ 193 /*FUNCTION PetscVecParam::GetParameterName (void);{{{1*/193 /*FUNCTION PetscVecParam::GetParameterName{{{1*/ 194 194 char* PetscVecParam::GetParameterName(void){ 195 195 return EnumAsString(this->enum_type); 196 196 } 197 197 /*}}}*/ 198 /*FUNCTION PetscVecParam::SetMatlabField (mxArray* dataref);{{{1*/198 /*FUNCTION PetscVecParam::SetMatlabField{{{1*/ 199 199 #ifdef _SERIAL_ 200 200 void PetscVecParam::SetMatlabField(mxArray* dataref){ … … 218 218 #endif 219 219 /*}}}*/ 220 /*FUNCTION PetscVecParam::SetValue (Vec vector){{{1*/220 /*FUNCTION PetscVecParam::SetValue{{{1*/ 221 221 void PetscVecParam::SetValue(Vec vector){ 222 222 -
issm/trunk/src/c/objects/Params/StringArrayParam.cpp
r4248 r4546 192 192 193 193 /*StringArrayParam virtual functions definitions: */ 194 /*FUNCTION StringArrayParam::GetParameterValue (char*** pstringarray, int* pnumstrings){{{1*/194 /*FUNCTION StringArrayParam::GetParameterValue{{{1*/ 195 195 void StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){ 196 196 … … 220 220 } 221 221 /*}}}*/ 222 /*FUNCTION StringArrayParam::GetParameterName (void);{{{1*/222 /*FUNCTION StringArrayParam::GetParameterName{{{1*/ 223 223 char* StringArrayParam::GetParameterName(void){ 224 224 return EnumAsString(this->enum_type); 225 225 } 226 226 /*}}}*/ 227 /*FUNCTION StringArrayParam::SetMatlabField (mxArray* dataref);{{{1*/227 /*FUNCTION StringArrayParam::SetMatlabField{{{1*/ 228 228 #ifdef _SERIAL_ 229 229 void StringArrayParam::SetMatlabField(mxArray* dataref){ … … 247 247 #endif 248 248 /*}}}*/ 249 /*FUNCTION StringArrayParam::SetValue (char** stringarray, int M){{{1*/249 /*FUNCTION StringArrayParam::SetValue{{{1*/ 250 250 void StringArrayParam::SetValue(char** stringarray,int M){ 251 251 -
issm/trunk/src/c/objects/Params/StringParam.cpp
r4248 r4546 142 142 143 143 /*StringParam virtual functions definitions: */ 144 /*FUNCTION StringParam::GetParameterValue (char** pstring){{{1*/144 /*FUNCTION StringParam::GetParameterValue{{{1*/ 145 145 void StringParam::GetParameterValue(char** pstring){ 146 146 … … 157 157 } 158 158 /*}}}*/ 159 /*FUNCTION StringParam::GetParameterName (void);{{{1*/159 /*FUNCTION StringParam::GetParameterName{{{1*/ 160 160 char* StringParam::GetParameterName(void){ 161 161 return EnumAsString(this->enum_type); 162 162 } 163 163 /*}}}*/ 164 /*FUNCTION StringParam::SetMatlabField (mxArray* dataref);{{{1*/164 /*FUNCTION StringParam::SetMatlabField{{{1*/ 165 165 #ifdef _SERIAL_ 166 166 void StringParam::SetMatlabField(mxArray* dataref){ … … 173 173 #endif 174 174 /*}}}*/ 175 /*FUNCTION StringParam::SetValue (char* string){{{1*/175 /*FUNCTION StringParam::SetValue{{{1*/ 176 176 void StringParam::SetValue(char* string){ 177 177 -
issm/trunk/src/c/objects/Patch.cpp
r4508 r4546 112 112 void Patch::MPI_Gather(void){ 113 113 114 115 114 int i; 116 115 int count; … … 154 153 } 155 154 156 157 155 /*Now, node 0 has total_values, of size total_numrows*this->numcols. Update the fields in the patch, to reflect this new 158 156 * reality. For other cpus, no point in keeping their data anymore: */ … … 166 164 xfree((void**)&this->values); 167 165 } 168 169 } 170 /*}}}*/ 166 }/*}}}*/ -
issm/trunk/src/c/objects/Vertex.cpp
r4492 r4546 26 26 Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){ 27 27 this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma); 28 } 29 /*}}}*/ 30 /*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/ 31 Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){ 32 33 this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i])); 34 35 } 36 /*}}}*/ 37 /*FUNCTION Vertex::~Vertex() {{{1*/ 38 Vertex::~Vertex(){ 39 return; 28 40 } 29 41 /*}}}*/ … … 43 55 } 44 56 /*}}}*/ 45 /*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/46 Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){47 48 this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i]));49 50 }51 /*}}}*/52 /*FUNCTION Vertex::~Vertex() {{{1*/53 Vertex::~Vertex(){54 return;55 }56 /*}}}*/57 57 58 58 /*Object virtual functions definitions:*/ 59 /*FUNCTION Echo{{{1*/59 /*FUNCTION Vertex::Echo{{{1*/ 60 60 void Vertex::Echo(void){ 61 61 … … 73 73 } 74 74 /*}}}*/ 75 /*FUNCTION DeepEcho{{{1*/75 /*FUNCTION Vertex::DeepEcho{{{1*/ 76 76 77 77 void Vertex::DeepEcho(void){ … … 79 79 } 80 80 /*}}}*/ 81 /*FUNCTION Id{{{1*/81 /*FUNCTION Vertex::Id{{{1*/ 82 82 int Vertex::Id(void){ return id; } 83 83 /*}}}*/ 84 /*FUNCTION MyRank {{{1*/84 /*FUNCTION Vertex::MyRank {{{1*/ 85 85 int Vertex::MyRank(void){ 86 86 extern int my_rank; … … 88 88 } 89 89 /*}}}*/ 90 /*FUNCTION Marshall {{{1*/90 /*FUNCTION Vertex::Marshall {{{1*/ 91 91 void Vertex::Marshall(char** pmarshalled_dataset){ 92 92 … … 117 117 } 118 118 /*}}}*/ 119 /*FUNCTION MarshallSize {{{1*/119 /*FUNCTION Vertex::MarshallSize {{{1*/ 120 120 int Vertex::MarshallSize(){ 121 121 … … 131 131 } 132 132 /*}}}*/ 133 /*FUNCTION Demarshall {{{1*/133 /*FUNCTION Vertex::Demarshall {{{1*/ 134 134 void Vertex::Demarshall(char** pmarshalled_dataset){ 135 135 … … 157 157 } 158 158 /*}}}*/ 159 /*FUNCTION Enum {{{1*/159 /*FUNCTION Vertex::Enum {{{1*/ 160 160 int Vertex::Enum(void){ 161 161 … … 164 164 } 165 165 /*}}}*/ 166 /*FUNCTION copy {{{1*/166 /*FUNCTION Vertex::copy {{{1*/ 167 167 Object* Vertex::copy() { 168 168 … … 173 173 174 174 /* DofObject routines: */ 175 /*FUNCTION Vertex 175 /*FUNCTION Vertex::DistributeDofs{{{1*/ 176 176 void Vertex::DistributeDofs(int* pdofcount){ 177 177 … … 196 196 } 197 197 /*}}}*/ 198 /*FUNCTION Vertex 198 /*FUNCTION Vertex::OffsetDofs{{{1*/ 199 199 void Vertex::OffsetDofs(int dofcount){ 200 200 … … 211 211 } 212 212 /*}}}*/ 213 /*FUNCTION Vertex 213 /*FUNCTION Vertex::ShowTrueDofs{{{1*/ 214 214 void Vertex::ShowTrueDofs(int* truedofs){ 215 215 … … 225 225 } 226 226 /*}}}*/ 227 /*FUNCTION Vertex 227 /*FUNCTION Vertex::UpdateCloneDofs{{{1*/ 228 228 void Vertex::UpdateCloneDofs(int* alltruedofs){ 229 229 … … 239 239 } 240 240 /*}}}*/ 241 /*FUNCTION Vertex 241 /*FUNCTION Vertex::SetClone {{{1*/ 242 242 void Vertex::SetClone(int* minranks){ 243 243 … … 255 255 } 256 256 /*}}}*/ 257 /*FUNCTION Vertex 257 /*FUNCTION Vertex::CreatePartition{{{1*/ 258 258 void Vertex::CreatePartition(Vec partition){ 259 259 … … 270 270 271 271 /*Vertex management: */ 272 /*FUNCTION Sid{{{1*/272 /*FUNCTION Vertex::Sid{{{1*/ 273 273 int Vertex::Sid(void){ return sid; } 274 274 /*}}}*/ 275 /*FUNCTION UpdateVertexPosition {{{1*/275 /*FUNCTION Vertex::UpdateVertexPosition {{{1*/ 276 276 void Vertex::UpdatePosition(double* thickness,double* bed){ 277 277 … … 281 281 } 282 282 /*}}}*/ 283
Note:
See TracChangeset
for help on using the changeset viewer.