Changeset 4546


Ignore:
Timestamp:
07/13/10 08:46:04 (15 years ago)
Author:
Mathieu Morlighem
Message:

cosmetics (fold names)

Location:
issm/trunk/src/c/objects
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/Constraints/Rgb.cpp

    r4248 r4546  
    22 * \brief: implementation of the Rgb object
    33 */
    4 
    54
    65#ifdef HAVE_CONFIG_H
    … …  
    1918
    2019/*Rgb constructors and destructor*/
    21 /*FUNCTION Rgb::constructor {{{1*/
     20/*FUNCTION Rgb::Rgb(){{{1*/
    2221Rgb::Rgb(){
    2322        return;
    2423}
    2524/*}}}1*/
    26 /*FUNCTION Rgb::creation {{{1*/
     25/*FUNCTION Rgb::Rgb(int rgb_id,int rgb_nodeid1,...){{{1*/
    2726Rgb::Rgb(int rgb_id,int rgb_nodeid1,int rgb_nodeid2, int rgb_dof,int rgb_analysis_type){
    2827
    … …  
    3635}
    3736/*}}}1*/
    38 /*FUNCTION Rgb::destructor {{{1*/
     37/*FUNCTION Rgb::~Rgb{{{1*/
    3938Rgb::~Rgb(){
    4039        return;
    … …  
    166165}
    167166/*}}}1*/
    168 /*FUNCTION Rgb::InAnalysis(int analysis_type){{{1*/
     167/*FUNCTION Rgb::InAnalysis{{{1*/
    169168bool Rgb::InAnalysis(int in_analysis_type){
    170169        if (in_analysis_type==this->analysis_type)return true;
    … …  
    172171}
    173172/*}}}*/
    174 

  • issm/trunk/src/c/objects/Constraints/Spc.cpp

    r4248 r4546  
    22 * \brief: implementation of the Spc object
    33 */
    4 
    54
    65#ifdef HAVE_CONFIG_H
    … …  
    1817#include "../objects.h"
    1918
    20                
    2119/*Spc constructors and destructor*/
    22 /*FUNCTION Spc::constructor {{{1*/
     20/*FUNCTION Spc::Spc(){{{1*/
    2321Spc::Spc(){
    2422        return;
    2523}
    2624/*}}}1*/
    27 /*FUNCTION Spc::creation {{{1*/
     25/*FUNCTION Spc::Spc(int spc_sid,int spc_nodeid,...){{{1*/
    2826Spc::Spc(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){
    2927
    … …  
    3735}
    3836/*}}}1*/
    39 /*FUNCTION Spc::destructor {{{1*/
     37/*FUNCTION Spc::~Spc{{{1*/
    4038Spc::~Spc(){
    4139        return;
    … …  
    166164}
    167165/*}}}1*/
    168 /*FUNCTION Spc::InAnalysis(int analysis_type){{{1*/
     166/*FUNCTION Spc::InAnalysis{{{1*/
    169167bool Spc::InAnalysis(int in_analysis_type){
    170168        if (in_analysis_type==this->analysis_type) return true;

  • issm/trunk/src/c/objects/ElementResults/BeamVertexElementResult.cpp

    r4248 r4546  
    136136/*}}}*/
    137137
    138 
    139138/*ElementResult management*/
    140139/*FUNCTION BeamVertexElementResult::EnumType{{{1*/
    … …  
    145144}
    146145/*}}}*/
    147 /*FUNCTION BeamVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/
     146/*FUNCTION BeamVertexElementResult::ProcessUnits{{{1*/
    148147void BeamVertexElementResult::ProcessUnits(Parameters* parameters){
    149148       
    … …  
    152151}
    153152/*}}}*/
    154 /*FUNCTION BeamVertexElementResult::NumberOfNodalValues(void){{{1*/
     153/*FUNCTION BeamVertexElementResult::NumberOfNodalValues{{{1*/
    155154int BeamVertexElementResult::NumberOfNodalValues(void){
    156155        return 2;
    157156}
    158157/*}}}*/
    159 /*FUNCTION BeamVertexElementResult::BeamVertexElementResult::PatchFill(int row, Patch* patch){{{1*/
     158/*FUNCTION BeamVertexElementResult::PatchFill{{{1*/
    160159void BeamVertexElementResult::PatchFill(int row, Patch* patch){
    161160       

  • issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp

    r4248 r4546  
    194194}
    195195/*}}}*/
    196 /*FUNCTION DoubleElementResult::ProcessUnits(Parameters* parameters){{{1*/
     196/*FUNCTION DoubleElementResult::ProcessUnits{{{1*/
    197197void DoubleElementResult::ProcessUnits(Parameters* parameters){
    198198       
    … …  
    201201}
    202202/*}}}*/
    203 /*FUNCTION DoubleElementResult::NumberOfNodalValues(void){{{1*/
     203/*FUNCTION DoubleElementResult::NumberOfNodalValues{{{1*/
    204204int DoubleElementResult::NumberOfNodalValues(void){
    205205        return 1;
    206206}
    207207/*}}}*/
    208 /*FUNCTION DoubleElementResult::DoubleElementResult::PatchFill(int row, Patch* patch){{{1*/
     208/*FUNCTION DoubleElementResult::PatchFill{{{1*/
    209209void DoubleElementResult::PatchFill(int row, Patch* patch){
    210210       

  • issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp

    r4248 r4546  
    137137/*}}}*/
    138138
    139 
    140139/*ElementResult management*/
    141140/*FUNCTION PentaVertexElementResult::EnumType{{{1*/
    … …  
    211210}
    212211/*}}}*/
    213 /*FUNCTION PentaVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/
     212/*FUNCTION PentaVertexElementResult::ProcessUnits{{{1*/
    214213void PentaVertexElementResult::ProcessUnits(Parameters* parameters){
    215214       
    … …  
    218217}
    219218/*}}}*/
    220 /*FUNCTION PentaVertexElementResult::NumberOfNodalValues(void){{{1*/
     219/*FUNCTION PentaVertexElementResult::NumberOfNodalValues{{{1*/
    221220int PentaVertexElementResult::NumberOfNodalValues(void){
    222221        return 6;
    223222}
    224223/*}}}*/
    225 /*FUNCTION PentaVertexElementResult::PentaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/
     224/*FUNCTION PentaVertexElementResult::PatchFill{{{1*/
    226225void PentaVertexElementResult::PatchFill(int row, Patch* patch){
    227226       

  • issm/trunk/src/c/objects/ElementResults/SingVertexElementResult.cpp

    r4248 r4546  
    136136
    137137/*ElementResult virtual functions definitions*/
    138 /*FUNCTION SingVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/
     138/*FUNCTION SingVertexElementResult::ProcessUnits{{{1*/
    139139void SingVertexElementResult::ProcessUnits(Parameters* parameters){
    140140       
    … …  
    143143}
    144144/*}}}*/
    145 /*FUNCTION SingVertexElementResult::NumberOfNodalValues(void){{{1*/
     145/*FUNCTION SingVertexElementResult::NumberOfNodalValues{{{1*/
    146146int SingVertexElementResult::NumberOfNodalValues(void){
    147147        return 1;
    148148}
    149149/*}}}*/
    150 /*FUNCTION SingVertexElementResult::SingVertexElementResult::PatchFill(int row, Patch* patch){{{1*/
     150/*FUNCTION SingVertexElementResult::PatchFill{{{1*/
    151151void SingVertexElementResult::PatchFill(int row, Patch* patch){
    152152       

  • issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp

    r4248 r4546  
    137137/*}}}*/
    138138
    139 
    140139/*ElementResult management*/
    141140/*FUNCTION TriaVertexElementResult::EnumType{{{1*/
    … …  
    200199}
    201200/*}}}*/
    202 /*FUNCTION TriaVertexElementResult::ProcessUnits(Parameters* parameters){{{1*/
     201/*FUNCTION TriaVertexElementResult::ProcessUnits{{{1*/
    203202void TriaVertexElementResult::ProcessUnits(Parameters* parameters){
    204203       
    … …  
    207206}
    208207/*}}}*/
    209 /*FUNCTION TriaVertexElementResult::NumberOfNodalValues(void){{{1*/
     208/*FUNCTION TriaVertexElementResult::NumberOfNodalValues{{{1*/
    210209int TriaVertexElementResult::NumberOfNodalValues(void){
    211210        return 3;
    212211}
    213212/*}}}*/
    214 /*FUNCTION TriaVertexElementResult::TriaVertexElementResult::PatchFill(int row, Patch* patch){{{1*/
     213/*FUNCTION TriaVertexElementResult::PatchFill{{{1*/
    215214void TriaVertexElementResult::PatchFill(int row, Patch* patch){
    216215       

  • issm/trunk/src/c/objects/Elements/Beam.cpp

    r4532 r4546  
    319319}
    320320/*}}}*/
    321 /*FUNCTION Beam::GetSolutionFromInputs(Vec solution);{{{1*/
     321/*FUNCTION Beam::GetSolutionFromInputs{{{1*/
    322322void  Beam::GetSolutionFromInputs(Vec solution){
    323323        ISSMERROR(" not supported yet!");
    … …  
    329329}
    330330/*}}}*/
    331 /*FUNCTION Beam::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/
     331/*FUNCTION Beam::GetVectorFromInputs{{{1*/
    332332void  Beam::GetVectorFromInputs(Vec vector,int NameEnum){
    333333
    … …  
    363363}
    364364/*}}}*/
    365 /*FUNCTION Beam::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
     365/*FUNCTION Beam::InputAXPY{{{1*/
    366366void  Beam::InputAXPY(int YEnum, double scalar, int XEnum){
    367367
    … …  
    381381}
    382382/*}}}*/
    383 /*FUNCTION Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     383/*FUNCTION Beam::InputControlConstrain{{{1*/
    384384void  Beam::InputControlConstrain(int control_type, double cm_min, double cm_max){
    385385
    … …  
    397397}
    398398/*}}}*/
    399 /*FUNCTION Beam::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/
     399/*FUNCTION Beam::InputConvergence{{{1*/
    400400void  Beam::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    401401
    … …  
    426426}
    427427/*}}}*/
    428 /*FUNCTION Beam::InputDuplicate(int original_enum,int new_enum){{{1*/
     428/*FUNCTION Beam::InputDuplicate{{{1*/
    429429void  Beam::InputDuplicate(int original_enum,int new_enum){
    430430
    … …  
    443443}
    444444/*}}}*/
    445 /*FUNCTION Beam::InputScale(int enum_type,double scale_factor){{{1*/
     445/*FUNCTION Beam::InputScale{{{1*/
    446446void  Beam::InputScale(int enum_type,double scale_factor){
    447447
    … …  
    455455}
    456456/*}}}*/
    457 /*FUNCTION Beam::InputToResult(int enum_type,int step,double time){{{1*/
     457/*FUNCTION Beam::InputToResult{{{1*/
    458458void  Beam::InputToResult(int enum_type,int step,double time){
    459459        ISSMERROR(" not supported yet!");
    … …  
    465465}
    466466/*}}}*/
    467 /*FUNCTION Beam::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/
     467/*FUNCTION Beam::MaxAbsVx{{{1*/
    468468void  Beam::MaxAbsVx(double* pmaxabsvx, bool process_units){
    469469
    … …  
    491491}
    492492/*}}}*/
    493 /*FUNCTION Beam::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/
     493/*FUNCTION Beam::MaxAbsVy{{{1*/
    494494void  Beam::MaxAbsVy(double* pmaxabsvy, bool process_units){
    495495
    … …  
    517517}
    518518/*}}}*/
    519 /*FUNCTION Beam::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/
     519/*FUNCTION Beam::MaxAbsVz{{{1*/
    520520void  Beam::MaxAbsVz(double* pmaxabsvz, bool process_units){
    521521
    … …  
    543543}
    544544/*}}}*/
    545 /*FUNCTION Beam::MaxVel(double* pmaxvel, bool process_units);{{{1*/
     545/*FUNCTION Beam::MaxVel{{{1*/
    546546void  Beam::MaxVel(double* pmaxvel, bool process_units){
    547547
    … …  
    570570}
    571571/*}}}*/
    572 /*FUNCTION Beam::MaxVx(double* pmaxvx, bool process_units);{{{1*/
     572/*FUNCTION Beam::MaxVx{{{1*/
    573573void  Beam::MaxVx(double* pmaxvx, bool process_units){
    574574
    … …  
    597597}
    598598/*}}}*/
    599 /*FUNCTION Beam::MaxVy(double* pmaxvy, bool process_units);{{{1*/
     599/*FUNCTION Beam::MaxVy{{{1*/
    600600void  Beam::MaxVy(double* pmaxvy, bool process_units){
    601601
    … …  
    624624}
    625625/*}}}*/
    626 /*FUNCTION Beam::MaxVz(double* pmaxvz, bool process_units);{{{1*/
     626/*FUNCTION Beam::MaxVz{{{1*/
    627627void  Beam::MaxVz(double* pmaxvz, bool process_units){
    628628
    … …  
    651651}
    652652/*}}}*/
    653 /*FUNCTION Beam::MinVel(double* pminvel, bool process_units);{{{1*/
     653/*FUNCTION Beam::MinVel{{{1*/
    654654void  Beam::MinVel(double* pminvel, bool process_units){
    655655
    … …  
    678678}
    679679/*}}}*/
    680 /*FUNCTION Beam::MinVx(double* pminvx, bool process_units);{{{1*/
     680/*FUNCTION Beam::MinVx{{{1*/
    681681void  Beam::MinVx(double* pminvx, bool process_units){
    682682
    … …  
    705705}
    706706/*}}}*/
    707 /*FUNCTION Beam::MinVy(double* pminvy, bool process_units);{{{1*/
     707/*FUNCTION Beam::MinVy{{{1*/
    708708void  Beam::MinVy(double* pminvy, bool process_units){
    709709
    … …  
    732732}
    733733/*}}}*/
    734 /*FUNCTION Beam::MinVz(double* pminvz, bool process_units);{{{1*/
     734/*FUNCTION Beam::MinVz{{{1*/
    735735void  Beam::MinVz(double* pminvz, bool process_units){
    736736
    … …  
    764764}
    765765/*}}}*/
    766 /*FUNCTION Beam::PatchFill(int* pcount, Patch* patch){{{1*/
     766/*FUNCTION Beam::PatchFill{{{1*/
    767767void  Beam::PatchFill(int* pcount, Patch* patch){
    768768
    … …  
    770770}
    771771/*}}}*/
    772 /*FUNCTION Beam::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/
     772/*FUNCTION Beam::PatchSize{{{1*/
    773773void  Beam::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    774774
    … …  
    777777}
    778778/*}}}*/
    779 /*FUNCTION Beam::ProcessResultsUnits(void){{{1*/
     779/*FUNCTION Beam::ProcessResultsUnits{{{1*/
    780780void  Beam::ProcessResultsUnits(void){
    781781        ISSMERROR(" not supported yet!");
    … …  
    787787}
    788788/*}}}*/
    789 /*FUNCTION Beam::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/
     789/*FUNCTION Beam::Update{{{1*/
    790790void Beam::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){
    791791        ISSMERROR(" not supported yet!");

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r4532 r4546  
    898898}
    899899/*}}}*/
    900 /*FUNCTION Penta::GetSolutionFromInputs(Vec solution){{{1*/
     900/*FUNCTION Penta::GetSolutionFromInputs{{{1*/
    901901void  Penta::GetSolutionFromInputs(Vec solution){
    902902
    … …  
    930930}
    931931/*}}}*/
    932 /*FUNCTION Penta::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/
     932/*FUNCTION Penta::GetVectorFromInputs{{{1*/
    933933void  Penta::GetVectorFromInputs(Vec vector,int NameEnum){
    934934
    … …  
    10201020}
    10211021/*}}}*/
    1022 /*FUNCTION Penta::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
     1022/*FUNCTION Penta::InputAXPY{{{1*/
    10231023void  Penta::InputAXPY(int YEnum, double scalar, int XEnum){
    10241024
    … …  
    10381038}
    10391039/*}}}*/
    1040 /*FUNCTION Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     1040/*FUNCTION Penta::InputControlConstrain{{{1*/
    10411041void  Penta::InputControlConstrain(int control_type, double cm_min, double cm_max){
    10421042
    … …  
    10541054}
    10551055/*}}}*/
    1056 /*FUNCTION Penta::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/
     1056/*FUNCTION Penta::InputConvergence{{{1*/
    10571057void  Penta::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    10581058
    … …  
    11661166}
    11671167/*}}}*/
    1168 /*FUNCTION Penta::InputDuplicate(int original_enum,int new_enum){{{1*/
     1168/*FUNCTION Penta::InputDuplicate{{{1*/
    11691169void  Penta::InputDuplicate(int original_enum,int new_enum){
    11701170
    … …  
    11841184}
    11851185/*}}}*/
    1186 /*FUNCTION Penta::InputScale(int enum_type,double scale_factor){{{1*/
     1186/*FUNCTION Penta::InputScale{{{1*/
    11871187void  Penta::InputScale(int enum_type,double scale_factor){
    11881188
    … …  
    11971197}
    11981198/*}}}*/
    1199 /*FUNCTION Penta::InputToResult(int enum_type,int step,double time){{{1*/
     1199/*FUNCTION Penta::InputToResult{{{1*/
    12001200void  Penta::InputToResult(int enum_type,int step,double time){
    12011201
    … …  
    12241224}
    12251225/*}}}*/
    1226 /*FUNCTION Penta::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/
     1226/*FUNCTION Penta::MaxAbsVx{{{1*/
    12271227void  Penta::MaxAbsVx(double* pmaxabsvx, bool process_units){
    12281228
    … …  
    12501250}
    12511251/*}}}*/
    1252 /*FUNCTION Penta::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/
     1252/*FUNCTION Penta::MaxAbsVy{{{1*/
    12531253void  Penta::MaxAbsVy(double* pmaxabsvy, bool process_units){
    12541254
    … …  
    12761276}
    12771277/*}}}*/
    1278 /*FUNCTION Penta::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/
     1278/*FUNCTION Penta::MaxAbsVz{{{1*/
    12791279void  Penta::MaxAbsVz(double* pmaxabsvz, bool process_units){
    12801280
    … …  
    13021302}
    13031303/*}}}*/
    1304 /*FUNCTION Penta::MaxVel(double* pmaxvel, bool process_units);{{{1*/
     1304/*FUNCTION Penta::MaxVel{{{1*/
    13051305void  Penta::MaxVel(double* pmaxvel, bool process_units){
    13061306
    … …  
    13291329}
    13301330/*}}}*/
    1331 /*FUNCTION Penta::MaxVx(double* pmaxvx, bool process_units);{{{1*/
     1331/*FUNCTION Penta::MaxVx{{{1*/
    13321332void  Penta::MaxVx(double* pmaxvx, bool process_units){
    13331333
    … …  
    13561356}
    13571357/*}}}*/
    1358 /*FUNCTION Penta::MaxVy(double* pmaxvy, bool process_units);{{{1*/
     1358/*FUNCTION Penta::MaxVy{{{1*/
    13591359void  Penta::MaxVy(double* pmaxvy, bool process_units){
    13601360
    … …  
    13831383}
    13841384/*}}}*/
    1385 /*FUNCTION Penta::MaxVz(double* pmaxvz, bool process_units);{{{1*/
     1385/*FUNCTION Penta::MaxVz{{{1*/
    13861386void  Penta::MaxVz(double* pmaxvz, bool process_units){
    13871387
    … …  
    14101410}
    14111411/*}}}*/
    1412 /*FUNCTION Penta::MinVel(double* pminvel, bool process_units);{{{1*/
     1412/*FUNCTION Penta::MinVel{{{1*/
    14131413void  Penta::MinVel(double* pminvel, bool process_units){
    14141414
    … …  
    14371437}
    14381438/*}}}*/
    1439 /*FUNCTION Penta::MinVx(double* pminvx, bool process_units);{{{1*/
     1439/*FUNCTION Penta::MinVx{{{1*/
    14401440void  Penta::MinVx(double* pminvx, bool process_units){
    14411441
    … …  
    14641464}
    14651465/*}}}*/
    1466 /*FUNCTION Penta::MinVy(double* pminvy, bool process_units);{{{1*/
     1466/*FUNCTION Penta::MinVy{{{1*/
    14671467void  Penta::MinVy(double* pminvy, bool process_units){
    14681468
    … …  
    14911491}
    14921492/*}}}*/
    1493 /*FUNCTION Penta::MinVz(double* pminvz, bool process_units);{{{1*/
     1493/*FUNCTION Penta::MinVz{{{1*/
    14941494void  Penta::MinVz(double* pminvz, bool process_units){
    14951495
    … …  
    15631563}
    15641564/*}}}*/
    1565 /*FUNCTION Penta::PatchFill(int* pcount, Patch* patch){{{1*/
     1565/*FUNCTION Penta::PatchFill{{{1*/
    15661566void  Penta::PatchFill(int* pcount, Patch* patch){
    15671567
    … …  
    15911591        /*Assign output pointers:*/
    15921592        *pcount=count;
    1593 }
    1594 /*FUNCTION Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/
     1593}/*}}}*/
     1594/*FUNCTION Penta::PatchSize{{{1*/
    15951595void  Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    15961596
    … …  
    16191619}
    16201620/*}}}*/
    1621 /*FUNCTION Penta::ProcessResultsUnits(void){{{1*/
     1621/*FUNCTION Penta::ProcessResultsUnits{{{1*/
    16221622void  Penta::ProcessResultsUnits(void){
    16231623
    … …  
    26192619}
    26202620/*}}}*/
    2621 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){{{1*/
     2621/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/
    26222622void  Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){
    26232623
    … …  
    26552655}
    26562656/*}}}*/
    2657 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert(Vec solution){{{1*/
     2657/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{1*/
    26582658void  Penta::GetSolutionFromInputsDiagnosticVert(Vec solution){
    26592659
    … …  
    26872687}
    26882688/*}}}*/
    2689 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes(Vec solution){{{1*/
     2689/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{1*/
    26902690void  Penta::GetSolutionFromInputsDiagnosticStokes(Vec solution){
    26912691

  • issm/trunk/src/c/objects/Elements/PentaHook.cpp

    r4412 r4546  
    6060}
    6161/*}}}*/
    62 /*FUNCTION PentaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/
     62
     63/*FUNCTION PentaHook::SetHookNodes{{{1*/
    6364void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){
    6465        this->hnodes[analysis_counter]= new Hook(node_ids,6);
    … …  
    6667}
    6768/*}}}*/
    68 /*FUNCTION PentaHook::InitHookNeighbors(int* element_ids){{{1*/
     69/*FUNCTION PentaHook::InitHookNeighbors{{{1*/
    6970void PentaHook::InitHookNeighbors(int* element_ids){
    7071        this->hneighbors=new Hook(element_ids,2);
    … …  
    7273}
    7374/*}}}*/
    74 /*FUNCTION PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices);{{{1*/
     75/*FUNCTION PentaHook::SpawnTriaHook{{{1*/
    7576void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){
    7677

  • issm/trunk/src/c/objects/Elements/Sing.cpp

    r4532 r4546  
    288288}
    289289/*}}}*/
    290 /*FUNCTION Sing::GetSolutionFromInputs(Vec solution);{{{1*/
     290/*FUNCTION Sing::GetSolutionFromInputs{{{1*/
    291291void  Sing::GetSolutionFromInputs(Vec solution){
    292292        ISSMERROR(" not supported yet!");
    … …  
    298298}
    299299/*}}}*/
    300 /*FUNCTION Sing::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/
     300/*FUNCTION Sing::GetVectorFromInputs{{{1*/
    301301void  Sing::GetVectorFromInputs(Vec vector,int NameEnum){
    302302
    … …  
    332332}
    333333/*}}}*/
    334 /*FUNCTION Sing::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
     334/*FUNCTION Sing::InputAXPY{{{1*/
    335335void  Sing::InputAXPY(int YEnum, double scalar, int XEnum){
    336336
    … …  
    350350}
    351351/*}}}*/
    352 /*FUNCTION Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     352/*FUNCTION Sing::InputControlConstrain{{{1*/
    353353void  Sing::InputControlConstrain(int control_type, double cm_min, double cm_max){
    354354
    … …  
    366366}
    367367/*}}}*/
    368 /*FUNCTION Sing::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/
     368/*FUNCTION Sing::InputConvergence{{{1*/
    369369void  Sing::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    370370
    … …  
    395395}
    396396/*}}}*/
    397 /*FUNCTION Sing::InputDuplicate(int original_enum,int new_enum){{{1*/
     397/*FUNCTION Sing::InputDuplicate{{{1*/
    398398void  Sing::InputDuplicate(int original_enum,int new_enum){
    399399
    … …  
    412412}
    413413/*}}}*/
    414 /*FUNCTION Sing::InputScale(int enum_type,double scale_factor){{{1*/
     414/*FUNCTION Sing::InputScale{{{1*/
    415415void  Sing::InputScale(int enum_type,double scale_factor){
    416416
    … …  
    424424}
    425425/*}}}*/
    426 /*FUNCTION Sing::InputToResult(int enum_type,int step,double time){{{1*/
     426/*FUNCTION Sing::InputToResult{{{1*/
    427427void  Sing::InputToResult(int enum_type,int step,double time){
    428428        ISSMERROR(" not supported yet!");
    … …  
    434434}
    435435/*}}}*/
    436 /*FUNCTION Sing::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/
     436/*FUNCTION Sing::MaxAbsVx{{{1*/
    437437void  Sing::MaxAbsVx(double* pmaxabsvx, bool process_units){
    438438
    … …  
    451451}
    452452/*}}}*/
    453 /*FUNCTION Sing::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/
     453/*FUNCTION Sing::MaxAbsVy{{{1*/
    454454void  Sing::MaxAbsVy(double* pmaxabsvy, bool process_units){
    455455
    … …  
    468468}
    469469/*}}}*/
    470 /*FUNCTION Sing::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/
     470/*FUNCTION Sing::MaxAbsVz{{{1*/
    471471void  Sing::MaxAbsVz(double* pmaxabsvz, bool process_units){
    472472
    … …  
    485485}
    486486/*}}}*/
    487 /*FUNCTION Sing::MaxVel(double* pmaxvel, bool process_units);{{{1*/
     487/*FUNCTION Sing::MaxVel{{{1*/
    488488void  Sing::MaxVel(double* pmaxvel, bool process_units){
    489489
    … …  
    502502}
    503503/*}}}*/
    504 /*FUNCTION Sing::MaxVx(double* pmaxvx, bool process_units);{{{1*/
     504/*FUNCTION Sing::MaxVx{{{1*/
    505505void  Sing::MaxVx(double* pmaxvx, bool process_units){
    506506
    … …  
    519519}
    520520/*}}}*/
    521 /*FUNCTION Sing::MaxVy(double* pmaxvy, bool process_units);{{{1*/
     521/*FUNCTION Sing::MaxVy{{{1*/
    522522void  Sing::MaxVy(double* pmaxvy, bool process_units){
    523523
    … …  
    536536}
    537537/*}}}*/
    538 /*FUNCTION Sing::MaxVz(double* pmaxvz, bool process_units);{{{1*/
     538/*FUNCTION Sing::MaxVz{{{1*/
    539539void  Sing::MaxVz(double* pmaxvz, bool process_units){
    540540
    … …  
    553553}
    554554/*}}}*/
    555 /*FUNCTION Sing::MinVel(double* pminvel, bool process_units);{{{1*/
     555/*FUNCTION Sing::MinVel{{{1*/
    556556void  Sing::MinVel(double* pminvel, bool process_units){
    557557
    … …  
    570570}
    571571/*}}}*/
    572 /*FUNCTION Sing::MinVx(double* pminvx, bool process_units);{{{1*/
     572/*FUNCTION Sing::MinVx{{{1*/
    573573void  Sing::MinVx(double* pminvx, bool process_units){
    574574
    … …  
    587587}
    588588/*}}}*/
    589 /*FUNCTION Sing::MinVy(double* pminvy, bool process_units);{{{1*/
     589/*FUNCTION Sing::MinVy{{{1*/
    590590void  Sing::MinVy(double* pminvy, bool process_units){
    591591
    … …  
    604604}
    605605/*}}}*/
    606 /*FUNCTION Sing::MinVz(double* pminvz, bool process_units);{{{1*/
     606/*FUNCTION Sing::MinVz{{{1*/
    607607void  Sing::MinVz(double* pminvz, bool process_units){
    608608
    … …  
    626626}
    627627/*}}}*/
    628 /*FUNCTION Sing::PatchFill(int* pcount, Patch* patch){{{1*/
     628/*FUNCTION Sing::PatchFill{{{1*/
    629629void  Sing::PatchFill(int* pcount, Patch* patch){
    630630       
    … …  
    632632}
    633633/*}}}*/
    634 /*FUNCTION Sing::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/
     634/*FUNCTION Sing::PatchSize{{{1*/
    635635void  Sing::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    636636
    … …  
    639639}
    640640/*}}}*/
    641 /*FUNCTION Sing::ProcessResultsUnits(void){{{1*/
     641/*FUNCTION Sing::ProcessResultsUnits{{{1*/
    642642void  Sing::ProcessResultsUnits(void){
    643643        ISSMERROR(" not supported yet!");
    … …  
    649649}
    650650/*}}}*/
    651 /*FUNCTION Sing::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type);{{{1*/
     651/*FUNCTION Sing::Update{{{1*/
    652652void Sing::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){
    653653        ISSMERROR(" not supported yet!");

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r4532 r4546  
    10051005}
    10061006/*}}}*/
    1007 /*FUNCTION Tria::GetSolutionFromInputs(Vec solution){{{1*/
     1007/*FUNCTION Tria::GetSolutionFromInputs{{{1*/
    10081008void  Tria::GetSolutionFromInputs(Vec solution){
    10091009
    … …  
    10321032}
    10331033/*}}}*/
    1034 /*FUNCTION Tria::GetVectorFromInputs(Vec vector,int NameEnum){{{1*/
     1034/*FUNCTION Tria::GetVectorFromInputs{{{1*/
    10351035void  Tria::GetVectorFromInputs(Vec vector,int NameEnum){
    10361036
    … …  
    13791379}
    13801380/*}}}*/
    1381 /*FUNCTION Tria::InputAXPY(int YEnum, double scalar, int XEnum);{{{1*/
     1381/*FUNCTION Tria::InputAXPY{{{1*/
    13821382void  Tria::InputAXPY(int YEnum, double scalar, int XEnum){
    13831383
    … …  
    13961396}
    13971397/*}}}*/
    1398 /*FUNCTION Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){{{1*/
     1398/*FUNCTION Tria::InputControlConstrain{{{1*/
    13991399void  Tria::InputControlConstrain(int control_type, double cm_min, double cm_max){
    14001400
    … …  
    14121412}
    14131413/*}}}*/
    1414 /*FUNCTION Tria::InputConvergence(int* pconverged, double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){{{1*/
     1414/*FUNCTION Tria::InputConvergence{{{1*/
    14151415void  Tria::InputConvergence(int* pconverged,double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    14161416
    … …  
    14611461}
    14621462/*}}}*/
    1463 /*FUNCTION Tria::InputDuplicate(int original_enum,int new_enum){{{1*/
     1463/*FUNCTION Tria::InputDuplicate{{{1*/
    14641464void  Tria::InputDuplicate(int original_enum,int new_enum){
    14651465
    … …  
    14791479}
    14801480/*}}}*/
    1481 /*FUNCTION Tria::InputScale(int enum_type,double scale_factor){{{1*/
     1481/*FUNCTION Tria::InputScale{{{1*/
    14821482void  Tria::InputScale(int enum_type,double scale_factor){
    14831483
    … …  
    14921492}
    14931493/*}}}*/
    1494 /*FUNCTION Tria::InputToResult(int enum_type,int step,double time){{{1*/
     1494/*FUNCTION Tria::InputToResult{{{1*/
    14951495void  Tria::InputToResult(int enum_type,int step,double time){
    14961496
    … …  
    15741574}
    15751575/*}}}*/
    1576 /*FUNCTION Tria::MaxAbsVx(double* pmaxabsvx, bool process_units);{{{1*/
     1576/*FUNCTION Tria::MaxAbsVx{{{1*/
    15771577void  Tria::MaxAbsVx(double* pmaxabsvx, bool process_units){
    15781578
    … …  
    16001600}
    16011601/*}}}*/
    1602 /*FUNCTION Tria::MaxAbsVy(double* pmaxabsvy, bool process_units);{{{1*/
     1602/*FUNCTION Tria::MaxAbsVy{{{1*/
    16031603void  Tria::MaxAbsVy(double* pmaxabsvy, bool process_units){
    16041604
    … …  
    16261626}
    16271627/*}}}*/
    1628 /*FUNCTION Tria::MaxAbsVz(double* pmaxabsvz, bool process_units);{{{1*/
     1628/*FUNCTION Tria::MaxAbsVz{{{1*/
    16291629void  Tria::MaxAbsVz(double* pmaxabsvz, bool process_units){
    16301630
    … …  
    16521652}
    16531653/*}}}*/
    1654 /*FUNCTION Tria::MaxVel(double* pmaxvel, bool process_units);{{{1*/
     1654/*FUNCTION Tria::MaxVel{{{1*/
    16551655void  Tria::MaxVel(double* pmaxvel, bool process_units){
    16561656
    … …  
    16791679}
    16801680/*}}}*/
    1681 /*FUNCTION Tria::MaxVx(double* pmaxvx, bool process_units);{{{1*/
     1681/*FUNCTION Tria::MaxVx{{{1*/
    16821682void  Tria::MaxVx(double* pmaxvx, bool process_units){
    16831683
    … …  
    17061706}
    17071707/*}}}*/
    1708 /*FUNCTION Tria::MaxVy(double* pmaxvy, bool process_units);{{{1*/
     1708/*FUNCTION Tria::MaxVy{{{1*/
    17091709void  Tria::MaxVy(double* pmaxvy, bool process_units){
    17101710
    … …  
    17331733}
    17341734/*}}}*/
    1735 /*FUNCTION Tria::MaxVz(double* pmaxvz, bool process_units);{{{1*/
     1735/*FUNCTION Tria::MaxVz{{{1*/
    17361736void  Tria::MaxVz(double* pmaxvz, bool process_units){
    17371737
    … …  
    17601760}
    17611761/*}}}*/
    1762 /*FUNCTION Tria::MinVel(double* pminvel, bool process_units);{{{1*/
     1762/*FUNCTION Tria::MinVel{{{1*/
    17631763void  Tria::MinVel(double* pminvel, bool process_units){
    17641764
    … …  
    17871787}
    17881788/*}}}*/
    1789 /*FUNCTION Tria::MinVx(double* pminvx, bool process_units);{{{1*/
     1789/*FUNCTION Tria::MinVx{{{1*/
    17901790void  Tria::MinVx(double* pminvx, bool process_units){
    17911791
    … …  
    18141814}
    18151815/*}}}*/
    1816 /*FUNCTION Tria::MinVy(double* pminvy, bool process_units);{{{1*/
     1816/*FUNCTION Tria::MinVy{{{1*/
    18171817void  Tria::MinVy(double* pminvy, bool process_units){
    18181818
    … …  
    18411841}
    18421842/*}}}*/
    1843 /*FUNCTION Tria::MinVz(double* pminvz, bool process_units);{{{1*/
     1843/*FUNCTION Tria::MinVz{{{1*/
    18441844void  Tria::MinVz(double* pminvz, bool process_units){
    18451845
    … …  
    20602060}
    20612061/*}}}*/
    2062 /*FUNCTION Tria::PatchFill(int* prow, Patch* patch){{{1*/
     2062/*FUNCTION Tria::PatchFill{{{1*/
    20632063void  Tria::PatchFill(int* prow, Patch* patch){
    20642064
    … …  
    20902090}
    20912091/*}}}*/
    2092 /*FUNCTION Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){{{1*/
     2092/*FUNCTION Tria::PatchSize{{{1*/
    20932093void  Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    20942094
    … …  
    21172117}
    21182118/*}}}*/
    2119 /*FUNCTION Tria::ProcessResultsUnits(void){{{1*/
     2119/*FUNCTION Tria::ProcessResultsUnits{{{1*/
    21202120void  Tria::ProcessResultsUnits(void){
    21212121
    … …  
    52255225}
    52265226/*}}}*/
    5227 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){{{1*/
     5227/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/
    52285228void  Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){
    52295229
    … …  
    52615261}
    52625262/*}}}*/
    5263 /*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){{{1*/
     5263/*FUNCTION Tria::GetSolutionFromInputsAdjointHoriz{{{1*/
    52645264void  Tria::GetSolutionFromInputsAdjointHoriz(Vec solution){
    52655265

  • issm/trunk/src/c/objects/Elements/TriaHook.cpp

    r4412 r4546  
    5757}
    5858/*}}}*/
    59 /*FUNCTION TriaHook::SetHookNodes(int* node_ids,int analysis_counter){{{1*/
     59
     60/*FUNCTION TriaHook::SetHookNodes{{{1*/
    6061void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){
    6162

  • issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp

    r4321 r4546  
    142142
    143143/*BoolExternalResult management: */
    144 /*FUNCTION BoolExternalResult::WriteData(FILE* fid) {{{1*/
     144/*FUNCTION BoolExternalResult::WriteData{{{1*/
    145145void   BoolExternalResult::WriteData(FILE* fid){
    146146
    … …  
    177177}
    178178/*}}}1*/
    179 /*FUNCTION BoolExternalResult::GetResultName(void); {{{1*/
     179/*FUNCTION BoolExternalResult::GetResultName{{{1*/
    180180char* BoolExternalResult::GetResultName(void){
    181181        return  EnumAsString(this->enum_type);
    182182}
    183183/*}}}*/
    184 /*FUNCTION BoolExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     184/*FUNCTION BoolExternalResult::SetMatlabField{{{1*/
    185185#ifdef _SERIAL_
    186186void BoolExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    195195#endif
    196196/*}}}*/
    197 /*FUNCTION BoolExternalResult::GetStep(void);{{{1*/
     197/*FUNCTION BoolExternalResult::GetStep{{{1*/
    198198int BoolExternalResult::GetStep(void){
    199199

  • issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp

    r4321 r4546  
    142142
    143143/*DoubleExternalResult management: */
    144 /*FUNCTION DoubleExternalResult::WriteData(FILE* fid) {{{1*/
     144/*FUNCTION DoubleExternalResult::WriteData{{{1*/
    145145void   DoubleExternalResult::WriteData(FILE* fid){
    146146
    … …  
    173173}
    174174/*}}}1*/
    175 /*FUNCTION DoubleExternalResult::GetResultName(void); {{{1*/
     175/*FUNCTION DoubleExternalResult::GetResultName{{{1*/
    176176char* DoubleExternalResult::GetResultName(void){
    177177        return  EnumAsString(this->enum_type);
    178178}
    179179/*}}}*/
    180 /*FUNCTION DoubleExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     180/*FUNCTION DoubleExternalResult::SetMatlabField{{{1*/
    181181#ifdef _SERIAL_
    182182void DoubleExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    191191#endif
    192192/*}}}*/
    193 /*FUNCTION DoubleExternalResult::GetStep(void);{{{1*/
     193/*FUNCTION DoubleExternalResult::GetStep{{{1*/
    194194int DoubleExternalResult::GetStep(void){
    195195

  • issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

    r4526 r4546  
    179179
    180180/*DoubleMatExternalResult management: */
    181 /*FUNCTION DoubleMatExternalResult::WriteData(FILE* fid) {{{1*/
     181/*FUNCTION DoubleMatExternalResult::WriteData{{{1*/
    182182void   DoubleMatExternalResult::WriteData(FILE* fid){
    183183
    … …  
    212212}
    213213/*}}}1*/
    214 /*FUNCTION DoubleMatExternalResult::GetResultName(void); {{{1*/
     214/*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/
    215215char* DoubleMatExternalResult::GetResultName(void){
    216216        return  EnumAsString(this->enum_type);
    217217}
    218218/*}}}*/
    219 /*FUNCTION DoubleMatExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     219/*FUNCTION DoubleMatExternalResult::SetMatlabField{{{1*/
    220220#ifdef _SERIAL_
    221221void DoubleMatExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    250250#endif
    251251/*}}}*/
    252 /*FUNCTION DoubleMatExternalResult::GetStep(void);{{{1*/
     252/*FUNCTION DoubleMatExternalResult::GetStep{{{1*/
    253253int DoubleMatExternalResult::GetStep(void){
    254254

  • issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

    r4321 r4546  
    167167
    168168/*DoubleVecExternalResult management: */
    169 /*FUNCTION DoubleVecExternalResult::WriteData(FILE* fid) {{{1*/
     169/*FUNCTION DoubleVecExternalResult::WriteData{{{1*/
    170170void   DoubleVecExternalResult::WriteData(FILE* fid){
    171171
    … …  
    198198}
    199199/*}}}1*/
    200 /*FUNCTION DoubleVecExternalResult::GetResultName(void); {{{1*/
     200/*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/
    201201char* DoubleVecExternalResult::GetResultName(void){
    202202        return  EnumAsString(this->enum_type);
    203203}
    204204/*}}}*/
    205 /*FUNCTION DoubleVecExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     205/*FUNCTION DoubleVecExternalResult::SetMatlabField{{{1*/
    206206#ifdef _SERIAL_
    207207void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    232232#endif
    233233/*}}}*/
    234 /*FUNCTION DoubleVecExternalResult::GetStep(void);{{{1*/
     234/*FUNCTION DoubleVecExternalResult::GetStep{{{1*/
    235235int DoubleVecExternalResult::GetStep(void){
    236236

  • issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp

    r4321 r4546  
    142142
    143143/*IntExternalResult management: */
    144 /*FUNCTION IntExternalResult::WriteData(FILE* fid) {{{1*/
     144/*FUNCTION IntExternalResult::WriteData{{{1*/
    145145void   IntExternalResult::WriteData(FILE* fid){
    146146
    … …  
    177177}
    178178/*}}}1*/
    179 /*FUNCTION IntExternalResult::GetResultName(void); {{{1*/
     179/*FUNCTION IntExternalResult::GetResultName{{{1*/
    180180char* IntExternalResult::GetResultName(void){
    181181        return  EnumAsString(this->enum_type);
    182182}
    183183/*}}}*/
    184 /*FUNCTION IntExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     184/*FUNCTION IntExternalResult::SetMatlabField{{{1*/
    185185#ifdef _SERIAL_
    186186void IntExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    196196#endif
    197197/*}}}*/
    198 /*FUNCTION IntExternalResult::GetStep(void);{{{1*/
     198/*FUNCTION IntExternalResult::GetStep{{{1*/
    199199int IntExternalResult::GetStep(void){
    200200

  • issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp

    r4321 r4546  
    198198
    199199/*PetscVecExternalResult management: */
    200 /*FUNCTION PetscVecExternalResult::WriteData(FILE* fid) {{{1*/
     200/*FUNCTION PetscVecExternalResult::WriteData{{{1*/
    201201void   PetscVecExternalResult::WriteData(FILE* fid){
    202202
    … …  
    235235}
    236236/*}}}1*/
    237 /*FUNCTION PetscVecExternalResult::GetResultName(void); {{{1*/
     237/*FUNCTION PetscVecExternalResult::GetResultName{{{1*/
    238238char* PetscVecExternalResult::GetResultName(void){
    239239        return  EnumAsString(this->enum_type);
    240240}
    241241/*}}}*/
    242 /*FUNCTION PetscVecExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     242/*FUNCTION PetscVecExternalResult::SetMatlabField{{{1*/
    243243#ifdef _SERIAL_
    244244void  PetscVecExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    265265#endif
    266266/*}}}*/
    267 /*FUNCTION PetscVecExternalResult::GetStep(void);{{{1*/
     267/*FUNCTION PetscVecExternalResult::GetStep{{{1*/
    268268int PetscVecExternalResult::GetStep(void){
    269269

  • issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp

    r4321 r4546  
    157157
    158158/*StringExternalResult management: */
    159 /*FUNCTION StringExternalResult::WriteData(FILE* fid) {{{1*/
     159/*FUNCTION StringExternalResult::WriteData{{{1*/
    160160void   StringExternalResult::WriteData(FILE* fid){
    161161
    … …  
    188188}
    189189/*}}}1*/
    190 /*FUNCTION StringExternalResult::GetResultName(void); {{{1*/
     190/*FUNCTION StringExternalResult::GetResultName{{{1*/
    191191char* StringExternalResult::GetResultName(void){
    192192        return  EnumAsString(this->enum_type);
    193193}
    194194/*}}}*/
    195 /*FUNCTION StringExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
     195/*FUNCTION StringExternalResult::SetMatlabField{{{1*/
    196196#ifdef _SERIAL_
    197197void  StringExternalResult::SetMatlabField(mxArray* dataref){
    … …  
    208208#endif
    209209/*}}}*/
    210 /*FUNCTION StringExternalResult::GetStep(void);{{{1*/
     210/*FUNCTION StringExternalResult::GetStep{{{1*/
    211211int StringExternalResult::GetStep(void){
    212212

  • issm/trunk/src/c/objects/Hook.cpp

    r4400 r4546  
    208208}
    209209/*}}}*/
    210 /*FUNCTION Hook::copy(void) {{{1*/
     210/*FUNCTION Hook::copy {{{1*/
    211211Object* Hook::copy(void){
    212212

  • issm/trunk/src/c/objects/Inputs/BeamVertexInput.cpp

    r4248 r4546  
    200200void BeamVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    201201/*}}}*/
    202 /*FUNCTION BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     202/*FUNCTION BeamVertexInput::GetParameterValues{{{1*/
    203203void BeamVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){
    204204        /*It is assumed that output has been correctly allocated*/
    … …  
    216216}
    217217/*}}}*/
    218 /*FUNCTION BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     218/*FUNCTION BeamVertexInput::GetParameterDerivativeValue{{{1*/
    219219void BeamVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");}
    220220/*}}}*/
    221 /*FUNCTION BeamVertexInput::ChangeEnum(int newenumtype){{{1*/
     221/*FUNCTION BeamVertexInput::ChangeEnum{{{1*/
    222222void BeamVertexInput::ChangeEnum(int newenumtype){
    223223        this->enum_type=newenumtype;
    224224}
    225225/*}}}*/
    226 /*FUNCTION BeamVertexInput::GetParameterAverage(double* pvalue){{{1*/
     226/*FUNCTION BeamVertexInput::GetParameterAverage{{{1*/
    227227void BeamVertexInput::GetParameterAverage(double* pvalue){
    228228        *pvalue=1./2.*(values[0]+values[1]);
    229229}
    230230/*}}}*/
    231 /*FUNCTION BeamVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     231/*FUNCTION BeamVertexInput::SquareMin{{{1*/
    232232void BeamVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    233233
    … …  
    252252}
    253253/*}}}*/
    254 /*FUNCTION BeamVertexInput::Scale(double scale_factor){{{1*/
     254/*FUNCTION BeamVertexInput::Scale{{{1*/
    255255void BeamVertexInput::Scale(double scale_factor){
    256256
    … …  
    261261}
    262262/*}}}*/
    263 /*FUNCTION BeamVertexInput::AXPY(Input* xinput,double scalar);{{{1*/
     263/*FUNCTION BeamVertexInput::AXPY{{{1*/
    264264void BeamVertexInput::AXPY(Input* xinput,double scalar){
    265265
    … …  
    284284}
    285285/*}}}*/
    286 /*FUNCTION BeamVertexInput::Constrain(double cm_min, double cm_max){{{1*/
     286/*FUNCTION BeamVertexInput::Constrain{{{1*/
    287287void BeamVertexInput::Constrain(double cm_min, double cm_max){
    288288
    … …  
    295295}
    296296/*}}}*/
    297 /*FUNCTION BeamVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     297/*FUNCTION BeamVertexInput::GetVectorFromInputs{{{1*/
    298298void BeamVertexInput::GetVectorFromInputs(Vec vector,int* doflist){
    299299
    … …  
    304304}
    305305/*}}}*/
    306 /*FUNCTION BeamVertexInput::GetValuesPtr(double* pvalues,int* pnum_values);{{{1*/
     306/*FUNCTION BeamVertexInput::GetValuesPtr{{{1*/
    307307void BeamVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){
    308308

  • issm/trunk/src/c/objects/Inputs/BoolInput.cpp

    r4248 r4546  
    208208void BoolInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    209209/*}}}*/
    210 /*FUNCTION BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     210/*FUNCTION BoolInput::GetParameterValues{{{1*/
    211211void BoolInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}
    212212/*}}}*/
    213 /*FUNCTION BoolInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     213/*FUNCTION BoolInput::GetParameterDerivativeValue{{{1*/
    214214void BoolInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");}
    215215/*}}}*/
    216 /*FUNCTION BoolInput::ChangeEnum(int newenumtype){{{1*/
     216/*FUNCTION BoolInput::ChangeEnum{{{1*/
    217217void BoolInput::ChangeEnum(int newenumtype){
    218218        this->enum_type=newenumtype;
    219219}
    220220/*}}}*/
    221 /*FUNCTION BoolInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     221/*FUNCTION BoolInput::SquareMin{{{1*/
    222222void BoolInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    223223        /*square of a bool is the bool itself: */
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION BoolInput::Scale(double scale_factor){{{1*/
     227/*FUNCTION BoolInput::Scale{{{1*/
    228228void BoolInput::Scale(double scale_factor){
    229229        /*a bool cannot be scaled: */
    230230}
    231231/*}}}*/
    232 /*FUNCTION BoolInput::AXPY(Input* xinput,double scalar);{{{1*/
     232/*FUNCTION BoolInput::AXPY{{{1*/
    233233void BoolInput::AXPY(Input* xinput,double scalar){
    234234
    … …  
    251251}
    252252/*}}}*/
    253 /*FUNCTION BoolInput::Constrain(double cm_min, double cm_max){{{1*/
     253/*FUNCTION BoolInput::Constrain{{{1*/
    254254void BoolInput::Constrain(double cm_min, double cm_max){
    255255
    … …  
    259259}
    260260/*}}}*/
    261 /*FUNCTION BoolInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     261/*FUNCTION BoolInput::GetVectorFromInputs{{{1*/
    262262void BoolInput::GetVectorFromInputs(Vec vector,int* doflist){
    263263
    … …  
    266266}
    267267/*}}}*/
    268 /*FUNCTION BoolInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     268/*FUNCTION BoolInput::GetValuesPtr{{{1*/
    269269void BoolInput::GetValuesPtr(double** pvalues,int* pnum_values){
    270270

  • issm/trunk/src/c/objects/Inputs/DoubleInput.cpp

    r4528 r4546  
    221221void DoubleInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    222222/*}}}*/
    223 /*FUNCTION DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     223/*FUNCTION DoubleInput::GetParameterValues{{{1*/
    224224void DoubleInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}
    225225/*}}}*/
    226 /*FUNCTION DoubleInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     226/*FUNCTION DoubleInput::GetParameterDerivativeValue{{{1*/
    227227void DoubleInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");}
    228228/*}}}*/
    229 /*FUNCTION DoubleInput::ChangeEnum(int newenumtype){{{1*/
     229/*FUNCTION DoubleInput::ChangeEnum{{{1*/
    230230void DoubleInput::ChangeEnum(int newenumtype){
    231231        this->enum_type=newenumtype;
    232232}
    233233/*}}}*/
    234 /*FUNCTION DoubleInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     234/*FUNCTION DoubleInput::SquareMin{{{1*/
    235235void DoubleInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    236236
    … …  
    239239}
    240240/*}}}*/
    241 /*FUNCTION DoubleInput::Scale(double scale_factor){{{1*/
     241/*FUNCTION DoubleInput::Scale{{{1*/
    242242void DoubleInput::Scale(double scale_factor){
    243243        value=value*scale_factor;
    244244}
    245245/*}}}*/
    246 /*FUNCTION DoubleInput::AXPY(Input* xinput,double scalar);{{{1*/
     246/*FUNCTION DoubleInput::AXPY{{{1*/
    247247void DoubleInput::AXPY(Input* xinput,double scalar){
    248248
    … …  
    265265}
    266266/*}}}*/
    267 /*FUNCTION DoubleInput::Constrain(double cm_min, double cm_max){{{1*/
     267/*FUNCTION DoubleInput::Constrain{{{1*/
    268268void DoubleInput::Constrain(double cm_min, double cm_max){
    269269
    … …  
    273273}
    274274/*}}}*/
    275 /*FUNCTION DoubleInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     275/*FUNCTION DoubleInput::GetVectorFromInputs{{{1*/
    276276void DoubleInput::GetVectorFromInputs(Vec vector,int* doflist){
    277277
    … …  
    280280}
    281281/*}}}*/
    282 /*FUNCTION DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     282/*FUNCTION DoubleInput::GetValuesPtr{{{1*/
    283283void DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values){
    284284

  • issm/trunk/src/c/objects/Inputs/IntInput.cpp

    r4353 r4546  
    207207void IntInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    208208/*}}}*/
    209 /*FUNCTION IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     209/*FUNCTION IntInput::GetParameterValues{{{1*/
    210210void IntInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}
    211211/*}}}*/
    212 /*FUNCTION IntInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     212/*FUNCTION IntInput::GetParameterDerivativeValue{{{1*/
    213213void IntInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");}
    214214/*}}}*/
    215 /*FUNCTION IntInput::ChangeEnum(int newenumtype){{{1*/
     215/*FUNCTION IntInput::ChangeEnum{{{1*/
    216216void IntInput::ChangeEnum(int newenumtype){
    217217        this->enum_type=newenumtype;
    218218}
    219219/*}}}*/
    220 /*FUNCTION IntInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     220/*FUNCTION IntInput::SquareMin{{{1*/
    221221void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    222222
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION IntInput::Scale(double scale_factor){{{1*/
     227/*FUNCTION IntInput::Scale{{{1*/
    228228void IntInput::Scale(double scale_factor){
    229229        double dvalue=(double)value*scale_factor;
    … …  
    231231}
    232232/*}}}*/
    233 /*FUNCTION IntInput::AXPY(Input* xinput,int scalar);{{{1*/
     233/*FUNCTION IntInput::AXPY{{{1*/
    234234void IntInput::AXPY(Input* xinput,double scalar){
    235235
    … …  
    254254}
    255255/*}}}*/
    256 /*FUNCTION IntInput::Constrain(double cm_min, double cm_max){{{1*/
     256/*FUNCTION IntInput::Constrain{{{1*/
    257257void IntInput::Constrain(double cm_min, double cm_max){
    258258
    … …  
    262262}
    263263/*}}}*/
    264 /*FUNCTION IntInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     264/*FUNCTION IntInput::GetVectorFromInputs{{{1*/
    265265void IntInput::GetVectorFromInputs(Vec vector,int* doflist){
    266266
    … …  
    269269}
    270270/*}}}*/
    271 /*FUNCTION IntInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     271/*FUNCTION IntInput::GetValuesPtr{{{1*/
    272272void IntInput::GetValuesPtr(double** pvalues,int* pnum_values){
    273273

  • issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

    r4502 r4546  
    243243void PentaVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    244244/*}}}*/
    245 /*FUNCTION PentaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     245/*FUNCTION PentaVertexInput::GetParameterValues{{{1*/
    246246void PentaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){
    247247        /*It is assumed that output values has been correctly allocated*/
    … …  
    260260}
    261261/*}}}*/
    262 /*FUNCTION PentaVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     262/*FUNCTION PentaVertexInput::GetParameterDerivativeValue{{{1*/
    263263void PentaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){
    264264        /*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:
    … …  
    283283}
    284284/*}}}*/
    285 /*FUNCTION PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/
     285/*FUNCTION PentaVertexInput::GetVxStrainRate3d{{{1*/
    286286void PentaVertexInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, double* gauss){
    287287        int i,j;
    … …  
    328328}
    329329/*}}}*/
    330 /*FUNCTION PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/
     330/*FUNCTION PentaVertexInput::GetVyStrainRate3d{{{1*/
    331331void PentaVertexInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, double* gauss){
    332332        int i,j;
    … …  
    373373}
    374374/*}}}*/
    375 /*FUNCTION PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss) {{{1*/
     375/*FUNCTION PentaVertexInput::GetVzStrainRate3d{{{1*/
    376376void PentaVertexInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, double* gauss){
    377377        int i,j;
    … …  
    419419}
    420420/*}}}*/
    421 /*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/
     421/*FUNCTION PentaVertexInput::GetVxStrainRate3dPattyn{{{1*/
    422422void PentaVertexInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){
    423423
    … …  
    444444}
    445445/*}}}*/
    446 /*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/
     446/*FUNCTION PentaVertexInput::GetVyStrainRate3dPattyn{{{1*/
    447447void PentaVertexInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){
    448448
    … …  
    469469}
    470470/*}}}*/
    471 /*FUNCTION PentaVertexInput::ChangeEnum(int newenumtype){{{1*/
     471/*FUNCTION PentaVertexInput::ChangeEnum{{{1*/
    472472void PentaVertexInput::ChangeEnum(int newenumtype){
    473473        this->enum_type=newenumtype;
    474474}
    475475/*}}}*/
    476 /*FUNCTION PentaVertexInput::GetParameterAverage(double* pvalue){{{1*/
     476/*FUNCTION PentaVertexInput::GetParameterAverage{{{1*/
    477477void PentaVertexInput::GetParameterAverage(double* pvalue){
    478478        *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]);
    … …  
    10161016}
    10171017/*}}}*/
    1018 /*FUNCTION PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     1018/*FUNCTION PentaVertexInput::GetVectorFromInputs{{{1*/
    10191019void PentaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){
    10201020
    … …  
    10231023
    10241024} /*}}}*/
    1025 /*FUNCTION PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     1025/*FUNCTION PentaVertexInput::GetValuesPtr{{{1*/
    10261026void PentaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){
    10271027

  • issm/trunk/src/c/objects/Inputs/SingVertexInput.cpp

    r4248 r4546  
    191191void SingVertexInput::GetParameterValue(double* pvalue,double* gauss,double defaultvalue){ISSMERROR(" not supported yet!");}
    192192/*}}}*/
    193 /*FUNCTION SingVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     193/*FUNCTION SingVertexInput::GetParameterValues{{{1*/
    194194void SingVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){ISSMERROR(" not supported yet!");}
    195195/*}}}*/
    196 /*FUNCTION SingVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     196/*FUNCTION SingVertexInput::GetParameterDerivativeValue{{{1*/
    197197void SingVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){ISSMERROR(" not supported yet!");}
    198198/*}}}*/
    199 /*FUNCTION SingVertexInput::ChangeEnum(int newenumtype){{{1*/
     199/*FUNCTION SingVertexInput::ChangeEnum{{{1*/
    200200void SingVertexInput::ChangeEnum(int newenumtype){
    201201        this->enum_type=newenumtype;
    202202}
    203203/*}}}*/
    204 /*FUNCTION SingVertexInput::GetParameterAverage(double* pvalue){{{1*/
     204/*FUNCTION SingVertexInput::GetParameterAverage{{{1*/
    205205void SingVertexInput::GetParameterAverage(double* pvalue){
    206206        *pvalue=value;
    207207}
    208208/*}}}*/
    209 /*FUNCTION SingVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     209/*FUNCTION SingVertexInput::SquareMin{{{1*/
    210210void SingVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    211211
    … …  
    226226}
    227227/*}}}*/
    228 /*FUNCTION SingVertexInput::Scale(double scale_factor){{{1*/
     228/*FUNCTION SingVertexInput::Scale{{{1*/
    229229void SingVertexInput::Scale(double scale_factor){
    230230        value=value*scale_factor;
    231231}
    232232/*}}}*/
    233 /*FUNCTION SingVertexInput::AXPY(Input* xinput,double scalar);{{{1*/
     233/*FUNCTION SingVertexInput::AXPY{{{1*/
    234234void SingVertexInput::AXPY(Input* xinput,double scalar){
    235235
    … …  
    252252}
    253253/*}}}*/
    254 /*FUNCTION SingVertexInput::Constrain(double cm_min, double cm_max){{{1*/
     254/*FUNCTION SingVertexInput::Constrain{{{1*/
    255255void SingVertexInput::Constrain(double cm_min, double cm_max){
    256256
    … …  
    260260}
    261261/*}}}*/
    262 /*FUNCTION SingVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     262/*FUNCTION SingVertexInput::GetVectorFromInputs{{{1*/
    263263void SingVertexInput::GetVectorFromInputs(Vec vector,int* doflist){
    264264
    … …  
    269269}
    270270/*}}}*/
    271 /*FUNCTION SingVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     271/*FUNCTION SingVertexInput::GetValuesPtr{{{1*/
    272272void SingVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){
    273273

  • issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp

    r4502 r4546  
    196196
    197197/*Object functions*/
    198 /*FUNCTION TriaVertexInput::GetParameterValue(double* pvalue,double* gauss){{{1*/
     198/*FUNCTION TriaVertexInput::GetParameterValue{{{1*/
    199199void TriaVertexInput::GetParameterValue(double* pvalue,double* gauss){
    200200        /*P1 interpolation on Gauss point*/
    … …  
    211211}
    212212/*}}}*/
    213 /*FUNCTION TriaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){{{1*/
     213/*FUNCTION TriaVertexInput::GetParameterValues{{{1*/
    214214void TriaVertexInput::GetParameterValues(double* values,double* gauss_pointers, int numgauss){
    215215        /*It is assumed that output values has been correctly allocated*/
    … …  
    229229}
    230230/*}}}*/
    231 /*FUNCTION TriaVertexInput::GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss){{{1*/
     231/*FUNCTION TriaVertexInput::GetParameterDerivativeValue{{{1*/
    232232void TriaVertexInput::GetParameterDerivativeValue(double* p, double* xyz_list, double* gauss){
    233233        /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian
    … …  
    251251}
    252252/*}}}*/
    253 /*FUNCTION TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss) {{{1*/
     253/*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/
    254254void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, double* gauss){
    255255
    … …  
    275275}
    276276/*}}}*/
    277 /*FUNCTION TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss) {{{1*/
     277/*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/
    278278void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, double* gauss){
    279279
    … …  
    299299}
    300300/*}}}*/
    301 /*FUNCTION TriaVertexInput::ChangeEnum(int newenumtype){{{1*/
     301/*FUNCTION TriaVertexInput::ChangeEnum{{{1*/
    302302void TriaVertexInput::ChangeEnum(int newenumtype){
    303303        this->enum_type=newenumtype;
    304304}
    305305/*}}}*/
    306 /*FUNCTION TriaVertexInput::GetParameterAverage(double* pvalue){{{1*/
     306/*FUNCTION TriaVertexInput::GetParameterAverage{{{1*/
    307307void TriaVertexInput::GetParameterAverage(double* pvalue){
    308308        *pvalue=1./3.*(values[0]+values[1]+values[2]);
    … …  
    452452}
    453453/*}}}*/
    454 /*FUNCTION TriaVertexInput::SquareMin(double* psquaremin, bool process_units){{{1*/
     454/*FUNCTION TriaVertexInput::SquareMin{{{1*/
    455455void TriaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    456456
    … …  
    475475}
    476476/*}}}*/
    477 /*FUNCTION TriaVertexInput::Scale(double scale_factor){{{1*/
     477/*FUNCTION TriaVertexInput::Scale{{{1*/
    478478void TriaVertexInput::Scale(double scale_factor){
    479479       
    … …  
    484484}
    485485/*}}}*/
    486 /*FUNCTION TriaVertexInput::AXPY(Input* xinput,double scalar);{{{1*/
     486/*FUNCTION TriaVertexInput::AXPY{{{1*/
    487487void TriaVertexInput::AXPY(Input* xinput,double scalar){
    488488
    … …  
    507507}
    508508/*}}}*/
    509 /*FUNCTION TriaVertexInput::Constrain(double cm_min, double cm_max){{{1*/
     509/*FUNCTION TriaVertexInput::Constrain{{{1*/
    510510void TriaVertexInput::Constrain(double cm_min, double cm_max){
    511511
    … …  
    518518}
    519519/*}}}*/
    520 /*FUNCTION TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
     520/*FUNCTION TriaVertexInput::GetVectorFromInputs{{{1*/
    521521void TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){
    522522
    … …  
    525525
    526526} /*}}}*/
    527 /*FUNCTION TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values);{{{1*/
     527/*FUNCTION TriaVertexInput::GetValuesPtr{{{1*/
    528528void TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){
    529529

  • issm/trunk/src/c/objects/IoModel.cpp

    r4382 r4546  
    221221}
    222222/*}}}*/
    223 /*FUNCTION IoModel::IoModelInit(void){{{1*/
     223/*FUNCTION IoModel::IoModelInit{{{1*/
    224224void IoModel::IoModelInit(void){
    225225       
    … …  
    387387}
    388388/*}}}*/
    389 /*FUNCTION IoModel::Echo(int which_part,int rank){{{1*/
     389/*FUNCTION IoModel::Echo{{{1*/
    390390void IoModel::Echo(int which_part,int rank) {
    391391

  • issm/trunk/src/c/objects/Loads/Friction.cpp

    r4461 r4546  
    2020/*}}}*/
    2121
    22 /*methods: */
     22/*Constructors/destructors*/
    2323/*FUNCTION Friction::Friction() {{{1*/
    2424Friction::Friction(){
    … …  
    4444}
    4545/*}}}*/
     46
     47/*methods: */
    4648/*FUNCTION Friction::Echo {{{1*/
    4749void Friction::Echo(void){
    … …  
    5355}
    5456/*}}}*/
    55 /*FUNCTION Friction::GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){{{1*/
     57/*FUNCTION Friction::GetAlpha2{{{1*/
    5658void Friction::GetAlpha2(double* palpha2, double* gauss,int vxenum,int vyenum,int vzenum){
    5759

  • issm/trunk/src/c/objects/Loads/Icefront.cpp

    r4456 r4546  
    323323}
    324324/*}}}*/
    325 /*FUNCTION Icefront::InAnalysis(int analysis_type){{{1*/
     325/*FUNCTION Icefront::InAnalysis{{{1*/
    326326bool Icefront::InAnalysis(int in_analysis_type){
    327327        if (in_analysis_type==this->analysis_type)return true;
    … …  
    361361}
    362362/*}}}*/
    363 /*FUNCTION Icefront::InputUpdateFromSolution(double* solution) {{{1*/
     363/*FUNCTION Icefront::InputUpdateFromSolution{{{1*/
    364364void  Icefront::InputUpdateFromSolution(double* solution){
    365365        /*Nothing updated yet*/

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r4456 r4546  
    343343}
    344344/*}}}*/
    345 /*FUNCTION Numericalflux::InAnalysis(int analysis_type){{{1*/
     345/*FUNCTION Numericalflux::InAnalysis{{{1*/
    346346bool Numericalflux::InAnalysis(int in_analysis_type){
    347347        if (in_analysis_type==this->analysis_type) return true;

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r4492 r4546  
    319319}
    320320/*}}}1*/
    321 /*FUNCTION Pengrid::InAnalysis(int analysis_type){{{1*/
     321/*FUNCTION Pengrid::InAnalysis{{{1*/
    322322bool Pengrid::InAnalysis(int in_analysis_type){
    323323        if (in_analysis_type==this->analysis_type)return true;
    … …  
    370370}
    371371/*}}}*/
    372 /*FUNCTION Pengrid::InputUpdateFromSolution(double* solution) {{{1*/
     372/*FUNCTION Pengrid::InputUpdateFromSolution{{{1*/
    373373void  Pengrid::InputUpdateFromSolution(double* solution){
    374374        /*Nothing updated yet*/

  • issm/trunk/src/c/objects/Loads/Penpair.cpp

    r4396 r4546  
    210210}
    211211/*}}}1*/
    212 /*FUNCTION Penpair::InAnalysis(int analysis_type){{{1*/
     212/*FUNCTION Penpair::InAnalysis{{{1*/
    213213bool Penpair::InAnalysis(int in_analysis_type){
    214214        if (in_analysis_type==this->analysis_type)return true;

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r4456 r4546  
    541541}
    542542/*}}}1*/
    543 /*FUNCTION Riftfront::InAnalysis(int analysis_type){{{1*/
     543/*FUNCTION Riftfront::InAnalysis{{{1*/
    544544bool Riftfront::InAnalysis(int in_analysis_type){
    545545        if (in_analysis_type==this->analysis_type) return true;

  • issm/trunk/src/c/objects/Materials/Material.cpp

    r3683 r4546  
    33 * the Object derived class Material.
    44 */
    5 
    65
    76#include "../objects.h"
    … …  
    1211        return MaterialEnum;
    1312}
    14                
    15 

  • issm/trunk/src/c/objects/Materials/Matice.cpp

    r4248 r4546  
    2727}
    2828/*}}}*/
     29/*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/
     30Matice::Matice(int matice_mid,int i, IoModel* iomodel){
     31
     32        int j;
     33       
     34        /*needed for Init routine:*/
     35        double matice_B;
     36        double matice_n;
     37        int    num_vertices;
     38
     39        /*intermediary: */
     40        double B_avg;
     41
     42        /*2d or 3d? */
     43        if(iomodel->dim==2){
     44                num_vertices=3; //tria elements
     45        }
     46        else if(iomodel->dim==3){
     47                num_vertices=6; //penta elements
     48        }
     49        else ISSMERROR(" Mesh type not supported yet!");
     50
     51        /*Compute B on the element if provided*/
     52        if (iomodel->rheology_B){
     53                B_avg=0;
     54                for(j=0;j<num_vertices;j++){
     55                        B_avg+=*(iomodel->rheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1));
     56                }
     57                B_avg=B_avg/num_vertices;
     58                matice_B=B_avg;
     59        }
     60        else matice_B=UNDEF;
     61       
     62        if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i);
     63        else matice_n=UNDEF;
     64
     65        this->Init(matice_mid,matice_B,matice_n);
     66}
     67/*}}}*/
     68/*FUNCTION Matice::~Matice(){{{1*/
     69Matice::~Matice(){
     70        return;
     71}
     72/*}}}*/
    2973/*FUNCTION Matice::Init {{{1*/
    3074void Matice::Init(int in_mid,double in_B,double in_n){
    … …  
    3276        this->B=in_B;
    3377        this->n=in_n;
    34 }
    35 /*}}}*/
    36 /*FUNCTION Matice::Matice(int id, int i, IoModel* iomodel, int num_vertices){{{1*/
    37 Matice::Matice(int matice_mid,int i, IoModel* iomodel){
    38 
    39         int j;
    40        
    41         /*needed for Init routine:*/
    42         double matice_B;
    43         double matice_n;
    44         int    num_vertices;
    45 
    46         /*intermediary: */
    47         double B_avg;
    48 
    49         /*2d or 3d? */
    50         if(iomodel->dim==2){
    51                 num_vertices=3; //tria elements
    52         }
    53         else if(iomodel->dim==3){
    54                 num_vertices=6; //penta elements
    55         }
    56         else ISSMERROR(" Mesh type not supported yet!");
    57 
    58         /*Compute B on the element if provided*/
    59         if (iomodel->rheology_B){
    60                 B_avg=0;
    61                 for(j=0;j<num_vertices;j++){
    62                         B_avg+=*(iomodel->rheology_B+((int)*(iomodel->elements+num_vertices*i+j)-1));
    63                 }
    64                 B_avg=B_avg/num_vertices;
    65                 matice_B=B_avg;
    66         }
    67         else matice_B=UNDEF;
    68        
    69         if (iomodel->rheology_n) matice_n=(double)*(iomodel->rheology_n+i);
    70         else matice_n=UNDEF;
    71 
    72         this->Init(matice_mid,matice_B,matice_n);
    73 }
    74 /*}}}*/
    75 /*FUNCTION Matice::~Matice(){{{1*/
    76 Matice::~Matice(){
    77         return;
    7878}
    7979/*}}}*/
    … …  
    471471}
    472472/*}}}*/
    473 /*FUNCTION Matice::InputUpdateFromSolution(double* solution) {{{1*/
     473/*FUNCTION Matice::InputUpdateFromSolution{{{1*/
    474474void  Matice::InputUpdateFromSolution(double* solution){
    475475        /*Nothing updated yet*/

  • issm/trunk/src/c/objects/Materials/Matpar.cpp

    r4532 r4546  
    22 * \brief: implementation of the Matpar object
    33 */
    4 
    54
    65#ifdef HAVE_CONFIG_H
    … …  
    1615#include "../../include/include.h"
    1716#include "../../EnumDefinitions/EnumDefinitions.h"
    18 
    1917               
    2018/*Matpar constructors and destructor*/
    … …  
    286284}
    287285/*}}}*/
    288 /*FUNCTION Matpar::InputUpdateFromSolution(double* solution) {{{1*/
     286/*FUNCTION Matpar::InputUpdateFromSolution{{{1*/
    289287void   Matpar::InputUpdateFromSolution(double* solution){
    290288        /*Nothing updated yet*/

  • issm/trunk/src/c/objects/Node.cpp

    r4401 r4546  
    1818#include "../include/include.h"
    1919/*}}}*/
    20 /*Node constructors and destructors: {{{1*/
    21 /*FUNCTION Node::Node() default constructor {{{2*/
     20
     21/*Node constructors and destructors:*/
     22/*FUNCTION Node::Node() default constructor {{{1*/
    2223Node::Node(){
    2324        this->inputs=NULL;
    … …  
    2728}
    2829/*}}}*/
    29 /*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{2*/
     30/*FUNCTION Node::Node(int id, int vertex_id, int uppernode_id, int numdofs, NodeProperties*) {{{1*/
    3031Node::Node(int node_id,int node_sid, int node_vertex_id, int node_upper_node_id, int node_numdofs):
    3132        indexing(node_numdofs){
    … …  
    4041}
    4142/*}}}*/
    42 /*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{2*/
     43/*FUNCTION Node::Node(int id, DofIndexing* indexing, Hook* vertex, Hook* uppernode,Inputs* inputs,int analysis_type){{{1*/
    4344Node::Node(int node_id,int node_sid, DofIndexing* node_indexing, Hook* node_vertex, Hook* node_upper_node,Inputs* node_inputs,int analysis_type):
    4445            indexing(node_indexing),
    … …  
    5960}
    6061/*}}}*/
    61 /*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{2*/
     62/*FUNCTION Node::Node(int node_id,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{1*/
    6263Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type){
    6364
    … …  
    173174}
    174175/*}}}*/
    175 /*FUNCTION Node::~Node(){{{2*/
     176/*FUNCTION Node::~Node(){{{1*/
    176177Node::~Node(){
    177178        delete inputs;
    … …  
    181182}
    182183/*}}}*/
    183 /*}}}*/
    184 /*Object virtual functions definitions: {{{1*/
    185 /*FUNCTION Node::Echo{{{2*/
     184
     185/*Object virtual functions definitions:*/
     186/*FUNCTION Node::Echo{{{1*/
    186187void Node::Echo(void){
    187188
    … …  
    198199}
    199200/*}}}*/
    200 /*FUNCTION Node::DeepEcho{{{2*/
     201/*FUNCTION Node::DeepEcho{{{1*/
    201202void Node::DeepEcho(void){
    202203
    … …  
    216217}
    217218/*}}}*/
    218 /*FUNCTION Node::Id{{{2*/
     219/*FUNCTION Node::Id{{{1*/
    219220int    Node::Id(void){ return id; }
    220221/*}}}*/
    221 /*FUNCTION Node::MyRank{{{2*/
     222/*FUNCTION Node::MyRank{{{1*/
    222223int    Node::MyRank(void){
    223224        extern int my_rank;
    … …  
    226227}
    227228/*}}}*/
    228 /*FUNCTION Node::Marshall{{{2*/
     229/*FUNCTION Node::Marshall{{{1*/
    229230void  Node::Marshall(char** pmarshalled_dataset){
    230231
    … …  
    266267}
    267268/*}}}*/
    268 /*FUNCTION Node::MarshallSize{{{2*/
     269/*FUNCTION Node::MarshallSize{{{1*/
    269270int   Node::MarshallSize(){
    270271
    … …  
    279280}
    280281/*}}}*/
    281 /*FUNCTION Node::Demarshall{{{2*/
     282/*FUNCTION Node::Demarshall{{{1*/
    282283void  Node::Demarshall(char** pmarshalled_dataset){
    283284
    … …  
    307308}
    308309/*}}}*/
    309 /*FUNCTION Node::Enum{{{2*/
     310/*FUNCTION Node::Enum{{{1*/
    310311int Node::Enum(void){
    311312
    … …  
    314315}
    315316/*}}}*/
    316 /*FUNCTION Node::copy {{{2*/
     317/*FUNCTION Node::copy {{{1*/
    317318Object* Node::copy() {
    318319               
    … …  
    322323
    323324/*}}}*/
    324 /*}}}*/
    325 /*Node management: {{{1*/
    326 /*FUNCTION Node::Configure {{{2*/
     325
     326/*Node management:*/
     327/*FUNCTION Node::Configure {{{1*/
    327328void  Node::Configure(DataSet* nodesin,Vertices* verticesin){
    328329
    … …  
    335336
    336337}
    337 /*FUNCTION Node::GetDof {{{2*/
     338/*FUNCTION Node::GetDof {{{1*/
    338339int   Node::GetDof(int dofindex){
    339340
    … …  
    342343}
    343344/*}}}*/
    344 /*FUNCTION Node::GetDofList1{{{2*/
     345/*FUNCTION Node::GetDofList1{{{1*/
    345346int  Node::GetDofList1(void){
    346347
    … …  
    352353}
    353354/*}}}*/
    354 /*FUNCTION Node::GetDofList{{{2*/
     355/*FUNCTION Node::GetDofList{{{1*/
    355356void  Node::GetDofList(int* outdoflist,int* pnumberofdofspernode){
    356357
    … …  
    363364}
    364365/*}}}*/
    365 /*FUNCTION Node::Sid{{{2*/
     366/*FUNCTION Node::Sid{{{1*/
    366367int    Node::Sid(void){ return sid; }
    367368/*}}}*/
    368 /*FUNCTION Node::GetVertexId {{{2*/
     369/*FUNCTION Node::GetVertexId {{{1*/
    369370int   Node::GetVertexId(void){
    370371
    … …  
    375376}
    376377/*}}}*/
    377 /*FUNCTION Node::GetVertexDof {{{2*/
     378/*FUNCTION Node::GetVertexDof {{{1*/
    378379int   Node::GetVertexDof(void){
    379380
    … …  
    384385}
    385386/*}}}*/
    386 /*FUNCTION Node::SetVertexDof {{{2*/
     387/*FUNCTION Node::SetVertexDof {{{1*/
    387388void   Node::SetVertexDof(int in_dof){
    388389
    … …  
    394395}
    395396/*}}}*/
    396 /*FUNCTION Node::InAnalysis(int analysis_type){{{2*/
     397/*FUNCTION Node::InAnalysis{{{1*/
    397398bool Node::InAnalysis(int in_analysis_type){
    398399        if (in_analysis_type==this->analysis_type) return true;
    … …  
    400401}
    401402/*}}}*/
    402 /*}}}*/
    403 /*Node numerics: {{{1*/
    404 /*FUNCTION Node::ApplyConstraints{{{2*/
     403
     404/*Node numerics:*/
     405/*FUNCTION Node::ApplyConstraints{{{1*/
    405406void  Node::ApplyConstraint(Vec yg,int dof,double value){
    406407
    … …  
    425426}
    426427/*}}}*/
    427 /*FUNCTION Node::CreateVecSets {{{2*/
     428/*FUNCTION Node::CreateVecSets {{{1*/
    428429void  Node::CreateVecSets(Vec pv_g,Vec pv_m,Vec pv_n,Vec pv_f,Vec pv_s){
    429430
    … …  
    459460}
    460461/*}}}*/
    461 /*FUNCTION Node::DofInMSet{{{2*/
     462/*FUNCTION Node::DofInMSet{{{1*/
    462463void  Node::DofInMSet(int dof){
    463464
    … …  
    470471}
    471472/*}}}*/
    472 /*FUNCTION Node::DofInSSet {{{2*/
     473/*FUNCTION Node::DofInSSet {{{1*/
    473474void  Node::DofInSSet(int dof){
    474475
    … …  
    482483}
    483484/*}}}*/
    484 /*FUNCTION Node::DofIsInMSet{{{2*/
     485/*FUNCTION Node::DofIsInMSet{{{1*/
    485486int  Node::DofIsInMSet(int dof){
    486487
    … …  
    490491}
    491492/*}}}*/
    492 /*FUNCTION Node::FieldAverageOntoVertices{{{2*/
     493/*FUNCTION Node::FieldAverageOntoVertices{{{1*/
    493494void  Node::FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field){
    494495
    … …  
    514515}
    515516/*}}}*/
    516 /*FUNCTION Node::FieldDepthAverageAtBase{{{2*/
     517/*FUNCTION Node::FieldDepthAverageAtBase{{{1*/
    517518void  Node::FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname){
    518519
    … …  
    643644}
    644645/*}}}*/
    645 /*FUNCTION Node::VecExtrude {{{2*/
     646/*FUNCTION Node::VecExtrude {{{1*/
    646647void  Node::VecExtrude(Vec vector,double* vector_serial){
    647648               
    … …  
    684685}
    685686/*}}}*/
    686 /*FUNCTION Node::FreezeDof{{{2*/
     687/*FUNCTION Node::FreezeDof{{{1*/
    687688void  Node::FreezeDof(int dof){
    688689       
    … …  
    691692}
    692693/*}}}*/
    693 /*FUNCTION Node::GetConnectivity {{{2*/
     694/*FUNCTION Node::GetConnectivity {{{1*/
    694695int Node::GetConnectivity(){
    695696        int connectivity;
    … …  
    701702}
    702703/*}}}*/
    703 /*FUNCTION Node::GetNumberOfDofs{{{2*/
     704/*FUNCTION Node::GetNumberOfDofs{{{1*/
    704705int   Node::GetNumberOfDofs(){
    705706       
    … …  
    708709}
    709710/*}}}*/
    710 /*FUNCTION Node::GetSigma {{{2*/
     711/*FUNCTION Node::GetSigma {{{1*/
    711712double Node::GetSigma(){
    712713        Vertex* vertex=NULL;
    … …  
    716717}
    717718/*}}}*/
    718 /*FUNCTION Node::GetUpperNode {{{2*/
     719/*FUNCTION Node::GetUpperNode {{{1*/
    719720Node* Node::GetUpperNode(){
    720721        Node* upper_node=NULL;
    … …  
    723724}
    724725/*}}}*/
    725 /*FUNCTION Node::GetX {{{2*/
     726/*FUNCTION Node::GetX {{{1*/
    726727double Node::GetX(){
    727728        Vertex* vertex=NULL;
    … …  
    731732}
    732733/*}}}*/
    733 /*FUNCTION Node::GetY {{{2*/
     734/*FUNCTION Node::GetY {{{1*/
    734735double Node::GetY(){
    735736        Vertex* vertex=NULL;
    … …  
    739740}
    740741/*}}}*/
    741 /*FUNCTION Node::GetZ {{{2*/
     742/*FUNCTION Node::GetZ {{{1*/
    742743double Node::GetZ(){
    743744        Vertex* vertex=NULL;
    … …  
    747748}
    748749/*}}}*/
    749 /*FUNCTION Node::IsClone {{{2*/
     750/*FUNCTION Node::IsClone {{{1*/
    750751int   Node::IsClone(){
    751752       
    … …  
    754755}
    755756/*}}}*/
    756 /*FUNCTION Node::IsOnBed {{{2*/
     757/*FUNCTION Node::IsOnBed {{{1*/
    757758int   Node::IsOnBed(){
    758759
    … …  
    765766}
    766767/*}}}*/
    767 /*FUNCTION Node::IsOnSheet {{{2*/
     768/*FUNCTION Node::IsOnSheet {{{1*/
    768769int   Node::IsOnSheet(){
    769770
    … …  
    776777}               
    777778/*}}}*/
    778 /*FUNCTION Node::IsOnShelf {{{2*/
     779/*FUNCTION Node::IsOnShelf {{{1*/
    779780int   Node::IsOnShelf(){
    780781       
    … …  
    787788}
    788789/*}}}*/
    789 /*FUNCTION Node::IsOnSurface {{{2*/
     790/*FUNCTION Node::IsOnSurface {{{1*/
    790791int   Node::IsOnSurface(){
    791792
    … …  
    798799}
    799800/*}}}*/
    800 /*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{2*/
     801/*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{1*/
    801802void  Node::InputUpdateFromVector(double* vector, int name, int type){
    802803
    … …  
    804805}
    805806/*}}}*/
    806 /*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{2*/
     807/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{1*/
    807808void  Node::InputUpdateFromVector(int* vector, int name, int type){
    808809
    … …  
    810811}
    811812/*}}}*/
    812 /*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{2*/
     813/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{1*/
    813814void  Node::InputUpdateFromVector(bool* vector, int name, int type){
    814815
    … …  
    816817}
    817818/*}}}*/
    818 /*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{2*/
     819/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{1*/
    819820void  Node::InputUpdateFromConstant(double constant, int name){
    820821
    … …  
    822823}
    823824/*}}}*/
    824 /*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{2*/
     825/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{1*/
    825826void  Node::InputUpdateFromConstant(int constant, int name){
    826827
    … …  
    828829}
    829830/*}}}*/
    830 /*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{2*/
     831/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{1*/
    831832void  Node::InputUpdateFromConstant(bool constant, int name){
    832833
    … …  
    834835}
    835836/*}}}*/
    836 /*}}}*/
    837 /* DofObject routines: {{{1*/
    838 /*FUNCTION Node::DistributeDofs{{{2*/
     837
     838/* DofObject routines:*/
     839/*FUNCTION Node::DistributeDofs{{{1*/
    839840void  Node::DistributeDofs(int* pdofcount){
    840841
    … …  
    861862}
    862863/*}}}*/
    863 /*FUNCTION Node::OffsetDofs{{{2*/
     864/*FUNCTION Node::OffsetDofs{{{1*/
    864865void  Node::OffsetDofs(int dofcount){
    865866       
    … …  
    878879}
    879880/*}}}*/
    880 /*FUNCTION Node::ShowTrueDofs{{{2*/
     881/*FUNCTION Node::ShowTrueDofs{{{1*/
    881882void  Node::ShowTrueDofs(int* truedofs){
    882883
    … …  
    894895}
    895896/*}}}*/
    896 /*FUNCTION Node::UpdateCloneDofs{{{2*/
     897/*FUNCTION Node::UpdateCloneDofs{{{1*/
    897898void  Node::UpdateCloneDofs(int* alltruedofs){
    898899
    … …  
    910911}
    911912/*}}}*/
    912 /*FUNCTION Node::SetClone {{{2*/
     913/*FUNCTION Node::SetClone {{{1*/
    913914void  Node::SetClone(int* minranks){
    914915
    … …  
    926927}
    927928/*}}}*/
    928 /*FUNCTION Node::CreatePartition{{{2*/
     929/*FUNCTION Node::CreatePartition{{{1*/
    929930void  Node::CreatePartition(Vec partition){
    930931
    … …  
    933934}
    934935/*}}}*/
    935 /*}}}*/

  • issm/trunk/src/c/objects/NodeSets.cpp

    r3775 r4546  
    77#include "./objects.h"
    88
    9 /*--------------------------------------------------
    10         Construtor
    11   --------------------------------------------------*/
     9/*constructors and destructors*/
     10/*FUNCTION NodeSets::NodeSets{{{1*/
    1211NodeSets::NodeSets( double* nodesets_pv_m,double* nodesets_pv_n,double* nodesets_pv_f,double* nodesets_pv_s,
    1312                int nodesets_gsize,int nodesets_msize,int nodesets_nsize,int nodesets_fsize,int nodesets_ssize){
    … …  
    2423        pv_s=nodesets_pv_s;
    2524
    26 }
    27 
    28 
    29 
    30 /*--------------------------------------------------
    31         Destructor:
    32   --------------------------------------------------*/
    33 
     25}/*}}}*/
     26/*FUNCTION NodeSets::~NodeSets{{{1*/
    3427NodeSets::~NodeSets(void){
    3528
    … …  
    3932        xfree((void**)&pv_s);
    4033
    41 }
     34}/*}}}*/
    4235
    43 /*--------------------------------------------------
    44         Echo
    45   --------------------------------------------------*/
    46 
     36/*Object management*/
     37/*FUNCTION NodeSets::Echo{{{1*/
    4738void NodeSets::Echo(void){
    4839       
    … …  
    8374                }
    8475        }       
    85 }
    86 
    87 
    88 /*Access to internals: */
    89 int NodeSets::GetGSize(){ return gsize;}
    90 int NodeSets::GetMSize(){ return msize;}
    91 int NodeSets::GetNSize(){ return nsize;}
    92 int NodeSets::GetFSize(){ return fsize;}
    93 int NodeSets::GetSSize(){ return ssize;}
    94 double* NodeSets::GetPV_M(){ return pv_m;}
    95 double* NodeSets::GetPV_N(){ return pv_n;}
    96 double* NodeSets::GetPV_F(){ return pv_f;}
    97 double* NodeSets::GetPV_S(){ return pv_s;}
    98 
    99 
     76}/*}}}*/
     77/*FUNCTION NodeSets::GetGSize{{{1*/
     78int NodeSets::GetGSize(){
     79        return gsize;
     80}/*}}}*/
     81/*FUNCTION NodeSets::GetMSize{{{1*/
     82int NodeSets::GetMSize(){
     83        return msize;
     84}/*}}}*/
     85/*FUNCTION NodeSets::GetNSize{{{1*/
     86int NodeSets::GetNSize(){
     87        return nsize;
     88}/*}}}*/
     89/*FUNCTION NodeSets::GetFSize{{{1*/
     90int NodeSets::GetFSize(){
     91        return fsize;
     92}/*}}}*/
     93/*FUNCTION NodeSets::GetSSize{{{1*/
     94int NodeSets::GetSSize(){
     95        return ssize;
     96}/*}}}*/
     97/*FUNCTION NodeSets::GetPV_M{{{1*/
     98double* NodeSets::GetPV_M(){
     99        return pv_m;
     100}/*}}}*/
     101/*FUNCTION NodeSets::GetPV_N{{{1*/
     102double* NodeSets::GetPV_N(){
     103        return pv_n;
     104}/*}}}*/
     105/*FUNCTION NodeSets::GetPV_F{{{1*/
     106double* NodeSets::GetPV_F(){
     107        return pv_f;
     108}/*}}}*/
     109/*FUNCTION NodeSets::GetPV_S{{{1*/
     110double* NodeSets::GetPV_S(){
     111        return pv_s;
     112}/*}}}*/

  • issm/trunk/src/c/objects/Params/BoolParam.cpp

    r4248 r4546  
    127127
    128128/*BoolParam virtual functions definitions: */
    129 /*FUNCTION BoolParam::GetParameterName(void); {{{1*/
     129/*FUNCTION BoolParam::GetParameterName{{{1*/
    130130char* BoolParam::GetParameterName(void){
    131131        return  EnumAsString(this->enum_type);
    132132}
    133133/*}}}*/
    134 /*FUNCTION BoolParam::SetMatlabField(mxArray* dataref);{{{1*/
     134/*FUNCTION BoolParam::SetMatlabField{{{1*/
    135135#ifdef _SERIAL_
    136136void  BoolParam::SetMatlabField(mxArray* dataref){

  • issm/trunk/src/c/objects/Params/DoubleMatParam.cpp

    r4526 r4546  
    152152
    153153/*DoubleMatParam virtual functions definitions: */
    154 /*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/
     154/*FUNCTION DoubleMatParam::GetParameterValue{{{1*/
    155155void  DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
    156156        double* output=NULL;
    … …  
    168168}
    169169/*}}}*/
    170 /*FUNCTION DoubleMatParam::GetParameterName(void); {{{1*/
     170/*FUNCTION DoubleMatParam::GetParameterName{{{1*/
    171171char* DoubleMatParam::GetParameterName(void){
    172172        return  EnumAsString(this->enum_type);
    173173}
    174174/*}}}*/
    175 /*FUNCTION DoubleMatParam::SetMatlabField(mxArray* dataref);{{{1*/
     175/*FUNCTION DoubleMatParam::SetMatlabField{{{1*/
    176176#ifdef _SERIAL_
    177177void  DoubleMatParam::SetMatlabField(mxArray* dataref){
    … …  
    197197#endif
    198198/*}}}*/
    199 /*FUNCTION DoubleMatParam::SetValue(double* doublearray,int M,int N);{{{1*/
     199/*FUNCTION DoubleMatParam::SetValue{{{1*/
    200200void  DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){
    201201

  • issm/trunk/src/c/objects/Params/DoubleParam.cpp

    r4528 r4546  
    124124
    125125/*DoubleParam virtual functions definitions: */
    126 /*FUNCTION DoubleParam::GetParameterName(void); {{{1*/
     126/*FUNCTION DoubleParam::GetParameterName{{{1*/
    127127char* DoubleParam::GetParameterName(void){
    128128        return  EnumAsString(this->enum_type);
    129129}
    130130/*}}}*/
    131 /*FUNCTION DoubleParam::GetParameterValue(int* pinteger) {{{1*/
     131/*FUNCTION DoubleParam::GetParameterValue{{{1*/
    132132void DoubleParam::GetParameterValue(int* pinteger){
    133133#ifdef _SERIAL_
    … …  
    138138}
    139139/*}}}*/
    140 /*FUNCTION DoubleParam::GetParameterValue(bool* pbool) {{{1*/
     140/*FUNCTION DoubleParam::GetParameterValue{{{1*/
    141141void DoubleParam::GetParameterValue(bool* pbool){
    142142#ifdef _SERIAL_
    … …  
    151151}
    152152/*}}}*/
    153 /*FUNCTION DoubleParam::SetMatlabField(mxArray* dataref);{{{1*/
     153/*FUNCTION DoubleParam::SetMatlabField{{{1*/
    154154#ifdef _SERIAL_
    155155void  DoubleParam::SetMatlabField(mxArray* dataref){

  • issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

    r4352 r4546  
    146146
    147147/*DoubleVecParam virtual functions definitions: */
    148 /*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
     148/*FUNCTION DoubleVecParam::GetParameterValue{{{1*/
    149149void  DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){
    150150        double* output=NULL;
    … …  
    160160}
    161161/*}}}*/
    162 /*FUNCTION DoubleVecParam::GetParameterName(void); {{{1*/
     162/*FUNCTION DoubleVecParam::GetParameterName{{{1*/
    163163char* DoubleVecParam::GetParameterName(void){
    164164        return  EnumAsString(this->enum_type);
    165165}
    166166/*}}}*/
    167 /*FUNCTION DoubleVecParam::SetMatlabField(mxArray* dataref);{{{1*/
     167/*FUNCTION DoubleVecParam::SetMatlabField{{{1*/
    168168#ifdef _SERIAL_
    169169void  DoubleVecParam::SetMatlabField(mxArray* dataref){
    … …  
    186186#endif
    187187/*}}}*/
    188 /*FUNCTION DoubleVecParam::SetValue(double* doublearray,int M);{{{1*/
     188/*FUNCTION DoubleVecParam::SetValue{{{1*/
    189189void  DoubleVecParam::SetValue(double* doublearray,int in_M){
    190190

  • issm/trunk/src/c/objects/Params/IntParam.cpp

    r4248 r4546  
    127127
    128128/*IntParam virtual functions definitions: */
    129 /*FUNCTION IntParam::GetParameterName(void); {{{1*/
     129/*FUNCTION IntParam::GetParameterName{{{1*/
    130130char* IntParam::GetParameterName(void){
    131131        return  EnumAsString(this->enum_type);
    132132}
    133133/*}}}*/
    134 /*FUNCTION IntParam::SetMatlabField(mxArray* dataref);{{{1*/
     134/*FUNCTION IntParam::SetMatlabField{{{1*/
    135135#ifdef _SERIAL_
    136136void  IntParam::SetMatlabField(mxArray* dataref){

  • issm/trunk/src/c/objects/Params/PetscMatParam.cpp

    r4248 r4546  
    188188
    189189/*PetscMatParam virtual functions definitions: */
    190 /*FUNCTION PetscMatParam::GetParameterValue(Mat* pvalue){{{1*/
     190/*FUNCTION PetscMatParam::GetParameterValue{{{1*/
    191191void  PetscMatParam::GetParameterValue(Mat* poutput){
    192192        Mat output=NULL;
    … …  
    198198}
    199199/*}}}*/
    200 /*FUNCTION PetscMatParam::GetParameterName(void); {{{1*/
     200/*FUNCTION PetscMatParam::GetParameterName{{{1*/
    201201char* PetscMatParam::GetParameterName(void){
    202202        return  EnumAsString(this->enum_type);
    203203}
    204204/*}}}*/
    205 /*FUNCTION PetscMatParam::SetMatlabField(mxArray* dataref);{{{1*/
     205/*FUNCTION PetscMatParam::SetMatlabField{{{1*/
    206206#ifdef _SERIAL_
    207207void  PetscMatParam::SetMatlabField(mxArray* dataref){
    … …  
    224224#endif
    225225/*}}}*/
    226 /*FUNCTION PetscMatParam::SetValue(Mat matrix){{{1*/
     226/*FUNCTION PetscMatParam::SetValue{{{1*/
    227227void  PetscMatParam::SetValue(Mat matrix){
    228228       

  • issm/trunk/src/c/objects/Params/PetscVecParam.cpp

    r4248 r4546  
    180180
    181181/*PetscVecParam virtual functions definitions: */
    182 /*FUNCTION PetscVecParam::GetParameterValue(Vec* pvalue){{{1*/
     182/*FUNCTION PetscVecParam::GetParameterValue{{{1*/
    183183void  PetscVecParam::GetParameterValue(Vec* poutput){
    184184        Vec output=NULL;
    … …  
    191191}
    192192/*}}}*/
    193 /*FUNCTION PetscVecParam::GetParameterName(void); {{{1*/
     193/*FUNCTION PetscVecParam::GetParameterName{{{1*/
    194194char* PetscVecParam::GetParameterName(void){
    195195        return  EnumAsString(this->enum_type);
    196196}
    197197/*}}}*/
    198 /*FUNCTION PetscVecParam::SetMatlabField(mxArray* dataref);{{{1*/
     198/*FUNCTION PetscVecParam::SetMatlabField{{{1*/
    199199#ifdef _SERIAL_
    200200void  PetscVecParam::SetMatlabField(mxArray* dataref){
    … …  
    218218#endif
    219219/*}}}*/
    220 /*FUNCTION PetscVecParam::SetValue(Vec vector){{{1*/
     220/*FUNCTION PetscVecParam::SetValue{{{1*/
    221221void  PetscVecParam::SetValue(Vec vector){
    222222

  • issm/trunk/src/c/objects/Params/StringArrayParam.cpp

    r4248 r4546  
    192192
    193193/*StringArrayParam virtual functions definitions: */
    194 /*FUNCTION StringArrayParam::GetParameterValue(char*** pstringarray, int* pnumstrings){{{1*/
     194/*FUNCTION StringArrayParam::GetParameterValue{{{1*/
    195195void  StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){
    196196       
    … …  
    220220}
    221221/*}}}*/
    222 /*FUNCTION StringArrayParam::GetParameterName(void); {{{1*/
     222/*FUNCTION StringArrayParam::GetParameterName{{{1*/
    223223char* StringArrayParam::GetParameterName(void){
    224224        return  EnumAsString(this->enum_type);
    225225}
    226226/*}}}*/
    227 /*FUNCTION StringArrayParam::SetMatlabField(mxArray* dataref);{{{1*/
     227/*FUNCTION StringArrayParam::SetMatlabField{{{1*/
    228228#ifdef _SERIAL_
    229229void  StringArrayParam::SetMatlabField(mxArray* dataref){
    … …  
    247247#endif
    248248/*}}}*/
    249 /*FUNCTION StringArrayParam::SetValue(char** stringarray, int M){{{1*/
     249/*FUNCTION StringArrayParam::SetValue{{{1*/
    250250void  StringArrayParam::SetValue(char** stringarray,int M){
    251251       

  • issm/trunk/src/c/objects/Params/StringParam.cpp

    r4248 r4546  
    142142
    143143/*StringParam virtual functions definitions: */
    144 /*FUNCTION StringParam::GetParameterValue(char** pstring){{{1*/
     144/*FUNCTION StringParam::GetParameterValue{{{1*/
    145145void  StringParam::GetParameterValue(char** pstring){
    146146       
    … …  
    157157}
    158158/*}}}*/
    159 /*FUNCTION StringParam::GetParameterName(void); {{{1*/
     159/*FUNCTION StringParam::GetParameterName{{{1*/
    160160char* StringParam::GetParameterName(void){
    161161        return  EnumAsString(this->enum_type);
    162162}
    163163/*}}}*/
    164 /*FUNCTION StringParam::SetMatlabField(mxArray* dataref);{{{1*/
     164/*FUNCTION StringParam::SetMatlabField{{{1*/
    165165#ifdef _SERIAL_
    166166void  StringParam::SetMatlabField(mxArray* dataref){
    … …  
    173173#endif
    174174/*}}}*/
    175 /*FUNCTION StringParam::SetValue(char* string){{{1*/
     175/*FUNCTION StringParam::SetValue{{{1*/
    176176void  StringParam::SetValue(char* string){
    177177       

  • issm/trunk/src/c/objects/Patch.cpp

    r4508 r4546  
    112112void Patch::MPI_Gather(void){
    113113
    114 
    115114        int         i;
    116115        int         count;
    … …  
    154153        }       
    155154
    156 
    157155        /*Now, node 0 has total_values, of size total_numrows*this->numcols. Update the fields in the patch, to reflect this new
    158156         * reality. For other cpus, no point in keeping their data anymore: */
    … …  
    166164                xfree((void**)&this->values);
    167165        }
    168 
    169 }
    170 /*}}}*/
     166}/*}}}*/

  • issm/trunk/src/c/objects/Vertex.cpp

    r4492 r4546  
    2626Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){
    2727        this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma);
     28}
     29/*}}}*/
     30/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/
     31Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
     32
     33        this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i]));
     34
     35}
     36/*}}}*/
     37/*FUNCTION Vertex::~Vertex() {{{1*/
     38Vertex::~Vertex(){
     39        return;
    2840}
    2941/*}}}*/
    … …  
    4355}
    4456/*}}}*/
    45 /*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/
    46 Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
    47 
    48         this->Init(vertex_id, vertex_sid, iomodel->x[i],iomodel->y[i],iomodel->z[i],(iomodel->z[i]-iomodel->bed[i])/(iomodel->thickness[i]));
    49 
    50 }
    51 /*}}}*/
    52 /*FUNCTION Vertex::~Vertex() {{{1*/
    53 Vertex::~Vertex(){
    54         return;
    55 }
    56 /*}}}*/
    5757
    5858/*Object virtual functions definitions:*/
    59 /*FUNCTION Echo{{{1*/
     59/*FUNCTION Vertex::Echo{{{1*/
    6060void Vertex::Echo(void){
    6161
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION DeepEcho{{{1*/
     75/*FUNCTION Vertex::DeepEcho{{{1*/
    7676
    7777void Vertex::DeepEcho(void){
    … …  
    7979}
    8080/*}}}*/
    81 /*FUNCTION Id{{{1*/
     81/*FUNCTION Vertex::Id{{{1*/
    8282int    Vertex::Id(void){ return id; }
    8383/*}}}*/
    84 /*FUNCTION MyRank {{{1*/
     84/*FUNCTION Vertex::MyRank {{{1*/
    8585int    Vertex::MyRank(void){
    8686        extern int my_rank;
    … …  
    8888}
    8989/*}}}*/
    90 /*FUNCTION Marshall {{{1*/
     90/*FUNCTION Vertex::Marshall {{{1*/
    9191void  Vertex::Marshall(char** pmarshalled_dataset){
    9292
    … …  
    117117}
    118118/*}}}*/
    119 /*FUNCTION MarshallSize {{{1*/
     119/*FUNCTION Vertex::MarshallSize {{{1*/
    120120int   Vertex::MarshallSize(){
    121121       
    … …  
    131131}
    132132/*}}}*/
    133 /*FUNCTION Demarshall {{{1*/
     133/*FUNCTION Vertex::Demarshall {{{1*/
    134134void  Vertex::Demarshall(char** pmarshalled_dataset){
    135135
    … …  
    157157}
    158158/*}}}*/
    159 /*FUNCTION Enum {{{1*/
     159/*FUNCTION Vertex::Enum {{{1*/
    160160int Vertex::Enum(void){
    161161
    … …  
    164164}
    165165/*}}}*/
    166 /*FUNCTION copy {{{1*/
     166/*FUNCTION Vertex::copy {{{1*/
    167167Object* Vertex::copy() {
    168168
    … …  
    173173
    174174/* DofObject routines: */
    175 /*FUNCTION Vertex DistributeDofs{{{1*/
     175/*FUNCTION Vertex::DistributeDofs{{{1*/
    176176void  Vertex::DistributeDofs(int* pdofcount){
    177177
    … …  
    196196}
    197197/*}}}*/
    198 /*FUNCTION Vertex OffsetDofs{{{1*/
     198/*FUNCTION Vertex::OffsetDofs{{{1*/
    199199void  Vertex::OffsetDofs(int dofcount){
    200200       
    … …  
    211211}
    212212/*}}}*/
    213 /*FUNCTION Vertex ShowTrueDofs{{{1*/
     213/*FUNCTION Vertex::ShowTrueDofs{{{1*/
    214214void  Vertex::ShowTrueDofs(int* truedofs){
    215215
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION Vertex UpdateCloneDofs{{{1*/
     227/*FUNCTION Vertex::UpdateCloneDofs{{{1*/
    228228void  Vertex::UpdateCloneDofs(int* alltruedofs){
    229229
    … …  
    239239}
    240240/*}}}*/
    241 /*FUNCTION Vertex SetClone {{{1*/
     241/*FUNCTION Vertex::SetClone {{{1*/
    242242void  Vertex::SetClone(int* minranks){
    243243
    … …  
    255255}
    256256/*}}}*/
    257 /*FUNCTION Vertex CreatePartition{{{1*/
     257/*FUNCTION Vertex::CreatePartition{{{1*/
    258258void  Vertex::CreatePartition(Vec partition){
    259259
    … …  
    270270
    271271/*Vertex management: */
    272 /*FUNCTION Sid{{{1*/
     272/*FUNCTION Vertex::Sid{{{1*/
    273273int    Vertex::Sid(void){ return sid; }
    274274/*}}}*/
    275 /*FUNCTION UpdateVertexPosition {{{1*/
     275/*FUNCTION Vertex::UpdateVertexPosition {{{1*/
    276276void  Vertex::UpdatePosition(double* thickness,double* bed){
    277277
    … …  
    281281}
    282282/*}}}*/
    283 
Note: See TracChangeset for help on using the changeset viewer.