Index: /issm/trunk/src/c/objects/Constraints/Rgb.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/Rgb.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Constraints/Rgb.cpp (revision 4546) @@ -2,5 +2,4 @@ * \brief: implementation of the Rgb object */ - #ifdef HAVE_CONFIG_H @@ -19,10 +18,10 @@ /*Rgb constructors and destructor*/ -/*FUNCTION Rgb::constructor {{{1*/ +/*FUNCTION Rgb::Rgb(){{{1*/ Rgb::Rgb(){ return; } /*}}}1*/ -/*FUNCTION Rgb::creation {{{1*/ +/*FUNCTION Rgb::Rgb(int rgb_id,int rgb_nodeid1,...){{{1*/ Rgb::Rgb(int rgb_id,int rgb_nodeid1,int rgb_nodeid2, int rgb_dof,int rgb_analysis_type){ @@ -36,5 +35,5 @@ } /*}}}1*/ -/*FUNCTION Rgb::destructor {{{1*/ +/*FUNCTION Rgb::~Rgb{{{1*/ Rgb::~Rgb(){ return; @@ -166,5 +165,5 @@ } /*}}}1*/ -/*FUNCTION Rgb::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Rgb::InAnalysis{{{1*/ bool Rgb::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -172,3 +171,2 @@ } /*}}}*/ - Index: /issm/trunk/src/c/objects/Constraints/Spc.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/Spc.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Constraints/Spc.cpp (revision 4546) @@ -2,5 +2,4 @@ * \brief: implementation of the Spc object */ - #ifdef HAVE_CONFIG_H @@ -18,12 +17,11 @@ #include "../objects.h" - /*Spc constructors and destructor*/ -/*FUNCTION Spc::constructor {{{1*/ +/*FUNCTION Spc::Spc(){{{1*/ Spc::Spc(){ return; } /*}}}1*/ -/*FUNCTION Spc::creation {{{1*/ +/*FUNCTION Spc::Spc(int spc_sid,int spc_nodeid,...){{{1*/ Spc::Spc(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){ @@ -37,5 +35,5 @@ } /*}}}1*/ -/*FUNCTION Spc::destructor {{{1*/ +/*FUNCTION Spc::~Spc{{{1*/ Spc::~Spc(){ return; @@ -166,5 +164,5 @@ } /*}}}1*/ -/*FUNCTION Spc::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Spc::InAnalysis{{{1*/ bool Spc::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; Index: /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp (revision 4546) @@ -136,5 +136,4 @@ /*}}}*/ - /*ElementResult management*/ /*FUNCTION BeamVertexElementResult::EnumType{{{1*/ @@ -145,5 +144,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/ +/*FUNCTION BeamVertexElementResult::ProcessUnits{{{1*/ void BeamVertexElementResult::ProcessUnits(Parameters* parameters){ @@ -152,10 +151,10 @@ } /*}}}*/ -/*FUNCTION BeamVertexElementResult::NumberOfNodalValues(void){{{1*/ +/*FUNCTION BeamVertexElementResult::NumberOfNodalValues{{{1*/ int BeamVertexElementResult::NumberOfNodalValues(void){ return 2; } /*}}}*/ -/*FUNCTION BeamVertexElementResult::BeamVertexElementResult::PatchFill(int row, Patch* patch){{{1*/ +/*FUNCTION BeamVertexElementResult::PatchFill{{{1*/ void BeamVertexElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 4546) @@ -194,5 +194,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::ProcessUnits(Parameters* parameters){{{1*/ +/*FUNCTION DoubleElementResult::ProcessUnits{{{1*/ void DoubleElementResult::ProcessUnits(Parameters* parameters){ @@ -201,10 +201,10 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::NumberOfNodalValues(void){{{1*/ +/*FUNCTION DoubleElementResult::NumberOfNodalValues{{{1*/ int DoubleElementResult::NumberOfNodalValues(void){ return 1; } /*}}}*/ -/*FUNCTION DoubleElementResult::DoubleElementResult::PatchFill(int row, Patch* patch){{{1*/ +/*FUNCTION DoubleElementResult::PatchFill{{{1*/ void DoubleElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 4546) @@ -137,5 +137,4 @@ /*}}}*/ - /*ElementResult management*/ /*FUNCTION PentaVertexElementResult::EnumType{{{1*/ @@ -211,5 +210,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/ +/*FUNCTION PentaVertexElementResult::ProcessUnits{{{1*/ void PentaVertexElementResult::ProcessUnits(Parameters* parameters){ @@ -218,10 +217,10 @@ } /*}}}*/ -/*FUNCTION PentaVertexElementResult::NumberOfNodalValues(void){{{1*/ +/*FUNCTION PentaVertexElementResult::NumberOfNodalValues{{{1*/ int PentaVertexElementResult::NumberOfNodalValues(void){ return 6; } /*}}}*/ -/*FUNCTION PentaVertexElementResult::PentaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/ +/*FUNCTION PentaVertexElementResult::PatchFill{{{1*/ void PentaVertexElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp (revision 4546) @@ -136,5 +136,5 @@ /*ElementResult virtual functions definitions*/ -/*FUNCTION SingVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/ +/*FUNCTION SingVertexElementResult::ProcessUnits{{{1*/ void SingVertexElementResult::ProcessUnits(Parameters* parameters){ @@ -143,10 +143,10 @@ } /*}}}*/ -/*FUNCTION SingVertexElementResult::NumberOfNodalValues(void){{{1*/ +/*FUNCTION SingVertexElementResult::NumberOfNodalValues{{{1*/ int SingVertexElementResult::NumberOfNodalValues(void){ return 1; } /*}}}*/ -/*FUNCTION SingVertexElementResult::SingVertexElementResult::PatchFill(int row, Patch* patch){{{1*/ +/*FUNCTION SingVertexElementResult::PatchFill{{{1*/ void SingVertexElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 4546) @@ -137,5 +137,4 @@ /*}}}*/ - /*ElementResult management*/ /*FUNCTION TriaVertexElementResult::EnumType{{{1*/ @@ -200,5 +199,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/ +/*FUNCTION TriaVertexElementResult::ProcessUnits{{{1*/ void TriaVertexElementResult::ProcessUnits(Parameters* parameters){ @@ -207,10 +206,10 @@ } /*}}}*/ -/*FUNCTION TriaVertexElementResult::NumberOfNodalValues(void){{{1*/ +/*FUNCTION TriaVertexElementResult::NumberOfNodalValues{{{1*/ int TriaVertexElementResult::NumberOfNodalValues(void){ return 3; } /*}}}*/ -/*FUNCTION TriaVertexElementResult::TriaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/ +/*FUNCTION TriaVertexElementResult::PatchFill{{{1*/ void TriaVertexElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk/src/c/objects/Elements/Beam.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/Beam.cpp (revision 4546) @@ -319,5 +319,5 @@ } /*}}}*/ -/*FUNCTION Beam::GetSolutionFromInputs(Vec solution);{{{1*/ +/*FUNCTION Beam::GetSolutionFromInputs{{{1*/ void Beam::GetSolutionFromInputs(Vec solution){ ISSMERROR(" not supported yet!"); @@ -329,5 +329,5 @@ } /*}}}*/ -/*FUNCTION Beam::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/ +/*FUNCTION Beam::GetVectorFromInputs{{{1*/ void Beam::GetVectorFromInputs(Vec vector,int NameEnum){ @@ -363,5 +363,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/ +/*FUNCTION Beam::InputAXPY{{{1*/ void Beam::InputAXPY(int YEnum, double scalar, int XEnum){ @@ -381,5 +381,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ +/*FUNCTION Beam::InputControlConstrain{{{1*/ void Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){ @@ -397,5 +397,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/ +/*FUNCTION Beam::InputConvergence{{{1*/ void Beam::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -426,5 +426,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputDuplicate(int original_enum,int new_enum){{{1*/ +/*FUNCTION Beam::InputDuplicate{{{1*/ void Beam::InputDuplicate(int original_enum,int new_enum){ @@ -443,5 +443,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputScale(int enum_type,double scale_factor){{{1*/ +/*FUNCTION Beam::InputScale{{{1*/ void Beam::InputScale(int enum_type,double scale_factor){ @@ -455,5 +455,5 @@ } /*}}}*/ -/*FUNCTION Beam::InputToResult(int enum_type,int step,double time){{{1*/ +/*FUNCTION Beam::InputToResult{{{1*/ void Beam::InputToResult(int enum_type,int step,double time){ ISSMERROR(" not supported yet!"); @@ -465,5 +465,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxAbsVx{{{1*/ void Beam::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -491,5 +491,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxAbsVy{{{1*/ void Beam::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -517,5 +517,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxAbsVz{{{1*/ void Beam::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -543,5 +543,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxVel(double* pmaxvel, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxVel{{{1*/ void Beam::MaxVel(double* pmaxvel, bool process_units){ @@ -570,5 +570,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxVx(double* pmaxvx, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxVx{{{1*/ void Beam::MaxVx(double* pmaxvx, bool process_units){ @@ -597,5 +597,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxVy(double* pmaxvy, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxVy{{{1*/ void Beam::MaxVy(double* pmaxvy, bool process_units){ @@ -624,5 +624,5 @@ } /*}}}*/ -/*FUNCTION Beam::MaxVz(double* pmaxvz, bool process_units);{{{1*/ +/*FUNCTION Beam::MaxVz{{{1*/ void Beam::MaxVz(double* pmaxvz, bool process_units){ @@ -651,5 +651,5 @@ } /*}}}*/ -/*FUNCTION Beam::MinVel(double* pminvel, bool process_units);{{{1*/ +/*FUNCTION Beam::MinVel{{{1*/ void Beam::MinVel(double* pminvel, bool process_units){ @@ -678,5 +678,5 @@ } /*}}}*/ -/*FUNCTION Beam::MinVx(double* pminvx, bool process_units);{{{1*/ +/*FUNCTION Beam::MinVx{{{1*/ void Beam::MinVx(double* pminvx, bool process_units){ @@ -705,5 +705,5 @@ } /*}}}*/ -/*FUNCTION Beam::MinVy(double* pminvy, bool process_units);{{{1*/ +/*FUNCTION Beam::MinVy{{{1*/ void Beam::MinVy(double* pminvy, bool process_units){ @@ -732,5 +732,5 @@ } /*}}}*/ -/*FUNCTION Beam::MinVz(double* pminvz, bool process_units);{{{1*/ +/*FUNCTION Beam::MinVz{{{1*/ void Beam::MinVz(double* pminvz, bool process_units){ @@ -764,5 +764,5 @@ } /*}}}*/ -/*FUNCTION Beam::PatchFill(int* pcount, Patch* patch){{{1*/ +/*FUNCTION Beam::PatchFill{{{1*/ void Beam::PatchFill(int* pcount, Patch* patch){ @@ -770,5 +770,5 @@ } /*}}}*/ -/*FUNCTION Beam::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/ +/*FUNCTION Beam::PatchSize{{{1*/ void Beam::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -777,5 +777,5 @@ } /*}}}*/ -/*FUNCTION Beam::ProcessResultsUnits(void){{{1*/ +/*FUNCTION Beam::ProcessResultsUnits{{{1*/ void Beam::ProcessResultsUnits(void){ ISSMERROR(" not supported yet!"); @@ -787,5 +787,5 @@ } /*}}}*/ -/*FUNCTION Beam::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/ +/*FUNCTION Beam::Update{{{1*/ void Beam::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ ISSMERROR(" not supported yet!"); Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 4546) @@ -898,5 +898,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputs(Vec solution){{{1*/ +/*FUNCTION Penta::GetSolutionFromInputs{{{1*/ void Penta::GetSolutionFromInputs(Vec solution){ @@ -930,5 +930,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/ +/*FUNCTION Penta::GetVectorFromInputs{{{1*/ void Penta::GetVectorFromInputs(Vec vector,int NameEnum){ @@ -1020,5 +1020,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/ +/*FUNCTION Penta::InputAXPY{{{1*/ void Penta::InputAXPY(int YEnum, double scalar, int XEnum){ @@ -1038,5 +1038,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ +/*FUNCTION Penta::InputControlConstrain{{{1*/ void Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){ @@ -1054,5 +1054,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/ +/*FUNCTION Penta::InputConvergence{{{1*/ void Penta::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -1166,5 +1166,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputDuplicate(int original_enum,int new_enum){{{1*/ +/*FUNCTION Penta::InputDuplicate{{{1*/ void Penta::InputDuplicate(int original_enum,int new_enum){ @@ -1184,5 +1184,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputScale(int enum_type,double scale_factor){{{1*/ +/*FUNCTION Penta::InputScale{{{1*/ void Penta::InputScale(int enum_type,double scale_factor){ @@ -1197,5 +1197,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputToResult(int enum_type,int step,double time){{{1*/ +/*FUNCTION Penta::InputToResult{{{1*/ void Penta::InputToResult(int enum_type,int step,double time){ @@ -1224,5 +1224,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxAbsVx{{{1*/ void Penta::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -1250,5 +1250,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxAbsVy{{{1*/ void Penta::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -1276,5 +1276,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxAbsVz{{{1*/ void Penta::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -1302,5 +1302,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVel(double* pmaxvel, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxVel{{{1*/ void Penta::MaxVel(double* pmaxvel, bool process_units){ @@ -1329,5 +1329,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVx(double* pmaxvx, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxVx{{{1*/ void Penta::MaxVx(double* pmaxvx, bool process_units){ @@ -1356,5 +1356,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVy(double* pmaxvy, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxVy{{{1*/ void Penta::MaxVy(double* pmaxvy, bool process_units){ @@ -1383,5 +1383,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVz(double* pmaxvz, bool process_units);{{{1*/ +/*FUNCTION Penta::MaxVz{{{1*/ void Penta::MaxVz(double* pmaxvz, bool process_units){ @@ -1410,5 +1410,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVel(double* pminvel, bool process_units);{{{1*/ +/*FUNCTION Penta::MinVel{{{1*/ void Penta::MinVel(double* pminvel, bool process_units){ @@ -1437,5 +1437,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVx(double* pminvx, bool process_units);{{{1*/ +/*FUNCTION Penta::MinVx{{{1*/ void Penta::MinVx(double* pminvx, bool process_units){ @@ -1464,5 +1464,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVy(double* pminvy, bool process_units);{{{1*/ +/*FUNCTION Penta::MinVy{{{1*/ void Penta::MinVy(double* pminvy, bool process_units){ @@ -1491,5 +1491,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVz(double* pminvz, bool process_units);{{{1*/ +/*FUNCTION Penta::MinVz{{{1*/ void Penta::MinVz(double* pminvz, bool process_units){ @@ -1563,5 +1563,5 @@ } /*}}}*/ -/*FUNCTION Penta::PatchFill(int* pcount, Patch* patch){{{1*/ +/*FUNCTION Penta::PatchFill{{{1*/ void Penta::PatchFill(int* pcount, Patch* patch){ @@ -1591,6 +1591,6 @@ /*Assign output pointers:*/ *pcount=count; -} -/*FUNCTION Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/ +}/*}}}*/ +/*FUNCTION Penta::PatchSize{{{1*/ void Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -1619,5 +1619,5 @@ } /*}}}*/ -/*FUNCTION Penta::ProcessResultsUnits(void){{{1*/ +/*FUNCTION Penta::ProcessResultsUnits{{{1*/ void Penta::ProcessResultsUnits(void){ @@ -2619,5 +2619,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/ void Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ @@ -2655,5 +2655,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert(Vec solution){{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{1*/ void Penta::GetSolutionFromInputsDiagnosticVert(Vec solution){ @@ -2687,5 +2687,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes(Vec solution){{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{1*/ void Penta::GetSolutionFromInputsDiagnosticStokes(Vec solution){ Index: /issm/trunk/src/c/objects/Elements/PentaHook.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/PentaHook.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/PentaHook.cpp (revision 4546) @@ -60,5 +60,6 @@ } /*}}}*/ -/*FUNCTION PentaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/ + +/*FUNCTION PentaHook::SetHookNodes{{{1*/ void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){ this->hnodes[analysis_counter]= new Hook(node_ids,6); @@ -66,5 +67,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::InitHookNeighbors(int* element_ids){{{1*/ +/*FUNCTION PentaHook::InitHookNeighbors{{{1*/ void PentaHook::InitHookNeighbors(int* element_ids){ this->hneighbors=new Hook(element_ids,2); @@ -72,5 +73,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices);{{{1*/ +/*FUNCTION PentaHook::SpawnTriaHook{{{1*/ void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){ Index: /issm/trunk/src/c/objects/Elements/Sing.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/Sing.cpp (revision 4546) @@ -288,5 +288,5 @@ } /*}}}*/ -/*FUNCTION Sing::GetSolutionFromInputs(Vec solution);{{{1*/ +/*FUNCTION Sing::GetSolutionFromInputs{{{1*/ void Sing::GetSolutionFromInputs(Vec solution){ ISSMERROR(" not supported yet!"); @@ -298,5 +298,5 @@ } /*}}}*/ -/*FUNCTION Sing::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/ +/*FUNCTION Sing::GetVectorFromInputs{{{1*/ void Sing::GetVectorFromInputs(Vec vector,int NameEnum){ @@ -332,5 +332,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/ +/*FUNCTION Sing::InputAXPY{{{1*/ void Sing::InputAXPY(int YEnum, double scalar, int XEnum){ @@ -350,5 +350,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ +/*FUNCTION Sing::InputControlConstrain{{{1*/ void Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){ @@ -366,5 +366,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/ +/*FUNCTION Sing::InputConvergence{{{1*/ void Sing::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -395,5 +395,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputDuplicate(int original_enum,int new_enum){{{1*/ +/*FUNCTION Sing::InputDuplicate{{{1*/ void Sing::InputDuplicate(int original_enum,int new_enum){ @@ -412,5 +412,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputScale(int enum_type,double scale_factor){{{1*/ +/*FUNCTION Sing::InputScale{{{1*/ void Sing::InputScale(int enum_type,double scale_factor){ @@ -424,5 +424,5 @@ } /*}}}*/ -/*FUNCTION Sing::InputToResult(int enum_type,int step,double time){{{1*/ +/*FUNCTION Sing::InputToResult{{{1*/ void Sing::InputToResult(int enum_type,int step,double time){ ISSMERROR(" not supported yet!"); @@ -434,5 +434,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxAbsVx{{{1*/ void Sing::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -451,5 +451,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxAbsVy{{{1*/ void Sing::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -468,5 +468,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxAbsVz{{{1*/ void Sing::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -485,5 +485,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxVel(double* pmaxvel, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxVel{{{1*/ void Sing::MaxVel(double* pmaxvel, bool process_units){ @@ -502,5 +502,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxVx(double* pmaxvx, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxVx{{{1*/ void Sing::MaxVx(double* pmaxvx, bool process_units){ @@ -519,5 +519,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxVy(double* pmaxvy, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxVy{{{1*/ void Sing::MaxVy(double* pmaxvy, bool process_units){ @@ -536,5 +536,5 @@ } /*}}}*/ -/*FUNCTION Sing::MaxVz(double* pmaxvz, bool process_units);{{{1*/ +/*FUNCTION Sing::MaxVz{{{1*/ void Sing::MaxVz(double* pmaxvz, bool process_units){ @@ -553,5 +553,5 @@ } /*}}}*/ -/*FUNCTION Sing::MinVel(double* pminvel, bool process_units);{{{1*/ +/*FUNCTION Sing::MinVel{{{1*/ void Sing::MinVel(double* pminvel, bool process_units){ @@ -570,5 +570,5 @@ } /*}}}*/ -/*FUNCTION Sing::MinVx(double* pminvx, bool process_units);{{{1*/ +/*FUNCTION Sing::MinVx{{{1*/ void Sing::MinVx(double* pminvx, bool process_units){ @@ -587,5 +587,5 @@ } /*}}}*/ -/*FUNCTION Sing::MinVy(double* pminvy, bool process_units);{{{1*/ +/*FUNCTION Sing::MinVy{{{1*/ void Sing::MinVy(double* pminvy, bool process_units){ @@ -604,5 +604,5 @@ } /*}}}*/ -/*FUNCTION Sing::MinVz(double* pminvz, bool process_units);{{{1*/ +/*FUNCTION Sing::MinVz{{{1*/ void Sing::MinVz(double* pminvz, bool process_units){ @@ -626,5 +626,5 @@ } /*}}}*/ -/*FUNCTION Sing::PatchFill(int* pcount, Patch* patch){{{1*/ +/*FUNCTION Sing::PatchFill{{{1*/ void Sing::PatchFill(int* pcount, Patch* patch){ @@ -632,5 +632,5 @@ } /*}}}*/ -/*FUNCTION Sing::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/ +/*FUNCTION Sing::PatchSize{{{1*/ void Sing::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -639,5 +639,5 @@ } /*}}}*/ -/*FUNCTION Sing::ProcessResultsUnits(void){{{1*/ +/*FUNCTION Sing::ProcessResultsUnits{{{1*/ void Sing::ProcessResultsUnits(void){ ISSMERROR(" not supported yet!"); @@ -649,5 +649,5 @@ } /*}}}*/ -/*FUNCTION Sing::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/ +/*FUNCTION Sing::Update{{{1*/ void Sing::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ ISSMERROR(" not supported yet!"); Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 4546) @@ -1005,5 +1005,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputs(Vec solution){{{1*/ +/*FUNCTION Tria::GetSolutionFromInputs{{{1*/ void Tria::GetSolutionFromInputs(Vec solution){ @@ -1032,5 +1032,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/ +/*FUNCTION Tria::GetVectorFromInputs{{{1*/ void Tria::GetVectorFromInputs(Vec vector,int NameEnum){ @@ -1379,5 +1379,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/ +/*FUNCTION Tria::InputAXPY{{{1*/ void Tria::InputAXPY(int YEnum, double scalar, int XEnum){ @@ -1396,5 +1396,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/ +/*FUNCTION Tria::InputControlConstrain{{{1*/ void Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){ @@ -1412,5 +1412,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/ +/*FUNCTION Tria::InputConvergence{{{1*/ void Tria::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -1461,5 +1461,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputDuplicate(int original_enum,int new_enum){{{1*/ +/*FUNCTION Tria::InputDuplicate{{{1*/ void Tria::InputDuplicate(int original_enum,int new_enum){ @@ -1479,5 +1479,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputScale(int enum_type,double scale_factor){{{1*/ +/*FUNCTION Tria::InputScale{{{1*/ void Tria::InputScale(int enum_type,double scale_factor){ @@ -1492,5 +1492,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputToResult(int enum_type,int step,double time){{{1*/ +/*FUNCTION Tria::InputToResult{{{1*/ void Tria::InputToResult(int enum_type,int step,double time){ @@ -1574,5 +1574,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxAbsVx{{{1*/ void Tria::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -1600,5 +1600,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxAbsVy{{{1*/ void Tria::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -1626,5 +1626,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxAbsVz{{{1*/ void Tria::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -1652,5 +1652,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVel(double* pmaxvel, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxVel{{{1*/ void Tria::MaxVel(double* pmaxvel, bool process_units){ @@ -1679,5 +1679,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVx(double* pmaxvx, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxVx{{{1*/ void Tria::MaxVx(double* pmaxvx, bool process_units){ @@ -1706,5 +1706,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVy(double* pmaxvy, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxVy{{{1*/ void Tria::MaxVy(double* pmaxvy, bool process_units){ @@ -1733,5 +1733,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVz(double* pmaxvz, bool process_units);{{{1*/ +/*FUNCTION Tria::MaxVz{{{1*/ void Tria::MaxVz(double* pmaxvz, bool process_units){ @@ -1760,5 +1760,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVel(double* pminvel, bool process_units);{{{1*/ +/*FUNCTION Tria::MinVel{{{1*/ void Tria::MinVel(double* pminvel, bool process_units){ @@ -1787,5 +1787,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVx(double* pminvx, bool process_units);{{{1*/ +/*FUNCTION Tria::MinVx{{{1*/ void Tria::MinVx(double* pminvx, bool process_units){ @@ -1814,5 +1814,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVy(double* pminvy, bool process_units);{{{1*/ +/*FUNCTION Tria::MinVy{{{1*/ void Tria::MinVy(double* pminvy, bool process_units){ @@ -1841,5 +1841,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVz(double* pminvz, bool process_units);{{{1*/ +/*FUNCTION Tria::MinVz{{{1*/ void Tria::MinVz(double* pminvz, bool process_units){ @@ -2060,5 +2060,5 @@ } /*}}}*/ -/*FUNCTION Tria::PatchFill(int* prow, Patch* patch){{{1*/ +/*FUNCTION Tria::PatchFill{{{1*/ void Tria::PatchFill(int* prow, Patch* patch){ @@ -2090,5 +2090,5 @@ } /*}}}*/ -/*FUNCTION Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/ +/*FUNCTION Tria::PatchSize{{{1*/ void Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -2117,5 +2117,5 @@ } /*}}}*/ -/*FUNCTION Tria::ProcessResultsUnits(void){{{1*/ +/*FUNCTION Tria::ProcessResultsUnits{{{1*/ void Tria::ProcessResultsUnits(void){ @@ -5225,5 +5225,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){{{1*/ +/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/ void Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){ @@ -5261,5 +5261,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){{{1*/ +/*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz{{{1*/ void Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){ Index: /issm/trunk/src/c/objects/Elements/TriaHook.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/TriaHook.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Elements/TriaHook.cpp (revision 4546) @@ -57,5 +57,6 @@ } /*}}}*/ -/*FUNCTION TriaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/ + +/*FUNCTION TriaHook::SetHookNodes{{{1*/ void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){ Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 4546) @@ -142,5 +142,5 @@ /*BoolExternalResult management: */ -/*FUNCTION BoolExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION BoolExternalResult::WriteData{{{1*/ void BoolExternalResult::WriteData(FILE* fid){ @@ -177,10 +177,10 @@ } /*}}}1*/ -/*FUNCTION BoolExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION BoolExternalResult::GetResultName{{{1*/ char* BoolExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION BoolExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION BoolExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void BoolExternalResult::SetMatlabField(mxArray* dataref){ @@ -195,5 +195,5 @@ #endif /*}}}*/ -/*FUNCTION BoolExternalResult::GetStep(void);{{{1*/ +/*FUNCTION BoolExternalResult::GetStep{{{1*/ int BoolExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 4546) @@ -142,5 +142,5 @@ /*DoubleExternalResult management: */ -/*FUNCTION DoubleExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION DoubleExternalResult::WriteData{{{1*/ void DoubleExternalResult::WriteData(FILE* fid){ @@ -173,10 +173,10 @@ } /*}}}1*/ -/*FUNCTION DoubleExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION DoubleExternalResult::GetResultName{{{1*/ char* DoubleExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleExternalResult::SetMatlabField(mxArray* dataref){ @@ -191,5 +191,5 @@ #endif /*}}}*/ -/*FUNCTION DoubleExternalResult::GetStep(void);{{{1*/ +/*FUNCTION DoubleExternalResult::GetStep{{{1*/ int DoubleExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 4546) @@ -179,5 +179,5 @@ /*DoubleMatExternalResult management: */ -/*FUNCTION DoubleMatExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION DoubleMatExternalResult::WriteData{{{1*/ void DoubleMatExternalResult::WriteData(FILE* fid){ @@ -212,10 +212,10 @@ } /*}}}1*/ -/*FUNCTION DoubleMatExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/ char* DoubleMatExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleMatExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleMatExternalResult::SetMatlabField(mxArray* dataref){ @@ -250,5 +250,5 @@ #endif /*}}}*/ -/*FUNCTION DoubleMatExternalResult::GetStep(void);{{{1*/ +/*FUNCTION DoubleMatExternalResult::GetStep{{{1*/ int DoubleMatExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 4546) @@ -167,5 +167,5 @@ /*DoubleVecExternalResult management: */ -/*FUNCTION DoubleVecExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION DoubleVecExternalResult::WriteData{{{1*/ void DoubleVecExternalResult::WriteData(FILE* fid){ @@ -198,10 +198,10 @@ } /*}}}1*/ -/*FUNCTION DoubleVecExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/ char* DoubleVecExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleVecExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){ @@ -232,5 +232,5 @@ #endif /*}}}*/ -/*FUNCTION DoubleVecExternalResult::GetStep(void);{{{1*/ +/*FUNCTION DoubleVecExternalResult::GetStep{{{1*/ int DoubleVecExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 4546) @@ -142,5 +142,5 @@ /*IntExternalResult management: */ -/*FUNCTION IntExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION IntExternalResult::WriteData{{{1*/ void IntExternalResult::WriteData(FILE* fid){ @@ -177,10 +177,10 @@ } /*}}}1*/ -/*FUNCTION IntExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION IntExternalResult::GetResultName{{{1*/ char* IntExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION IntExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION IntExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void IntExternalResult::SetMatlabField(mxArray* dataref){ @@ -196,5 +196,5 @@ #endif /*}}}*/ -/*FUNCTION IntExternalResult::GetStep(void);{{{1*/ +/*FUNCTION IntExternalResult::GetStep{{{1*/ int IntExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 4546) @@ -198,5 +198,5 @@ /*PetscVecExternalResult management: */ -/*FUNCTION PetscVecExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION PetscVecExternalResult::WriteData{{{1*/ void PetscVecExternalResult::WriteData(FILE* fid){ @@ -235,10 +235,10 @@ } /*}}}1*/ -/*FUNCTION PetscVecExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION PetscVecExternalResult::GetResultName{{{1*/ char* PetscVecExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION PetscVecExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION PetscVecExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void PetscVecExternalResult::SetMatlabField(mxArray* dataref){ @@ -265,5 +265,5 @@ #endif /*}}}*/ -/*FUNCTION PetscVecExternalResult::GetStep(void);{{{1*/ +/*FUNCTION PetscVecExternalResult::GetStep{{{1*/ int PetscVecExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 4545) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 4546) @@ -157,5 +157,5 @@ /*StringExternalResult management: */ -/*FUNCTION StringExternalResult::WriteData(FILE* fid) {{{1*/ +/*FUNCTION StringExternalResult::WriteData{{{1*/ void StringExternalResult::WriteData(FILE* fid){ @@ -188,10 +188,10 @@ } /*}}}1*/ -/*FUNCTION StringExternalResult::GetResultName(void); {{{1*/ +/*FUNCTION StringExternalResult::GetResultName{{{1*/ char* StringExternalResult::GetResultName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION StringExternalResult::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION StringExternalResult::SetMatlabField{{{1*/ #ifdef _SERIAL_ void StringExternalResult::SetMatlabField(mxArray* dataref){ @@ -208,5 +208,5 @@ #endif /*}}}*/ -/*FUNCTION StringExternalResult::GetStep(void);{{{1*/ +/*FUNCTION StringExternalResult::GetStep{{{1*/ int StringExternalResult::GetStep(void){ Index: /issm/trunk/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk/src/c/objects/Hook.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Hook.cpp (revision 4546) @@ -208,5 +208,5 @@ } /*}}}*/ -/*FUNCTION Hook::copy(void) {{{1*/ +/*FUNCTION Hook::copy {{{1*/ Object* Hook::copy(void){ Index: /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp (revision 4546) @@ -200,5 +200,5 @@ void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION BeamVertexInput::GetParameterValues{{{1*/ void BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ /*It is assumed that output has been correctly allocated*/ @@ -216,18 +216,18 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION BeamVertexInput::GetParameterDerivativeValue{{{1*/ void BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BeamVertexInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION BeamVertexInput::ChangeEnum{{{1*/ void BeamVertexInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION BeamVertexInput::GetParameterAverage(double* pvalue){{{1*/ +/*FUNCTION BeamVertexInput::GetParameterAverage{{{1*/ void BeamVertexInput::GetParameterAverage(double* pvalue){ *pvalue=1./2.*(values[0]+values[1]); } /*}}}*/ -/*FUNCTION BeamVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION BeamVertexInput::SquareMin{{{1*/ void BeamVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -252,5 +252,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::Scale(double scale_factor){{{1*/ +/*FUNCTION BeamVertexInput::Scale{{{1*/ void BeamVertexInput::Scale(double scale_factor){ @@ -261,5 +261,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::AXPY(Input* xinput,double scalar);{{{1*/ +/*FUNCTION BeamVertexInput::AXPY{{{1*/ void BeamVertexInput::AXPY(Input* xinput,double scalar){ @@ -284,5 +284,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION BeamVertexInput::Constrain{{{1*/ void BeamVertexInput::Constrain(double cm_min, double cm_max){ @@ -295,5 +295,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION BeamVertexInput::GetVectorFromInputs{{{1*/ void BeamVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -304,5 +304,5 @@ } /*}}}*/ -/*FUNCTION BeamVertexInput::GetValuesPtr(double* pvalues,int* pnum_values);{{{1*/ +/*FUNCTION BeamVertexInput::GetValuesPtr{{{1*/ void BeamVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 4546) @@ -208,16 +208,16 @@ void BoolInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION BoolInput::GetParameterValues{{{1*/ void BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION BoolInput::GetParameterDerivativeValue{{{1*/ void BoolInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION BoolInput::ChangeEnum{{{1*/ void BoolInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION BoolInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION BoolInput::SquareMin{{{1*/ void BoolInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ /*square of a bool is the bool itself: */ @@ -225,10 +225,10 @@ } /*}}}*/ -/*FUNCTION BoolInput::Scale(double scale_factor){{{1*/ +/*FUNCTION BoolInput::Scale{{{1*/ void BoolInput::Scale(double scale_factor){ /*a bool cannot be scaled: */ } /*}}}*/ -/*FUNCTION BoolInput::AXPY(Input* xinput,double scalar);{{{1*/ +/*FUNCTION BoolInput::AXPY{{{1*/ void BoolInput::AXPY(Input* xinput,double scalar){ @@ -251,5 +251,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION BoolInput::Constrain{{{1*/ void BoolInput::Constrain(double cm_min, double cm_max){ @@ -259,5 +259,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION BoolInput::GetVectorFromInputs{{{1*/ void BoolInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -266,5 +266,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION BoolInput::GetValuesPtr{{{1*/ void BoolInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 4546) @@ -221,16 +221,16 @@ void DoubleInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION DoubleInput::GetParameterValues{{{1*/ void DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION DoubleInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION DoubleInput::GetParameterDerivativeValue{{{1*/ void DoubleInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION DoubleInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION DoubleInput::ChangeEnum{{{1*/ void DoubleInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION DoubleInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION DoubleInput::SquareMin{{{1*/ void DoubleInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -239,10 +239,10 @@ } /*}}}*/ -/*FUNCTION DoubleInput::Scale(double scale_factor){{{1*/ +/*FUNCTION DoubleInput::Scale{{{1*/ void DoubleInput::Scale(double scale_factor){ value=value*scale_factor; } /*}}}*/ -/*FUNCTION DoubleInput::AXPY(Input* xinput,double scalar);{{{1*/ +/*FUNCTION DoubleInput::AXPY{{{1*/ void DoubleInput::AXPY(Input* xinput,double scalar){ @@ -265,5 +265,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION DoubleInput::Constrain{{{1*/ void DoubleInput::Constrain(double cm_min, double cm_max){ @@ -273,5 +273,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION DoubleInput::GetVectorFromInputs{{{1*/ void DoubleInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -280,5 +280,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION DoubleInput::GetValuesPtr{{{1*/ void DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 4546) @@ -207,16 +207,16 @@ void IntInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION IntInput::GetParameterValues{{{1*/ void IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION IntInput::GetParameterDerivativeValue{{{1*/ void IntInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION IntInput::ChangeEnum{{{1*/ void IntInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION IntInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION IntInput::SquareMin{{{1*/ void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -225,5 +225,5 @@ } /*}}}*/ -/*FUNCTION IntInput::Scale(double scale_factor){{{1*/ +/*FUNCTION IntInput::Scale{{{1*/ void IntInput::Scale(double scale_factor){ double dvalue=(double)value*scale_factor; @@ -231,5 +231,5 @@ } /*}}}*/ -/*FUNCTION IntInput::AXPY(Input* xinput,int scalar);{{{1*/ +/*FUNCTION IntInput::AXPY{{{1*/ void IntInput::AXPY(Input* xinput,double scalar){ @@ -254,5 +254,5 @@ } /*}}}*/ -/*FUNCTION IntInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION IntInput::Constrain{{{1*/ void IntInput::Constrain(double cm_min, double cm_max){ @@ -262,5 +262,5 @@ } /*}}}*/ -/*FUNCTION IntInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION IntInput::GetVectorFromInputs{{{1*/ void IntInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -269,5 +269,5 @@ } /*}}}*/ -/*FUNCTION IntInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION IntInput::GetValuesPtr{{{1*/ void IntInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 4546) @@ -243,5 +243,5 @@ void PentaVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION PentaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION PentaVertexInput::GetParameterValues{{{1*/ void PentaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ /*It is assumed that output values has been correctly allocated*/ @@ -260,5 +260,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION PentaVertexInput::GetParameterDerivativeValue{{{1*/ void PentaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){ /*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,5 +283,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/ void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){ int i,j; @@ -328,5 +328,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION PentaVertexInput::GetVyStrainRate3d{{{1*/ void PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){ int i,j; @@ -373,5 +373,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION PentaVertexInput::GetVzStrainRate3d{{{1*/ void PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){ int i,j; @@ -419,5 +419,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn{{{1*/ void PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ @@ -444,5 +444,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn{{{1*/ void PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ @@ -469,10 +469,10 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION PentaVertexInput::ChangeEnum{{{1*/ void PentaVertexInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION PentaVertexInput::GetParameterAverage(double* pvalue){{{1*/ +/*FUNCTION PentaVertexInput::GetParameterAverage{{{1*/ void PentaVertexInput::GetParameterAverage(double* pvalue){ *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); @@ -1016,5 +1016,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION PentaVertexInput::GetVectorFromInputs{{{1*/ void PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -1023,5 +1023,5 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION PentaVertexInput::GetValuesPtr{{{1*/ void PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp (revision 4546) @@ -191,21 +191,21 @@ void SingVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION SingVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION SingVertexInput::GetParameterValues{{{1*/ void SingVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION SingVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION SingVertexInput::GetParameterDerivativeValue{{{1*/ void SingVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");} /*}}}*/ -/*FUNCTION SingVertexInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION SingVertexInput::ChangeEnum{{{1*/ void SingVertexInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION SingVertexInput::GetParameterAverage(double* pvalue){{{1*/ +/*FUNCTION SingVertexInput::GetParameterAverage{{{1*/ void SingVertexInput::GetParameterAverage(double* pvalue){ *pvalue=value; } /*}}}*/ -/*FUNCTION SingVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION SingVertexInput::SquareMin{{{1*/ void SingVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -226,10 +226,10 @@ } /*}}}*/ -/*FUNCTION SingVertexInput::Scale(double scale_factor){{{1*/ +/*FUNCTION SingVertexInput::Scale{{{1*/ void SingVertexInput::Scale(double scale_factor){ value=value*scale_factor; } /*}}}*/ -/*FUNCTION SingVertexInput::AXPY(Input* xinput,double scalar);{{{1*/ +/*FUNCTION SingVertexInput::AXPY{{{1*/ void SingVertexInput::AXPY(Input* xinput,double scalar){ @@ -252,5 +252,5 @@ } /*}}}*/ -/*FUNCTION SingVertexInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION SingVertexInput::Constrain{{{1*/ void SingVertexInput::Constrain(double cm_min, double cm_max){ @@ -260,5 +260,5 @@ } /*}}}*/ -/*FUNCTION SingVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION SingVertexInput::GetVectorFromInputs{{{1*/ void SingVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -269,5 +269,5 @@ } /*}}}*/ -/*FUNCTION SingVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION SingVertexInput::GetValuesPtr{{{1*/ void SingVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 4546) @@ -196,5 +196,5 @@ /*Object functions*/ -/*FUNCTION TriaVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/ +/*FUNCTION TriaVertexInput::GetParameterValue{{{1*/ void TriaVertexInput::GetParameterValue(double* pvalue,double* gauss){ /*P1 interpolation on Gauss point*/ @@ -211,5 +211,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/ +/*FUNCTION TriaVertexInput::GetParameterValues{{{1*/ void TriaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ /*It is assumed that output values has been correctly allocated*/ @@ -229,5 +229,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/ +/*FUNCTION TriaVertexInput::GetParameterDerivativeValue{{{1*/ void TriaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){ /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian @@ -251,5 +251,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){ @@ -275,5 +275,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/ +/*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/ void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){ @@ -299,10 +299,10 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::ChangeEnum(int newenumtype){{{1*/ +/*FUNCTION TriaVertexInput::ChangeEnum{{{1*/ void TriaVertexInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION TriaVertexInput::GetParameterAverage(double* pvalue){{{1*/ +/*FUNCTION TriaVertexInput::GetParameterAverage{{{1*/ void TriaVertexInput::GetParameterAverage(double* pvalue){ *pvalue=1./3.*(values[0]+values[1]+values[2]); @@ -452,5 +452,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/ +/*FUNCTION TriaVertexInput::SquareMin{{{1*/ void TriaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -475,5 +475,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::Scale(double scale_factor){{{1*/ +/*FUNCTION TriaVertexInput::Scale{{{1*/ void TriaVertexInput::Scale(double scale_factor){ @@ -484,5 +484,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::AXPY(Input* xinput,double scalar);{{{1*/ +/*FUNCTION TriaVertexInput::AXPY{{{1*/ void TriaVertexInput::AXPY(Input* xinput,double scalar){ @@ -507,5 +507,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::Constrain(double cm_min, double cm_max){{{1*/ +/*FUNCTION TriaVertexInput::Constrain{{{1*/ void TriaVertexInput::Constrain(double cm_min, double cm_max){ @@ -518,5 +518,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/ +/*FUNCTION TriaVertexInput::GetVectorFromInputs{{{1*/ void TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){ @@ -525,5 +525,5 @@ } /*}}}*/ -/*FUNCTION TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/ +/*FUNCTION TriaVertexInput::GetValuesPtr{{{1*/ void TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){ Index: /issm/trunk/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk/src/c/objects/IoModel.cpp (revision 4545) +++ /issm/trunk/src/c/objects/IoModel.cpp (revision 4546) @@ -221,5 +221,5 @@ } /*}}}*/ -/*FUNCTION IoModel::IoModelInit(void){{{1*/ +/*FUNCTION IoModel::IoModelInit{{{1*/ void IoModel::IoModelInit(void){ @@ -387,5 +387,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Echo(int which_part,int rank){{{1*/ +/*FUNCTION IoModel::Echo{{{1*/ void IoModel::Echo(int which_part,int rank) { Index: /issm/trunk/src/c/objects/Loads/Friction.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Friction.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Friction.cpp (revision 4546) @@ -20,5 +20,5 @@ /*}}}*/ -/*methods: */ +/*Constructors/destructors*/ /*FUNCTION Friction::Friction() {{{1*/ Friction::Friction(){ @@ -44,4 +44,6 @@ } /*}}}*/ + +/*methods: */ /*FUNCTION Friction::Echo {{{1*/ void Friction::Echo(void){ @@ -53,5 +55,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){{{1*/ +/*FUNCTION Friction::GetAlpha2{{{1*/ void Friction::GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){ Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 4546) @@ -323,5 +323,5 @@ } /*}}}*/ -/*FUNCTION Icefront::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Icefront::InAnalysis{{{1*/ bool Icefront::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -361,5 +361,5 @@ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromSolution(double* solution) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromSolution{{{1*/ void Icefront::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ Index: /issm/trunk/src/c/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 4546) @@ -343,5 +343,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Numericalflux::InAnalysis{{{1*/ bool Numericalflux::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 4546) @@ -319,5 +319,5 @@ } /*}}}1*/ -/*FUNCTION Pengrid::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Pengrid::InAnalysis{{{1*/ bool Pengrid::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -370,5 +370,5 @@ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromSolution(double* solution) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromSolution{{{1*/ void Pengrid::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ Index: /issm/trunk/src/c/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Penpair.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Penpair.cpp (revision 4546) @@ -210,5 +210,5 @@ } /*}}}1*/ -/*FUNCTION Penpair::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Penpair::InAnalysis{{{1*/ bool Penpair::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; Index: /issm/trunk/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 4546) @@ -541,5 +541,5 @@ } /*}}}1*/ -/*FUNCTION Riftfront::InAnalysis(int analysis_type){{{1*/ +/*FUNCTION Riftfront::InAnalysis{{{1*/ bool Riftfront::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; Index: /issm/trunk/src/c/objects/Materials/Material.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Material.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Materials/Material.cpp (revision 4546) @@ -3,5 +3,4 @@ * the Object derived class Material. */ - #include "../objects.h" @@ -12,4 +11,2 @@ return MaterialEnum; } - - Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 4546) @@ -27,4 +27,48 @@ } /*}}}*/ +/*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/ +Matice::Matice(int matice_mid,int i, IoModel* iomodel){ + + int j; + + /*needed for Init routine:*/ + double matice_B; + double matice_n; + int num_vertices; + + /*intermediary: */ + double B_avg; + + /*2d or 3d? */ + if(iomodel->dim==2){ + num_vertices=3; //tria elements + } + else if(iomodel->dim==3){ + num_vertices=6; //penta elements + } + else ISSMERROR(" Mesh type not supported yet!"); + + /*Compute B on the element if provided*/ + if (iomodel->rheology_B){ + B_avg=0; + for(j=0;jrheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1)); + } + B_avg=B_avg/num_vertices; + matice_B=B_avg; + } + else matice_B=UNDEF; + + if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i); + else matice_n=UNDEF; + + this->Init(matice_mid,matice_B,matice_n); +} +/*}}}*/ +/*FUNCTION Matice::~Matice(){{{1*/ +Matice::~Matice(){ + return; +} +/*}}}*/ /*FUNCTION Matice::Init {{{1*/ void Matice::Init(int in_mid,double in_B,double in_n){ @@ -32,48 +76,4 @@ this->B=in_B; this->n=in_n; -} -/*}}}*/ -/*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/ -Matice::Matice(int matice_mid,int i, IoModel* iomodel){ - - int j; - - /*needed for Init routine:*/ - double matice_B; - double matice_n; - int num_vertices; - - /*intermediary: */ - double B_avg; - - /*2d or 3d? */ - if(iomodel->dim==2){ - num_vertices=3; //tria elements - } - else if(iomodel->dim==3){ - num_vertices=6; //penta elements - } - else ISSMERROR(" Mesh type not supported yet!"); - - /*Compute B on the element if provided*/ - if (iomodel->rheology_B){ - B_avg=0; - for(j=0;jrheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1)); - } - B_avg=B_avg/num_vertices; - matice_B=B_avg; - } - else matice_B=UNDEF; - - if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i); - else matice_n=UNDEF; - - this->Init(matice_mid,matice_B,matice_n); -} -/*}}}*/ -/*FUNCTION Matice::~Matice(){{{1*/ -Matice::~Matice(){ - return; } /*}}}*/ @@ -471,5 +471,5 @@ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromSolution(double* solution) {{{1*/ +/*FUNCTION Matice::InputUpdateFromSolution{{{1*/ void Matice::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ Index: /issm/trunk/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 4546) @@ -2,5 +2,4 @@ * \brief: implementation of the Matpar object */ - #ifdef HAVE_CONFIG_H @@ -16,5 +15,4 @@ #include "../../include/include.h" #include "../../EnumDefinitions/EnumDefinitions.h" - /*Matpar constructors and destructor*/ @@ -286,5 +284,5 @@ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromSolution(double* solution) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromSolution{{{1*/ void Matpar::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Node.cpp (revision 4546) @@ -18,6 +18,7 @@ #include "../include/include.h" /*}}}*/ -/*Node constructors and destructors: {{{1*/ -/*FUNCTION Node::Node() default constructor {{{2*/ + +/*Node constructors and destructors:*/ +/*FUNCTION Node::Node() default constructor {{{1*/ Node::Node(){ this->inputs=NULL; @@ -27,5 +28,5 @@ } /*}}}*/ -/*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{2*/ +/*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{1*/ Node::Node(int node_id,int node_sid, int node_vertex_id, int node_upper_node_id, int node_numdofs): indexing(node_numdofs){ @@ -40,5 +41,5 @@ } /*}}}*/ -/*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{2*/ +/*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{1*/ Node::Node(int node_id,int node_sid, DofIndexing* node_indexing, Hook* node_vertex, Hook* node_upper_node,Inputs* node_inputs,int analysis_type): indexing(node_indexing), @@ -59,5 +60,5 @@ } /*}}}*/ -/*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{2*/ +/*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{1*/ Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type){ @@ -173,5 +174,5 @@ } /*}}}*/ -/*FUNCTION Node::~Node(){{{2*/ +/*FUNCTION Node::~Node(){{{1*/ Node::~Node(){ delete inputs; @@ -181,7 +182,7 @@ } /*}}}*/ -/*}}}*/ -/*Object virtual functions definitions: {{{1*/ -/*FUNCTION Node::Echo{{{2*/ + +/*Object virtual functions definitions:*/ +/*FUNCTION Node::Echo{{{1*/ void Node::Echo(void){ @@ -198,5 +199,5 @@ } /*}}}*/ -/*FUNCTION Node::DeepEcho{{{2*/ +/*FUNCTION Node::DeepEcho{{{1*/ void Node::DeepEcho(void){ @@ -216,8 +217,8 @@ } /*}}}*/ -/*FUNCTION Node::Id{{{2*/ +/*FUNCTION Node::Id{{{1*/ int Node::Id(void){ return id; } /*}}}*/ -/*FUNCTION Node::MyRank{{{2*/ +/*FUNCTION Node::MyRank{{{1*/ int Node::MyRank(void){ extern int my_rank; @@ -226,5 +227,5 @@ } /*}}}*/ -/*FUNCTION Node::Marshall{{{2*/ +/*FUNCTION Node::Marshall{{{1*/ void Node::Marshall(char** pmarshalled_dataset){ @@ -266,5 +267,5 @@ } /*}}}*/ -/*FUNCTION Node::MarshallSize{{{2*/ +/*FUNCTION Node::MarshallSize{{{1*/ int Node::MarshallSize(){ @@ -279,5 +280,5 @@ } /*}}}*/ -/*FUNCTION Node::Demarshall{{{2*/ +/*FUNCTION Node::Demarshall{{{1*/ void Node::Demarshall(char** pmarshalled_dataset){ @@ -307,5 +308,5 @@ } /*}}}*/ -/*FUNCTION Node::Enum{{{2*/ +/*FUNCTION Node::Enum{{{1*/ int Node::Enum(void){ @@ -314,5 +315,5 @@ } /*}}}*/ -/*FUNCTION Node::copy {{{2*/ +/*FUNCTION Node::copy {{{1*/ Object* Node::copy() { @@ -322,7 +323,7 @@ /*}}}*/ -/*}}}*/ -/*Node management: {{{1*/ -/*FUNCTION Node::Configure {{{2*/ + +/*Node management:*/ +/*FUNCTION Node::Configure {{{1*/ void Node::Configure(DataSet* nodesin,Vertices* verticesin){ @@ -335,5 +336,5 @@ } -/*FUNCTION Node::GetDof {{{2*/ +/*FUNCTION Node::GetDof {{{1*/ int Node::GetDof(int dofindex){ @@ -342,5 +343,5 @@ } /*}}}*/ -/*FUNCTION Node::GetDofList1{{{2*/ +/*FUNCTION Node::GetDofList1{{{1*/ int Node::GetDofList1(void){ @@ -352,5 +353,5 @@ } /*}}}*/ -/*FUNCTION Node::GetDofList{{{2*/ +/*FUNCTION Node::GetDofList{{{1*/ void Node::GetDofList(int* outdoflist,int* pnumberofdofspernode){ @@ -363,8 +364,8 @@ } /*}}}*/ -/*FUNCTION Node::Sid{{{2*/ +/*FUNCTION Node::Sid{{{1*/ int Node::Sid(void){ return sid; } /*}}}*/ -/*FUNCTION Node::GetVertexId {{{2*/ +/*FUNCTION Node::GetVertexId {{{1*/ int Node::GetVertexId(void){ @@ -375,5 +376,5 @@ } /*}}}*/ -/*FUNCTION Node::GetVertexDof {{{2*/ +/*FUNCTION Node::GetVertexDof {{{1*/ int Node::GetVertexDof(void){ @@ -384,5 +385,5 @@ } /*}}}*/ -/*FUNCTION Node::SetVertexDof {{{2*/ +/*FUNCTION Node::SetVertexDof {{{1*/ void Node::SetVertexDof(int in_dof){ @@ -394,5 +395,5 @@ } /*}}}*/ -/*FUNCTION Node::InAnalysis(int analysis_type){{{2*/ +/*FUNCTION Node::InAnalysis{{{1*/ bool Node::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -400,7 +401,7 @@ } /*}}}*/ -/*}}}*/ -/*Node numerics: {{{1*/ -/*FUNCTION Node::ApplyConstraints{{{2*/ + +/*Node numerics:*/ +/*FUNCTION Node::ApplyConstraints{{{1*/ void Node::ApplyConstraint(Vec yg,int dof,double value){ @@ -425,5 +426,5 @@ } /*}}}*/ -/*FUNCTION Node::CreateVecSets {{{2*/ +/*FUNCTION Node::CreateVecSets {{{1*/ void Node::CreateVecSets(Vec pv_g,Vec pv_m,Vec pv_n,Vec pv_f,Vec pv_s){ @@ -459,5 +460,5 @@ } /*}}}*/ -/*FUNCTION Node::DofInMSet{{{2*/ +/*FUNCTION Node::DofInMSet{{{1*/ void Node::DofInMSet(int dof){ @@ -470,5 +471,5 @@ } /*}}}*/ -/*FUNCTION Node::DofInSSet {{{2*/ +/*FUNCTION Node::DofInSSet {{{1*/ void Node::DofInSSet(int dof){ @@ -482,5 +483,5 @@ } /*}}}*/ -/*FUNCTION Node::DofIsInMSet{{{2*/ +/*FUNCTION Node::DofIsInMSet{{{1*/ int Node::DofIsInMSet(int dof){ @@ -490,5 +491,5 @@ } /*}}}*/ -/*FUNCTION Node::FieldAverageOntoVertices{{{2*/ +/*FUNCTION Node::FieldAverageOntoVertices{{{1*/ void Node::FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field){ @@ -514,5 +515,5 @@ } /*}}}*/ -/*FUNCTION Node::FieldDepthAverageAtBase{{{2*/ +/*FUNCTION Node::FieldDepthAverageAtBase{{{1*/ void Node::FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname){ @@ -643,5 +644,5 @@ } /*}}}*/ -/*FUNCTION Node::VecExtrude {{{2*/ +/*FUNCTION Node::VecExtrude {{{1*/ void Node::VecExtrude(Vec vector,double* vector_serial){ @@ -684,5 +685,5 @@ } /*}}}*/ -/*FUNCTION Node::FreezeDof{{{2*/ +/*FUNCTION Node::FreezeDof{{{1*/ void Node::FreezeDof(int dof){ @@ -691,5 +692,5 @@ } /*}}}*/ -/*FUNCTION Node::GetConnectivity {{{2*/ +/*FUNCTION Node::GetConnectivity {{{1*/ int Node::GetConnectivity(){ int connectivity; @@ -701,5 +702,5 @@ } /*}}}*/ -/*FUNCTION Node::GetNumberOfDofs{{{2*/ +/*FUNCTION Node::GetNumberOfDofs{{{1*/ int Node::GetNumberOfDofs(){ @@ -708,5 +709,5 @@ } /*}}}*/ -/*FUNCTION Node::GetSigma {{{2*/ +/*FUNCTION Node::GetSigma {{{1*/ double Node::GetSigma(){ Vertex* vertex=NULL; @@ -716,5 +717,5 @@ } /*}}}*/ -/*FUNCTION Node::GetUpperNode {{{2*/ +/*FUNCTION Node::GetUpperNode {{{1*/ Node* Node::GetUpperNode(){ Node* upper_node=NULL; @@ -723,5 +724,5 @@ } /*}}}*/ -/*FUNCTION Node::GetX {{{2*/ +/*FUNCTION Node::GetX {{{1*/ double Node::GetX(){ Vertex* vertex=NULL; @@ -731,5 +732,5 @@ } /*}}}*/ -/*FUNCTION Node::GetY {{{2*/ +/*FUNCTION Node::GetY {{{1*/ double Node::GetY(){ Vertex* vertex=NULL; @@ -739,5 +740,5 @@ } /*}}}*/ -/*FUNCTION Node::GetZ {{{2*/ +/*FUNCTION Node::GetZ {{{1*/ double Node::GetZ(){ Vertex* vertex=NULL; @@ -747,5 +748,5 @@ } /*}}}*/ -/*FUNCTION Node::IsClone {{{2*/ +/*FUNCTION Node::IsClone {{{1*/ int Node::IsClone(){ @@ -754,5 +755,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnBed {{{2*/ +/*FUNCTION Node::IsOnBed {{{1*/ int Node::IsOnBed(){ @@ -765,5 +766,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnSheet {{{2*/ +/*FUNCTION Node::IsOnSheet {{{1*/ int Node::IsOnSheet(){ @@ -776,5 +777,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnShelf {{{2*/ +/*FUNCTION Node::IsOnShelf {{{1*/ int Node::IsOnShelf(){ @@ -787,5 +788,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnSurface {{{2*/ +/*FUNCTION Node::IsOnSurface {{{1*/ int Node::IsOnSurface(){ @@ -798,5 +799,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{2*/ +/*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{1*/ void Node::InputUpdateFromVector(double* vector, int name, int type){ @@ -804,5 +805,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{2*/ +/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{1*/ void Node::InputUpdateFromVector(int* vector, int name, int type){ @@ -810,5 +811,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{2*/ +/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{1*/ void Node::InputUpdateFromVector(bool* vector, int name, int type){ @@ -816,5 +817,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{2*/ +/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{1*/ void Node::InputUpdateFromConstant(double constant, int name){ @@ -822,5 +823,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{2*/ +/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{1*/ void Node::InputUpdateFromConstant(int constant, int name){ @@ -828,5 +829,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{2*/ +/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{1*/ void Node::InputUpdateFromConstant(bool constant, int name){ @@ -834,7 +835,7 @@ } /*}}}*/ -/*}}}*/ -/* DofObject routines: {{{1*/ -/*FUNCTION Node::DistributeDofs{{{2*/ + +/* DofObject routines:*/ +/*FUNCTION Node::DistributeDofs{{{1*/ void Node::DistributeDofs(int* pdofcount){ @@ -861,5 +862,5 @@ } /*}}}*/ -/*FUNCTION Node::OffsetDofs{{{2*/ +/*FUNCTION Node::OffsetDofs{{{1*/ void Node::OffsetDofs(int dofcount){ @@ -878,5 +879,5 @@ } /*}}}*/ -/*FUNCTION Node::ShowTrueDofs{{{2*/ +/*FUNCTION Node::ShowTrueDofs{{{1*/ void Node::ShowTrueDofs(int* truedofs){ @@ -894,5 +895,5 @@ } /*}}}*/ -/*FUNCTION Node::UpdateCloneDofs{{{2*/ +/*FUNCTION Node::UpdateCloneDofs{{{1*/ void Node::UpdateCloneDofs(int* alltruedofs){ @@ -910,5 +911,5 @@ } /*}}}*/ -/*FUNCTION Node::SetClone {{{2*/ +/*FUNCTION Node::SetClone {{{1*/ void Node::SetClone(int* minranks){ @@ -926,5 +927,5 @@ } /*}}}*/ -/*FUNCTION Node::CreatePartition{{{2*/ +/*FUNCTION Node::CreatePartition{{{1*/ void Node::CreatePartition(Vec partition){ @@ -933,3 +934,2 @@ } /*}}}*/ -/*}}}*/ Index: /issm/trunk/src/c/objects/NodeSets.cpp =================================================================== --- /issm/trunk/src/c/objects/NodeSets.cpp (revision 4545) +++ /issm/trunk/src/c/objects/NodeSets.cpp (revision 4546) @@ -7,7 +7,6 @@ #include "./objects.h" -/*-------------------------------------------------- - Construtor - --------------------------------------------------*/ +/*constructors and destructors*/ +/*FUNCTION NodeSets::NodeSets{{{1*/ NodeSets::NodeSets( double* nodesets_pv_m,double* nodesets_pv_n,double* nodesets_pv_f,double* nodesets_pv_s, int nodesets_gsize,int nodesets_msize,int nodesets_nsize,int nodesets_fsize,int nodesets_ssize){ @@ -24,12 +23,6 @@ pv_s=nodesets_pv_s; -} - - - -/*-------------------------------------------------- - Destructor: - --------------------------------------------------*/ - +}/*}}}*/ +/*FUNCTION NodeSets::~NodeSets{{{1*/ NodeSets::~NodeSets(void){ @@ -39,10 +32,8 @@ xfree((void**)&pv_s); -} +}/*}}}*/ -/*-------------------------------------------------- - Echo - --------------------------------------------------*/ - +/*Object management*/ +/*FUNCTION NodeSets::Echo{{{1*/ void NodeSets::Echo(void){ @@ -83,17 +74,39 @@ } } -} - - -/*Access to internals: */ -int NodeSets::GetGSize(){ return gsize;} -int NodeSets::GetMSize(){ return msize;} -int NodeSets::GetNSize(){ return nsize;} -int NodeSets::GetFSize(){ return fsize;} -int NodeSets::GetSSize(){ return ssize;} -double* NodeSets::GetPV_M(){ return pv_m;} -double* NodeSets::GetPV_N(){ return pv_n;} -double* NodeSets::GetPV_F(){ return pv_f;} -double* NodeSets::GetPV_S(){ return pv_s;} - - +}/*}}}*/ +/*FUNCTION NodeSets::GetGSize{{{1*/ +int NodeSets::GetGSize(){ + return gsize; +}/*}}}*/ +/*FUNCTION NodeSets::GetMSize{{{1*/ +int NodeSets::GetMSize(){ + return msize; +}/*}}}*/ +/*FUNCTION NodeSets::GetNSize{{{1*/ +int NodeSets::GetNSize(){ + return nsize; +}/*}}}*/ +/*FUNCTION NodeSets::GetFSize{{{1*/ +int NodeSets::GetFSize(){ + return fsize; +}/*}}}*/ +/*FUNCTION NodeSets::GetSSize{{{1*/ +int NodeSets::GetSSize(){ + return ssize; +}/*}}}*/ +/*FUNCTION NodeSets::GetPV_M{{{1*/ +double* NodeSets::GetPV_M(){ + return pv_m; +}/*}}}*/ +/*FUNCTION NodeSets::GetPV_N{{{1*/ +double* NodeSets::GetPV_N(){ + return pv_n; +}/*}}}*/ +/*FUNCTION NodeSets::GetPV_F{{{1*/ +double* NodeSets::GetPV_F(){ + return pv_f; +}/*}}}*/ +/*FUNCTION NodeSets::GetPV_S{{{1*/ +double* NodeSets::GetPV_S(){ + return pv_s; +}/*}}}*/ Index: /issm/trunk/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 4546) @@ -127,10 +127,10 @@ /*BoolParam virtual functions definitions: */ -/*FUNCTION BoolParam::GetParameterName(void); {{{1*/ +/*FUNCTION BoolParam::GetParameterName{{{1*/ char* BoolParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION BoolParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION BoolParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void BoolParam::SetMatlabField(mxArray* dataref){ Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 4546) @@ -152,5 +152,5 @@ /*DoubleMatParam virtual functions definitions: */ -/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ +/*FUNCTION DoubleMatParam::GetParameterValue{{{1*/ void DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ double* output=NULL; @@ -168,10 +168,10 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::GetParameterName(void); {{{1*/ +/*FUNCTION DoubleMatParam::GetParameterName{{{1*/ char* DoubleMatParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleMatParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleMatParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleMatParam::SetMatlabField(mxArray* dataref){ @@ -197,5 +197,5 @@ #endif /*}}}*/ -/*FUNCTION DoubleMatParam::SetValue(double* doublearray,int M,int N);{{{1*/ +/*FUNCTION DoubleMatParam::SetValue{{{1*/ void DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){ Index: /issm/trunk/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 4546) @@ -124,10 +124,10 @@ /*DoubleParam virtual functions definitions: */ -/*FUNCTION DoubleParam::GetParameterName(void); {{{1*/ +/*FUNCTION DoubleParam::GetParameterName{{{1*/ char* DoubleParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(int* pinteger) {{{1*/ +/*FUNCTION DoubleParam::GetParameterValue{{{1*/ void DoubleParam::GetParameterValue(int* pinteger){ #ifdef _SERIAL_ @@ -138,5 +138,5 @@ } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(bool* pbool) {{{1*/ +/*FUNCTION DoubleParam::GetParameterValue{{{1*/ void DoubleParam::GetParameterValue(bool* pbool){ #ifdef _SERIAL_ @@ -151,5 +151,5 @@ } /*}}}*/ -/*FUNCTION DoubleParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleParam::SetMatlabField(mxArray* dataref){ Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 4546) @@ -146,5 +146,5 @@ /*DoubleVecParam virtual functions definitions: */ -/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ +/*FUNCTION DoubleVecParam::GetParameterValue{{{1*/ void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){ double* output=NULL; @@ -160,10 +160,10 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::GetParameterName(void); {{{1*/ +/*FUNCTION DoubleVecParam::GetParameterName{{{1*/ char* DoubleVecParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION DoubleVecParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION DoubleVecParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void DoubleVecParam::SetMatlabField(mxArray* dataref){ @@ -186,5 +186,5 @@ #endif /*}}}*/ -/*FUNCTION DoubleVecParam::SetValue(double* doublearray,int M);{{{1*/ +/*FUNCTION DoubleVecParam::SetValue{{{1*/ void DoubleVecParam::SetValue(double* doublearray,int in_M){ Index: /issm/trunk/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 4546) @@ -127,10 +127,10 @@ /*IntParam virtual functions definitions: */ -/*FUNCTION IntParam::GetParameterName(void); {{{1*/ +/*FUNCTION IntParam::GetParameterName{{{1*/ char* IntParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION IntParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION IntParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void IntParam::SetMatlabField(mxArray* dataref){ Index: /issm/trunk/src/c/objects/Params/PetscMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 4546) @@ -188,5 +188,5 @@ /*PetscMatParam virtual functions definitions: */ -/*FUNCTION PetscMatParam::GetParameterValue(Mat* pvalue){{{1*/ +/*FUNCTION PetscMatParam::GetParameterValue{{{1*/ void PetscMatParam::GetParameterValue(Mat* poutput){ Mat output=NULL; @@ -198,10 +198,10 @@ } /*}}}*/ -/*FUNCTION PetscMatParam::GetParameterName(void); {{{1*/ +/*FUNCTION PetscMatParam::GetParameterName{{{1*/ char* PetscMatParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION PetscMatParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION PetscMatParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void PetscMatParam::SetMatlabField(mxArray* dataref){ @@ -224,5 +224,5 @@ #endif /*}}}*/ -/*FUNCTION PetscMatParam::SetValue(Mat matrix){{{1*/ +/*FUNCTION PetscMatParam::SetValue{{{1*/ void PetscMatParam::SetValue(Mat matrix){ Index: /issm/trunk/src/c/objects/Params/PetscVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 4546) @@ -180,5 +180,5 @@ /*PetscVecParam virtual functions definitions: */ -/*FUNCTION PetscVecParam::GetParameterValue(Vec* pvalue){{{1*/ +/*FUNCTION PetscVecParam::GetParameterValue{{{1*/ void PetscVecParam::GetParameterValue(Vec* poutput){ Vec output=NULL; @@ -191,10 +191,10 @@ } /*}}}*/ -/*FUNCTION PetscVecParam::GetParameterName(void); {{{1*/ +/*FUNCTION PetscVecParam::GetParameterName{{{1*/ char* PetscVecParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION PetscVecParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION PetscVecParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void PetscVecParam::SetMatlabField(mxArray* dataref){ @@ -218,5 +218,5 @@ #endif /*}}}*/ -/*FUNCTION PetscVecParam::SetValue(Vec vector){{{1*/ +/*FUNCTION PetscVecParam::SetValue{{{1*/ void PetscVecParam::SetValue(Vec vector){ Index: /issm/trunk/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 4546) @@ -192,5 +192,5 @@ /*StringArrayParam virtual functions definitions: */ -/*FUNCTION StringArrayParam::GetParameterValue(char*** pstringarray, int* pnumstrings){{{1*/ +/*FUNCTION StringArrayParam::GetParameterValue{{{1*/ void StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){ @@ -220,10 +220,10 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::GetParameterName(void); {{{1*/ +/*FUNCTION StringArrayParam::GetParameterName{{{1*/ char* StringArrayParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION StringArrayParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION StringArrayParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void StringArrayParam::SetMatlabField(mxArray* dataref){ @@ -247,5 +247,5 @@ #endif /*}}}*/ -/*FUNCTION StringArrayParam::SetValue(char** stringarray, int M){{{1*/ +/*FUNCTION StringArrayParam::SetValue{{{1*/ void StringArrayParam::SetValue(char** stringarray,int M){ Index: /issm/trunk/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 4546) @@ -142,5 +142,5 @@ /*StringParam virtual functions definitions: */ -/*FUNCTION StringParam::GetParameterValue(char** pstring){{{1*/ +/*FUNCTION StringParam::GetParameterValue{{{1*/ void StringParam::GetParameterValue(char** pstring){ @@ -157,10 +157,10 @@ } /*}}}*/ -/*FUNCTION StringParam::GetParameterName(void); {{{1*/ +/*FUNCTION StringParam::GetParameterName{{{1*/ char* StringParam::GetParameterName(void){ return EnumAsString(this->enum_type); } /*}}}*/ -/*FUNCTION StringParam::SetMatlabField(mxArray* dataref);{{{1*/ +/*FUNCTION StringParam::SetMatlabField{{{1*/ #ifdef _SERIAL_ void StringParam::SetMatlabField(mxArray* dataref){ @@ -173,5 +173,5 @@ #endif /*}}}*/ -/*FUNCTION StringParam::SetValue(char* string){{{1*/ +/*FUNCTION StringParam::SetValue{{{1*/ void StringParam::SetValue(char* string){ Index: /issm/trunk/src/c/objects/Patch.cpp =================================================================== --- /issm/trunk/src/c/objects/Patch.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Patch.cpp (revision 4546) @@ -112,5 +112,4 @@ void Patch::MPI_Gather(void){ - int i; int count; @@ -154,5 +153,4 @@ } - /*Now, node 0 has total_values, of size total_numrows*this->numcols. Update the fields in the patch, to reflect this new * reality. For other cpus, no point in keeping their data anymore: */ @@ -166,5 +164,3 @@ xfree((void**)&this->values); } - -} -/*}}}*/ +}/*}}}*/ Index: /issm/trunk/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 4545) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 4546) @@ -26,4 +26,16 @@ Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){ this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma); +} +/*}}}*/ +/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/ +Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){ + + this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i])); + +} +/*}}}*/ +/*FUNCTION Vertex::~Vertex() {{{1*/ +Vertex::~Vertex(){ + return; } /*}}}*/ @@ -43,19 +55,7 @@ } /*}}}*/ -/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/ -Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){ - - this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i])); - -} -/*}}}*/ -/*FUNCTION Vertex::~Vertex() {{{1*/ -Vertex::~Vertex(){ - return; -} -/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION Echo{{{1*/ +/*FUNCTION Vertex::Echo{{{1*/ void Vertex::Echo(void){ @@ -73,5 +73,5 @@ } /*}}}*/ -/*FUNCTION DeepEcho{{{1*/ +/*FUNCTION Vertex::DeepEcho{{{1*/ void Vertex::DeepEcho(void){ @@ -79,8 +79,8 @@ } /*}}}*/ -/*FUNCTION Id{{{1*/ +/*FUNCTION Vertex::Id{{{1*/ int Vertex::Id(void){ return id; } /*}}}*/ -/*FUNCTION MyRank {{{1*/ +/*FUNCTION Vertex::MyRank {{{1*/ int Vertex::MyRank(void){ extern int my_rank; @@ -88,5 +88,5 @@ } /*}}}*/ -/*FUNCTION Marshall {{{1*/ +/*FUNCTION Vertex::Marshall {{{1*/ void Vertex::Marshall(char** pmarshalled_dataset){ @@ -117,5 +117,5 @@ } /*}}}*/ -/*FUNCTION MarshallSize {{{1*/ +/*FUNCTION Vertex::MarshallSize {{{1*/ int Vertex::MarshallSize(){ @@ -131,5 +131,5 @@ } /*}}}*/ -/*FUNCTION Demarshall {{{1*/ +/*FUNCTION Vertex::Demarshall {{{1*/ void Vertex::Demarshall(char** pmarshalled_dataset){ @@ -157,5 +157,5 @@ } /*}}}*/ -/*FUNCTION Enum {{{1*/ +/*FUNCTION Vertex::Enum {{{1*/ int Vertex::Enum(void){ @@ -164,5 +164,5 @@ } /*}}}*/ -/*FUNCTION copy {{{1*/ +/*FUNCTION Vertex::copy {{{1*/ Object* Vertex::copy() { @@ -173,5 +173,5 @@ /* DofObject routines: */ -/*FUNCTION Vertex DistributeDofs{{{1*/ +/*FUNCTION Vertex::DistributeDofs{{{1*/ void Vertex::DistributeDofs(int* pdofcount){ @@ -196,5 +196,5 @@ } /*}}}*/ -/*FUNCTION Vertex OffsetDofs{{{1*/ +/*FUNCTION Vertex::OffsetDofs{{{1*/ void Vertex::OffsetDofs(int dofcount){ @@ -211,5 +211,5 @@ } /*}}}*/ -/*FUNCTION Vertex ShowTrueDofs{{{1*/ +/*FUNCTION Vertex::ShowTrueDofs{{{1*/ void Vertex::ShowTrueDofs(int* truedofs){ @@ -225,5 +225,5 @@ } /*}}}*/ -/*FUNCTION Vertex UpdateCloneDofs{{{1*/ +/*FUNCTION Vertex::UpdateCloneDofs{{{1*/ void Vertex::UpdateCloneDofs(int* alltruedofs){ @@ -239,5 +239,5 @@ } /*}}}*/ -/*FUNCTION Vertex SetClone {{{1*/ +/*FUNCTION Vertex::SetClone {{{1*/ void Vertex::SetClone(int* minranks){ @@ -255,5 +255,5 @@ } /*}}}*/ -/*FUNCTION Vertex CreatePartition{{{1*/ +/*FUNCTION Vertex::CreatePartition{{{1*/ void Vertex::CreatePartition(Vec partition){ @@ -270,8 +270,8 @@ /*Vertex management: */ -/*FUNCTION Sid{{{1*/ +/*FUNCTION Vertex::Sid{{{1*/ int Vertex::Sid(void){ return sid; } /*}}}*/ -/*FUNCTION UpdateVertexPosition {{{1*/ +/*FUNCTION Vertex::UpdateVertexPosition {{{1*/ void Vertex::UpdatePosition(double* thickness,double* bed){ @@ -281,3 +281,2 @@ } /*}}}*/ -