Changeset 12365


Ignore:
Timestamp:
06/04/12 16:40:38 (13 years ago)
Author:
Mathieu Morlighem
Message:

Do not number folds (folding is automated)

Location:
issm/trunk-jpl/src
Files:
300 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Container/Constraints.cpp

    r12102 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Constraints::Constraints(){{{1*/
     27/*FUNCTION Constraints::Constraints(){{{*/
    2828Constraints::Constraints(){
    2929        enum_type=ConstraintsEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Constraints::~Constraints(){{{1*/
     33/*FUNCTION Constraints::~Constraints(){{{*/
    3434Constraints::~Constraints(){
    3535        return;
    … …  
    3838
    3939/*Numerics: */
    40 /*FUNCTION Constraints::NumberOfConstraints{{{1*/
     40/*FUNCTION Constraints::NumberOfConstraints{{{*/
    4141int Constraints::NumberOfConstraints(void){
    4242

  • issm/trunk-jpl/src/c/Container/Constraints.h

    r10522 r12365  
    2121        public:
    2222
    23                 /*constructors, destructors: {{{1*/
     23                /*constructors, destructors: {{{*/
    2424                Constraints();
    2525                ~Constraints();
    2626                /*}}}*/
    27                 /*numerics: {{{1*/
     27                /*numerics: {{{*/
    2828                int   NumberOfConstraints(void);
    2929                /*}}}*/

  • issm/trunk-jpl/src/c/Container/DataSet.cpp

    r12315 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2828
    2929/*Constructors/Destructors*/
    30 /*FUNCTION DataSet::DataSet(){{{1*/
     30/*FUNCTION DataSet::DataSet(){{{*/
    3131DataSet::DataSet(){
    3232       
    … …  
    3737}
    3838/*}}}*/
    39 /*FUNCTION DataSet::DataSet(int dataset_enum){{{1*/
     39/*FUNCTION DataSet::DataSet(int dataset_enum){{{*/
    4040DataSet::DataSet(int dataset_enum){
    4141        enum_type=dataset_enum;
    … …  
    4747}
    4848/*}}}*/
    49 /*FUNCTION DataSet::Copy{{{1*/
     49/*FUNCTION DataSet::Copy{{{*/
    5050DataSet*   DataSet::Copy(void){
    5151
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION DataSet::~DataSet{{{1*/
     79/*FUNCTION DataSet::~DataSet{{{*/
    8080DataSet::~DataSet(){
    8181        clear();
    … …  
    8686
    8787/*Specific methods*/
    88 /*FUNCTION DataSet::AddObject{{{1*/
     88/*FUNCTION DataSet::AddObject{{{*/
    8989int  DataSet::AddObject(Object* object){
    9090
    … …  
    9494}
    9595/*}}}*/
    96 /*FUNCTION DataSet::clear{{{1*/
     96/*FUNCTION DataSet::clear{{{*/
    9797void  DataSet::clear(){
    9898
    … …  
    112112}
    113113/*}}}*/
    114 /*FUNCTION DataSet::DeleteObject{{{1*/
     114/*FUNCTION DataSet::DeleteObject{{{*/
    115115int  DataSet::DeleteObject(Object* object){
    116116
    … …  
    127127}
    128128/*}}}*/
    129 /*FUNCTION DataSet::DeepEcho{{{1*/
     129/*FUNCTION DataSet::DeepEcho{{{*/
    130130void DataSet::DeepEcho(){
    131131
    … …  
    145145}
    146146/*}}}*/
    147 /*FUNCTION DataSet::Echo{{{1*/
     147/*FUNCTION DataSet::Echo{{{*/
    148148void DataSet::Echo(){
    149149
    … …  
    163163}
    164164/*}}}*/
    165 /*FUNCTION DataSet::GetEnum(){{{1*/
     165/*FUNCTION DataSet::GetEnum(){{{*/
    166166int  DataSet::GetEnum(){
    167167        return enum_type;
    168168}
    169169/*}}}*/
    170 /*FUNCTION DataSet::GetEnum(int offset){{{1*/
     170/*FUNCTION DataSet::GetEnum(int offset){{{*/
    171171int   DataSet::GetEnum(int offset){
    172172
    … …  
    175175}
    176176/*}}}*/
    177 /*FUNCTION DataSet::GetObjectByOffset{{{1*/
     177/*FUNCTION DataSet::GetObjectByOffset{{{*/
    178178Object* DataSet::GetObjectByOffset(int offset){
    179179
    … …  
    186186}
    187187/*}}}*/
    188 /*FUNCTION DataSet::GetObjectById{{{1*/
     188/*FUNCTION DataSet::GetObjectById{{{*/
    189189Object* DataSet::GetObjectById(int* poffset,int eid){
    190190
    … …  
    211211}
    212212/*}}}*/
    213 /*FUNCTION DataSet::Presort{{{1*/
     213/*FUNCTION DataSet::Presort{{{*/
    214214void DataSet::Presort(){
    215215
    … …  
    239239}
    240240/*}}}*/
    241 /*FUNCTION DataSet::SetSorting{{{1*/
     241/*FUNCTION DataSet::SetSorting{{{*/
    242242void DataSet::SetSorting(int* in_sorted_ids,int* in_id_offsets){
    243243
    … …  
    247247}
    248248/*}}}*/
    249 /*FUNCTION DataSet::Size{{{1*/
     249/*FUNCTION DataSet::Size{{{*/
    250250int  DataSet::Size(void){
    251251        _assert_(this!=NULL);
    … …  
    254254}
    255255/*}}}*/
    256 /*FUNCTION DataSet::Sort{{{1*/
     256/*FUNCTION DataSet::Sort{{{*/
    257257void DataSet::Sort(){
    258258

  • issm/trunk-jpl/src/c/Container/DataSet.h

    r12015 r12365  
    3939                int*            id_offsets;
    4040
    41                 /*constructors, destructors: {{{1*/
     41                /*constructors, destructors: {{{*/
    4242                DataSet();
    4343                DataSet(int enum_type);
    4444                ~DataSet();
    4545                /*}}}*/
    46                 /*management: {{{1*/
     46                /*management: {{{*/
    4747                int   GetEnum();
    4848                int   GetEnum(int offset);

  • issm/trunk-jpl/src/c/Container/Elements.cpp

    r12102 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Elements::Elements(){{{1*/
     27/*FUNCTION Elements::Elements(){{{*/
    2828Elements::Elements(){
    2929        enum_type=MeshElementsEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Elements::~Elements(){{{1*/
     33/*FUNCTION Elements::~Elements(){{{*/
    3434Elements::~Elements(){
    3535        return;
    … …  
    3838
    3939/*Object management*/
    40 /*FUNCTION Elements::Configure{{{1*/
     40/*FUNCTION Elements::Configure{{{*/
    4141void Elements::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    4242
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION Elements::ProcessResultsUnits{{{1*/
     55/*FUNCTION Elements::ProcessResultsUnits{{{*/
    5656void Elements::ProcessResultsUnits(void){
    5757
    … …  
    6363}
    6464/*}}}*/
    65 /*FUNCTION Elements::DeleteResults{{{1*/
     65/*FUNCTION Elements::DeleteResults{{{*/
    6666void Elements::DeleteResults(void){
    6767       
    … …  
    7272}
    7373/*}}}*/
    74 /*FUNCTION Elements::ResultsToPatch{{{1*/
     74/*FUNCTION Elements::ResultsToPatch{{{*/
    7575Patch* Elements::ResultsToPatch(void){
    7676
    … …  
    148148}
    149149/*}}}*/
    150 /*FUNCTION Elements::SetCurrentConfiguration{{{1*/
     150/*FUNCTION Elements::SetCurrentConfiguration{{{*/
    151151void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    152152
    … …  
    163163}
    164164/*}}}*/
    165 /*FUNCTION Elements::ToResults{{{1*/
     165/*FUNCTION Elements::ToResults{{{*/
    166166void Elements::ToResults(Results* results,Parameters* parameters){
    167167
    … …  
    276276}
    277277/*}}}*/
    278 /*FUNCTION Elements::NumberOfElements{{{1*/
     278/*FUNCTION Elements::NumberOfElements{{{*/
    279279int Elements::NumberOfElements(void){
    280280
    … …  
    292292}
    293293/*}}}*/
    294 /*FUNCTION Elements::InputCopy{{{1*/
     294/*FUNCTION Elements::InputCopy{{{*/
    295295void Elements::InputDuplicate(int input_enum,int output_enum){
    296296

  • issm/trunk-jpl/src/c/Container/Elements.h

    r10989 r12365  
    2121        public:
    2222
    23                 /*constructors, destructors: {{{1*/
     23                /*constructors, destructors: {{{*/
    2424                Elements();
    2525                ~Elements();
    2626                /*}}}*/
    27                 /*numerics: {{{1*/
     27                /*numerics: {{{*/
    2828                void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    2929                void DeleteResults(void);

  • issm/trunk-jpl/src/c/Container/Inputs.cpp

    r10522 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Inputs::Inputs(){{{1*/
     27/*FUNCTION Inputs::Inputs(){{{*/
    2828Inputs::Inputs(){
    2929        return;
    3030}
    3131/*}}}*/
    32 /*FUNCTION Inputs::~Inputs(){{{1*/
     32/*FUNCTION Inputs::~Inputs(){{{*/
    3333Inputs::~Inputs(){
    3434        return;
    … …  
    3737
    3838/*Object management*/
    39 /*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{1*/
     39/*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{*/
    4040void Inputs::GetInputValue(bool* pvalue,int enum_type){
    4141
    … …  
    6565}
    6666/*}}}*/
    67 /*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{1*/
     67/*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{*/
    6868void Inputs::GetInputValue(int* pvalue,int enum_type){
    6969
    … …  
    9393}
    9494/*}}}*/
    95 /*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{1*/
     95/*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{*/
    9696void Inputs::GetInputValue(double* pvalue,int enum_type){
    9797
    … …  
    121121}
    122122/*}}}*/
    123 /*FUNCTION Inputs::GetInputAverage{{{1*/
     123/*FUNCTION Inputs::GetInputAverage{{{*/
    124124void Inputs::GetInputAverage(double* pvalue,int enum_type){
    125125
    … …  
    149149}
    150150/*}}}*/
    151 /*FUNCTION Inputs::AddInput{{{1*/
     151/*FUNCTION Inputs::AddInput{{{*/
    152152int  Inputs::AddInput(Input* in_input){
    153153
    … …  
    175175}
    176176/*}}}*/
    177 /*FUNCTION Inputs::ChangeEnum{{{1*/
     177/*FUNCTION Inputs::ChangeEnum{{{*/
    178178void  Inputs::ChangeEnum(int oldenumtype,int newenumtype){
    179179
    … …  
    205205}
    206206/*}}}*/
    207 /*FUNCTION Inputs::ConstrainMin{{{1*/
     207/*FUNCTION Inputs::ConstrainMin{{{*/
    208208void  Inputs::ConstrainMin(int constrain_enum, double minimum){
    209209           
    … …  
    219219}
    220220/*}}}*/
    221 /*FUNCTION Inputs::InfinityNorm{{{1*/
     221/*FUNCTION Inputs::InfinityNorm{{{*/
    222222double Inputs::InfinityNorm(int enumtype){
    223223
    … …  
    240240}
    241241/*}}}*/
    242 /*FUNCTION Inputs::Max{{{1*/
     242/*FUNCTION Inputs::Max{{{*/
    243243double Inputs::Max(int enumtype){
    244244
    … …  
    261261}
    262262/*}}}*/
    263 /*FUNCTION Inputs::MaxAbs{{{1*/
     263/*FUNCTION Inputs::MaxAbs{{{*/
    264264double Inputs::MaxAbs(int enumtype){
    265265
    … …  
    282282}
    283283/*}}}*/
    284 /*FUNCTION Inputs::Min{{{1*/
     284/*FUNCTION Inputs::Min{{{*/
    285285double Inputs::Min(int enumtype){
    286286
    … …  
    303303}
    304304/*}}}*/
    305 /*FUNCTION Inputs::MinAbs{{{1*/
     305/*FUNCTION Inputs::MinAbs{{{*/
    306306double Inputs::MinAbs(int enumtype){
    307307
    … …  
    324324}
    325325/*}}}*/
    326 /*FUNCTION Inputs::GetInput{{{1*/
     326/*FUNCTION Inputs::GetInput{{{*/
    327327Input* Inputs::GetInput(int enum_name){
    328328
    … …  
    341341}
    342342/*}}}*/
    343 /*FUNCTION Inputs::DeleteInput{{{1*/
     343/*FUNCTION Inputs::DeleteInput{{{*/
    344344int  Inputs::DeleteInput(int enum_type){
    345345
    … …  
    361361}
    362362/*}}}*/
    363 /*FUNCTION Inputs::DuplicateInput{{{1*/
     363/*FUNCTION Inputs::DuplicateInput{{{*/
    364364void  Inputs::DuplicateInput(int original_enum,int new_enum){
    365365
    … …  
    379379}
    380380/*}}}*/
    381 /*FUNCTION Inputs::SpawnTriaInputs{{{1*/
     381/*FUNCTION Inputs::SpawnTriaInputs{{{*/
    382382Inputs* Inputs::SpawnTriaInputs(int* indices){
    383383
    … …  
    405405}
    406406/*}}}*/
    407 /*FUNCTION Inputs::AXPY{{{1*/
     407/*FUNCTION Inputs::AXPY{{{*/
    408408void  Inputs::AXPY(int MeshYEnum, double scalar, int MeshXEnum){
    409409           
    … …  
    423423}
    424424/*}}}*/
    425 /*FUNCTION Inputs::Configure{{{1*/
     425/*FUNCTION Inputs::Configure{{{*/
    426426void Inputs::Configure(Parameters* parameters){
    427427

  • issm/trunk-jpl/src/c/Container/Inputs.h

    r10522 r12365  
    2323        public:
    2424
    25                 /*constructors, destructors: {{{1*/
     25                /*constructors, destructors: {{{*/
    2626                Inputs();
    2727                ~Inputs();
    2828
    2929                /*}}}*/
    30                 /*numerics: {{{1*/
     30                /*numerics: {{{*/
    3131                int     AddInput(Input* in_input);
    3232                void    ChangeEnum(int enumtype,int new_enumtype);

  • issm/trunk-jpl/src/c/Container/Loads.cpp

    r12102 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Loads::Loads(){{{1*/
     27/*FUNCTION Loads::Loads(){{{*/
    2828Loads::Loads(){
    2929        enum_type=LoadsEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Loads::~Loads(){{{1*/
     33/*FUNCTION Loads::~Loads(){{{*/
    3434Loads::~Loads(){
    3535        return;
    … …  
    3838
    3939/*Numerics:*/
    40 /*FUNCTION Loads::Configure{{{1*/
     40/*FUNCTION Loads::Configure{{{*/
    4141void Loads::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    4242
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION Loads::NumberOfLoads{{{1*/
     55/*FUNCTION Loads::NumberOfLoads{{{*/
    5656int Loads::NumberOfLoads(void){
    5757
    … …  
    7474}
    7575/*}}}*/
    76 /*FUNCTION Loads::SetCurrentConfiguration{{{1*/
     76/*FUNCTION Loads::SetCurrentConfiguration{{{*/
    7777void Loads::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    7878

  • issm/trunk-jpl/src/c/Container/Loads.h

    r10522 r12365  
    2020        public:
    2121
    22                 /*constructors, destructors: {{{1*/
     22                /*constructors, destructors: {{{*/
    2323                Loads();
    2424                ~Loads();
    2525                /*}}}*/
    26                 /*numerics: {{{1*/
     26                /*numerics: {{{*/
    2727                void  Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    2828                int   NumberOfLoads(void);

  • issm/trunk-jpl/src/c/Container/Materials.cpp

    r10522 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Materials::Materials(){{{1*/
     27/*FUNCTION Materials::Materials(){{{*/
    2828Materials::Materials(){
    2929        enum_type=MaterialsEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Materials::~Materials(){{{1*/
     33/*FUNCTION Materials::~Materials(){{{*/
    3434Materials::~Materials(){
    3535        return;
    … …  
    3838
    3939/*Object management*/
    40 /*FUNCTION Materials::Configure{{{1*/
     40/*FUNCTION Materials::Configure{{{*/
    4141void Materials::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    4242

  • issm/trunk-jpl/src/c/Container/Materials.h

    r10522 r12365  
    1919        public:
    2020
    21                 /*constructors, destructors: {{{1*/
     21                /*constructors, destructors: {{{*/
    2222                Materials();
    2323                ~Materials();
    2424                /*}}}*/
    25                 /*numerics: {{{1*/
     25                /*numerics: {{{*/
    2626                void  Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    2727                /*}}}*/

  • issm/trunk-jpl/src/c/Container/Nodes.cpp

    r12109 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Nodes::Nodes(){{{1*/
     27/*FUNCTION Nodes::Nodes(){{{*/
    2828Nodes::Nodes(){
    2929        enum_type=NodesEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Nodes::~Nodes(){{{1*/
     33/*FUNCTION Nodes::~Nodes(){{{*/
    3434Nodes::~Nodes(){
    3535        return;
    … …  
    3838
    3939/*Numerics*/
    40 /*FUNCTION Nodes::Configure{{{1*/
     40/*FUNCTION Nodes::Configure{{{*/
    4141void Nodes::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    4242
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION Nodes::DistributeDofs{{{1*/
     55/*FUNCTION Nodes::DistributeDofs{{{*/
    5656void  Nodes::DistributeDofs(int analysis_type,int setenum){
    5757
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION Nodes::FlagClones{{{1*/
     146/*FUNCTION Nodes::FlagClones{{{*/
    147147void  Nodes::FlagClones(int analysis_type){
    148148
    … …  
    195195}
    196196/*}}}*/
    197 /*FUNCTION Nodes::MaxNumDofs{{{1*/
     197/*FUNCTION Nodes::MaxNumDofs{{{*/
    198198int   Nodes::MaxNumDofs(int analysis_type,int setenum){
    199199
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION Nodes::NumberOfDofs{{{1*/
     227/*FUNCTION Nodes::NumberOfDofs{{{*/
    228228int   Nodes::NumberOfDofs(int analysis_type,int setenum){
    229229
    … …  
    259259}
    260260/*}}}*/
    261 /*FUNCTION Nodes::NumberOfNodes(){{{1*/
     261/*FUNCTION Nodes::NumberOfNodes(){{{*/
    262262int Nodes::NumberOfNodes(void){
    263263
    … …  
    287287}
    288288/*}}}*/
    289 /*FUNCTION Nodes::NumberOfNodes(analysis){{{1*/
     289/*FUNCTION Nodes::NumberOfNodes(analysis){{{*/
    290290int Nodes::NumberOfNodes(int analysis_type){
    291291
    … …  
    326326}
    327327/*}}}*/
    328 /*FUNCTION Nodes::Ranks{{{1*/
     328/*FUNCTION Nodes::Ranks{{{*/
    329329void   Nodes::Ranks(int* ranks,int analysis_type){
    330330
    … …  
    352352}
    353353/*}}}*/
    354 /*FUNCTION Nodes::SetCurrentConfiguration{{{1*/
     354/*FUNCTION Nodes::SetCurrentConfiguration{{{*/
    355355void Nodes::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
    356356

  • issm/trunk-jpl/src/c/Container/Nodes.h

    r10522 r12365  
    1313        public:
    1414
    15                 /*constructors, destructors: {{{1*/
     15                /*constructors, destructors: {{{*/
    1616                Nodes();
    1717                ~Nodes();
    1818                /*}}}*/
    19                 /*numerics: {{{1*/
     19                /*numerics: {{{*/
    2020                void  Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters);
    2121                void  DistributeDofs(int analysis_type,int SETENUM);

  • issm/trunk-jpl/src/c/Container/Options.cpp

    r12319 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Options::Options(){{{1*/
     27/*FUNCTION Options::Options(){{{*/
    2828Options::Options(){
    2929        return;
    3030}
    3131/*}}}*/
    32 /*FUNCTION Options::~Options(){{{1*/
     32/*FUNCTION Options::~Options(){{{*/
    3333Options::~Options(){
    3434        return;
    … …  
    3737
    3838/*Object management*/
    39 /*FUNCTION Options::AddOption{{{1*/
     39/*FUNCTION Options::AddOption{{{*/
    4040int  Options::AddOption(Option* in_option){
    4141
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION Options::Get(int* pvalue, char* name){{{1*/
     70/*FUNCTION Options::Get(int* pvalue, char* name){{{*/
    7171void Options::Get(int* pvalue,const char* name){
    7272
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{1*/
     89/*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{*/
    9090void Options::Get(int* pvalue,const char* name,int default_value){
    9191
    … …  
    106106}
    107107/*}}}*/
    108 /*FUNCTION Options::Get(double* pvalue, char* name){{{1*/
     108/*FUNCTION Options::Get(double* pvalue, char* name){{{*/
    109109void Options::Get(double* pvalue,const char* name){
    110110
    … …  
    125125}
    126126/*}}}*/
    127 /*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{1*/
     127/*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{*/
    128128void Options::Get(double* pvalue,const char* name,double default_value){
    129129
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION Options::Get(bool* pvalue, char* name){{{1*/
     146/*FUNCTION Options::Get(bool* pvalue, char* name){{{*/
    147147void Options::Get(bool* pvalue,const char* name){
    148148
    … …  
    163163}
    164164/*}}}*/
    165 /*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{1*/
     165/*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{*/
    166166void Options::Get(bool* pvalue,const char* name,bool default_value){
    167167
    … …  
    182182}
    183183/*}}}*/
    184 /*FUNCTION Options::Get(char** pvalue, char* name){{{1*/
     184/*FUNCTION Options::Get(char** pvalue, char* name){{{*/
    185185void Options::Get(char** pvalue,const char* name){
    186186
    … …  
    204204}
    205205/*}}}*/
    206 /*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{1*/
     206/*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{*/
    207207void Options::Get(char** pvalue,const char* name,const char* default_value){
    208208
    … …  
    229229}
    230230/*}}}*/
    231 /*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{1*/
     231/*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{*/
    232232void Options::Get(char*** ppvalue,int* numel,const char* name){
    233233
    … …  
    275275}
    276276/*}}}*/
    277 /*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{1*/
     277/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{*/
    278278void Options::Get(double** pvalue,int* numel,const char* name){
    279279
    … …  
    294294}
    295295/*}}}*/
    296 /*FUNCTION Options::GetOption{{{1*/
     296/*FUNCTION Options::GetOption{{{*/
    297297Option* Options::GetOption(const char* name){
    298298

  • issm/trunk-jpl/src/c/Container/Parameters.cpp

    r11695 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Parameters::Parameters(){{{1*/
     27/*FUNCTION Parameters::Parameters(){{{*/
    2828Parameters::Parameters(){
    2929        enum_type=ParametersEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Parameters::~Parameters(){{{1*/
     33/*FUNCTION Parameters::~Parameters(){{{*/
    3434Parameters::~Parameters(){
    3535        return;
    … …  
    3838
    3939/*Object management*/
    40 /*FUNCTION Parameters::Exist{{{1*/
     40/*FUNCTION Parameters::Exist{{{*/
    4141bool Parameters::Exist(int enum_type){
    4242
    … …  
    5151}
    5252/*}}}*/
    53 /*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{1*/
     53/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{*/
    5454void Parameters::FindParam(bool* pbool,int enum_type){ _assert_(this);
    5555       
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{1*/
     70/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{*/
    7171void Parameters::FindParam(int* pinteger,int enum_type){ _assert_(this);
    7272       
    … …  
    8585}
    8686/*}}}*/
    87 /*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{1*/
     87/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{*/
    8888void Parameters::FindParam(double* pscalar, int enum_type){ _assert_(this);
    8989       
    … …  
    102102}
    103103/*}}}*/
    104 /*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{1*/
     104/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{*/
    105105void Parameters::FindParam(char** pstring,int enum_type){ _assert_(this);
    106106       
    … …  
    120120}
    121121/*}}}*/
    122 /*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{1*/
     122/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{*/
    123123void Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){ _assert_(this);
    124124       
    … …  
    138138}
    139139/*}}}*/
    140 /*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{1*/
     140/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{*/
    141141void Parameters::FindParam(int** pintarray,int* pM, int enum_type){ _assert_(this);
    142142
    … …  
    156156}
    157157/*}}}*/
    158 /*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{1*/
     158/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{*/
    159159void Parameters::FindParam(int** pintarray,int* pM,int *pN,int enum_type){ _assert_(this);
    160160
    … …  
    174174}
    175175/*}}}*/
    176 /*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{1*/
     176/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{*/
    177177void Parameters::FindParam(double** pdoublearray,int* pM, int enum_type){ _assert_(this);
    178178
    … …  
    192192}
    193193/*}}}*/
    194 /*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{1*/
     194/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{*/
    195195void Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){ _assert_(this);
    196196
    … …  
    210210}
    211211/*}}}*/
    212 /*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{1*/
     212/*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{*/
    213213void Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){ _assert_(this);
    214214       
    … …  
    227227}
    228228/*}}}*/
    229 /*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{1*/
     229/*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{*/
    230230void Parameters::FindParam(Vector** pvec,int enum_type){ _assert_(this);
    231231       
    … …  
    245245}
    246246/*}}}*/
    247 /*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{1*/
     247/*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{*/
    248248void Parameters::FindParam(Matrix** pmat,int enum_type){ _assert_(this);
    249249       
    … …  
    263263}
    264264/*}}}*/
    265 /*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{1*/
     265/*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{*/
    266266void Parameters::FindParam(FILE** pfid,int enum_type){ _assert_(this);
    267267
    … …  
    281281/*}}}*/
    282282
    283 /*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{1*/
     283/*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{*/
    284284void   Parameters::SetParam(bool boolean,int enum_type){
    285285
    … …  
    293293}
    294294/*}}}*/
    295 /*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{1*/
     295/*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{*/
    296296void   Parameters::SetParam(int integer,int enum_type){
    297297
    … …  
    305305}
    306306/*}}}*/
    307 /*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{1*/
     307/*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{*/
    308308void   Parameters::SetParam(double scalar,int enum_type){
    309309
    … …  
    317317}
    318318/*}}}*/
    319 /*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{1*/
     319/*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{*/
    320320void   Parameters::SetParam(char* string,int enum_type){
    321321
    … …  
    329329}
    330330/*}}}*/
    331 /*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{1*/
     331/*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{*/
    332332void   Parameters::SetParam(char** stringarray,int M, int enum_type){
    333333
    … …  
    341341}
    342342/*}}}*/
    343 /*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{1*/
     343/*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{*/
    344344void   Parameters::SetParam(double* doublearray,int M, int enum_type){
    345345
    … …  
    353353}
    354354/*}}}*/
    355 /*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{1*/
     355/*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{*/
    356356void   Parameters::SetParam(double* doublearray,int M, int N, int enum_type){
    357357
    … …  
    365365}
    366366/*}}}*/
    367 /*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{1*/
     367/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{*/
    368368void   Parameters::SetParam(int* intarray,int M, int enum_type){
    369369
    … …  
    377377}
    378378/*}}}*/
    379 /*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{1*/
     379/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{*/
    380380void   Parameters::SetParam(int* intarray,int M, int N, int enum_type){
    381381
    … …  
    389389}
    390390/*}}}*/
    391 /*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{1*/
     391/*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{*/
    392392void   Parameters::SetParam(Vector* vector,int enum_type){
    393393
    … …  
    401401}
    402402/*}}}*/
    403 /*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{1*/
     403/*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{*/
    404404void   Parameters::SetParam(Matrix* matrix,int enum_type){
    405405
    … …  
    413413}
    414414/*}}}*/
    415 /*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{1*/
     415/*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{*/
    416416void   Parameters::SetParam(FILE* fid,int enum_type){
    417417
    … …  
    425425}
    426426/*}}}*/
    427 /*FUNCTION Parameters::UnitConversion(int direction_enum);{{{1*/
     427/*FUNCTION Parameters::UnitConversion(int direction_enum);{{{*/
    428428void   Parameters::UnitConversion(int direction_enum){
    429429
    … …  
    439439/*}}}*/
    440440
    441 /*FUNCTION Parameters::FindParamObject{{{1*/
     441/*FUNCTION Parameters::FindParamObject{{{*/
    442442Object* Parameters::FindParamObject(int enum_type){
    443443

  • issm/trunk-jpl/src/c/Container/Parameters.h

    r12222 r12365  
    2323        public:
    2424
    25                 /*constructors, destructors: {{{1*/
     25                /*constructors, destructors: {{{*/
    2626                Parameters();
    2727                ~Parameters();
    2828                /*}}}*/
    29                 /*numerics: {{{1*/
     29                /*numerics: {{{*/
    3030                bool  Exist(int enum_type);
    3131

  • issm/trunk-jpl/src/c/Container/Results.cpp

    r12011 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Results::Results(){{{1*/
     27/*FUNCTION Results::Results(){{{*/
    2828Results::Results(){
    2929        enum_type=ResultsEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Results::~Results(){{{1*/
     33/*FUNCTION Results::~Results(){{{*/
    3434Results::~Results(){
    3535        return;
    … …  
    3838
    3939/*Object management*/
    40 /*FUNCTION Results::SpawnTriaResults{{{1*/
     40/*FUNCTION Results::SpawnTriaResults{{{*/
    4141Results* Results::SpawnTriaResults(int* indices){
    4242
    … …  
    6464}
    6565/*}}}*/
    66 /*FUNCTION Results::Write{{{1*/
     66/*FUNCTION Results::Write{{{*/
    6767void Results::Write(Parameters* parameters){
    6868       

  • issm/trunk-jpl/src/c/Container/Results.h

    r12011 r12365  
    2020        public:
    2121
    22                 /*constructors, destructors: {{{1*/
     22                /*constructors, destructors: {{{*/
    2323                Results();
    2424                ~Results();
    2525                /*}}}*/
    26                 /*numerics: {{{1*/
     26                /*numerics: {{{*/
    2727                Results* SpawnTriaResults(int* indices);
    2828                void Write(Parameters* parameters);

  • issm/trunk-jpl/src/c/Container/Vertices.cpp

    r12102 r12365  
    44 */
    55
    6 /*Headers: {{{1*/
     6/*Headers: {{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2525
    2626/*Object constructors and destructor*/
    27 /*FUNCTION Vertices::Vertices(){{{1*/
     27/*FUNCTION Vertices::Vertices(){{{*/
    2828Vertices::Vertices(){
    2929        enum_type=VerticesEnum;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Vertices::~Vertices(){{{1*/
     33/*FUNCTION Vertices::~Vertices(){{{*/
    3434Vertices::~Vertices(){
    3535        return;
    … …  
    3838
    3939/*Numerics management*/
    40 /*FUNCTION Vertices::DistributeDofs{{{1*/
     40/*FUNCTION Vertices::DistributeDofs{{{*/
    4141void  Vertices::DistributeDofs(int numberofobjects,int numberofdofsperobject){
    4242
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION Vertices::FlagClones{{{1*/
     109/*FUNCTION Vertices::FlagClones{{{*/
    110110void  Vertices::FlagClones(int numberofobjects){
    111111
    … …  
    148148}
    149149/*}}}*/
    150 /*FUNCTION Vertices::NumberOfVertices{{{1*/
     150/*FUNCTION Vertices::NumberOfVertices{{{*/
    151151int Vertices::NumberOfVertices(void){
    152152
    … …  
    174174}
    175175/*}}}*/
    176 /*FUNCTION Vertices::Ranks{{{1*/
     176/*FUNCTION Vertices::Ranks{{{*/
    177177void   Vertices::Ranks(int* ranks){
    178178

  • issm/trunk-jpl/src/c/Container/Vertices.h

    r12213 r12365  
    1919        public:
    2020
    21                 /*constructors, destructors: {{{1*/
     21                /*constructors, destructors: {{{*/
    2222                Vertices();
    2323                ~Vertices();
    2424                /*}}}*/
    25                 /*numerics: {{{1*/
     25                /*numerics: {{{*/
    2626                void  DistributeDofs(int numberofnodes,int numdofspernode);
    2727                void  FlagClones(int numberofnodes);

  • issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

    r12326 r12365  
    1111
    1212enum definitions{
    13         /*Model fields {{{1*/
     13        /*Model fields {{{*/
    1414        AutodiffForwardEnum,
    1515        AutodiffIsautodiffEnum,
    … …  
    183183        TransientRequestedOutputsEnum,
    184184        /*}}}*/
    185         /*Solutions and Analyses{{{1 */
     185        /*Solutions and Analyses{{{ */
    186186        SolutionTypeEnum,
    187187        AnalysisTypeEnum,
    … …  
    220220        TransientSolutionEnum,
    221221        /*}}}*/
    222         /*Approximations {{{1*/
     222        /*Approximations {{{*/
    223223        ApproximationEnum,
    224224        HutterApproximationEnum,
    … …  
    231231        StokesApproximationEnum,
    232232        /*}}}*/
    233         /*Datasets {{{1*/
     233        /*Datasets {{{*/
    234234        ConstraintsEnum,
    235235        LoadsEnum,
    … …  
    240240        ResultsEnum,
    241241        /*}}}*/
    242         /*Objects {{{1*/
     242        /*Objects {{{*/
    243243        BoolInputEnum,
    244244        BoolParamEnum,
    … …  
    289289        VertexEnum,
    290290        /*}}}*/
    291         /*Fill {{{1*/
     291        /*Fill {{{*/
    292292        AirEnum,
    293293        IceEnum,
    … …  
    295295        WaterEnum,
    296296        /*}}}*/
    297         /*Rift state {{{1*/
     297        /*Rift state {{{*/
    298298        ClosedEnum,
    299299        FreeEnum,
    300300        OpenEnum,
    301301        /*}}}*/
    302         /*Inputs {{{1*/
     302        /*Inputs {{{*/
    303303        AdjointpEnum,
    304304        AdjointxEnum,
    … …  
    388388        IceVolumeEnum,
    389389        /*}}}*/
    390         /*Element Interpolations{{{1*/
     390        /*Element Interpolations{{{*/
    391391        P0Enum,
    392392        P1Enum,
    393393        P1DGEnum,
    394394        /*}}}*/
    395         /*Results{{{1*/
     395        /*Results{{{*/
    396396        SaveResultsEnum,
    397397        BoolElementResultEnum,
    … …  
    414414        WaterColumnOldEnum,
    415415        /*}}}*/
    416         /*Responses{{{1*/
     416        /*Responses{{{*/
    417417        MinVelEnum,
    418418        MaxVelEnum,
    … …  
    427427        MaxAbsVzEnum,
    428428        /*}}}*/
    429         /*Convergence{{{1*/
     429        /*Convergence{{{*/
    430430        RelativeEnum,
    431431        AbsoluteEnum,
    432432        IncrementalEnum,
    433433        /*}}}*/
    434         /*Grounding Line{{{1*/
     434        /*Grounding Line{{{*/
    435435        AgressiveMigrationEnum,
    436436        NoneEnum,
    437437        SoftMigrationEnum,
    438438        /*}}}*/
    439         /*Solver{{{1*/
     439        /*Solver{{{*/
    440440        StokesSolverEnum,
    441441        /*}}}*/
    442         /*Parameters{{{1*/
     442        /*Parameters{{{*/
    443443        AdjointEnum,
    444444        ColinearEnum,
    … …  
    468468        VerboseEnum,
    469469        /*}}}*/
    470         /*Interpolation {{{1*/
     470        /*Interpolation {{{*/
    471471        TriangleInterpEnum,
    472472        BilinearInterpEnum,
    473473        NearestInterpEnum,
    474474        /*}}}*/
    475         /*Coordinate Systems{{{1*/
     475        /*Coordinate Systems{{{*/
    476476        XYEnum,
    477477        XYZPEnum,
    478478        /*}}}*/
    479         /*Options{{{1*/
     479        /*Options{{{*/
    480480        OptionEnum,
    481481        OptionCellEnum,
    … …  
    485485        OptionLogicalEnum,
    486486        /*}}}*/
    487         /*Rheology law (move too Material) {{{1*/
     487        /*Rheology law (move too Material) {{{*/
    488488        PatersonEnum,
    489489        ArrheniusEnum,

  • issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh

    r12342 r12365  
    5656END
    5757#}}}
    58 #Build StringToEnumx.cpp {{{1
     58#Build StringToEnumx.cpp {{{
    5959#Header
    6060cat <<END > $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp

  • issm/trunk-jpl/src/c/include/macros.h

    r12078 r12365  
    33 */
    44
    5 /*Header {{{1*/
     5/*Header {{{*/
    66#ifndef _MACROS_H_
    77#define _MACROS_H_
    … …  
    1616/*}}}*/
    1717
    18 /* _printf_ {{{1*/
     18/* _printf_ {{{*/
    1919/*Printing macro: only cpu number 0 */
    2020#define _printf_(flag,...) do { if(flag) PrintfFunction(__VA_ARGS__); }while (0)
    2121/*}}}*/
    22 /* _error_ {{{1*/
     22/* _error_ {{{*/
    2323/*Error exception macro*/
    2424#ifdef _INTEL_WIN_
    … …  
    3030#endif
    3131/*}}}*/
    32 /* _assert_ {{{1*/
     32/* _assert_ {{{*/
    3333/*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
    3434#ifdef _ISSM_DEBUG_
    … …  
    4040#endif
    4141/*}}}*/
    42 /* ISSMBOOT/ISSMEND {{{1*/
     42/* ISSMBOOT/ISSMEND {{{*/
    4343
    4444/*The following macros hide the error exception handling in a matlab module. Just put

  • issm/trunk-jpl/src/c/io/io.h

    r12003 r12365  
    66#define _ISSM_IO_H_
    77
    8 #ifdef HAVE_CONFIG_H //config.h {{{1
     8#ifdef HAVE_CONFIG_H //config.h {{{
    99#include <config.h>
    1010#else

  • issm/trunk-jpl/src/c/matlab/include/matlab_macros.h

    r12078 r12365  
    33 */
    44
    5 /*Header {{{1*/
     5/*Header {{{*/
    66#ifndef _MATLAB_MACROS_H_
    77#define _MATLAB_MACROS_H_
    … …  
    1515
    1616#ifdef _HAVE_MATLAB_
    17 /* MODULEBOOT/MODULEEND {{{1*/
     17/* MODULEBOOT/MODULEEND {{{*/
    1818
    1919/*The following macros hide the error exception handling in a matlab module. Just put
    … …  
    3636        }
    3737//}}}
    38 /* WRAPPER {{{1*/
     38/* WRAPPER {{{*/
    3939#define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[])
    4040
    4141/*}}}*/
    42 /* CHECKARGUMENTS {{{1*/
     42/* CHECKARGUMENTS {{{*/
    4343#define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,functionpointer)
    4444/*}}}*/

  • issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp

    r12225 r12365  
    1515
    1616/*Primitive data types*/
    17 /*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/
     17/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/
    1818void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){
    1919
    … …  
    5151}
    5252/*}}}*/
    53 /*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/
     53/*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/
    5454void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){
    5555
    … …  
    9494}
    9595/*}}}*/
    96 /*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/
     96/*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/
    9797void FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){
    9898
    … …  
    136136}
    137137/*}}}*/
    138 /*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/
     138/*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/
    139139void FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){
    140140
    … …  
    178178}
    179179/*}}}*/
    180 /*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/
     180/*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/
    181181void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){
    182182
    … …  
    243243}
    244244/*}}}*/
    245 /*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{1*/
     245/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{*/
    246246void FetchData(double** pvector,int* pM,const mxArray* dataref){
    247247
    … …  
    270270}
    271271/*}}}*/
    272 /*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{1*/
     272/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{*/
    273273void FetchData(int** pvector,int* pM,const mxArray* dataref){
    274274
    … …  
    302302}
    303303/*}}}*/
    304 /*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{1*/
     304/*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{*/
    305305void FetchData(bool** pvector,int* pM,const mxArray* dataref){
    306306
    … …  
    334334}
    335335/*}}}*/
    336 /*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{1*/
     336/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{*/
    337337void FetchData(float** pvector,int* pM,const mxArray* dataref){
    338338
    … …  
    366366}
    367367/*}}}*/
    368 /*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{1*/
     368/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{*/
    369369void FetchData(char** pstring,const mxArray* dataref){
    370370
    … …  
    388388        *pstring=outstring;
    389389}
    390 /*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/
     390/*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/
    391391void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){
    392392
    … …  
    421421}
    422422/*}}}*/
    423 /*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{1*/
     423/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{*/
    424424void FetchData(double* pscalar,const mxArray* dataref){
    425425
    … …  
    438438}
    439439/*}}}*/
    440 /*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{1*/
     440/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{*/
    441441void FetchData(int* pinteger,const mxArray* dataref){
    442442
    … …  
    455455}
    456456/*}}}*/
    457 /*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{1*/
     457/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{*/
    458458void FetchData(bool* pboolean,const mxArray* dataref){
    459459
    … …  
    474474
    475475/*ISSM objects*/
    476 /*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{1*/
     476/*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{*/
    477477void FetchData(Matrix** pmatrix,const mxArray* dataref){
    478478
    … …  
    495495}
    496496/*}}}*/
    497 /*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{1*/
     497/*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{*/
    498498void FetchData(Vector** pvector,const mxArray* dataref){
    499499
    … …  
    519519}
    520520/*}}}*/
    521 /*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{1*/
     521/*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{*/
    522522void FetchData(BamgGeom** pbamggeom,const mxArray* dataref){
    523523
    … …  
    538538}
    539539/*}}}*/
    540 /*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{1*/
     540/*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{*/
    541541void FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){
    542542
    … …  
    558558}
    559559/*}}}*/
    560 /*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{1*/
     560/*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{*/
    561561void FetchData(BamgOpts** pbamgopts,const mxArray* dataref){
    562562
    … …  
    602602}
    603603/*}}}*/
    604 /*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{1*/
     604/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{*/
    605605void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref){
    606606

  • issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp

    r12013 r12365  
    33
    44/*Headers:*/
    5 /*{{{1*/
     5/*{{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp

    r12013 r12365  
    33
    44/*Headers:*/
    5 /*{{{1*/
     5/*{{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp

    r12013 r12365  
    1515#include <mex.h>
    1616
    17 /*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/
     17/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/
    1818int MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){
    1919
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/
     97/*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/
    9898int MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){
    9999
    … …  
    175175}
    176176/*}}}*/
    177 /*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/
     177/*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/
    178178int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){
    179179

  • issm/trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp

    r12013 r12365  
    33
    44/*Headers:*/
    5 /*{{{1*/
     5/*{{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp

    r12013 r12365  
    33
    44/*Headers:*/
    5 /*{{{1*/
     5/*{{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp

    r12225 r12365  
    1515#include <mex.h>
    1616
    17 /*FUNCTION OptionDoubleParse {{{1*/
     17/*FUNCTION OptionDoubleParse {{{*/
    1818OptionDouble* OptionDoubleParse( char* name, const mxArray* prhs[]){
    1919
    … …  
    3434        return(odouble);
    3535}/*}}}*/
    36 /*FUNCTION OptionLogicalParse {{{1*/
     36/*FUNCTION OptionLogicalParse {{{*/
    3737OptionLogical* OptionLogicalParse( char* name, const mxArray* prhs[]){
    3838
    … …  
    5353        return(ological);
    5454}/*}}}*/
    55 /*FUNCTION OptionCharParse {{{1*/
     55/*FUNCTION OptionCharParse {{{*/
    5656OptionChar* OptionCharParse( char* name, const mxArray* prhs[]){
    5757
    … …  
    7272        return(ochar);
    7373}/*}}}*/
    74 /*FUNCTION OptionStructParse {{{1*/
     74/*FUNCTION OptionStructParse {{{*/
    7575OptionStruct* OptionStructParse( char* name, const mxArray* prhs[]){
    7676
    … …  
    117117        return(ostruct);
    118118}/*}}}*/
    119 /*FUNCTION OptionCellParse {{{1*/
     119/*FUNCTION OptionCellParse {{{*/
    120120OptionCell* OptionCellParse( char* name, const mxArray* prhs[]){
    121121
    … …  
    167167        return(ocell);
    168168}/*}}}*/
    169 /*FUNCTION OptionParse{{{1*/
     169/*FUNCTION OptionParse{{{*/
    170170Option* OptionParse(char* name, const mxArray* prhs[]){
    171171

  • issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp

    r12102 r12365  
    1717
    1818/*Primitive data types*/
    19 /*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{1*/
     19/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{*/
    2020void WriteData(mxArray** pdataref,double* matrix, int M,int N){
    2121
    … …  
    4242}
    4343/*}}}*/
    44 /*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{1*/
     44/*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{*/
    4545void WriteData(mxArray** pdataref,int* matrix, int M,int N){
    4646
    … …  
    6767}
    6868/*}}}*/
    69 /*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{1*/
     69/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{*/
    7070void WriteData(mxArray** pdataref,double* vector, int M){
    7171       
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION WriteData(mxArray** pdataref,double scalar){{{1*/
     92/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{*/
    9393void WriteData(mxArray** pdataref,double scalar){
    9494
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION WriteData(mxArray** pdataref,int integer){{{1*/
     98/*FUNCTION WriteData(mxArray** pdataref,int integer){{{*/
    9999void WriteData(mxArray** pdataref,int integer){
    100100
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION WriteData(mxArray** pdataref,int boolean){{{1*/
     105/*FUNCTION WriteData(mxArray** pdataref,int boolean){{{*/
    106106void WriteData(mxArray** pdataref,bool boolean){
    107107
    … …  
    110110}
    111111/*}}}*/
    112 /*FUNCTION WriteData(mxArray** pdataref,char* string){{{1*/
     112/*FUNCTION WriteData(mxArray** pdataref,char* string){{{*/
    113113void WriteData(mxArray** pdataref,char* string){
    114114
    … …  
    118118
    119119/*ISSM objects*/
    120 /*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{1*/
     120/*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{*/
    121121void WriteData(mxArray** pdataref,BamgGeom* bamggeom){
    122122
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{1*/
     160/*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{*/
    161161void WriteData(mxArray** pdataref,BamgMesh* bamgmesh){
    162162
    … …  
    216216}
    217217/*}}}*/
    218 /*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{1*/
     218/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{*/
    219219void WriteData(mxArray** pdataref,Matrix* matrix){
    220220               
    … …  
    259259}
    260260/*}}}*/
    261 /*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{1*/
     261/*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{*/
    262262void WriteData(mxArray** pdataref,Vector* vector){
    263263       
    … …  
    296296
    297297/*Toolkit*/
    298 /*FUNCTION SetStructureField{{{1*/
     298/*FUNCTION SetStructureField{{{*/
    299299void SetStructureField(mxArray* dataref,const char* fieldname,int M,int N,double* fieldpointer){
    300300

  • issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp

    r12218 r12365  
    3838        /*If no mesh in input, generate one*/
    3939        if(bamgmesh_in->TrianglesSize[0]==0){
    40                 /*Mesh generation {{{1*/
     40                /*Mesh generation {{{*/
    4141
    4242                //Step1: generate geometry Gh
    … …  
    8484        }
    8585        else{
    86                 /*Anisotropic mesh adaptation {{{1*/
     86                /*Anisotropic mesh adaptation {{{*/
    8787
    8888                // read background mesh

  • issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

    r12102 r12365  
    1212
    1313/*current module: */
    14 /*RiftIsPresent(Loads* loads,int configuration_type){{{1*/
     14/*RiftIsPresent(Loads* loads,int configuration_type){{{*/
    1515int RiftIsPresent(Loads* loads,int configuration_type){
    1616
    … …  
    4141}
    4242/*}}}*/
    43 /*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{1*/
     43/*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{*/
    4444void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){
    4545
    … …  
    6565}
    6666/*}}}*/
    67 /*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{1*/
     67/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{*/
    6868void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){
    6969
    … …  
    106106}
    107107/*}}}*/
    108 /*RiftIsFrozen(Loads* loads,int configuration_type){{{1*/
     108/*RiftIsFrozen(Loads* loads,int configuration_type){{{*/
    109109int RiftIsFrozen(Loads* loads,int configuration_type){
    110110
    … …  
    144144}
    145145/*}}}*/
    146 /*RiftFreezeConstraints(Loads* loads,int configuration_type){{{1*/
     146/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{*/
    147147void RiftFreezeConstraints(Loads* loads,int configuration_type){
    148148
    … …  
    172172
    173173/*diverse trials and errors: */
    174 /*RiftIsMaterialStable(Loads* loads){{{1*/
     174/*RiftIsMaterialStable(Loads* loads){{{*/
    175175int RiftIsMaterialStable(Loads* loads){
    176176
    … …  
    204204}
    205205/*}}}*/
    206 /*RiftIsPreStable(Loads* loads){{{1*/
     206/*RiftIsPreStable(Loads* loads){{{*/
    207207int RiftIsPreStable(Loads* loads){
    208208
    … …  
    243243}
    244244/*}}}*/
    245 /*RiftSetPreStable(Loads* loads){{{1*/
     245/*RiftSetPreStable(Loads* loads){{{*/
    246246void RiftSetPreStable(Loads* loads){
    247247
    … …  
    264264}
    265265/*}}}*/
    266 /*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{1*/
     266/*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{*/
    267267void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){
    268268
    … …  
    300300}
    301301/*}}}*/
    302 /*RiftMaxPenetrationInInputs(Loads* loads){{{1*/
     302/*RiftMaxPenetrationInInputs(Loads* loads){{{*/
    303303void RiftMaxPenetrationInInputs(Loads* loads){
    304304
    … …  
    342342}
    343343/*}}}*/
    344 /*RiftPotentialUnstableConstraints(Loads* loads){{{1*/
     344/*RiftPotentialUnstableConstraints(Loads* loads){{{*/
    345345int RiftPotentialUnstableConstraints(Loads* loads){
    346346

  • issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

    r12102 r12365  
    5454}
    5555
    56 /*FUNCTION CreateNodesOnFloatingIce {{{1*/
     56/*FUNCTION CreateNodesOnFloatingIce {{{*/
    5757Vector* CreateNodesOnFloatingIce(Nodes* nodes,int configuration_type){
    5858
    … …  
    8181}
    8282/*%}}}*/
    83 /*FUNCTION PotentialSheetUngrounding {{{1*/
     83/*FUNCTION PotentialSheetUngrounding {{{*/
    8484double*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){
    8585
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{1*/
     110/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/
    111111double*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding){
    112112

  • issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

    r11695 r12365  
    9292}
    9393/*}}}*/
    94 /*InterpFromGridToMeshxt {{{1*/
     94/*InterpFromGridToMeshxt {{{*/
    9595void* InterpFromGridToMeshxt(void* vpthread_handle){
    9696
    … …  
    183183}/*}}}*/
    184184
    185 /*findindices {{{1*/
     185/*findindices {{{*/
    186186bool findindices(int* pn,int* pm,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid){
    187187
    … …  
    218218        return (foundx && foundy);
    219219}/*}}}*/
    220 /*triangleinterp{{{1*/
     220/*triangleinterp{{{*/
    221221double triangleinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){
    222222        /*split the rectangle in 2 triangle and
    … …  
    259259        }
    260260}/*}}}*/
    261 /*bilinearinterp{{{1*/
     261/*bilinearinterp{{{*/
    262262double bilinearinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){
    263263        /*Bilinear  interpolation: (http://en.wikipedia.org/wiki/Bilinear_interpolation) */
    … …  
    286286}
    287287/*}}}*/
    288 /*nearestinterp{{{1*/
     288/*nearestinterp{{{*/
    289289double nearestinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){
    290290        /*Nearest neighbor interpolation*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

    r10660 r12365  
    1515void CreateParametersDakota(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){
    1616
    17         /*variable declarations: {{{1*/
     17        /*variable declarations: {{{*/
    1818        int i,j,k;
    1919       
    … …  
    7373                iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    7474
    75                 /*name of qmu input, error and output files:{{{1*/
     75                /*name of qmu input, error and output files:{{{*/
    7676                qmuinname=(char*)xmalloc((strlen(name)+strlen(".qmu.in")+1)*sizeof(char));
    7777                sprintf(qmuinname,"%s%s",name,".qmu.in");
    … …  
    8686                parameters->AddObject(new   StringParam(QmuErrNameEnum,qmuerrname));
    8787                /*}}}*/
    88                 /*Fetch variable descriptors: {{{1*/
     88                /*Fetch variable descriptors: {{{*/
    8989                iomodel->FetchData(&variabledescriptors,&numvariabledescriptors,QmuVariabledescriptorsEnum);
    9090
    … …  
    9393
    9494                /*}}}*/
    95                 /*Fetch response descriptors: {{{1*/
     95                /*Fetch response descriptors: {{{*/
    9696                iomodel->FetchData(&responsedescriptors,&numresponsedescriptors,QmuResponsedescriptorsEnum);
    9797
    … …  
    100100                parameters->AddObject(new    IntParam(QmuNumberofresponsesEnum,numberofresponses));
    101101                /*}}}*/
    102                 /*Deal with partitioning: {{{1*/
     102                /*Deal with partitioning: {{{*/
    103103                /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */
    104104               
    … …  
    116116                parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,numberofvertices));
    117117                /*}}}*/
    118                 /*Deal with data needed because of qmu variables: {{{1*/
     118                /*Deal with data needed because of qmu variables: {{{*/
    119119               
    120120                for(i=0;i<numvariabledescriptors;i++){
    … …  
    140140                }
    141141                /*}}}*/
    142                 /*Deal with data needed to compute qmu responses: {{{1*/
     142                /*Deal with data needed to compute qmu responses: {{{*/
    143143                for(i=0;i<numresponsedescriptors;i++){
    144144                       
    … …  
    201201                }
    202202                /*}}}*/
    203                 /*Free data: {{{1*/
     203                /*Free data: {{{*/
    204204                for(i=0;i<numresponsedescriptors;i++){
    205205                        descriptor=responsedescriptors[i];

  • issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

    r11695 r12365  
    4141        numberofdofspernode=nodes->MaxNumDofs(configuration_type,GsetEnum);
    4242
    43         /*Checks in debugging mode {{{1*/
     43        /*Checks in debugging mode {{{*/
    4444        if(penalty_kflag)_assert_(kflag);
    4545        if(penalty_pflag)_assert_(pflag);

  • issm/trunk-jpl/src/c/objects/Bamg/AdjacentTriangle.cpp

    r5401 r12365  
    1414
    1515        /*Methods*/
    16         /*FUNCTION AdjacentTriangle::Locked {{{1*/
     16        /*FUNCTION AdjacentTriangle::Locked {{{*/
    1717        int  AdjacentTriangle::Locked() const {
    1818                return t->AdjEdgeIndex[a] & 4;
    1919        }
    2020        /*}}}*/
    21         /*FUNCTION AdjacentTriangle::MarkUnSwap {{{1*/
     21        /*FUNCTION AdjacentTriangle::MarkUnSwap {{{*/
    2222        int  AdjacentTriangle::MarkUnSwap() const {
    2323                return t->AdjEdgeIndex[a] & 8;
    2424        }
    2525        /*}}}*/
    26         /*FUNCTION AdjacentTriangle::GetAllFlag_UnSwap {{{1*/
     26        /*FUNCTION AdjacentTriangle::GetAllFlag_UnSwap {{{*/
    2727        int  AdjacentTriangle::GetAllFlag_UnSwap() const {
    2828                // take all flag except MarkUnSwap
    … …  
    3030        }
    3131        /*}}}*/
    32         /*FUNCTION AdjacentTriangle::SetLock {{{1*/
     32        /*FUNCTION AdjacentTriangle::SetLock {{{*/
    3333        void AdjacentTriangle::SetLock(){
    3434                t->SetLocked(a);
    3535        }
    3636        /*}}}*/
    37         /*FUNCTION AdjacentTriangle::Adj {{{1*/
     37        /*FUNCTION AdjacentTriangle::Adj {{{*/
    3838        AdjacentTriangle AdjacentTriangle::Adj() const {
    3939                return  t->Adj(a);
    4040        }
    4141        /*}}}*/
    42         /*FUNCTION AdjacentTriangle::EdgeVertex {{{1*/
     42        /*FUNCTION AdjacentTriangle::EdgeVertex {{{*/
    4343        BamgVertex* AdjacentTriangle::EdgeVertex(const int & i) const {
    4444                return t->vertices[VerticesOfTriangularEdge[a][i]];
    4545        }
    4646        /*}}}*/
    47         /*FUNCTION AdjacentTriangle::OppositeVertex {{{1*/
     47        /*FUNCTION AdjacentTriangle::OppositeVertex {{{*/
    4848        BamgVertex* AdjacentTriangle::OppositeVertex() const {
    4949                return t->vertices[bamg::OppositeVertex[a]];
    5050        }
    5151        /*}}}*/
    52         /*FUNCTION AdjacentTriangle::det {{{1*/
     52        /*FUNCTION AdjacentTriangle::det {{{*/
    5353        Icoor2 & AdjacentTriangle::det() const {
    5454                return t->det;
    5555        }
    5656        /*}}}*/
    57         /*FUNCTION AdjacentTriangle::swap {{{1*/
     57        /*FUNCTION AdjacentTriangle::swap {{{*/
    5858        int AdjacentTriangle::swap(){
    5959                return  t->swap(a);
    6060        }
    6161        /*}}}*/
    62         /*FUNCTION AdjacentTriangle::SetAdj2 {{{1*/
     62        /*FUNCTION AdjacentTriangle::SetAdj2 {{{*/
    6363        void AdjacentTriangle::SetAdj2(const AdjacentTriangle & ta, int l  ){
    6464                //set Adjacent Triangle of a triangle

  • issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp

    r12011 r12365  
    55
    66/*Constructors/Destructors*/
    7 /*FUNCTION BamgGeom::BamgGeom(){{{1*/
     7/*FUNCTION BamgGeom::BamgGeom(){{{*/
    88BamgGeom::BamgGeom(){
    99
    … …  
    1919}
    2020/*}}}*/
    21 /*FUNCTION BamgGeom::~BamgGeom(){{{1*/
     21/*FUNCTION BamgGeom::~BamgGeom(){{{*/
    2222BamgGeom::~BamgGeom(){
    2323

  • issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp

    r12043 r12365  
    55
    66/*Constructors/Destructors*/
    7 /*FUNCTION BamgMesh::BamgMesh(){{{1*/
     7/*FUNCTION BamgMesh::BamgMesh(){{{*/
    88BamgMesh::BamgMesh(){
    99
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION BamgMesh::~BamgMesh(){{{1*/
     32/*FUNCTION BamgMesh::~BamgMesh(){{{*/
    3333BamgMesh::~BamgMesh(){
    3434

  • issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp

    r12011 r12365  
    66
    77/*Constructors/Destructors*/
    8 /*FUNCTION BamgOpts::BamgOpts() {{{1*/
     8/*FUNCTION BamgOpts::BamgOpts() {{{*/
    99BamgOpts::BamgOpts(){
    1010
    … …  
    4141}
    4242/*}}}*/
    43 /*FUNCTION BamgOpts::~BamgOpts() {{{1*/
     43/*FUNCTION BamgOpts::~BamgOpts() {{{*/
    4444BamgOpts::~BamgOpts(){
    4545
    … …  
    5555
    5656/*Methods*/
    57 /*FUNCTION BamgOpts::Check{{{1*/
     57/*FUNCTION BamgOpts::Check{{{*/
    5858void BamgOpts::Check(void){
    5959

  • issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.cpp

    r12218 r12365  
    77namespace bamg {
    88
    9         /*MACROS {{{1*/
     9        /*MACROS {{{*/
    1010        /*
    1111         *
    … …  
    4848#define J_IJ(k,l)  ((k&2) ? l:0)
    4949        /*}}}*/
    50         /*DOCUMENTATION What is a BamgQuadtree? {{{1
     50        /*DOCUMENTATION What is a BamgQuadtree? {{{
    5151         * A Quadtree is a very simple way to group vertices according
    5252         * to their locations. A square that holds all the points of the mesh
    … …  
    9494         * Using binaries is therefore very easy to locate a vertex in a box:
    9595         * we just need to look at the bits from the left to the right (See ::Add)
    96          }}}1*/
     96         }}}*/
    9797
    9898        /*Constructors/Destructors*/
    99         /*FUNCTION BamgQuadtree::BamgQuadtree(){{{1*/
     99        /*FUNCTION BamgQuadtree::BamgQuadtree(){{{*/
    100100        BamgQuadtree::BamgQuadtree(){
    101101
    … …  
    111111
    112112                }
    113         /*}}}1*/
    114         /*FUNCTION BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){{{1*/
     113        /*}}}*/
     114        /*FUNCTION BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){{{*/
    115115        BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){
    116116
    … …  
    133133
    134134        }
    135         /*}}}1*/
    136         /*FUNCTION BamgQuadtree::~BamgQuadtree(){{{1*/
     135        /*}}}*/
     136        /*FUNCTION BamgQuadtree::~BamgQuadtree(){{{*/
    137137        BamgQuadtree::~BamgQuadtree() {
    138138                delete boxcontainer;
    139139                root=NULL;
    140140        }
    141         /*}}}1*/
     141        /*}}}*/
    142142
    143143        /*Methods*/
    144         /*FUNCTION BamgQuadtree::Add{{{1*/
     144        /*FUNCTION BamgQuadtree::Add{{{*/
    145145        void  BamgQuadtree::Add(BamgVertex &w){
    146146                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.cpp/Add)*/
    … …  
    230230                NbVertices++;
    231231        }
    232         /*}}}1*/
    233         /*FUNCTION BamgQuadtree::NearestVertex{{{1*/
     232        /*}}}*/
     233        /*FUNCTION BamgQuadtree::NearestVertex{{{*/
    234234        BamgVertex*  BamgQuadtree::NearestVertex(Icoor1 i,Icoor1 j) {
    235235                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.cpp/NearestVertex)*/
    … …  
    389389
    390390        }
    391         /*}}}1*/
    392         /*FUNCTION BamgQuadtree::NearestVertexWithNormal{{{1*/
     391        /*}}}*/
     392        /*FUNCTION BamgQuadtree::NearestVertexWithNormal{{{*/
    393393        BamgVertex*  BamgQuadtree::NearestVertexWithNormal(Icoor1 i,Icoor1 j) {
    394394                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.cpp/NearestVertexWithNormal)*/
    … …  
    497497                return vn;
    498498        }
    499         /*}}}1*/
    500         /*FUNCTION BamgQuadtree::NewBamgQuadtreeBox {{{1*/
     499        /*}}}*/
     500        /*FUNCTION BamgQuadtree::NewBamgQuadtreeBox {{{*/
    501501        BamgQuadtree::BamgQuadtreeBox* BamgQuadtree::NewBamgQuadtreeBox(void){
    502502
    … …  
    521521                return newbox;
    522522        }/*}}}*/
    523         /*FUNCTION BamgQuadtree::ToClose {{{1*/
     523        /*FUNCTION BamgQuadtree::ToClose {{{*/
    524524        BamgVertex*   BamgQuadtree::ToClose(BamgVertex & v,double seuil,Icoor1 hx,Icoor1 hy){
    525525                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, BamgQuadtree.cpp/ToClose)*/
    … …  
    595595                return 0;
    596596        }
    597         /*}}}1*/
     597        /*}}}*/
    598598}

  • issm/trunk-jpl/src/c/objects/Bamg/BamgVertex.cpp

    r6412 r12365  
    99
    1010        /*Methods*/
    11         /*FUNCTION BamgVertex::Echo {{{1*/
     11        /*FUNCTION BamgVertex::Echo {{{*/
    1212
    1313        void BamgVertex::Echo(void){
    … …  
    2222        }
    2323        /*}}}*/
    24         /*FUNCTION BamgVertex::GetReferenceNumber{{{1*/
     24        /*FUNCTION BamgVertex::GetReferenceNumber{{{*/
    2525        int  BamgVertex::GetReferenceNumber() const {
    2626                return ReferenceNumber;
    2727        }
    2828        /*}}}*/
    29         /*FUNCTION BamgVertex::MetricFromHessian{{{1*/
     29        /*FUNCTION BamgVertex::MetricFromHessian{{{*/
    3030        void BamgVertex::MetricFromHessian(const double Hxx,const double Hyx, const double Hyy,const double smin,const double smax,const double s,double err,BamgOpts* bamgopts){
    3131                /*Compute Metric from Hessian*/
    … …  
    105105
    106106        }
    107         /*}}}1*/
    108         /*FUNCTION BamgVertex::Optim {{{1*/
     107        /*}}}*/
     108        /*FUNCTION BamgVertex::Optim {{{*/
    109109        long BamgVertex::Optim(int i,int koption){
    110110                long ret=0;
    … …  
    119119        }
    120120        /*}}}*/
    121         /*FUNCTION BamgVertex::Smoothing{{{1*/
     121        /*FUNCTION BamgVertex::Smoothing{{{*/
    122122        double  BamgVertex::Smoothing(Mesh &Th,const Mesh &BTh,Triangle* &tstart ,double omega){
    123123                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Smoothing)*/
    … …  
    222222                return delta;
    223223        }
    224         /*}}}1*/
     224        /*}}}*/
    225225
    226226        /*Intermediary*/
    227         /*FUNCTION QuadQuality{{{1*/
     227        /*FUNCTION QuadQuality{{{*/
    228228        double QuadQuality(const BamgVertex & a,const BamgVertex &b,const BamgVertex &c,const BamgVertex &d) {
    229229                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshQuad.cpp/QuadQuality)*/
    … …  
    252252                return 1.0-Max(Max(Abs(cosDAB),Abs(cosABC)),Max(Abs(cosBCD),Abs(cosCDA)));
    253253        }
    254         /*}}}1*/
     254        /*}}}*/
    255255
    256256}

  • issm/trunk-jpl/src/c/objects/Bamg/CrackedEdge.cpp

    r3913 r12365  
    99
    1010        /*Constructors/Destructors*/
    11         /*FUNCTION CrackedEdge() {{{1*/
     11        /*FUNCTION CrackedEdge() {{{*/
    1212        CrackedEdge::CrackedEdge() {
    1313                a=NULL;

  • issm/trunk-jpl/src/c/objects/Bamg/Curve.cpp

    r5401 r12365  
    1010
    1111        /*Constructors/Destructors*/
    12         /*FUNCTION Curve::Curve(){{{1*/
     12        /*FUNCTION Curve::Curve(){{{*/
    1313        Curve::Curve(){
    1414                FirstEdge=NULL;
    … …  
    2020
    2121        /*Methods*/
    22         /*FUNCTION Curve::Reverse {{{1*/
     22        /*FUNCTION Curve::Reverse {{{*/
    2323        void Curve::Reverse() {
    2424                /*reverse the direction of the curve */
    … …  
    2727        }
    2828        /*}}}*/
    29         /*FUNCTION Curve::Set {{{1*/
     29        /*FUNCTION Curve::Set {{{*/
    3030        void Curve::Set(const Curve & rec,const Geometry & Gh ,Geometry & GhNew){
    3131                *this = rec;

  • issm/trunk-jpl/src/c/objects/Bamg/Direction.cpp

    r5148 r12365  
    99
    1010        /*Constructors/Destructors*/
    11         /*FUNCTION Direction() {{{1*/
     11        /*FUNCTION Direction() {{{*/
    1212        Direction::Direction():
    1313                dir(MaxICoor){
    1414
    1515        }/*}}}*/
    16         /*FUNCTION Direction(Icoor1 i,Icoor1 j) {{{1*/
     16        /*FUNCTION Direction(Icoor1 i,Icoor1 j) {{{*/
    1717        Direction::Direction(Icoor1 i,Icoor1 j) {
    1818                Icoor2 n2 = 2*(Abs(i)+Abs(j)); 
    … …  
    2323
    2424        /*Methods*/
    25         /*FUNCTION Direction::direction{{{1*/
     25        /*FUNCTION Direction::direction{{{*/
    2626        int Direction::direction(Icoor1 i,Icoor1 j) {
    2727                int r =1;

  • issm/trunk-jpl/src/c/objects/Bamg/Edge.cpp

    r6412 r12365  
    1313
    1414        /*Methods*/
    15         /*FUNCTION Edge::Set {{{1*/
     15        /*FUNCTION Edge::Set {{{*/
    1616        void Edge::Set(const Mesh & Th ,long i,Mesh & ThNew){
    1717                *this = Th.edges[i];
    … …  
    2424        }
    2525        /*}}}*/
    26         /*FUNCTION Edge::Echo {{{1*/
     26        /*FUNCTION Edge::Echo {{{*/
    2727        void Edge::Echo(void){
    2828                printf("Edge:\n");
    … …  
    3333        }
    3434        /*}}}*/
    35         /*FUNCTION Edge::Renumbering{{{1*/
     35        /*FUNCTION Edge::Renumbering{{{*/
    3636        void Edge::Renumbering(BamgVertex *vb,BamgVertex *ve, long *renu){
    3737
    … …  
    4141        }
    4242        /*}}}*/
    43         /*FUNCTION Edge::Intersection{{{1*/
     43        /*FUNCTION Edge::Intersection{{{*/
    4444        int Edge::Intersection(const  Edge & e){
    4545

  • issm/trunk-jpl/src/c/objects/Bamg/EigenMetric.cpp

    r9371 r12365  
    99
    1010        /*Constructor*/
    11         /*FUNCTION EigenMetric::EigenMetric(const Metric M){{{1*/
     11        /*FUNCTION EigenMetric::EigenMetric(const Metric M){{{*/
    1212        EigenMetric::EigenMetric(const Metric& M){
    1313                /*From a metric (a11,a21,a22), get eigen values lambda1 and lambda2 and one eigen vector v*/
    … …  
    8888
    8989        }
    90         /*}}}1*/
    91         /*FUNCTION EigenMetric::EigenMetric(double r1,double r2,const D2 vp1){{{1*/
     90        /*}}}*/
     91        /*FUNCTION EigenMetric::EigenMetric(double r1,double r2,const D2 vp1){{{*/
    9292        EigenMetric::EigenMetric(double r1,double r2,const D2& vp1): lambda1(r1),lambda2(r2),v(vp1){
    9393
    … …  
    9595
    9696        /*Methods*/
    97         /*FUNCTION EigenMetric::Abs{{{1*/
     97        /*FUNCTION EigenMetric::Abs{{{*/
    9898        void   EigenMetric::Abs(){
    9999                lambda1=bamg::Abs(lambda1),lambda2=bamg::Abs(lambda2);
    100100        }/*}}}*/
    101         /*FUNCTION EigenMetric::Aniso{{{1*/
     101        /*FUNCTION EigenMetric::Aniso{{{*/
    102102        double EigenMetric::Aniso() const  {
    103103                return sqrt( Aniso2());
    104104        }/*}}}*/
    105         /*FUNCTION EigenMetric::Aniso2{{{1*/
     105        /*FUNCTION EigenMetric::Aniso2{{{*/
    106106        double EigenMetric::Aniso2() const  {
    107107                return lmax()/lmin();
    108108        }/*}}}*/
    109         /*FUNCTION EigenMetric::BoundAniso{{{1*/
     109        /*FUNCTION EigenMetric::BoundAniso{{{*/
    110110        void   EigenMetric::BoundAniso(const double c){
    111111                BoundAniso2(1/(c*c));
    112112        }/*}}}*/
    113         /*FUNCTION EigenMetric::Echo {{{1*/
     113        /*FUNCTION EigenMetric::Echo {{{*/
    114114        void EigenMetric::Echo(void){
    115115
    … …  
    123123        }
    124124        /*}}}*/
    125         /*FUNCTION EigenMetric::hmin{{{1*/
     125        /*FUNCTION EigenMetric::hmin{{{*/
    126126        double EigenMetric::hmin() const {
    127127                return sqrt(1/bamg::Max3(lambda1,lambda2,1e-30));
    128128        }/*}}}*/
    129         /*FUNCTION EigenMetric::hmax{{{1*/
     129        /*FUNCTION EigenMetric::hmax{{{*/
    130130        double EigenMetric::hmax() const {
    131131                return sqrt(1/bamg::Max(bamg::Min(lambda1,lambda2),1e-30));
    132132        }/*}}}*/
    133         /*FUNCTION EigenMetric::Isotrope{{{1*/
     133        /*FUNCTION EigenMetric::Isotrope{{{*/
    134134        void   EigenMetric::Isotrope() {
    135135                lambda1=lambda2=bamg::Max(lambda1,lambda2);
    136136        }/*}}}*/
    137         /*FUNCTION EigenMetric::lmax{{{1*/
     137        /*FUNCTION EigenMetric::lmax{{{*/
    138138        double EigenMetric::lmax() const {
    139139                return bamg::Max3(lambda1,lambda2,1e-30);
    140140        }/*}}}*/
    141         /*FUNCTION EigenMetric::lmin{{{1*/
     141        /*FUNCTION EigenMetric::lmin{{{*/
    142142        double EigenMetric::lmin() const {
    143143                return bamg::Max(bamg::Min(lambda1,lambda2),1e-30);
    144144        }/*}}}*/
    145         /*FUNCTION EigenMetric::Min{{{1*/
     145        /*FUNCTION EigenMetric::Min{{{*/
    146146        void   EigenMetric::Min(double a) {
    147147                lambda1=bamg::Min(a,lambda1); lambda2=bamg::Min(a,lambda2) ;
    148148        }/*}}}*/
    149         /*FUNCTION EigenMetric::Max{{{1*/
     149        /*FUNCTION EigenMetric::Max{{{*/
    150150        void   EigenMetric::Max(double a) {
    151151                //change eigen values
    152152                lambda1=bamg::Max(a,lambda1); lambda2=bamg::Max(a,lambda2) ;
    153153        }/*}}}*/
    154         /*FUNCTION EigenMetric::Minh{{{1*/
     154        /*FUNCTION EigenMetric::Minh{{{*/
    155155        void   EigenMetric::Minh(double h) {
    156156                Min(1.0/(h*h));
    157157        }/*}}}*/
    158         /*FUNCTION EigenMetric::Maxh{{{1*/
     158        /*FUNCTION EigenMetric::Maxh{{{*/
    159159        void   EigenMetric::Maxh(double h) {
    160160                //Call Max function
    161161                Max(1.0/(h*h));
    162162        }/*}}}*/
    163         /*FUNCTION EigenMetric::pow{{{1*/
     163        /*FUNCTION EigenMetric::pow{{{*/
    164164        void   EigenMetric::pow(double p){
    165165                lambda1=::pow(lambda1,p);lambda2=::pow(lambda2,p);

  • issm/trunk-jpl/src/c/objects/Bamg/GeomEdge.cpp

    r6412 r12365  
    1616
    1717        /*Methods*/
    18         /*FUNCTION GeomEdge::Cracked{{{1*/
     18        /*FUNCTION GeomEdge::Cracked{{{*/
    1919        int    GeomEdge::Cracked() const  {
    2020                return type &1; 
    2121        }/*}}}*/
    22         /*FUNCTION GeomEdge::F{{{1*/
     22        /*FUNCTION GeomEdge::F{{{*/
    2323        R2 GeomEdge::F(double theta) const{
    2424                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/F)*/
    … …  
    6262                return A*ca + B*cb + tg[0]*cta + tg[1]*ctb;
    6363          }
    64         /*}}}1*/
    65         /*FUNCTION GeomEdge::Mark{{{1*/
     64        /*}}}*/
     65        /*FUNCTION GeomEdge::Mark{{{*/
    6666        int    GeomEdge::Mark()    const  {
    6767                return type &16;
    6868        }/*}}}*/
    69         /*FUNCTION GeomEdge::R1tg{{{1*/
     69        /*FUNCTION GeomEdge::R1tg{{{*/
    7070        double GeomEdge::R1tg(double theta,R2 & t) const{
    7171                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/R1tg)*/
    … …  
    138138                else return 0;
    139139        }
    140         /*}}}1*/
    141         /*FUNCTION GeomEdge::Required{{{1*/
     140        /*}}}*/
     141        /*FUNCTION GeomEdge::Required{{{*/
    142142        int    GeomEdge::Required()       {
    143143                return type &64;
    144144        }/*}}}*/
    145         /*FUNCTION GeomEdge::Set {{{1*/
     145        /*FUNCTION GeomEdge::Set {{{*/
    146146        void GeomEdge::Set(const GeomEdge & rec,const Geometry & Gh ,Geometry & GhNew){
    147147                *this = rec;
    … …  
    152152        }
    153153        /*}}}*/
    154         /*FUNCTION GeomEdge::SetCracked{{{1*/
     154        /*FUNCTION GeomEdge::SetCracked{{{*/
    155155        void   GeomEdge::SetCracked()     {
    156156                type |= 1;/*=>1st digit to 1*/
    157157        }/*}}}*/
    158         /*FUNCTION GeomEdge::SetTgA{{{1*/
     158        /*FUNCTION GeomEdge::SetTgA{{{*/
    159159        void   GeomEdge::SetTgA()         {
    160160                type |=4; /*=>2d digit to 1*/
    161161        }/*}}}*/
    162         /*FUNCTION GeomEdge::SetTgB{{{1*/
     162        /*FUNCTION GeomEdge::SetTgB{{{*/
    163163        void   GeomEdge::SetTgB()         {
    164164                type |=8; /*=> 3d digit to 1*/
    165165        }/*}}}*/
    166         /*FUNCTION GeomEdge::SetMark{{{1*/
     166        /*FUNCTION GeomEdge::SetMark{{{*/
    167167        void   GeomEdge::SetMark()        {
    168168                type |=16;/*=> 4th digiy to 1*/
    169169        }/*}}}*/
    170         /*FUNCTION GeomEdge::SetUnMark{{{1*/
     170        /*FUNCTION GeomEdge::SetUnMark{{{*/
    171171        void   GeomEdge::SetUnMark()      {
    172172                type &= 1007 /* 1023-16 = 000111110111 => 4th digit to 0*/;
    173173        }/*}}}*/
    174         /*FUNCTION GeomEdge::SetRequired{{{1*/
     174        /*FUNCTION GeomEdge::SetRequired{{{*/
    175175        void   GeomEdge::SetRequired()    {
    176176                type |= 64;/*=>6th digit to 1*/
    177177        }/*}}}*/
    178           /*FUNCTION GeomEdge::Tg{{{1*/
     178          /*FUNCTION GeomEdge::Tg{{{*/
    179179        int    GeomEdge::Tg(int i) const  {
    180180                return i==0 ? TgA() : TgB();
    181181        }/*}}}*/
    182         /*FUNCTION GeomEdge::TgA{{{1*/
     182        /*FUNCTION GeomEdge::TgA{{{*/
    183183        int    GeomEdge::TgA()     const  {
    184184                return type &4; 
    185185        }/*}}}*/
    186         /*FUNCTION GeomEdge::TgB{{{1*/
     186        /*FUNCTION GeomEdge::TgB{{{*/
    187187        int    GeomEdge::TgB()     const  {
    188188                return type &8; 

  • issm/trunk-jpl/src/c/objects/Bamg/GeomSubDomain.cpp

    r5573 r12365  
    1212
    1313        /*Methods*/
    14         /*FUNCTION GeomSubDomain::Set {{{1*/
     14        /*FUNCTION GeomSubDomain::Set {{{*/
    1515        void GeomSubDomain::Set(const GeomSubDomain & rec,const Geometry & Gh ,const Geometry & GhNew){
    1616                *this = rec;

  • issm/trunk-jpl/src/c/objects/Bamg/GeomVertex.cpp

    r5573 r12365  
    1414
    1515        /*Methods*/
    16         /*FUNCTION GeomVertex::Corner {{{1*/
     16        /*FUNCTION GeomVertex::Corner {{{*/
    1717        int  GeomVertex::Corner() const {
    1818                return type & 4;
    1919        }
    2020        /*}}}*/
    21         /*FUNCTION GeomVertex::Required {{{1*/
     21        /*FUNCTION GeomVertex::Required {{{*/
    2222        int  GeomVertex::Required()const {
    2323                // a corner is required
    … …  
    2525        }
    2626        /*}}}*/
    27         /*FUNCTION GeomVertex::SetCorner {{{1*/
     27        /*FUNCTION GeomVertex::SetCorner {{{*/
    2828        void GeomVertex::SetCorner(){
    2929                type |= 4;
    3030        }
    3131        /*}}}*/
    32         /*FUNCTION GeomVertex::SetRequired {{{1*/
     32        /*FUNCTION GeomVertex::SetRequired {{{*/
    3333        void GeomVertex::SetRequired(){
    3434                type |= 2;

  • issm/trunk-jpl/src/c/objects/Bamg/Geometry.cpp

    r12218 r12365  
    1313
    1414        /*Constructors/Destructors*/
    15         /*FUNCTION Geometry::Geometry(){{{1*/
     15        /*FUNCTION Geometry::Geometry(){{{*/
    1616        Geometry::Geometry(){
    1717                Init();
    1818        }
    1919        /*}}}*/
    20         /*FUNCTION Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){{{1*/
     20        /*FUNCTION Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){{{*/
    2121        Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){
    2222                Init();
    … …  
    2525        }
    2626        /*}}}*/
    27         /*FUNCTION Geometry::Geometry(const Geometry & Gh) (COPY operator){{{1*/
     27        /*FUNCTION Geometry::Geometry(const Geometry & Gh) (COPY operator){{{*/
    2828        Geometry::Geometry(const Geometry & Gh) {
    2929                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/Geometry)*/
    … …  
    4444                 subdomains[i].Set(Gh.subdomains[i],Gh,*this);
    4545        }
    46         /*}}}1*/
    47         /*FUNCTION Geometry::~Geometry(){{{1*/
     46        /*}}}*/
     47        /*FUNCTION Geometry::~Geometry(){{{*/
    4848        Geometry::~Geometry() {
    4949                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/~Geometry)*/
    … …  
    5656                Init();
    5757        }
    58         /*}}}1*/
     58        /*}}}*/
    5959
    6060        /*IO*/
    61         /*FUNCTION Geometry::ReadGeometry{{{1*/
     61        /*FUNCTION Geometry::ReadGeometry{{{*/
    6262        void Geometry::ReadGeometry(BamgGeom* bamggeom,BamgOpts* bamgopts){
    6363
    … …  
    279279                }
    280280        }
    281         /*}}}1*/
    282         /*FUNCTION Geometry::WriteGeometry{{{1*/
     281        /*}}}*/
     282        /*FUNCTION Geometry::WriteGeometry{{{*/
    283283        void Geometry::WriteGeometry(BamgGeom* bamggeom, BamgOpts* bamgopts){
    284284
    … …  
    397397                }
    398398        }
    399         /*}}}1*/
     399        /*}}}*/
    400400
    401401        /*Methods*/
    402         /*FUNCTION Geometry::Echo {{{1*/
     402        /*FUNCTION Geometry::Echo {{{*/
    403403        void Geometry::Echo(void){
    404404
    … …  
    421421        }
    422422        /*}}}*/
    423         /*FUNCTION Geometry::Init{{{1*/
     423        /*FUNCTION Geometry::Init{{{*/
    424424        void Geometry::Init(void){
    425425                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/EmptyGeometry)*/
    … …  
    437437                MaxCornerAngle = 10*Pi/180; //default is 10 degres
    438438        }
    439         /*}}}1*/
    440         /*FUNCTION Geometry::MinimalHmin{{{1*/
     439        /*}}}*/
     440        /*FUNCTION Geometry::MinimalHmin{{{*/
    441441        double Geometry::MinimalHmin() {
    442442                /* coeffIcoor = (2^30-1)/D
    … …  
    445445                return 2.0/coefIcoor;
    446446        }/*}}}*/
    447         /*FUNCTION Geometry::MaximalHmax{{{1*/
     447        /*FUNCTION Geometry::MaximalHmax{{{*/
    448448        double Geometry::MaximalHmax() {
    449449                return Max(pmax.x-pmin.x,pmax.y-pmin.y);
    450450        }/*}}}*/
    451         /*FUNCTION Geometry::GetId(const GeomVertex &t){{{1*/
     451        /*FUNCTION Geometry::GetId(const GeomVertex &t){{{*/
    452452        long Geometry::GetId(const GeomVertex & t) const  {
    453453                return &t - vertices;
    454454        }/*}}}*/
    455         /*FUNCTION Geometry::GetId(const GeomVertex * t){{{1*/
     455        /*FUNCTION Geometry::GetId(const GeomVertex * t){{{*/
    456456        long Geometry::GetId(const GeomVertex * t) const  {
    457457                return t - vertices;
    458458        }/*}}}*/
    459         /*FUNCTION Geometry::GetId(const GeomEdge & t){{{1*/
     459        /*FUNCTION Geometry::GetId(const GeomEdge & t){{{*/
    460460        long Geometry::GetId(const GeomEdge & t) const  {
    461461                return &t - edges;
    462462        }/*}}}*/
    463         /*FUNCTION Geometry::GetId(const GeomEdge * t){{{1*/
     463        /*FUNCTION Geometry::GetId(const GeomEdge * t){{{*/
    464464        long Geometry::GetId(const GeomEdge * t) const  {
    465465                return t - edges;
    466466        }/*}}}*/
    467         /*FUNCTION Geometry::GetId(const Curve * c){{{1*/
     467        /*FUNCTION Geometry::GetId(const Curve * c){{{*/
    468468        long Geometry::GetId(const Curve * c) const  {
    469469                return c - curves;
    470470        }/*}}}*/
    471         /*FUNCTION Geometry::Containing{{{1*/
     471        /*FUNCTION Geometry::Containing{{{*/
    472472        GeomEdge* Geometry::Containing(const R2 P,  GeomEdge * start) const {
    473473                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/Contening)*/
    … …  
    494494                return on;
    495495        }
    496         /*}}}1*/
    497         /*FUNCTION Geometry::PostRead{{{1*/
     496        /*}}}*/
     497        /*FUNCTION Geometry::PostRead{{{*/
    498498        void Geometry::PostRead(){
    499499                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/AfterRead)*/
    … …  
    817817
    818818        }
    819         /*}}}1*/
    820         /*FUNCTION Geometry::ProjectOnCurve {{{1*/
     819        /*}}}*/
     820        /*FUNCTION Geometry::ProjectOnCurve {{{*/
    821821        GeomEdge* Geometry::ProjectOnCurve(const Edge &e,double s,BamgVertex &V,VertexOnGeom &GV) const {
    822822                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/ProjectOnCurve)*/
    … …  
    951951                return on;
    952952        }
    953         /*}}}1*/
    954         /*FUNCTION Geometry::R2ToI2{{{1*/
     953        /*}}}*/
     954        /*FUNCTION Geometry::R2ToI2{{{*/
    955955        I2 Geometry::R2ToI2(const R2 & P) const {
    956956                /*coefIcoor is the coefficient used for integer coordinates:
    … …  
    965965                return  I2( (Icoor1) (coefIcoor*(P.x-pmin.x)) ,(Icoor1) (coefIcoor*(P.y-pmin.y)) );
    966966        }/*}}}*/
    967         /*FUNCTION Geometry::UnMarkEdges{{{1*/
     967        /*FUNCTION Geometry::UnMarkEdges{{{*/
    968968        void Geometry::UnMarkEdges() {
    969969                for (int i=0;i<nbe;i++) edges[i].SetUnMark();

  • issm/trunk-jpl/src/c/objects/Bamg/ListofIntersectionTriangles.cpp

    r9306 r12365  
    99
    1010        /*Constructors Destructors*/
    11         /*FUNCTION ListofIntersectionTriangles::ListofIntersectionTriangles{{{1*/
     11        /*FUNCTION ListofIntersectionTriangles::ListofIntersectionTriangles{{{*/
    1212        ListofIntersectionTriangles::ListofIntersectionTriangles(int n,int m)
    1313          : MaxSize(n), Size(0), len(-1),state(-1),lIntTria(new IntersectionTriangles[n]) ,
    … …  
    1515          }
    1616        /*}}}*/
    17         /*FUNCTION ListofIntersectionTriangles::~ListofIntersectionTriangles{{{1*/
     17        /*FUNCTION ListofIntersectionTriangles::~ListofIntersectionTriangles{{{*/
    1818        ListofIntersectionTriangles::~ListofIntersectionTriangles(){
    1919                if (lIntTria) delete [] lIntTria,lIntTria=0;
    … …  
    2323
    2424        /*Methods*/
    25         /*FUNCTION ListofIntersectionTriangles::Init{{{1*/
     25        /*FUNCTION ListofIntersectionTriangles::Init{{{*/
    2626        void ListofIntersectionTriangles::Init(void){
    2727                state=0;
    … …  
    3030        }
    3131        /*}}}*/
    32         /*FUNCTION ListofIntersectionTriangles::Length{{{1*/
     32        /*FUNCTION ListofIntersectionTriangles::Length{{{*/
    3333        double  ListofIntersectionTriangles::Length(){
    3434                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Length)*/
    … …  
    7777                return s;
    7878        }
    79         /*}}}1*/
    80         /*FUNCTION ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {{{1*/
     79        /*}}}*/
     80        /*FUNCTION ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {{{*/
    8181        int  ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {
    8282                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewItem)*/
    … …  
    105105                return n;
    106106        }
    107         /*}}}1*/
    108         /*FUNCTION ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm){{{1*/
     107        /*}}}*/
     108        /*FUNCTION ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm){{{*/
    109109        int ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm) {
    110110                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewItem)*/
    … …  
    121121                return  n;
    122122        }
    123         /*}}}1*/
    124         /*FUNCTION ListofIntersectionTriangles::NewPoints{{{1*/
     123        /*}}}*/
     124        /*FUNCTION ListofIntersectionTriangles::NewPoints{{{*/
    125125        long ListofIntersectionTriangles::NewPoints(BamgVertex* vertices,long &nbv,long maxnbv){
    126126                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewPoints)*/
    … …  
    178178                return nbv-nbvold;
    179179        }
    180         /*}}}1*/
    181         /*FUNCTION ListofIntersectionTriangles::NewSubSeg{{{1*/
     180        /*}}}*/
     181        /*FUNCTION ListofIntersectionTriangles::NewSubSeg{{{*/
    182182        void  ListofIntersectionTriangles::NewSubSeg(GeomEdge *e,double s0,double s1){
    183183                long int verbosity=0;
    … …  
    201201        }
    202202        /*}}}*/
    203         /*FUNCTION ListofIntersectionTriangles::ReShape{{{1*/
     203        /*FUNCTION ListofIntersectionTriangles::ReShape{{{*/
    204204        void ListofIntersectionTriangles::ReShape(){
    205205
    … …  
    217217        }
    218218        /*}}}*/
    219         /*FUNCTION ListofIntersectionTriangles::SplitEdge{{{1*/
     219        /*FUNCTION ListofIntersectionTriangles::SplitEdge{{{*/
    220220        void ListofIntersectionTriangles::SplitEdge(const Mesh & Bh, const R2 &A,const R2  &B,int nbegin) {
    221221                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ListofIntersectionTriangles)*/
    … …  
    421421                } // for(;;)
    422422        }
    423         /*}}}1*/
     423        /*}}}*/
    424424
    425425}

  • issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp

    r12218 r12365  
    1111
    1212        /*Constructors/Destructors*/
    13         /*FUNCTION Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts){{{1*/
     13        /*FUNCTION Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts){{{*/
    1414        Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts):Gh(*(new Geometry())),BTh(*this){
    1515
    … …  
    4040                ReconstructExistingMesh();
    4141        }
    42         /*}}}1*/
    43         /*FUNCTION Mesh::Mesh(double* index,double* x,double* y,int nods,int nels){{{1*/
     42        /*}}}*/
     43        /*FUNCTION Mesh::Mesh(double* index,double* x,double* y,int nods,int nels){{{*/
    4444        Mesh::Mesh(double* index,double* x,double* y,int nods,int nels):Gh(*(new Geometry())),BTh(*this){
    4545
    … …  
    4949                ReconstructExistingMesh();
    5050        }
    51         /*}}}1*/
    52         /*FUNCTION Mesh::Mesh(double* x,double* y,int nods){{{1*/
     51        /*}}}*/
     52        /*FUNCTION Mesh::Mesh(double* x,double* y,int nods){{{*/
    5353        Mesh::Mesh(double* x,double* y,int nods):Gh(*(new Geometry())),BTh(*this){
    5454                Triangulate(x,y,nods);
    5555        }
    56         /*}}}1*/
    57         /*FUNCTION Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb){{{1*/
     56        /*}}}*/
     57        /*FUNCTION Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb){{{*/
    5858        Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb,BamgOpts* bamgopts) : Gh(*(new Geometry())), BTh(*this) {
    5959                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Triangles)*/
    … …  
    160160
    161161          }
    162         /*}}}1*/
    163         /*FUNCTION Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in) COPY{{{1*/
     162        /*}}}*/
     163        /*FUNCTION Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in) COPY{{{*/
    164164        Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in)
    165165          : Gh(*(pGh?pGh:&Th.Gh)), BTh(*(pBth?pBth:this)) {
    … …  
    224224
    225225          }
    226         /*}}}1*/
    227         /*FUNCTION Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices){{{1*/
     226        /*}}}*/
     227        /*FUNCTION Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices){{{*/
    228228        Mesh::Mesh(long imaxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices) :Gh(BT.Gh),BTh(BT) {
    229229                this->Init(imaxnbv);
    230230                TriangulateFromGeom1(bamgopts,keepBackVertices);
    231231        }
    232         /*}}}1*/
    233         /*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{1*/
     232        /*}}}*/
     233        /*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{*/
    234234        Mesh::Mesh(long imaxnbv,Geometry & G,BamgOpts* bamgopts):Gh(G),BTh(*this){
    235235                Init(imaxnbv);
    236236                TriangulateFromGeom0(bamgopts);
    237237        }
    238         /*}}}1*/
    239         /*FUNCTION Mesh::~Mesh(){{{1*/
     238        /*}}}*/
     239        /*FUNCTION Mesh::~Mesh(){{{*/
    240240        Mesh::~Mesh() {
    241241                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Triangles)*/
    … …  
    262262                Init(0); // set all to zero
    263263        }
    264         /*}}}1*/
     264        /*}}}*/
    265265
    266266        /*IO*/
    267         /*FUNCTION Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){{{1*/
     267        /*FUNCTION Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){{{*/
    268268        void Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){
    269269
    … …  
    328328                xfree((void**)&nodeflags);
    329329        }
    330         /*}}}1*/
    331         /*FUNCTION Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){{{1*/
     330        /*}}}*/
     331        /*FUNCTION Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){{{*/
    332332        void Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){
    333333
    … …  
    529529
    530530        }
    531         /*}}}1*/
    532         /*FUNCTION Mesh::WriteMesh {{{1*/
     531        /*}}}*/
     532        /*FUNCTION Mesh::WriteMesh {{{*/
    533533        void Mesh::WriteMesh(BamgMesh* bamgmesh,BamgOpts* bamgopts){
    534534
    … …  
    954954                delete [] numt;
    955955        }
    956         /*}}}1*/
    957         /*FUNCTION Mesh::ReadMetric{{{1*/
     956        /*}}}*/
     957        /*FUNCTION Mesh::ReadMetric{{{*/
    958958        void Mesh::ReadMetric(const BamgOpts* bamgopts) {
    959959
    … …  
    992992                }
    993993        }
    994         /*}}}1*/
    995         /*FUNCTION Mesh::WriteMetric{{{1*/
     994        /*}}}*/
     995        /*FUNCTION Mesh::WriteMetric{{{*/
    996996        void Mesh::WriteMetric(BamgOpts* bamgopts) {
    997997                int i;
    … …  
    10041004                }
    10051005        }
    1006         /*}}}1*/
    1007         /*FUNCTION Mesh::WriteIndex{{{1*/
     1006        /*}}}*/
     1007        /*FUNCTION Mesh::WriteIndex{{{*/
    10081008        void Mesh::WriteIndex(int** pindex,int* pnels){
    10091009
    … …  
    10421042                *pnels=num;
    10431043        }
    1044         /*}}}1*/
     1044        /*}}}*/
    10451045
    10461046        /*Methods*/
    1047         /*FUNCTION Mesh::AddGeometryMetric{{{1*/
     1047        /*FUNCTION Mesh::AddGeometryMetric{{{*/
    10481048        void Mesh::AddGeometryMetric(BamgOpts* bamgopts){
    10491049                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/IntersectGeomMetric)*/
    … …  
    10991099                // the problem is for the vertex on vertex
    11001100        }
    1101         /*}}}1*/
    1102         /*FUNCTION Mesh::AddMetric{{{1*/
     1101        /*}}}*/
     1102        /*FUNCTION Mesh::AddMetric{{{*/
    11031103        void Mesh::AddMetric(BamgOpts* bamgopts){
    11041104                //  Hessiantype = 0 =>  H is computed using double P2 projection
    … …  
    11181118                }
    11191119        }
    1120         /*}}}1*/
    1121         /*FUNCTION Mesh::AddVertex{{{1*/
     1120        /*}}}*/
     1121        /*FUNCTION Mesh::AddVertex{{{*/
    11221122        void Mesh::AddVertex( BamgVertex &s,Triangle* t, Icoor2* det3) {
    11231123                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Add)*/
    … …  
    12551255                }
    12561256        }
    1257         /*}}}1*/
    1258         /*FUNCTION Mesh::BoundAnisotropy{{{1*/
     1257        /*}}}*/
     1258        /*FUNCTION Mesh::BoundAnisotropy{{{*/
    12591259        void  Mesh::BoundAnisotropy(double anisomax,double hminaniso) {
    12601260                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/BoundAnisotropy)*/
    … …  
    12951295                }
    12961296        }
    1297         /*}}}1*/
    1298         /*FUNCTION Mesh::BuildGeometryFromMesh{{{1*/
     1297        /*}}}*/
     1298        /*FUNCTION Mesh::BuildGeometryFromMesh{{{*/
    12991299        void Mesh::BuildGeometryFromMesh(BamgOpts* bamgopts){
    13001300                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshGeom.cpp/ConsGeometry)*/
    … …  
    17481748
    17491749        }
    1750         /*}}}1*/
    1751         /*FUNCTION Mesh::BuildMetric0 (double P2 projection){{{1*/
     1750        /*}}}*/
     1751        /*FUNCTION Mesh::BuildMetric0 (double P2 projection){{{*/
    17521752        void Mesh::BuildMetric0(BamgOpts* bamgopts){
    17531753
    … …  
    19531953                delete [] dydy_vertex;
    19541954        }
    1955         /*}}}1*/
    1956         /*FUNCTION Mesh::BuildMetric1 (Green formula){{{1*/
     1955        /*}}}*/
     1956        /*FUNCTION Mesh::BuildMetric1 (Green formula){{{*/
    19571957        void Mesh::BuildMetric1(BamgOpts* bamgopts){
    19581958                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/IntersectConsMetric)*/
    … …  
    22442244
    22452245        }
    2246         /*}}}1*/
    2247         /*FUNCTION Mesh::CrackMesh{{{1*/
     2246        /*}}}*/
     2247        /*FUNCTION Mesh::CrackMesh{{{*/
    22482248        void Mesh::CrackMesh(BamgOpts* bamgopts) {
    22492249                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/CrackMesh)*/
    … …  
    23922392
    23932393        }
    2394         /*}}}1*/
    2395         /*FUNCTION Mesh::Echo{{{1*/
     2394        /*}}}*/
     2395        /*FUNCTION Mesh::Echo{{{*/
    23962396        void Mesh::Echo(void) {
    23972397
    … …  
    24162416
    24172417        }
    2418         /*}}}1*/
    2419         /*FUNCTION Mesh::ForceBoundary{{{1*/
     2418        /*}}}*/
     2419        /*FUNCTION Mesh::ForceBoundary{{{*/
    24202420                void Mesh::ForceBoundary() {
    24212421                        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ForceBoundary)*/
    … …  
    24592459                        if (verbose > 3) printf("      number of inforced edge = %i, number of swap= %i\n",nbfe,Nbswap);
    24602460                }
    2461         /*}}}1*/
    2462         /*FUNCTION Mesh::FindSubDomain{{{1*/
     2461        /*}}}*/
     2462        /*FUNCTION Mesh::FindSubDomain{{{*/
    24632463        void Mesh::FindSubDomain(int OutSide) {
    24642464                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/FindSubDomain)*/
    … …  
    27072707                         if(!triangles[it].link)  nbtout++;
    27082708        }
    2709         /*}}}1*/
    2710         /*FUNCTION Mesh::GetId(const Triangle & t) const{{{1*/
     2709        /*}}}*/
     2710        /*FUNCTION Mesh::GetId(const Triangle & t) const{{{*/
    27112711        long Mesh::GetId(const Triangle & t) const  {
    27122712                return &t - triangles;
    27132713        }
    2714         /*}}}1*/
    2715         /*FUNCTION Mesh::GetId(const Triangle * t) const{{{1*/
     2714        /*}}}*/
     2715        /*FUNCTION Mesh::GetId(const Triangle * t) const{{{*/
    27162716        long Mesh::GetId(const Triangle * t) const  {
    27172717                return t - triangles;
    27182718        }
    2719         /*}}}1*/
    2720         /*FUNCTION Mesh::GetId(const BamgVertex & t) const{{{1*/
     2719        /*}}}*/
     2720        /*FUNCTION Mesh::GetId(const BamgVertex & t) const{{{*/
    27212721        long Mesh::GetId(const BamgVertex & t) const  {
    27222722                return &t - vertices;
    27232723        }
    2724         /*}}}1*/
    2725         /*FUNCTION Mesh::GetId(const BamgVertex * t) const{{{1*/
     2724        /*}}}*/
     2725        /*FUNCTION Mesh::GetId(const BamgVertex * t) const{{{*/
    27262726        long Mesh::GetId(const BamgVertex * t) const  {
    27272727                return t - vertices;
    27282728        }
    2729         /*}}}1*/
    2730         /*FUNCTION Mesh::GetId(const Edge & t) const{{{1*/
     2729        /*}}}*/
     2730        /*FUNCTION Mesh::GetId(const Edge & t) const{{{*/
    27312731        long Mesh::GetId(const Edge & t) const  {
    27322732                return &t - edges;
    27332733        }
    2734         /*}}}1*/
    2735         /*FUNCTION Mesh::GetId(const Edge * t) const{{{1*/
     2734        /*}}}*/
     2735        /*FUNCTION Mesh::GetId(const Edge * t) const{{{*/
    27362736        long Mesh::GetId(const Edge * t) const  {
    27372737                return t - edges;
    27382738        }
    2739         /*}}}1*/
    2740         /*FUNCTION Mesh::Init{{{1*/
     2739        /*}}}*/
     2740        /*FUNCTION Mesh::Init{{{*/
    27412741        void Mesh::Init(long maxnbv_in) {
    27422742                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/PreInit)*/
    … …  
    27862786                }
    27872787        }
    2788         /*}}}1*/
    2789         /*FUNCTION Mesh::Insert{{{1*/
     2788        /*}}}*/
     2789        /*FUNCTION Mesh::Insert{{{*/
    27902790        void Mesh::Insert() {
    27912791                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Insert)*/
    … …  
    29382938#endif
    29392939        }
    2940         /*}}}1*/
    2941         /*FUNCTION Mesh::InsertNewPoints{{{1*/
     2940        /*}}}*/
     2941        /*FUNCTION Mesh::InsertNewPoints{{{*/
    29422942        long Mesh::InsertNewPoints(long nbvold,long & NbTSwap) {
    29432943                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/
    … …  
    30153015                return nbv-nbvold;
    30163016        }
    3017         /*}}}1*/
    3018         /*FUNCTION Mesh::isCracked{{{1*/
     3017        /*}}}*/
     3018        /*FUNCTION Mesh::isCracked{{{*/
    30193019        int Mesh::isCracked() const {
    30203020                return NbCrackedVertices != 0;
    30213021        }
    3022         /*}}}1*/
    3023         /*FUNCTION Mesh::MakeGeomEdgeToEdge{{{1*/
     3022        /*}}}*/
     3023        /*FUNCTION Mesh::MakeGeomEdgeToEdge{{{*/
    30243024        Edge** Mesh::MakeGeomEdgeToEdge() {
    30253025                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeGeomEdgeToEdge)*/
    … …  
    30633063                return e;
    30643064        }
    3065         /*}}}1*/
    3066         /*FUNCTION Mesh::MakeQuadrangles{{{1*/
     3065        /*}}}*/
     3066        /*FUNCTION Mesh::MakeQuadrangles{{{*/
    30673067        void Mesh::MakeQuadrangles(double costheta){
    30683068                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeQuadrangles)*/
    … …  
    31063106                        delete [] qq;
    31073107        }
    3108         /*}}}1*/
    3109         /*FUNCTION Mesh::MakeBamgQuadtree{{{1*/
     3108        /*}}}*/
     3109        /*FUNCTION Mesh::MakeBamgQuadtree{{{*/
    31103110        void Mesh::MakeBamgQuadtree() { 
    31113111                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MakeBamgQuadtree)*/
    … …  
    31153115
    31163116        }
    3117         /*}}}1*/
    3118         /*FUNCTION Mesh::MaxinalHmax{{{1*/
     3117        /*}}}*/
     3118        /*FUNCTION Mesh::MaxinalHmax{{{*/
    31193119        double Mesh::MaximalHmax() {
    31203120                return Max(pmax.x-pmin.x,pmax.y-pmin.y);
    31213121        }
    3122         /*}}}1*/
    3123         /*FUNCTION Mesh::MaxSubDivision{{{1*/
     3122        /*}}}*/
     3123        /*FUNCTION Mesh::MaxSubDivision{{{*/
    31243124        void  Mesh::MaxSubDivision(double maxsubdiv) {
    31253125                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/MaxSubDivision)*/
    … …  
    31743174                }
    31753175        }
    3176         /*}}}1*/
    3177         /*FUNCTION Mesh::MetricAt{{{1*/
     3176        /*}}}*/
     3177        /*FUNCTION Mesh::MetricAt{{{*/
    31783178        Metric Mesh::MetricAt(const R2 & A) const {
    31793179                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/MetricAt)*/
    … …  
    31953195                }
    31963196        }
    3197         /*}}}1*/
    3198         /*FUNCTION Mesh::MininalHmin{{{1*/
     3197        /*}}}*/
     3198        /*FUNCTION Mesh::MininalHmin{{{*/
    31993199        double Mesh::MinimalHmin() {
    32003200                return 2.0/coefIcoor;
    32013201        }
    3202         /*}}}1*/
    3203 /*FUNCTION Mesh::NearestVertex{{{1*/
     3202        /*}}}*/
     3203/*FUNCTION Mesh::NearestVertex{{{*/
    32043204BamgVertex* Mesh::NearestVertex(Icoor1 i,Icoor1 j) {
    32053205        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NearestVertex)*/
    32063206        return  quadtree->NearestVertex(i,j);
    32073207}
    3208 /*}}}1*/
    3209         /*FUNCTION Mesh::NewPoints{{{1*/
     3208/*}}}*/
     3209        /*FUNCTION Mesh::NewPoints{{{*/
    32103210        void  Mesh::NewPoints(Mesh & Bh,BamgOpts* bamgopts,int KeepVertices){
    32113211                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewPoints)*/
    … …  
    33263326                NbTSwap +=  NbSwapf ;
    33273327        }
    3328         /*}}}1*/
    3329         /*FUNCTION Mesh::ProjectOnCurve{{{1*/
     3328        /*}}}*/
     3329        /*FUNCTION Mesh::ProjectOnCurve{{{*/
    33303330        GeomEdge*   Mesh::ProjectOnCurve( Edge & BhAB, BamgVertex &  vA, BamgVertex & vB,
    33313331                                double theta,BamgVertex & R,VertexOnEdge &  BR,VertexOnGeom & GR) {
    … …  
    34553455                return 0; // just for the compiler
    34563456        }                 
    3457         /*}}}1*/
    3458 /*FUNCTION Mesh::ReconstructExistingMesh{{{1*/
     3457        /*}}}*/
     3458/*FUNCTION Mesh::ReconstructExistingMesh{{{*/
    34593459void Mesh::ReconstructExistingMesh(){
    34603460        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/FillHoleInMesh)*/
    … …  
    37623762        }
    37633763}
    3764 /*}}}1*/
    3765         /*FUNCTION Mesh::TrianglesRenumberBySubDomain{{{1*/
     3764/*}}}*/
     3765        /*FUNCTION Mesh::TrianglesRenumberBySubDomain{{{*/
    37663766        void Mesh::TrianglesRenumberBySubDomain(bool justcompress){
    37673767                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ReNumberingTheTriangleBySubDomain)*/
    … …  
    38313831
    38323832        }
    3833         /*}}}1*/
    3834         /*FUNCTION Mesh::VerticesRenumber{{{1*/
     3833        /*}}}*/
     3834        /*FUNCTION Mesh::VerticesRenumber{{{*/
    38353835        void Mesh::VerticesRenumber(long * renu) {
    38363836                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ReNumberingVertex)*/
    … …  
    39053905                for ( it=0;it<nbv;it++) renu[i]= -renu[i]-1;
    39063906        }
    3907         /*}}}1*/
    3908 /*FUNCTION Mesh::SetIntCoor{{{1*/
     3907        /*}}}*/
     3908/*FUNCTION Mesh::SetIntCoor{{{*/
    39093909void Mesh::SetIntCoor(const char * strfrom) {
    39103910        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/SetIntCoor)*/
    … …  
    39673967        if (number_of_errors) _error_("Fatal error: some triangles have negative areas, see above");
    39683968}
    3969 /*}}}1*/
    3970 /*FUNCTION Mesh::ShowRegulaty{{{1*/
     3969/*}}}*/
     3970/*FUNCTION Mesh::ShowRegulaty{{{*/
    39713971void  Mesh::ShowRegulaty() const {
    39723972        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr>*/
    … …  
    40314031        printf("      anisomax = %g, beta max = %g, min = %g\n",pow(alpha2,0.5),1./pow(beta/aireKh,0.5), 1./pow(beta0/aireKh,0.5));
    40324032}
    4033 /*}}}1*/
    4034 /*FUNCTION Mesh::ShowHistogram{{{1*/
     4033/*}}}*/
     4034/*FUNCTION Mesh::ShowHistogram{{{*/
    40354035void  Mesh::ShowHistogram() const {
    40364036        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ShowHistogram)*/
    … …  
    40764076        printf("      --------------------+-------------+-------------\n");
    40774077}
    4078 /*}}}1*/
    4079 /*FUNCTION Mesh::SmoothingVertex{{{1*/
     4078/*}}}*/
     4079/*FUNCTION Mesh::SmoothingVertex{{{*/
    40804080void Mesh::SmoothingVertex(int nbiter,double omega ) {
    40814081        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/SmoothingVertex)*/
    … …  
    41184118        if (quadtree) quadtree= new BamgQuadtree(this);
    41194119}
    4120 /*}}}1*/
    4121 /*FUNCTION Mesh::SmoothMetric{{{1*/
     4120/*}}}*/
     4121/*FUNCTION Mesh::SmoothMetric{{{*/
    41224122void Mesh::SmoothMetric(double raisonmax) {
    41234123        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/SmoothMetric)*/
    … …  
    41964196        delete [] first_np_or_next_t1;
    41974197}
    4198 /*}}}1*/
    4199         /*FUNCTION Mesh::SplitElement{{{1*/
     4198/*}}}*/
     4199        /*FUNCTION Mesh::SplitElement{{{*/
    42004200        int  Mesh::SplitElement(int choice){
    42014201                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, MeshQuad.cpp/SplitElement)*/
    … …  
    47064706                return ret; // ok
    47074707        }
    4708         /*}}}1*/
    4709 /*FUNCTION Mesh::SplitInternalEdgeWithBorderVertices{{{1*/
     4708        /*}}}*/
     4709/*FUNCTION Mesh::SplitInternalEdgeWithBorderVertices{{{*/
    47104710long  Mesh::SplitInternalEdgeWithBorderVertices(){
    47114711        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/SplitInternalEdgeWithBorderVertices)*/
    … …  
    47774777return  NbSplitEdge;
    47784778}
    4779 /*}}}1*/
    4780 /*FUNCTION Mesh::ToI2{{{1*/
     4779/*}}}*/
     4780/*FUNCTION Mesh::ToI2{{{*/
    47814781I2 Mesh::R2ToI2(const R2 & P) const {
    47824782        return  I2( (Icoor1) (coefIcoor*(P.x-pmin.x)),(Icoor1) (coefIcoor*(P.y-pmin.y)) );
    47834783}
    4784 /*}}}1*/
    4785 /*FUNCTION Mesh::ToR2{{{1*/
     4784/*}}}*/
     4785/*FUNCTION Mesh::ToR2{{{*/
    47864786R2 Mesh::I2ToR2(const I2 & P) const {
    47874787        return  R2( (double) P.x/coefIcoor+pmin.x, (double) P.y/coefIcoor+pmin.y);
    47884788}
    4789 /*}}}1*/
    4790 /*FUNCTION Mesh::TriangleFindFromCoord{{{1*/
     4789/*}}}*/
     4790/*FUNCTION Mesh::TriangleFindFromCoord{{{*/
    47914791Triangle * Mesh::TriangleFindFromCoord(const I2 & B,Icoor2 det3[3], Triangle *tstart) const {
    47924792        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/FindTriangleContening)*/
    … …  
    48794879        return t;
    48804880}
    4881 /*}}}1*/
    4882 /*FUNCTION Mesh::TriangleIntNumbering{{{1*/
     4881/*}}}*/
     4882/*FUNCTION Mesh::TriangleIntNumbering{{{*/
    48834883void Mesh::TriangleIntNumbering(long* renumbering){
    48844884
    … …  
    48904890        return;   
    48914891}
    4892 /*}}}1*/
    4893 /*FUNCTION Mesh::TriangleReferenceList{{{1*/
     4892/*}}}*/
     4893/*FUNCTION Mesh::TriangleReferenceList{{{*/
    48944894long  Mesh::TriangleReferenceList(long* reft) const {
    48954895        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/
    … …  
    49304930        return k;   
    49314931}
    4932 /*}}}1*/
    4933 /*FUNCTION Mesh::Triangulate{{{1*/
     4932/*}}}*/
     4933/*FUNCTION Mesh::Triangulate{{{*/
    49344934void Mesh::Triangulate(double* x,double* y,int nods){
    49354935
    … …  
    49574957        Insert();
    49584958}
    4959 /*}}}1*/
    4960         /*FUNCTION Mesh::TriangulateFromGeom0{{{1*/
     4959/*}}}*/
     4960        /*FUNCTION Mesh::TriangulateFromGeom0{{{*/
    49614961        void Mesh::TriangulateFromGeom0(BamgOpts* bamgopts){
    49624962                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/GeomToTriangles0)*/
    … …  
    52725272                if (verbose>4) printf("      -- current number of vertices = %i\n",nbv);
    52735273        }
    5274         /*}}}1*/
    5275         /*FUNCTION Mesh::TriangulateFromGeom1{{{1*/
     5274        /*}}}*/
     5275        /*FUNCTION Mesh::TriangulateFromGeom1{{{*/
    52765276        void Mesh::TriangulateFromGeom1(BamgOpts* bamgopts,int KeepVertices){
    52775277                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/GeomToTriangles1)*/
    … …  
    56025602                if (verbose>4) printf("      -- current number of vertices = %i\n",nbv);
    56035603        }
    5604         /*}}}1*/
     5604        /*}}}*/
    56055605
    56065606        /*Intermediary*/
    5607         /*FUNCTION CloseBoundaryEdge{{{1*/
     5607        /*FUNCTION CloseBoundaryEdge{{{*/
    56085608        AdjacentTriangle CloseBoundaryEdge(I2 A,Triangle *t, double &a,double &b) {
    56095609                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdge)*/
    … …  
    56445644                  }
    56455645        }
    5646         /*}}}1*/
    5647         /*FUNCTION CloseBoundaryEdgeV2{{{1*/
     5646        /*}}}*/
     5647        /*FUNCTION CloseBoundaryEdgeV2{{{*/
    56485648        AdjacentTriangle CloseBoundaryEdgeV2(I2 C,Triangle *t, double &a,double &b) {
    56495649                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdgeV2)*/
    … …  
    57935793                return er;
    57945794        }
    5795         /*}}}1*/
    5796 /*FUNCTION ForceEdge{{{1*/
     5795        /*}}}*/
     5796/*FUNCTION ForceEdge{{{*/
    57975797int ForceEdge(BamgVertex &a, BamgVertex & b,AdjacentTriangle & taret)  {
    57985798        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/ForceEdge)*/
    … …  
    58695869        return NbSwap;
    58705870}
    5871 /*}}}1*/
    5872 /*FUNCTION swap{{{1*/
     5871/*}}}*/
     5872/*FUNCTION swap{{{*/
    58735873void  swap(Triangle *t1,short a1, Triangle *t2,short a2, BamgVertex *s1,BamgVertex *s2,Icoor2 det1,Icoor2 det2){
    58745874        /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/swap)*/
    … …  
    59145914        t2->SetSingleVertexToTriangleConnectivity();
    59155915} // end swap
    5916 /*}}}1*/
    5917         /*FUNCTION SwapForForcingEdge{{{1*/
     5916/*}}}*/
     5917        /*FUNCTION SwapForForcingEdge{{{*/
    59185918        int SwapForForcingEdge(BamgVertex   *  & pva ,BamgVertex  * &   pvb ,AdjacentTriangle & tt1,Icoor2 & dets1, Icoor2 & detsa,Icoor2 & detsb, int & NbSwap) {
    59195919                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/SwapForForcingEdge)*/
    … …  
    60026002                return ret;
    60036003        }
    6004         /*}}}1*/
     6004        /*}}}*/
    60056005
    60066006}

  • issm/trunk-jpl/src/c/objects/Bamg/Metric.cpp

    r9371 r12365  
    1414
    1515        /*Constructor/Destructor*/
    16         /*FUNCTION Metric::Metric(){{{1*/
    17         /*FUNCTION Metric::Metric(double a){{{1*/
     16        /*FUNCTION Metric::Metric(double a){{{*/
    1817        Metric::Metric(double a): a11(1/(a*a)),a21(0),a22(1/(a*a)){
    1918       
    2019        }/*}}}*/
    21         /*FUNCTION Metric::Metric(double a,double b,double c){{{1*/
     20        /*FUNCTION Metric::Metric(double a,double b,double c){{{*/
    2221        Metric::Metric(double a,double b,double c) :a11(a),a21(b),a22(c){
    2322       
    2423        }/*}}}*/
    25         /*FUNCTION Metric::Metric(const double  a[3],const  Metric& m0, const  Metric& m1,const  Metric&  m2 ){{{1*/
     24        /*FUNCTION Metric::Metric(const double  a[3],const  Metric& m0, const  Metric& m1,const  Metric&  m2 ){{{*/
    2625        Metric::Metric(const double  a[3],const  Metric& m0, const  Metric& m1,const  Metric& m2 ){
    2726                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/Metric)*/
    … …  
    4342                *this = vab;
    4443        }
    45         /*}}}1*/
    46         /*FUNCTION Metric::Metric(double  a,const  Metric& ma, double  b,const  Metric& mb){{{1*/
     44        /*}}}*/
     45        /*FUNCTION Metric::Metric(double  a,const  Metric& ma, double  b,const  Metric& mb){{{*/
    4746        Metric::Metric(double  a,const  Metric& ma, double  b,const  Metric& mb) {
    4847                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/EigenMetric)*/
    … …  
    6362                *this=vab;
    6463        }
    65         /*}}}1*/
     64        /*}}}*/
    6665
    6766        /*Methods*/
    68         /*FUNCTION Metric::det{{{1*/
     67        /*FUNCTION Metric::det{{{*/
    6968        double Metric::det() const {
    7069                return a11*a22-a21*a21;
    7170        }  /*}}}*/
    72         /*FUNCTION Metric::Echo {{{1*/
     71        /*FUNCTION Metric::Echo {{{*/
    7372        void Metric::Echo(void){
    7473
    … …  
    7978        }
    8079        /*}}}*/
    81         /*FUNCTION Metric::IntersectWith{{{1*/
     80        /*FUNCTION Metric::IntersectWith{{{*/
    8281        int Metric::IntersectWith(const Metric& M2) {
    8382                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/IntersectWith)*/
    … …  
    131130                return change;
    132131        }
    133         /*}}}1*/
    134         /*FUNCTION Metric::mul{{{1*/
     132        /*}}}*/
     133        /*FUNCTION Metric::mul{{{*/
    135134        R2     Metric::mul(const R2 x)const {
    136135                return R2(a11*x.x+a21*x.y,a21*x.x+a22*x.y);
    … …  
    138137
    139138        /*Intermediary*/
    140         /*FUNCTION LengthInterpole{{{1*/
     139        /*FUNCTION LengthInterpole{{{*/
    141140        double LengthInterpole(const Metric& Ma,const  Metric& Mb, R2 AB) {
    142141                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/LengthInterpole)*/
    … …  
    205204                return l;
    206205        }
    207         /*}}}1*/
    208         /*FUNCTION SimultaneousMatrixReduction{{{1*/
     206        /*}}}*/
     207        /*FUNCTION SimultaneousMatrixReduction{{{*/
    209208        void SimultaneousMatrixReduction( Metric M1,  Metric M2, D2xD2 &V) {
    210209                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/ReductionSimultanee)*/
    … …  
    308307                }
    309308        }
    310         /*}}}1*/
    311         /*FUNCTION abscisseInterpole{{{1*/
     309        /*}}}*/
     310        /*FUNCTION abscisseInterpole{{{*/
    312311        double abscisseInterpole(const Metric& Ma,const  Metric& Mb, R2 AB,double s,int optim) {
    313312                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Metric.cpp/abscisseInterpole)*/
    … …  
    350349                return r ;
    351350        }
    352         /*}}}1*/
     351        /*}}}*/
    353352
    354353}

  • issm/trunk-jpl/src/c/objects/Bamg/SetOfE4.cpp

    r6412 r12365  
    55
    66        /*Constructor*/
    7         /*FUNCTION  SetOfEdges4::SetOfEdges4(long mmx,long nnx){{{1*/
     7        /*FUNCTION  SetOfEdges4::SetOfEdges4(long mmx,long nnx){{{*/
    88        SetOfEdges4::SetOfEdges4(long mmx,long nnx){
    99                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, SetOfEdges4.cpp/SetOfEdges4)*/
    … …  
    2323                while(i--) head[i]=-1;
    2424        }
    25         /*}}}1*/
     25        /*}}}*/
    2626
    2727        /*Methods*/
    28         /*FUNCTION  SetOfEdges4::add{{{1*/
     28        /*FUNCTION  SetOfEdges4::add{{{*/
    2929        long SetOfEdges4::add(long ii,long jj) {
    3030                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, SetOfEdges4.cpp/add)*/
    … …  
    6060                return NbOfEdges ++;
    6161        }
    62         /*}}}1*/
    63         /*FUNCTION  SetOfEdges4::find {{{1*/
     62        /*}}}*/
     63        /*FUNCTION  SetOfEdges4::find {{{*/
    6464        long SetOfEdges4::find(long ii,long jj) {
    6565                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, SetOfEdges4.cpp/find)*/
    … …  
    8787                return -1;
    8888        }
    89         /*}}}1*/
    90         /*FUNCTION  SetOfEdges4::i{{{1*/
     89        /*}}}*/
     90        /*FUNCTION  SetOfEdges4::i{{{*/
    9191        long SetOfEdges4::i(long k){
    9292                return Edges[k].i;
    9393        }
    94         /*}}}1*/
    95         /*FUNCTION  SetOfEdges4::j{{{1*/
     94        /*}}}*/
     95        /*FUNCTION  SetOfEdges4::j{{{*/
    9696        long SetOfEdges4::j(long k){
    9797                return Edges[k].j;
    9898        }
    99         /*}}}1*/
    100         /*FUNCTION  SetOfEdges4::nb{{{1*/
     99        /*}}}*/
     100        /*FUNCTION  SetOfEdges4::nb{{{*/
    101101        long SetOfEdges4::nb(){
    102102                return NbOfEdges;
    103103        }
    104         /*}}}1*/
    105         /*FUNCTION  SetOfEdges4::newarete{{{1*/
     104        /*}}}*/
     105        /*FUNCTION  SetOfEdges4::newarete{{{*/
    106106        long SetOfEdges4::newarete(long k){
    107107                return NbOfEdges == k+1;
    108108        }
    109         /*}}}1*/
    110         /*FUNCTION  SetOfEdges4::SortAndAdd{{{1*/
     109        /*}}}*/
     110        /*FUNCTION  SetOfEdges4::SortAndAdd{{{*/
    111111        long SetOfEdges4::SortAndAdd (long ii,long jj) {
    112112                return ii <=jj ? add (ii,jj)  : add (jj,ii) ;
    113113        }
    114         /*}}}1*/
    115         /*FUNCTION  SetOfEdges4::SortAndFind{{{1*/
     114        /*}}}*/
     115        /*FUNCTION  SetOfEdges4::SortAndFind{{{*/
    116116        long SetOfEdges4::SortAndFind (long ii,long jj) {
    117117                return ii <=jj ? find (ii,jj)  : find (jj,ii) ;
    118118        }
    119         /*}}}1*/
     119        /*}}}*/
    120120}

  • issm/trunk-jpl/src/c/objects/Bamg/SubDomain.cpp

    r6412 r12365  
    1212
    1313        /*Methods*/
    14         /*FUNCTION SubDomain::Set {{{1*/
     14        /*FUNCTION SubDomain::Set {{{*/
    1515        void SubDomain::Set(const Mesh & Th ,long i,Mesh & ThNew){
    1616                *this = Th.subdomains[i];

  • issm/trunk-jpl/src/c/objects/Bamg/Triangle.cpp

    r11584 r12365  
    99
    1010        /*Constructors/Destructors*/
    11         /*FUNCTION Triangle(){{{1*/
     11        /*FUNCTION Triangle(){{{*/
    1212        Triangle::Triangle(void){
    1313
    1414        }
    1515        /*}}}*/
    16         /*FUNCTION Triangle(Mesh *Th,long i,long j,long k) {{{1*/
     16        /*FUNCTION Triangle(Mesh *Th,long i,long j,long k) {{{*/
    1717        Triangle::Triangle(Mesh *Th,long i,long j,long k) {
    1818                BamgVertex *v=Th->vertices;
    … …  
    3232        }
    3333        /*}}}*/
    34         /*FUNCTION Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2) {{{1*/
     34        /*FUNCTION Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2) {{{*/
    3535        Triangle::Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2){
    3636                vertices[0]=v0;
    … …  
    4747
    4848        /*Methods*/
    49         /*FUNCTION Triangle::Adj{{{1*/
     49        /*FUNCTION Triangle::Adj{{{*/
    5050        AdjacentTriangle Triangle::Adj(int i)  const {
    5151                return AdjacentTriangle(adj[i],AdjEdgeIndex[i]&3);
    5252        };/*}}}*/
    53         /*FUNCTION Triangle::Anisotropy{{{1*/
     53        /*FUNCTION Triangle::Anisotropy{{{*/
    5454        double Triangle::Anisotropy() const{
    5555
    … …  
    8080                return lmax/lmin;
    8181        };/*}}}*/
    82         /*FUNCTION Triangle::Length{{{1*/
     82        /*FUNCTION Triangle::Length{{{*/
    8383        double Triangle::Length() const{
    8484
    … …  
    102102                return l;
    103103        };/*}}}*/
    104         /*FUNCTION Triangle::Echo {{{1*/
     104        /*FUNCTION Triangle::Echo {{{*/
    105105        void Triangle::Echo(void){
    106106
    … …  
    133133        }
    134134        /*}}}*/
    135         /*FUNCTION Triangle::FindBoundaryEdge{{{1*/
     135        /*FUNCTION Triangle::FindBoundaryEdge{{{*/
    136136        AdjacentTriangle Triangle::FindBoundaryEdge(int i) const{
    137137                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/FindBoundaryEdge)*/
    … …  
    179179                return AdjacentTriangle(NULL,0);
    180180        }
    181         /*}}}1*/
    182         /*FUNCTION Triangle::GetAllflag{{{1*/
     181        /*}}}*/
     182        /*FUNCTION Triangle::GetAllflag{{{*/
    183183        int    Triangle::GetAllflag(int a){
    184184                return AdjEdgeIndex[a] & 1020;
    185185        }/*}}}*/
    186         /*FUNCTION Triangle::Hidden{{{1*/
     186        /*FUNCTION Triangle::Hidden{{{*/
    187187        int    Triangle::Hidden(int a)const {
    188188                return AdjEdgeIndex[a]&16;
    189189        } /*}}}*/
    190         /*FUNCTION Triangle::Locked{{{1*/
     190        /*FUNCTION Triangle::Locked{{{*/
    191191        int    Triangle::Locked(int a)const {
    192192                return AdjEdgeIndex[a]&4;
    193193        } /*}}}*/
    194         /*FUNCTION Triangle::NuEdgeTriangleAdj{{{1*/
     194        /*FUNCTION Triangle::NuEdgeTriangleAdj{{{*/
    195195        short  Triangle::NuEdgeTriangleAdj(int i) const {
    196196                /*Number of the  adjacent edge in adj tria (make sure it is between 0 and 2*/
    197197                return AdjEdgeIndex[i&3]&3;
    198198        }/*}}}*/
    199         /*FUNCTION Triangle::Optim{{{1*/
     199        /*FUNCTION Triangle::Optim{{{*/
    200200        long  Triangle::Optim(short i,int koption) {
    201201                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Optim)*/
    … …  
    229229                return NbSwap;
    230230        }
    231         /*}}}1*/
    232         /*FUNCTION Triangle::Quadrangle {{{1*/
     231        /*}}}*/
     232        /*FUNCTION Triangle::Quadrangle {{{*/
    233233        Triangle* Triangle::Quadrangle(BamgVertex * & v0,BamgVertex * & v1,BamgVertex * & v2,BamgVertex * & v3) const{
    234234                // return the other triangle of the quad if a quad or 0 if not a quat
    … …  
    251251        }
    252252        /*}}}*/
    253         /*FUNCTION Triangle::QualityQuad {{{1*/
     253        /*FUNCTION Triangle::QualityQuad {{{*/
    254254        double   Triangle::QualityQuad(int a,int option) const{
    255255                double q;
    … …  
    274274        }
    275275        /*}}}*/
    276         /*FUNCTION Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){{{1*/
     276        /*FUNCTION Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){{{*/
    277277        void  Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){
    278278
    … …  
    282282                if (adj[2] >=tb && adj[2] <te) adj[2] = tb + renu[adj[2]-tb];   
    283283        }/*}}}*/
    284         /*FUNCTION Triangle::Renumbering(BamgVertex *vb,BamgVertex *ve, long *renu){{{1*/
     284        /*FUNCTION Triangle::Renumbering(BamgVertex *vb,BamgVertex *ve, long *renu){{{*/
    285285        void Triangle::Renumbering(BamgVertex *vb,BamgVertex *ve, long *renu){
    286286                if (vertices[0] >=vb && vertices[0] <ve) vertices[0] = vb + renu[vertices[0]-vb];
    … …  
    288288                if (vertices[2] >=vb && vertices[2] <ve) vertices[2] = vb + renu[vertices[2]-vb];   
    289289        }/*}}}*/
    290         /*FUNCTION Triangle::Set {{{1*/
     290        /*FUNCTION Triangle::Set {{{*/
    291291        void Triangle::Set(const Triangle & rec,const Mesh & Th ,Mesh & ThNew){
    292292                *this = rec;
    … …  
    301301        }
    302302        /*}}}*/
    303         /*FUNCTION Triangle::SetAdjAdj{{{1*/
     303        /*FUNCTION Triangle::SetAdjAdj{{{*/
    304304        void Triangle::SetAdjAdj(short a){
    305305                // Copy all the mark
    … …  
    313313                }
    314314        }/*}}}*/
    315         /*FUNCTION Triangle::SetAdj2{{{1*/
     315        /*FUNCTION Triangle::SetAdj2{{{*/
    316316        void Triangle::SetAdj2(short a,Triangle *t,short aat){
    317317                /*For current triangle:
    … …  
    326326                }
    327327        }/*}}}*/
    328         /*FUNCTION Triangle::SetAllFlag{{{1*/
     328        /*FUNCTION Triangle::SetAllFlag{{{*/
    329329        void   Triangle::SetAllFlag(int a,int f){
    330330                AdjEdgeIndex[a] = (AdjEdgeIndex[a] &3) + (1020 & f);
    331331        }/*}}}*/
    332         /*FUNCTION Triangle::SetDet{{{1*/
     332        /*FUNCTION Triangle::SetDet{{{*/
    333333        void Triangle::SetDet() {
    334334                if(vertices[0] && vertices[1] && vertices[2])    det = bamg::det(*vertices[0],*vertices[1],*vertices[2]);
    335335                else det = -1;
    336336        }/*}}}*/
    337         /*FUNCTION Triangle::SetHidden{{{1*/
     337        /*FUNCTION Triangle::SetHidden{{{*/
    338338        void Triangle::SetHidden(int a){
    339339                //Get Adjacent Triangle number a
    … …  
    344344                AdjEdgeIndex[a] |= 16;
    345345        }/*}}}*/
    346         /*FUNCTION Triangle::SetLocked{{{1*/
     346        /*FUNCTION Triangle::SetLocked{{{*/
    347347        void Triangle::SetLocked(int a){
    348348                //mark the edge as on Boundary
    … …  
    351351                AdjEdgeIndex[a] |= 4;
    352352        }/*}}}*/
    353         /*FUNCTION Triangle::SetMarkUnSwap{{{1*/
     353        /*FUNCTION Triangle::SetMarkUnSwap{{{*/
    354354        void Triangle::SetMarkUnSwap(int a){
    355355                register Triangle * t = adj[a];
    … …  
    357357                AdjEdgeIndex[a] |=8 ;
    358358        }/*}}}*/
    359         /*FUNCTION Triangle::SetSingleVertexToTriangleConnectivity{{{1*/
     359        /*FUNCTION Triangle::SetSingleVertexToTriangleConnectivity{{{*/
    360360        void Triangle::SetSingleVertexToTriangleConnectivity() {
    361361                if (vertices[0]) (vertices[0]->t=this,vertices[0]->IndexInTriangle=0);
    … …  
    363363                if (vertices[2]) (vertices[2]->t=this,vertices[2]->IndexInTriangle=2);
    364364        }/*}}}*/
    365         /*FUNCTION Triangle::SetUnMarkUnSwap{{{1*/
     365        /*FUNCTION Triangle::SetUnMarkUnSwap{{{*/
    366366        void Triangle::SetUnMarkUnSwap(int a){
    367367                register Triangle * t = adj[a];
    … …  
    369369                AdjEdgeIndex[a] &=55 ;
    370370        }/*}}}*/
    371         /*FUNCTION Triangle::swap{{{1*/
     371        /*FUNCTION Triangle::swap{{{*/
    372372        int Triangle::swap(short a,int koption){
    373373                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/swap)*/
    … …  
    483483                return OnSwap;
    484484        }
    485         /*}}}1*/
    486         /*FUNCTION Triangle::TriangleAdj{{{1*/
     485        /*}}}*/
     486        /*FUNCTION Triangle::TriangleAdj{{{*/
    487487        Triangle* Triangle::TriangleAdj(int i) const {
    488488                return adj[i&3];

  • issm/trunk-jpl/src/c/objects/Bamg/VertexOnEdge.cpp

    r9326 r12365  
    1010
    1111        /*Methods*/
    12         /*FUNCTION VertexOnEdge::Set {{{1*/
     12        /*FUNCTION VertexOnEdge::Set {{{*/
    1313        void VertexOnEdge::Set(const Mesh & Th ,long i,Mesh & ThNew){
    1414                *this = Th.VertexOnBThEdge[i]; 
    … …  
    1616        }
    1717        /*}}}*/
    18         /*FUNCTION VertexOnEdge::SetOnBTh{{{1*/
     18        /*FUNCTION VertexOnEdge::SetOnBTh{{{*/
    1919        void VertexOnEdge::SetOnBTh(){
    2020                v->BackgroundEdgeHook=this;

  • issm/trunk-jpl/src/c/objects/Bamg/VertexOnGeom.cpp

    r9399 r12365  
    1111
    1212        /*Constructors/Destructors*/
    13         /*FUNCTION VertexOnGeom::VertexOnGeom(){{{1*/
     13        /*FUNCTION VertexOnGeom::VertexOnGeom(){{{*/
    1414        VertexOnGeom::VertexOnGeom(){
    1515                meshvertex=NULL;
    … …  
    1818        }
    1919        /*}}}*/
    20         /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){{{1*/
     20        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){{{*/
    2121        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){
    2222                meshvertex=&m;
    … …  
    2525        }
    2626        /*}}}*/
    27         /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){{{1*/
     27        /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){{{*/
    2828        VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){
    2929                meshvertex=&m;
    … …  
    3434
    3535        /*Methods*/
    36         /*FUNCTION VertexOnGeom::Set {{{1*/
     36        /*FUNCTION VertexOnGeom::Set {{{*/
    3737        void VertexOnGeom::Set(const VertexOnGeom & rec,const Mesh & Th ,Mesh & ThNew){
    3838                *this = rec; 
    … …  
    4646        }
    4747        /*}}}*/
    48         /*FUNCTION VertexOnGeom::OnGeomVertex{{{1*/
     48        /*FUNCTION VertexOnGeom::OnGeomVertex{{{*/
    4949        int VertexOnGeom::OnGeomVertex()const{
    5050                return this? curvilincoord <0 :0;
    5151        }
    5252        /*}}}*/
    53         /*FUNCTION VertexOnGeom::OnGeomEdge{{{1*/
     53        /*FUNCTION VertexOnGeom::OnGeomEdge{{{*/
    5454        int VertexOnGeom::OnGeomEdge() const{
    5555                return this? curvilincoord >=0 :0;
    5656        }
    5757        /*}}}*/
    58         /*FUNCTION VertexOnGeom::IsRequiredVertex{{{1*/
     58        /*FUNCTION VertexOnGeom::IsRequiredVertex{{{*/
    5959        int VertexOnGeom::IsRequiredVertex() {
    6060                return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0;
    6161        }
    6262        /*}}}*/
    63         /*FUNCTION VertexOnGeom::SetOn{{{1*/
     63        /*FUNCTION VertexOnGeom::SetOn{{{*/
    6464        void VertexOnGeom::SetOn(){
    6565                meshvertex->GeomEdgeHook=this;

  • issm/trunk-jpl/src/c/objects/Bamg/VertexOnVertex.cpp

    r9371 r12365  
    1010
    1111        /*Constructors/Destructors*/
    12         /*FUNCTION VertexOnVertex::VertexOnVertex(){{{1*/
     12        /*FUNCTION VertexOnVertex::VertexOnVertex(){{{*/
    1313        VertexOnVertex::VertexOnVertex() {
    1414                v=NULL;
    1515                bv=NULL;
    1616        };/*}}}*/
    17         /*FUNCTION VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw){{{1*/
     17        /*FUNCTION VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw){{{*/
    1818        VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw) :v(w),bv(bw){
    1919       
    … …  
    2121
    2222        /*Methods*/
    23         /*FUNCTION VertexOnVertex::Set{{{1*/
     23        /*FUNCTION VertexOnVertex::Set{{{*/
    2424        void VertexOnVertex::Set(const Mesh &Th ,long i,Mesh &ThNew) {
    2525                *this = Th.VertexOnBThVertex[i]; 
    … …  
    2727        }
    2828        /*}}}*/
    29         /*FUNCTION VertexOnVertex::SetOnBTh{{{1*/
     29        /*FUNCTION VertexOnVertex::SetOnBTh{{{*/
    3030        void VertexOnVertex::SetOnBTh(){
    3131                v->BackgroundVertexHook=bv;v->IndexInTriangle=IsVertexOnVertex;

  • issm/trunk-jpl/src/c/objects/Constraints/Constraint.h

    r12200 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313class Nodes;
    1414#include "../Object.h"

  • issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp

    r12014 r12365  
    1818
    1919/*SpcDynamic constructors and destructor*/
    20 /*FUNCTION SpcDynamic::SpcDynamic(){{{1*/
     20/*FUNCTION SpcDynamic::SpcDynamic(){{{*/
    2121SpcDynamic::SpcDynamic(){
    2222        return;
    2323}
    24 /*}}}1*/
    25 /*FUNCTION SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid,...){{{1*/
     24/*}}}*/
     25/*FUNCTION SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid,...){{{*/
    2626SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,int spc_analysis_type){
    2727
    … …  
    3535        return;
    3636}
    37 /*}}}1*/
    38 /*FUNCTION SpcDynamic::~SpcDynamic{{{1*/
     37/*}}}*/
     38/*FUNCTION SpcDynamic::~SpcDynamic{{{*/
    3939SpcDynamic::~SpcDynamic(){
    4040        return;
    4141}
    42 /*}}}1*/
     42/*}}}*/
    4343               
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION SpcDynamic::Echo {{{1*/
     45/*FUNCTION SpcDynamic::Echo {{{*/
    4646void SpcDynamic::Echo(void){
    4747
    … …  
    5555        return;
    5656}
    57 /*}}}1*/
    58 /*FUNCTION SpcDynamic::DeepEcho {{{1*/
     57/*}}}*/
     58/*FUNCTION SpcDynamic::DeepEcho {{{*/
    5959void SpcDynamic::DeepEcho(void){
    6060
    … …  
    6262        return;
    6363}               
    64 /*}}}1*/
    65 /*FUNCTION SpcDynamic::Id {{{1*/
     64/*}}}*/
     65/*FUNCTION SpcDynamic::Id {{{*/
    6666int    SpcDynamic::Id(void){ return sid; }
    67 /*}}}1*/
    68 /*FUNCTION SpcDynamic::MyRank {{{1*/
     67/*}}}*/
     68/*FUNCTION SpcDynamic::MyRank {{{*/
    6969int    SpcDynamic::MyRank(void){
    7070        extern int my_rank;
    7171        return my_rank;
    7272}
    73 /*}}}1*/
    74 /*FUNCTION SpcDynamic::ObjectEnum{{{1*/
     73/*}}}*/
     74/*FUNCTION SpcDynamic::ObjectEnum{{{*/
    7575int SpcDynamic::ObjectEnum(void){
    7676
    … …  
    7878
    7979}
    80 /*}}}1*/
    81 /*FUNCTION SpcDynamic::copy {{{1*/
     80/*}}}*/
     81/*FUNCTION SpcDynamic::copy {{{*/
    8282Object* SpcDynamic::copy() {
    8383        return new SpcDynamic(*this);
    8484}
    85 /*}}}1*/
     85/*}}}*/
    8686
    8787/*Constraint virtual functions definitions: */
    88 /*FUNCTION SpcDynamic::InAnalysis{{{1*/
     88/*FUNCTION SpcDynamic::InAnalysis{{{*/
    8989bool SpcDynamic::InAnalysis(int in_analysis_type){
    9090        if (in_analysis_type==this->analysis_type) return true;
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION SpcDynamic::ConstrainNode{{{1*/
     94/*FUNCTION SpcDynamic::ConstrainNode{{{*/
    9595void SpcDynamic::ConstrainNode(Nodes* nodes,Parameters* parameters){
    9696
    … …  
    110110
    111111/*SpcDynamic functions*/
    112 /*FUNCTION SpcDynamic::GetDof {{{1*/
     112/*FUNCTION SpcDynamic::GetDof {{{*/
    113113int SpcDynamic::GetDof(){
    114114        return dof;
    115115}
    116 /*}}}1*/
    117 /*FUNCTION SpcDynamic::GetNodeId {{{1*/
     116/*}}}*/
     117/*FUNCTION SpcDynamic::GetNodeId {{{*/
    118118int   SpcDynamic::GetNodeId(){
    119119       
    120120        return nodeid;
    121121}
    122 /*}}}1*/
    123 /*FUNCTION SpcDynamic::GetValue {{{1*/
     122/*}}}*/
     123/*FUNCTION SpcDynamic::GetValue {{{*/
    124124double SpcDynamic::GetValue(){
    125125        _assert_(this->isset);
    … …  
    127127        return value;
    128128}
    129 /*}}}1*/
    130 /*FUNCTION SpcDynamic::SetDynamicConstraint {{{1*/
     129/*}}}*/
     130/*FUNCTION SpcDynamic::SetDynamicConstraint {{{*/
    131131void SpcDynamic::SetDynamicConstraint(Nodes* nodes,double* yg_serial){
    132132
    … …  
    139139        this->isset=true;
    140140}
    141 /*}}}1*/
     141/*}}}*/

  • issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../Object.h"
    1111class DataSet;
    … …  
    2424        public:
    2525
    26                 /*SpcDynamic constructors, destructors:{{{1*/
     26                /*SpcDynamic constructors, destructors:{{{*/
    2727                SpcDynamic();
    2828                SpcDynamic(int sid,int nodeid, int dof,int analysis_type);
    2929                ~SpcDynamic();
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1 */
     31                /*Object virtual functions definitions:{{{ */
    3232                void  Echo();
    3333                void  DeepEcho();
    … …  
    3737                Object* copy();
    3838                /*}}}*/
    39                 /*Constraint virtual functions definitions: {{{1*/
     39                /*Constraint virtual functions definitions: {{{*/
    4040                void   ConstrainNode(Nodes* nodes,Parameters* parameters);
    4141                bool   InAnalysis(int analysis_type);
    4242                /*}}}*/
    43                 /*SpcDynamic management:{{{1 */
     43                /*SpcDynamic management:{{{ */
    4444                int    GetNodeId();
    4545                int    GetDof();

  • issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp

    r12014 r12365  
    1818
    1919/*SpcStatic constructors and destructor*/
    20 /*FUNCTION SpcStatic::SpcStatic(){{{1*/
     20/*FUNCTION SpcStatic::SpcStatic(){{{*/
    2121SpcStatic::SpcStatic(){
    2222        return;
    2323}
    24 /*}}}1*/
    25 /*FUNCTION SpcStatic::SpcStatic(int spc_sid,int spc_nodeid,...){{{1*/
     24/*}}}*/
     25/*FUNCTION SpcStatic::SpcStatic(int spc_sid,int spc_nodeid,...){{{*/
    2626SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){
    2727
    … …  
    3434        return;
    3535}
    36 /*}}}1*/
    37 /*FUNCTION SpcStatic::~SpcStatic{{{1*/
     36/*}}}*/
     37/*FUNCTION SpcStatic::~SpcStatic{{{*/
    3838SpcStatic::~SpcStatic(){
    3939        return;
    4040}
    41 /*}}}1*/
     41/*}}}*/
    4242               
    4343/*Object virtual functions definitions:*/
    44 /*FUNCTION SpcStatic::Echo {{{1*/
     44/*FUNCTION SpcStatic::Echo {{{*/
    4545void SpcStatic::Echo(void){
    4646
    … …  
    5353        return;
    5454}
    55 /*}}}1*/
    56 /*FUNCTION SpcStatic::DeepEcho {{{1*/
     55/*}}}*/
     56/*FUNCTION SpcStatic::DeepEcho {{{*/
    5757void SpcStatic::DeepEcho(void){
    5858
    … …  
    6565        return;
    6666}               
    67 /*}}}1*/
    68 /*FUNCTION SpcStatic::Id {{{1*/
     67/*}}}*/
     68/*FUNCTION SpcStatic::Id {{{*/
    6969int    SpcStatic::Id(void){ return sid; }
    70 /*}}}1*/
    71 /*FUNCTION SpcStatic::MyRank {{{1*/
     70/*}}}*/
     71/*FUNCTION SpcStatic::MyRank {{{*/
    7272int    SpcStatic::MyRank(void){
    7373        extern int my_rank;
    7474        return my_rank;
    7575}
    76 /*}}}1*/
    77 /*FUNCTION SpcStatic::ObjectEnum{{{1*/
     76/*}}}*/
     77/*FUNCTION SpcStatic::ObjectEnum{{{*/
    7878int SpcStatic::ObjectEnum(void){
    7979
    … …  
    8181
    8282}
    83 /*}}}1*/
    84 /*FUNCTION SpcStatic::copy {{{1*/
     83/*}}}*/
     84/*FUNCTION SpcStatic::copy {{{*/
    8585Object* SpcStatic::copy() {
    8686        return new SpcStatic(*this);
    8787}
    88 /*}}}1*/
     88/*}}}*/
    8989
    9090/*Constraint virtual functions definitions: */
    91 /*FUNCTION SpcStatic::InAnalysis{{{1*/
     91/*FUNCTION SpcStatic::InAnalysis{{{*/
    9292bool SpcStatic::InAnalysis(int in_analysis_type){
    9393        if (in_analysis_type==this->analysis_type) return true;
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION SpcStatic::ConstrainNode{{{1*/
     97/*FUNCTION SpcStatic::ConstrainNode{{{*/
    9898void SpcStatic::ConstrainNode(Nodes* nodes,Parameters* parameters){
    9999
    … …  
    111111
    112112/*SpcStatic functions*/
    113 /*FUNCTION SpcStatic::GetDof {{{1*/
     113/*FUNCTION SpcStatic::GetDof {{{*/
    114114int SpcStatic::GetDof(){
    115115        return dof;
    116116}
    117 /*}}}1*/
    118 /*FUNCTION SpcStatic::GetNodeId {{{1*/
     117/*}}}*/
     118/*FUNCTION SpcStatic::GetNodeId {{{*/
    119119int   SpcStatic::GetNodeId(){
    120120       
    121121        return nodeid;
    122122}
    123 /*}}}1*/
    124 /*FUNCTION SpcStatic::GetValue {{{1*/
     123/*}}}*/
     124/*FUNCTION SpcStatic::GetValue {{{*/
    125125double SpcStatic::GetValue(){
    126126        _assert_(!isnan(value));
    127127        return value;
    128128}
    129 /*}}}1*/
     129/*}}}*/

  • issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../Object.h"
    1111class DataSet;
    … …  
    2323        public:
    2424
    25                 /*SpcStatic constructors, destructors:{{{1*/
     25                /*SpcStatic constructors, destructors:{{{*/
    2626                SpcStatic();
    2727                SpcStatic(int sid,int nodeid, int dof,double value,int analysis_type);
    2828                ~SpcStatic();
    2929                /*}}}*/
    30                 /*Object virtual functions definitions:{{{1 */
     30                /*Object virtual functions definitions:{{{ */
    3131                void  Echo();
    3232                void  DeepEcho();
    … …  
    3636                Object* copy();
    3737                /*}}}*/
    38                 /*Constraint virtual functions definitions: {{{1*/
     38                /*Constraint virtual functions definitions: {{{*/
    3939                void   ConstrainNode(Nodes* nodes,Parameters* parameters);
    4040                bool   InAnalysis(int analysis_type);
    4141                /*}}}*/
    42                 /*SpcStatic management:{{{1 */
     42                /*SpcStatic management:{{{ */
    4343                int    GetNodeId();
    4444                int    GetDof();

  • issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp

    r12014 r12365  
    1818
    1919/*SpcTransient constructors and destructor*/
    20 /*FUNCTION SpcTransient::SpcTransient(){{{1*/
     20/*FUNCTION SpcTransient::SpcTransient(){{{*/
    2121SpcTransient::SpcTransient(){
    2222        sid=-1;
    … …  
    2929        return;
    3030}
    31 /*}}}1*/
    32 /*FUNCTION SpcTransient::SpcTransient(int spc_sid,int spc_nodeid,...){{{1*/
     31/*}}}*/
     32/*FUNCTION SpcTransient::SpcTransient(int spc_sid,int spc_nodeid,...){{{*/
    3333SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, double* spc_times, double* spc_values,int spc_analysis_type){
    3434
    … …  
    4646        return;
    4747}
    48 /*}}}1*/
    49 /*FUNCTION SpcTransient::~SpcTransient{{{1*/
     48/*}}}*/
     49/*FUNCTION SpcTransient::~SpcTransient{{{*/
    5050SpcTransient::~SpcTransient(){
    5151        xfree((void**)&times);
    … …  
    5353        return;
    5454}
    55 /*}}}1*/
     55/*}}}*/
    5656               
    5757/*Object virtual functions definitions:*/
    58 /*FUNCTION SpcTransient::Echo {{{1*/
     58/*FUNCTION SpcTransient::Echo {{{*/
    5959void SpcTransient::Echo(void){
    6060
    … …  
    7272        return;
    7373}
    74 /*}}}1*/
    75 /*FUNCTION SpcTransient::DeepEcho {{{1*/
     74/*}}}*/
     75/*FUNCTION SpcTransient::DeepEcho {{{*/
    7676void SpcTransient::DeepEcho(void){
    7777        this->Echo();
    7878}               
    79 /*}}}1*/
    80 /*FUNCTION SpcTransient::Id {{{1*/
     79/*}}}*/
     80/*FUNCTION SpcTransient::Id {{{*/
    8181int    SpcTransient::Id(void){ return sid; }
    82 /*}}}1*/
    83 /*FUNCTION SpcTransient::MyRank {{{1*/
     82/*}}}*/
     83/*FUNCTION SpcTransient::MyRank {{{*/
    8484int    SpcTransient::MyRank(void){
    8585        extern int my_rank;
    8686        return my_rank;
    8787}
    88 /*}}}1*/
    89 /*FUNCTION SpcTransient::ObjectEnum{{{1*/
     88/*}}}*/
     89/*FUNCTION SpcTransient::ObjectEnum{{{*/
    9090int SpcTransient::ObjectEnum(void){
    9191
    … …  
    9393
    9494}
    95 /*}}}1*/
    96 /*FUNCTION SpcTransient::copy {{{1*/
     95/*}}}*/
     96/*FUNCTION SpcTransient::copy {{{*/
    9797Object* SpcTransient::copy() {
    9898        return new SpcTransient(sid,nodeid,dof,nsteps,times,values,analysis_type);
    9999}
    100 /*}}}1*/
     100/*}}}*/
    101101
    102102/*Constraint virtual functions definitions:*/
    103 /*FUNCTION SpcTransient::InAnalysis{{{1*/
     103/*FUNCTION SpcTransient::InAnalysis{{{*/
    104104bool SpcTransient::InAnalysis(int in_analysis_type){
    105105       
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION SpcTransient::ConstrainNode{{{1*/
     110/*FUNCTION SpcTransient::ConstrainNode{{{*/
    111111void SpcTransient::ConstrainNode(Nodes* nodes,Parameters* parameters){
    112112
    … …  
    158158
    159159/*SpcTransient functions*/
    160 /*FUNCTION SpcTransient::GetDof {{{1*/
     160/*FUNCTION SpcTransient::GetDof {{{*/
    161161int SpcTransient::GetDof(){
    162162        return dof;
    163163}
    164 /*}}}1*/
    165 /*FUNCTION SpcTransient::GetNodeId {{{1*/
     164/*}}}*/
     165/*FUNCTION SpcTransient::GetNodeId {{{*/
    166166int   SpcTransient::GetNodeId(){
    167167       
    168168        return nodeid;
    169169}
    170 /*}}}1*/
    171 /*FUNCTION SpcTransient::GetValue {{{1*/
     170/*}}}*/
     171/*FUNCTION SpcTransient::GetValue {{{*/
    172172double SpcTransient::GetValue(){
    173173        return values[0];
    174174}
    175 /*}}}1*/
     175/*}}}*/
    176176

  • issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../Object.h"
    1111class DataSet;
    … …  
    2525        public:
    2626
    27                 /*SpcTransient constructors, destructors:{{{1*/
     27                /*SpcTransient constructors, destructors:{{{*/
    2828                SpcTransient();
    2929                SpcTransient(int sid,int nodeid, int dof,int nsteps, double* times, double* values,int analysis_type);
    3030                ~SpcTransient();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1 */
     32                /*Object virtual functions definitions:{{{ */
    3333                void  Echo();
    3434                void  DeepEcho();
    … …  
    3838                Object* copy();
    3939                /*}}}*/
    40                 /*Constraint virtual functions definitions: {{{1*/
     40                /*Constraint virtual functions definitions: {{{*/
    4141                void   ConstrainNode(Nodes* nodes,Parameters* parameters);
    4242                bool   InAnalysis(int analysis_type);
    4343                /*}}}*/
    44                 /*SpcTransient management:{{{1 */
     44                /*SpcTransient management:{{{ */
    4545                int    GetNodeId();
    4646                int    GetDof();

  • issm/trunk-jpl/src/c/objects/Contour.cpp

    r12356 r12365  
    1515
    1616/*Contour constructors and destructors:*/
    17 /*FUNCTION Contour::Contour() default constructor {{{1*/
     17/*FUNCTION Contour::Contour() default constructor {{{*/
    1818Contour::Contour(){
    1919        this->id=0;
    … …  
    2424}
    2525/*}}}*/
    26 /*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{1*/
     26/*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{*/
    2727Contour::Contour(int pid,int pnods, IssmDouble* px, IssmDouble* py,bool pclosed){
    2828       
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION Contour::Contour() default constructor {{{1*/
     40/*FUNCTION Contour::Contour() default constructor {{{*/
    4141Contour::~Contour(){
    4242        xDelete<IssmDouble>(this->x);
    … …  
    4747
    4848/*Object virtual function resolutoin: */
    49 /*FUNCTION Contour::Echo(){{{1*/
     49/*FUNCTION Contour::Echo(){{{*/
    5050void Contour::Echo(void){
    5151
    … …  
    6363}
    6464/*}}}*/
    65 /*FUNCTION Contour::DeepEcho(){{{1*/
     65/*FUNCTION Contour::DeepEcho(){{{*/
    6666void Contour::DeepEcho(void){
    6767        this->Echo();
    6868}
    6969/*}}}*/
    70 /*FUNCTION Contour::Id(){{{1*/
     70/*FUNCTION Contour::Id(){{{*/
    7171int Contour::Id(void){
    7272        return id;
    7373}
    7474/*}}}*/
    75 /*FUNCTION Contour::MyRank{{{1*/
     75/*FUNCTION Contour::MyRank{{{*/
    7676int    Contour::MyRank(void){
    7777        extern int my_rank;
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION Contour::ObjectEnum{{{1*/
     82/*FUNCTION Contour::ObjectEnum{{{*/
    8383int Contour::ObjectEnum(void){
    8484
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION Contour::copy {{{1*/
     89/*FUNCTION Contour::copy {{{*/
    9090Object* Contour::copy() {
    9191

  • issm/trunk-jpl/src/c/objects/Contour.h

    r12322 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Object.h"
    1111#include "../shared/Exceptions/exceptions.h"
    … …  
    2424                bool    closed; //is this contour closed?
    2525
    26                 /*Contour constructors, destructors {{{1*/
     26                /*Contour constructors, destructors {{{*/
    2727                Contour();
    2828                Contour(int id, int nods, IssmDouble* x, IssmDouble* y,bool closed);
    2929                ~Contour();
    3030                /*}}}*/
    31                 /*Object virtual functions{{{1*/
     31                /*Object virtual functions{{{*/
    3232                void  Echo(void);
    3333                void  DeepEcho(void);

  • issm/trunk-jpl/src/c/objects/DakotaPlugin.h

    r4042 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212
    1313

  • issm/trunk-jpl/src/c/objects/DofIndexing.cpp

    r12360 r12365  
    1818
    1919/*DofIndexing constructors and destructor*/
    20 /*FUNCTION DofIndexing::DofIndexing(){{{1*/
     20/*FUNCTION DofIndexing::DofIndexing(){{{*/
    2121DofIndexing::DofIndexing(){
    2222
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION DofIndexing::DofIndexing(int gsize){{{1*/
     37/*FUNCTION DofIndexing::DofIndexing(int gsize){{{*/
    3838DofIndexing::DofIndexing(int in_gsize){
    3939        this->Init(in_gsize,NULL);
    4040}
    4141/*}}}*/
    42 /*FUNCTION DofIndexing::DofIndexing(DofIndexing* in)  -> copy{{{1*/
     42/*FUNCTION DofIndexing::DofIndexing(DofIndexing* in)  -> copy{{{*/
    4343DofIndexing::DofIndexing(DofIndexing* in){ //copy constructor
    4444
    … …  
    7979}
    8080/*}}}*/
    81 /*FUNCTION DofIndexing::~DofIndexing() {{{1*/
     81/*FUNCTION DofIndexing::~DofIndexing() {{{*/
    8282DofIndexing::~DofIndexing(){ //destructor
    8383
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION DofIndexing::Init{{{1*/
     94/*FUNCTION DofIndexing::Init{{{*/
    9595void DofIndexing::Init(int in_gsize,int* in_doftype){
    9696
    … …  
    119119}
    120120/*}}}*/
    121 /*FUNCTION DofIndexing::InitSet{{{1*/
     121/*FUNCTION DofIndexing::InitSet{{{*/
    122122void DofIndexing::InitSet(int setenum){
    123123
    … …  
    148148
    149149/*Some of the Object functionality: */
    150 /*FUNCTION DofIndexing::Echo{{{1*/
     150/*FUNCTION DofIndexing::Echo{{{*/
    151151void DofIndexing::Echo(void){
    152152
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION DofIndexing::DeepEcho{{{1*/
     160/*FUNCTION DofIndexing::DeepEcho{{{*/
    161161void DofIndexing::DeepEcho(void){
    162162

  • issm/trunk-jpl/src/c/objects/DofIndexing.h

    r12322 r12365  
    3434
    3535
    36                 /*DofIndexing constructors, destructors {{{1*/
     36                /*DofIndexing constructors, destructors {{{*/
    3737                DofIndexing();
    3838                DofIndexing(int g_size);
    … …  
    4242                ~DofIndexing();
    4343                /*}}}*/
    44                 /*Object like functionality: {{{1*/
     44                /*Object like functionality: {{{*/
    4545                void  Echo(void);
    4646                void  DeepEcho(void);
    4747                void  copy(DofIndexing* properties);
    4848                /*}}}*/
    49                 /*DofIndexing management: {{{1*/
     49                /*DofIndexing management: {{{*/
    5050                DofIndexing* Spawn(int* indices, int numindices);
    5151                /*}}}*/

  • issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp

    r12014 r12365  
    1919
    2020/*BoolElementResult constructors and destructor*/
    21 /*FUNCTION BoolElementResult::BoolElementResult(){{{1*/
     21/*FUNCTION BoolElementResult::BoolElementResult(){{{*/
    2222BoolElementResult::BoolElementResult(){
    2323        return;
    2424}
    2525/*}}}*/
    26 /*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{1*/
     26/*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/
    2727BoolElementResult::BoolElementResult(int in_enum_type,bool in_value,int in_step, double in_time){
    2828
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION BoolElementResult::~BoolElementResult(){{{1*/
     35/*FUNCTION BoolElementResult::~BoolElementResult(){{{*/
    3636BoolElementResult::~BoolElementResult(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION BoolElementResult::Echo {{{1*/
     42/*FUNCTION BoolElementResult::Echo {{{*/
    4343void BoolElementResult::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION BoolElementResult::DeepEcho{{{1*/
     47/*FUNCTION BoolElementResult::DeepEcho{{{*/
    4848void BoolElementResult::DeepEcho(void){
    4949
    … …  
    5555}
    5656/*}}}*/
    57 /*FUNCTION BoolElementResult::Id{{{1*/
     57/*FUNCTION BoolElementResult::Id{{{*/
    5858int    BoolElementResult::Id(void){ return -1; }
    5959/*}}}*/
    60 /*FUNCTION BoolElementResult::MyRank{{{1*/
     60/*FUNCTION BoolElementResult::MyRank{{{*/
    6161int    BoolElementResult::MyRank(void){
    6262        extern int my_rank;
    … …  
    6464}
    6565/*}}}*/
    66 /*FUNCTION BoolElementResult::ObjectEnum{{{1*/
     66/*FUNCTION BoolElementResult::ObjectEnum{{{*/
    6767int BoolElementResult::ObjectEnum(void){
    6868
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION BoolElementResult::copy{{{1*/
     73/*FUNCTION BoolElementResult::copy{{{*/
    7474Object* BoolElementResult::copy() {
    7575
    … …  
    8080
    8181/*ElementResult management*/
    82 /*FUNCTION BoolElementResult::InstanceEnum{{{1*/
     82/*FUNCTION BoolElementResult::InstanceEnum{{{*/
    8383int BoolElementResult::InstanceEnum(void){
    8484
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION BoolElementResult::SpawnTriaElementResult{{{1*/
     89/*FUNCTION BoolElementResult::SpawnTriaElementResult{{{*/
    9090ElementResult* BoolElementResult::SpawnTriaElementResult(int* indices){
    9191
    … …  
    104104}
    105105/*}}}*/
    106 /*FUNCTION BoolElementResult::ProcessUnits{{{1*/
     106/*FUNCTION BoolElementResult::ProcessUnits{{{*/
    107107void BoolElementResult::ProcessUnits(Parameters* parameters){
    108108       
    … …  
    111111}
    112112/*}}}*/
    113 /*FUNCTION BoolElementResult::NumberOfNodalValues{{{1*/
     113/*FUNCTION BoolElementResult::NumberOfNodalValues{{{*/
    114114int BoolElementResult::NumberOfNodalValues(void){
    115115        return 1;
    116116}
    117117/*}}}*/
    118 /*FUNCTION BoolElementResult::PatchFill{{{1*/
     118/*FUNCTION BoolElementResult::PatchFill{{{*/
    119119void BoolElementResult::PatchFill(int row, Patch* patch){
    120120       
    … …  
    127127}
    128128/*}}}*/
    129 /*FUNCTION BoolElementResult::GetVectorFromResults{{{1*/
     129/*FUNCTION BoolElementResult::GetVectorFromResults{{{*/
    130130void BoolElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    131131
    132132        _error_("cannot return vector on vertices");
    133133} /*}}}*/
    134 /*FUNCTION BoolElementResult::GetElementVectorFromResults{{{1*/
     134/*FUNCTION BoolElementResult::GetElementVectorFromResults{{{*/
    135135void BoolElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    136136

  • issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h

    r12014 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../Inputs/Input.h"
    1313#include "../../include/include.h"
    … …  
    2525        public:
    2626
    27                 /*BoolElementResult constructors, destructors: {{{1*/
     27                /*BoolElementResult constructors, destructors: {{{*/
    2828                BoolElementResult();
    2929                BoolElementResult(int enum_type,bool value,int step,double time);
    3030                ~BoolElementResult();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1 */
     32                /*Object virtual functions definitions:{{{ */
    3333                void  Echo();
    3434                void  DeepEcho();
    … …  
    3838                Object* copy();
    3939                /*}}}*/
    40                 /*ElementResult virtual functions definitions: {{{1*/
     40                /*ElementResult virtual functions definitions: {{{*/
    4141                ElementResult* SpawnTriaElementResult(int* indices);
    4242                double  GetTime(void){return time;};
    … …  
    4646                void    PatchFill(int row, Patch* patch);
    4747                /*}}}*/
    48                 /*BoolElementResult management: {{{1*/
     48                /*BoolElementResult management: {{{*/
    4949                int   InstanceEnum();
    5050                void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs);

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

    r12014 r12365  
    1919
    2020/*DoubleElementResult constructors and destructor*/
    21 /*FUNCTION DoubleElementResult::DoubleElementResult(){{{1*/
     21/*FUNCTION DoubleElementResult::DoubleElementResult(){{{*/
    2222DoubleElementResult::DoubleElementResult(){
    2323        return;
    2424}
    2525/*}}}*/
    26 /*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{1*/
     26/*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/
    2727DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){
    2828
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION DoubleElementResult::~DoubleElementResult(){{{1*/
     35/*FUNCTION DoubleElementResult::~DoubleElementResult(){{{*/
    3636DoubleElementResult::~DoubleElementResult(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION DoubleElementResult::Echo {{{1*/
     42/*FUNCTION DoubleElementResult::Echo {{{*/
    4343void DoubleElementResult::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION DoubleElementResult::DeepEcho{{{1*/
     47/*FUNCTION DoubleElementResult::DeepEcho{{{*/
    4848void DoubleElementResult::DeepEcho(void){
    4949
    … …  
    5555}
    5656/*}}}*/
    57 /*FUNCTION DoubleElementResult::Id{{{1*/
     57/*FUNCTION DoubleElementResult::Id{{{*/
    5858int    DoubleElementResult::Id(void){ return -1; }
    5959/*}}}*/
    60 /*FUNCTION DoubleElementResult::MyRank{{{1*/
     60/*FUNCTION DoubleElementResult::MyRank{{{*/
    6161int    DoubleElementResult::MyRank(void){
    6262        extern int my_rank;
    … …  
    6464}
    6565/*}}}*/
    66 /*FUNCTION DoubleElementResult::ObjectEnum{{{1*/
     66/*FUNCTION DoubleElementResult::ObjectEnum{{{*/
    6767int DoubleElementResult::ObjectEnum(void){
    6868
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION DoubleElementResult::copy{{{1*/
     73/*FUNCTION DoubleElementResult::copy{{{*/
    7474Object* DoubleElementResult::copy() {
    7575
    … …  
    8080
    8181/*ElementResult management*/
    82 /*FUNCTION DoubleElementResult::InstanceEnum{{{1*/
     82/*FUNCTION DoubleElementResult::InstanceEnum{{{*/
    8383int DoubleElementResult::InstanceEnum(void){
    8484
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{1*/
     89/*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{*/
    9090ElementResult* DoubleElementResult::SpawnTriaElementResult(int* indices){
    9191
    … …  
    104104}
    105105/*}}}*/
    106 /*FUNCTION DoubleElementResult::ProcessUnits{{{1*/
     106/*FUNCTION DoubleElementResult::ProcessUnits{{{*/
    107107void DoubleElementResult::ProcessUnits(Parameters* parameters){
    108108       
    … …  
    111111}
    112112/*}}}*/
    113 /*FUNCTION DoubleElementResult::NumberOfNodalValues{{{1*/
     113/*FUNCTION DoubleElementResult::NumberOfNodalValues{{{*/
    114114int DoubleElementResult::NumberOfNodalValues(void){
    115115        return 1;
    116116}
    117117/*}}}*/
    118 /*FUNCTION DoubleElementResult::PatchFill{{{1*/
     118/*FUNCTION DoubleElementResult::PatchFill{{{*/
    119119void DoubleElementResult::PatchFill(int row, Patch* patch){
    120120       

  • issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h

    r12014 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../Inputs/Input.h"
    1313#include "../../include/include.h"
    … …  
    2525        public:
    2626
    27                 /*DoubleElementResult constructors, destructors: {{{1*/
     27                /*DoubleElementResult constructors, destructors: {{{*/
    2828                DoubleElementResult();
    2929                DoubleElementResult(int enum_type,double value,int step,double time);
    3030                ~DoubleElementResult();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1 */
     32                /*Object virtual functions definitions:{{{ */
    3333                void  Echo();
    3434                void  DeepEcho();
    … …  
    3838                Object* copy();
    3939                /*}}}*/
    40                 /*ElementResult virtual functions definitions: {{{1*/
     40                /*ElementResult virtual functions definitions: {{{*/
    4141                ElementResult* SpawnTriaElementResult(int* indices);
    4242                double  GetTime(void){return time;};
    … …  
    4646                void    PatchFill(int row, Patch* patch);
    4747                /*}}}*/
    48                 /*DoubleElementResult management: {{{1*/
     48                /*DoubleElementResult management: {{{*/
    4949                int   InstanceEnum();
    5050                void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){_error_("not implemented");};

  • issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h

    r11695 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "../Object.h"
    1212/*}}}*/

  • issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp

    r12014 r12365  
    1919
    2020/*PentaP1ElementResult constructors and destructor*/
    21 /*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{1*/
     21/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{*/
    2222PentaP1ElementResult::PentaP1ElementResult(){
    2323        return;
    2424}
    2525/*}}}*/
    26 /*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/
     26/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/
    2727PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){
    2828
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{1*/
     37/*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{*/
    3838PentaP1ElementResult::~PentaP1ElementResult(){
    3939        return;
    … …  
    4242
    4343/*Object virtual functions definitions:*/
    44 /*FUNCTION PentaP1ElementResult::Echo {{{1*/
     44/*FUNCTION PentaP1ElementResult::Echo {{{*/
    4545void PentaP1ElementResult::Echo(void){
    4646        this->DeepEcho();
    4747}
    4848/*}}}*/
    49 /*FUNCTION PentaP1ElementResult::DeepEcho{{{1*/
     49/*FUNCTION PentaP1ElementResult::DeepEcho{{{*/
    5050void PentaP1ElementResult::DeepEcho(void){
    5151
    … …  
    5858}
    5959/*}}}*/
    60 /*FUNCTION PentaP1ElementResult::Id{{{1*/
     60/*FUNCTION PentaP1ElementResult::Id{{{*/
    6161int    PentaP1ElementResult::Id(void){ return -1; }
    6262/*}}}*/
    63 /*FUNCTION PentaP1ElementResult::MyRank{{{1*/
     63/*FUNCTION PentaP1ElementResult::MyRank{{{*/
    6464int    PentaP1ElementResult::MyRank(void){
    6565        extern int my_rank;
    … …  
    6767}
    6868/*}}}*/
    69 /*FUNCTION PentaP1ElementResult::ObjectEnum{{{1*/
     69/*FUNCTION PentaP1ElementResult::ObjectEnum{{{*/
    7070int PentaP1ElementResult::ObjectEnum(void){
    7171
    … …  
    7474}
    7575/*}}}*/
    76 /*FUNCTION PentaP1ElementResult::copy{{{1*/
     76/*FUNCTION PentaP1ElementResult::copy{{{*/
    7777Object* PentaP1ElementResult::copy() {
    7878       
    … …  
    8383
    8484/*ElementResult management*/
    85 /*FUNCTION PentaP1ElementResult::InstanceEnum{{{1*/
     85/*FUNCTION PentaP1ElementResult::InstanceEnum{{{*/
    8686int PentaP1ElementResult::InstanceEnum(void){
    8787
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{1*/
     92/*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{*/
    9393ElementResult* PentaP1ElementResult::SpawnTriaElementResult(int* indices){
    9494
    … …  
    115115}
    116116/*}}}*/
    117 /*FUNCTION PentaP1ElementResult::ProcessUnits{{{1*/
     117/*FUNCTION PentaP1ElementResult::ProcessUnits{{{*/
    118118void PentaP1ElementResult::ProcessUnits(Parameters* parameters){
    119119       
    … …  
    122122}
    123123/*}}}*/
    124 /*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{1*/
     124/*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{*/
    125125int PentaP1ElementResult::NumberOfNodalValues(void){
    126126        return 6;
    127127}
    128128/*}}}*/
    129 /*FUNCTION PentaP1ElementResult::PatchFill{{{1*/
     129/*FUNCTION PentaP1ElementResult::PatchFill{{{*/
    130130void PentaP1ElementResult::PatchFill(int row, Patch* patch){
    131131       
    … …  
    137137}
    138138/*}}}*/
    139 /*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{1*/
     139/*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{*/
    140140void PentaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    141141
    … …  
    147147
    148148} /*}}}*/
    149 /*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{1*/
     149/*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{*/
    150150void PentaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    151151

  • issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h

    r12014 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../Inputs/Input.h"
    1313#include "../../include/include.h"
    … …  
    2424        public:
    2525
    26                 /*PentaP1ElementResult constructors, destructors: {{{1*/
     26                /*PentaP1ElementResult constructors, destructors: {{{*/
    2727                PentaP1ElementResult();
    2828                PentaP1ElementResult(int enum_type,double* values,int step, double time);
    2929                ~PentaP1ElementResult();
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1 */
     31                /*Object virtual functions definitions:{{{ */
    3232                void  Echo();
    3333                void  DeepEcho();
    … …  
    3737                Object* copy();
    3838                /*}}}*/
    39                 /*ElementResult virtual functions definitions: {{{1*/
     39                /*ElementResult virtual functions definitions: {{{*/
    4040                ElementResult* SpawnTriaElementResult(int* indices);
    4141                double  GetTime(void){return time;};
    … …  
    4545                void    PatchFill(int row, Patch* patch);
    4646                /*}}}*/
    47                 /*PentaP1ElementResult management: {{{1*/
     47                /*PentaP1ElementResult management: {{{*/
    4848                int   InstanceEnum();
    4949                void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs);

  • issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp

    r12014 r12365  
    1919
    2020/*TriaP1ElementResult constructors and destructor*/
    21 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{1*/
     21/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{*/
    2222TriaP1ElementResult::TriaP1ElementResult(){
    2323        return;
    2424}
    2525/*}}}*/
    26 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/
     26/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/
    2727TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){
    2828
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{1*/
     37/*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{*/
    3838TriaP1ElementResult::~TriaP1ElementResult(){
    3939        return;
    … …  
    4242
    4343/*Object virtual functions definitions:*/
    44 /*FUNCTION TriaP1ElementResult::Echo {{{1*/
     44/*FUNCTION TriaP1ElementResult::Echo {{{*/
    4545void TriaP1ElementResult::Echo(void){
    4646        this->DeepEcho();
    4747}
    4848/*}}}*/
    49 /*FUNCTION TriaP1ElementResult::DeepEcho{{{1*/
     49/*FUNCTION TriaP1ElementResult::DeepEcho{{{*/
    5050void TriaP1ElementResult::DeepEcho(void){
    5151               
    … …  
    5757}
    5858/*}}}*/
    59 /*FUNCTION TriaP1ElementResult::Id{{{1*/
     59/*FUNCTION TriaP1ElementResult::Id{{{*/
    6060int    TriaP1ElementResult::Id(void){ return -1; }
    6161/*}}}*/
    62 /*FUNCTION TriaP1ElementResult::MyRank{{{1*/
     62/*FUNCTION TriaP1ElementResult::MyRank{{{*/
    6363int    TriaP1ElementResult::MyRank(void){
    6464        extern int my_rank;
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/
     68/*FUNCTION TriaP1ElementResult::ObjectEnum{{{*/
    6969int TriaP1ElementResult::ObjectEnum(void){
    7070
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION TriaP1ElementResult::copy{{{1*/
     75/*FUNCTION TriaP1ElementResult::copy{{{*/
    7676Object* TriaP1ElementResult::copy() {
    7777       
    … …  
    8282
    8383/*ElementResult management*/
    84 /*FUNCTION TriaP1ElementResult::InstanceEnum{{{1*/
     84/*FUNCTION TriaP1ElementResult::InstanceEnum{{{*/
    8585int TriaP1ElementResult::InstanceEnum(void){
    8686
    … …  
    8989}
    9090/*}}}*/
    91 /*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{1*/
     91/*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{*/
    9292ElementResult* TriaP1ElementResult::SpawnTriaElementResult(int* indices){
    9393
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION TriaP1ElementResult::ProcessUnits{{{1*/
     105/*FUNCTION TriaP1ElementResult::ProcessUnits{{{*/
    106106void TriaP1ElementResult::ProcessUnits(Parameters* parameters){
    107107       
    … …  
    110110}
    111111/*}}}*/
    112 /*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{1*/
     112/*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{*/
    113113int TriaP1ElementResult::NumberOfNodalValues(void){
    114114        return 3;
    115115}
    116116/*}}}*/
    117 /*FUNCTION TriaP1ElementResult::PatchFill{{{1*/
     117/*FUNCTION TriaP1ElementResult::PatchFill{{{*/
    118118void TriaP1ElementResult::PatchFill(int row, Patch* patch){
    119119       
    … …  
    125125}
    126126/*}}}*/
    127 /*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{1*/
     127/*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{*/
    128128void TriaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    129129
    … …  
    135135
    136136} /*}}}*/
    137 /*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{1*/
     137/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{*/
    138138void TriaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    139139        _error_("Result %s is a TriaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));

  • issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "../Inputs/Input.h"
    1212#include "../../include/include.h"
    … …  
    2323        public:
    2424
    25                 /*TriaP1ElementResult constructors, destructors: {{{1*/
     25                /*TriaP1ElementResult constructors, destructors: {{{*/
    2626                TriaP1ElementResult();
    2727                TriaP1ElementResult(int enum_type,double* values,int step,double time);
    2828                ~TriaP1ElementResult();
    2929                /*}}}*/
    30                 /*Object virtual functions definitions:{{{1 */
     30                /*Object virtual functions definitions:{{{ */
    3131                void  Echo();
    3232                void  DeepEcho();
    … …  
    3636                Object* copy();
    3737                /*}}}*/
    38                 /*ElementResult virtual functions definitions: {{{1*/
     38                /*ElementResult virtual functions definitions: {{{*/
    3939                ElementResult* SpawnTriaElementResult(int* indices);
    4040                double  GetTime(void){return time;};
    … …  
    4444                void    PatchFill(int row, Patch* patch);
    4545                /*}}}*/
    46                 /*TriaP1ElementResult management: {{{1*/
     46                /*TriaP1ElementResult management: {{{*/
    4747                int   InstanceEnum();
    4848                void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs);

  • issm/trunk-jpl/src/c/objects/Elements/Element.h

    r11994 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313#include "../Object.h"
    1414

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

    r12326 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88#include <config.h>
    … …  
    2424
    2525/*Constructors/destructor/copy*/
    26 /*FUNCTION Penta::Penta(){{{1*/
     26/*FUNCTION Penta::Penta(){{{*/
    2727Penta::Penta(){
    2828
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION Penta::~Penta(){{{1*/
     41/*FUNCTION Penta::~Penta(){{{*/
    4242Penta::~Penta(){
    4343        delete inputs;
    … …  
    4646}
    4747/*}}}*/
    48 /*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{1*/
     48/*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{*/
    4949Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels)
    5050        :PentaRef(nummodels)
    … …  
    5656
    5757        /*Checks in debugging mode*/
    58         /*{{{2*/
     58        /*{{{*/
    5959        _assert_(iomodel->Data(MeshUpperelementsEnum));
    6060        _assert_(iomodel->Data(MeshLowerelementsEnum));
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION Penta::copy {{{1*/
     92/*FUNCTION Penta::copy {{{*/
    9393Object* Penta::copy() {
    9494
    … …  
    144144
    145145/*Other*/
    146 /*FUNCTION Penta::AverageOntoPartition {{{1*/
     146/*FUNCTION Penta::AverageOntoPartition {{{*/
    147147void  Penta::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part){
    148148        _error_("Not supported yet!");
    149149}
    150150/*}}}*/
    151 /*FUNCTION Penta::BedNormal {{{1*/
     151/*FUNCTION Penta::BedNormal {{{*/
    152152void Penta::BedNormal(double* bed_normal, double xyz_list[3][3]){
    153153
    … …  
    173173}
    174174/*}}}*/
    175 /*FUNCTION Penta::BasalFrictionCreateInput {{{1*/
     175/*FUNCTION Penta::BasalFrictionCreateInput {{{*/
    176176void Penta::BasalFrictionCreateInput(void){
    177177
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION Penta::ComputeBasalStress {{{1*/
     227/*FUNCTION Penta::ComputeBasalStress {{{*/
    228228void  Penta::ComputeBasalStress(Vector* sigma_b){
    229229
    … …  
    315315}
    316316/*}}}*/
    317 /*FUNCTION Penta::ComputeStrainRate {{{1*/
     317/*FUNCTION Penta::ComputeStrainRate {{{*/
    318318void  Penta::ComputeStrainRate(Vector* eps){
    319319
    … …  
    322322}
    323323/*}}}*/
    324 /*FUNCTION Penta::ComputeStressTensor {{{1*/
     324/*FUNCTION Penta::ComputeStressTensor {{{*/
    325325void  Penta::ComputeStressTensor(){
    326326
    … …  
    377377}
    378378/*}}}*/
    379                 /*FUNCTION Penta::Configure {{{1*/
     379                /*FUNCTION Penta::Configure {{{*/
    380380void  Penta::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    381381
    … …  
    409409}
    410410/*}}}*/
    411 /*FUNCTION Penta::CreateKMatrix {{{1*/
     411/*FUNCTION Penta::CreateKMatrix {{{*/
    412412void  Penta::CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df){
    413413
    … …  
    418418        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    419419
    420         /*Checks in debugging {{{2*/
     420        /*Checks in debugging {{{*/
    421421        _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs);
    422422        /*}}}*/
    … …  
    479479}
    480480/*}}}*/
    481 /*FUNCTION Penta::CreateKMatrixPrognostic {{{1*/
     481/*FUNCTION Penta::CreateKMatrixPrognostic {{{*/
    482482ElementMatrix* Penta::CreateKMatrixPrognostic(void){
    483483
    … …  
    500500}
    501501/*}}}*/
    502 /*FUNCTION Penta::CreateKMatrixSlope {{{1*/
     502/*FUNCTION Penta::CreateKMatrixSlope {{{*/
    503503ElementMatrix* Penta::CreateKMatrixSlope(void){
    504504
    … …  
    513513}
    514514/*}}}*/
    515 /*FUNCTION Penta::CreatePVector {{{1*/
     515/*FUNCTION Penta::CreatePVector {{{*/
    516516void  Penta::CreatePVector(Vector* pf){
    517517
    … …  
    521521        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    522522
    523         /*if debugging mode, check that all pointers exist {{{2*/
     523        /*if debugging mode, check that all pointers exist {{{*/
    524524        _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs);
    525525        /*}}}*/
    … …  
    579579}
    580580/*}}}*/
    581 /*FUNCTION Penta::CreatePVectorPrognostic {{{1*/
     581/*FUNCTION Penta::CreatePVectorPrognostic {{{*/
    582582ElementVector* Penta::CreatePVectorPrognostic(void){
    583583
    … …  
    601601}
    602602/*}}}*/
    603 /*FUNCTION Penta::CreatePVectorSlope {{{1*/
     603/*FUNCTION Penta::CreatePVectorSlope {{{*/
    604604ElementVector* Penta::CreatePVectorSlope(void){
    605605
    … …  
    615615}
    616616/*}}}*/
    617 /*FUNCTION Penta::CreateJacobianMatrix{{{1*/
     617/*FUNCTION Penta::CreateJacobianMatrix{{{*/
    618618void  Penta::CreateJacobianMatrix(Matrix* Jff){
    619619
    … …  
    623623        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    624624
    625         /*Checks in debugging {{{2*/
     625        /*Checks in debugging {{{*/
    626626        _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs);
    627627        /*}}}*/
    … …  
    648648}
    649649/*}}}*/
    650 /*FUNCTION Penta::DeepEcho{{{1*/
     650/*FUNCTION Penta::DeepEcho{{{*/
    651651void Penta::DeepEcho(void){
    652652
    … …  
    676676}
    677677/*}}}*/
    678 /*FUNCTION Penta::DeleteResults {{{1*/
     678/*FUNCTION Penta::DeleteResults {{{*/
    679679void  Penta::DeleteResults(void){
    680680
    … …  
    685685}
    686686/*}}}*/
    687 /*FUNCTION Penta::Echo{{{1*/
     687/*FUNCTION Penta::Echo{{{*/
    688688
    689689void Penta::Echo(void){
    … …  
    691691}
    692692/*}}}*/
    693 /*FUNCTION Penta::ObjectEnum{{{1*/
     693/*FUNCTION Penta::ObjectEnum{{{*/
    694694int Penta::ObjectEnum(void){
    695695
    … …  
    698698}
    699699/*}}}*/
    700 /*FUNCTION Penta::GetBasalElement{{{1*/
     700/*FUNCTION Penta::GetBasalElement{{{*/
    701701Penta* Penta::GetBasalElement(void){
    702702
    … …  
    719719}
    720720/*}}}*/
    721 /*FUNCTION Penta::GetDofList {{{1*/
     721/*FUNCTION Penta::GetDofList {{{*/
    722722void  Penta::GetDofList(int** pdoflist,int approximation_enum,int setenum){
    723723
    … …  
    743743}
    744744/*}}}*/
    745 /*FUNCTION Penta::GetDofList1 {{{1*/
     745/*FUNCTION Penta::GetDofList1 {{{*/
    746746void  Penta::GetDofList1(int* doflist){
    747747
    … …  
    751751}
    752752/*}}}*/
    753 /*FUNCTION Penta::GetConnectivityList {{{1*/
     753/*FUNCTION Penta::GetConnectivityList {{{*/
    754754void  Penta::GetConnectivityList(int* connectivity){
    755755        for(int i=0;i<NUMVERTICES;i++) connectivity[i]=nodes[i]->GetConnectivity();
    756756}
    757757/*}}}*/
    758 /*FUNCTION Penta::GetElementType {{{1*/
     758/*FUNCTION Penta::GetElementType {{{*/
    759759int Penta::GetElementType(){
    760760
    … …  
    763763}
    764764/*}}}*/
    765 /*FUNCTION Penta::GetElementSizes{{{1*/
     765/*FUNCTION Penta::GetElementSizes{{{*/
    766766void Penta::GetElementSizes(double* hx,double* hy,double* hz){
    767767
    … …  
    790790}
    791791/*}}}*/
    792 /*FUNCTION Penta::GetHorizontalNeighboorSids {{{1*/
     792/*FUNCTION Penta::GetHorizontalNeighboorSids {{{*/
    793793int* Penta::GetHorizontalNeighboorSids(){
    794794
    … …  
    798798}
    799799/*}}}*/
    800 /*FUNCTION Penta::GetLowerElement{{{1*/
     800/*FUNCTION Penta::GetLowerElement{{{*/
    801801Penta* Penta::GetLowerElement(void){
    802802
    … …  
    808808}
    809809/*}}}*/
    810 /*FUNCTION Penta::GetNodeIndex {{{1*/
     810/*FUNCTION Penta::GetNodeIndex {{{*/
    811811int Penta::GetNodeIndex(Node* node){
    812812
    … …  
    820820}
    821821/*}}}*/
    822 /*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/
     822/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype) {{{*/
    823823void Penta::GetInputListOnVertices(double* pvalue,int enumtype){
    824824
    … …  
    845845}
    846846/*}}}*/
    847 /*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/
     847/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{*/
    848848void Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){
    849849
    … …  
    874874}
    875875/*}}}*/
    876 /*FUNCTION Penta::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/
     876/*FUNCTION Penta::GetInputValue(double* pvalue,Node* node,int enumtype) {{{*/
    877877void Penta::GetInputValue(double* pvalue,Node* node,int enumtype){
    878878
    … …  
    887887}
    888888/*}}}*/
    889 /*FUNCTION Penta::GetPhi {{{1*/
     889/*FUNCTION Penta::GetPhi {{{*/
    890890void Penta::GetPhi(double* phi, double*  epsilon, double viscosity){
    891891        /*Compute deformational heating from epsilon and viscosity */
    … …  
    925925}
    926926/*}}}*/
    927 /*FUNCTION Penta::GetSidList{{{1*/
     927/*FUNCTION Penta::GetSidList{{{*/
    928928void  Penta::GetSidList(int* sidlist){
    929929
    … …  
    933933}
    934934/*}}}*/
    935 /*FUNCTION Penta::GetSolutionFromInputs{{{1*/
     935/*FUNCTION Penta::GetSolutionFromInputs{{{*/
    936936void  Penta::GetSolutionFromInputs(Vector* solution){
    937937
    … …  
    977977}
    978978/*}}}*/
    979 /*FUNCTION Penta::GetStabilizationParameter {{{1*/
     979/*FUNCTION Penta::GetStabilizationParameter {{{*/
    980980double Penta::GetStabilizationParameter(double u, double v, double w, double diameter, double kappa){
    981981        /*Compute stabilization parameter*/
    … …  
    995995}
    996996/*}}}*/
    997 /*FUNCTION Penta::GetStrainRate3dPattyn{{{1*/
     997/*FUNCTION Penta::GetStrainRate3dPattyn{{{*/
    998998void Penta::GetStrainRate3dPattyn(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input){
    999999        /*Compute the 3d Blatter/PattynStrain Rate (5 components):
    … …  
    10241024}
    10251025/*}}}*/
    1026 /*FUNCTION Penta::GetStrainRate3d{{{1*/
     1026/*FUNCTION Penta::GetStrainRate3d{{{*/
    10271027void Penta::GetStrainRate3d(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input){
    10281028        /*Compute the 3d Strain Rate (6 components):
    … …  
    10501050}
    10511051/*}}}*/
    1052 /*FUNCTION Penta::GetUpperElement{{{1*/
     1052/*FUNCTION Penta::GetUpperElement{{{*/
    10531053Penta* Penta::GetUpperElement(void){
    10541054
    … …  
    10601060}
    10611061/*}}}*/
    1062 /*FUNCTION Penta::GetVectorFromInputs{{{1*/
     1062/*FUNCTION Penta::GetVectorFromInputs{{{*/
    10631063void  Penta::GetVectorFromInputs(Vector* vector,int input_enum){
    10641064
    … …  
    10791079}
    10801080/*}}}*/
    1081 /*FUNCTION Penta::GetVectorFromResults{{{1*/
     1081/*FUNCTION Penta::GetVectorFromResults{{{*/
    10821082void  Penta::GetVectorFromResults(Vector* vector,int offset,int interp){
    10831083
    … …  
    10991099}
    11001100/*}}}*/
    1101 /*FUNCTION Penta::GetZcoord {{{1*/
     1101/*FUNCTION Penta::GetZcoord {{{*/
    11021102double Penta::GetZcoord(GaussPenta* gauss){
    11031103
    … …  
    11141114}
    11151115/*}}}*/
    1116 /*FUNCTION Penta::Sid {{{1*/
     1116/*FUNCTION Penta::Sid {{{*/
    11171117int    Penta::Sid(){
    11181118       
    … …  
    11211121}
    11221122/*}}}*/
    1123 /*FUNCTION Penta::Id {{{1*/
     1123/*FUNCTION Penta::Id {{{*/
    11241124int    Penta::Id(void){
    11251125        return id;
    11261126}
    11271127/*}}}*/
    1128 /*FUNCTION Penta::InputArtificialNoise{{{1*/
     1128/*FUNCTION Penta::InputArtificialNoise{{{*/
    11291129void  Penta::InputArtificialNoise(int enum_type,double min,double max){
    11301130
    … …  
    11391139}
    11401140/*}}}*/
    1141 /*FUNCTION Penta::InputConvergence{{{1*/
     1141/*FUNCTION Penta::InputConvergence{{{*/
    11421142bool Penta::InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    11431143
    … …  
    11711171}
    11721172/*}}}*/
    1173 /*FUNCTION Penta::InputCreate(double scalar,int enum,int code);{{{1*/
     1173/*FUNCTION Penta::InputCreate(double scalar,int enum,int code);{{{*/
    11741174void Penta::InputCreate(double scalar,int name,int code){
    11751175
    … …  
    11901190}
    11911191/*}}}*/
    1192 /*FUNCTION Penta::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{1*/
     1192/*FUNCTION Penta::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/
    11931193void Penta::InputCreate(double* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){//index into elements
    11941194
    … …  
    12801280}
    12811281/*}}}*/
    1282 /*FUNCTION Penta::InputDepthAverageAtBase{{{1*/
     1282/*FUNCTION Penta::InputDepthAverageAtBase{{{*/
    12831283void  Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){
    12841284
    … …  
    13771377}
    13781378/*}}}*/
    1379 /*FUNCTION Penta::InputDuplicate{{{1*/
     1379/*FUNCTION Penta::InputDuplicate{{{*/
    13801380void  Penta::InputDuplicate(int original_enum,int new_enum){
    13811381
    … …  
    13851385}
    13861386/*}}}*/
    1387 /*FUNCTION Penta::InputExtrude {{{1*/
     1387/*FUNCTION Penta::InputExtrude {{{*/
    13881388void  Penta::InputExtrude(int enum_type,int object_type){
    13891389
    … …  
    14571457}
    14581458/*}}}*/
    1459 /*FUNCTION Penta::InputScale{{{1*/
     1459/*FUNCTION Penta::InputScale{{{*/
    14601460void  Penta::InputScale(int enum_type,double scale_factor){
    14611461
    … …  
    14701470}
    14711471/*}}}*/
    1472 /*FUNCTION Penta::InputToResult{{{1*/
     1472/*FUNCTION Penta::InputToResult{{{*/
    14731473void  Penta::InputToResult(int enum_type,int step,double time){
    14741474
    … …  
    14951495}
    14961496/*}}}*/
    1497 /*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{1*/
     1497/*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{*/
    14981498void  Penta::InputUpdateFromConstant(bool constant, int name){
    14991499
    … …  
    15051505}
    15061506/*}}}*/
    1507 /*FUNCTION Penta::InputUpdateFromConstant(double value, int name);{{{1*/
     1507/*FUNCTION Penta::InputUpdateFromConstant(double value, int name);{{{*/
    15081508void  Penta::InputUpdateFromConstant(double constant, int name){
    15091509        /*Check that name is an element input*/
    … …  
    15141514}
    15151515/*}}}*/
    1516 /*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{1*/
     1516/*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{*/
    15171517void  Penta::InputUpdateFromConstant(int constant, int name){
    15181518        /*Check that name is an element input*/
    … …  
    15231523}
    15241524/*}}}*/
    1525 /*FUNCTION Penta::InputUpdateFromIoModel {{{1*/
     1525/*FUNCTION Penta::InputUpdateFromIoModel {{{*/
    15261526void Penta::InputUpdateFromIoModel(int index,IoModel* iomodel){
    15271527
    … …  
    15451545
    15461546        /*Checks if debuging*/
    1547         /*{{{2*/
     1547        /*{{{*/
    15481548        _assert_(iomodel->Data(MeshElementsEnum));
    15491549        /*}}}*/
    … …  
    16461646}
    16471647/*}}}*/
    1648 /*FUNCTION Penta::InputUpdateFromSolution {{{1*/
     1648/*FUNCTION Penta::InputUpdateFromSolution {{{*/
    16491649void  Penta::InputUpdateFromSolution(double* solution){
    16501650
    … …  
    17151715}
    17161716/*}}}*/
    1717 /*FUNCTION Penta::InputUpdateFromSolutionPrognostic{{{1*/
     1717/*FUNCTION Penta::InputUpdateFromSolutionPrognostic{{{*/
    17181718void  Penta::InputUpdateFromSolutionPrognostic(double* solution){
    17191719
    … …  
    17981798}
    17991799/*}}}*/
    1800 /*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{1*/
     1800/*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{*/
    18011801void  Penta::InputUpdateFromSolutionOneDof(double* solution,int enum_type){
    18021802
    … …  
    18221822}
    18231823/*}}}*/
    1824 /*FUNCTION Penta::InputUpdateFromSolutionOneDofCollpased{{{1*/
     1824/*FUNCTION Penta::InputUpdateFromSolutionOneDofCollpased{{{*/
    18251825void  Penta::InputUpdateFromSolutionOneDofCollapsed(double* solution,int enum_type){
    18261826
    … …  
    18621862}
    18631863/*}}}*/
    1864 /*FUNCTION Penta::InputUpdateFromVector(double* vector, int name, int type);{{{1*/
     1864/*FUNCTION Penta::InputUpdateFromVector(double* vector, int name, int type);{{{*/
    18651865void  Penta::InputUpdateFromVector(double* vector, int name, int type){
    18661866
    … …  
    18921892}
    18931893/*}}}*/
    1894 /*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{1*/
     1894/*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{*/
    18951895void  Penta::InputUpdateFromVector(int* vector, int name, int type){
    18961896        _error_(" not supported yet!");
    18971897}
    18981898/*}}}*/
    1899 /*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/
     1899/*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
    19001900void  Penta::InputUpdateFromVector(bool* vector, int name, int type){
    19011901        _error_(" not supported yet!");
    19021902}
    19031903/*}}}*/
    1904 /*FUNCTION Penta::IsOnBed{{{1*/
     1904/*FUNCTION Penta::IsOnBed{{{*/
    19051905bool Penta::IsOnBed(void){
    19061906
    … …  
    19101910}
    19111911/*}}}*/
    1912 /*FUNCTION Penta::IsInput{{{1*/
     1912/*FUNCTION Penta::IsInput{{{*/
    19131913bool Penta::IsInput(int name){
    19141914        if (
    … …  
    19541954}
    19551955/*}}}*/
    1956 /*FUNCTION Penta::IsFloating{{{1*/
     1956/*FUNCTION Penta::IsFloating{{{*/
    19571957bool   Penta::IsFloating(){
    19581958
    … …  
    19621962}
    19631963/*}}}*/
    1964 /*FUNCTION Penta::IsNodeOnShelf {{{1*/
     1964/*FUNCTION Penta::IsNodeOnShelf {{{*/
    19651965bool   Penta::IsNodeOnShelf(){
    19661966
    … …  
    19771977}
    19781978/*}}}*/
    1979 /*FUNCTION Penta::IsNodeOnShelfFromFlags {{{1*/
     1979/*FUNCTION Penta::IsNodeOnShelfFromFlags {{{*/
    19801980bool   Penta::IsNodeOnShelfFromFlags(double* flags){
    19811981
    … …  
    19921992}
    19931993/*}}}*/
    1994 /*FUNCTION Penta::IsOnSurface{{{1*/
     1994/*FUNCTION Penta::IsOnSurface{{{*/
    19951995bool Penta::IsOnSurface(void){
    19961996
    … …  
    20002000}
    20012001/*}}}*/
    2002 /*FUNCTION Penta::IsOnWater {{{1*/
     2002/*FUNCTION Penta::IsOnWater {{{*/
    20032003bool   Penta::IsOnWater(){
    20042004
    … …  
    20592059
    20602060}/*}}}*/
    2061 /*FUNCTION Penta::MigrateGroundingLine{{{1*/
     2061/*FUNCTION Penta::MigrateGroundingLine{{{*/
    20622062void  Penta::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){
    20632063
    … …  
    21422142}
    21432143/*}}}*/
    2144 /*FUNCTION Penta::MinEdgeLength{{{1*/
     2144/*FUNCTION Penta::MinEdgeLength{{{*/
    21452145double Penta::MinEdgeLength(double xyz_list[6][3]){
    21462146        /*Return the minimum lenght of the nine egdes of the penta*/
    … …  
    21642164}
    21652165/*}}}*/
    2166 /*FUNCTION Penta::MyRank {{{1*/
     2166/*FUNCTION Penta::MyRank {{{*/
    21672167int    Penta::MyRank(void){
    21682168        extern int my_rank;
    … …  
    21702170}
    21712171/*}}}*/
    2172 /*FUNCTION Penta::NodalValue {{{1*/
     2172/*FUNCTION Penta::NodalValue {{{*/
    21732173int    Penta::NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units){
    21742174
    … …  
    22012201}
    22022202/*}}}*/
    2203 /*FUNCTION Penta::PatchFill{{{1*/
     2203/*FUNCTION Penta::PatchFill{{{*/
    22042204void  Penta::PatchFill(int* pcount, Patch* patch){
    22052205
    … …  
    22282228        *pcount=count;
    22292229}/*}}}*/
    2230 /*FUNCTION Penta::PatchSize{{{1*/
     2230/*FUNCTION Penta::PatchSize{{{*/
    22312231void  Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    22322232
    … …  
    22522252}
    22532253/*}}}*/
    2254 /*FUNCTION Penta::PositiveDegreeDay{{{1*/
     2254/*FUNCTION Penta::PositiveDegreeDay{{{*/
    22552255void  Penta::PositiveDegreeDay(double* pdds,double* pds,double signorm){
    22562256
    … …  
    24772477}
    24782478/*}}}*/
    2479 /*FUNCTION Penta::PotentialSheetUngrounding{{{1*/
     2479/*FUNCTION Penta::PotentialSheetUngrounding{{{*/
    24802480void  Penta::PotentialSheetUngrounding(Vector* potential_sheet_ungrounding){
    24812481
    … …  
    25062506}
    25072507/*}}}*/
    2508 /*FUNCTION Penta::ProcessResultsUnits{{{1*/
     2508/*FUNCTION Penta::ProcessResultsUnits{{{*/
    25092509void  Penta::ProcessResultsUnits(void){
    25102510
    … …  
    25172517}
    25182518/*}}}*/
    2519 /*FUNCTION Penta::ReduceMatrixStokes {{{1*/
     2519/*FUNCTION Penta::ReduceMatrixStokes {{{*/
    25202520void Penta::ReduceMatrixStokes(double* Ke_reduced, double* Ke_temp){
    25212521
    … …  
    25592559}
    25602560/*}}}*/
    2561 /*FUNCTION Penta::ReduceVectorStokes {{{1*/
     2561/*FUNCTION Penta::ReduceVectorStokes {{{*/
    25622562void Penta::ReduceVectorStokes(double* Pe_reduced, double* Ke_temp, double* Pe_temp){
    25632563
    … …  
    25942594}
    25952595/*}}}*/
    2596 /*FUNCTION Penta::RequestedOutput{{{1*/
     2596/*FUNCTION Penta::RequestedOutput{{{*/
    25972597void Penta::RequestedOutput(int output_enum,int step,double time){
    25982598                       
    … …  
    26452645}
    26462646/*}}}*/
    2647 /*FUNCTION Penta::ResetCoordinateSystem{{{1*/
     2647/*FUNCTION Penta::ResetCoordinateSystem{{{*/
    26482648void  Penta::ResetCoordinateSystem(void){
    26492649
    … …  
    26732673}
    26742674/*}}}*/
    2675 /*FUNCTION Penta::SetClone {{{1*/
     2675/*FUNCTION Penta::SetClone {{{*/
    26762676void  Penta::SetClone(int* minranks){
    26772677
    26782678        _error_("not implemented yet");
    26792679}
    2680 /*}}}1*/
    2681 /*FUNCTION Penta::SetCurrentConfiguration {{{1*/
     2680/*}}}*/
     2681/*FUNCTION Penta::SetCurrentConfiguration {{{*/
    26822682void  Penta::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    26832683
    … …  
    26952695}
    26962696/*}}}*/
    2697 /*FUNCTION Penta::SpawnTria {{{1*/
     2697/*FUNCTION Penta::SpawnTria {{{*/
    26982698Tria*  Penta::SpawnTria(int g0, int g1, int g2){
    26992699
    … …  
    27382738}
    27392739/*}}}*/
    2740 /*FUNCTION Penta::SurfaceArea {{{1*/
     2740/*FUNCTION Penta::SurfaceArea {{{*/
    27412741double Penta::SurfaceArea(void){
    27422742
    … …  
    27752775}
    27762776/*}}}*/
    2777 /*FUNCTION Penta::SurfaceNormal {{{1*/
     2777/*FUNCTION Penta::SurfaceNormal {{{*/
    27782778void Penta::SurfaceNormal(double* surface_normal, double xyz_list[3][3]){
    27792779
    … …  
    27992799}
    28002800/*}}}*/
    2801 /*FUNCTION Penta::TimeAdapt{{{1*/
     2801/*FUNCTION Penta::TimeAdapt{{{*/
    28022802double  Penta::TimeAdapt(void){
    28032803
    … …  
    28432843        return dt;
    28442844}
    2845 /*FUNCTION Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type) {{{1*/
     2845/*FUNCTION Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type) {{{*/
    28462846void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type){
    28472847
    … …  
    28702870
    28712871        /*Checks if debuging*/
    2872         /*{{{2*/
     2872        /*{{{*/
    28732873        _assert_(iomodel->Data(MeshElementsEnum));
    28742874        /*}}}*/
    … …  
    29972997}
    29982998/*}}}*/
    2999 /*FUNCTION Penta::UpdatePotentialSheetUngrounding{{{1*/
     2999/*FUNCTION Penta::UpdatePotentialSheetUngrounding{{{*/
    30003000int Penta::UpdatePotentialSheetUngrounding(double* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,double* nodes_on_iceshelf){
    30013001
    … …  
    30173017}
    30183018/*}}}*/
    3019 /*FUNCTION Penta::ViscousHeatingCreateInput {{{1*/
     3019/*FUNCTION Penta::ViscousHeatingCreateInput {{{*/
    30203020void Penta::ViscousHeatingCreateInput(void){
    30213021
    … …  
    30653065}
    30663066/*}}}*/
    3067 /*FUNCTION Penta::SmearFunction {{{1*/
     3067/*FUNCTION Penta::SmearFunction {{{*/
    30683068void  Penta::SmearFunction(Vector* smearedvector,double (*WeightFunction)(double distance,double radius),double radius){
    30693069        _error_("not implemented yet");
    30703070}
    3071 /*}}}1*/
     3071/*}}}*/
    30723072
    30733073#ifdef _HAVE_RESPONSES_
    3074 /*FUNCTION Penta::IceVolume {{{1*/
     3074/*FUNCTION Penta::IceVolume {{{*/
    30753075double Penta::IceVolume(void){
    30763076
    … …  
    30953095}
    30963096/*}}}*/
    3097 /*FUNCTION Penta::MinVel{{{1*/
     3097/*FUNCTION Penta::MinVel{{{*/
    30983098void  Penta::MinVel(double* pminvel, bool process_units){
    30993099
    … …  
    31083108}
    31093109/*}}}*/
    3110 /*FUNCTION Penta::MinVx{{{1*/
     3110/*FUNCTION Penta::MinVx{{{*/
    31113111void  Penta::MinVx(double* pminvx, bool process_units){
    31123112
    … …  
    31213121}
    31223122/*}}}*/
    3123 /*FUNCTION Penta::MinVy{{{1*/
     3123/*FUNCTION Penta::MinVy{{{*/
    31243124void  Penta::MinVy(double* pminvy, bool process_units){
    31253125
    … …  
    31343134}
    31353135/*}}}*/
    3136 /*FUNCTION Penta::MinVz{{{1*/
     3136/*FUNCTION Penta::MinVz{{{*/
    31373137void  Penta::MinVz(double* pminvz, bool process_units){
    31383138
    … …  
    31473147}
    31483148/*}}}*/
    3149 /*FUNCTION Penta::MassFlux {{{1*/
     3149/*FUNCTION Penta::MassFlux {{{*/
    31503150double Penta::MassFlux( double* segment,bool process_units){
    31513151
    … …  
    31713171}
    31723172/*}}}*/
    3173 /*FUNCTION Penta::MaxAbsVx{{{1*/
     3173/*FUNCTION Penta::MaxAbsVx{{{*/
    31743174void  Penta::MaxAbsVx(double* pmaxabsvx, bool process_units){
    31753175
    … …  
    31843184}
    31853185/*}}}*/
    3186 /*FUNCTION Penta::MaxAbsVy{{{1*/
     3186/*FUNCTION Penta::MaxAbsVy{{{*/
    31873187void  Penta::MaxAbsVy(double* pmaxabsvy, bool process_units){
    31883188
    … …  
    31973197}
    31983198/*}}}*/
    3199 /*FUNCTION Penta::MaxAbsVz{{{1*/
     3199/*FUNCTION Penta::MaxAbsVz{{{*/
    32003200void  Penta::MaxAbsVz(double* pmaxabsvz, bool process_units){
    32013201
    … …  
    32103210}
    32113211/*}}}*/
    3212 /*FUNCTION Penta::MaxVel{{{1*/
     3212/*FUNCTION Penta::MaxVel{{{*/
    32133213void  Penta::MaxVel(double* pmaxvel, bool process_units){
    32143214
    … …  
    32243224}
    32253225/*}}}*/
    3226 /*FUNCTION Penta::MaxVx{{{1*/
     3226/*FUNCTION Penta::MaxVx{{{*/
    32273227void  Penta::MaxVx(double* pmaxvx, bool process_units){
    32283228
    … …  
    32373237}
    32383238/*}}}*/
    3239 /*FUNCTION Penta::MaxVy{{{1*/
     3239/*FUNCTION Penta::MaxVy{{{*/
    32403240void  Penta::MaxVy(double* pmaxvy, bool process_units){
    32413241
    … …  
    32503250}
    32513251/*}}}*/
    3252 /*FUNCTION Penta::MaxVz{{{1*/
     3252/*FUNCTION Penta::MaxVz{{{*/
    32533253void  Penta::MaxVz(double* pmaxvz, bool process_units){
    32543254
    … …  
    32633263}
    32643264/*}}}*/
    3265 /*FUNCTION Penta::ElementResponse{{{1*/
     3265/*FUNCTION Penta::ElementResponse{{{*/
    32663266void Penta::ElementResponse(double* presponse,int response_enum,bool process_units){
    32673267
    … …  
    32933293
    32943294#ifdef _HAVE_THERMAL_
    3295 /*FUNCTION Penta::CreateKMatrixEnthalpy {{{1*/
     3295/*FUNCTION Penta::CreateKMatrixEnthalpy {{{*/
    32963296ElementMatrix* Penta::CreateKMatrixEnthalpy(void){
    32973297       
    … …  
    33073307}
    33083308/*}}}*/
    3309 /*FUNCTION Penta::CreateKMatrixEnthalpyVolume {{{1*/
     3309/*FUNCTION Penta::CreateKMatrixEnthalpyVolume {{{*/
    33103310ElementMatrix* Penta::CreateKMatrixEnthalpyVolume(void){
    33113311
    … …  
    34643464}
    34653465/*}}}*/
    3466 /*FUNCTION Penta::CreateKMatrixEnthalpyShelf {{{1*/
     3466/*FUNCTION Penta::CreateKMatrixEnthalpyShelf {{{*/
    34673467ElementMatrix* Penta::CreateKMatrixEnthalpyShelf(void){
    34683468
    … …  
    35183518}
    35193519/*}}}*/
    3520 /*FUNCTION Penta::CreateKMatrixMelting {{{1*/
     3520/*FUNCTION Penta::CreateKMatrixMelting {{{*/
    35213521ElementMatrix* Penta::CreateKMatrixMelting(void){
    35223522
    … …  
    35303530}
    35313531/*}}}*/
    3532 /*FUNCTION Penta::CreateKMatrixThermal {{{1*/
     3532/*FUNCTION Penta::CreateKMatrixThermal {{{*/
    35333533ElementMatrix* Penta::CreateKMatrixThermal(void){
    35343534       
    … …  
    35443544}
    35453545/*}}}*/
    3546 /*FUNCTION Penta::CreateKMatrixThermalVolume {{{1*/
     3546/*FUNCTION Penta::CreateKMatrixThermalVolume {{{*/
    35473547ElementMatrix* Penta::CreateKMatrixThermalVolume(void){
    35483548
    … …  
    36963696}
    36973697/*}}}*/
    3698 /*FUNCTION Penta::CreateKMatrixThermalShelf {{{1*/
     3698/*FUNCTION Penta::CreateKMatrixThermalShelf {{{*/
    36993699ElementMatrix* Penta::CreateKMatrixThermalShelf(void){
    37003700
    … …  
    37513751}
    37523752/*}}}*/
    3753 /*FUNCTION Penta::CreatePVectorEnthalpy {{{1*/
     3753/*FUNCTION Penta::CreatePVectorEnthalpy {{{*/
    37543754ElementVector* Penta::CreatePVectorEnthalpy(void){
    37553755
    … …  
    37673767}
    37683768/*}}}*/
    3769 /*FUNCTION Penta::CreatePVectorEnthalpyVolume {{{1*/
     3769/*FUNCTION Penta::CreatePVectorEnthalpyVolume {{{*/
    37703770ElementVector* Penta::CreatePVectorEnthalpyVolume(void){
    37713771
    … …  
    38633863}
    38643864/*}}}*/
    3865 /*FUNCTION Penta::CreatePVectorEnthalpyShelf {{{1*/
     3865/*FUNCTION Penta::CreatePVectorEnthalpyShelf {{{*/
    38663866ElementVector* Penta::CreatePVectorEnthalpyShelf(void){
    38673867
    … …  
    39203920}
    39213921/*}}}*/
    3922 /*FUNCTION Penta::CreatePVectorEnthalpySheet {{{1*/
     3922/*FUNCTION Penta::CreatePVectorEnthalpySheet {{{*/
    39233923ElementVector* Penta::CreatePVectorEnthalpySheet(void){
    39243924
    … …  
    40094009}
    40104010/*}}}*/
    4011 /*FUNCTION Penta::CreatePVectorMelting {{{1*/
     4011/*FUNCTION Penta::CreatePVectorMelting {{{*/
    40124012ElementVector* Penta::CreatePVectorMelting(void){
    40134013        return NULL;
    40144014}
    40154015/*}}}*/
    4016 /*FUNCTION Penta::CreatePVectorThermal {{{1*/
     4016/*FUNCTION Penta::CreatePVectorThermal {{{*/
    40174017ElementVector* Penta::CreatePVectorThermal(void){
    40184018
    … …  
    40304030}
    40314031/*}}}*/
    4032 /*FUNCTION Penta::CreatePVectorThermalVolume {{{1*/
     4032/*FUNCTION Penta::CreatePVectorThermalVolume {{{*/
    40334033ElementVector* Penta::CreatePVectorThermalVolume(void){
    40344034
    … …  
    41174117}
    41184118/*}}}*/
    4119 /*FUNCTION Penta::CreatePVectorThermalShelf {{{1*/
     4119/*FUNCTION Penta::CreatePVectorThermalShelf {{{*/
    41204120ElementVector* Penta::CreatePVectorThermalShelf(void){
    41214121
    … …  
    41744174}
    41754175/*}}}*/
    4176 /*FUNCTION Penta::CreatePVectorThermalSheet {{{1*/
     4176/*FUNCTION Penta::CreatePVectorThermalSheet {{{*/
    41774177ElementVector* Penta::CreatePVectorThermalSheet(void){
    41784178
    … …  
    42414241}
    42424242/*}}}*/
    4243 /*FUNCTION Penta::GetSolutionFromInputsThermal{{{1*/
     4243/*FUNCTION Penta::GetSolutionFromInputsThermal{{{*/
    42444244void  Penta::GetSolutionFromInputsThermal(Vector* solution){
    42454245
    … …  
    42724272}
    42734273/*}}}*/
    4274 /*FUNCTION Penta::GetSolutionFromInputsEnthalpy{{{1*/
     4274/*FUNCTION Penta::GetSolutionFromInputsEnthalpy{{{*/
    42754275void  Penta::GetSolutionFromInputsEnthalpy(Vector* solution){
    42764276
    … …  
    43034303}
    43044304/*}}}*/
    4305 /*FUNCTION Penta::InputUpdateFromSolutionThermal {{{1*/
     4305/*FUNCTION Penta::InputUpdateFromSolutionThermal {{{*/
    43064306void  Penta::InputUpdateFromSolutionThermal(double* solution){
    43074307
    … …  
    43744374}
    43754375/*}}}*/
    4376 /*FUNCTION Penta::InputUpdateFromSolutionEnthalpy {{{1*/
     4376/*FUNCTION Penta::InputUpdateFromSolutionEnthalpy {{{*/
    43774377void  Penta::InputUpdateFromSolutionEnthalpy(double* solution){
    43784378
    … …  
    44554455
    44564456#ifdef _HAVE_CONTROL_
    4457 /*FUNCTION Penta::ControlInputGetGradient{{{1*/
     4457/*FUNCTION Penta::ControlInputGetGradient{{{*/
    44584458void Penta::ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){
    44594459
    … …  
    44754475
    44764476}/*}}}*/
    4477 /*FUNCTION Penta::ControlInputScaleGradient{{{1*/
     4477/*FUNCTION Penta::ControlInputScaleGradient{{{*/
    44784478void Penta::ControlInputScaleGradient(int enum_type,double scale){
    44794479
    … …  
    44914491        ((ControlInput*)input)->ScaleGradient(scale);
    44924492}/*}}}*/
    4493 /*FUNCTION Penta::ControlInputSetGradient{{{1*/
     4493/*FUNCTION Penta::ControlInputSetGradient{{{*/
    44944494void Penta::ControlInputSetGradient(double* gradient,int enum_type,int control_index){
    44954495
    … …  
    45144514
    45154515}/*}}}*/
    4516 /*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{1*/
     4516/*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{*/
    45174517ElementMatrix* Penta::CreateKMatrixAdjointHoriz(void){
    45184518
    … …  
    45344534}
    45354535/*}}}*/
    4536 /*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{1*/
     4536/*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{*/
    45374537ElementMatrix* Penta::CreateKMatrixAdjointMacAyeal2d(void){
    45384538
    … …  
    45574557}
    45584558/*}}}*/
    4559 /*FUNCTION Penta::CreateKMatrixAdjointPattyn{{{1*/
     4559/*FUNCTION Penta::CreateKMatrixAdjointPattyn{{{*/
    45604560ElementMatrix* Penta::CreateKMatrixAdjointPattyn(void){
    45614561
    … …  
    46254625}
    46264626/*}}}*/
    4627 /*FUNCTION Penta::CreateKMatrixAdjointStokes{{{1*/
     4627/*FUNCTION Penta::CreateKMatrixAdjointStokes{{{*/
    46284628ElementMatrix* Penta::CreateKMatrixAdjointStokes(void){
    46294629
    … …  
    47044704}
    47054705/*}}}*/
    4706 /*FUNCTION Penta::CreatePVectorAdjointHoriz{{{1*/
     4706/*FUNCTION Penta::CreatePVectorAdjointHoriz{{{*/
    47074707ElementVector* Penta::CreatePVectorAdjointHoriz(void){
    47084708
    … …  
    47244724}
    47254725/*}}}*/
    4726 /*FUNCTION Penta::CreatePVectorAdjointMacAyeal{{{1*/
     4726/*FUNCTION Penta::CreatePVectorAdjointMacAyeal{{{*/
    47274727ElementVector* Penta::CreatePVectorAdjointMacAyeal(){
    47284728
    … …  
    47384738}
    47394739/*}}}*/
    4740 /*FUNCTION Penta::CreatePVectorAdjointPattyn{{{1*/
     4740/*FUNCTION Penta::CreatePVectorAdjointPattyn{{{*/
    47414741ElementVector* Penta::CreatePVectorAdjointPattyn(void){
    47424742
    … …  
    47524752}
    47534753/*}}}*/
    4754 /*FUNCTION Penta::CreatePVectorAdjointStokes{{{1*/
     4754/*FUNCTION Penta::CreatePVectorAdjointStokes{{{*/
    47554755ElementVector* Penta::CreatePVectorAdjointStokes(void){
    47564756
    … …  
    47664766}
    47674767/*}}}*/
    4768 /*FUNCTION Penta::GradientIndexing{{{1*/
     4768/*FUNCTION Penta::GradientIndexing{{{*/
    47694769void Penta::GradientIndexing(int* indexing,int control_index){
    47704770
    … …  
    47804780}
    47814781/*}}}*/
    4782 /*FUNCTION Penta::Gradj {{{1*/
     4782/*FUNCTION Penta::Gradj {{{*/
    47834783void  Penta::Gradj(Vector* gradient,int control_type,int control_index){
    47844784        /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/
    … …  
    48714871}
    48724872/*}}}*/
    4873 /*FUNCTION Penta::GradjDragMacAyeal {{{1*/
     4873/*FUNCTION Penta::GradjDragMacAyeal {{{*/
    48744874void  Penta::GradjDragMacAyeal(Vector* gradient,int control_index){
    48754875
    … …  
    48834883
    48844884} /*}}}*/
    4885 /*FUNCTION Penta::GradjDragPattyn {{{1*/
     4885/*FUNCTION Penta::GradjDragPattyn {{{*/
    48864886void  Penta::GradjDragPattyn(Vector* gradient,int control_index){
    48874887
    … …  
    49544954}
    49554955/*}}}*/
    4956 /*FUNCTION Penta::GradjDragStokes {{{1*/
     4956/*FUNCTION Penta::GradjDragStokes {{{*/
    49574957void  Penta::GradjDragStokes(Vector* gradient,int control_index){
    49584958
    … …  
    50465046}
    50475047/*}}}*/
    5048 /*FUNCTION Penta::GradjBbarMacAyeal {{{1*/
     5048/*FUNCTION Penta::GradjBbarMacAyeal {{{*/
    50495049void  Penta::GradjBbarMacAyeal(Vector* gradient,int control_index){
    50505050
    … …  
    50645064
    50655065} /*}}}*/
    5066 /*FUNCTION Penta::GradjBbarPattyn {{{1*/
     5066/*FUNCTION Penta::GradjBbarPattyn {{{*/
    50675067void  Penta::GradjBbarPattyn(Vector* gradient,int control_index){
    50685068
    … …  
    50815081        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
    50825082} /*}}}*/
    5083 /*FUNCTION Penta::GradjBbarStokes {{{1*/
     5083/*FUNCTION Penta::GradjBbarStokes {{{*/
    50845084void  Penta::GradjBbarStokes(Vector* gradient,int control_index){
    50855085
    … …  
    50985098        this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
    50995099} /*}}}*/
    5100 /*FUNCTION Penta::InputControlUpdate{{{1*/
     5100/*FUNCTION Penta::InputControlUpdate{{{*/
    51015101void  Penta::InputControlUpdate(double scalar,bool save_parameter){
    51025102
    … …  
    51365136}
    51375137/*}}}*/
    5138 /*FUNCTION Penta::InputUpdateFromSolutionAdjointStokes {{{1*/
     5138/*FUNCTION Penta::InputUpdateFromSolutionAdjointStokes {{{*/
    51395139void  Penta::InputUpdateFromSolutionAdjointStokes(double* solution){
    51405140
    … …  
    51795179}
    51805180/*}}}*/
    5181 /*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{1*/
     5181/*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{*/
    51825182void  Penta::InputUpdateFromSolutionAdjointHoriz(double* solution){
    51835183
    … …  
    52145214}
    52155215/*}}}*/
    5216 /*FUNCTION Penta::SurfaceAverageVelMisfit {{{1*/
     5216/*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/
    52175217double Penta::SurfaceAverageVelMisfit(bool process_units,int weight_index){
    52185218
    … …  
    52515251}
    52525252/*}}}*/
    5253 /*FUNCTION Penta::SurfaceAbsVelMisfit {{{1*/
     5253/*FUNCTION Penta::SurfaceAbsVelMisfit {{{*/
    52545254double Penta::SurfaceAbsVelMisfit(bool process_units,int weight_index){
    52555255
    … …  
    52885288}
    52895289/*}}}*/
    5290 /*FUNCTION Penta::SurfaceLogVelMisfit {{{1*/
     5290/*FUNCTION Penta::SurfaceLogVelMisfit {{{*/
    52915291double Penta::SurfaceLogVelMisfit(bool process_units,int weight_index){
    52925292
    … …  
    53255325}
    53265326/*}}}*/
    5327 /*FUNCTION Penta::SurfaceLogVxVyMisfit {{{1*/
     5327/*FUNCTION Penta::SurfaceLogVxVyMisfit {{{*/
    53285328double Penta::SurfaceLogVxVyMisfit(bool process_units,int weight_index){
    53295329
    … …  
    53645364}
    53655365/*}}}*/
    5366 /*FUNCTION Penta::SurfaceRelVelMisfit {{{1*/
     5366/*FUNCTION Penta::SurfaceRelVelMisfit {{{*/
    53675367double Penta::SurfaceRelVelMisfit(bool process_units,int weight_index){
    53685368
    … …  
    54015401}
    54025402/*}}}*/
    5403 /*FUNCTION Penta::ThicknessAbsGradient{{{1*/
     5403/*FUNCTION Penta::ThicknessAbsGradient{{{*/
    54045404double Penta::ThicknessAbsGradient(bool process_units,int weight_index){
    54055405
    … …  
    54075407}
    54085408/*}}}*/
    5409 /*FUNCTION Penta::ThicknessAbsMisfit {{{1*/
     5409/*FUNCTION Penta::ThicknessAbsMisfit {{{*/
    54105410double Penta::ThicknessAbsMisfit(bool process_units,int weight_index){
    54115411
    … …  
    54275427}
    54285428/*}}}*/
    5429 /*FUNCTION Penta::DragCoefficientAbsGradient{{{1*/
     5429/*FUNCTION Penta::DragCoefficientAbsGradient{{{*/
    54305430double Penta::DragCoefficientAbsGradient(bool process_units,int weight_index){
    54315431
    … …  
    54425442}
    54435443/*}}}*/
    5444 /*FUNCTION Penta::RheologyBbarAbsGradient{{{1*/
     5444/*FUNCTION Penta::RheologyBbarAbsGradient{{{*/
    54455445double Penta::RheologyBbarAbsGradient(bool process_units,int weight_index){
    54465446
    … …  
    54575457}
    54585458/*}}}*/
    5459 /*FUNCTION Penta::GetVectorFromControlInputs{{{1*/
     5459/*FUNCTION Penta::GetVectorFromControlInputs{{{*/
    54605460void  Penta::GetVectorFromControlInputs(Vector* vector,int control_enum,int control_index,const char* data){
    54615461
    … …  
    54805480}
    54815481/*}}}*/
    5482 /*FUNCTION Penta::SetControlInputsFromVector{{{1*/
     5482/*FUNCTION Penta::SetControlInputsFromVector{{{*/
    54835483void  Penta::SetControlInputsFromVector(double* vector,int control_enum,int control_index){
    54845484
    … …  
    55185518
    55195519#ifdef _HAVE_DAKOTA_
    5520 /*FUNCTION Penta::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/
     5520/*FUNCTION Penta::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{*/
    55215521void  Penta::InputUpdateFromVectorDakota(double* vector, int name, int type){
    55225522       
    … …  
    55415541                        switch(name){
    55425542                                case ThicknessEnum:
    5543                                         /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{2*/
     5543                                        /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/
    55445544                                        double  thickness[6];
    55455545                                        double  thickness_init[6];
    … …  
    56205620}
    56215621/*}}}*/
    5622 /*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/
     5622/*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
    56235623void  Penta::InputUpdateFromVectorDakota(int* vector, int name, int type){
    56245624        _error_(" not supported yet!");
    56255625}
    56265626/*}}}*/
    5627 /*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/
     5627/*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
    56285628void  Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    56295629        _error_(" not supported yet!");
    56305630}
    56315631/*}}}*/
    5632 /*FUNCTION Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{1*/
     5632/*FUNCTION Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{*/
    56335633void  Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){
    56345634       
    … …  
    56785678
    56795679#ifdef _HAVE_DIAGNOSTIC_
    5680 /*FUNCTION Penta::CreateDVectorDiagnosticHoriz {{{1*/
     5680/*FUNCTION Penta::CreateDVectorDiagnosticHoriz {{{*/
    56815681ElementVector* Penta::CreateDVectorDiagnosticHoriz(void){
    56825682
    … …  
    56925692}
    56935693/*}}}*/
    5694 /*FUNCTION Penta::CreateDVectorDiagnosticStokes{{{1*/
     5694/*FUNCTION Penta::CreateDVectorDiagnosticStokes{{{*/
    56955695ElementVector* Penta::CreateDVectorDiagnosticStokes(void){
    56965696
    … …  
    57175717}
    57185718/*}}}*/
    5719 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattyn{{{1*/
     5719/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattyn{{{*/
    57205720ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattyn(void){
    57215721       
    … …  
    57315731}
    57325732/*}}}*/
    5733 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynViscous{{{1*/
     5733/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynViscous{{{*/
    57345734ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattynViscous(void){
    57355735
    … …  
    58245824}
    58255825/*}}}*/
    5826 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynFriction{{{1*/
     5826/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynFriction{{{*/
    58275827ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattynFriction(void){
    58285828
    … …  
    59225922}
    59235923/*}}}*/
    5924 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokes{{{1*/
     5924/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokes{{{*/
    59255925ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokes(void){
    59265926
    … …  
    59365936}
    59375937/*}}}*/
    5938 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesViscous{{{1*/
     5938/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesViscous{{{*/
    59395939ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokesViscous(void){
    59405940
    … …  
    60406040}
    60416041/*}}}*/
    6042 /*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesFriction {{{1*/
     6042/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesFriction {{{*/
    60436043ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokesFriction(void){
    60446044
    … …  
    61566156}
    61576157/*}}}*/
    6158 /*FUNCTION Penta::CreateKMatrixCouplingPattynStokes{{{1*/
     6158/*FUNCTION Penta::CreateKMatrixCouplingPattynStokes{{{*/
    61596159ElementMatrix* Penta::CreateKMatrixCouplingPattynStokes(void){
    61606160
    … …  
    62056205}
    62066206/*}}}*/
    6207 /*FUNCTION Penta::CreateKMatrixDiagnosticHoriz {{{1*/
     6207/*FUNCTION Penta::CreateKMatrixDiagnosticHoriz {{{*/
    62086208ElementMatrix* Penta::CreateKMatrixDiagnosticHoriz(void){
    62096209
    … …  
    62336233}
    62346234/*}}}*/
    6235 /*FUNCTION Penta::CreateKMatrixDiagnosticHutter{{{1*/
     6235/*FUNCTION Penta::CreateKMatrixDiagnosticHutter{{{*/
    62366236ElementMatrix* Penta::CreateKMatrixDiagnosticHutter(void){
    62376237
    … …  
    62966296        return Ke;
    62976297}
    6298 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal2d{{{1*/
     6298/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal2d{{{*/
    62996299ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal2d(void){
    63006300
    … …  
    63196319}
    63206320/*}}}*/
    6321 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3d{{{1*/
     6321/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3d{{{*/
    63226322ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3d(void){
    63236323
    … …  
    63336333}
    63346334/*}}}*/
    6335 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dViscous{{{1*/
     6335/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dViscous{{{*/
    63366336ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dViscous(void){
    63376337
    … …  
    64216421}
    64226422/*}}}*/
    6423 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dFriction{{{1*/
     6423/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dFriction{{{*/
    64246424ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dFriction(void){
    64256425
    … …  
    64386438}
    64396439/*}}}*/
    6440 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealPattyn{{{1*/
     6440/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealPattyn{{{*/
    64416441ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealPattyn(void){
    64426442
    … …  
    64546454}
    64556455/*}}}*/
    6456 /*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealStokes{{{1*/
     6456/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealStokes{{{*/
    64576457ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealStokes(void){
    64586458
    … …  
    64706470}
    64716471/*}}}*/
    6472 /*FUNCTION Penta::CreateKMatrixDiagnosticPattyn{{{1*/
     6472/*FUNCTION Penta::CreateKMatrixDiagnosticPattyn{{{*/
    64736473ElementMatrix* Penta::CreateKMatrixDiagnosticPattyn(void){
    64746474
    … …  
    64856485}
    64866486/*}}}*/
    6487 /*FUNCTION Penta::CreateKMatrixDiagnosticPattynViscous{{{1*/
     6487/*FUNCTION Penta::CreateKMatrixDiagnosticPattynViscous{{{*/
    64886488ElementMatrix* Penta::CreateKMatrixDiagnosticPattynViscous(void){
    64896489
    … …  
    65506550}
    65516551/*}}}*/
    6552 /*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{1*/
     6552/*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{*/
    65536553ElementMatrix* Penta::CreateKMatrixDiagnosticPattynFriction(void){
    65546554
    … …  
    66256625}
    66266626/*}}}*/
    6627 /*FUNCTION Penta::CreateKMatrixDiagnosticPattynStokes{{{1*/
     6627/*FUNCTION Penta::CreateKMatrixDiagnosticPattynStokes{{{*/
    66286628ElementMatrix* Penta::CreateKMatrixDiagnosticPattynStokes(void){
    66296629
    … …  
    66416641}
    66426642/*}}}*/
    6643 /*FUNCTION Penta::CreateKMatrixDiagnosticStokes{{{1*/
     6643/*FUNCTION Penta::CreateKMatrixDiagnosticStokes{{{*/
    66446644ElementMatrix* Penta::CreateKMatrixDiagnosticStokes(void){
    66456645
    … …  
    66556655}
    66566656/*}}}*/
    6657 /*FUNCTION Penta::CreateKMatrixDiagnosticStokesViscous {{{1*/
     6657/*FUNCTION Penta::CreateKMatrixDiagnosticStokesViscous {{{*/
    66586658ElementMatrix* Penta::CreateKMatrixDiagnosticStokesViscous(void){
    66596659
    … …  
    67166716}
    67176717/*}}}*/
    6718 /*FUNCTION Penta::CreateKMatrixDiagnosticStokesFriction{{{1*/
     6718/*FUNCTION Penta::CreateKMatrixDiagnosticStokesFriction{{{*/
    67196719ElementMatrix* Penta::CreateKMatrixDiagnosticStokesFriction(void){
    67206720
    … …  
    67886788}
    67896789/*}}}*/
    6790 /*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{1*/
     6790/*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{*/
    67916791ElementMatrix* Penta::CreateKMatrixDiagnosticVert(void){
    67926792       
    … …  
    68036803}
    68046804/*}}}*/
    6805 /*FUNCTION Penta::CreateKMatrixDiagnosticVertVolume {{{1*/
     6805/*FUNCTION Penta::CreateKMatrixDiagnosticVertVolume {{{*/
    68066806ElementMatrix* Penta::CreateKMatrixDiagnosticVertVolume(void){
    68076807
    … …  
    68476847}
    68486848/*}}}*/
    6849 /*FUNCTION Penta::CreateKMatrixDiagnosticVertSurface {{{1*/
     6849/*FUNCTION Penta::CreateKMatrixDiagnosticVertSurface {{{*/
    68506850ElementMatrix* Penta::CreateKMatrixDiagnosticVertSurface(void){
    68516851
    … …  
    68946894}
    68956895/*}}}*/
    6896 /*FUNCTION Penta::CreatePVectorCouplingMacAyealStokes {{{1*/
     6896/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokes {{{*/
    68976897ElementVector* Penta::CreatePVectorCouplingMacAyealStokes(void){
    68986898
    … …  
    69086908}
    69096909/*}}}*/
    6910 /*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesViscous {{{1*/
     6910/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesViscous {{{*/
    69116911ElementVector* Penta::CreatePVectorCouplingMacAyealStokesViscous(void){
    69126912
    … …  
    69706970}
    69716971/*}}}*/
    6972 /*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesFriction{{{1*/
     6972/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesFriction{{{*/
    69736973ElementVector* Penta::CreatePVectorCouplingMacAyealStokesFriction(void){
    69746974
    … …  
    70457045}
    70467046/*}}}*/
    7047 /*FUNCTION Penta::CreatePVectorCouplingPattynStokes {{{1*/
     7047/*FUNCTION Penta::CreatePVectorCouplingPattynStokes {{{*/
    70487048ElementVector* Penta::CreatePVectorCouplingPattynStokes(void){
    70497049
    … …  
    70597059}
    70607060/*}}}*/
    7061 /*FUNCTION Penta::CreatePVectorCouplingPattynStokesViscous {{{1*/
     7061/*FUNCTION Penta::CreatePVectorCouplingPattynStokesViscous {{{*/
    70627062ElementVector* Penta::CreatePVectorCouplingPattynStokesViscous(void){
    70637063
    … …  
    71217121}
    71227122/*}}}*/
    7123 /*FUNCTION Penta::CreatePVectorCouplingPattynStokesFriction{{{1*/
     7123/*FUNCTION Penta::CreatePVectorCouplingPattynStokesFriction{{{*/
    71247124ElementVector* Penta::CreatePVectorCouplingPattynStokesFriction(void){
    71257125
    … …  
    71967196}
    71977197/*}}}*/
    7198 /*FUNCTION Penta::CreatePVectorDiagnosticHoriz{{{1*/
     7198/*FUNCTION Penta::CreatePVectorDiagnosticHoriz{{{*/
    71997199ElementVector* Penta::CreatePVectorDiagnosticHoriz(void){
    72007200
    … …  
    72247224}
    72257225/*}}}*/
    7226 /*FUNCTION Penta::CreatePVectorDiagnosticMacAyealPattyn{{{1*/
     7226/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealPattyn{{{*/
    72277227ElementVector* Penta::CreatePVectorDiagnosticMacAyealPattyn(void){
    72287228
    … …  
    72387238}
    72397239/*}}}*/
    7240 /*FUNCTION Penta::CreatePVectorDiagnosticMacAyealStokes{{{1*/
     7240/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealStokes{{{*/
    72417241ElementVector* Penta::CreatePVectorDiagnosticMacAyealStokes(void){
    72427242
    … …  
    72547254}
    72557255/*}}}*/
    7256 /*FUNCTION Penta::CreatePVectorDiagnosticPattynStokes{{{1*/
     7256/*FUNCTION Penta::CreatePVectorDiagnosticPattynStokes{{{*/
    72577257ElementVector* Penta::CreatePVectorDiagnosticPattynStokes(void){
    72587258
    … …  
    72707270}
    72717271/*}}}*/
    7272 /*FUNCTION Penta::CreatePVectorDiagnosticHutter{{{1*/
     7272/*FUNCTION Penta::CreatePVectorDiagnosticHutter{{{*/
    72737273ElementVector* Penta::CreatePVectorDiagnosticHutter(void){
    72747274
    … …  
    73587358}
    73597359/*}}}*/
    7360 /*FUNCTION Penta::CreatePVectorDiagnosticMacAyeal{{{1*/
     7360/*FUNCTION Penta::CreatePVectorDiagnosticMacAyeal{{{*/
    73617361ElementVector* Penta::CreatePVectorDiagnosticMacAyeal(void){
    73627362
    … …  
    73727372}
    73737373/*}}}*/
    7374 /*FUNCTION Penta::CreatePVectorDiagnosticPattyn{{{1*/
     7374/*FUNCTION Penta::CreatePVectorDiagnosticPattyn{{{*/
    73757375ElementVector* Penta::CreatePVectorDiagnosticPattyn(void){
    73767376
    … …  
    74207420}
    74217421/*}}}*/
    7422 /*FUNCTION Penta::CreatePVectorDiagnosticStokes {{{1*/
     7422/*FUNCTION Penta::CreatePVectorDiagnosticStokes {{{*/
    74237423ElementVector* Penta::CreatePVectorDiagnosticStokes(void){
    74247424
    … …  
    74347434}
    74357435/*}}}*/
    7436 /*FUNCTION Penta::CreatePVectorDiagnosticStokesViscous {{{1*/
     7436/*FUNCTION Penta::CreatePVectorDiagnosticStokesViscous {{{*/
    74377437ElementVector* Penta::CreatePVectorDiagnosticStokesViscous(void){
    74387438
    … …  
    75147514}
    75157515/*}}}*/
    7516 /*FUNCTION Penta::CreatePVectorDiagnosticStokesShelf{{{1*/
     7516/*FUNCTION Penta::CreatePVectorDiagnosticStokesShelf{{{*/
    75177517ElementVector* Penta::CreatePVectorDiagnosticStokesShelf(void){
    75187518
    … …  
    75827582}
    75837583/*}}}*/
    7584 /*FUNCTION Penta::CreatePVectorDiagnosticVert {{{1*/
     7584/*FUNCTION Penta::CreatePVectorDiagnosticVert {{{*/
    75857585ElementVector* Penta::CreatePVectorDiagnosticVert(void){
    75867586
    … …  
    75967596}
    75977597/*}}}*/
    7598 /*FUNCTION Penta::CreatePVectorDiagnosticVertVolume {{{1*/
     7598/*FUNCTION Penta::CreatePVectorDiagnosticVertVolume {{{*/
    75997599ElementVector* Penta::CreatePVectorDiagnosticVertVolume(void){
    76007600
    … …  
    76527652}
    76537653/*}}}*/
    7654 /*FUNCTION Penta::CreatePVectorDiagnosticVertBase {{{1*/
     7654/*FUNCTION Penta::CreatePVectorDiagnosticVertBase {{{*/
    76557655ElementVector* Penta::CreatePVectorDiagnosticVertBase(void){
    76567656
    … …  
    77177717}
    77187718/*}}}*/
    7719 /*FUNCTION Penta::CreateJacobianDiagnosticHoriz{{{1*/
     7719/*FUNCTION Penta::CreateJacobianDiagnosticHoriz{{{*/
    77207720ElementMatrix* Penta::CreateJacobianDiagnosticHoriz(void){
    77217721
    … …  
    77377737}
    77387738/*}}}*/
    7739 /*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{1*/
     7739/*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{*/
    77407740ElementMatrix* Penta::CreateJacobianDiagnosticMacayeal2d(void){
    77417741
    … …  
    77607760}
    77617761/*}}}*/
    7762 /*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/
     7762/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{*/
    77637763ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){
    77647764
    … …  
    78257825}
    78267826/*}}}*/
    7827 /*FUNCTION Penta::CreateJacobianDiagnosticStokes{{{1*/
     7827/*FUNCTION Penta::CreateJacobianDiagnosticStokes{{{*/
    78287828ElementMatrix* Penta::CreateJacobianDiagnosticStokes(void){
    78297829
    … …  
    79017901}
    79027902/*}}}*/
    7903 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/
     7903/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{*/
    79047904void  Penta::GetSolutionFromInputsDiagnosticHoriz(Vector* solution){
    79057905
    … …  
    79437943}
    79447944/*}}}*/
    7945 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHutter{{{1*/
     7945/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHutter{{{*/
    79467946void  Penta::GetSolutionFromInputsDiagnosticHutter(Vector* solution){
    79477947
    … …  
    79797979}
    79807980/*}}}*/
    7981 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{1*/
     7981/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{*/
    79827982void  Penta::GetSolutionFromInputsDiagnosticVert(Vector* solution){
    79837983
    … …  
    80128012}
    80138013/*}}}*/
    8014 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{1*/
     8014/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{*/
    80158015void  Penta::GetSolutionFromInputsDiagnosticStokes(Vector* solution){
    80168016
    … …  
    80578057}
    80588058/*}}}*/
    8059 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHoriz {{{1*/
     8059/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHoriz {{{*/
    80608060void  Penta::InputUpdateFromSolutionDiagnosticHoriz(double* solution){
    80618061
    … …  
    80938093}
    80948094/*}}}*/
    8095 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyeal {{{1*/
     8095/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyeal {{{*/
    80968096void  Penta::InputUpdateFromSolutionDiagnosticMacAyeal(double* solution){
    80978097
    … …  
    81748174}
    81758175/*}}}*/
    8176 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn {{{1*/
     8176/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn {{{*/
    81778177void  Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn(double* solution){
    81788178
    … …  
    82588258}
    82598259/*}}}*/
    8260 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes {{{1*/
     8260/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes {{{*/
    82618261void  Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes(double* solution){
    82628262
    … …  
    83588358}
    83598359/*}}}*/
    8360 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattyn {{{1*/
     8360/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattyn {{{*/
    83618361void  Penta::InputUpdateFromSolutionDiagnosticPattyn(double* solution){
    83628362       
    … …  
    84328432}
    84338433/*}}}*/
    8434 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattynStokes {{{1*/
     8434/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattynStokes {{{*/
    84358435void  Penta::InputUpdateFromSolutionDiagnosticPattynStokes(double* solution){
    84368436
    … …  
    85268526}
    85278527/*}}}*/
    8528 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHutter {{{1*/
     8528/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHutter {{{*/
    85298529void  Penta::InputUpdateFromSolutionDiagnosticHutter(double* solution){
    85308530       
    … …  
    85898589}
    85908590/*}}}*/
    8591 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticVert {{{1*/
     8591/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticVert {{{*/
    85928592void  Penta::InputUpdateFromSolutionDiagnosticVert(double* solution){
    85938593
    … …  
    86938693}
    86948694/*}}}*/
    8695 /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{1*/
     8695/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{*/
    86968696void  Penta::InputUpdateFromSolutionDiagnosticStokes(double* solution){
    86978697       
    … …  
    87578757
    87588758#ifdef _HAVE_BALANCED_
    8759 /*FUNCTION Penta::CreateKMatrixBalancethickness {{{1*/
     8759/*FUNCTION Penta::CreateKMatrixBalancethickness {{{*/
    87608760ElementMatrix* Penta::CreateKMatrixBalancethickness(void){
    87618761
    … …  
    87828782}
    87838783/*}}}*/
    8784 /*FUNCTION Penta::CreatePVectorBalancethickness {{{1*/
     8784/*FUNCTION Penta::CreatePVectorBalancethickness {{{*/
    87858785ElementVector* Penta::CreatePVectorBalancethickness(void){
    87868786

  • issm/trunk-jpl/src/c/objects/Elements/Penta.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Element.h"
    1111#include "./PentaHook.h"
    … …  
    4444                Results      *results;
    4545
    46                 /*Penta constructors and destructor: {{{1*/
     46                /*Penta constructors and destructor: {{{*/
    4747                Penta();
    4848                Penta(int penta_id,int penta_sid,int i, IoModel* iomodel,int nummodels);
    4949                ~Penta();
    5050                /*}}}*/
    51                 /*Object virtual functions definitions: {{{1*/
     51                /*Object virtual functions definitions: {{{*/
    5252                Object*   copy();
    5353                void      DeepEcho();
    … …  
    5757                int               MyRank();
    5858                /*}}}*/
    59                 /*Update virtual functions definitions: {{{1*/
     59                /*Update virtual functions definitions: {{{*/
    6060                void  InputUpdateFromConstant(bool constant, int name);
    6161                void  InputUpdateFromConstant(double constant, int name);
    … …  
    7373                void  InputUpdateFromIoModel(int index, IoModel* iomodel);
    7474                /*}}}*/
    75                 /*Element virtual functions definitions: {{{1*/
     75                /*Element virtual functions definitions: {{{*/
    7676                void   AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part);
    7777                void   BasalFrictionCreateInput(void);
    … …  
    162162                #endif
    163163                /*}}}*/
    164                 /*Penta specific routines:{{{1*/
     164                /*Penta specific routines:{{{*/
    165165                void      BedNormal(double* bed_normal, double xyz_list[3][3]);
    166166                ElementMatrix* CreateKMatrixPrognostic(void);

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

    r9725 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Object constructors and destructor*/
    23 /*FUNCTION PentaHook::PentaHook(){{{1*/
     23/*FUNCTION PentaHook::PentaHook(){{{*/
    2424PentaHook::PentaHook(){
    2525        numanalyses=UNDEF;
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION PentaHook::~PentaHook(){{{1*/
     32/*FUNCTION PentaHook::~PentaHook(){{{*/
    3333PentaHook::~PentaHook(){
    3434
    … …  
    4444}
    4545/*}}}*/
    46 /*FUNCTION PentaHook::PentaHook(int in_numanalyses,int matice_id, int matpar_id){{{1*/
     46/*FUNCTION PentaHook::PentaHook(int in_numanalyses,int matice_id, int matpar_id){{{*/
    4747PentaHook::PentaHook(int in_numanalyses,int matice_id, IoModel* iomodel){
    4848
    … …  
    6767/*}}}*/
    6868
    69 /*FUNCTION PentaHook::SetHookNodes{{{1*/
     69/*FUNCTION PentaHook::SetHookNodes{{{*/
    7070void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){
    7171        this->hnodes[analysis_counter]= new Hook(node_ids,6);
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION PentaHook::InitHookNeighbors{{{1*/
     75/*FUNCTION PentaHook::InitHookNeighbors{{{*/
    7676void PentaHook::InitHookNeighbors(int* element_ids){
    7777        this->hneighbors=new Hook(element_ids,2);
    … …  
    7979}
    8080/*}}}*/
    81 /*FUNCTION PentaHook::SpawnTriaHook{{{1*/
     81/*FUNCTION PentaHook::SpawnTriaHook{{{*/
    8282void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){
    8383

  • issm/trunk-jpl/src/c/objects/Elements/PentaHook.h

    r9356 r12365  
    1919                Hook*  hneighbors; // 2 elements, first down, second up
    2020
    21                 /*FUNCTION constructors, destructors {{{1*/
     21                /*FUNCTION constructors, destructors {{{*/
    2222                PentaHook();
    2323                PentaHook(int in_numanalyses,int matice_id, IoModel* iomodel);

  • issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp

    r10628 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2626
    2727/*Object constructors and destructor*/
    28 /*FUNCTION PentaRef::PentaRef(){{{1*/
     28/*FUNCTION PentaRef::PentaRef(){{{*/
    2929PentaRef::PentaRef(){
    3030        this->element_type_list=NULL;
    3131}
    3232/*}}}*/
    33 /*FUNCTION PentaRef::PentaRef(int* types,int nummodels){{{1*/
     33/*FUNCTION PentaRef::PentaRef(int* types,int nummodels){{{*/
    3434PentaRef::PentaRef(const int nummodels){
    3535
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION PentaRef::~PentaRef(){{{1*/
     41/*FUNCTION PentaRef::~PentaRef(){{{*/
    4242PentaRef::~PentaRef(){
    4343        xfree((void**)&element_type_list);
    … …  
    4646
    4747/*Management*/
    48 /*FUNCTION PentaRef::SetElementType{{{1*/
     48/*FUNCTION PentaRef::SetElementType{{{*/
    4949void PentaRef::SetElementType(int type,int type_counter){
    5050
    … …  
    5757
    5858/*Reference Element numerics*/
    59 /*FUNCTION PentaRef::GetBMacAyealPattyn {{{1*/
     59/*FUNCTION PentaRef::GetBMacAyealPattyn {{{*/
    6060void PentaRef::GetBMacAyealPattyn(double* B, double* xyz_list, GaussPenta* gauss){
    6161        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2.
    … …  
    8888}
    8989/*}}}*/
    90 /*FUNCTION PentaRef::GetBMacAyealStokes{{{1*/
     90/*FUNCTION PentaRef::GetBMacAyealStokes{{{*/
    9191void PentaRef::GetBMacAyealStokes(double* B, double* xyz_list, GaussPenta* gauss){
    9292        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2.
    … …  
    134134}
    135135/*}}}*/
    136 /*FUNCTION PentaRef::GetBPattyn {{{1*/
     136/*FUNCTION PentaRef::GetBPattyn {{{*/
    137137void PentaRef::GetBPattyn(double* B, double* xyz_list, GaussPenta* gauss){
    138138        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2.
    … …  
    174174}
    175175/*}}}*/
    176 /*FUNCTION PentaRef::GetBprimePattyn {{{1*/
     176/*FUNCTION PentaRef::GetBprimePattyn {{{*/
    177177void PentaRef::GetBprimePattyn(double* B, double* xyz_list, GaussPenta* gauss_coord){
    178178        /*Compute B  prime matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2.
    … …  
    212212}
    213213/*}}}*/
    214 /*FUNCTION PentaRef::GetBprimeMacAyealStokes{{{1*/
     214/*FUNCTION PentaRef::GetBprimeMacAyealStokes{{{*/
    215215void PentaRef::GetBprimeMacAyealStokes(double* Bprime, double* xyz_list, GaussPenta* gauss){
    216216        /*Compute Bprime  matrix. Bprime=[Bprime1 Bprime2 Bprime3 Bprime4 Bprime5 Bprime6] where Bprimei is of size 5*NDOF2.
    … …  
    252252}
    253253/*}}}*/
    254 /*FUNCTION PentaRef::GetBStokes {{{1*/
     254/*FUNCTION PentaRef::GetBStokes {{{*/
    255255void PentaRef::GetBStokes(double* B, double* xyz_list, GaussPenta* gauss){
    256256
    … …  
    319319}
    320320/*}}}*/
    321 /*FUNCTION PentaRef::GetBprimeStokes {{{1*/
     321/*FUNCTION PentaRef::GetBprimeStokes {{{*/
    322322void PentaRef::GetBprimeStokes(double* B_prime, double* xyz_list, GaussPenta* gauss){
    323323        /*      Compute B'  matrix. B'=[B1' B2' B3' B4' B5' B6' Bb'] where Bi' is of size 3*NDOF2.
    … …  
    386386}
    387387/*}}}*/
    388 /*FUNCTION PentaRef::GetBAdvec{{{1*/
     388/*FUNCTION PentaRef::GetBAdvec{{{*/
    389389void PentaRef::GetBAdvec(double* B_advec, double* xyz_list, GaussPenta* gauss){
    390390        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1.
    … …  
    413413}
    414414/*}}}*/
    415 /*FUNCTION PentaRef::GetBConduct{{{1*/
     415/*FUNCTION PentaRef::GetBConduct{{{*/
    416416void PentaRef::GetBConduct(double* B_conduct, double* xyz_list, GaussPenta* gauss){
    417417        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1.
    … …  
    440440}
    441441/*}}}*/
    442 /*FUNCTION PentaRef::GetBVert{{{1*/
     442/*FUNCTION PentaRef::GetBVert{{{*/
    443443void PentaRef::GetBVert(double* B, double* xyz_list, GaussPenta* gauss){
    444444        /*      Compute B  matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz];
    … …  
    458458}
    459459/*}}}*/
    460 /*FUNCTION PentaRef::GetBprimeAdvec{{{1*/
     460/*FUNCTION PentaRef::GetBprimeAdvec{{{*/
    461461void PentaRef::GetBprimeAdvec(double* Bprime_advec, double* xyz_list, GaussPenta* gauss){
    462462        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1.
    … …  
    485485}
    486486/*}}}*/
    487 /*FUNCTION PentaRef::GetBprimeVert{{{1*/
     487/*FUNCTION PentaRef::GetBprimeVert{{{*/
    488488void PentaRef::GetBprimeVert(double* B, double* xyz_list, GaussPenta* gauss){
    489489        /* Compute Bprime  matrix. Bprime=[L1 L2 L3 L4 L5 L6] where Li is the nodal function for node i*/
    … …  
    493493}
    494494/*}}}*/
    495 /*FUNCTION PentaRef::GetL{{{1*/
     495/*FUNCTION PentaRef::GetL{{{*/
    496496void PentaRef::GetL(double* L, GaussPenta* gauss, int numdof){
    497497        /*Compute L  matrix. L=[L1 L2 L3] where Li is square and of size numdof.
    … …  
    530530}
    531531/*}}}*/
    532 /*FUNCTION PentaRef::GetLStokes{{{1*/
     532/*FUNCTION PentaRef::GetLStokes{{{*/
    533533void PentaRef::GetLStokes(double* LStokes, GaussPenta* gauss){
    534534        /*
    … …  
    565565}
    566566/*}}}*/
    567 /*FUNCTION PentaRef::GetLprimeStokes {{{1*/
     567/*FUNCTION PentaRef::GetLprimeStokes {{{*/
    568568void PentaRef::GetLprimeStokes(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){
    569569
    … …  
    677677}
    678678/*}}}*/
    679 /*FUNCTION PentaRef::GetLMacAyealStokes {{{1*/
     679/*FUNCTION PentaRef::GetLMacAyealStokes {{{*/
    680680void PentaRef::GetLMacAyealStokes(double* LStokes, GaussPenta* gauss){
    681681        /*
    … …  
    727727}
    728728/*}}}*/
    729 /*FUNCTION PentaRef::GetLprimeMacAyealStokes {{{1*/
     729/*FUNCTION PentaRef::GetLprimeMacAyealStokes {{{*/
    730730void PentaRef::GetLprimeMacAyealStokes(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){
    731731
    … …  
    794794}
    795795/*}}}*/
    796 /*FUNCTION PentaRef::GetLStokesMacAyeal {{{1*/
     796/*FUNCTION PentaRef::GetLStokesMacAyeal {{{*/
    797797void PentaRef::GetLStokesMacAyeal(double* LStokes, GaussPenta* gauss){
    798798        /*
    … …  
    840840}
    841841/*}}}*/
    842 /*FUNCTION PentaRef::GetLprimeStokesMacAyeal {{{1*/
     842/*FUNCTION PentaRef::GetLprimeStokesMacAyeal {{{*/
    843843void PentaRef::GetLprimeStokesMacAyeal(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){
    844844
    … …  
    879879}
    880880/*}}}*/
    881 /*FUNCTION PentaRef::GetJacobian {{{1*/
     881/*FUNCTION PentaRef::GetJacobian {{{*/
    882882void PentaRef::GetJacobian(double* J, double* xyz_list,GaussPenta* gauss){
    883883
    … …  
    938938}
    939939/*}}}*/
    940 /*FUNCTION PentaRef::GetJacobianDeterminant {{{1*/
     940/*FUNCTION PentaRef::GetJacobianDeterminant {{{*/
    941941void PentaRef::GetJacobianDeterminant(double*  Jdet, double* xyz_list,GaussPenta* gauss){
    942942        /*On a penta, Jacobian varies according to coordinates. We need to get the Jacobian, and take
    … …  
    953953}
    954954/*}}}*/
    955 /*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{1*/
     955/*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{*/
    956956void PentaRef::GetTriaJacobianDeterminant(double*  Jdet, double* xyz_list,GaussPenta* gauss){
    957957        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    … …  
    975975}
    976976/*}}}*/
    977 /*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{1*/
     977/*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/
    978978void PentaRef::GetSegmentJacobianDeterminant(double*  Jdet, double* xyz_list,GaussPenta* gauss){
    979979        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    … …  
    994994}
    995995/*}}}*/
    996 /*FUNCTION PentaRef::GetJacobianInvert {{{1*/
     996/*FUNCTION PentaRef::GetJacobianInvert {{{*/
    997997void PentaRef::GetJacobianInvert(double* Jinv, double* xyz_list,GaussPenta* gauss){
    998998
    … …  
    10071007}
    10081008/*}}}*/
    1009 /*FUNCTION PentaRef::GetNodalFunctionsMINI{{{1*/
     1009/*FUNCTION PentaRef::GetNodalFunctionsMINI{{{*/
    10101010void PentaRef::GetNodalFunctionsMINI(double* l1l7, GaussPenta* gauss){
    10111011        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    10211021}
    10221022/*}}}*/
    1023 /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{1*/
     1023/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{*/
    10241024void PentaRef::GetNodalFunctionsMINIDerivatives(double* dh1dh7,double* xyz_list, GaussPenta* gauss){
    10251025
    … …  
    10521052}
    10531053/*}}}*/
    1054 /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{1*/
     1054/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{*/
    10551055void PentaRef::GetNodalFunctionsMINIDerivativesReference(double* dl1dl7,GaussPenta* gauss){
    10561056
    … …  
    10981098}
    10991099/*}}}*/
    1100 /*FUNCTION PentaRef::GetNodalFunctionsP1 {{{1*/
     1100/*FUNCTION PentaRef::GetNodalFunctionsP1 {{{*/
    11011101void PentaRef::GetNodalFunctionsP1(double* l1l6, GaussPenta* gauss){
    11021102        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    11111111}
    11121112/*}}}*/
    1113 /*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{1*/
     1113/*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{*/
    11141114void PentaRef::GetNodalFunctionsP1Derivatives(double* dh1dh6,double* xyz_list, GaussPenta* gauss){
    11151115
    … …  
    11401140}
    11411141/*}}}*/
    1142 /*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{1*/
     1142/*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{*/
    11431143void PentaRef::GetNodalFunctionsP1DerivativesReference(double* dl1dl6,GaussPenta* gauss){
    11441144
    … …  
    11841184}
    11851185/*}}}*/
    1186 /*FUNCTION PentaRef::GetQuadNodalFunctions {{{1*/
     1186/*FUNCTION PentaRef::GetQuadNodalFunctions {{{*/
    11871187void PentaRef::GetQuadNodalFunctions(double* l1l4,GaussPenta* gauss,int index1,int index2,int index3,int index4){
    11881188        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    12041204}
    12051205/*}}}*/
    1206 /*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{1*/
     1206/*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{*/
    12071207void PentaRef::GetQuadJacobianDeterminant(double* Jdet,double xyz_list[4][3],GaussPenta* gauss){
    12081208        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    12301230}
    12311231/*}}}*/
    1232 /*FUNCTION PentaRef::GetInputValue{{{1*/
     1232/*FUNCTION PentaRef::GetInputValue{{{*/
    12331233void PentaRef::GetInputValue(double* pvalue,double* plist,GaussPenta* gauss){
    12341234        /*P1 interpolation on Gauss point*/
    … …  
    12451245}
    12461246/*}}}*/
    1247 /*FUNCTION PentaRef::GetInputDerivativeValue{{{1*/
     1247/*FUNCTION PentaRef::GetInputDerivativeValue{{{*/
    12481248void PentaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussPenta* gauss){
    12491249        /*From node 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:

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

    r12326 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2323
    2424/*Constructors/destructor/copy*/
    25 /*FUNCTION Tria::Tria(){{{1*/
     25/*FUNCTION Tria::Tria(){{{*/
    2626Tria::Tria(){
    2727
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{1*/
     40/*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/
    4141Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels)
    4242        :TriaRef(nummodels)
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION Tria::~Tria(){{{1*/
     68/*FUNCTION Tria::~Tria(){{{*/
    6969Tria::~Tria(){
    7070        delete inputs;
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION Tria::copy {{{1*/
     75/*FUNCTION Tria::copy {{{*/
    7676Object* Tria::copy() {
    7777
    … …  
    124124
    125125/*Other*/
    126 /*FUNCTION Tria::AverageOntoPartition {{{1*/
     126/*FUNCTION Tria::AverageOntoPartition {{{*/
    127127void  Tria::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part){
    128128
    … …  
    164164}
    165165/*}}}*/
    166 /*FUNCTION Tria::CreateKMatrix {{{1*/
     166/*FUNCTION Tria::CreateKMatrix {{{*/
    167167void  Tria::CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df){
    168168
    … …  
    172172        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    173173
    174         /*Checks in debugging mode{{{2*/
     174        /*Checks in debugging mode{{{*/
    175175        _assert_(this->nodes && this->matice && this->matpar && this->parameters && this->inputs);
    176176        /*}}}*/
    … …  
    224224}
    225225/*}}}*/
    226 /*FUNCTION Tria::CreateKMatrixMelting {{{1*/
     226/*FUNCTION Tria::CreateKMatrixMelting {{{*/
    227227ElementMatrix* Tria::CreateKMatrixMelting(void){
    228228
    … …  
    268268}
    269269/*}}}*/
    270 /*FUNCTION Tria::CreateKMatrixPrognostic {{{1*/
     270/*FUNCTION Tria::CreateKMatrixPrognostic {{{*/
    271271ElementMatrix* Tria::CreateKMatrixPrognostic(void){
    272272
    … …  
    282282}
    283283/*}}}*/
    284 /*FUNCTION Tria::CreateKMatrixPrognostic_CG {{{1*/
     284/*FUNCTION Tria::CreateKMatrixPrognostic_CG {{{*/
    285285ElementMatrix* Tria::CreateKMatrixPrognostic_CG(void){
    286286
    … …  
    402402}
    403403/*}}}*/
    404 /*FUNCTION Tria::CreateKMatrixPrognostic_DG {{{1*/
     404/*FUNCTION Tria::CreateKMatrixPrognostic_DG {{{*/
    405405ElementMatrix* Tria::CreateKMatrixPrognostic_DG(void){
    406406
    … …  
    477477}
    478478/*}}}*/
    479 /*FUNCTION Tria::CreateKMatrixSlope {{{1*/
     479/*FUNCTION Tria::CreateKMatrixSlope {{{*/
    480480ElementMatrix* Tria::CreateKMatrixSlope(void){
    481481
    … …  
    517517}
    518518/*}}}*/
    519 /*FUNCTION Tria::CreatePVector {{{1*/
     519/*FUNCTION Tria::CreatePVector {{{*/
    520520void  Tria::CreatePVector(Vector* pf){
    521521
    … …  
    578578}
    579579/*}}}*/
    580 /*FUNCTION Tria::CreatePVectorPrognostic{{{1*/
     580/*FUNCTION Tria::CreatePVectorPrognostic{{{*/
    581581ElementVector* Tria::CreatePVectorPrognostic(void){
    582582
    … …  
    591591}
    592592/*}}}*/
    593 /*FUNCTION Tria::CreatePVectorPrognostic_CG {{{1*/
     593/*FUNCTION Tria::CreatePVectorPrognostic_CG {{{*/
    594594ElementVector* Tria::CreatePVectorPrognostic_CG(void){
    595595
    … …  
    642642}
    643643/*}}}*/
    644 /*FUNCTION Tria::CreatePVectorPrognostic_DG {{{1*/
     644/*FUNCTION Tria::CreatePVectorPrognostic_DG {{{*/
    645645ElementVector* Tria::CreatePVectorPrognostic_DG(void){
    646646
    … …  
    687687}
    688688/*}}}*/
    689 /*FUNCTION Tria::CreatePVectorSlope {{{1*/
     689/*FUNCTION Tria::CreatePVectorSlope {{{*/
    690690ElementVector* Tria::CreatePVectorSlope(void){
    691691
    … …  
    740740}
    741741/*}}}*/
    742 /*FUNCTION Tria::CreateJacobianMatrix{{{1*/
     742/*FUNCTION Tria::CreateJacobianMatrix{{{*/
    743743void  Tria::CreateJacobianMatrix(Matrix* Jff){
    744744
    … …  
    748748        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
    749749
    750         /*Checks in debugging {{{2*/
     750        /*Checks in debugging {{{*/
    751751        _assert_(this->nodes && this->matice && this->matpar && this->parameters && this->inputs);
    752752        /*}}}*/
    … …  
    773773}
    774774/*}}}*/
    775 /*FUNCTION Tria::ComputeBasalStress {{{1*/
     775/*FUNCTION Tria::ComputeBasalStress {{{*/
    776776void  Tria::ComputeBasalStress(Vector* eps){
    777777        _error_("Not Implemented yet");
    778778}
    779779/*}}}*/
    780 /*FUNCTION Tria::ComputeStrainRate {{{1*/
     780/*FUNCTION Tria::ComputeStrainRate {{{*/
    781781void  Tria::ComputeStrainRate(Vector* eps){
    782782        _error_("Not Implemented yet");
    783783}
    784784/*}}}*/
    785 /*FUNCTION Tria::ComputeStressTensor {{{1*/
     785/*FUNCTION Tria::ComputeStressTensor {{{*/
    786786void  Tria::ComputeStressTensor(){
    787787
    … …  
    834834}
    835835/*}}}*/
    836 /*FUNCTION Tria::Configure {{{1*/
     836/*FUNCTION Tria::Configure {{{*/
    837837void  Tria::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    838838       
    … …  
    864864}
    865865/*}}}*/
    866 /*FUNCTION Tria::DeepEcho{{{1*/
     866/*FUNCTION Tria::DeepEcho{{{*/
    867867void Tria::DeepEcho(void){
    868868
    … …  
    899899}
    900900/*}}}*/
    901 /*FUNCTION Tria::DeleteResults {{{1*/
     901/*FUNCTION Tria::DeleteResults {{{*/
    902902void  Tria::DeleteResults(void){
    903903
    … …  
    908908}
    909909/*}}}*/
    910 /*FUNCTION Tria::Echo{{{1*/
     910/*FUNCTION Tria::Echo{{{*/
    911911void Tria::Echo(void){
    912912        printf("Tria:\n");
    … …  
    940940}
    941941/*}}}*/
    942 /*FUNCTION Tria::ObjectEnum{{{1*/
     942/*FUNCTION Tria::ObjectEnum{{{*/
    943943int Tria::ObjectEnum(void){
    944944
    … …  
    947947}
    948948/*}}}*/
    949 /*FUNCTION Tria::GetArea {{{1*/
     949/*FUNCTION Tria::GetArea {{{*/
    950950double Tria::GetArea(void){
    951951
    … …  
    964964}
    965965/*}}}*/
    966 /*FUNCTION Tria::GetDofList {{{1*/
     966/*FUNCTION Tria::GetDofList {{{*/
    967967void  Tria::GetDofList(int** pdoflist, int approximation_enum,int setenum){
    968968
    … …  
    987987}
    988988/*}}}*/
    989 /*FUNCTION Tria::GetDofList1 {{{1*/
     989/*FUNCTION Tria::GetDofList1 {{{*/
    990990void  Tria::GetDofList1(int* doflist){
    991991
    … …  
    995995}
    996996/*}}}*/
    997 /*FUNCTION Tria::GetElementType {{{1*/
     997/*FUNCTION Tria::GetElementType {{{*/
    998998int Tria::GetElementType(){
    999999
    … …  
    10031003}
    10041004/*}}}*/
    1005 /*FUNCTION Tria::GetHorizontalNeighboorSids {{{1*/
     1005/*FUNCTION Tria::GetHorizontalNeighboorSids {{{*/
    10061006int* Tria::GetHorizontalNeighboorSids(){
    10071007
    … …  
    10111011}
    10121012/*}}}*/
    1013 /*FUNCTION Tria::GetNodeIndex {{{1*/
     1013/*FUNCTION Tria::GetNodeIndex {{{*/
    10141014int Tria::GetNodeIndex(Node* node){
    10151015
    … …  
    10221022}
    10231023/*}}}*/
    1024 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/
     1024/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype) {{{*/
    10251025void Tria::GetInputListOnVertices(double* pvalue,int enumtype){
    10261026
    … …  
    10471047}
    10481048/*}}}*/
    1049 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/
     1049/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{*/
    10501050void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){
    10511051
    … …  
    10731073}
    10741074/*}}}*/
    1075 /*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{1*/
     1075/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{*/
    10761076void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index){
    10771077
    … …  
    10991099}
    11001100/*}}}*/
    1101 /*FUNCTION Tria::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/
     1101/*FUNCTION Tria::GetInputValue(double* pvalue,Node* node,int enumtype) {{{*/
    11021102void Tria::GetInputValue(double* pvalue,Node* node,int enumtype){
    11031103
    … …  
    11121112}
    11131113/*}}}*/
    1114 /*FUNCTION Tria::GetSidList {{{1*/
     1114/*FUNCTION Tria::GetSidList {{{*/
    11151115void  Tria::GetSidList(int* sidlist){
    11161116        for(int i=0;i<NUMVERTICES;i++) sidlist[i]=nodes[i]->GetSidList();
    11171117}
    11181118/*}}}*/
    1119 /*FUNCTION Tria::GetConnectivityList {{{1*/
     1119/*FUNCTION Tria::GetConnectivityList {{{*/
    11201120void  Tria::GetConnectivityList(int* connectivity){
    11211121        for(int i=0;i<NUMVERTICES;i++) connectivity[i]=nodes[i]->GetConnectivity();
    11221122}
    11231123/*}}}*/
    1124 /*FUNCTION Tria::GetSolutionFromInputs{{{1*/
     1124/*FUNCTION Tria::GetSolutionFromInputs{{{*/
    11251125void  Tria::GetSolutionFromInputs(Vector* solution){
    11261126
    … …  
    11501150}
    11511151/*}}}*/
    1152 /*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{1*/
     1152/*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{*/
    11531153void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){
    11541154        /*Compute the 2d Strain Rate (3 components):
    … …  
    11721172}
    11731173/*}}}*/
    1174 /*FUNCTION Tria::GetVectorFromInputs{{{1*/
     1174/*FUNCTION Tria::GetVectorFromInputs{{{*/
    11751175void  Tria::GetVectorFromInputs(Vector* vector,int input_enum){
    11761176
    … …  
    11911191}
    11921192/*}}}*/
    1193 /*FUNCTION Tria::GetVectorFromResults{{{1*/
     1193/*FUNCTION Tria::GetVectorFromResults{{{*/
    11941194void  Tria::GetVectorFromResults(Vector* vector,int offset,int interp){
    11951195
    … …  
    12111211}
    12121212/*}}}*/
    1213 /*FUNCTION Tria::Id {{{1*/
     1213/*FUNCTION Tria::Id {{{*/
    12141214int    Tria::Id(){
    12151215       
    … …  
    12181218}
    12191219/*}}}*/
    1220 /*FUNCTION Tria::Sid {{{1*/
     1220/*FUNCTION Tria::Sid {{{*/
    12211221int    Tria::Sid(){
    12221222       
    … …  
    12251225}
    12261226/*}}}*/
    1227 /*FUNCTION Tria::InputArtificialNoise{{{1*/
     1227/*FUNCTION Tria::InputArtificialNoise{{{*/
    12281228void  Tria::InputArtificialNoise(int enum_type,double min,double max){
    12291229
    … …  
    12381238}
    12391239/*}}}*/
    1240 /*FUNCTION Tria::InputConvergence{{{1*/
     1240/*FUNCTION Tria::InputConvergence{{{*/
    12411241bool Tria::InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){
    12421242
    … …  
    12681268}
    12691269/*}}}*/
    1270 /*FUNCTION Tria::InputDepthAverageAtBase {{{1*/
     1270/*FUNCTION Tria::InputDepthAverageAtBase {{{*/
    12711271void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){
    12721272
    … …  
    12971297}
    12981298/*}}}*/
    1299 /*FUNCTION Tria::InputDuplicate{{{1*/
     1299/*FUNCTION Tria::InputDuplicate{{{*/
    13001300void  Tria::InputDuplicate(int original_enum,int new_enum){
    13011301
    … …  
    13051305}
    13061306/*}}}*/
    1307 /*FUNCTION Tria::InputScale{{{1*/
     1307/*FUNCTION Tria::InputScale{{{*/
    13081308void  Tria::InputScale(int enum_type,double scale_factor){
    13091309
    … …  
    13181318}
    13191319/*}}}*/
    1320 /*FUNCTION Tria::InputToResult{{{1*/
     1320/*FUNCTION Tria::InputToResult{{{*/
    13211321void  Tria::InputToResult(int enum_type,int step,double time){
    13221322
    … …  
    13411341}
    13421342/*}}}*/
    1343 /*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{1*/
     1343/*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{*/
    13441344void  Tria::InputUpdateFromConstant(int constant, int name){
    13451345        /*Check that name is an element input*/
    … …  
    13501350}
    13511351/*}}}*/
    1352 /*FUNCTION Tria::InputUpdateFromConstant(double value, int name);{{{1*/
     1352/*FUNCTION Tria::InputUpdateFromConstant(double value, int name);{{{*/
    13531353void  Tria::InputUpdateFromConstant(double constant, int name){
    13541354        /*Check that name is an element input*/
    … …  
    13591359}
    13601360/*}}}*/
    1361 /*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{1*/
     1361/*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{*/
    13621362void  Tria::InputUpdateFromConstant(bool constant, int name){
    13631363        /*Check that name is an element input*/
    … …  
    13681368}
    13691369/*}}}*/
    1370 /*FUNCTION Tria::InputUpdateFromIoModel{{{1*/
     1370/*FUNCTION Tria::InputUpdateFromIoModel{{{*/
    13711371void Tria::InputUpdateFromIoModel(int index, IoModel* iomodel){ //i is the element index
    13721372
    … …  
    14541454}
    14551455/*}}}*/
    1456 /*FUNCTION Tria::InputUpdateFromSolution {{{1*/
     1456/*FUNCTION Tria::InputUpdateFromSolution {{{*/
    14571457void  Tria::InputUpdateFromSolution(double* solution){
    14581458
    … …  
    15091509}
    15101510/*}}}*/
    1511 /*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{1*/
     1511/*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{*/
    15121512void  Tria::InputUpdateFromSolutionOneDof(double* solution,int enum_type){
    15131513
    … …  
    15331533}
    15341534/*}}}*/
    1535 /*FUNCTION Tria::InputUpdateFromSolutionPrognostic{{{1*/
     1535/*FUNCTION Tria::InputUpdateFromSolutionPrognostic{{{*/
    15361536void  Tria::InputUpdateFromSolutionPrognostic(double* solution){
    15371537
    … …  
    16001600}
    16011601/*}}}*/
    1602 /*FUNCTION Tria::InputUpdateFromVector(double* vector, int name, int type);{{{1*/
     1602/*FUNCTION Tria::InputUpdateFromVector(double* vector, int name, int type);{{{*/
    16031603void  Tria::InputUpdateFromVector(double* vector, int name, int type){
    16041604
    … …  
    16321632}
    16331633/*}}}*/
    1634 /*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{1*/
     1634/*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{*/
    16351635void  Tria::InputUpdateFromVector(int* vector, int name, int type){
    16361636        _error_(" not supported yet!");
    16371637}
    16381638/*}}}*/
    1639 /*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/
     1639/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
    16401640void  Tria::InputUpdateFromVector(bool* vector, int name, int type){
    16411641        _error_(" not supported yet!");
    16421642}
    16431643/*}}}*/
    1644 /*FUNCTION Tria::InputCreate(double scalar,int enum,int code);{{{1*/
     1644/*FUNCTION Tria::InputCreate(double scalar,int enum,int code);{{{*/
    16451645void Tria::InputCreate(double scalar,int name,int code){
    16461646
    … …  
    16611661}
    16621662/*}}}*/
    1663 /*FUNCTION Tria::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{1*/
     1663/*FUNCTION Tria::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/
    16641664void Tria::InputCreate(double* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){//index into elements
    16651665
    … …  
    17511751}
    17521752/*}}}*/
    1753 /*FUNCTION Tria::IsInput{{{1*/
     1753/*FUNCTION Tria::IsInput{{{*/
    17541754bool Tria::IsInput(int name){
    17551755        if (
    … …  
    17851785}
    17861786/*}}}*/
    1787 /*FUNCTION Tria::IsOnBed {{{1*/
     1787/*FUNCTION Tria::IsOnBed {{{*/
    17881788bool Tria::IsOnBed(){
    17891789       
    … …  
    17931793}
    17941794/*}}}*/
    1795 /*FUNCTION Tria::IsFloating {{{1*/
     1795/*FUNCTION Tria::IsFloating {{{*/
    17961796bool   Tria::IsFloating(){
    17971797
    … …  
    18011801}
    18021802/*}}}*/
    1803 /*FUNCTION Tria::IsNodeOnShelf {{{1*/
     1803/*FUNCTION Tria::IsNodeOnShelf {{{*/
    18041804bool   Tria::IsNodeOnShelf(){
    18051805
    … …  
    18161816}
    18171817/*}}}*/
    1818 /*FUNCTION Tria::IsNodeOnShelfFromFlags {{{1*/
     1818/*FUNCTION Tria::IsNodeOnShelfFromFlags {{{*/
    18191819bool   Tria::IsNodeOnShelfFromFlags(double* flags){
    18201820
    … …  
    18311831}
    18321832/*}}}*/
    1833 /*FUNCTION Tria::IsOnWater {{{1*/
     1833/*FUNCTION Tria::IsOnWater {{{*/
    18341834bool   Tria::IsOnWater(){
    18351835
    … …  
    18901890
    18911891}/*}}}*/
    1892 /*FUNCTION Tria::MigrateGroundingLine{{{1*/
     1892/*FUNCTION Tria::MigrateGroundingLine{{{*/
    18931893void  Tria::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){
    18941894
    … …  
    19661966}
    19671967/*}}}*/
    1968 /*FUNCTION Tria::MyRank {{{1*/
     1968/*FUNCTION Tria::MyRank {{{*/
    19691969int    Tria::MyRank(void){
    19701970        extern int my_rank;
    … …  
    19721972}
    19731973/*}}}*/
    1974 /*FUNCTION Tria::NodalValue {{{1*/
     1974/*FUNCTION Tria::NodalValue {{{*/
    19751975int    Tria::NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units){
    19761976
    … …  
    20032003}
    20042004/*}}}*/
    2005 /*FUNCTION Tria::PatchFill{{{1*/
     2005/*FUNCTION Tria::PatchFill{{{*/
    20062006void  Tria::PatchFill(int* prow, Patch* patch){
    20072007
    … …  
    20302030}
    20312031/*}}}*/
    2032 /*FUNCTION Tria::PatchSize{{{1*/
     2032/*FUNCTION Tria::PatchSize{{{*/
    20332033void  Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){
    20342034
    … …  
    20542054}
    20552055/*}}}*/
    2056 /*FUNCTION Tria::PotentialSheetUngrounding{{{1*/
     2056/*FUNCTION Tria::PotentialSheetUngrounding{{{*/
    20572057void  Tria::PotentialSheetUngrounding(Vector* potential_sheet_ungrounding){
    20582058
    … …  
    20832083}
    20842084/*}}}*/
    2085 /*FUNCTION Tria::PositiveDegreeDay{{{1*/
     2085/*FUNCTION Tria::PositiveDegreeDay{{{*/
    20862086void  Tria::PositiveDegreeDay(double* pdds,double* pds,double signorm){
    20872087
    … …  
    23182318}
    23192319/*}}}*/
    2320 /*FUNCTION Tria::ProcessResultsUnits{{{1*/
     2320/*FUNCTION Tria::ProcessResultsUnits{{{*/
    23212321void  Tria::ProcessResultsUnits(void){
    23222322
    … …  
    23292329}
    23302330/*}}}*/
    2331 /*FUNCTION Tria::RequestedOutput{{{1*/
     2331/*FUNCTION Tria::RequestedOutput{{{*/
    23322332void Tria::RequestedOutput(int output_enum,int step,double time){
    23332333
    … …  
    23572357}
    23582358/*}}}*/
    2359 /*FUNCTION Tria::SetClone {{{1*/
     2359/*FUNCTION Tria::SetClone {{{*/
    23602360void  Tria::SetClone(int* minranks){
    23612361
    23622362        _error_("not implemented yet");
    23632363}
    2364 /*}}}1*/
    2365 /*FUNCTION Tria::SmearFunction {{{1*/
     2364/*}}}*/
     2365/*FUNCTION Tria::SmearFunction {{{*/
    23662366void  Tria::SmearFunction(Vector*  smearedvector,double (*WeightFunction)(double distance,double radius),double radius){
    23672367        _error_("not implemented yet");
    23682368
    23692369}
    2370 /*}}}1*/
    2371 /*FUNCTION Tria::SetCurrentConfiguration {{{1*/
     2370/*}}}*/
     2371/*FUNCTION Tria::SetCurrentConfiguration {{{*/
    23722372void  Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){
    23732373       
    … …  
    23852385}
    23862386/*}}}*/
    2387 /*FUNCTION Tria::SurfaceArea {{{1*/
     2387/*FUNCTION Tria::SurfaceArea {{{*/
    23882388double Tria::SurfaceArea(void){
    23892389
    … …  
    24142414}
    24152415/*}}}*/
    2416 /*FUNCTION Tria::SurfaceNormal{{{1*/
     2416/*FUNCTION Tria::SurfaceNormal{{{*/
    24172417void Tria::SurfaceNormal(double* surface_normal, double xyz_list[3][3]){
    24182418
    … …  
    24382438}
    24392439/*}}}*/
    2440 /*FUNCTION Tria::TimeAdapt{{{1*/
     2440/*FUNCTION Tria::TimeAdapt{{{*/
    24412441double  Tria::TimeAdapt(void){
    24422442
    … …  
    24842484}
    24852485/*}}}*/
    2486 /*FUNCTION Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){{{1*/
     2486/*FUNCTION Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){{{*/
    24872487void Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ //i is the element index
    24882488
    … …  
    24982498
    24992499        /*Checks if debuging*/
    2500         /*{{{2*/
     2500        /*{{{*/
    25012501        _assert_(iomodel->Data(MeshElementsEnum));
    25022502        /*}}}*/
    … …  
    25842584}
    25852585/*}}}*/
    2586 /*FUNCTION Tria::UpdatePotentialSheetUngrounding{{{1*/
     2586/*FUNCTION Tria::UpdatePotentialSheetUngrounding{{{*/
    25872587int Tria::UpdatePotentialSheetUngrounding(double* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,double* nodes_on_iceshelf){
    25882588
    … …  
    26062606
    26072607#ifdef _HAVE_RESPONSES_
    2608 /*FUNCTION Tria::IceVolume {{{1*/
     2608/*FUNCTION Tria::IceVolume {{{*/
    26092609double Tria::IceVolume(void){
    26102610
    … …  
    26322632}
    26332633/*}}}*/
    2634 /*FUNCTION Tria::MassFlux {{{1*/
     2634/*FUNCTION Tria::MassFlux {{{*/
    26352635double Tria::MassFlux( double* segment,bool process_units){
    26362636
    … …  
    27042704}
    27052705/*}}}*/
    2706 /*FUNCTION Tria::MaxAbsVx{{{1*/
     2706/*FUNCTION Tria::MaxAbsVx{{{*/
    27072707void  Tria::MaxAbsVx(double* pmaxabsvx, bool process_units){
    27082708
    … …  
    27172717}
    27182718/*}}}*/
    2719 /*FUNCTION Tria::MaxAbsVy{{{1*/
     2719/*FUNCTION Tria::MaxAbsVy{{{*/
    27202720void  Tria::MaxAbsVy(double* pmaxabsvy, bool process_units){
    27212721
    … …  
    27302730}
    27312731/*}}}*/
    2732 /*FUNCTION Tria::MaxAbsVz{{{1*/
     2732/*FUNCTION Tria::MaxAbsVz{{{*/
    27332733void  Tria::MaxAbsVz(double* pmaxabsvz, bool process_units){
    27342734
    … …  
    27432743}
    27442744/*}}}*/
    2745 /*FUNCTION Tria::MaxVel{{{1*/
     2745/*FUNCTION Tria::MaxVel{{{*/
    27462746void  Tria::MaxVel(double* pmaxvel, bool process_units){
    27472747
    … …  
    27562756}
    27572757/*}}}*/
    2758 /*FUNCTION Tria::MaxVx{{{1*/
     2758/*FUNCTION Tria::MaxVx{{{*/
    27592759void  Tria::MaxVx(double* pmaxvx, bool process_units){
    27602760
    … …  
    27692769}
    27702770/*}}}*/
    2771 /*FUNCTION Tria::MaxVy{{{1*/
     2771/*FUNCTION Tria::MaxVy{{{*/
    27722772void  Tria::MaxVy(double* pmaxvy, bool process_units){
    27732773
    … …  
    27832783}
    27842784/*}}}*/
    2785 /*FUNCTION Tria::MaxVz{{{1*/
     2785/*FUNCTION Tria::MaxVz{{{*/
    27862786void  Tria::MaxVz(double* pmaxvz, bool process_units){
    27872787
    … …  
    27962796}
    27972797/*}}}*/
    2798 /*FUNCTION Tria::MinVel{{{1*/
     2798/*FUNCTION Tria::MinVel{{{*/
    27992799void  Tria::MinVel(double* pminvel, bool process_units){
    28002800
    … …  
    28092809}
    28102810/*}}}*/
    2811 /*FUNCTION Tria::MinVx{{{1*/
     2811/*FUNCTION Tria::MinVx{{{*/
    28122812void  Tria::MinVx(double* pminvx, bool process_units){
    28132813
    … …  
    28222822}
    28232823/*}}}*/
    2824 /*FUNCTION Tria::MinVy{{{1*/
     2824/*FUNCTION Tria::MinVy{{{*/
    28252825void  Tria::MinVy(double* pminvy, bool process_units){
    28262826
    … …  
    28352835}
    28362836/*}}}*/
    2837 /*FUNCTION Tria::MinVz{{{1*/
     2837/*FUNCTION Tria::MinVz{{{*/
    28382838void  Tria::MinVz(double* pminvz, bool process_units){
    28392839
    … …  
    28482848}
    28492849/*}}}*/
    2850 /*FUNCTION Tria::ElementResponse{{{1*/
     2850/*FUNCTION Tria::ElementResponse{{{*/
    28512851void Tria::ElementResponse(double* presponse,int response_enum,bool process_units){
    28522852
    … …  
    28782878
    28792879#ifdef _HAVE_DIAGNOSTIC_
    2880 /*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{1*/
     2880/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{*/
    28812881ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyeal(void){
    28822882
    … …  
    28922892}
    28932893/*}}}*/
    2894 /*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealViscous{{{1*/
     2894/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealViscous{{{*/
    28952895ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealViscous(void){
    28962896
    … …  
    29562956}
    29572957/*}}}*/
    2958 /*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealFriction {{{1*/
     2958/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealFriction {{{*/
    29592959ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealFriction(void){
    29602960
    … …  
    30253025}
    30263026/*}}}*/
    3027 /*FUNCTION Tria::CreateKMatrixDiagnosticHutter{{{1*/
     3027/*FUNCTION Tria::CreateKMatrixDiagnosticHutter{{{*/
    30283028ElementMatrix* Tria::CreateKMatrixDiagnosticHutter(void){
    30293029
    … …  
    30463046}
    30473047/*}}}*/
    3048 /*FUNCTION Tria::CreatePVectorDiagnosticMacAyeal {{{1*/
     3048/*FUNCTION Tria::CreatePVectorDiagnosticMacAyeal {{{*/
    30493049ElementVector* Tria::CreatePVectorDiagnosticMacAyeal(){
    30503050
    … …  
    31003100}
    31013101/*}}}*/
    3102 /*FUNCTION Tria::CreatePVectorDiagnosticHutter{{{1*/
     3102/*FUNCTION Tria::CreatePVectorDiagnosticHutter{{{*/
    31033103ElementVector* Tria::CreatePVectorDiagnosticHutter(void){
    31043104
    … …  
    31503150}
    31513151/*}}}*/
    3152 /*FUNCTION Tria::CreateJacobianDiagnosticMacayeal{{{1*/
     3152/*FUNCTION Tria::CreateJacobianDiagnosticMacayeal{{{*/
    31533153ElementMatrix* Tria::CreateJacobianDiagnosticMacayeal(void){
    31543154
    … …  
    32163216}
    32173217/*}}}*/
    3218 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/
     3218/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{*/
    32193219void  Tria::GetSolutionFromInputsDiagnosticHoriz(Vector* solution){
    32203220
    … …  
    32553255}
    32563256/*}}}*/
    3257 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{1*/
     3257/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{*/
    32583258void  Tria::GetSolutionFromInputsDiagnosticHutter(Vector* solution){
    32593259
    … …  
    32943294}
    32953295/*}}}*/
    3296 /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{1*/
     3296/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{*/
    32973297void  Tria::InputUpdateFromSolutionDiagnosticHoriz(double* solution){
    32983298       
    … …  
    33573357}
    33583358/*}}}*/
    3359 /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{1*/
     3359/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{*/
    33603360void  Tria::InputUpdateFromSolutionDiagnosticHutter(double* solution){
    33613361       
    … …  
    34193419
    34203420#ifdef _HAVE_CONTROL_
    3421 /*FUNCTION Tria::InputControlUpdate{{{1*/
     3421/*FUNCTION Tria::InputControlUpdate{{{*/
    34223422void  Tria::InputControlUpdate(double scalar,bool save_parameter){
    34233423
    … …  
    34543454}
    34553455/*}}}*/
    3456 /*FUNCTION Tria::ControlInputGetGradient{{{1*/
     3456/*FUNCTION Tria::ControlInputGetGradient{{{*/
    34573457void Tria::ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){
    34583458
    … …  
    34733473
    34743474}/*}}}*/
    3475 /*FUNCTION Tria::ControlInputScaleGradient{{{1*/
     3475/*FUNCTION Tria::ControlInputScaleGradient{{{*/
    34763476void Tria::ControlInputScaleGradient(int enum_type,double scale){
    34773477
    … …  
    34893489        ((ControlInput*)input)->ScaleGradient(scale);
    34903490}/*}}}*/
    3491 /*FUNCTION Tria::ControlInputSetGradient{{{1*/
     3491/*FUNCTION Tria::ControlInputSetGradient{{{*/
    34923492void Tria::ControlInputSetGradient(double* gradient,int enum_type,int control_index){
    34933493
    … …  
    35133513
    35143514}/*}}}*/
    3515 /*FUNCTION Tria::Gradj {{{1*/
     3515/*FUNCTION Tria::Gradj {{{*/
    35163516void  Tria::Gradj(Vector* gradient,int control_type,int control_index){
    35173517        /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/
    … …  
    35723572}
    35733573/*}}}*/
    3574 /*FUNCTION Tria::GradjBGradient{{{1*/
     3574/*FUNCTION Tria::GradjBGradient{{{*/
    35753575void  Tria::GradjBGradient(Vector* gradient,int weight_index,int control_index){
    35763576
    … …  
    36123612}
    36133613/*}}}*/
    3614 /*FUNCTION Tria::GradjBMacAyeal{{{1*/
     3614/*FUNCTION Tria::GradjBMacAyeal{{{*/
    36153615void  Tria::GradjBMacAyeal(Vector* gradient,int control_index){
    36163616
    … …  
    36693669}
    36703670/*}}}*/
    3671 /*FUNCTION Tria::GradjDragMacAyeal {{{1*/
     3671/*FUNCTION Tria::GradjDragMacAyeal {{{*/
    36723672void  Tria::GradjDragMacAyeal(Vector* gradient,int control_index){
    36733673
    … …  
    37573757}
    37583758/*}}}*/
    3759 /*FUNCTION Tria::GradjDragGradient{{{1*/
     3759/*FUNCTION Tria::GradjDragGradient{{{*/
    37603760void  Tria::GradjDragGradient(Vector* gradient, int weight_index,int control_index){
    37613761
    … …  
    38013801}
    38023802/*}}}*/
    3803 /*FUNCTION Tria::GradjDhDtBalancedthickness{{{1*/
     3803/*FUNCTION Tria::GradjDhDtBalancedthickness{{{*/
    38043804void  Tria::GradjDhDtBalancedthickness(Vector* gradient,int control_index){
    38053805
    … …  
    38173817}
    38183818/*}}}*/
    3819 /*FUNCTION Tria::GradjVxBalancedthickness{{{1*/
     3819/*FUNCTION Tria::GradjVxBalancedthickness{{{*/
    38203820void  Tria::GradjVxBalancedthickness(Vector* gradient,int control_index){
    38213821
    … …  
    38603860}
    38613861/*}}}*/
    3862 /*FUNCTION Tria::GradjVyBalancedthickness{{{1*/
     3862/*FUNCTION Tria::GradjVyBalancedthickness{{{*/
    38633863void  Tria::GradjVyBalancedthickness(Vector* gradient,int control_index){
    38643864
    … …  
    39023902}
    39033903/*}}}*/
    3904 /*FUNCTION Tria::GradientIndexing{{{1*/
     3904/*FUNCTION Tria::GradientIndexing{{{*/
    39053905void  Tria::GradientIndexing(int* indexing,int control_index){
    39063906
    … …  
    39163916}
    39173917/*}}}*/
    3918 /*FUNCTION Tria::RheologyBbarAbsGradient{{{1*/
     3918/*FUNCTION Tria::RheologyBbarAbsGradient{{{*/
    39193919double Tria::RheologyBbarAbsGradient(bool process_units,int weight_index){
    39203920
    … …  
    39603960}
    39613961/*}}}*/
    3962 /*FUNCTION Tria::SurfaceAverageVelMisfit {{{1*/
     3962/*FUNCTION Tria::SurfaceAverageVelMisfit {{{*/
    39633963double Tria::SurfaceAverageVelMisfit(bool process_units,int weight_index){
    39643964
    … …  
    40214021}
    40224022/*}}}*/
    4023 /*FUNCTION Tria::SurfaceLogVelMisfit {{{1*/
     4023/*FUNCTION Tria::SurfaceLogVelMisfit {{{*/
    40244024double Tria::SurfaceLogVelMisfit(bool process_units,int weight_index){
    40254025
    … …  
    40864086}
    40874087/*}}}*/
    4088 /*FUNCTION Tria::SurfaceLogVxVyMisfit {{{1*/
     4088/*FUNCTION Tria::SurfaceLogVxVyMisfit {{{*/
    40894089double Tria::SurfaceLogVxVyMisfit(bool process_units,int weight_index){
    40904090
    … …  
    41524152}
    41534153/*}}}*/
    4154 /*FUNCTION Tria::SurfaceAbsVelMisfit {{{1*/
     4154/*FUNCTION Tria::SurfaceAbsVelMisfit {{{*/
    41554155double Tria::SurfaceAbsVelMisfit(bool process_units,int weight_index){
    41564156
    … …  
    42134213}
    42144214/*}}}*/
    4215 /*FUNCTION Tria::SurfaceRelVelMisfit {{{1*/
     4215/*FUNCTION Tria::SurfaceRelVelMisfit {{{*/
    42164216double Tria::SurfaceRelVelMisfit(bool process_units,int weight_index){
    42174217        const int  numdof=2*NUMVERTICES;
    … …  
    42774277}
    42784278/*}}}*/
    4279 /*FUNCTION Tria::ThicknessAbsGradient{{{1*/
     4279/*FUNCTION Tria::ThicknessAbsGradient{{{*/
    42804280double Tria::ThicknessAbsGradient(bool process_units,int weight_index){
    42814281
    … …  
    43214321}
    43224322/*}}}*/
    4323 /*FUNCTION Tria::ThicknessAbsMisfit {{{1*/
     4323/*FUNCTION Tria::ThicknessAbsMisfit {{{*/
    43244324double Tria::ThicknessAbsMisfit(bool process_units,int weight_index){
    43254325
    … …  
    43664366}
    43674367/*}}}*/
    4368 /*FUNCTION Tria::CreatePVectorAdjointBalancethickness{{{1*/
     4368/*FUNCTION Tria::CreatePVectorAdjointBalancethickness{{{*/
    43694369ElementVector* Tria::CreatePVectorAdjointBalancethickness(void){
    43704370
    … …  
    44324432}
    44334433/*}}}*/
    4434 /*FUNCTION Tria::CreatePVectorAdjointHoriz{{{1*/
     4434/*FUNCTION Tria::CreatePVectorAdjointHoriz{{{*/
    44354435ElementVector* Tria::CreatePVectorAdjointHoriz(void){
    44364436
    … …  
    46114611}
    46124612/*}}}*/
    4613 /*FUNCTION Tria::CreatePVectorAdjointStokes{{{1*/
     4613/*FUNCTION Tria::CreatePVectorAdjointStokes{{{*/
    46144614ElementVector* Tria::CreatePVectorAdjointStokes(void){
    46154615
    … …  
    47884788}
    47894789/*}}}*/
    4790 /*FUNCTION Tria::DragCoefficientAbsGradient{{{1*/
     4790/*FUNCTION Tria::DragCoefficientAbsGradient{{{*/
    47914791double Tria::DragCoefficientAbsGradient(bool process_units,int weight_index){
    47924792
    … …  
    48324832}
    48334833/*}}}*/
    4834 /*FUNCTION Tria::CreateKMatrixAdjointBalancethickness {{{1*/
     4834/*FUNCTION Tria::CreateKMatrixAdjointBalancethickness {{{*/
    48354835ElementMatrix* Tria::CreateKMatrixAdjointBalancethickness(void){
    48364836
    … …  
    48544854}
    48554855/*}}}*/
    4856 /*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{1*/
     4856/*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{*/
    48574857ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){
    48584858
    … …  
    49244924}
    49254925/*}}}*/
    4926 /*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{1*/
     4926/*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{*/
    49274927void  Tria::InputUpdateFromSolutionAdjointHoriz(double* solution){
    49284928
    … …  
    49604960/*}}}*/
    49614961
    4962 /*FUNCTION Tria::InputUpdateFromSolutionAdjointBalancethickness {{{1*/
     4962/*FUNCTION Tria::InputUpdateFromSolutionAdjointBalancethickness {{{*/
    49634963void  Tria::InputUpdateFromSolutionAdjointBalancethickness(double* solution){
    49644964
    … …  
    49894989}
    49904990/*}}}*/
    4991 /*FUNCTION Tria::GetVectorFromControlInputs{{{1*/
     4991/*FUNCTION Tria::GetVectorFromControlInputs{{{*/
    49924992void  Tria::GetVectorFromControlInputs(Vector* vector,int control_enum,int control_index,const char* data){
    49934993
    … …  
    50175017}
    50185018/*}}}*/
    5019 /*FUNCTION Tria::SetControlInputsFromVector{{{1*/
     5019/*FUNCTION Tria::SetControlInputsFromVector{{{*/
    50205020void  Tria::SetControlInputsFromVector(double* vector,int control_enum,int control_index){
    50215021
    … …  
    50545054
    50555055#ifdef _HAVE_HYDROLOGY_
    5056 /*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{1*/
     5056/*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{*/
    50575057void Tria::CreateHydrologyWaterVelocityInput(void){
    50585058
    … …  
    51095109}
    51105110/*}}}*/
    5111 /*FUNCTION Tria::CreateKMatrixHydrology{{{1*/
     5111/*FUNCTION Tria::CreateKMatrixHydrology{{{*/
    51125112ElementMatrix* Tria::CreateKMatrixHydrology(void){
    51135113
    … …  
    52145214}
    52155215/*}}}*/
    5216 /*FUNCTION Tria::CreatePVectorHydrology {{{1*/
     5216/*FUNCTION Tria::CreatePVectorHydrology {{{*/
    52175217ElementVector* Tria::CreatePVectorHydrology(void){
    52185218
    … …  
    52635263}
    52645264/*}}}*/
    5265 /*FUNCTION Tria::GetSolutionFromInputsHydrology{{{1*/
     5265/*FUNCTION Tria::GetSolutionFromInputsHydrology{{{*/
    52665266void  Tria::GetSolutionFromInputsHydrology(Vector* solution){
    52675267
    … …  
    52995299}
    53005300/*}}}*/
    5301 /*FUNCTION Tria::InputUpdateFromSolutionHydrology{{{1*/
     5301/*FUNCTION Tria::InputUpdateFromSolutionHydrology{{{*/
    53025302void  Tria::InputUpdateFromSolutionHydrology(double* solution){
    53035303
    … …  
    53305330
    53315331#ifdef _HAVE_DAKOTA_
    5332 /*FUNCTION Tria::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/
     5332/*FUNCTION Tria::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{*/
    53335333void  Tria::InputUpdateFromVectorDakota(double* vector, int name, int type){
    53345334       
    … …  
    53535353                        switch(name){
    53545354                                case ThicknessEnum:
    5355                                         /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{2*/
     5355                                        /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/
    53565356                                        double  thickness[3];
    53575357                                        double  thickness_init[3];
    … …  
    54325432}
    54335433/*}}}*/
    5434 /*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/
     5434/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
    54355435void  Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){
    54365436        _error_(" not supported yet!");
    54375437}
    54385438/*}}}*/
    5439 /*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/
     5439/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
    54405440void  Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    54415441        _error_(" not supported yet!");
    54425442}
    54435443/*}}}*/
    5444 /*FUNCTION Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{1*/
     5444/*FUNCTION Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{*/
    54455445void  Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){
    54465446       
    … …  
    54895489
    54905490#ifdef _HAVE_BALANCED_
    5491 /*FUNCTION Tria::CreateKMatrixBalancethickness {{{1*/
     5491/*FUNCTION Tria::CreateKMatrixBalancethickness {{{*/
    54925492ElementMatrix* Tria::CreateKMatrixBalancethickness(void){
    54935493
    … …  
    55035503}
    55045504/*}}}*/
    5505 /*FUNCTION Tria::CreateKMatrixBalancethickness_CG {{{1*/
     5505/*FUNCTION Tria::CreateKMatrixBalancethickness_CG {{{*/
    55065506ElementMatrix* Tria::CreateKMatrixBalancethickness_CG(void){
    55075507
    … …  
    56135613}
    56145614/*}}}*/
    5615 /*FUNCTION Tria::CreateKMatrixBalancethickness_DG {{{1*/
     5615/*FUNCTION Tria::CreateKMatrixBalancethickness_DG {{{*/
    56165616ElementMatrix* Tria::CreateKMatrixBalancethickness_DG(void){
    56175617
    … …  
    56675667}
    56685668/*}}}*/
    5669 /*FUNCTION Tria::CreatePVectorBalancethickness{{{1*/
     5669/*FUNCTION Tria::CreatePVectorBalancethickness{{{*/
    56705670ElementVector* Tria::CreatePVectorBalancethickness(void){
    56715671
    … …  
    56815681}
    56825682/*}}}*/
    5683 /*FUNCTION Tria::CreatePVectorBalancethickness_CG{{{1*/
     5683/*FUNCTION Tria::CreatePVectorBalancethickness_CG{{{*/
    56845684ElementVector* Tria::CreatePVectorBalancethickness_CG(void){
    56855685
    … …  
    57245724}
    57255725/*}}}*/
    5726 /*FUNCTION Tria::CreatePVectorBalancethickness_DG {{{1*/
     5726/*FUNCTION Tria::CreatePVectorBalancethickness_DG {{{*/
    57275727ElementVector* Tria::CreatePVectorBalancethickness_DG(void){
    57285728

  • issm/trunk-jpl/src/c/objects/Elements/Tria.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Element.h"
    1111#include "./TriaHook.h"
    … …  
    4141                Results    *results;
    4242
    43                 /*Tria constructors, destructors {{{1*/
     43                /*Tria constructors, destructors {{{*/
    4444                Tria();
    4545                Tria(int tria_id,int tria_sid,int i, IoModel* iomodel,int nummodels);
    4646                ~Tria();
    4747                /*}}}*/
    48                 /*Object virtual functions definitions:{{{1 */
     48                /*Object virtual functions definitions:{{{ */
    4949                void  Echo();
    5050                void  DeepEcho();
    … …  
    5454                Object* copy();
    5555                /*}}}*/
    56                 /*Update virtual functions resolution: {{{1*/
     56                /*Update virtual functions resolution: {{{*/
    5757                void  InputUpdateFromSolution(double* solutiong);
    5858                void  InputUpdateFromVector(double* vector, int name, int type);
    … …  
    7070                void  InputUpdateFromIoModel(int index, IoModel* iomodel);
    7171                /*}}}*/
    72                 /*Element virtual functions definitions: {{{1*/
     72                /*Element virtual functions definitions: {{{*/
    7373                void   AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part);
    7474                void   ComputeBasalStress(Vector* sigma_b);
    … …  
    164164
    165165                /*}}}*/
    166                 /*Tria specific routines:{{{1*/
     166                /*Tria specific routines:{{{*/
    167167                ElementMatrix* CreateKMatrixBalancethickness(void);
    168168                ElementMatrix* CreateKMatrixBalancethickness_DG(void);

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

    r9725 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Object constructors and destructor*/
    23 /*FUNCTION TriaHook::TriaHook(){{{1*/
     23/*FUNCTION TriaHook::TriaHook(){{{*/
    2424TriaHook::TriaHook(){
    2525        numanalyses=UNDEF;
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION TriaHook::~TriaHook(){{{1*/
     31/*FUNCTION TriaHook::~TriaHook(){{{*/
    3232TriaHook::~TriaHook(){
    3333        int i;
    … …  
    4242}
    4343/*}}}*/
    44 /*FUNCTION TriaHook::TriaHook(int in_numanalyses,int matice_id, int matpar_id){{{1*/
     44/*FUNCTION TriaHook::TriaHook(int in_numanalyses,int matice_id, int matpar_id){{{*/
    4545TriaHook::TriaHook(int in_numanalyses,int matice_id, IoModel* iomodel){
    4646
    … …  
    6464/*}}}*/
    6565
    66 /*FUNCTION TriaHook::SetHookNodes{{{1*/
     66/*FUNCTION TriaHook::SetHookNodes{{{*/
    6767void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){
    6868

  • issm/trunk-jpl/src/c/objects/Elements/TriaHook.h

    r9356 r12365  
    1818
    1919
    20                 /*FUNCTION constructors, destructors {{{1*/
     20                /*FUNCTION constructors, destructors {{{*/
    2121                TriaHook();
    2222                TriaHook(int in_numanalyses,int matice_id, IoModel* iomodel);

  • issm/trunk-jpl/src/c/objects/Elements/TriaRef.cpp

    r10135 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2424
    2525/*Object constructors and destructor*/
    26 /*FUNCTION TriaRef::TriaRef(){{{1*/
     26/*FUNCTION TriaRef::TriaRef(){{{*/
    2727TriaRef::TriaRef(){
    2828        this->element_type_list=NULL;
    2929}
    3030/*}}}*/
    31 /*FUNCTION TriaRef::TriaRef(int* types,int nummodels){{{1*/
     31/*FUNCTION TriaRef::TriaRef(int* types,int nummodels){{{*/
    3232
    3333TriaRef::TriaRef(const int nummodels){
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION TriaRef::~TriaRef(){{{1*/
     40/*FUNCTION TriaRef::~TriaRef(){{{*/
    4141TriaRef::~TriaRef(){
    4242        xfree((void**)&element_type_list);
    … …  
    4545
    4646/*Management*/
    47 /*FUNCTION TriaRef::SetElementType{{{1*/
     47/*FUNCTION TriaRef::SetElementType{{{*/
    4848void TriaRef::SetElementType(int type,int type_counter){
    4949
    … …  
    5656
    5757/*Reference Element numerics*/
    58 /*FUNCTION TriaRef::GetBMacAyeal {{{1*/
     58/*FUNCTION TriaRef::GetBMacAyeal {{{*/
    5959void TriaRef::GetBMacAyeal(double* B, double* xyz_list, GaussTria* gauss){
    6060        /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2.
    … …  
    8686}
    8787/*}}}*/
    88 /*FUNCTION TriaRef::GetBMacAyealStokes {{{1*/
     88/*FUNCTION TriaRef::GetBMacAyealStokes {{{*/
    8989void TriaRef::GetBMacAyealStokes(double* B, double* xyz_list, GaussTria* gauss){
    9090
    … …  
    117117}
    118118/*}}}*/
    119 /*FUNCTION TriaRef::GetSegmentBFlux{{{1*/
     119/*FUNCTION TriaRef::GetSegmentBFlux{{{*/
    120120void TriaRef::GetSegmentBFlux(double* B,GaussTria* gauss, int index1,int index2){
    121121        /*Compute B  matrix. B=[phi1 phi2 -phi3 -phi4]
    … …  
    136136}
    137137/*}}}*/
    138 /*FUNCTION TriaRef::GetSegmentBprimeFlux{{{1*/
     138/*FUNCTION TriaRef::GetSegmentBprimeFlux{{{*/
    139139void TriaRef::GetSegmentBprimeFlux(double* Bprime,GaussTria* gauss, int index1,int index2){
    140140        /*Compute Bprime  matrix. Bprime=[phi1 phi2 phi3 phi4]
    … …  
    155155}
    156156/*}}}*/
    157 /*FUNCTION TriaRef::GetBPrognostic{{{1*/
     157/*FUNCTION TriaRef::GetBPrognostic{{{*/
    158158void TriaRef::GetBPrognostic(double* B_prog, double* xyz_list, GaussTria* gauss){
    159159        /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2.
    … …  
    179179}
    180180/*}}}*/
    181 /*FUNCTION TriaRef::GetBprimeMacAyeal {{{1*/
     181/*FUNCTION TriaRef::GetBprimeMacAyeal {{{*/
    182182void TriaRef::GetBprimeMacAyeal(double* Bprime, double* xyz_list, GaussTria* gauss){
    183183
    … …  
    210210}
    211211/*}}}*/
    212 /*FUNCTION TriaRef::GetBprimeMacAyealStokes {{{1*/
     212/*FUNCTION TriaRef::GetBprimeMacAyealStokes {{{*/
    213213void TriaRef::GetBprimeMacAyealStokes(double* Bprime, double* xyz_list, GaussTria* gauss){
    214214
    … …  
    244244}
    245245/*}}}*/
    246 /*FUNCTION TriaRef::GetBprimePrognostic{{{1*/
     246/*FUNCTION TriaRef::GetBprimePrognostic{{{*/
    247247void TriaRef::GetBprimePrognostic(double* Bprime_prog, double* xyz_list, GaussTria* gauss){
    248248        /*Compute B'  matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2.
    … …  
    269269}
    270270/*}}}*/
    271 /*FUNCTION TriaRef::GetL{{{1*/
     271/*FUNCTION TriaRef::GetL{{{*/
    272272void TriaRef::GetL(double* L, double* xyz_list,GaussTria* gauss,int numdof){
    273273        /*Compute L  matrix. L=[L1 L2 L3] where Li is square and of size numdof.
    … …  
    306306}
    307307/*}}}*/
    308 /*FUNCTION TriaRef::GetJacobian{{{1*/
     308/*FUNCTION TriaRef::GetJacobian{{{*/
    309309void TriaRef::GetJacobian(double* J, double* xyz_list,GaussTria* gauss){
    310310        /*The Jacobian is constant over the element, discard the gaussian points.
    … …  
    326326}
    327327/*}}}*/
    328 /*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{1*/
     328/*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{*/
    329329void TriaRef::GetSegmentJacobianDeterminant(double* Jdet, double* xyz_list,GaussTria* gauss){
    330330        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    … …  
    342342}
    343343/*}}}*/
    344 /*FUNCTION TriaRef::GetJacobianDeterminant2d{{{1*/
     344/*FUNCTION TriaRef::GetJacobianDeterminant2d{{{*/
    345345void TriaRef::GetJacobianDeterminant2d(double* Jdet, double* xyz_list,GaussTria* gauss){
    346346        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    … …  
    357357}
    358358/*}}}*/
    359 /*FUNCTION TriaRef::GetJacobianDeterminant3d {{{1*/
     359/*FUNCTION TriaRef::GetJacobianDeterminant3d {{{*/
    360360void TriaRef::GetJacobianDeterminant3d(double*  Jdet, double* xyz_list,GaussTria* gauss){
    361361        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    … …  
    379379}
    380380/*}}}*/
    381 /*FUNCTION TriaRef::GetJacobianInvert{{{1*/
     381/*FUNCTION TriaRef::GetJacobianInvert{{{*/
    382382void TriaRef::GetJacobianInvert(double*  Jinv, double* xyz_list,GaussTria* gauss){
    383383
    … …  
    393393}
    394394/*}}}*/
    395 /*FUNCTION TriaRef::GetNodalFunctions{{{1*/
     395/*FUNCTION TriaRef::GetNodalFunctions{{{*/
    396396void TriaRef::GetNodalFunctions(double* basis,GaussTria* gauss){
    397397        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    403403}
    404404/*}}}*/
    405 /*FUNCTION TriaRef::GetSegmentNodalFunctions{{{1*/
     405/*FUNCTION TriaRef::GetSegmentNodalFunctions{{{*/
    406406void TriaRef::GetSegmentNodalFunctions(double* basis,GaussTria* gauss,int index1,int index2){
    407407        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    … …  
    417417}
    418418/*}}}*/
    419 /*FUNCTION TriaRef::GetNodalFunctionsDerivatives{{{1*/
     419/*FUNCTION TriaRef::GetNodalFunctionsDerivatives{{{*/
    420420void TriaRef::GetNodalFunctionsDerivatives(double* dbasis,double* xyz_list, GaussTria* gauss){
    421421
    … …  
    444444}
    445445/*}}}*/
    446 /*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference{{{1*/
     446/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference{{{*/
    447447void TriaRef::GetNodalFunctionsDerivativesReference(double* dl1dl3,GaussTria* gauss){
    448448        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    463463}
    464464/*}}}*/
    465 /*FUNCTION TriaRef::GetInputDerivativeValue{{{1*/
     465/*FUNCTION TriaRef::GetInputDerivativeValue{{{*/
    466466void TriaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussTria* gauss){
    467467
    … …  
    486486}
    487487/*}}}*/
    488 /*FUNCTION TriaRef::GetInputValue{{{1*/
     488/*FUNCTION TriaRef::GetInputValue{{{*/
    489489void TriaRef::GetInputValue(double* p, double* plist, GaussTria* gauss){
    490490

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*BoolExternalResult constructors and destructor*/
    23 /*FUNCTION BoolExternalResult::BoolExternalResult(){{{1*/
     23/*FUNCTION BoolExternalResult::BoolExternalResult(){{{*/
    2424BoolExternalResult::BoolExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{1*/
     28/*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{*/
    2929BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, double in_time){
    3030
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION BoolExternalResult::~BoolExternalResult(){{{1*/
     38/*FUNCTION BoolExternalResult::~BoolExternalResult(){{{*/
    3939BoolExternalResult::~BoolExternalResult(){
    4040        return;
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION BoolExternalResult::Echo {{{1*/
     45/*FUNCTION BoolExternalResult::Echo {{{*/
    4646void BoolExternalResult::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION BoolExternalResult::DeepEcho{{{1*/
     50/*FUNCTION BoolExternalResult::DeepEcho{{{*/
    5151void BoolExternalResult::DeepEcho(void){
    5252
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION BoolExternalResult::Id{{{1*/
     61/*FUNCTION BoolExternalResult::Id{{{*/
    6262int    BoolExternalResult::Id(void){ return -1; }
    6363/*}}}*/
    64 /*FUNCTION BoolExternalResult::MyRank{{{1*/
     64/*FUNCTION BoolExternalResult::MyRank{{{*/
    6565int    BoolExternalResult::MyRank(void){
    6666        extern int my_rank;
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION BoolExternalResult::ObjectEnum{{{1*/
     70/*FUNCTION BoolExternalResult::ObjectEnum{{{*/
    7171int BoolExternalResult::ObjectEnum(void){
    7272
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION BoolExternalResult::copy{{{1*/
     77/*FUNCTION BoolExternalResult::copy{{{*/
    7878Object* BoolExternalResult::copy() {
    7979       
    … …  
    8484
    8585/*BoolExternalResult management: */
    86 /*FUNCTION BoolExternalResult::WriteData{{{1*/
     86/*FUNCTION BoolExternalResult::WriteData{{{*/
    8787void   BoolExternalResult::WriteData(FILE* fid,bool io_gather){
    8888
    … …  
    119119
    120120}
    121 /*}}}1*/
    122 /*FUNCTION BoolExternalResult::GetResultName{{{1*/
     121/*}}}*/
     122/*FUNCTION BoolExternalResult::GetResultName{{{*/
    123123void BoolExternalResult::GetResultName(char** pname){
    124124        EnumToStringx(pname,this->enum_type);
    125125}
    126126/*}}}*/
    127 /*FUNCTION BoolExternalResult::GetStep{{{1*/
     127/*FUNCTION BoolExternalResult::GetStep{{{*/
    128128int BoolExternalResult::GetStep(void){
    129129

  • issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    3232                double time;
    3333
    34                 /*BoolExternalResult constructors, destructors: {{{1*/
     34                /*BoolExternalResult constructors, destructors: {{{*/
    3535                BoolExternalResult();
    3636                BoolExternalResult(int id, int enum_type,bool value,int step,double time);
    3737                ~BoolExternalResult();
    3838                /*}}}*/
    39                 /*Object virtual functions definitions:{{{1 */
     39                /*Object virtual functions definitions:{{{ */
    4040                void  Echo();
    4141                void  DeepEcho();
    … …  
    4545                Object* copy();
    4646                /*}}}*/
    47                 /*ExternalResult management: {{{1*/
     47                /*ExternalResult management: {{{*/
    4848                int   InstanceEnum(){return enum_type;}
    4949                void  WriteData(FILE* fid,bool io_gather);

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleExternalResult constructors and destructor*/
    23 /*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{1*/
     23/*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{*/
    2424DoubleExternalResult::DoubleExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,double value){{{1*/
     28/*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,double value){{{*/
    2929DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type,double in_value,int in_step, double in_time){
    3030
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{1*/
     38/*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{*/
    3939DoubleExternalResult::~DoubleExternalResult(){
    4040        return;
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION DoubleExternalResult::Echo {{{1*/
     45/*FUNCTION DoubleExternalResult::Echo {{{*/
    4646void DoubleExternalResult::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION DoubleExternalResult::DeepEcho{{{1*/
     50/*FUNCTION DoubleExternalResult::DeepEcho{{{*/
    5151void DoubleExternalResult::DeepEcho(void){
    5252
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION DoubleExternalResult::Id{{{1*/
     61/*FUNCTION DoubleExternalResult::Id{{{*/
    6262int    DoubleExternalResult::Id(void){ return -1; }
    6363/*}}}*/
    64 /*FUNCTION DoubleExternalResult::MyRank{{{1*/
     64/*FUNCTION DoubleExternalResult::MyRank{{{*/
    6565int    DoubleExternalResult::MyRank(void){
    6666        extern int my_rank;
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION DoubleExternalResult::ObjectEnum{{{1*/
     70/*FUNCTION DoubleExternalResult::ObjectEnum{{{*/
    7171int DoubleExternalResult::ObjectEnum(void){
    7272
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION DoubleExternalResult::copy{{{1*/
     77/*FUNCTION DoubleExternalResult::copy{{{*/
    7878Object* DoubleExternalResult::copy() {
    7979       
    … …  
    8484
    8585/*DoubleExternalResult management: */
    86 /*FUNCTION DoubleExternalResult::WriteData{{{1*/
     86/*FUNCTION DoubleExternalResult::WriteData{{{*/
    8787void   DoubleExternalResult::WriteData(FILE* fid,bool io_gather){
    8888
    … …  
    115115
    116116}
    117 /*}}}1*/
    118 /*FUNCTION DoubleExternalResult::GetResultName{{{1*/
     117/*}}}*/
     118/*FUNCTION DoubleExternalResult::GetResultName{{{*/
    119119void DoubleExternalResult::GetResultName(char** pname){
    120120        EnumToStringx(pname,this->enum_type);
    121121}
    122122/*}}}*/
    123 /*FUNCTION DoubleExternalResult::GetStep{{{1*/
     123/*FUNCTION DoubleExternalResult::GetStep{{{*/
    124124int DoubleExternalResult::GetStep(void){
    125125

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    3434
    3535
    36                 /*DoubleExternalResult constructors, destructors: {{{1*/
     36                /*DoubleExternalResult constructors, destructors: {{{*/
    3737                DoubleExternalResult();
    3838                DoubleExternalResult(int id,int enum_type,double value,int step,double time);
    3939                ~DoubleExternalResult();
    4040                /*}}}*/
    41                 /*Object virtual functions definitions:{{{1 */
     41                /*Object virtual functions definitions:{{{ */
    4242                void  Echo();
    4343                void  DeepEcho();
    … …  
    4747                Object* copy();
    4848                /*}}}*/
    49                 /*ExternalResult management: {{{1*/
     49                /*ExternalResult management: {{{*/
    5050                int   InstanceEnum(){return enum_type;}
    5151                void  WriteData(FILE* fid,bool io_gather);

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleMatExternalResult constructors and destructor*/
    23 /*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(){{{1*/
     23/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(){{{*/
    2424DoubleMatExternalResult::DoubleMatExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{1*/
     28/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{*/
    2929DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_N,int in_step,double in_time){
    3030
    … …  
    4545}
    4646/*}}}*/
    47 /*FUNCTION DoubleMatExternalResult::~DoubleMatExternalResult(){{{1*/
     47/*FUNCTION DoubleMatExternalResult::~DoubleMatExternalResult(){{{*/
    4848DoubleMatExternalResult::~DoubleMatExternalResult(){
    4949
    … …  
    5454
    5555/*Object virtual functions definitions:*/
    56 /*FUNCTION DoubleMatExternalResult::Echo {{{1*/
     56/*FUNCTION DoubleMatExternalResult::Echo {{{*/
    5757void DoubleMatExternalResult::Echo(void){
    5858
    … …  
    6565}
    6666/*}}}*/
    67 /*FUNCTION DoubleMatExternalResult::DeepEcho{{{1*/
     67/*FUNCTION DoubleMatExternalResult::DeepEcho{{{*/
    6868void DoubleMatExternalResult::DeepEcho(void){
    6969
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION DoubleMatExternalResult::Id{{{1*/
     89/*FUNCTION DoubleMatExternalResult::Id{{{*/
    9090int    DoubleMatExternalResult::Id(void){ return -1; }
    9191/*}}}*/
    92 /*FUNCTION DoubleMatExternalResult::MyRank{{{1*/
     92/*FUNCTION DoubleMatExternalResult::MyRank{{{*/
    9393int    DoubleMatExternalResult::MyRank(void){
    9494        extern int my_rank;
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION DoubleMatExternalResult::ObjectEnum{{{1*/
     98/*FUNCTION DoubleMatExternalResult::ObjectEnum{{{*/
    9999int DoubleMatExternalResult::ObjectEnum(void){
    100100
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION DoubleMatExternalResult::copy{{{1*/
     105/*FUNCTION DoubleMatExternalResult::copy{{{*/
    106106Object* DoubleMatExternalResult::copy() {
    107107       
    … …  
    112112
    113113/*DoubleMatExternalResult management: */
    114 /*FUNCTION DoubleMatExternalResult::WriteData{{{1*/
     114/*FUNCTION DoubleMatExternalResult::WriteData{{{*/
    115115void   DoubleMatExternalResult::WriteData(FILE* fid,bool io_gather){
    116116
    … …  
    147147
    148148}
    149 /*}}}1*/
    150 /*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/
     149/*}}}*/
     150/*FUNCTION DoubleMatExternalResult::GetResultName{{{*/
    151151void DoubleMatExternalResult::GetResultName(char** pname){
    152152        EnumToStringx(pname,this->enum_type);
    153153}
    154154/*}}}*/
    155 /*FUNCTION DoubleMatExternalResult::GetStep{{{1*/
     155/*FUNCTION DoubleMatExternalResult::GetStep{{{*/
    156156int DoubleMatExternalResult::GetStep(void){
    157157

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010
    1111#ifdef HAVE_CONFIG_H
    … …  
    3434
    3535        public:
    36                 /*DoubleMatExternalResult constructors, destructors: {{{1*/
     36                /*DoubleMatExternalResult constructors, destructors: {{{*/
    3737                DoubleMatExternalResult();
    3838                DoubleMatExternalResult(int id,int enum_type,double* values,int M,int N,int step, double time);
    3939                ~DoubleMatExternalResult();
    4040                /*}}}*/
    41                 /*Object virtual functions definitions:{{{1 */
     41                /*Object virtual functions definitions:{{{ */
    4242                void  Echo();
    4343                void  DeepEcho();
    … …  
    4747                Object* copy();
    4848                /*}}}*/
    49                 /*ExternalResult managemnet: {{{1*/
     49                /*ExternalResult managemnet: {{{*/
    5050                int   InstanceEnum(){return enum_type;}
    5151                void  WriteData(FILE* fid,bool io_gather);

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleVecExternalResult constructors and destructor*/
    23 /*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(){{{1*/
     23/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(){{{*/
    2424DoubleVecExternalResult::DoubleVecExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step,double in_time){{{1*/
     28/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step,double in_time){{{*/
    2929DoubleVecExternalResult::DoubleVecExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_step,double in_time){
    3030
    … …  
    4343}
    4444/*}}}*/
    45 /*FUNCTION DoubleVecExternalResult::~DoubleVecExternalResult(){{{1*/
     45/*FUNCTION DoubleVecExternalResult::~DoubleVecExternalResult(){{{*/
    4646DoubleVecExternalResult::~DoubleVecExternalResult(){
    4747        xfree((void**)&values);
    … …  
    5151
    5252/*Object virtual functions definitions:*/
    53 /*FUNCTION DoubleVecExternalResult::Echo {{{1*/
     53/*FUNCTION DoubleVecExternalResult::Echo {{{*/
    5454void DoubleVecExternalResult::Echo(void){
    5555
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION DoubleVecExternalResult::DeepEcho{{{1*/
     64/*FUNCTION DoubleVecExternalResult::DeepEcho{{{*/
    6565void DoubleVecExternalResult::DeepEcho(void){
    6666
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION DoubleVecExternalResult::Id{{{1*/
     80/*FUNCTION DoubleVecExternalResult::Id{{{*/
    8181int    DoubleVecExternalResult::Id(void){ return -1; }
    8282/*}}}*/
    83 /*FUNCTION DoubleVecExternalResult::MyRank{{{1*/
     83/*FUNCTION DoubleVecExternalResult::MyRank{{{*/
    8484int    DoubleVecExternalResult::MyRank(void){
    8585        extern int my_rank;
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION DoubleVecExternalResult::ObjectEnum{{{1*/
     89/*FUNCTION DoubleVecExternalResult::ObjectEnum{{{*/
    9090int DoubleVecExternalResult::ObjectEnum(void){
    9191
    … …  
    9494}
    9595/*}}}*/
    96 /*FUNCTION DoubleVecExternalResult::copy{{{1*/
     96/*FUNCTION DoubleVecExternalResult::copy{{{*/
    9797Object* DoubleVecExternalResult::copy() {
    9898       
    … …  
    103103
    104104/*DoubleVecExternalResult management: */
    105 /*FUNCTION DoubleVecExternalResult::WriteData{{{1*/
     105/*FUNCTION DoubleVecExternalResult::WriteData{{{*/
    106106void   DoubleVecExternalResult::WriteData(FILE* fid,bool io_gather){
    107107
    … …  
    134134
    135135}
    136 /*}}}1*/
    137 /*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/
     136/*}}}*/
     137/*FUNCTION DoubleVecExternalResult::GetResultName{{{*/
    138138void DoubleVecExternalResult::GetResultName(char** pname){
    139139        EnumToStringx(pname,this->enum_type);
    140140}
    141141/*}}}*/
    142 /*FUNCTION DoubleVecExternalResult::GetStep{{{1*/
     142/*FUNCTION DoubleVecExternalResult::GetStep{{{*/
    143143int DoubleVecExternalResult::GetStep(void){
    144144

  • issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010
    1111#ifdef HAVE_CONFIG_H
    … …  
    3333
    3434        public:
    35                 /*DoubleVecExternalResult constructors, destructors: {{{1*/
     35                /*DoubleVecExternalResult constructors, destructors: {{{*/
    3636                DoubleVecExternalResult();
    3737                DoubleVecExternalResult(int id,int enum_type,double* values,int M,int step, double time);
    3838                ~DoubleVecExternalResult();
    3939                /*}}}*/
    40                 /*Object virtual functions definitions:{{{1 */
     40                /*Object virtual functions definitions:{{{ */
    4141                void  Echo();
    4242                void  DeepEcho();
    … …  
    4646                Object* copy();
    4747                /*}}}*/
    48                 /*ExternalResult management: {{{1*/
     48                /*ExternalResult management: {{{*/
    4949                int   InstanceEnum(){return enum_type;}
    5050                void  WriteData(FILE* fid,bool io_gather);

  • issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    2525               
    2626                virtual        ~ExternalResult(){};
    27                 /*Virtual functions:{{{1*/
     27                /*Virtual functions:{{{*/
    2828                virtual int   InstanceEnum()=0;
    2929                virtual void  WriteData(FILE* fid,bool io_gather)=0;

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*IntExternalResult constructors and destructor*/
    23 /*FUNCTION IntExternalResult::IntExternalResult(){{{1*/
     23/*FUNCTION IntExternalResult::IntExternalResult(){{{*/
    2424IntExternalResult::IntExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){{{1*/
     28/*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){{{*/
    2929IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){
    3030
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION IntExternalResult::~IntExternalResult(){{{1*/
     38/*FUNCTION IntExternalResult::~IntExternalResult(){{{*/
    3939IntExternalResult::~IntExternalResult(){
    4040        return;
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION IntExternalResult::Echo {{{1*/
     45/*FUNCTION IntExternalResult::Echo {{{*/
    4646void IntExternalResult::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION IntExternalResult::DeepEcho{{{1*/
     50/*FUNCTION IntExternalResult::DeepEcho{{{*/
    5151void IntExternalResult::DeepEcho(void){
    5252
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION IntExternalResult::Id{{{1*/
     61/*FUNCTION IntExternalResult::Id{{{*/
    6262int    IntExternalResult::Id(void){ return -1; }
    6363/*}}}*/
    64 /*FUNCTION IntExternalResult::MyRank{{{1*/
     64/*FUNCTION IntExternalResult::MyRank{{{*/
    6565int    IntExternalResult::MyRank(void){
    6666        extern int my_rank;
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION IntExternalResult::ObjectEnum{{{1*/
     70/*FUNCTION IntExternalResult::ObjectEnum{{{*/
    7171int IntExternalResult::ObjectEnum(void){
    7272
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION IntExternalResult::copy{{{1*/
     77/*FUNCTION IntExternalResult::copy{{{*/
    7878Object* IntExternalResult::copy() {
    7979       
    … …  
    8484
    8585/*IntExternalResult management: */
    86 /*FUNCTION IntExternalResult::WriteData{{{1*/
     86/*FUNCTION IntExternalResult::WriteData{{{*/
    8787void   IntExternalResult::WriteData(FILE* fid,bool io_gather){
    8888
    … …  
    119119
    120120}
    121 /*}}}1*/
    122 /*FUNCTION IntExternalResult::GetResultName{{{1*/
     121/*}}}*/
     122/*FUNCTION IntExternalResult::GetResultName{{{*/
    123123void IntExternalResult::GetResultName(char** pname){
    124124        EnumToStringx(pname,this->enum_type);
    125125}
    126126/*}}}*/
    127 /*FUNCTION IntExternalResult::GetStep{{{1*/
     127/*FUNCTION IntExternalResult::GetStep{{{*/
    128128int IntExternalResult::GetStep(void){
    129129

  • issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    3131
    3232
    33                 /*IntExternalResult constructors, destructors: {{{1*/
     33                /*IntExternalResult constructors, destructors: {{{*/
    3434                IntExternalResult();
    3535                IntExternalResult(int id,int enum_type,int value,int step,double time);
    … …  
    3737
    3838                /*}}}*/
    39                 /*Object virtual functions definitions:{{{1 */
     39                /*Object virtual functions definitions:{{{ */
    4040                void  Echo();
    4141                void  DeepEcho();
    … …  
    4545                Object* copy();
    4646                /*}}}*/
    47                 /*ExternalResult managemnet: {{{1*/
     47                /*ExternalResult managemnet: {{{*/
    4848                int   InstanceEnum(){return enum_type;}
    4949                void  WriteData(FILE* fid,bool io_gather);

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*PetscVecExternalResult constructors and destructor*/
    23 /*FUNCTION PetscVecExternalResult::PetscVecExternalResult(){{{1*/
     23/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(){{{*/
    2424PetscVecExternalResult::PetscVecExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION PetscVecExternalResult::PetscVecExternalResult(int enum_type,IssmPetscVec value){{{1*/
     28/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(int enum_type,IssmPetscVec value){{{*/
    2929PetscVecExternalResult::PetscVecExternalResult(int in_id, int in_enum_type,Vector* in_value,int in_step, double in_time){
    3030
    … …  
    4444}
    4545/*}}}*/
    46 /*FUNCTION PetscVecExternalResult::~PetscVecExternalResult(){{{1*/
     46/*FUNCTION PetscVecExternalResult::~PetscVecExternalResult(){{{*/
    4747PetscVecExternalResult::~PetscVecExternalResult(){
    4848        VecFree(&value);
    … …  
    5151
    5252/*Object virtual functions definitions:*/
    53 /*FUNCTION PetscVecExternalResult::Echo {{{1*/
     53/*FUNCTION PetscVecExternalResult::Echo {{{*/
    5454void PetscVecExternalResult::Echo(void){
    5555
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION PetscVecExternalResult::DeepEcho{{{1*/
     61/*FUNCTION PetscVecExternalResult::DeepEcho{{{*/
    6262void PetscVecExternalResult::DeepEcho(void){
    6363
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION PetscVecExternalResult::Id{{{1*/
     73/*FUNCTION PetscVecExternalResult::Id{{{*/
    7474int    PetscVecExternalResult::Id(void){ return -1; }
    7575/*}}}*/
    76 /*FUNCTION PetscVecExternalResult::MyRank{{{1*/
     76/*FUNCTION PetscVecExternalResult::MyRank{{{*/
    7777int    PetscVecExternalResult::MyRank(void){
    7878        extern int my_rank;
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION PetscVecExternalResult::ObjectEnum{{{1*/
     82/*FUNCTION PetscVecExternalResult::ObjectEnum{{{*/
    8383int PetscVecExternalResult::ObjectEnum(void){
    8484
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION PetscVecExternalResult::copy{{{1*/
     89/*FUNCTION PetscVecExternalResult::copy{{{*/
    9090Object* PetscVecExternalResult::copy() {
    9191       
    … …  
    9696
    9797/*PetscVecExternalResult management: */
    98 /*FUNCTION PetscVecExternalResult::WriteData{{{1*/
     98/*FUNCTION PetscVecExternalResult::WriteData{{{*/
    9999void   PetscVecExternalResult::WriteData(FILE* fid,bool io_gather){
    100100
    … …  
    134134        xfree((void**)&serialvec);
    135135}
    136 /*}}}1*/
    137 /*FUNCTION PetscVecExternalResult::GetResultName{{{1*/
     136/*}}}*/
     137/*FUNCTION PetscVecExternalResult::GetResultName{{{*/
    138138void PetscVecExternalResult::GetResultName(char**pname){
    139139        EnumToStringx(pname,this->enum_type);
    140140}
    141141/*}}}*/
    142 /*FUNCTION PetscVecExternalResult::GetStep{{{1*/
     142/*FUNCTION PetscVecExternalResult::GetStep{{{*/
    143143int PetscVecExternalResult::GetStep(void){
    144144

  • issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    3333
    3434        public:
    35                 /*PetscVecExternalResult constructors, destructors: {{{1*/
     35                /*PetscVecExternalResult constructors, destructors: {{{*/
    3636                PetscVecExternalResult();
    3737                PetscVecExternalResult(int id,int enum_type,Vector* value, int step, double time);
    3838                ~PetscVecExternalResult();
    3939                /*}}}*/
    40                 /*Object virtual functions definitions:{{{1 */
     40                /*Object virtual functions definitions:{{{ */
    4141                void  Echo();
    4242                void  DeepEcho();
    … …  
    4646                Object* copy();
    4747                /*}}}*/
    48                 /*ExternalResult management: {{{1*/
     48                /*ExternalResult management: {{{*/
    4949                int   InstanceEnum(){return enum_type;}
    5050                void  WriteData(FILE* fid,bool io_gather);

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*StringExternalResult constructors and destructor*/
    23 /*FUNCTION StringExternalResult::StringExternalResult(){{{1*/
     23/*FUNCTION StringExternalResult::StringExternalResult(){{{*/
    2424StringExternalResult::StringExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION StringExternalResult::StringExternalResult(int enum_type,IssmString value){{{1*/
     28/*FUNCTION StringExternalResult::StringExternalResult(int enum_type,IssmString value){{{*/
    2929StringExternalResult::StringExternalResult(int in_id, int in_enum_type,char* in_value,int in_step, double in_time){
    3030
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION StringExternalResult::~StringExternalResult(){{{1*/
     41/*FUNCTION StringExternalResult::~StringExternalResult(){{{*/
    4242StringExternalResult::~StringExternalResult(){
    4343        xfree((void**)&value);
    … …  
    4646
    4747/*Object virtual functions definitions:*/
    48 /*FUNCTION StringExternalResult::Echo {{{1*/
     48/*FUNCTION StringExternalResult::Echo {{{*/
    4949void StringExternalResult::Echo(void){
    5050        this->DeepEcho();
    5151}
    5252/*}}}*/
    53 /*FUNCTION StringExternalResult::DeepEcho{{{1*/
     53/*FUNCTION StringExternalResult::DeepEcho{{{*/
    5454void StringExternalResult::DeepEcho(void){
    5555
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION StringExternalResult::Id{{{1*/
     64/*FUNCTION StringExternalResult::Id{{{*/
    6565int    StringExternalResult::Id(void){ return -1; }
    6666/*}}}*/
    67 /*FUNCTION StringExternalResult::MyRank{{{1*/
     67/*FUNCTION StringExternalResult::MyRank{{{*/
    6868int    StringExternalResult::MyRank(void){
    6969        extern int my_rank;
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION StringExternalResult::ObjectEnum{{{1*/
     73/*FUNCTION StringExternalResult::ObjectEnum{{{*/
    7474int StringExternalResult::ObjectEnum(void){
    7575
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION StringExternalResult::copy{{{1*/
     80/*FUNCTION StringExternalResult::copy{{{*/
    8181Object* StringExternalResult::copy() {
    8282       
    … …  
    8787
    8888/*StringExternalResult management: */
    89 /*FUNCTION StringExternalResult::WriteData{{{1*/
     89/*FUNCTION StringExternalResult::WriteData{{{*/
    9090void   StringExternalResult::WriteData(FILE* fid,bool io_gather){
    9191
    … …  
    118118
    119119}
    120 /*}}}1*/
    121 /*FUNCTION StringExternalResult::GetResultName{{{1*/
     120/*}}}*/
     121/*FUNCTION StringExternalResult::GetResultName{{{*/
    122122void StringExternalResult::GetResultName(char**pname){
    123123        EnumToStringx(pname,this->enum_type);
    124124}
    125125/*}}}*/
    126 /*FUNCTION StringExternalResult::GetStep{{{1*/
     126/*FUNCTION StringExternalResult::GetStep{{{*/
    127127int StringExternalResult::GetStep(void){
    128128

  • issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H
    … …  
    3333
    3434        public:
    35                 /*StringExternalResult constructors, destructors: {{{1*/
     35                /*StringExternalResult constructors, destructors: {{{*/
    3636                StringExternalResult();
    3737                StringExternalResult(int id,int enum_type,char* value,int step, double time);
    3838                ~StringExternalResult();
    3939                /*}}}*/
    40                 /*Object virtual functions definitions:{{{1 */
     40                /*Object virtual functions definitions:{{{ */
    4141                void  Echo();
    4242                void  DeepEcho();
    … …  
    4646                Object* copy();
    4747                /*}}}*/
    48                 /*ExternalResult management: {{{1*/
     48                /*ExternalResult management: {{{*/
    4949                int   InstanceEnum(){return enum_type;}
    5050                void  WriteData(FILE* fid,bool io_gather);

  • issm/trunk-jpl/src/c/objects/FemModel.cpp

    r12016 r12365  
    2020
    2121/*Object constructors and destructor*/
    22 /*FUNCTION FemModel::constructor {{{1*/
     22/*FUNCTION FemModel::constructor {{{*/
    2323FemModel::FemModel(char* inputfilename, char* outputfilename, const int in_solution_type,const int* analyses,const int nummodels){
    2424
    … …  
    7777}
    7878
    79 /*}}}1*/
    80 /*FUNCTION FemModel::destructor {{{1*/
     79/*}}}*/
     80/*FUNCTION FemModel::destructor {{{*/
    8181FemModel::~FemModel(){
    8282
    … …  
    9696
    9797}
    98 /*}}}1*/
     98/*}}}*/
    9999
    100100/*Object management*/
    101 /*FUNCTION FemModel::Echo {{{1*/
     101/*FUNCTION FemModel::Echo {{{*/
    102102void FemModel::Echo(void){
    103103
    … …  
    113113
    114114/*Numerics: */
    115 /*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){{{1*/
     115/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){{{*/
    116116void FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){
    117117
    … …  
    150150
    151151}
    152 /*}}}1*/
    153 /*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type){{{1*/
     152/*}}}*/
     153/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type){{{*/
    154154void FemModel::SetCurrentConfiguration(int configuration_type){
    155155
    … …  
    157157        this->SetCurrentConfiguration(configuration_type,configuration_type);
    158158}
    159 /*}}}1*/
     159/*}}}*/

  • issm/trunk-jpl/src/c/objects/FemModel.h

    r8800 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Object.h"
    1111#include "../toolkits/toolkits.h"

  • issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp

    r8416 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#include "./../objects.h"
    77/*}}}*/
    88
    99/*GaussPenta constructors and destructors:*/
    10 /*FUNCTION GaussPenta::GaussPenta() {{{1*/
     10/*FUNCTION GaussPenta::GaussPenta() {{{*/
    1111GaussPenta::GaussPenta(){
    1212
    … …  
    2626}
    2727/*}}}*/
    28 /*FUNCTION GaussPenta::GaussPenta(int order_horiz,int order_vert) {{{1*/
     28/*FUNCTION GaussPenta::GaussPenta(int order_horiz,int order_vert) {{{*/
    2929GaussPenta::GaussPenta(int order_horiz,int order_vert){
    3030
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int order){{{1*/
     82/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int order){{{*/
    8383GaussPenta::GaussPenta(int index1, int index2,int order){
    8484
    … …  
    137137}
    138138/*}}}*/
    139 /*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int order){{{1*/
     139/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int order){{{*/
    140140GaussPenta::GaussPenta(int index1, int index2, int index3, int order){
    141141
    … …  
    166166}
    167167/*}}}*/
    168 /*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){{{1*/
     168/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){{{*/
    169169GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){
    170170
    … …  
    233233}
    234234/*}}}*/
    235 /*FUNCTION GaussPenta::~GaussPenta(){{{1*/
     235/*FUNCTION GaussPenta::~GaussPenta(){{{*/
    236236GaussPenta::~GaussPenta(){
    237237        xfree((void**)&weights);
    … …  
    244244
    245245/*Methods*/
    246 /*FUNCTION GaussPenta::Echo{{{1*/
     246/*FUNCTION GaussPenta::Echo{{{*/
    247247void GaussPenta::Echo(void){
    248248
    … …  
    289289}
    290290/*}}}*/
    291 /*FUNCTION GaussPenta::GaussCenter{{{1*/
     291/*FUNCTION GaussPenta::GaussCenter{{{*/
    292292void GaussPenta::GaussCenter(void){
    293293
    … …  
    300300}
    301301/*}}}*/
    302 /*FUNCTION GaussPenta::GaussPoint{{{1*/
     302/*FUNCTION GaussPenta::GaussPoint{{{*/
    303303void GaussPenta::GaussPoint(int ig){
    304304
    … …  
    315315}
    316316/*}}}*/
    317 /*FUNCTION GaussPenta::GaussVertex{{{1*/
     317/*FUNCTION GaussPenta::GaussVertex{{{*/
    318318void GaussPenta::GaussVertex(int iv){
    319319
    … …  
    348348}
    349349/*}}}*/
    350 /*FUNCTION GaussPenta::GaussFaceTria{{{1*/
     350/*FUNCTION GaussPenta::GaussFaceTria{{{*/
    351351void GaussPenta::GaussFaceTria(int index1, int index2, int index3, int order){
    352352
    … …  
    366366}
    367367/*}}}*/
    368 /*FUNCTION GaussPenta::begin{{{1*/
     368/*FUNCTION GaussPenta::begin{{{*/
    369369int GaussPenta::begin(void){
    370370
    … …  
    381381}
    382382/*}}}*/
    383 /*FUNCTION GaussPenta::end{{{1*/
     383/*FUNCTION GaussPenta::end{{{*/
    384384int GaussPenta::end(void){
    385385
    … …  
    396396}
    397397/*}}}*/
    398 /*FUNCTION GaussPenta::SynchronizeGaussTria{{{1*/
     398/*FUNCTION GaussPenta::SynchronizeGaussTria{{{*/
    399399void GaussPenta::SynchronizeGaussTria(GaussTria* gauss_tria){
    400400

  • issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.h

    r5797 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./../../shared/shared.h"
    1111class GaussTria;

  • issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp

    r6412 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#include "./../objects.h"
    77/*}}}*/
    88
    99/*GaussTria constructors and destructors:*/
    10 /*FUNCTION GaussTria::GaussTria() {{{1*/
     10/*FUNCTION GaussTria::GaussTria() {{{*/
    1111GaussTria::GaussTria(){
    1212
    … …  
    2424}
    2525/*}}}*/
    26 /*FUNCTION GaussTria::GaussTria(int order) {{{1*/
     26/*FUNCTION GaussTria::GaussTria(int order) {{{*/
    2727GaussTria::GaussTria(int order){
    2828
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION GaussTria::GaussTria(int index1,int index2,int order) {{{1*/
     40/*FUNCTION GaussTria::GaussTria(int index1,int index2,int order) {{{*/
    4141GaussTria::GaussTria(int index1,int index2,int order){
    4242
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION GaussTria::~GaussTria(){{{1*/
     97/*FUNCTION GaussTria::~GaussTria(){{{*/
    9898GaussTria::~GaussTria(){
    9999        xfree((void**)&weights);
    … …  
    105105
    106106/*Methods*/
    107 /*FUNCTION GaussTria::Echo{{{1*/
     107/*FUNCTION GaussTria::Echo{{{*/
    108108void GaussTria::Echo(void){
    109109
    … …  
    143143}
    144144/*}}}*/
    145 /*FUNCTION GaussTria::GaussCenter{{{1*/
     145/*FUNCTION GaussTria::GaussCenter{{{*/
    146146void GaussTria::GaussCenter(void){
    147147
    … …  
    153153}
    154154/*}}}*/
    155 /*FUNCTION GaussTria::GaussEdgeCenter{{{1*/
     155/*FUNCTION GaussTria::GaussEdgeCenter{{{*/
    156156void GaussTria::GaussEdgeCenter(int index1,int index2){
    157157
    … …  
    184184}
    185185/*}}}*/
    186 /*FUNCTION GaussTria::GaussPoint{{{1*/
     186/*FUNCTION GaussTria::GaussPoint{{{*/
    187187void GaussTria::GaussPoint(int ig){
    188188
    … …  
    198198}
    199199/*}}}*/
    200 /*FUNCTION GaussTria::GaussFromCoords{{{1*/
     200/*FUNCTION GaussTria::GaussFromCoords{{{*/
    201201void GaussTria::GaussFromCoords(double x,double y,double* xyz_list){
    202202
    … …  
    225225}
    226226/*}}}*/
    227 /*FUNCTION GaussTria::GaussVertex{{{1*/
     227/*FUNCTION GaussTria::GaussVertex{{{*/
    228228void GaussTria::GaussVertex(int iv){
    229229
    … …  
    249249}
    250250/*}}}*/
    251 /*FUNCTION GaussTria::begin{{{1*/
     251/*FUNCTION GaussTria::begin{{{*/
    252252int GaussTria::begin(void){
    253253
    … …  
    263263}
    264264/*}}}*/
    265 /*FUNCTION GaussTria::end{{{1*/
     265/*FUNCTION GaussTria::end{{{*/
    266266int GaussTria::end(void){
    267267

  • issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h

    r5739 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./../../shared/shared.h"
    1111/*}}}*/

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

    r12014 r12365  
    2020
    2121/*Constructor/Destructors*/
    22 /*FUNCTION Hook::Hook(){{{1*/
     22/*FUNCTION Hook::Hook(){{{*/
    2323Hook::Hook(){
    2424        this->num=0;
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION Hook::Hook(int* ids, int num){{{1*/
     31/*FUNCTION Hook::Hook(int* ids, int num){{{*/
    3232Hook::Hook(int* in_ids, int in_num){
    3333
    … …  
    6060}
    6161/*}}}*/
    62 /*FUNCTION Hook::~Hook(){{{1*/
     62/*FUNCTION Hook::~Hook(){{{*/
    6363Hook::~Hook(){
    6464        /*deallocate: */
    … …  
    7171
    7272/*Some of the Object functionality: */
    73 /*FUNCTION Hook::Echo{{{1*/
     73/*FUNCTION Hook::Echo{{{*/
    7474void Hook::Echo(void){
    7575
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION Hook::DeepEcho{{{1*/
     92/*FUNCTION Hook::DeepEcho{{{*/
    9393void Hook::DeepEcho(void){
    9494
    … …  
    118118}
    119119/*}}}*/
    120 /*FUNCTION Hook::copy {{{1*/
     120/*FUNCTION Hook::copy {{{*/
    121121Object* Hook::copy(void){
    122122
    … …  
    148148
    149149/*Hook management: */
    150 /*FUNCTION Hook::configure{{{1*/
     150/*FUNCTION Hook::configure{{{*/
    151151void Hook::configure(DataSet* dataset){
    152152
    … …  
    190190}
    191191/*}}}*/
    192 /*FUNCTION Hook::delivers{{{1*/
     192/*FUNCTION Hook::delivers{{{*/
    193193Object* Hook::delivers(void){
    194194       
    … …  
    203203
    204204/*}}}*/
    205 /*FUNCTION Hook::deliverp{{{1*/
     205/*FUNCTION Hook::deliverp{{{*/
    206206Object** Hook::deliverp(void){
    207207        return objects;
    208208}
    209209/*}}}*/
    210 /*FUNCTION Hook::Ids{{{1*/
     210/*FUNCTION Hook::Ids{{{*/
    211211int* Hook::Ids(void){
    212212        return this->ids;
    213213}
    214214/*}}}*/
    215 /*FUNCTION Hook::GetNum{{{1*/
     215/*FUNCTION Hook::GetNum{{{*/
    216216int Hook::GetNum(void){
    217217        return this->num;
    218218}
    219219/*}}}*/
    220 /*FUNCTION Hook::GetObjects{{{1*/
     220/*FUNCTION Hook::GetObjects{{{*/
    221221Object** Hook::GetObjects(void){
    222222        return this->objects;
    223223}
    224224/*}}}*/
    225 /*FUNCTION Hook::GetOffsets{{{1*/
     225/*FUNCTION Hook::GetOffsets{{{*/
    226226int* Hook::GetOffsets(void){
    227227        return this->offsets;
    228228}
    229229/*}}}*/
    230 /*FUNCTION Hook::Spawn{{{1*/
     230/*FUNCTION Hook::Spawn{{{*/
    231231Hook* Hook::Spawn(int* indices, int numindices){
    232232

  • issm/trunk-jpl/src/c/objects/Hook.h

    r12014 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313#include "./Object.h"
    1414class DataSet;
    … …  
    3131                ~Hook();
    3232                /*}}}*/
    33                 /*Object like functionality:{{{1*/
     33                /*Object like functionality:{{{*/
    3434                void       Echo(void);
    3535                void       DeepEcho(void);
    3636                Object*    copy(void);
    3737                /*}}}*/
    38                 /*Hook management: {{{1*/
     38                /*Hook management: {{{*/
    3939                Object*    delivers(void); //single object deliver
    4040                Object**   deliverp(void); //deliver all objects

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

    r12014 r12365  
    1818
    1919/*BoolInput constructors and destructor*/
    20 /*FUNCTION BoolInput::BoolInput(){{{1*/
     20/*FUNCTION BoolInput::BoolInput(){{{*/
    2121BoolInput::BoolInput(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION BoolInput::BoolInput(double* values){{{1*/
     25/*FUNCTION BoolInput::BoolInput(double* values){{{*/
    2626BoolInput::BoolInput(int in_enum_type,IssmBool in_value){
    2727
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION BoolInput::~BoolInput(){{{1*/
     32/*FUNCTION BoolInput::~BoolInput(){{{*/
    3333BoolInput::~BoolInput(){
    3434        return;
    … …  
    3737
    3838/*Object virtual functions definitions:*/
    39 /*FUNCTION BoolInput::Echo {{{1*/
     39/*FUNCTION BoolInput::Echo {{{*/
    4040void BoolInput::Echo(void){
    4141        this->DeepEcho();
    4242}
    4343/*}}}*/
    44 /*FUNCTION BoolInput::DeepEcho{{{1*/
     44/*FUNCTION BoolInput::DeepEcho{{{*/
    4545void BoolInput::DeepEcho(void){
    4646
    … …  
    5050}
    5151/*}}}*/
    52 /*FUNCTION BoolInput::Id{{{1*/
     52/*FUNCTION BoolInput::Id{{{*/
    5353int    BoolInput::Id(void){ return -1; }
    5454/*}}}*/
    55 /*FUNCTION BoolInput::MyRank{{{1*/
     55/*FUNCTION BoolInput::MyRank{{{*/
    5656int    BoolInput::MyRank(void){
    5757        extern int my_rank;
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION BoolInput::ObjectEnum{{{1*/
     61/*FUNCTION BoolInput::ObjectEnum{{{*/
    6262int BoolInput::ObjectEnum(void){
    6363
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION BoolInput::copy{{{1*/
     68/*FUNCTION BoolInput::copy{{{*/
    6969Object* BoolInput::copy() {
    7070       
    … …  
    7575       
    7676/*BoolInput management*/
    77 /*FUNCTION BoolInput::InstanceEnum{{{1*/
     77/*FUNCTION BoolInput::InstanceEnum{{{*/
    7878int BoolInput::InstanceEnum(void){
    7979
    … …  
    8282}
    8383/*}}}*/
    84 /*FUNCTION BoolInput::SpawnTriaInput{{{1*/
     84/*FUNCTION BoolInput::SpawnTriaInput{{{*/
    8585Input* BoolInput::SpawnTriaInput(int* indices){
    8686
    … …  
    9797}
    9898/*}}}*/
    99 /*FUNCTION BoolInput::SpawnResult{{{1*/
     99/*FUNCTION BoolInput::SpawnResult{{{*/
    100100ElementResult* BoolInput::SpawnResult(int step, double time){
    101101       
    … …  
    106106
    107107/*Object functions*/
    108 /*FUNCTION BoolInput::GetInputValue(bool* pvalue) {{{1*/
     108/*FUNCTION BoolInput::GetInputValue(bool* pvalue) {{{*/
    109109void BoolInput::GetInputValue(bool* pvalue){
    110110        *pvalue=value;
    111111}
    112112/*}}}*/
    113 /*FUNCTION BoolInput::GetInputValue(int* pvalue){{{1*/
     113/*FUNCTION BoolInput::GetInputValue(int* pvalue){{{*/
    114114void BoolInput::GetInputValue(int* pvalue){_error_(" not supported yet!");}
    115115/*}}}*/
    116 /*FUNCTION BoolInput::GetInputValue(double* pvalue){{{1*/
     116/*FUNCTION BoolInput::GetInputValue(double* pvalue){{{*/
    117117void BoolInput::GetInputValue(double* pvalue){_error_(" not supported yet!");}
    118118/*}}}*/
    119 /*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
     119/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/
    120120void BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");}
    121121/*}}}*/
    122 /*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/
     122/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
    123123void BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");}
    124124/*}}}*/
    125 /*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/
     125/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/
    126126void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}
    127127/*}}}*/
    128 /*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/
     128/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/
    129129void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}
    130130/*}}}*/
    131 /*FUNCTION BoolInput::ChangeEnum{{{1*/
     131/*FUNCTION BoolInput::ChangeEnum{{{*/
    132132void BoolInput::ChangeEnum(int newenumtype){
    133133        this->enum_type=newenumtype;
    134134}
    135135/*}}}*/
    136 /*FUNCTION BoolInput::SquareMin{{{1*/
     136/*FUNCTION BoolInput::SquareMin{{{*/
    137137void BoolInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    138138        /*square of a bool is the bool itself: */
    … …  
    140140}
    141141/*}}}*/
    142 /*FUNCTION BoolInput::Scale{{{1*/
     142/*FUNCTION BoolInput::Scale{{{*/
    143143void BoolInput::Scale(double scale_factor){
    144144        /*a bool cannot be scaled: */
    145145}
    146146/*}}}*/
    147 /*FUNCTION BoolInput::AXPY{{{1*/
     147/*FUNCTION BoolInput::AXPY{{{*/
    148148void BoolInput::AXPY(Input* xinput,double scalar){
    149149
    … …  
    166166}
    167167/*}}}*/
    168 /*FUNCTION BoolInput::Constrain{{{1*/
     168/*FUNCTION BoolInput::Constrain{{{*/
    169169void BoolInput::Constrain(double cm_min, double cm_max){
    170170
    … …  
    174174}
    175175/*}}}*/
    176 /*FUNCTION BoolInput::Extrude{{{1*/
     176/*FUNCTION BoolInput::Extrude{{{*/
    177177void BoolInput::Extrude(void){
    178178
    … …  
    181181}
    182182/*}}}*/
    183 /*FUNCTION BoolInput::GetVectorFromInputs{{{1*/
     183/*FUNCTION BoolInput::GetVectorFromInputs{{{*/
    184184void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){
    185185
    … …  
    188188}
    189189/*}}}*/
    190 /*FUNCTION BoolInput::GetValuesPtr{{{1*/
     190/*FUNCTION BoolInput::GetValuesPtr{{{*/
    191191void BoolInput::GetValuesPtr(double** pvalues,int* pnum_values){
    192192
    … …  
    195195}
    196196/*}}}*/
    197 /*FUNCTION BoolInput::Configure{{{1*/
     197/*FUNCTION BoolInput::Configure{{{*/
    198198void BoolInput::Configure(Parameters* parameters){
    199199        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../../include/include.h"
    … …  
    2121                IssmBool value;
    2222
    23                 /*BoolInput constructors, destructors: {{{1*/
     23                /*BoolInput constructors, destructors: {{{*/
    2424                BoolInput();
    2525                BoolInput(int enum_type,IssmBool value);
    2626                ~BoolInput();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();
    … …  
    3434                Object* copy();
    3535                /*}}}*/
    36                 /*BoolInput management: {{{1*/
     36                /*BoolInput management: {{{*/
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    … …  
    4444                void AddTimeValues(double* values,int step,double time){_error_("not supported yet");};
    4545                /*}}}*/
    46                 /*numerics: {{{1*/
     46                /*numerics: {{{*/
    4747                void GetInputValue(bool* pvalue);
    4848                void GetInputValue(int* pvalue);

  • issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp

    r12014 r12365  
    1818
    1919/*ControlInput constructors and destructor*/
    20 /*FUNCTION ControlInput::ControlInput(){{{1*/
     20/*FUNCTION ControlInput::ControlInput(){{{*/
    2121ControlInput::ControlInput(){
    2222        control_id  = 0;
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){{{1*/
     30/*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){{{*/
    3131ControlInput::ControlInput(int in_enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){
    3232
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION ControlInput::~ControlInput(){{{1*/
     55/*FUNCTION ControlInput::~ControlInput(){{{*/
    5656ControlInput::~ControlInput(){
    5757        delete values;
    … …  
    6464
    6565/*Object virtual functions definitions:*/
    66                 /*FUNCTION ControlInput::Echo {{{1*/
     66                /*FUNCTION ControlInput::Echo {{{*/
    6767void ControlInput::Echo(void){
    6868        this->DeepEcho();
    6969}
    7070/*}}}*/
    71 /*FUNCTION ControlInput::DeepEcho{{{1*/
     71/*FUNCTION ControlInput::DeepEcho{{{*/
    7272void ControlInput::DeepEcho(void){
    7373
    … …  
    8181}
    8282/*}}}*/
    83 /*FUNCTION ControlInput::Id{{{1*/
     83/*FUNCTION ControlInput::Id{{{*/
    8484int    ControlInput::Id(void){ return -1; }
    8585/*}}}*/
    86 /*FUNCTION ControlInput::MyRank{{{1*/
     86/*FUNCTION ControlInput::MyRank{{{*/
    8787int    ControlInput::MyRank(void){
    8888        extern int my_rank;
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION ControlInput::ObjectEnum{{{1*/
     92/*FUNCTION ControlInput::ObjectEnum{{{*/
    9393int ControlInput::ObjectEnum(void){
    9494
    … …  
    9797}
    9898/*}}}*/
    99 /*FUNCTION ControlInput::copy{{{1*/
     99/*FUNCTION ControlInput::copy{{{*/
    100100Object* ControlInput::copy() {
    101101       
    … …  
    117117       
    118118/*ControlInput management*/
    119 /*FUNCTION ControlInput::InstanceEnum{{{1*/
     119/*FUNCTION ControlInput::InstanceEnum{{{*/
    120120int ControlInput::InstanceEnum(void){
    121121
    … …  
    126126
    127127/*Object functions*/
    128 /*FUNCTION ControlInput::Constrain(){{{1*/
     128/*FUNCTION ControlInput::Constrain(){{{*/
    129129void ControlInput::Constrain(void){
    130130
    … …  
    136136        delete values; this->values=newvalues;
    137137}/*}}}*/
    138 /*FUNCTION ControlInput::Constrain(double min, double max){{{1*/
     138/*FUNCTION ControlInput::Constrain(double min, double max){{{*/
    139139void ControlInput::Constrain(double min, double max){
    140140           values->Constrain(min,max);
    141141}/*}}}*/
    142 /*FUNCTION ControlInput::Extrude{{{1*/
     142/*FUNCTION ControlInput::Extrude{{{*/
    143143void ControlInput::Extrude(void){
    144144        values->Extrude();
    … …  
    146146        //gradient->Extrude();
    147147}/*}}}*/
    148 /*FUNCTION ControlInput::GetGradient{{{1*/
     148/*FUNCTION ControlInput::GetGradient{{{*/
    149149void ControlInput::GetGradient(Vector* gradient_vec,int* doflist){
    150150        if(gradient) gradient->GetVectorFromInputs(gradient_vec,doflist);
    151151}/*}}}*/
    152 /*FUNCTION ControlInput::ScaleGradient{{{1*/
     152/*FUNCTION ControlInput::ScaleGradient{{{*/
    153153void ControlInput::ScaleGradient(double scaling_factor){
    154154        if(!gradient) _error_("Gradient of ControlInput %s not found",EnumToStringx(enum_type));
    155155        gradient->Scale(scaling_factor);
    156156}/*}}}*/
    157 /*FUNCTION ControlInput::SetGradient{{{1*/
     157/*FUNCTION ControlInput::SetGradient{{{*/
    158158void ControlInput::SetGradient(Input* gradient_in){
    159159
    … …  
    178178
    179179}/*}}}*/
    180 /*FUNCTION ControlInput::SetInput{{{1*/
     180/*FUNCTION ControlInput::SetInput{{{*/
    181181void ControlInput::SetInput(Input* in_input){
    182182
    … …  
    185185
    186186}/*}}}*/
    187 /*FUNCTION ControlInput::SpawnResult{{{1*/
     187/*FUNCTION ControlInput::SpawnResult{{{*/
    188188ElementResult* ControlInput::SpawnResult(int step, double time){
    189189        return savedvalues->SpawnResult(step,time);
    190190}/*}}}*/
    191 /*FUNCTION ControlInput::SpawnTriaInput{{{1*/
     191/*FUNCTION ControlInput::SpawnTriaInput{{{*/
    192192Input* ControlInput::SpawnTriaInput(int* indices){
    193193        return values->SpawnTriaInput(indices);
    194194}/*}}}*/
    195 /*FUNCTION ControlInput::SpawnGradient{{{1*/
     195/*FUNCTION ControlInput::SpawnGradient{{{*/
    196196ElementResult* ControlInput::SpawnGradient(int step, double time){
    197197        _assert_(gradient);
    198198        return gradient->SpawnResult(step,time);
    199199}/*}}}*/
    200 /*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){{{1*/
     200/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){{{*/
    201201void ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){
    202202        values->GetVectorFromInputs(vector,doflist);
    203203}/*}}}*/
    204 /*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){{{1*/
     204/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){{{*/
    205205void ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){
    206206         if(strcmp(data,"value")==0){
    … …  
    224224         }
    225225}/*}}}*/
    226 /*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{1*/
     226/*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{*/
    227227void ControlInput::GetInputAverage(double* pvalue){
    228228        values->GetInputAverage(pvalue);
    229229}/*}}}*/
    230 /*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/
     230/*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{*/
    231231void ControlInput::GetInputValue(bool* pvalue){
    232232        values->GetInputValue(pvalue);
    233233}/*}}}*/
    234 /*FUNCTION ControlInput::GetInputValue(int* pvalue){{{1*/
     234/*FUNCTION ControlInput::GetInputValue(int* pvalue){{{*/
    235235void ControlInput::GetInputValue(int* pvalue){
    236236        values->GetInputValue(pvalue);
    237237}/*}}}*/
    238 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/
     238/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/
    239239void ControlInput::GetInputValue(double* pvalue){
    240240        values->GetInputValue(pvalue);
    241241}/*}}}*/
    242 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/
     242/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/
    243243void ControlInput::GetInputValue(double* pvalue,GaussTria* gauss){
    244244        values->GetInputValue(pvalue,gauss);
    245245}/*}}}*/
    246 /*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/
     246/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/
    247247void ControlInput::GetInputValue(double* pvalue,GaussPenta* gauss){
    248248        values->GetInputValue(pvalue,gauss);
    249249}/*}}}*/
    250 /*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/
     250/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/
    251251void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){
    252252        values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss);
    253253}/*}}}*/
    254 /*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/
     254/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/
    255255void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){
    256256        values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss);
    257257}/*}}}*/
    258 /*FUNCTION ControlInput::SaveValue{{{1*/
     258/*FUNCTION ControlInput::SaveValue{{{*/
    259259void ControlInput::SaveValue(void){
    260260        if(!values) _error_("Values of %s not found",EnumToStringx(this->enum_type));
    … …  
    263263        this->savedvalues=(Input*)this->values->copy();
    264264}/*}}}*/
    265 /*FUNCTION ControlInput::UpdateValue{{{1*/
     265/*FUNCTION ControlInput::UpdateValue{{{*/
    266266void ControlInput::UpdateValue(double scalar){
    267267        if(!gradient)    _error_("Gradient of %s not found",EnumToStringx(this->enum_type));
    … …  
    272272        this->values->AXPY(gradient,scalar);
    273273}/*}}}*/
    274 /*FUNCTION ControlInput::VerticallyIntegrate{{{1*/
     274/*FUNCTION ControlInput::VerticallyIntegrate{{{*/
    275275void ControlInput::VerticallyIntegrate(Input* thickness_input){
    276276        values->VerticallyIntegrate(thickness_input);
    277277}/*}}}*/
    278 /*FUNCTION ControlInput::Configure{{{1*/
     278/*FUNCTION ControlInput::Configure{{{*/
    279279void ControlInput::Configure(Parameters* parameters){
    280280        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../../include/include.h"
    … …  
    2525                Input* gradient;
    2626
    27                 /*ControlInput constructors, destructors: {{{1*/
     27                /*ControlInput constructors, destructors: {{{*/
    2828                ControlInput();
    2929                ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id);
    3030                ~ControlInput();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1 */
     32                /*Object virtual functions definitions:{{{ */
    3333                void  Echo();
    3434                void  DeepEcho();
    … …  
    3838                Object* copy();
    3939                /*}}}*/
    40                 /*ControlInput management: {{{1*/
     40                /*ControlInput management: {{{*/
    4141                int    InstanceEnum();
    4242                Input* SpawnTriaInput(int* indices);
    … …  
    4848                void Configure(Parameters* parameters);
    4949                /*}}}*/
    50                 /*numerics: {{{1*/
     50                /*numerics: {{{*/
    5151                void SetInput(Input* in_input);
    5252                void GetInputValue(bool* pvalue);

  • issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp

    r12014 r12365  
    22 * \brief: implementation of the datasetinput object
    33 */
    4 /*Headers{{{1*/
     4/*Headers{{{*/
    55#ifdef HAVE_CONFIG_H
    66        #include <config.h>
    … …  
    1919
    2020/*DatasetInput constructors and destructor*/
    21 /*FUNCTION DatasetInput::DatasetInput(){{{1*/
     21/*FUNCTION DatasetInput::DatasetInput(){{{*/
    2222DatasetInput::DatasetInput(){
    2323        enum_type=UNDEF;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION DatasetInput::DatasetInput(int in_enum_type) {{{1*/
     27/*FUNCTION DatasetInput::DatasetInput(int in_enum_type) {{{*/
    2828DatasetInput::DatasetInput(int in_enum_type){
    2929
    … …  
    3232}
    3333/*}}}*/
    34 /*FUNCTION DatasetInput::~DatasetInput(){{{1*/
     34/*FUNCTION DatasetInput::~DatasetInput(){{{*/
    3535DatasetInput::~DatasetInput(){
    3636        delete inputs;
    … …  
    3939
    4040/*Object virtual functions definitions:*/
    41                 /*FUNCTION DatasetInput::Echo {{{1*/
     41                /*FUNCTION DatasetInput::Echo {{{*/
    4242void DatasetInput::Echo(void){
    4343        this->DeepEcho();
    4444}
    4545/*}}}*/
    46 /*FUNCTION DatasetInput::DeepEcho{{{1*/
     46/*FUNCTION DatasetInput::DeepEcho{{{*/
    4747void DatasetInput::DeepEcho(void){
    4848
    … …  
    5252}
    5353/*}}}*/
    54 /*FUNCTION DatasetInput::Id{{{1*/
     54/*FUNCTION DatasetInput::Id{{{*/
    5555int    DatasetInput::Id(void){ return -1; }
    5656/*}}}*/
    57 /*FUNCTION DatasetInput::MyRank{{{1*/
     57/*FUNCTION DatasetInput::MyRank{{{*/
    5858int    DatasetInput::MyRank(void){
    5959        extern int my_rank;
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION DatasetInput::ObjectEnum{{{1*/
     63/*FUNCTION DatasetInput::ObjectEnum{{{*/
    6464int DatasetInput::ObjectEnum(void){
    6565
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION DatasetInput::copy{{{1*/
     70/*FUNCTION DatasetInput::copy{{{*/
    7171Object* DatasetInput::copy() {
    7272       
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION DatasetInput::SpawnTriaInput{{{1*/
     82/*FUNCTION DatasetInput::SpawnTriaInput{{{*/
    8383Input* DatasetInput::SpawnTriaInput(int* indices){
    8484
    … …  
    9797       
    9898/*DatasetInput management*/
    99 /*FUNCTION DatasetInput::InstanceEnum{{{1*/
     99/*FUNCTION DatasetInput::InstanceEnum{{{*/
    100100int DatasetInput::InstanceEnum(void){
    101101
    … …  
    106106
    107107/*Object functions*/
    108 /*FUNCTION DatasetInput::Configure{{{1*/
     108/*FUNCTION DatasetInput::Configure{{{*/
    109109void DatasetInput::Configure(Parameters* parameters){
    110110        /*do nothing: */
    111111}
    112112/*}}}*/
    113 /*FUNCTION DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){{{1*/
     113/*FUNCTION DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){{{*/
    114114void DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){
    115115

  • issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../../include/include.h"
    … …  
    2121                Inputs*     inputs;
    2222
    23                 /*DatasetInput constructors, destructors: {{{1*/
     23                /*DatasetInput constructors, destructors: {{{*/
    2424                DatasetInput();
    2525                DatasetInput(int enum_type);
    2626                ~DatasetInput();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();
    … …  
    3434                Object* copy();
    3535                /*}}}*/
    36                 /*DatasetInput management: {{{1*/
     36                /*DatasetInput management: {{{*/
    3737                int    InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    … …  
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    46                 /*numeriics: {{{1*/
     46                /*numeriics: {{{*/
    4747                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
    4848                void GetInputValue(int* pvalue){_error_("not implemented yet");};

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

    r12018 r12365  
    1818
    1919/*DoubleInput constructors and destructor*/
    20 /*FUNCTION DoubleInput::DoubleInput(){{{1*/
     20/*FUNCTION DoubleInput::DoubleInput(){{{*/
    2121DoubleInput::DoubleInput(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION DoubleInput::DoubleInput(double value){{{1*/
     25/*FUNCTION DoubleInput::DoubleInput(double value){{{*/
    2626DoubleInput::DoubleInput(int in_enum_type,IssmDouble in_value){
    2727
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION DoubleInput::~DoubleInput(){{{1*/
     32/*FUNCTION DoubleInput::~DoubleInput(){{{*/
    3333DoubleInput::~DoubleInput(){
    3434        return;
    … …  
    3737
    3838/*Object virtual functions definitions:*/
    39                 /*FUNCTION DoubleInput::Echo {{{1*/
     39                /*FUNCTION DoubleInput::Echo {{{*/
    4040void DoubleInput::Echo(void){
    4141        this->DeepEcho();
    4242}
    4343/*}}}*/
    44 /*FUNCTION DoubleInput::DeepEcho{{{1*/
     44/*FUNCTION DoubleInput::DeepEcho{{{*/
    4545void DoubleInput::DeepEcho(void){
    4646
    … …  
    5050}
    5151/*}}}*/
    52 /*FUNCTION DoubleInput::Id{{{1*/
     52/*FUNCTION DoubleInput::Id{{{*/
    5353int    DoubleInput::Id(void){ return -1; }
    5454/*}}}*/
    55 /*FUNCTION DoubleInput::MyRank{{{1*/
     55/*FUNCTION DoubleInput::MyRank{{{*/
    5656int    DoubleInput::MyRank(void){
    5757        extern int my_rank;
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION DoubleInput::ObjectEnum{{{1*/
     61/*FUNCTION DoubleInput::ObjectEnum{{{*/
    6262int DoubleInput::ObjectEnum(void){
    6363
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION DoubleInput::copy{{{1*/
     68/*FUNCTION DoubleInput::copy{{{*/
    6969Object* DoubleInput::copy() {
    7070       
    … …  
    7575       
    7676/*DoubleInput management*/
    77 /*FUNCTION DoubleInput::InstanceEnum{{{1*/
     77/*FUNCTION DoubleInput::InstanceEnum{{{*/
    7878int DoubleInput::InstanceEnum(void){
    7979
    … …  
    8282}
    8383/*}}}*/
    84 /*FUNCTION DoubleInput::SpawnTriaInput{{{1*/
     84/*FUNCTION DoubleInput::SpawnTriaInput{{{*/
    8585Input* DoubleInput::SpawnTriaInput(int* indices){
    8686
    … …  
    9797}
    9898/*}}}*/
    99 /*FUNCTION DoubleInput::SpawnResult{{{1*/
     99/*FUNCTION DoubleInput::SpawnResult{{{*/
    100100ElementResult* DoubleInput::SpawnResult(int step, double time){
    101101
    … …  
    106106
    107107/*Object functions*/
    108 /*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{1*/
     108/*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{*/
    109109void DoubleInput::GetInputValue(bool* pvalue){
    110110        _error_("Double input of enum %s cannot return a boolean",EnumToStringx(enum_type));
    … …  
    112112}
    113113/*}}}*/
    114 /*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{1*/
     114/*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{*/
    115115void DoubleInput::GetInputValue(int* pvalue){
    116116        _error_("Double input of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));
    … …  
    118118}
    119119/*}}}*/
    120 /*FUNCTION DoubleInput::GetInputValue(double* pvalue){{{1*/
     120/*FUNCTION DoubleInput::GetInputValue(double* pvalue){{{*/
    121121void DoubleInput::GetInputValue(double* pvalue){
    122122
    … …  
    125125}
    126126/*}}}*/
    127 /*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
     127/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/
    128128void DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){*pvalue=this->value;}
    129129/*}}}*/
    130 /*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/
     130/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
    131131void DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){*pvalue=this->value;}
    132132/*}}}*/
    133 /*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/
     133/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/
    134134void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}
    135135/*}}}*/
    136 /*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/
     136/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/
    137137void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}
    138138/*}}}*/
    139 /*FUNCTION DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){{{1*/
     139/*FUNCTION DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){{{*/
    140140void DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){
    141141        /*Epsilon is zero as vx is constant over the element*/
    … …  
    143143}
    144144/*}}}*/
    145 /*FUNCTION DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){{{1*/
     145/*FUNCTION DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){{{*/
    146146void DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){
    147147        /*Epsilon is zero as vy is constant over the element*/
    … …  
    149149}
    150150/*}}}*/
    151 /*FUNCTION DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{1*/
     151/*FUNCTION DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{*/
    152152void DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){
    153153        /*Epsilon is zero as vx is constant over the element*/
    … …  
    155155}
    156156/*}}}*/
    157 /*FUNCTION DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{1*/
     157/*FUNCTION DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{*/
    158158void DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){
    159159        /*Epsilon is zero as vy is constant over the element*/
    … …  
    161161}
    162162/*}}}*/
    163 /*FUNCTION DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){{{1*/
     163/*FUNCTION DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){{{*/
    164164void DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){
    165165        /*Epsilon is zero as vz is constant over the element*/
    … …  
    167167}
    168168/*}}}*/
    169 /*FUNCTION DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{1*/
     169/*FUNCTION DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{*/
    170170void DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){
    171171        /*Epsilon is zero as vx is constant over the element*/
    … …  
    173173}
    174174/*}}}*/
    175 /*FUNCTION DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{1*/
     175/*FUNCTION DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{*/
    176176void DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){
    177177        /*Epsilon is zero as vy is constant over the element*/
    … …  
    179179}
    180180/*}}}*/
    181 /*FUNCTION DoubleInput::ChangeEnum{{{1*/
     181/*FUNCTION DoubleInput::ChangeEnum{{{*/
    182182void DoubleInput::ChangeEnum(int newenumtype){
    183183        this->enum_type=newenumtype;
    184184}
    185185/*}}}*/
    186 /*FUNCTION DoubleInput::SquareMin{{{1*/
     186/*FUNCTION DoubleInput::SquareMin{{{*/
    187187void DoubleInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    188188
    … …  
    191191}
    192192/*}}}*/
    193 /*FUNCTION DoubleInput::Scale{{{1*/
     193/*FUNCTION DoubleInput::Scale{{{*/
    194194void DoubleInput::Scale(double scale_factor){
    195195        value=value*scale_factor;
    196196}
    197197/*}}}*/
    198 /*FUNCTION DoubleInput::ConstrainMin{{{1*/
     198/*FUNCTION DoubleInput::ConstrainMin{{{*/
    199199void DoubleInput::ConstrainMin(double minimum){
    200200        if (value<minimum) value=minimum;
    201201}
    202202/*}}}*/
    203 /*FUNCTION DoubleInput::AXPY{{{1*/
     203/*FUNCTION DoubleInput::AXPY{{{*/
    204204void DoubleInput::AXPY(Input* xinput,double scalar){
    205205
    … …  
    222222}
    223223/*}}}*/
    224 /*FUNCTION DoubleInput::Constrain{{{1*/
     224/*FUNCTION DoubleInput::Constrain{{{*/
    225225void DoubleInput::Constrain(double cm_min, double cm_max){
    226226
    … …  
    230230}
    231231/*}}}*/
    232 /*FUNCTION DoubleInput::Max{{{1*/
     232/*FUNCTION DoubleInput::Max{{{*/
    233233double DoubleInput::Max(void){
    234234        return this->value;
    235235}
    236236/*}}}*/
    237 /*FUNCTION DoubleInput::MaxAbs{{{1*/
     237/*FUNCTION DoubleInput::MaxAbs{{{*/
    238238double DoubleInput::MaxAbs(void){
    239239        return fabs(this->value);
    240240}
    241241/*}}}*/
    242 /*FUNCTION DoubleInput::Min{{{1*/
     242/*FUNCTION DoubleInput::Min{{{*/
    243243double DoubleInput::Min(void){
    244244        return this->value;
    245245}
    246246/*}}}*/
    247 /*FUNCTION DoubleInput::MinAbs{{{1*/
     247/*FUNCTION DoubleInput::MinAbs{{{*/
    248248double DoubleInput::MinAbs(void){
    249249        return fabs(this->value);
    250250}
    251251/*}}}*/
    252 /*FUNCTION DoubleInput::GetVectorFromInputs{{{1*/
     252/*FUNCTION DoubleInput::GetVectorFromInputs{{{*/
    253253void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){
    254254
    … …  
    257257}
    258258/*}}}*/
    259 /*FUNCTION DoubleInput::GetValuesPtr{{{1*/
     259/*FUNCTION DoubleInput::GetValuesPtr{{{*/
    260260void DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values){
    261261
    … …  
    264264}
    265265/*}}}*/
    266 /*FUNCTION DoubleInput::GetInputAverage{{{1*/
     266/*FUNCTION DoubleInput::GetInputAverage{{{*/
    267267void DoubleInput::GetInputAverage(double* pvalue){
    268268        *pvalue=value;
    269269}
    270270/*}}}*/
    271 /*FUNCTION DoubleInput::VerticallyIntegrate{{{1*/
     271/*FUNCTION DoubleInput::VerticallyIntegrate{{{*/
    272272void DoubleInput::VerticallyIntegrate(Input* thickness_input){
    273273
    … …  
    291291}
    292292/*}}}*/
    293 /*FUNCTION DoubleInput::PointwiseDivide{{{1*/
     293/*FUNCTION DoubleInput::PointwiseDivide{{{*/
    294294Input* DoubleInput::PointwiseDivide(Input* inputB){
    295295
    … …  
    311311}
    312312/*}}}*/
    313 /*FUNCTION DoubleInput::PointwiseMin{{{1*/
     313/*FUNCTION DoubleInput::PointwiseMin{{{*/
    314314Input* DoubleInput::PointwiseMin(Input* input){
    315315
    … …  
    332332}
    333333/*}}}*/
    334 /*FUNCTION DoubleInput::PointwiseMax{{{1*/
     334/*FUNCTION DoubleInput::PointwiseMax{{{*/
    335335Input* DoubleInput::PointwiseMax(Input* input){
    336336
    … …  
    353353}
    354354/*}}}*/
    355 /*FUNCTION DoubleInput::Configure{{{1*/
     355/*FUNCTION DoubleInput::Configure{{{*/
    356356void DoubleInput::Configure(Parameters* parameters){
    357357        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../../include/include.h"
    … …  
    2020                double value;
    2121
    22                 /*DoubleInput constructors, destructors: {{{1*/
     22                /*DoubleInput constructors, destructors: {{{*/
    2323                DoubleInput();
    2424                DoubleInput(int enum_type,IssmDouble value);
    2525                ~DoubleInput();
    2626                /*}}}*/
    27                 /*Object virtual functions definitions:{{{1 */
     27                /*Object virtual functions definitions:{{{ */
    2828                void  Echo();
    2929                void  DeepEcho();
    … …  
    3333                Object* copy();
    3434                /*}}}*/
    35                 /*DoubleInput management: {{{1*/
     35                /*DoubleInput management: {{{*/
    3636                int   InstanceEnum();
    3737                Input* SpawnTriaInput(int* indices);
    … …  
    4343                void Configure(Parameters* parameters);
    4444                /*}}}*/
    45                 /*numerics: {{{1*/
     45                /*numerics: {{{*/
    4646                void GetInputValue(bool* pvalue);
    4747                void GetInputValue(int* pvalue);

  • issm/trunk-jpl/src/c/objects/Inputs/Input.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "../Object.h"
    1212class Node;
    … …  
    2121               
    2222                virtual        ~Input(){};
    23                 /*Virtual functions:{{{1*/
     23                /*Virtual functions:{{{*/
    2424                virtual int  InstanceEnum()=0;
    2525                virtual void GetInputValue(bool* pvalue)=0;

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

    r12014 r12365  
    1818
    1919/*IntInput constructors and destructor*/
    20 /*FUNCTION IntInput::IntInput(){{{1*/
     20/*FUNCTION IntInput::IntInput(){{{*/
    2121IntInput::IntInput(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION IntInput::IntInput(double* values){{{1*/
     25/*FUNCTION IntInput::IntInput(double* values){{{*/
    2626IntInput::IntInput(int in_enum_type,IssmInt in_value){
    2727
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION IntInput::~IntInput(){{{1*/
     32/*FUNCTION IntInput::~IntInput(){{{*/
    3333IntInput::~IntInput(){
    3434        return;
    … …  
    3737
    3838/*Object virtual functions definitions:*/
    39 /*FUNCTION IntInput::DeepEcho{{{1*/
     39/*FUNCTION IntInput::DeepEcho{{{*/
    4040void IntInput::DeepEcho(void){
    4141
    … …  
    4545}
    4646/*}}}*/
    47 /*FUNCTION IntInput::Id{{{1*/
     47/*FUNCTION IntInput::Id{{{*/
    4848int    IntInput::Id(void){ return -1; }
    4949/*}}}*/
    50 /*FUNCTION IntInput::MyRank{{{1*/
     50/*FUNCTION IntInput::MyRank{{{*/
    5151int    IntInput::MyRank(void){
    5252        extern int my_rank;
    … …  
    5454}
    5555/*}}}*/
    56 /*FUNCTION IntInput::ObjectEnum{{{1*/
     56/*FUNCTION IntInput::ObjectEnum{{{*/
    5757int IntInput::ObjectEnum(void){
    5858
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION IntInput::copy{{{1*/
     63/*FUNCTION IntInput::copy{{{*/
    6464Object* IntInput::copy() {
    6565       
    … …  
    7070
    7171/*IntInput management*/
    72 /*FUNCTION IntInput::Echo {{{1*/
     72/*FUNCTION IntInput::Echo {{{*/
    7373void IntInput::Echo(void){
    7474        this->DeepEcho();
    7575}
    7676/*}}}*/
    77 /*FUNCTION IntInput::InstanceEnum{{{1*/
     77/*FUNCTION IntInput::InstanceEnum{{{*/
    7878int IntInput::InstanceEnum(void){
    7979
    … …  
    8282}
    8383/*}}}*/
    84 /*FUNCTION IntInput::SpawnTriaInput{{{1*/
     84/*FUNCTION IntInput::SpawnTriaInput{{{*/
    8585Input* IntInput::SpawnTriaInput(int* indices){
    8686
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION IntInput::SpawnResult{{{1*/
     98/*FUNCTION IntInput::SpawnResult{{{*/
    9999ElementResult* IntInput::SpawnResult(int step, double time){
    100100       
    … …  
    105105
    106106/*Object functions*/
    107 /*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{1*/
     107/*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/
    108108void IntInput::GetInputValue(bool* pvalue){_error_(" not supported yet!");}
    109109/*}}}*/
    110 /*FUNCTION IntInput::GetInputValue(int* pvalue){{{1*/
     110/*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/
    111111void IntInput::GetInputValue(int* pvalue){
    112112        *pvalue=value;
    113113}
    114114/*}}}*/
    115 /*FUNCTION IntInput::GetInputValue(double* pvalue){{{1*/
     115/*FUNCTION IntInput::GetInputValue(double* pvalue){{{*/
    116116void IntInput::GetInputValue(double* pvalue){
    117117        _error_("IntInput cannot return a double in parallel");
    118118}
    119119/*}}}*/
    120 /*FUNCTION IntInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
     120/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/
    121121void IntInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");}
    122122/*}}}*/
    123 /*FUNCTION IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/
     123/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
    124124void IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");}
    125125/*}}}*/
    126 /*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/
     126/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/
    127127void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");}
    128128/*}}}*/
    129 /*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/
     129/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/
    130130void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");}
    131131/*}}}*/
    132 /*FUNCTION IntInput::ChangeEnum{{{1*/
     132/*FUNCTION IntInput::ChangeEnum{{{*/
    133133void IntInput::ChangeEnum(int newenumtype){
    134134        this->enum_type=newenumtype;
    135135}
    136136/*}}}*/
    137 /*FUNCTION IntInput::SquareMin{{{1*/
     137/*FUNCTION IntInput::SquareMin{{{*/
    138138void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    139139
    … …  
    142142}
    143143/*}}}*/
    144 /*FUNCTION IntInput::Scale{{{1*/
     144/*FUNCTION IntInput::Scale{{{*/
    145145void IntInput::Scale(double scale_factor){
    146146        double dvalue=(double)value*scale_factor;
    … …  
    148148}
    149149/*}}}*/
    150 /*FUNCTION IntInput::AXPY{{{1*/
     150/*FUNCTION IntInput::AXPY{{{*/
    151151void IntInput::AXPY(Input* xinput,double scalar){
    152152
    … …  
    171171}
    172172/*}}}*/
    173 /*FUNCTION IntInput::Constrain{{{1*/
     173/*FUNCTION IntInput::Constrain{{{*/
    174174void IntInput::Constrain(double cm_min, double cm_max){
    175175
    … …  
    179179}
    180180/*}}}*/
    181 /*FUNCTION IntInput::GetVectorFromInputs{{{1*/
     181/*FUNCTION IntInput::GetVectorFromInputs{{{*/
    182182void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){
    183183
    … …  
    186186}
    187187/*}}}*/
    188 /*FUNCTION IntInput::GetValuesPtr{{{1*/
     188/*FUNCTION IntInput::GetValuesPtr{{{*/
    189189void IntInput::GetValuesPtr(double** pvalues,int* pnum_values){
    190190
    … …  
    193193}
    194194/*}}}*/
    195 /*FUNCTION IntInput::Configure{{{1*/
     195/*FUNCTION IntInput::Configure{{{*/
    196196void IntInput::Configure(Parameters* parameters){
    197197        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/IntInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../../include/include.h"
    … …  
    2121                IssmInt value;
    2222
    23                 /*IntInput constructors, destructors: {{{1*/
     23                /*IntInput constructors, destructors: {{{*/
    2424                IntInput();
    2525                IntInput(int enum_type,IssmInt value);
    2626                ~IntInput();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();
    … …  
    3434                Object* copy();
    3535                /*}}}*/
    36                 /*IntInput management: {{{1*/
     36                /*IntInput management: {{{*/
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    … …  
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    46                 /*numerics: {{{1*/
     46                /*numerics: {{{*/
    4747                void GetInputValue(bool* pvalue);
    4848                void GetInputValue(int* pvalue);

  • issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp

    r12014 r12365  
    1818
    1919/*PentaP1Input constructors and destructor*/
    20 /*FUNCTION PentaP1Input::PentaP1Input(){{{1*/
     20/*FUNCTION PentaP1Input::PentaP1Input(){{{*/
    2121PentaP1Input::PentaP1Input(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION PentaP1Input::PentaP1Input(int in_enum_type,double* values){{{1*/
     25/*FUNCTION PentaP1Input::PentaP1Input(int in_enum_type,double* values){{{*/
    2626PentaP1Input::PentaP1Input(int in_enum_type,double* in_values)
    2727                :PentaRef(1)
    … …  
    4141}
    4242/*}}}*/
    43 /*FUNCTION PentaP1Input::~PentaP1Input(){{{1*/
     43/*FUNCTION PentaP1Input::~PentaP1Input(){{{*/
    4444PentaP1Input::~PentaP1Input(){
    4545        return;
    … …  
    4848
    4949/*Object virtual functions definitions:*/
    50 /*FUNCTION PentaP1Input::Echo {{{1*/
     50/*FUNCTION PentaP1Input::Echo {{{*/
    5151void PentaP1Input::Echo(void){
    5252        this->DeepEcho();
    5353}
    5454/*}}}*/
    55 /*FUNCTION PentaP1Input::DeepEcho{{{1*/
     55/*FUNCTION PentaP1Input::DeepEcho{{{*/
    5656void PentaP1Input::DeepEcho(void){
    5757
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION PentaP1Input::Id{{{1*/
     63/*FUNCTION PentaP1Input::Id{{{*/
    6464int    PentaP1Input::Id(void){ return -1; }
    6565/*}}}*/
    66 /*FUNCTION PentaP1Input::MyRank{{{1*/
     66/*FUNCTION PentaP1Input::MyRank{{{*/
    6767int    PentaP1Input::MyRank(void){
    6868        extern int my_rank;
    … …  
    7070}
    7171/*}}}*/
    72 /*FUNCTION PentaP1Input::ObjectEnum{{{1*/
     72/*FUNCTION PentaP1Input::ObjectEnum{{{*/
    7373int PentaP1Input::ObjectEnum(void){
    7474
    … …  
    7979       
    8080/*PentaP1Input management*/
    81 /*FUNCTION PentaP1Input::copy{{{1*/
     81/*FUNCTION PentaP1Input::copy{{{*/
    8282Object* PentaP1Input::copy() {
    8383       
    … …  
    8686}
    8787/*}}}*/
    88 /*FUNCTION PentaP1Input::InstanceEnum{{{1*/
     88/*FUNCTION PentaP1Input::InstanceEnum{{{*/
    8989int PentaP1Input::InstanceEnum(void){
    9090
    … …  
    9393}
    9494/*}}}*/
    95 /*FUNCTION PentaP1Input::SpawnTriaInput{{{1*/
     95/*FUNCTION PentaP1Input::SpawnTriaInput{{{*/
    9696Input* PentaP1Input::SpawnTriaInput(int* indices){
    9797
    … …  
    118118}
    119119/*}}}*/
    120 /*FUNCTION PentaP1Input::SpawnResult{{{1*/
     120/*FUNCTION PentaP1Input::SpawnResult{{{*/
    121121ElementResult* PentaP1Input::SpawnResult(int step, double time){
    122122
    … …  
    127127
    128128/*Object functions*/
    129 /*FUNCTION PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/
     129/*FUNCTION PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/
    130130void PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){
    131131
    … …  
    135135}
    136136/*}}}*/
    137 /*FUNCTION PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/
     137/*FUNCTION PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{*/
    138138void PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){
    139139
    … …  
    142142}
    143143/*}}}*/
    144 /*FUNCTION PentaP1Input::GetVxStrainRate3d{{{1*/
     144/*FUNCTION PentaP1Input::GetVxStrainRate3d{{{*/
    145145void PentaP1Input::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){
    146146        int i,j;
    … …  
    187187}
    188188/*}}}*/
    189 /*FUNCTION PentaP1Input::GetVyStrainRate3d{{{1*/
     189/*FUNCTION PentaP1Input::GetVyStrainRate3d{{{*/
    190190void PentaP1Input::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){
    191191        int i,j;
    … …  
    232232}
    233233/*}}}*/
    234 /*FUNCTION PentaP1Input::GetVzStrainRate3d{{{1*/
     234/*FUNCTION PentaP1Input::GetVzStrainRate3d{{{*/
    235235void PentaP1Input::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){
    236236        int i,j;
    … …  
    278278}
    279279/*}}}*/
    280 /*FUNCTION PentaP1Input::GetVxStrainRate3dPattyn{{{1*/
     280/*FUNCTION PentaP1Input::GetVxStrainRate3dPattyn{{{*/
    281281void PentaP1Input::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){
    282282
    … …  
    302302}
    303303/*}}}*/
    304 /*FUNCTION PentaP1Input::GetVyStrainRate3dPattyn{{{1*/
     304/*FUNCTION PentaP1Input::GetVyStrainRate3dPattyn{{{*/
    305305void PentaP1Input::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){
    306306
    … …  
    326326}
    327327/*}}}*/
    328 /*FUNCTION PentaP1Input::ChangeEnum{{{1*/
     328/*FUNCTION PentaP1Input::ChangeEnum{{{*/
    329329void PentaP1Input::ChangeEnum(int newenumtype){
    330330        this->enum_type=newenumtype;
    331331}
    332332/*}}}*/
    333 /*FUNCTION PentaP1Input::GetInputAverage{{{1*/
     333/*FUNCTION PentaP1Input::GetInputAverage{{{*/
    334334void PentaP1Input::GetInputAverage(double* pvalue){
    335335        *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]);
    … …  
    338338
    339339/*Intermediary*/
    340 /*FUNCTION PentaP1Input::SquareMin{{{1*/
     340/*FUNCTION PentaP1Input::SquareMin{{{*/
    341341void PentaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    342342
    … …  
    361361}
    362362/*}}}*/
    363 /*FUNCTION PentaP1Input::ConstrainMin{{{1*/
     363/*FUNCTION PentaP1Input::ConstrainMin{{{*/
    364364void PentaP1Input::ConstrainMin(double minimum){
    365365       
    … …  
    370370}
    371371/*}}}*/
    372 /*FUNCTION PentaP1Input::InfinityNorm{{{1*/
     372/*FUNCTION PentaP1Input::InfinityNorm{{{*/
    373373double PentaP1Input::InfinityNorm(void){
    374374
    … …  
    381381}
    382382/*}}}*/
    383 /*FUNCTION PentaP1Input::Max{{{1*/
     383/*FUNCTION PentaP1Input::Max{{{*/
    384384double PentaP1Input::Max(void){
    385385
    … …  
    393393}
    394394/*}}}*/
    395 /*FUNCTION PentaP1Input::MaxAbs{{{1*/
     395/*FUNCTION PentaP1Input::MaxAbs{{{*/
    396396double PentaP1Input::MaxAbs(void){
    397397
    … …  
    405405}
    406406/*}}}*/
    407 /*FUNCTION PentaP1Input::Min{{{1*/
     407/*FUNCTION PentaP1Input::Min{{{*/
    408408double PentaP1Input::Min(void){
    409409
    … …  
    417417}
    418418/*}}}*/
    419 /*FUNCTION PentaP1Input::MinAbs{{{1*/
     419/*FUNCTION PentaP1Input::MinAbs{{{*/
    420420double PentaP1Input::MinAbs(void){
    421421
    … …  
    429429}
    430430/*}}}*/
    431 /*FUNCTION PentaP1Input::Scale{{{1*/
     431/*FUNCTION PentaP1Input::Scale{{{*/
    432432void PentaP1Input::Scale(double scale_factor){
    433433       
    … …  
    438438}
    439439/*}}}*/
    440 /*FUNCTION PentaP1Input::AXPY{{{1*/
     440/*FUNCTION PentaP1Input::AXPY{{{*/
    441441void PentaP1Input::AXPY(Input* xinput,double scalar){
    442442
    … …  
    465465}
    466466/*}}}*/
    467 /*FUNCTION PentaP1Input::Constrain{{{1*/
     467/*FUNCTION PentaP1Input::Constrain{{{*/
    468468void PentaP1Input::Constrain(double cm_min, double cm_max){
    469469
    … …  
    476476}
    477477/*}}}*/
    478 /*FUNCTION PentaP1Input::Extrude{{{1*/
     478/*FUNCTION PentaP1Input::Extrude{{{*/
    479479void PentaP1Input::Extrude(void){
    480480
    … …  
    485485}
    486486/*}}}*/
    487 /*FUNCTION PentaP1Input::VerticallyIntegrate{{{1*/
     487/*FUNCTION PentaP1Input::VerticallyIntegrate{{{*/
    488488void PentaP1Input::VerticallyIntegrate(Input* thickness_input){
    489489
    … …  
    515515}
    516516/*}}}*/
    517 /*FUNCTION PentaP1Input::PointwiseDivide{{{1*/
     517/*FUNCTION PentaP1Input::PointwiseDivide{{{*/
    518518Input* PentaP1Input::PointwiseDivide(Input* inputB){
    519519
    … …  
    546546}
    547547/*}}}*/
    548 /*FUNCTION PentaP1Input::PointwiseMin{{{1*/
     548/*FUNCTION PentaP1Input::PointwiseMin{{{*/
    549549Input* PentaP1Input::PointwiseMin(Input* inputB){
    550550
    … …  
    577577}
    578578/*}}}*/
    579 /*FUNCTION PentaP1Input::PointwiseMax{{{1*/
     579/*FUNCTION PentaP1Input::PointwiseMax{{{*/
    580580Input* PentaP1Input::PointwiseMax(Input* inputB){
    581581
    … …  
    608608}
    609609/*}}}*/
    610 /*FUNCTION PentaP1Input::GetVectorFromInputs{{{1*/
     610/*FUNCTION PentaP1Input::GetVectorFromInputs{{{*/
    611611void PentaP1Input::GetVectorFromInputs(Vector* vector,int* doflist){
    612612
    … …  
    615615
    616616} /*}}}*/
    617 /*FUNCTION PentaP1Input::GetValuesPtr{{{1*/
     617/*FUNCTION PentaP1Input::GetValuesPtr{{{*/
    618618void PentaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){
    619619
    … …  
    623623}
    624624/*}}}*/
    625 /*FUNCTION PentaP1Input::Configure{{{1*/
     625/*FUNCTION PentaP1Input::Configure{{{*/
    626626void PentaP1Input::Configure(Parameters* parameters){
    627627        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../Elements/PentaRef.h"
    … …  
    2121                double values[6];
    2222
    23                 /*PentaP1Input constructors, destructors: {{{1*/
     23                /*PentaP1Input constructors, destructors: {{{*/
    2424                PentaP1Input();
    2525                PentaP1Input(int enum_type,double* values);
    2626                ~PentaP1Input();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();
    … …  
    3434                Object* copy();
    3535                /*}}}*/
    36                 /*PentaP1Input management: {{{1*/
     36                /*PentaP1Input management: {{{*/
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    … …  
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    46                 /*numerics: {{{1*/
     46                /*numerics: {{{*/
    4747                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
    4848                void GetInputValue(int* pvalue){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212class GaussTria;
    … …  
    2323                Parameters* parameters; //to find current time.
    2424
    25                 /*TransientInput constructors, destructors: {{{1*/
     25                /*TransientInput constructors, destructors: {{{*/
    2626                TransientInput();
    2727                TransientInput(int enum_type);
    … …  
    2929                void AddTimeInput(Input* input,double time);
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1*/
     31                /*Object virtual functions definitions:{{{*/
    3232                void  Echo();
    3333                void  DeepEcho();
    … …  
    3737                Object* copy();
    3838                /*}}}*/
    39                 /*TransientInput management: {{{1*/
     39                /*TransientInput management: {{{*/
    4040                int    InstanceEnum();
    4141                Input* SpawnTriaInput(int* indices);
    … …  
    4646                void Configure(Parameters* parameters);
    4747                /*}}}*/
    48                 /*numerics: {{{1*/
     48                /*numerics: {{{*/
    4949                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
    5050                void GetInputValue(int* pvalue){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp

    r12014 r12365  
    1818
    1919/*TriaP1Input constructors and destructor*/
    20 /*FUNCTION TriaP1Input::TriaP1Input(){{{1*/
     20/*FUNCTION TriaP1Input::TriaP1Input(){{{*/
    2121TriaP1Input::TriaP1Input(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{1*/
     25/*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{*/
    2626TriaP1Input::TriaP1Input(int in_enum_type,double* in_values)
    2727        :TriaRef(1)
    … …  
    4141}
    4242/*}}}*/
    43 /*FUNCTION TriaP1Input::~TriaP1Input(){{{1*/
     43/*FUNCTION TriaP1Input::~TriaP1Input(){{{*/
    4444TriaP1Input::~TriaP1Input(){
    4545        return;
    … …  
    4848
    4949/*Object virtual functions definitions:*/
    50 /*FUNCTION TriaP1Input::Echo {{{1*/
     50/*FUNCTION TriaP1Input::Echo {{{*/
    5151void TriaP1Input::Echo(void){
    5252        this->DeepEcho();
    5353}
    5454/*}}}*/
    55 /*FUNCTION TriaP1Input::DeepEcho{{{1*/
     55/*FUNCTION TriaP1Input::DeepEcho{{{*/
    5656void TriaP1Input::DeepEcho(void){
    5757
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION TriaP1Input::Id{{{1*/
     63/*FUNCTION TriaP1Input::Id{{{*/
    6464int    TriaP1Input::Id(void){ return -1; }
    6565/*}}}*/
    66 /*FUNCTION TriaP1Input::MyRank{{{1*/
     66/*FUNCTION TriaP1Input::MyRank{{{*/
    6767int    TriaP1Input::MyRank(void){
    6868        extern int my_rank;
    … …  
    7070}
    7171/*}}}*/
    72 /*FUNCTION TriaP1Input::ObjectEnum{{{1*/
     72/*FUNCTION TriaP1Input::ObjectEnum{{{*/
    7373int TriaP1Input::ObjectEnum(void){
    7474
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION TriaP1Input::copy{{{1*/
     79/*FUNCTION TriaP1Input::copy{{{*/
    8080Object* TriaP1Input::copy() {
    8181       
    … …  
    8686       
    8787/*TriaP1Input management*/
    88 /*FUNCTION TriaP1Input::InstanceEnum{{{1*/
     88/*FUNCTION TriaP1Input::InstanceEnum{{{*/
    8989int TriaP1Input::InstanceEnum(void){
    9090
    … …  
    9393}
    9494/*}}}*/
    95 /*FUNCTION TriaP1Input::SpawnTriaInput{{{1*/
     95/*FUNCTION TriaP1Input::SpawnTriaInput{{{*/
    9696Input* TriaP1Input::SpawnTriaInput(int* indices){
    9797
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION TriaP1Input::SpawnResult{{{1*/
     109/*FUNCTION TriaP1Input::SpawnResult{{{*/
    110110ElementResult* TriaP1Input::SpawnResult(int step, double time){
    111111
    … …  
    116116
    117117/*Object functions*/
    118 /*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
     118/*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{*/
    119119void TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){
    120120
    … …  
    124124}
    125125/*}}}*/
    126 /*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/
     126/*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{*/
    127127void TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){
    128128
    … …  
    131131}
    132132/*}}}*/
    133 /*FUNCTION TriaP1Input::GetVxStrainRate2d{{{1*/
     133/*FUNCTION TriaP1Input::GetVxStrainRate2d{{{*/
    134134void TriaP1Input::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){
    135135
    … …  
    154154}
    155155/*}}}*/
    156 /*FUNCTION TriaP1Input::GetVyStrainRate2d{{{1*/
     156/*FUNCTION TriaP1Input::GetVyStrainRate2d{{{*/
    157157void TriaP1Input::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){
    158158
    … …  
    177177}
    178178/*}}}*/
    179 /*FUNCTION TriaP1Input::ChangeEnum{{{1*/
     179/*FUNCTION TriaP1Input::ChangeEnum{{{*/
    180180void TriaP1Input::ChangeEnum(int newenumtype){
    181181        this->enum_type=newenumtype;
    182182}
    183183/*}}}*/
    184 /*FUNCTION TriaP1Input::GetInputAverage{{{1*/
     184/*FUNCTION TriaP1Input::GetInputAverage{{{*/
    185185void TriaP1Input::GetInputAverage(double* pvalue){
    186186        *pvalue=1./3.*(values[0]+values[1]+values[2]);
    … …  
    189189
    190190/*Intermediary*/
    191 /*FUNCTION TriaP1Input::SquareMin{{{1*/
     191/*FUNCTION TriaP1Input::SquareMin{{{*/
    192192void TriaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    193193
    … …  
    212212}
    213213/*}}}*/
    214 /*FUNCTION TriaP1Input::ContrainMin{{{1*/
     214/*FUNCTION TriaP1Input::ContrainMin{{{*/
    215215void TriaP1Input::ConstrainMin(double minimum){
    216216       
    … …  
    221221}
    222222/*}}}*/
    223 /*FUNCTION TriaP1Input::InfinityNorm{{{1*/
     223/*FUNCTION TriaP1Input::InfinityNorm{{{*/
    224224double TriaP1Input::InfinityNorm(void){
    225225
    … …  
    232232}
    233233/*}}}*/
    234 /*FUNCTION TriaP1Input::Max{{{1*/
     234/*FUNCTION TriaP1Input::Max{{{*/
    235235double TriaP1Input::Max(void){
    236236
    … …  
    244244}
    245245/*}}}*/
    246 /*FUNCTION TriaP1Input::MaxAbs{{{1*/
     246/*FUNCTION TriaP1Input::MaxAbs{{{*/
    247247double TriaP1Input::MaxAbs(void){
    248248
    … …  
    256256}
    257257/*}}}*/
    258 /*FUNCTION TriaP1Input::Min{{{1*/
     258/*FUNCTION TriaP1Input::Min{{{*/
    259259double TriaP1Input::Min(void){
    260260
    … …  
    268268}
    269269/*}}}*/
    270 /*FUNCTION TriaP1Input::MinAbs{{{1*/
     270/*FUNCTION TriaP1Input::MinAbs{{{*/
    271271double TriaP1Input::MinAbs(void){
    272272
    … …  
    280280}
    281281/*}}}*/
    282 /*FUNCTION TriaP1Input::Scale{{{1*/
     282/*FUNCTION TriaP1Input::Scale{{{*/
    283283void TriaP1Input::Scale(double scale_factor){
    284284       
    … …  
    289289}
    290290/*}}}*/
    291 /*FUNCTION TriaP1Input::ArtificialNoise{{{1*/
     291/*FUNCTION TriaP1Input::ArtificialNoise{{{*/
    292292void TriaP1Input::ArtificialNoise(double min,double max){
    293293
    … …  
    305305}
    306306/*}}}*/
    307 /*FUNCTION TriaP1Input::AXPY{{{1*/
     307/*FUNCTION TriaP1Input::AXPY{{{*/
    308308void TriaP1Input::AXPY(Input* xinput,double scalar){
    309309
    … …  
    328328}
    329329/*}}}*/
    330 /*FUNCTION TriaP1Input::Constrain{{{1*/
     330/*FUNCTION TriaP1Input::Constrain{{{*/
    331331void TriaP1Input::Constrain(double cm_min, double cm_max){
    332332
    … …  
    339339}
    340340/*}}}*/
    341 /*FUNCTION TriaP1Input::GetVectorFromInputs{{{1*/
     341/*FUNCTION TriaP1Input::GetVectorFromInputs{{{*/
    342342void TriaP1Input::GetVectorFromInputs(Vector* vector,int* doflist){
    343343
    … …  
    346346
    347347} /*}}}*/
    348 /*FUNCTION TriaP1Input::GetValuesPtr{{{1*/
     348/*FUNCTION TriaP1Input::GetValuesPtr{{{*/
    349349void TriaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){
    350350
    … …  
    354354}
    355355/*}}}*/
    356 /*FUNCTION TriaP1Input::PointwiseMin{{{1*/
     356/*FUNCTION TriaP1Input::PointwiseMin{{{*/
    357357Input* TriaP1Input::PointwiseMin(Input* inputB){
    358358
    … …  
    385385}
    386386/*}}}*/
    387 /*FUNCTION TriaP1Input::PointwiseMax{{{1*/
     387/*FUNCTION TriaP1Input::PointwiseMax{{{*/
    388388Input* TriaP1Input::PointwiseMax(Input* inputB){
    389389
    … …  
    416416}
    417417/*}}}*/
    418 /*FUNCTION TriaP1Input::Configure{{{1*/
     418/*FUNCTION TriaP1Input::Configure{{{*/
    419419void TriaP1Input::Configure(Parameters* parameters){
    420420        /*do nothing: */

  • issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h

    r12326 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#include "./Input.h"
    1212#include "../Elements/TriaRef.h"
    … …  
    2121                double values[3];
    2222
    23                 /*TriaP1Input constructors, destructors: {{{1*/
     23                /*TriaP1Input constructors, destructors: {{{*/
    2424                TriaP1Input();
    2525                TriaP1Input(int enum_type,double* values);
    2626                ~TriaP1Input();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();
    … …  
    3434                Object* copy();
    3535                /*}}}*/
    36                 /*TriaP1Input management: {{{1*/
     36                /*TriaP1Input management: {{{*/
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    … …  
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    46                 /*numerics: {{{1*/
     46                /*numerics: {{{*/
    4747                void GetInputValue(bool* pvalue){_error_("not implemented yet");}
    4848                void GetInputValue(int* pvalue){_error_("not implemented yet");}

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

    r12306 r12365  
    2222#include "../include/include.h"
    2323
    24 /*FUNCTION IoModel::IoModel(){{{1*/
     24/*FUNCTION IoModel::IoModel(){{{*/
    2525IoModel::IoModel(){
    2626        this->fid=NULL;
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION IoModel::IoModel(FILE*  iomodel_handle){{{1*/
     41/*FUNCTION IoModel::IoModel(FILE*  iomodel_handle){{{*/
    4242IoModel::IoModel(FILE* iomodel_handle){
    4343       
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION IoModel::~IoModel(){{{1*/
     70/*FUNCTION IoModel::~IoModel(){{{*/
    7171IoModel::~IoModel(){
    7272
    … …  
    9292/*}}}*/
    9393
    94 /*FUNCTION IoModel::CheckEnumSync{{{1*/
     94/*FUNCTION IoModel::CheckEnumSync{{{*/
    9595void  IoModel::CheckEnumSync(void){
    9696
    … …  
    135135}
    136136/*}}}*/
    137 /*FUNCTION IoModel::Constant(bool* poutput,int constant_enum){{{1*/
     137/*FUNCTION IoModel::Constant(bool* poutput,int constant_enum){{{*/
    138138void IoModel::Constant(bool* poutput,int constant_enum){
    139139
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION IoModel::Constant(int* poutput,int constant_enum){{{1*/
     146/*FUNCTION IoModel::Constant(int* poutput,int constant_enum){{{*/
    147147void IoModel::Constant(int* poutput,int constant_enum){
    148148
    … …  
    153153}
    154154/*}}}*/
    155 /*FUNCTION IoModel::Constant(double* poutput,int constant_enum){{{1*/
     155/*FUNCTION IoModel::Constant(double* poutput,int constant_enum){{{*/
    156156void IoModel::Constant(double* poutput,int constant_enum){
    157157
    … …  
    162162}
    163163/*}}}*/
    164 /*FUNCTION IoModel::Constant(char** poutput,int constant_enum){{{1*/
     164/*FUNCTION IoModel::Constant(char** poutput,int constant_enum){{{*/
    165165void IoModel::Constant(char** poutput,int constant_enum){
    166166
    … …  
    171171}
    172172/*}}}*/
    173 /*FUNCTION IoModel::CopyConstantObject{{{1*/
     173/*FUNCTION IoModel::CopyConstantObject{{{*/
    174174Param* IoModel::CopyConstantObject(int constant_enum){
    175175
    … …  
    183183}
    184184/*}}}*/
    185 /*FUNCTION IoModel::Data{{{1*/
     185/*FUNCTION IoModel::Data{{{*/
    186186double* IoModel::Data(int data_enum){
    187187
    … …  
    192192}
    193193/*}}}*/
    194 /*FUNCTION IoModel::DeleteData{{{1*/
     194/*FUNCTION IoModel::DeleteData{{{*/
    195195void  IoModel::DeleteData(int num,...){
    196196
    … …  
    210210        va_end(ap);
    211211} /*}}}*/
    212 /*FUNCTION IoModel::FetchConstants{{{1*/
     212/*FUNCTION IoModel::FetchConstants{{{*/
    213213void  IoModel::FetchConstants(void){
    214214
    … …  
    233233
    234234        /*Go find in the binary file, the position of the data we want to fetch: */
    235         if(my_rank==0){ //cpu 0{{{2
     235        if(my_rank==0){ //cpu 0{{{
    236236       
    237237                /*First set FILE* position to the beginning of the file: */
    … …  
    368368        } //}}}
    369369        #ifdef _HAVE_MPI_
    370         else{ //cpu ~0 {{{2
     370        else{ //cpu ~0 {{{
    371371                for(;;){ //wait on cpu 0
    372372                        MPI_Bcast(&record_code,1,MPI_INT,0,MPI_COMM_WORLD);  /*get from cpu 0 what we are going to do: */
    … …  
    440440}
    441441/*}}}*/
    442 /*FUNCTION IoModel::FetchData(bool*     pbool,int data_enum){{{1*/
     442/*FUNCTION IoModel::FetchData(bool*     pbool,int data_enum){{{*/
    443443void  IoModel::FetchData(bool* pboolean,int data_enum){
    444444
    … …  
    470470}
    471471/*}}}*/
    472 /*FUNCTION IoModel::FetchData(int*      pinteger,int data_enum){{{1*/
     472/*FUNCTION IoModel::FetchData(int*      pinteger,int data_enum){{{*/
    473473void  IoModel::FetchData(int* pinteger,int data_enum){
    474474
    … …  
    500500}
    501501/*}}}*/
    502 /*FUNCTION IoModel::FetchData(double*   pscalar,int data_enum){{{1*/
     502/*FUNCTION IoModel::FetchData(double*   pscalar,int data_enum){{{*/
    503503void  IoModel::FetchData(double* pscalar,int data_enum){
    504504
    … …  
    530530}
    531531/*}}}*/
    532 /*FUNCTION IoModel::FetchData(char**    pstring,int data_enum){{{1*/
     532/*FUNCTION IoModel::FetchData(char**    pstring,int data_enum){{{*/
    533533void  IoModel::FetchData(char** pstring,int data_enum){
    534534
    … …  
    581581}
    582582/*}}}*/
    583 /*FUNCTION IoModel::FetchData(int**  pintegerematrix,int* pM,int* pN,int data_enum){{{1*/
     583/*FUNCTION IoModel::FetchData(int**  pintegerematrix,int* pM,int* pN,int data_enum){{{*/
    584584void  IoModel::FetchData(int** pmatrix,int* pM,int* pN,int data_enum){
    585585
    … …  
    656656}
    657657/*}}}*/
    658 /*FUNCTION IoModel::FetchData(double**  pdoublematrix,int* pM,int* pN,int data_enum){{{1*/
     658/*FUNCTION IoModel::FetchData(double**  pdoublematrix,int* pM,int* pN,int data_enum){{{*/
    659659void  IoModel::FetchData(double** pmatrix,int* pM,int* pN,int data_enum){
    660660
    … …  
    709709}
    710710/*}}}*/
    711 /*FUNCTION IoModel::FetchData(char***   pstrings,int* pnumstrings,int data_enum){{{1*/
     711/*FUNCTION IoModel::FetchData(char***   pstrings,int* pnumstrings,int data_enum){{{*/
    712712void  IoModel::FetchData(char*** pstrings,int* pnumstrings,int data_enum){
    713713
    … …  
    779779}
    780780/*}}}*/
    781 /*FUNCTION IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{1*/
     781/*FUNCTION IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{*/
    782782void  IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum){
    783783
    … …  
    868868}
    869869/*}}}*/
    870 /*FUNCTION IoModel::FetchData(int num,...){{{1*/
     870/*FUNCTION IoModel::FetchData(int num,...){{{*/
    871871void  IoModel::FetchData(int num,...){
    872872
    … …  
    903903}
    904904/*}}}*/
    905 /*FUNCTION IoModel::FetchDataToInput{{{1*/
     905/*FUNCTION IoModel::FetchDataToInput{{{*/
    906906void IoModel::FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum,double default_value){
    907907
    … …  
    935935
    936936        switch(code){
    937                 case 1: //boolean constant.  {{{2
     937                case 1: //boolean constant.  {{{
    938938                        this->FetchData(&boolean,vector_enum);
    939939
    … …  
    948948                        }
    949949                        break; /*}}}*/
    950                 case 2: //integer constant.  {{{2
     950                case 2: //integer constant.  {{{
    951951                        this->FetchData(&integer,vector_enum);
    952952
    … …  
    961961                        }
    962962                        break; /*}}}*/
    963                 case 3: //double constant.  {{{2
     963                case 3: //double constant.  {{{
    964964                        this->FetchData(&scalar,vector_enum);
    965965
    … …  
    974974                        }
    975975                        break; /*}}}*/
    976                 case 5: //boolean vector.  {{{2
     976                case 5: //boolean vector.  {{{
    977977
    978978                        /*Fetch vector:*/
    … …  
    10121012                        }
    10131013                        break; /*}}}*/
    1014                 case 6: //int vector.  {{{2
     1014                case 6: //int vector{{{
    10151015
    10161016                        /*Fetch vector:*/
    … …  
    10501050                        }
    10511051                        break; /*}}}*/
    1052                 case 7: //double vector.  {{{2
     1052                case 7: //double vector{{{
    10531053
    10541054                        /*Fetch vector:*/
    … …  
    10891089
    10901090                        break; /*}}}*/
    1091                 default: /*{{{2*/
     1091                default: /*{{{*/
    10921092                        _error_("%s%i%s","data code ",code," not supported yet!");
    10931093                        break;
    … …  
    10981098        xfree((void**)&string);
    10991099}
    1100 /*FUNCTION IoModel::SetFilePointerToData{{{1*/
     1100/*FUNCTION IoModel::SetFilePointerToData{{{*/
    11011101FILE* IoModel::SetFilePointerToData(int* pcode,int* pvector_type, int data_enum){
    11021102

  • issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020/*}}}*/
    2121
    22 /*FUNCTION  KMLFileToken(FILE* fid,int* pncom=NULL,char*** ppcom=NULL) {{{1*/
     22/*FUNCTION  KMLFileToken(FILE* fid,int* pncom=NULL,char*** ppcom=NULL) {{{*/
    2323char* KMLFileToken(FILE* fid,
    2424                                   int* pncom=NULL,char*** ppcom=NULL){
    … …  
    139139/*}}}*/
    140140
    141 /*FUNCTION  KMLFileTokenComment(FILE* fid) {{{1*/
     141/*FUNCTION  KMLFileTokenComment(FILE* fid) {{{*/
    142142char* KMLFileTokenComment(FILE* fid){
    143143
    … …  
    204204/*}}}*/
    205205
    206 /*FUNCTION  KMLFileTokenBuffer {{{1*/
     206/*FUNCTION  KMLFileTokenBuffer {{{*/
    207207void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen,
    208208                                                int c,
    … …  
    229229/*}}}*/
    230230
    231 /*FUNCTION  KMLFileTagName {{{1*/
     231/*FUNCTION  KMLFileTagName {{{*/
    232232char* KMLFileTagName(char* pname,
    233233                                         char* ktag){
    … …  
    238238/*}}}*/
    239239
    240 /*FUNCTION  KMLFileTagName {{{1*/
     240/*FUNCTION  KMLFileTagName {{{*/
    241241char* KMLFileTagName(char* pname,int *m,int maxlen,
    242242                                         char* ktag){
    … …  
    284284/*}}}*/
    285285
    286 /*FUNCTION  KMLFileTagAttrib {{{1*/
     286/*FUNCTION  KMLFileTagAttrib {{{*/
    287287int KMLFileTagAttrib(KML_Object* kobj,
    288288                                         char* ktag){
    … …  
    334334/*}}}*/
    335335
    336 /*FUNCTION  KMLFileTokenParse {{{1*/
     336/*FUNCTION  KMLFileTokenParse {{{*/
    337337int KMLFileTokenParse(int* pival,
    338338                                          char* ktag,
    … …  
    369369/*}}}*/
    370370
    371 /*FUNCTION  KMLFileTokenParse {{{1*/
     371/*FUNCTION  KMLFileTokenParse {{{*/
    372372int KMLFileTokenParse(bool* pbval,
    373373                                          char* ktag,
    … …  
    406406/*}}}*/
    407407
    408 /*FUNCTION  KMLFileTokenParse {{{1*/
     408/*FUNCTION  KMLFileTokenParse {{{*/
    409409char* KMLFileTokenParse(char* pstr,
    410410                                                char* ktag,
    … …  
    417417/*}}}*/
    418418
    419 /*FUNCTION  KMLFileTokenParse {{{1*/
     419/*FUNCTION  KMLFileTokenParse {{{*/
    420420char* KMLFileTokenParse(char* pstr,int *m,int maxlen,
    421421                                                char* ktag,
    … …  
    469469/*}}}*/
    470470
    471 /*FUNCTION  KMLFileTokenParse {{{1*/
     471/*FUNCTION  KMLFileTokenParse {{{*/
    472472int KMLFileTokenParse(float* pfval,
    473473                                          char* ktag,
    … …  
    504504/*}}}*/
    505505
    506 /*FUNCTION  KMLFileTokenParse {{{1*/
     506/*FUNCTION  KMLFileTokenParse {{{*/
    507507int KMLFileTokenParse(double* pdval,
    508508                                          char* ktag,
    … …  
    539539/*}}}*/
    540540
    541 /*FUNCTION  KMLFileTokenParse {{{1*/
     541/*FUNCTION  KMLFileTokenParse {{{*/
    542542int KMLFileTokenParse(double **pdval,int* m,int maxlen,
    543543                                          char* ktag,
    … …  
    600600/*}}}*/
    601601
    602 /*FUNCTION  KMLFileTokenParse {{{1*/
     602/*FUNCTION  KMLFileTokenParse {{{*/
    603603int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen,
    604604                                          char* ktag,
    … …  
    668668/*}}}*/
    669669
    670 /*FUNCTION  KMLFileTagSkip {{{1*/
     670/*FUNCTION  KMLFileTagSkip {{{*/
    671671int KMLFileTagSkip(char* ktag,
    672672                                   FILE* fid){

  • issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h

    r11319 r12365  
    66#define _KMLFILEREADUTILS_H
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"

  • issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Attribute::KML_Attribute(){{{1*/
     23/*FUNCTION KML_Attribute::KML_Attribute(){{{*/
    2424KML_Attribute::KML_Attribute(){
    2525
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION KML_Attribute::~KML_Attribute(){{{1*/
     31/*FUNCTION KML_Attribute::~KML_Attribute(){{{*/
    3232KML_Attribute::~KML_Attribute(){
    3333
    … …  
    3939
    4040/*Other*/
    41 /*FUNCTION KML_Attribute::Echo {{{1*/
     41/*FUNCTION KML_Attribute::Echo {{{*/
    4242void  KML_Attribute::Echo(){
    4343
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION KML_Attribute::DeepEcho {{{1*/
     55/*FUNCTION KML_Attribute::DeepEcho {{{*/
    5656void  KML_Attribute::DeepEcho(){
    5757
    … …  
    6363}
    6464/*}}}*/
    65 /*FUNCTION KML_Attribute::DeepEcho {{{1*/
     65/*FUNCTION KML_Attribute::DeepEcho {{{*/
    6666void  KML_Attribute::DeepEcho(const char* indent){
    6767
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION KML_Attribute::Write {{{1*/
     79/*FUNCTION KML_Attribute::Write {{{*/
    8080void  KML_Attribute::Write(FILE* filout,const char* indent){
    8181
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION KML_Attribute::Read {{{1*/
     89/*FUNCTION KML_Attribute::Read {{{*/
    9090void  KML_Attribute::Read(FILE* fid,char* kstr){
    9191
    … …  
    9797}
    9898/*}}}*/
    99 /*FUNCTION KML_Attribute::Alloc {{{1*/
     99/*FUNCTION KML_Attribute::Alloc {{{*/
    100100void  KML_Attribute::Alloc(const char* namei,const char* valuei){
    101101
    … …  
    109109}
    110110/*}}}*/
    111 /*FUNCTION KML_Attribute::Add {{{1*/
     111/*FUNCTION KML_Attribute::Add {{{*/
    112112void  KML_Attribute::Add(DataSet* attrib){
    113113
    … …  
    117117}
    118118/*}}}*/
    119 /*FUNCTION KML_Attribute::Get {{{1*/
     119/*FUNCTION KML_Attribute::Get {{{*/
    120120void  KML_Attribute::Get(char** pvalueo,char* deflt){
    121121

  • issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h

    r11202 r12365  
    66#define _KML_ATTRIBUTE_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2222                char* value;
    2323
    24                 /*KML_Attribute constructors, destructors {{{1*/
     24                /*KML_Attribute constructors, destructors {{{*/
    2525                KML_Attribute();
    2626                ~KML_Attribute();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1*/
     28                /*Object virtual functions definitions:{{{*/
    2929                virtual void  Echo();
    3030                virtual void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{1*/
     23/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{*/
    2424KML_ColorStyle::KML_ColorStyle(){
    2525
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{1*/
     31/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{*/
    3232KML_ColorStyle::~KML_ColorStyle(){
    3333
    … …  
    3838
    3939/*Other*/
    40 /*FUNCTION KML_ColorStyle::Echo {{{1*/
     40/*FUNCTION KML_ColorStyle::Echo {{{*/
    4141void  KML_ColorStyle::Echo(){
    4242
    … …  
    5151}
    5252/*}}}*/
    53 /*FUNCTION KML_ColorStyle::DeepEcho {{{1*/
     53/*FUNCTION KML_ColorStyle::DeepEcho {{{*/
    5454void  KML_ColorStyle::DeepEcho(){
    5555
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION KML_ColorStyle::DeepEcho {{{1*/
     63/*FUNCTION KML_ColorStyle::DeepEcho {{{*/
    6464void  KML_ColorStyle::DeepEcho(const char* indent){
    6565
    … …  
    7474}
    7575/*}}}*/
    76 /*FUNCTION KML_ColorStyle::Write {{{1*/
     76/*FUNCTION KML_ColorStyle::Write {{{*/
    7777void  KML_ColorStyle::Write(FILE* filout,const char* indent){
    7878
    … …  
    8787}
    8888/*}}}*/
    89 /*FUNCTION KML_ColorStyle::Read {{{1*/
     89/*FUNCTION KML_ColorStyle::Read {{{*/
    9090void  KML_ColorStyle::Read(FILE* fid,char* kstr){
    9191

  • issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h

    r11202 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313#include "../../include/include.h"
    1414#include "../../shared/Exceptions/exceptions.h"
    … …  
    2525                char  colormode[KML_COLORSTYLE_COLORMODE_LENGTH+1];
    2626
    27                 /*KML_ColorStyle constructors, destructors {{{1*/
     27                /*KML_ColorStyle constructors, destructors {{{*/
    2828                KML_ColorStyle();
    2929                ~KML_ColorStyle();
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1*/
     31                /*Object virtual functions definitions:{{{*/
    3232                void  Echo();
    3333                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Comment::KML_Comment(){{{1*/
     23/*FUNCTION KML_Comment::KML_Comment(){{{*/
    2424KML_Comment::KML_Comment(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_Comment::~KML_Comment(){{{1*/
     30/*FUNCTION KML_Comment::~KML_Comment(){{{*/
    3131KML_Comment::~KML_Comment(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION KML_Comment::Echo {{{1*/
     39/*FUNCTION KML_Comment::Echo {{{*/
    4040void  KML_Comment::Echo(){
    4141
    … …  
    4848}
    4949/*}}}*/
    50 /*FUNCTION KML_Comment::DeepEcho {{{1*/
     50/*FUNCTION KML_Comment::DeepEcho {{{*/
    5151void  KML_Comment::DeepEcho(){
    5252
    … …  
    5858}
    5959/*}}}*/
    60 /*FUNCTION KML_Comment::DeepEcho {{{1*/
     60/*FUNCTION KML_Comment::DeepEcho {{{*/
    6161void  KML_Comment::DeepEcho(const char* indent){
    6262
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION KML_Comment::Write {{{1*/
     71/*FUNCTION KML_Comment::Write {{{*/
    7272void  KML_Comment::Write(FILE* filout,const char* indent){
    7373
    … …  
    8181}
    8282/*}}}*/
    83 /*FUNCTION KML_Comment::Read {{{1*/
     83/*FUNCTION KML_Comment::Read {{{*/
    8484void  KML_Comment::Read(FILE* fid,char* kstr){
    8585
    … …  
    9191}
    9292/*}}}*/
    93 /*FUNCTION KML_Comment::Alloc {{{1*/
     93/*FUNCTION KML_Comment::Alloc {{{*/
    9494void  KML_Comment::Alloc(const char* valuei){
    9595
    … …  
    100100}
    101101/*}}}*/
    102 /*FUNCTION KML_Comment::Add {{{1*/
     102/*FUNCTION KML_Comment::Add {{{*/
    103103void  KML_Comment::Add(DataSet* commnt){
    104104
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION KML_Comment::Get {{{1*/
     110/*FUNCTION KML_Comment::Get {{{*/
    111111void  KML_Comment::Get(char** pvalueo){
    112112

  • issm/trunk-jpl/src/c/objects/KML/KML_Comment.h

    r11202 r12365  
    66#define _KML_COMMENT_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2222                char* value;
    2323
    24                 /*KML_Comment constructors, destructors {{{1*/
     24                /*KML_Comment constructors, destructors {{{*/
    2525                KML_Comment();
    2626                ~KML_Comment();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1*/
     28                /*Object virtual functions definitions:{{{*/
    2929                virtual void  Echo();
    3030                virtual void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Container::KML_Container(){{{1*/
     23/*FUNCTION KML_Container::KML_Container(){{{*/
    2424KML_Container::KML_Container(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_Container::~KML_Container(){{{1*/
     30/*FUNCTION KML_Container::~KML_Container(){{{*/
    3131KML_Container::~KML_Container(){
    3232
    … …  
    4040
    4141/*Other*/
    42 /*FUNCTION KML_Container::Echo {{{1*/
     42/*FUNCTION KML_Container::Echo {{{*/
    4343void  KML_Container::Echo(){
    4444
    … …  
    5252}
    5353/*}}}*/
    54 /*FUNCTION KML_Container::DeepEcho {{{1*/
     54/*FUNCTION KML_Container::DeepEcho {{{*/
    5555void  KML_Container::DeepEcho(){
    5656
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION KML_Container::DeepEcho {{{1*/
     64/*FUNCTION KML_Container::DeepEcho {{{*/
    6565void  KML_Container::DeepEcho(const char* indent){
    6666
    … …  
    8888}
    8989/*}}}*/
    90 /*FUNCTION KML_Container::Write {{{1*/
     90/*FUNCTION KML_Container::Write {{{*/
    9191void  KML_Container::Write(FILE* filout,const char* indent){
    9292
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION KML_Container::Read {{{1*/
     110/*FUNCTION KML_Container::Read {{{*/
    111111void  KML_Container::Read(FILE* fid,char* kstr){
    112112
    … …  
    154154}
    155155/*}}}*/
    156 /*FUNCTION KML_Container::WriteExp {{{1*/
     156/*FUNCTION KML_Container::WriteExp {{{*/
    157157void  KML_Container::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    158158

  • issm/trunk-jpl/src/c/objects/KML/KML_Container.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2222                DataSet* feature;
    2323
    24                 /*KML_Container constructors, destructors {{{1*/
     24                /*KML_Container constructors, destructors {{{*/
    2525                KML_Container();
    2626                ~KML_Container();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1*/
     28                /*Object virtual functions definitions:{{{*/
    2929                void  Echo();
    3030                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Document::KML_Document(){{{1*/
     23/*FUNCTION KML_Document::KML_Document(){{{*/
    2424KML_Document::KML_Document(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_Document::~KML_Document(){{{1*/
     30/*FUNCTION KML_Document::~KML_Document(){{{*/
    3131KML_Document::~KML_Document(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION KML_Document::Echo {{{1*/
     39/*FUNCTION KML_Document::Echo {{{*/
    4040void  KML_Document::Echo(){
    4141
    … …  
    4949/*}}}*/
    5050
    51 /*FUNCTION KML_Document::DeepEcho {{{1*/
     51/*FUNCTION KML_Document::DeepEcho {{{*/
    5252void  KML_Document::DeepEcho(){
    5353
    … …  
    6060/*}}}*/
    6161
    62 /*FUNCTION KML_Document::DeepEcho {{{1*/
     62/*FUNCTION KML_Document::DeepEcho {{{*/
    6363void  KML_Document::DeepEcho(const char* indent){
    6464
    … …  
    7272/*}}}*/
    7373
    74 /*FUNCTION KML_Document::Write {{{1*/
     74/*FUNCTION KML_Document::Write {{{*/
    7575void  KML_Document::Write(FILE* filout,const char* indent){
    7676
    … …  
    8888/*}}}*/
    8989
    90 /*FUNCTION KML_Document::Read {{{1*/
     90/*FUNCTION KML_Document::Read {{{*/
    9191void  KML_Document::Read(FILE* fid,char* kstr){
    9292

  • issm/trunk-jpl/src/c/objects/KML/KML_Document.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020        public:
    2121
    22                 /*KML_Document constructors, destructors {{{1*/
     22                /*KML_Document constructors, destructors {{{*/
    2323                KML_Document();
    2424                ~KML_Document();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1 */
     26                /*Object virtual functions definitions:{{{ */
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Feature::KML_Feature(){{{1*/
     23/*FUNCTION KML_Feature::KML_Feature(){{{*/
    2424KML_Feature::KML_Feature(){
    2525
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION KML_Feature::~KML_Feature(){{{1*/
     37/*FUNCTION KML_Feature::~KML_Feature(){{{*/
    3838KML_Feature::~KML_Feature(){
    3939
    … …  
    4747
    4848/*Other*/
    49 /*FUNCTION KML_Feature::Echo {{{1*/
     49/*FUNCTION KML_Feature::Echo {{{*/
    5050void  KML_Feature::Echo(){
    5151
    … …  
    6666/*}}}*/
    6767
    68 /*FUNCTION KML_Feature::DeepEcho {{{1*/
     68/*FUNCTION KML_Feature::DeepEcho {{{*/
    6969void  KML_Feature::DeepEcho(){
    7070
    … …  
    7777/*}}}*/
    7878
    79 /*FUNCTION KML_Feature::DeepEcho {{{1*/
     79/*FUNCTION KML_Feature::DeepEcho {{{*/
    8080void  KML_Feature::DeepEcho(const char* indent){
    8181
    … …  
    111111/*}}}*/
    112112
    113 /*FUNCTION KML_Feature::Write {{{1*/
     113/*FUNCTION KML_Feature::Write {{{*/
    114114void  KML_Feature::Write(FILE* filout,const char* indent){
    115115
    … …  
    143143/*}}}*/
    144144
    145 /*FUNCTION KML_Feature::Read {{{1*/
     145/*FUNCTION KML_Feature::Read {{{*/
    146146void  KML_Feature::Read(FILE* fid,char* kstr){
    147147

  • issm/trunk-jpl/src/c/objects/KML/KML_Feature.h

    r11202 r12365  
    1212
    1313/*Headers:*/
    14 /*{{{1*/
     14/*{{{*/
    1515#include "../../include/include.h"
    1616#include "../../shared/Exceptions/exceptions.h"
    … …  
    3434                DataSet* style;
    3535
    36                 /*KML_Feature constructors, destructors {{{1*/
     36                /*KML_Feature constructors, destructors {{{*/
    3737                KML_Feature();
    3838                ~KML_Feature();
    3939                /*}}}*/
    40                 /*Object virtual functions definitions:{{{1*/
     40                /*Object virtual functions definitions:{{{*/
    4141                void  Echo();
    4242                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_File.cpp

    r11383 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_File::KML_File(){{{1*/
     23/*FUNCTION KML_File::KML_File(){{{*/
    2424KML_File::KML_File(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_File::~KML_File(){{{1*/
     30/*FUNCTION KML_File::~KML_File(){{{*/
    3131KML_File::~KML_File(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION KML_File::Echo {{{1*/
     39/*FUNCTION KML_File::Echo {{{*/
    4040void  KML_File::Echo(){
    4141
    … …  
    4848}
    4949/*}}}*/
    50 /*FUNCTION KML_File::DeepEcho {{{1*/
     50/*FUNCTION KML_File::DeepEcho {{{*/
    5151void  KML_File::DeepEcho(){
    5252
    … …  
    5858}
    5959/*}}}*/
    60 /*FUNCTION KML_File::DeepEcho {{{1*/
     60/*FUNCTION KML_File::DeepEcho {{{*/
    6161void  KML_File::DeepEcho(const char* indent){
    6262
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION KML_File::Write {{{1*/
     71/*FUNCTION KML_File::Write {{{*/
    7272void  KML_File::Write(FILE* filout,const char* indent){
    7373
    … …  
    8484}
    8585/*}}}*/
    86 /*FUNCTION KML_File::Read {{{1*/
     86/*FUNCTION KML_File::Read {{{*/
    8787void  KML_File::Read(FILE* fid,char* kstr){
    8888
    … …  
    126126}
    127127/*}}}*/
    128 /*FUNCTION KML_File::WriteExp {{{1*/
     128/*FUNCTION KML_File::WriteExp {{{*/
    129129void  KML_File::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    130130

  • issm/trunk-jpl/src/c/objects/KML/KML_File.h

    r11383 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020        public:
    2121
    22                 /*KML_File constructors, destructors {{{1*/
     22                /*KML_File constructors, destructors {{{*/
    2323                KML_File();
    2424                ~KML_File();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Folder::KML_Folder(){{{1*/
     23/*FUNCTION KML_Folder::KML_Folder(){{{*/
    2424KML_Folder::KML_Folder(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_Folder::~KML_Folder(){{{1*/
     30/*FUNCTION KML_Folder::~KML_Folder(){{{*/
    3131KML_Folder::~KML_Folder(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION KML_Folder::Echo {{{1*/
     39/*FUNCTION KML_Folder::Echo {{{*/
    4040void  KML_Folder::Echo(){
    4141
    … …  
    4949/*}}}*/
    5050
    51 /*FUNCTION KML_Folder::DeepEcho {{{1*/
     51/*FUNCTION KML_Folder::DeepEcho {{{*/
    5252void  KML_Folder::DeepEcho(){
    5353
    … …  
    6060/*}}}*/
    6161
    62 /*FUNCTION KML_Folder::DeepEcho {{{1*/
     62/*FUNCTION KML_Folder::DeepEcho {{{*/
    6363void  KML_Folder::DeepEcho(const char* indent){
    6464
    … …  
    7272/*}}}*/
    7373
    74 /*FUNCTION KML_Folder::Write {{{1*/
     74/*FUNCTION KML_Folder::Write {{{*/
    7575void  KML_Folder::Write(FILE* filout,const char* indent){
    7676
    … …  
    8888/*}}}*/
    8989
    90 /*FUNCTION KML_Folder::Read {{{1*/
     90/*FUNCTION KML_Folder::Read {{{*/
    9191void  KML_Folder::Read(FILE* fid,char* kstr){
    9292

  • issm/trunk-jpl/src/c/objects/KML/KML_Folder.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020        public:
    2121
    22                 /*KML_Folder constructors, destructors {{{1*/
     22                /*KML_Folder constructors, destructors {{{*/
    2323                KML_Folder();
    2424                ~KML_Folder();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1 */
     26                /*Object virtual functions definitions:{{{ */
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Geometry.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020
    2121/*Constructors/destructor/copy*/
    22 /*FUNCTION KML_Geometry::KML_Geometry(){{{1*/
     22/*FUNCTION KML_Geometry::KML_Geometry(){{{*/
    2323KML_Geometry::KML_Geometry(){
    2424
    … …  
    2727}
    2828/*}}}*/
    29 /*FUNCTION KML_Geometry::~KML_Geometry(){{{1*/
     29/*FUNCTION KML_Geometry::~KML_Geometry(){{{*/
    3030KML_Geometry::~KML_Geometry(){
    3131
    … …  
    3636
    3737/*Other*/
    38 /*FUNCTION KML_Geometry::Echo {{{1*/
     38/*FUNCTION KML_Geometry::Echo {{{*/
    3939void  KML_Geometry::Echo(){
    4040
    … …  
    4545/*}}}*/
    4646
    47 /*FUNCTION KML_Geometry::DeepEcho {{{1*/
     47/*FUNCTION KML_Geometry::DeepEcho {{{*/
    4848void  KML_Geometry::DeepEcho(){
    4949
    … …  
    5656/*}}}*/
    5757
    58 /*FUNCTION KML_Geometry::DeepEcho {{{1*/
     58/*FUNCTION KML_Geometry::DeepEcho {{{*/
    5959void  KML_Geometry::DeepEcho(const char* indent){
    6060
    … …  
    6565/*}}}*/
    6666
    67 /*FUNCTION KML_Geometry::Write {{{1*/
     67/*FUNCTION KML_Geometry::Write {{{*/
    6868void  KML_Geometry::Write(FILE* filout,const char* indent){
    6969
    … …  
    7474/*}}}*/
    7575
    76 /*FUNCTION KML_Geometry::Read {{{1*/
     76/*FUNCTION KML_Geometry::Read {{{*/
    7777void  KML_Geometry::Read(FILE* fid,char* kstr){
    7878

  • issm/trunk-jpl/src/c/objects/KML/KML_Geometry.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    1919        public:
    2020
    21                 /*KML_Geometry constructors, destructors {{{1*/
     21                /*KML_Geometry constructors, destructors {{{*/
    2222                KML_Geometry();
    2323                ~KML_Geometry();
    2424                /*}}}*/
    25                 /*Object virtual functions definitions:{{{1*/
     25                /*Object virtual functions definitions:{{{*/
    2626                void  Echo();
    2727                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{1*/
     23/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{*/
    2424KML_GroundOverlay::KML_GroundOverlay(){
    2525
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{1*/
     33/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{*/
    3434KML_GroundOverlay::~KML_GroundOverlay(){
    3535
    … …  
    4343
    4444/*Other*/
    45 /*FUNCTION KML_GroundOverlay::Echo {{{1*/
     45/*FUNCTION KML_GroundOverlay::Echo {{{*/
    4646void  KML_GroundOverlay::Echo(){
    4747
    … …  
    5959/*}}}*/
    6060
    61 /*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/
     61/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
    6262void  KML_GroundOverlay::DeepEcho(){
    6363
    … …  
    7070/*}}}*/
    7171
    72 /*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/
     72/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
    7373void  KML_GroundOverlay::DeepEcho(const char* indent){
    7474
    … …  
    9393/*}}}*/
    9494
    95 /*FUNCTION KML_GroundOverlay::Write {{{1*/
     95/*FUNCTION KML_GroundOverlay::Write {{{*/
    9696void  KML_GroundOverlay::Write(FILE* filout,const char* indent){
    9797
    … …  
    120120/*}}}*/
    121121
    122 /*FUNCTION KML_GroundOverlay::Read {{{1*/
     122/*FUNCTION KML_GroundOverlay::Read {{{*/
    123123void  KML_GroundOverlay::Read(FILE* fid,char* kstr){
    124124

  • issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2626                KML_LatLonBox* llbox;
    2727
    28                 /*KML_GroundOverlay constructors, destructors {{{1*/
     28                /*KML_GroundOverlay constructors, destructors {{{*/
    2929                KML_GroundOverlay();
    3030                ~KML_GroundOverlay();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1*/
     32                /*Object virtual functions definitions:{{{*/
    3333                void  Echo();
    3434                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Icon::KML_Icon(){{{1*/
     23/*FUNCTION KML_Icon::KML_Icon(){{{*/
    2424KML_Icon::KML_Icon(){
    2525
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION KML_Icon::~KML_Icon(){{{1*/
     37/*FUNCTION KML_Icon::~KML_Icon(){{{*/
    3838KML_Icon::~KML_Icon(){
    3939
    … …  
    4444
    4545/*Other*/
    46 /*FUNCTION KML_Icon::Echo {{{1*/
     46/*FUNCTION KML_Icon::Echo {{{*/
    4747void  KML_Icon::Echo(){
    4848
    … …  
    6565/*}}}*/
    6666
    67 /*FUNCTION KML_Icon::DeepEcho {{{1*/
     67/*FUNCTION KML_Icon::DeepEcho {{{*/
    6868void  KML_Icon::DeepEcho(){
    6969
    … …  
    7676/*}}}*/
    7777
    78 /*FUNCTION KML_Icon::DeepEcho {{{1*/
     78/*FUNCTION KML_Icon::DeepEcho {{{*/
    7979void  KML_Icon::DeepEcho(const char* indent){
    8080
    … …  
    9797/*}}}*/
    9898
    99 /*FUNCTION KML_Icon::Write {{{1*/
     99/*FUNCTION KML_Icon::Write {{{*/
    100100void  KML_Icon::Write(FILE* filout,const char* indent){
    101101
    … …  
    127127/*}}}*/
    128128
    129 /*FUNCTION KML_Icon::Read {{{1*/
     129/*FUNCTION KML_Icon::Read {{{*/
    130130void  KML_Icon::Read(FILE* fid,char* kstr){
    131131

  • issm/trunk-jpl/src/c/objects/KML/KML_Icon.h

    r11202 r12365  
    1313
    1414/*Headers:*/
    15 /*{{{1*/
     15/*{{{*/
    1616#include "../../include/include.h"
    1717#include "../../shared/Exceptions/exceptions.h"
    … …  
    3434                char  hquery[KML_ICON_HQUERY_LENGTH+1];
    3535
    36                 /*KML_Icon constructors, destructors {{{1*/
     36                /*KML_Icon constructors, destructors {{{*/
    3737                KML_Icon();
    3838                ~KML_Icon();
    3939                /*}}}*/
    40                 /*Object virtual functions definitions:{{{1*/
     40                /*Object virtual functions definitions:{{{*/
    4141                void  Echo();
    4242                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_LatLonBox::KML_LatLonBox(){{{1*/
     23/*FUNCTION KML_LatLonBox::KML_LatLonBox(){{{*/
    2424KML_LatLonBox::KML_LatLonBox(){
    2525
    … …  
    3232}
    3333/*}}}*/
    34 /*FUNCTION KML_LatLonBox::~KML_LatLonBox(){{{1*/
     34/*FUNCTION KML_LatLonBox::~KML_LatLonBox(){{{*/
    3535KML_LatLonBox::~KML_LatLonBox(){
    3636
    … …  
    4141
    4242/*Other*/
    43 /*FUNCTION KML_LatLonBox::Echo {{{1*/
     43/*FUNCTION KML_LatLonBox::Echo {{{*/
    4444void  KML_LatLonBox::Echo(){
    4545
    … …  
    5959/*}}}*/
    6060
    61 /*FUNCTION KML_LatLonBox::DeepEcho {{{1*/
     61/*FUNCTION KML_LatLonBox::DeepEcho {{{*/
    6262void  KML_LatLonBox::DeepEcho(){
    6363
    … …  
    7070/*}}}*/
    7171
    72 /*FUNCTION KML_LatLonBox::DeepEcho {{{1*/
     72/*FUNCTION KML_LatLonBox::DeepEcho {{{*/
    7373void  KML_LatLonBox::DeepEcho(const char* indent){
    7474
    … …  
    8888/*}}}*/
    8989
    90 /*FUNCTION KML_LatLonBox::Write {{{1*/
     90/*FUNCTION KML_LatLonBox::Write {{{*/
    9191void  KML_LatLonBox::Write(FILE* filout,const char* indent){
    9292
    … …  
    110110/*}}}*/
    111111
    112 /*FUNCTION KML_LatLonBox::Read {{{1*/
     112/*FUNCTION KML_LatLonBox::Read {{{*/
    113113void  KML_LatLonBox::Read(FILE* fid,char* kstr){
    114114

  • issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2525                double rotation;
    2626
    27                 /*KML_LatLonBox constructors, destructors {{{1*/
     27                /*KML_LatLonBox constructors, destructors {{{*/
    2828                KML_LatLonBox();
    2929                ~KML_LatLonBox();
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1*/
     31                /*Object virtual functions definitions:{{{*/
    3232                void  Echo();
    3333                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2222
    2323/*Constructors/destructor/copy*/
    24 /*FUNCTION KML_LineString::KML_LineString(){{{1*/
     24/*FUNCTION KML_LineString::KML_LineString(){{{*/
    2525KML_LineString::KML_LineString(){
    2626
    … …  
    3434}
    3535/*}}}*/
    36 /*FUNCTION KML_LineString::~KML_LineString(){{{1*/
     36/*FUNCTION KML_LineString::~KML_LineString(){{{*/
    3737KML_LineString::~KML_LineString(){
    3838
    … …  
    4646
    4747/*Other*/
    48 /*FUNCTION KML_LineString::Echo {{{1*/
     48/*FUNCTION KML_LineString::Echo {{{*/
    4949void  KML_LineString::Echo(){
    5050
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION KML_LineString::DeepEcho {{{1*/
     64/*FUNCTION KML_LineString::DeepEcho {{{*/
    6565void  KML_LineString::DeepEcho(){
    6666
    … …  
    7272}
    7373/*}}}*/
    74 /*FUNCTION KML_LineString::DeepEcho {{{1*/
     74/*FUNCTION KML_LineString::DeepEcho {{{*/
    7575void  KML_LineString::DeepEcho(const char* indent){
    7676
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION KML_LineString::Write {{{1*/
     94/*FUNCTION KML_LineString::Write {{{*/
    9595void  KML_LineString::Write(FILE* filout,const char* indent){
    9696
    … …  
    121121}
    122122/*}}}*/
    123 /*FUNCTION KML_LineString::Read {{{1*/
     123/*FUNCTION KML_LineString::Read {{{*/
    124124void  KML_LineString::Read(FILE* fid,char* kstr){
    125125
    … …  
    179179}
    180180/*}}}*/
    181 /*FUNCTION KML_LineString::WriteExp {{{1*/
     181/*FUNCTION KML_LineString::WriteExp {{{*/
    182182void  KML_LineString::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    183183

  • issm/trunk-jpl/src/c/objects/KML/KML_LineString.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2727                double (*coords)[3];
    2828
    29                 /*KML_LineString constructors, destructors {{{1*/
     29                /*KML_LineString constructors, destructors {{{*/
    3030                KML_LineString();
    3131                ~KML_LineString();
    3232                /*}}}*/
    33                 /*Object virtual functions definitions:{{{1*/
     33                /*Object virtual functions definitions:{{{*/
    3434                void  Echo();
    3535                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_LineStyle::KML_LineStyle(){{{1*/
     23/*FUNCTION KML_LineStyle::KML_LineStyle(){{{*/
    2424KML_LineStyle::KML_LineStyle(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_LineStyle::~KML_LineStyle(){{{1*/
     30/*FUNCTION KML_LineStyle::~KML_LineStyle(){{{*/
    3131KML_LineStyle::~KML_LineStyle(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION KML_LineStyle::Echo {{{1*/
     39/*FUNCTION KML_LineStyle::Echo {{{*/
    4040void  KML_LineStyle::Echo(){
    4141
    … …  
    5151/*}}}*/
    5252
    53 /*FUNCTION KML_LineStyle::DeepEcho {{{1*/
     53/*FUNCTION KML_LineStyle::DeepEcho {{{*/
    5454void  KML_LineStyle::DeepEcho(){
    5555
    … …  
    6262/*}}}*/
    6363
    64 /*FUNCTION KML_LineStyle::DeepEcho {{{1*/
     64/*FUNCTION KML_LineStyle::DeepEcho {{{*/
    6565void  KML_LineStyle::DeepEcho(const char* indent){
    6666
    … …  
    7777/*}}}*/
    7878
    79 /*FUNCTION KML_LineStyle::Write {{{1*/
     79/*FUNCTION KML_LineStyle::Write {{{*/
    8080void  KML_LineStyle::Write(FILE* filout,const char* indent){
    8181
    … …  
    9595/*}}}*/
    9696
    97 /*FUNCTION KML_LineStyle::Read {{{1*/
     97/*FUNCTION KML_LineStyle::Read {{{*/
    9898void  KML_LineStyle::Read(FILE* fid,char* kstr){
    9999

  • issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2121                float width;
    2222
    23                 /*KML_LineStyle constructors, destructors {{{1*/
     23                /*KML_LineStyle constructors, destructors {{{*/
    2424                KML_LineStyle();
    2525                ~KML_LineStyle();
    2626                /*}}}*/
    27                 /*Object virtual functions definitions:{{{1 */
     27                /*Object virtual functions definitions:{{{ */
    2828                void  Echo();
    2929                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2222
    2323/*Constructors/destructor/copy*/
    24 /*FUNCTION KML_LinearRing::KML_LinearRing(){{{1*/
     24/*FUNCTION KML_LinearRing::KML_LinearRing(){{{*/
    2525KML_LinearRing::KML_LinearRing(){
    2626
    … …  
    3434}
    3535/*}}}*/
    36 /*FUNCTION KML_LinearRing::~KML_LinearRing(){{{1*/
     36/*FUNCTION KML_LinearRing::~KML_LinearRing(){{{*/
    3737KML_LinearRing::~KML_LinearRing(){
    3838
    … …  
    4646
    4747/*Other*/
    48 /*FUNCTION KML_LinearRing::Echo {{{1*/
     48/*FUNCTION KML_LinearRing::Echo {{{*/
    4949void  KML_LinearRing::Echo(){
    5050
    … …  
    6363/*}}}*/
    6464
    65 /*FUNCTION KML_LinearRing::DeepEcho {{{1*/
     65/*FUNCTION KML_LinearRing::DeepEcho {{{*/
    6666void  KML_LinearRing::DeepEcho(){
    6767
    … …  
    7474/*}}}*/
    7575
    76 /*FUNCTION KML_LinearRing::DeepEcho {{{1*/
     76/*FUNCTION KML_LinearRing::DeepEcho {{{*/
    7777void  KML_LinearRing::DeepEcho(const char* indent){
    7878
    … …  
    9595/*}}}*/
    9696
    97 /*FUNCTION KML_LinearRing::Write {{{1*/
     97/*FUNCTION KML_LinearRing::Write {{{*/
    9898void  KML_LinearRing::Write(FILE* filout,const char* indent){
    9999
    … …  
    125125/*}}}*/
    126126
    127 /*FUNCTION KML_LinearRing::Read {{{1*/
     127/*FUNCTION KML_LinearRing::Read {{{*/
    128128void  KML_LinearRing::Read(FILE* fid,char* kstr){
    129129
    … …  
    184184/*}}}*/
    185185
    186 /*FUNCTION KML_LinearRing::WriteExp {{{1*/
     186/*FUNCTION KML_LinearRing::WriteExp {{{*/
    187187void  KML_LinearRing::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    188188

  • issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2727                double (*coords)[3];
    2828
    29                 /*KML_LinearRing constructors, destructors {{{1*/
     29                /*KML_LinearRing constructors, destructors {{{*/
    3030                KML_LinearRing();
    3131                ~KML_LinearRing();
    3232                /*}}}*/
    33                 /*Object virtual functions definitions:{{{1*/
     33                /*Object virtual functions definitions:{{{*/
    3434                void  Echo();
    3535                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{1*/
     23/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{*/
    2424KML_MultiGeometry::KML_MultiGeometry(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{1*/
     30/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{*/
    3131KML_MultiGeometry::~KML_MultiGeometry(){
    3232
    … …  
    4040
    4141/*Other*/
    42 /*FUNCTION KML_MultiGeometry::Echo {{{1*/
     42/*FUNCTION KML_MultiGeometry::Echo {{{*/
    4343void  KML_MultiGeometry::Echo(){
    4444
    … …  
    5454/*}}}*/
    5555
    56 /*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/
     56/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
    5757void  KML_MultiGeometry::DeepEcho(){
    5858
    … …  
    6565/*}}}*/
    6666
    67 /*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/
     67/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
    6868void  KML_MultiGeometry::DeepEcho(const char* indent){
    6969
    … …  
    9393/*}}}*/
    9494
    95 /*FUNCTION KML_MultiGeometry::Write {{{1*/
     95/*FUNCTION KML_MultiGeometry::Write {{{*/
    9696void  KML_MultiGeometry::Write(FILE* filout,const char* indent){
    9797
    … …  
    121121/*}}}*/
    122122
    123 /*FUNCTION KML_MultiGeometry::Read {{{1*/
     123/*FUNCTION KML_MultiGeometry::Read {{{*/
    124124void  KML_MultiGeometry::Read(FILE* fid,char* kstr){
    125125
    … …  
    194194/*}}}*/
    195195
    196 /*FUNCTION KML_MultiGeometry::WriteExp {{{1*/
     196/*FUNCTION KML_MultiGeometry::WriteExp {{{*/
    197197void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    198198

  • issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2323                DataSet* geometry;
    2424
    25                 /*KML_MultiGeometry constructors, destructors {{{1*/
     25                /*KML_MultiGeometry constructors, destructors {{{*/
    2626                KML_MultiGeometry();
    2727                ~KML_MultiGeometry();
    2828                /*}}}*/
    29                 /*Object virtual functions definitions:{{{1*/
     29                /*Object virtual functions definitions:{{{*/
    3030                void  Echo();
    3131                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

    r11383 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Object::KML_Object(){{{1*/
     23/*FUNCTION KML_Object::KML_Object(){{{*/
    2424KML_Object::KML_Object(){
    2525
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION KML_Object::~KML_Object(){{{1*/
     32/*FUNCTION KML_Object::~KML_Object(){{{*/
    3333KML_Object::~KML_Object(){
    3434
    … …  
    5050
    5151/*Other*/
    52 /*FUNCTION KML_Object::Echo {{{1*/
     52/*FUNCTION KML_Object::Echo {{{*/
    5353void  KML_Object::Echo(){
    5454
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION KML_Object::DeepEcho {{{1*/
     64/*FUNCTION KML_Object::DeepEcho {{{*/
    6565void  KML_Object::DeepEcho(){
    6666
    … …  
    7272}
    7373/*}}}*/
    74 /*FUNCTION KML_Object::DeepEcho {{{1*/
     74/*FUNCTION KML_Object::DeepEcho {{{*/
    7575void  KML_Object::DeepEcho(const char* indent){
    7676
    … …  
    114114}
    115115/*}}}*/
    116 /*FUNCTION KML_Object::Write {{{1*/
     116/*FUNCTION KML_Object::Write {{{*/
    117117void  KML_Object::Write(FILE* filout,const char* indent){
    118118
    … …  
    136136}
    137137/*}}}*/
    138 /*FUNCTION KML_Object::Read {{{1*/
     138/*FUNCTION KML_Object::Read {{{*/
    139139void  KML_Object::Read(FILE* fid,char* kstr){
    140140
    … …  
    264264}
    265265/*}}}*/
    266 /*FUNCTION KML_Object::WriteExp {{{1*/
     266/*FUNCTION KML_Object::WriteExp {{{*/
    267267void  KML_Object::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    268268
    … …  
    272272}
    273273/*}}}*/
    274 /*FUNCTION KML_Object::AddAttrib {{{1*/
     274/*FUNCTION KML_Object::AddAttrib {{{*/
    275275void  KML_Object::AddAttrib(const char* name,const char* value){
    276276
    … …  
    284284}
    285285/*}}}*/
    286 /*FUNCTION KML_Object::FindAttrib {{{1*/
     286/*FUNCTION KML_Object::FindAttrib {{{*/
    287287void  KML_Object::FindAttrib(char** pvalue,char* name,char* deflt){
    288288
    … …  
    311311}
    312312/*}}}*/
    313 /*FUNCTION KML_Object::WriteAttrib {{{1*/
     313/*FUNCTION KML_Object::WriteAttrib {{{*/
    314314void  KML_Object::WriteAttrib(FILE* filout,const char* indent){
    315315
    … …  
    325325}
    326326/*}}}*/
    327 /*FUNCTION KML_Object::AddCommnt {{{1*/
     327/*FUNCTION KML_Object::AddCommnt {{{*/
    328328void  KML_Object::AddCommnt(int ncom,char** pcom){
    329329
    … …  
    340340}
    341341/*}}}*/
    342 /*FUNCTION KML_Object::AddCommnt {{{1*/
     342/*FUNCTION KML_Object::AddCommnt {{{*/
    343343void  KML_Object::AddCommnt(char* value){
    344344
    … …  
    352352}
    353353/*}}}*/
    354 /*FUNCTION KML_Object::FindCommnt {{{1*/
     354/*FUNCTION KML_Object::FindCommnt {{{*/
    355355void  KML_Object::FindCommnt(char** pvalue,int inum){
    356356
    … …  
    370370}
    371371/*}}}*/
    372 /*FUNCTION KML_Object::WriteCommnt {{{1*/
     372/*FUNCTION KML_Object::WriteCommnt {{{*/
    373373void  KML_Object::WriteCommnt(FILE* filout,const char* indent){
    374374

  • issm/trunk-jpl/src/c/objects/KML/KML_Object.h

    r11383 r12365  
    66#define _KML_OBJECT_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2323                DataSet* kmlobj;
    2424
    25                 /*KML_Object constructors, destructors {{{1*/
     25                /*KML_Object constructors, destructors {{{*/
    2626                KML_Object();
    2727                ~KML_Object();
    2828                /*}}}*/
    29                 /*Object virtual functions definitions:{{{1*/
     29                /*Object virtual functions definitions:{{{*/
    3030                virtual void  Echo();
    3131                virtual void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Overlay::KML_Overlay(){{{1*/
     23/*FUNCTION KML_Overlay::KML_Overlay(){{{*/
    2424KML_Overlay::KML_Overlay(){
    2525
    … …  
    3232}
    3333/*}}}*/
    34 /*FUNCTION KML_Overlay::~KML_Overlay(){{{1*/
     34/*FUNCTION KML_Overlay::~KML_Overlay(){{{*/
    3535KML_Overlay::~KML_Overlay(){
    3636
    … …  
    4444
    4545/*Other*/
    46 /*FUNCTION KML_Overlay::Echo {{{1*/
     46/*FUNCTION KML_Overlay::Echo {{{*/
    4747void  KML_Overlay::Echo(){
    4848
    … …  
    5959/*}}}*/
    6060
    61 /*FUNCTION KML_Overlay::DeepEcho {{{1*/
     61/*FUNCTION KML_Overlay::DeepEcho {{{*/
    6262void  KML_Overlay::DeepEcho(){
    6363
    … …  
    7070/*}}}*/
    7171
    72 /*FUNCTION KML_Overlay::DeepEcho {{{1*/
     72/*FUNCTION KML_Overlay::DeepEcho {{{*/
    7373void  KML_Overlay::DeepEcho(const char* indent){
    7474
    … …  
    9292/*}}}*/
    9393
    94 /*FUNCTION KML_Overlay::Write {{{1*/
     94/*FUNCTION KML_Overlay::Write {{{*/
    9595void  KML_Overlay::Write(FILE* filout,const char* indent){
    9696
    … …  
    113113/*}}}*/
    114114
    115 /*FUNCTION KML_Overlay::Read {{{1*/
     115/*FUNCTION KML_Overlay::Read {{{*/
    116116void  KML_Overlay::Read(FILE* fid,char* kstr){
    117117

  • issm/trunk-jpl/src/c/objects/KML/KML_Overlay.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2626                KML_Icon* icon;
    2727
    28                 /*KML_Overlay constructors, destructors {{{1*/
     28                /*KML_Overlay constructors, destructors {{{*/
    2929                KML_Overlay();
    3030                ~KML_Overlay();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1*/
     32                /*Object virtual functions definitions:{{{*/
    3333                void  Echo();
    3434                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Placemark::KML_Placemark(){{{1*/
     23/*FUNCTION KML_Placemark::KML_Placemark(){{{*/
    2424KML_Placemark::KML_Placemark(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION KML_Placemark::~KML_Placemark(){{{1*/
     30/*FUNCTION KML_Placemark::~KML_Placemark(){{{*/
    3131KML_Placemark::~KML_Placemark(){
    3232
    … …  
    4040
    4141/*Other*/
    42 /*FUNCTION KML_Placemark::Echo {{{1*/
     42/*FUNCTION KML_Placemark::Echo {{{*/
    4343void  KML_Placemark::Echo(){
    4444
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION KML_Placemark::DeepEcho {{{1*/
     55/*FUNCTION KML_Placemark::DeepEcho {{{*/
    5656void  KML_Placemark::DeepEcho(){
    5757
    … …  
    6363}
    6464/*}}}*/
    65 /*FUNCTION KML_Placemark::DeepEcho {{{1*/
     65/*FUNCTION KML_Placemark::DeepEcho {{{*/
    6666void  KML_Placemark::DeepEcho(const char* indent){
    6767
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION KML_Placemark::Write {{{1*/
     92/*FUNCTION KML_Placemark::Write {{{*/
    9393void  KML_Placemark::Write(FILE* filout,const char* indent){
    9494
    … …  
    117117}
    118118/*}}}*/
    119 /*FUNCTION KML_Placemark::Read {{{1*/
     119/*FUNCTION KML_Placemark::Read {{{*/
    120120void  KML_Placemark::Read(FILE* fid,char* kstr){
    121121
    … …  
    189189}
    190190/*}}}*/
    191 /*FUNCTION KML_Placemark::WriteExp {{{1*/
     191/*FUNCTION KML_Placemark::WriteExp {{{*/
    192192void  KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    193193

  • issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2323                DataSet* geometry;
    2424
    25                 /*KML_Placemark constructors, destructors {{{1*/
     25                /*KML_Placemark constructors, destructors {{{*/
    2626                KML_Placemark();
    2727                ~KML_Placemark();
    2828                /*}}}*/
    29                 /*Object virtual functions definitions:{{{1*/
     29                /*Object virtual functions definitions:{{{*/
    3030                void  Echo();
    3131                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2222
    2323/*Constructors/destructor/copy*/
    24 /*FUNCTION KML_Point::KML_Point(){{{1*/
     24/*FUNCTION KML_Point::KML_Point(){{{*/
    2525KML_Point::KML_Point(){
    2626
    … …  
    3434}
    3535/*}}}*/
    36 /*FUNCTION KML_Point::~KML_Point(){{{1*/
     36/*FUNCTION KML_Point::~KML_Point(){{{*/
    3737KML_Point::~KML_Point(){
    3838
    … …  
    4343
    4444/*Other*/
    45 /*FUNCTION KML_Point::Echo {{{1*/
     45/*FUNCTION KML_Point::Echo {{{*/
    4646void  KML_Point::Echo(){
    4747
    … …  
    5858}
    5959/*}}}*/
    60 /*FUNCTION KML_Point::DeepEcho {{{1*/
     60/*FUNCTION KML_Point::DeepEcho {{{*/
    6161void  KML_Point::DeepEcho(){
    6262
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION KML_Point::DeepEcho {{{1*/
     70/*FUNCTION KML_Point::DeepEcho {{{*/
    7171void  KML_Point::DeepEcho(const char* indent){
    7272
    … …  
    8383}
    8484/*}}}*/
    85 /*FUNCTION KML_Point::Write {{{1*/
     85/*FUNCTION KML_Point::Write {{{*/
    8686void  KML_Point::Write(FILE* filout,const char* indent){
    8787
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION KML_Point::Read {{{1*/
     105/*FUNCTION KML_Point::Read {{{*/
    106106void  KML_Point::Read(FILE* fid,char* kstr){
    107107
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION KML_Point::WriteExp {{{1*/
     160/*FUNCTION KML_Point::WriteExp {{{*/
    161161void  KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    162162

  • issm/trunk-jpl/src/c/objects/KML/KML_Point.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2525                double coords[3];
    2626
    27                 /*KML_Point constructors, destructors {{{1*/
     27                /*KML_Point constructors, destructors {{{*/
    2828                KML_Point();
    2929                ~KML_Point();
    3030                /*}}}*/
    31                 /*Object virtual functions definitions:{{{1*/
     31                /*Object virtual functions definitions:{{{*/
    3232                void  Echo();
    3333                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_PolyStyle::KML_PolyStyle(){{{1*/
     23/*FUNCTION KML_PolyStyle::KML_PolyStyle(){{{*/
    2424KML_PolyStyle::KML_PolyStyle(){
    2525
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION KML_PolyStyle::~KML_PolyStyle(){{{1*/
     31/*FUNCTION KML_PolyStyle::~KML_PolyStyle(){{{*/
    3232KML_PolyStyle::~KML_PolyStyle(){
    3333
    … …  
    3838
    3939/*Other*/
    40 /*FUNCTION KML_PolyStyle::Echo {{{1*/
     40/*FUNCTION KML_PolyStyle::Echo {{{*/
    4141void  KML_PolyStyle::Echo(){
    4242
    … …  
    5353/*}}}*/
    5454
    55 /*FUNCTION KML_PolyStyle::DeepEcho {{{1*/
     55/*FUNCTION KML_PolyStyle::DeepEcho {{{*/
    5656void  KML_PolyStyle::DeepEcho(){
    5757
    … …  
    6464/*}}}*/
    6565
    66 /*FUNCTION KML_PolyStyle::DeepEcho {{{1*/
     66/*FUNCTION KML_PolyStyle::DeepEcho {{{*/
    6767void  KML_PolyStyle::DeepEcho(const char* indent){
    6868
    … …  
    8080/*}}}*/
    8181
    82 /*FUNCTION KML_PolyStyle::Write {{{1*/
     82/*FUNCTION KML_PolyStyle::Write {{{*/
    8383void  KML_PolyStyle::Write(FILE* filout,const char* indent){
    8484
    … …  
    9999/*}}}*/
    100100
    101 /*FUNCTION KML_PolyStyle::Read {{{1*/
     101/*FUNCTION KML_PolyStyle::Read {{{*/
    102102void  KML_PolyStyle::Read(FILE* fid,char* kstr){
    103103

  • issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2222                int   outline;
    2323
    24                 /*KML_PolyStyle constructors, destructors {{{1*/
     24                /*KML_PolyStyle constructors, destructors {{{*/
    2525                KML_PolyStyle();
    2626                ~KML_PolyStyle();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1 */
     28                /*Object virtual functions definitions:{{{ */
    2929                void  Echo();
    3030                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Polygon::KML_Polygon(){{{1*/
     23/*FUNCTION KML_Polygon::KML_Polygon(){{{*/
    2424KML_Polygon::KML_Polygon(){
    2525
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION KML_Polygon::~KML_Polygon(){{{1*/
     35/*FUNCTION KML_Polygon::~KML_Polygon(){{{*/
    3636KML_Polygon::~KML_Polygon(){
    3737
    … …  
    5050
    5151/*Other*/
    52 /*FUNCTION KML_Polygon::Echo {{{1*/
     52/*FUNCTION KML_Polygon::Echo {{{*/
    5353void  KML_Polygon::Echo(){
    5454
    … …  
    6767}
    6868/*}}}*/
    69 /*FUNCTION KML_Polygon::DeepEcho {{{1*/
     69/*FUNCTION KML_Polygon::DeepEcho {{{*/
    7070void  KML_Polygon::DeepEcho(){
    7171
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION KML_Polygon::DeepEcho {{{1*/
     79/*FUNCTION KML_Polygon::DeepEcho {{{*/
    8080void  KML_Polygon::DeepEcho(const char* indent){
    8181
    … …  
    115115}
    116116/*}}}*/
    117 /*FUNCTION KML_Polygon::Write {{{1*/
     117/*FUNCTION KML_Polygon::Write {{{*/
    118118void  KML_Polygon::Write(FILE* filout,const char* indent){
    119119
    … …  
    155155}
    156156/*}}}*/
    157 /*FUNCTION KML_Polygon::Read {{{1*/
     157/*FUNCTION KML_Polygon::Read {{{*/
    158158void  KML_Polygon::Read(FILE* fid,char* kstr){
    159159
    … …  
    266266}
    267267/*}}}*/
    268 /*FUNCTION KML_Polygon::WriteExp {{{1*/
     268/*FUNCTION KML_Polygon::WriteExp {{{*/
    269269void  KML_Polygon::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    270270

  • issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h

    r11202 r12365  
    99
    1010/*Headers:*/
    11 /*{{{1*/
     11/*{{{*/
    1212#include "../../include/include.h"
    1313#include "../../shared/Exceptions/exceptions.h"
    … …  
    2929                DataSet* inner;
    3030
    31                 /*KML_Polygon constructors, destructors {{{1*/
     31                /*KML_Polygon constructors, destructors {{{*/
    3232                KML_Polygon();
    3333                ~KML_Polygon();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1*/
     35                /*Object virtual functions definitions:{{{*/
    3636                void  Echo();
    3737                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp

    r11319 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Style::KML_Style(){{{1*/
     23/*FUNCTION KML_Style::KML_Style(){{{*/
    2424KML_Style::KML_Style(){
    2525
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION KML_Style::~KML_Style(){{{1*/
     35/*FUNCTION KML_Style::~KML_Style(){{{*/
    3636KML_Style::~KML_Style(){
    3737
    … …  
    6969
    7070/*Other*/
    71 /*FUNCTION KML_Style::Echo {{{1*/
     71/*FUNCTION KML_Style::Echo {{{*/
    7272void  KML_Style::Echo(){
    7373
    … …  
    8888/*}}}*/
    8989
    90 /*FUNCTION KML_Style::DeepEcho {{{1*/
     90/*FUNCTION KML_Style::DeepEcho {{{*/
    9191void  KML_Style::DeepEcho(){
    9292
    … …  
    9999/*}}}*/
    100100
    101 /*FUNCTION KML_Style::DeepEcho {{{1*/
     101/*FUNCTION KML_Style::DeepEcho {{{*/
    102102void  KML_Style::DeepEcho(const char* indent){
    103103
    … …  
    140140/*}}}*/
    141141
    142 /*FUNCTION KML_Style::Write {{{1*/
     142/*FUNCTION KML_Style::Write {{{*/
    143143void  KML_Style::Write(FILE* filout,const char* indent){
    144144
    … …  
    175175/*}}}*/
    176176
    177 /*FUNCTION KML_Style::Read {{{1*/
     177/*FUNCTION KML_Style::Read {{{*/
    178178void  KML_Style::Read(FILE* fid,char* kstr){
    179179

  • issm/trunk-jpl/src/c/objects/KML/KML_Style.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2828                void* list;
    2929
    30                 /*KML_Style constructors, destructors {{{1*/
     30                /*KML_Style constructors, destructors {{{*/
    3131                KML_Style();
    3232                ~KML_Style();
    3333                /*}}}*/
    34                 /*Object virtual functions definitions:{{{1*/
     34                /*Object virtual functions definitions:{{{*/
    3535                void  Echo();
    3636                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020
    2121/*Constructors/destructor/copy*/
    22 /*FUNCTION KML_StyleSelector::KML_StyleSelector(){{{1*/
     22/*FUNCTION KML_StyleSelector::KML_StyleSelector(){{{*/
    2323KML_StyleSelector::KML_StyleSelector(){
    2424
    … …  
    2727}
    2828/*}}}*/
    29 /*FUNCTION KML_StyleSelector::~KML_StyleSelector(){{{1*/
     29/*FUNCTION KML_StyleSelector::~KML_StyleSelector(){{{*/
    3030KML_StyleSelector::~KML_StyleSelector(){
    3131
    … …  
    3636
    3737/*Other*/
    38 /*FUNCTION KML_StyleSelector::Echo {{{1*/
     38/*FUNCTION KML_StyleSelector::Echo {{{*/
    3939void  KML_StyleSelector::Echo(){
    4040
    … …  
    4545/*}}}*/
    4646
    47 /*FUNCTION KML_StyleSelector::DeepEcho {{{1*/
     47/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
    4848void  KML_StyleSelector::DeepEcho(){
    4949
    … …  
    5656/*}}}*/
    5757
    58 /*FUNCTION KML_StyleSelector::DeepEcho {{{1*/
     58/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
    5959void  KML_StyleSelector::DeepEcho(const char* indent){
    6060
    … …  
    6565/*}}}*/
    6666
    67 /*FUNCTION KML_StyleSelector::Write {{{1*/
     67/*FUNCTION KML_StyleSelector::Write {{{*/
    6868void  KML_StyleSelector::Write(FILE* filout,const char* indent){
    6969
    … …  
    7474/*}}}*/
    7575
    76 /*FUNCTION KML_StyleSelector::Read {{{1*/
     76/*FUNCTION KML_StyleSelector::Read {{{*/
    7777void  KML_StyleSelector::Read(FILE* fid,char* kstr){
    7878

  • issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    1919        public:
    2020
    21                 /*KML_StyleSelector constructors, destructors {{{1*/
     21                /*KML_StyleSelector constructors, destructors {{{*/
    2222                KML_StyleSelector();
    2323                ~KML_StyleSelector();
    2424                /*}}}*/
    25                 /*Object virtual functions definitions:{{{1*/
     25                /*Object virtual functions definitions:{{{*/
    2626                void  Echo();
    2727                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.cpp

    r11202 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020
    2121/*Constructors/destructor/copy*/
    22 /*FUNCTION KML_SubStyle::KML_SubStyle(){{{1*/
     22/*FUNCTION KML_SubStyle::KML_SubStyle(){{{*/
    2323KML_SubStyle::KML_SubStyle(){
    2424
    … …  
    2727}
    2828/*}}}*/
    29 /*FUNCTION KML_SubStyle::~KML_SubStyle(){{{1*/
     29/*FUNCTION KML_SubStyle::~KML_SubStyle(){{{*/
    3030KML_SubStyle::~KML_SubStyle(){
    3131
    … …  
    3636
    3737/*Other*/
    38 /*FUNCTION KML_SubStyle::Echo {{{1*/
     38/*FUNCTION KML_SubStyle::Echo {{{*/
    3939void  KML_SubStyle::Echo(){
    4040
    … …  
    4545/*}}}*/
    4646
    47 /*FUNCTION KML_SubStyle::DeepEcho {{{1*/
     47/*FUNCTION KML_SubStyle::DeepEcho {{{*/
    4848void  KML_SubStyle::DeepEcho(){
    4949
    … …  
    5656/*}}}*/
    5757
    58 /*FUNCTION KML_SubStyle::DeepEcho {{{1*/
     58/*FUNCTION KML_SubStyle::DeepEcho {{{*/
    5959void  KML_SubStyle::DeepEcho(const char* indent){
    6060
    … …  
    6565/*}}}*/
    6666
    67 /*FUNCTION KML_SubStyle::Write {{{1*/
     67/*FUNCTION KML_SubStyle::Write {{{*/
    6868void  KML_SubStyle::Write(FILE* filout,const char* indent){
    6969
    … …  
    7474/*}}}*/
    7575
    76 /*FUNCTION KML_SubStyle::Read {{{1*/
     76/*FUNCTION KML_SubStyle::Read {{{*/
    7777void  KML_SubStyle::Read(FILE* fid,char* kstr){
    7878

  • issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.h

    r11202 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    1919        public:
    2020
    21                 /*KML_SubStyle constructors, destructors {{{1*/
     21                /*KML_SubStyle constructors, destructors {{{*/
    2222                KML_SubStyle();
    2323                ~KML_SubStyle();
    2424                /*}}}*/
    25                 /*Object virtual functions definitions:{{{1*/
     25                /*Object virtual functions definitions:{{{*/
    2626                void  Echo();
    2727                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp

    r11406 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION KML_Unknown::KML_Unknown(){{{1*/
     23/*FUNCTION KML_Unknown::KML_Unknown(){{{*/
    2424KML_Unknown::KML_Unknown(){
    2525
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION KML_Unknown::~KML_Unknown(){{{1*/
     31/*FUNCTION KML_Unknown::~KML_Unknown(){{{*/
    3232KML_Unknown::~KML_Unknown(){
    3333
    … …  
    3939
    4040/*Other*/
    41 /*FUNCTION KML_Unknown::Echo {{{1*/
     41/*FUNCTION KML_Unknown::Echo {{{*/
    4242void  KML_Unknown::Echo(){
    4343
    … …  
    5555}
    5656/*}}}*/
    57 /*FUNCTION KML_Unknown::DeepEcho {{{1*/
     57/*FUNCTION KML_Unknown::DeepEcho {{{*/
    5858void  KML_Unknown::DeepEcho(){
    5959
    … …  
    6565}
    6666/*}}}*/
    67 /*FUNCTION KML_Unknown::DeepEcho {{{1*/
     67/*FUNCTION KML_Unknown::DeepEcho {{{*/
    6868void  KML_Unknown::DeepEcho(const char* indent){
    6969
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION KML_Unknown::Write {{{1*/
     97/*FUNCTION KML_Unknown::Write {{{*/
    9898void  KML_Unknown::Write(FILE* filout,const char* indent){
    9999
    … …  
    127127}
    128128/*}}}*/
    129 /*FUNCTION KML_Unknown::Read {{{1*/
     129/*FUNCTION KML_Unknown::Read {{{*/
    130130void  KML_Unknown::Read(FILE* fid,char* kstr){
    131131

  • issm/trunk-jpl/src/c/objects/KML/KML_Unknown.h

    r11295 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../../include/include.h"
    1111#include "../../shared/Exceptions/exceptions.h"
    … …  
    2222                char* value;
    2323
    24                 /*KML_Unknown constructors, destructors {{{1*/
     24                /*KML_Unknown constructors, destructors {{{*/
    2525                KML_Unknown();
    2626                ~KML_Unknown();
    2727                /*}}}*/
    28                 /*Object virtual functions definitions:{{{1*/
     28                /*Object virtual functions definitions:{{{*/
    2929                void  Echo();
    3030                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp

    r12289 r12365  
    1717
    1818/*ExponentialVariogram constructors and destructor*/
    19 /*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{1*/
     19/*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{*/
    2020ExponentialVariogram::ExponentialVariogram(){
    2121        this->nugget = 0.2;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{1*/
     27/*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{*/
    2828ExponentialVariogram::ExponentialVariogram(Options* options){
    2929
    … …  
    4242}
    4343/*}}}*/
    44 /*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{1*/
     44/*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{*/
    4545ExponentialVariogram::~ExponentialVariogram(){
    4646        return;
    … …  
    4949
    5050/*Object virtual functions definitions:*/
    51 /*FUNCTION ExponentialVariogram::Echo {{{1*/
     51/*FUNCTION ExponentialVariogram::Echo {{{*/
    5252void ExponentialVariogram::Echo(void){
    5353        printf("ExponentialVariogram\n");
    … …  
    5959
    6060/*Variogram function*/
    61 /*FUNCTION ExponentialVariogram::Covariance{{{1*/
     61/*FUNCTION ExponentialVariogram::Covariance{{{*/
    6262double ExponentialVariogram::Covariance(double deltax,double deltay){
    6363        /*The covariance can be deduced from the variogram from the following
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION ExponentialVariogram::SemiVariogram{{{1*/
     79/*FUNCTION ExponentialVariogram::SemiVariogram{{{*/
    8080double ExponentialVariogram::SemiVariogram(double deltax,double deltay){
    8181        /*http://en.wikipedia.org/wiki/Variogram*/

  • issm/trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp

    r12292 r12365  
    1717
    1818/*GaussianVariogram constructors and destructor*/
    19 /*FUNCTION GaussianVariogram::GaussianVariogram(){{{1*/
     19/*FUNCTION GaussianVariogram::GaussianVariogram(){{{*/
    2020GaussianVariogram::GaussianVariogram(){
    2121        this->nugget = 0.2;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION GaussianVariogram::GaussianVariogram(Options* options){{{1*/
     27/*FUNCTION GaussianVariogram::GaussianVariogram(Options* options){{{*/
    2828GaussianVariogram::GaussianVariogram(Options* options){
    2929
    … …  
    4242}
    4343/*}}}*/
    44 /*FUNCTION GaussianVariogram::~GaussianVariogram(){{{1*/
     44/*FUNCTION GaussianVariogram::~GaussianVariogram(){{{*/
    4545GaussianVariogram::~GaussianVariogram(){
    4646        return;
    … …  
    4949
    5050/*Object virtual functions definitions:*/
    51 /*FUNCTION GaussianVariogram::Echo {{{1*/
     51/*FUNCTION GaussianVariogram::Echo {{{*/
    5252void GaussianVariogram::Echo(void){
    5353        printf("GaussianVariogram\n");
    … …  
    5959
    6060/*Variogram function*/
    61 /*FUNCTION GaussianVariogram::Covariance{{{1*/
     61/*FUNCTION GaussianVariogram::Covariance{{{*/
    6262double GaussianVariogram::Covariance(double deltax,double deltay){
    6363        /*The covariance can be deduced from the variogram from the following
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION GaussianVariogram::SemiVariogram{{{1*/
     82/*FUNCTION GaussianVariogram::SemiVariogram{{{*/
    8383double GaussianVariogram::SemiVariogram(double deltax,double deltay){
    8484        /*http://en.wikipedia.org/wiki/Variogram*/

  • issm/trunk-jpl/src/c/objects/Kriging/Observation.cpp

    r12273 r12365  
    77
    88/*Observation constructors and destructor*/
    9 /*FUNCTION Observation::Observation(){{{1*/
     9/*FUNCTION Observation::Observation(){{{*/
    1010Observation::Observation(){
    1111        return;
    1212}
    1313/*}}}*/
    14 /*FUNCTION Observation::Observation(double x,double y,int xi,int yi,int index,double value){{{1*/
     14/*FUNCTION Observation::Observation(double x,double y,int xi,int yi,int index,double value){{{*/
    1515Observation::Observation(double x_in,double y_in,int xi_in,int yi_in,int index_in,double value_in){
    1616
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION Observation::~Observation(){{{1*/
     27/*FUNCTION Observation::~Observation(){{{*/
    2828Observation::~Observation(){
    2929        return;
    … …  
    3232
    3333/*Object virtual functions definitions:*/
    34 /*FUNCTION Observation::Echo {{{1*/
     34/*FUNCTION Observation::Echo {{{*/
    3535void Observation::Echo(void){
    3636
    … …  
    4949
    5050/*Observations functions*/
    51 /*FUNCTION Observation::WriteXYObs(double* px,double* py,double* pobs){{{1*/
     51/*FUNCTION Observation::WriteXYObs(double* px,double* py,double* pobs){{{*/
    5252void Observation::WriteXYObs(double* px,double* py,double* pobs){
    5353        *px   = this->x;

  • issm/trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp

    r12289 r12365  
    1717
    1818/*PowerVariogram constructors and destructor*/
    19 /*FUNCTION PowerVariogram::PowerVariogram(){{{1*/
     19/*FUNCTION PowerVariogram::PowerVariogram(){{{*/
    2020PowerVariogram::PowerVariogram(){
    2121        this->nugget = 0.2;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION PowerVariogram::PowerVariogram(Options* options){{{1*/
     27/*FUNCTION PowerVariogram::PowerVariogram(Options* options){{{*/
    2828PowerVariogram::PowerVariogram(Options* options){
    2929
    … …  
    4343}
    4444/*}}}*/
    45 /*FUNCTION PowerVariogram::~PowerVariogram(){{{1*/
     45/*FUNCTION PowerVariogram::~PowerVariogram(){{{*/
    4646PowerVariogram::~PowerVariogram(){
    4747        return;
    … …  
    5050
    5151/*Object virtual functions definitions:*/
    52 /*FUNCTION PowerVariogram::Echo {{{1*/
     52/*FUNCTION PowerVariogram::Echo {{{*/
    5353void PowerVariogram::Echo(void){
    5454        printf("PowerVariogram\n");
    … …  
    6060
    6161/*Variogram function*/
    62 /*FUNCTION PowerVariogram::Covariance{{{1*/
     62/*FUNCTION PowerVariogram::Covariance{{{*/
    6363double PowerVariogram::Covariance(double deltax,double deltay){
    6464        /*The covariance can be deduced from the variogram from the following
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION PowerVariogram::SemiVariogram{{{1*/
     80/*FUNCTION PowerVariogram::SemiVariogram{{{*/
    8181double PowerVariogram::SemiVariogram(double deltax,double deltay){
    8282        /*http://en.wikipedia.org/wiki/Variogram*/

  • issm/trunk-jpl/src/c/objects/Kriging/Quadtree.cpp

    r12298 r12365  
    11#include "../objects.h"
    2 /*DOCUMENTATION What is a Quadtree? {{{1
     2/*DOCUMENTATION What is a Quadtree? {{{
    33 * A Quadtree is a very simple way to group vertices according
    44 * to their locations. A square that holds all the points of the mesh
    … …  
    4646 * Using binaries is therefore very easy to locate a vertex in a box:
    4747 * we just need to look at the bits from the left to the right (See ::Add)
    48  }}}1*/
    49 /*MACROS {{{1*/
     48 }}}*/
     49/*MACROS {{{*/
    5050/*
    5151 *
    … …  
    8080
    8181        /*Constructors/Destructors*/
    82 /*FUNCTION Quadtree::Quadtree(){{{1*/
     82/*FUNCTION Quadtree::Quadtree(){{{*/
    8383Quadtree::Quadtree(){
    8484        _error_("Constructor not supported");
    8585
    8686}
    87 /*}}}1*/
    88 /*FUNCTION Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){{{1*/
     87/*}}}*/
     88/*FUNCTION Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){{{*/
    8989Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){
    9090
    … …  
    104104        this->root=NewQuadtreeBox(xmin+length/2,ymin+length/2,length);
    105105}
    106 /*}}}1*/
    107         /*FUNCTION Quadtree::~Quadtree(){{{1*/
     106/*}}}*/
     107        /*FUNCTION Quadtree::~Quadtree(){{{*/
    108108        Quadtree::~Quadtree(){
    109109
    … …  
    112112
    113113        }
    114         /*}}}1*/
     114        /*}}}*/
    115115
    116116        /*Methods*/
    117 /*FUNCTION Quadtree::Add{{{1*/
     117/*FUNCTION Quadtree::Add{{{*/
    118118void  Quadtree::Add(Observation* observation){
    119119
    … …  
    198198
    199199}/*}}}*/
    200 /*FUNCTION Quadtree::AddAndAverage{{{1*/
     200/*FUNCTION Quadtree::AddAndAverage{{{*/
    201201void Quadtree::AddAndAverage(double x,double y,double value){
    202202
    … …  
    250250        }
    251251}/*}}}*/
    252 /*FUNCTION Quadtree::ClosestObs{{{1*/
     252/*FUNCTION Quadtree::ClosestObs{{{*/
    253253void Quadtree::ClosestObs(int *pindex,double x,double y){
    254254
    … …  
    293293        *pindex=index;
    294294}/*}}}*/
    295 /*FUNCTION Quadtree::Echo{{{1*/
     295/*FUNCTION Quadtree::Echo{{{*/
    296296void  Quadtree::Echo(void){
    297297
    … …  
    303303
    304304}/*}}}*/
    305 /*FUNCTION Quadtree::DeepEcho{{{1*/
     305/*FUNCTION Quadtree::DeepEcho{{{*/
    306306void  Quadtree::DeepEcho(void){
    307307
    … …  
    314314
    315315}/*}}}*/
    316 /*FUNCTION Quadtree::IntergerCoordinates{{{1*/
     316/*FUNCTION Quadtree::IntergerCoordinates{{{*/
    317317void  Quadtree::IntergerCoordinates(int *xi,int *yi,double x,double y){
    318318
    … …  
    338338        *yi=int(coefficient*(y - ymin));
    339339}/*}}}*/
    340 /*FUNCTION Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){{{1*/
     340/*FUNCTION Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){{{*/
    341341Quadtree::QuadtreeBox* Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){
    342342
    … …  
    362362        return newbox;
    363363}/*}}}*/
    364 /*FUNCTION Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index) {{{1*/
     364/*FUNCTION Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index) {{{*/
    365365Quadtree::QuadtreeBox* Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index){
    366366
    … …  
    407407        return newbox;
    408408}/*}}}*/
    409 /*FUNCTION Quadtree::QuadtreeDepth{{{1*/
     409/*FUNCTION Quadtree::QuadtreeDepth{{{*/
    410410void Quadtree::QuadtreeDepth(int* A,int xi,int yi){
    411411
    … …  
    435435        *A=level;
    436436}/*}}}*/
    437 /*FUNCTION Quadtree::QuadtreeDepth2{{{1*/
     437/*FUNCTION Quadtree::QuadtreeDepth2{{{*/
    438438void Quadtree::QuadtreeDepth2(int* A,int xi,int yi){
    439439
    … …  
    488488        *A=level;
    489489}/*}}}*/
    490 /*FUNCTION Quadtree::RangeSearch{{{1*/
     490/*FUNCTION Quadtree::RangeSearch{{{*/
    491491void Quadtree::RangeSearch(int **pindices,int *pnobs,double x,double y,double range){
    492492
    … …  
    508508
    509509/*QuadtreeBox methos*/
    510 /*FUNCTION QuadtreeBox::Echo{{{1*/
     510/*FUNCTION QuadtreeBox::Echo{{{*/
    511511void  Quadtree::QuadtreeBox::Echo(void){
    512512
    … …  
    518518
    519519}/*}}}*/
    520 /*FUNCTION QuadtreeBox::IsWithinRange{{{1*/
     520/*FUNCTION QuadtreeBox::IsWithinRange{{{*/
    521521int Quadtree::QuadtreeBox::IsWithinRange(double x,double y,double range){
    522522
    … …  
    537537
    538538}/*}}}*/
    539 /*FUNCTION QuadtreeBox::RangeSearch{{{1*/
     539/*FUNCTION QuadtreeBox::RangeSearch{{{*/
    540540void Quadtree::QuadtreeBox::RangeSearch(int* indices,int *pnobs,double x,double y,double range){
    541541
    … …  
    579579        *pnobs=nobs;
    580580}/*}}}*/
    581 /*FUNCTION QuadtreeBox::WriteObservations{{{1*/
     581/*FUNCTION QuadtreeBox::WriteObservations{{{*/
    582582void Quadtree::QuadtreeBox::WriteObservations(int* indices,int *pnobs){
    583583

  • issm/trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp

    r12289 r12365  
    1717
    1818/*SphericalVariogram constructors and destructor*/
    19 /*FUNCTION SphericalVariogram::SphericalVariogram(){{{1*/
     19/*FUNCTION SphericalVariogram::SphericalVariogram(){{{*/
    2020SphericalVariogram::SphericalVariogram(){
    2121        this->nugget = 0.2;
    … …  
    2525}
    2626/*}}}*/
    27 /*FUNCTION SphericalVariogram::SphericalVariogram(Options* options){{{1*/
     27/*FUNCTION SphericalVariogram::SphericalVariogram(Options* options){{{*/
    2828SphericalVariogram::SphericalVariogram(Options* options){
    2929
    … …  
    4242}
    4343/*}}}*/
    44 /*FUNCTION SphericalVariogram::~SphericalVariogram(){{{1*/
     44/*FUNCTION SphericalVariogram::~SphericalVariogram(){{{*/
    4545SphericalVariogram::~SphericalVariogram(){
    4646        return;
    … …  
    4949
    5050/*Object virtual functions definitions:*/
    51 /*FUNCTION SphericalVariogram::Echo {{{1*/
     51/*FUNCTION SphericalVariogram::Echo {{{*/
    5252void SphericalVariogram::Echo(void){
    5353        printf("SphericalVariogram\n");
    … …  
    5959
    6060/*Variogram function*/
    61 /*FUNCTION SphericalVariogram::Covariance{{{1*/
     61/*FUNCTION SphericalVariogram::Covariance{{{*/
    6262double SphericalVariogram::Covariance(double deltax,double deltay){
    6363        /*The covariance can be deduced from the variogram from the following
    … …  
    8080}
    8181/*}}}*/
    82 /*FUNCTION SphericalVariogram::SemiVariogram{{{1*/
     82/*FUNCTION SphericalVariogram::SemiVariogram{{{*/
    8383double SphericalVariogram::SemiVariogram(double deltax,double deltay){
    8484        /*http://en.wikipedia.org/wiki/Variogram*/

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

    r11198 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructors*/
    23 /*FUNCTION Friction::Friction() {{{1*/
     23/*FUNCTION Friction::Friction() {{{*/
    2424Friction::Friction(){
    2525        this->element_type=NULL;
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/
     30/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{*/
    3131Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){
    3232
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION Friction::~Friction() {{{1*/
     41/*FUNCTION Friction::~Friction() {{{*/
    4242Friction::~Friction(){
    4343        xfree((void**)&element_type);
    … …  
    4646
    4747/*methods: */
    48 /*FUNCTION Friction::Echo {{{1*/
     48/*FUNCTION Friction::Echo {{{*/
    4949void Friction::Echo(void){
    5050        printf("Friction:\n");
    … …  
    5555}
    5656/*}}}*/
    57 /*FUNCTION Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){{{1*/
     57/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){{{*/
    5858void Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){
    5959
    … …  
    119119}
    120120/*}}}*/
    121 /*FUNCTION Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){{{1*/
     121/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){{{*/
    122122void Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){
    123123
    … …  
    183183}
    184184/*}}}*/
    185 /*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum) {{{1*/
     185/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum) {{{*/
    186186void Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum){
    187187
    … …  
    249249}
    250250/*}}}*/
    251 /*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum) {{{1*/
     251/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum) {{{*/
    252252void Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){
    253253
    … …  
    315315}
    316316/*}}}*/
    317 /*FUNCTION Friction::GetInputValue{{{1*/
     317/*FUNCTION Friction::GetInputValue{{{*/
    318318void Friction::GetInputValue(double* pvalue,GaussTria* gauss,int enum_type){
    319319
    … …  
    324324}
    325325/*}}}*/
    326 /*FUNCTION Friction::GetInputValue{{{1*/
     326/*FUNCTION Friction::GetInputValue{{{*/
    327327void Friction::GetInputValue(double* pvalue,GaussPenta* gauss,int enum_type){
    328328

  • issm/trunk-jpl/src/c/objects/Loads/Friction.h

    r11198 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010class Inputs;
    1111class Matpar;

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

    r12014 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2424
    2525/*Icefront constructors and destructor*/
    26 /*FUNCTION Icefront::Icefront() {{{1*/
     26/*FUNCTION Icefront::Icefront() {{{*/
    2727Icefront::Icefront(){
    2828
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION Icefront::Icefront(int id, int i, IoModel* iomodel,int analysis_type) {{{1*/
     40/*FUNCTION Icefront::Icefront(int id, int i, IoModel* iomodel,int analysis_type) {{{*/
    4141Icefront::Icefront(int icefront_id,int i, IoModel* iomodel,int in_icefront_type, int in_analysis_type){
    4242
    … …  
    114114
    115115/*}}}*/
    116 /*FUNCTION Icefront::~Icefront() {{{1*/
     116/*FUNCTION Icefront::~Icefront() {{{*/
    117117Icefront::~Icefront(){
    118118        delete inputs;
    … …  
    125125
    126126/*Object virtual functions definitions:*/
    127 /*FUNCTION Icefront::Echo {{{1*/
     127/*FUNCTION Icefront::Echo {{{*/
    128128void Icefront::Echo(void){
    129129        printf("Icefront:\n");
    … …  
    139139}
    140140/*}}}*/
    141 /*FUNCTION Icefront::DeepEcho{{{1*/
     141/*FUNCTION Icefront::DeepEcho{{{*/
    142142void Icefront::DeepEcho(void){
    143143
    … …  
    154154}
    155155/*}}}*/
    156 /*FUNCTION Icefront::Id {{{1*/
     156/*FUNCTION Icefront::Id {{{*/
    157157int    Icefront::Id(void){ return id; }
    158158/*}}}*/
    159 /*FUNCTION Icefront::MyRank {{{1*/
     159/*FUNCTION Icefront::MyRank {{{*/
    160160int    Icefront::MyRank(void){
    161161        extern int my_rank;
    … …  
    163163}
    164164/*}}}*/
    165 /*FUNCTION Icefront::ObjectEnum{{{1*/
     165/*FUNCTION Icefront::ObjectEnum{{{*/
    166166int Icefront::ObjectEnum(void){
    167167
    … …  
    170170}
    171171/*}}}*/
    172 /*FUNCTION Icefront::copy {{{1*/
     172/*FUNCTION Icefront::copy {{{*/
    173173Object* Icefront::copy() {
    174174       
    … …  
    205205
    206206/*Load virtual functions definitions:*/
    207 /*FUNCTION Icefront::Configure {{{1*/
     207/*FUNCTION Icefront::Configure {{{*/
    208208void  Icefront::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    209209
    … …  
    223223}
    224224/*}}}*/
    225 /*FUNCTION Icefront::SetCurrentConfiguration {{{1*/
     225/*FUNCTION Icefront::SetCurrentConfiguration {{{*/
    226226void  Icefront::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    227227}
    228228/*}}}*/
    229 /*FUNCTION Icefront::CreateKMatrix {{{1*/
     229/*FUNCTION Icefront::CreateKMatrix {{{*/
    230230void  Icefront::CreateKMatrix(Matrix* Kff, Matrix* Kfs){
    231231
    … …  
    235235}
    236236/*}}}*/
    237 /*FUNCTION Icefront::CreatePVector {{{1*/
     237/*FUNCTION Icefront::CreatePVector {{{*/
    238238void  Icefront::CreatePVector(Vector* pf){
    239239
    240240        /*Checks in debugging mode*/
    241         /*{{{2*/
     241        /*{{{*/
    242242        _assert_(nodes);
    243243        _assert_(element);
    … …  
    273273}
    274274/*}}}*/
    275 /*FUNCTION Icefront::CreateJacobianMatrix{{{1*/
     275/*FUNCTION Icefront::CreateJacobianMatrix{{{*/
    276276void  Icefront::CreateJacobianMatrix(Matrix* Jff){
    277277        this->CreateKMatrix(Jff,NULL);
    278278}
    279 /*}}}1*/
    280 /*FUNCTION Icefront::PenaltyCreateKMatrix {{{1*/
     279/*}}}*/
     280/*FUNCTION Icefront::PenaltyCreateKMatrix {{{*/
    281281void  Icefront::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs, double kmax){
    282282        /*do nothing: */
    … …  
    284284}
    285285/*}}}*/
    286 /*FUNCTION Icefront::PenaltyCreatePVector{{{1*/
     286/*FUNCTION Icefront::PenaltyCreatePVector{{{*/
    287287void  Icefront::PenaltyCreatePVector(Vector* pf,double kmax){
    288288        /*do nothing: */
    … …  
    290290}
    291291/*}}}*/
    292 /*FUNCTION Icefront::PenaltyCreateJacobianMatrix{{{1*/
     292/*FUNCTION Icefront::PenaltyCreateJacobianMatrix{{{*/
    293293void  Icefront::PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){
    294294        this->PenaltyCreateKMatrix(Jff,NULL,kmax);
    295295}
    296 /*}}}1*/
    297 /*FUNCTION Icefront::InAnalysis{{{1*/
     296/*}}}*/
     297/*FUNCTION Icefront::InAnalysis{{{*/
    298298bool Icefront::InAnalysis(int in_analysis_type){
    299299        if (in_analysis_type==this->analysis_type)return true;
    … …  
    303303
    304304/*Update virtual functions definitions:*/
    305 /*FUNCTION Icefront::InputUpdateFromVector(double* vector, int name, int type) {{{1*/
     305/*FUNCTION Icefront::InputUpdateFromVector(double* vector, int name, int type) {{{*/
    306306void  Icefront::InputUpdateFromVector(double* vector, int name, int type){
    307307        /*Nothing updated yet*/
    308308}
    309309/*}}}*/
    310 /*FUNCTION Icefront::InputUpdateFromVector(int* vector, int name, int type) {{{1*/
     310/*FUNCTION Icefront::InputUpdateFromVector(int* vector, int name, int type) {{{*/
    311311void  Icefront::InputUpdateFromVector(int* vector, int name, int type){
    312312        /*Nothing updated yet*/
    313313}
    314314/*}}}*/
    315 /*FUNCTION Icefront::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
     315/*FUNCTION Icefront::InputUpdateFromVector(bool* vector, int name, int type) {{{*/
    316316void  Icefront::InputUpdateFromVector(bool* vector, int name, int type){
    317317        /*Nothing updated yet*/
    318318}
    319319/*}}}*/
    320 /*FUNCTION Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type) {{{1*/
     320/*FUNCTION Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type) {{{*/
    321321void  Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){
    322322        /*Nothing updated yet*/
    323323}
    324324/*}}}*/
    325 /*FUNCTION Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     325/*FUNCTION Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/
    326326void  Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type){
    327327        /*Nothing updated yet*/
    328328}
    329329/*}}}*/
    330 /*FUNCTION Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     330/*FUNCTION Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/
    331331void  Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type){
    332332        /*Nothing updated yet*/
    333333}
    334334/*}}}*/
    335 /*FUNCTION Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     335/*FUNCTION Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/
    336336void  Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    337337        /*Nothing updated yet*/
    338338}
    339339/*}}}*/
    340 /*FUNCTION Icefront::InputUpdateFromConstant(double constant, int name) {{{1*/
     340/*FUNCTION Icefront::InputUpdateFromConstant(double constant, int name) {{{*/
    341341void  Icefront::InputUpdateFromConstant(double constant, int name){
    342342        /*Nothing updated yet*/
    343343}
    344344/*}}}*/
    345 /*FUNCTION Icefront::InputUpdateFromConstant(int constant, int name) {{{1*/
     345/*FUNCTION Icefront::InputUpdateFromConstant(int constant, int name) {{{*/
    346346void  Icefront::InputUpdateFromConstant(int constant, int name){
    347347        /*Nothing updated yet*/
    348348}
    349349/*}}}*/
    350 /*FUNCTION Icefront::InputUpdateFromConstant(bool constant, int name) {{{1*/
     350/*FUNCTION Icefront::InputUpdateFromConstant(bool constant, int name) {{{*/
    351351void  Icefront::InputUpdateFromConstant(bool constant, int name){
    352352        /*Nothing updated yet*/
    353353}
    354354/*}}}*/
    355 /*FUNCTION Icefront::InputUpdateFromSolution{{{1*/
     355/*FUNCTION Icefront::InputUpdateFromSolution{{{*/
    356356void  Icefront::InputUpdateFromSolution(double* solution){
    357357        /*Nothing updated yet*/
    … …  
    361361/*Icefront numerics: */
    362362#ifdef _HAVE_DIAGNOSTIC_
    363 /*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/
     363/*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{*/
    364364ElementVector* Icefront::CreatePVectorDiagnosticHoriz(void){
    365365
    … …  
    383383}
    384384/*}}}*/
    385 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{1*/
     385/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{*/
    386386ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal2d(void){
    387387
    … …  
    467467
    468468#ifdef _HAVE_CONTROL_
    469 /*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/
     469/*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{*/
    470470ElementVector* Icefront::CreatePVectorAdjointHoriz(void){
    471471
    … …  
    476476#endif
    477477#ifdef _HAVE_3D_
    478 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/
     478/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{*/
    479479ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){
    480480
    … …  
    504504}
    505505/*}}}*/
    506 /*FUNCTION Icefront::CreatePVectorDiagnosticPattyn{{{1*/
     506/*FUNCTION Icefront::CreatePVectorDiagnosticPattyn{{{*/
    507507ElementVector* Icefront::CreatePVectorDiagnosticPattyn(void){
    508508
    … …  
    581581}
    582582/*}}}*/
    583 /*FUNCTION Icefront::CreatePVectorDiagnosticStokes{{{1*/
     583/*FUNCTION Icefront::CreatePVectorDiagnosticStokes{{{*/
    584584ElementVector* Icefront::CreatePVectorDiagnosticStokes(void){
    585585
    … …  
    660660/*}}}*/
    661661#endif
    662 /*FUNCTION Icefront::GetDofList {{{1*/
     662/*FUNCTION Icefront::GetDofList {{{*/
    663663void  Icefront::GetDofList(int** pdoflist,int approximation_enum,int setenum){
    664664
    … …  
    704704}
    705705/*}}}*/
    706 /*FUNCTION Icefront::GetSegmentNormal {{{1*/
     706/*FUNCTION Icefront::GetSegmentNormal {{{*/
    707707void Icefront:: GetSegmentNormal(double* normal,double xyz_list[4][3]){
    708708
    … …  
    721721}
    722722/*}}}*/
    723 /*FUNCTION Icefront::GetQuadNormal {{{1*/
     723/*FUNCTION Icefront::GetQuadNormal {{{*/
    724724void Icefront:: GetQuadNormal(double* normal,double xyz_list[4][3]){
    725725

  • issm/trunk-jpl/src/c/objects/Loads/Icefront.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Load.h"
    1111class Hook;
    … …  
    3939                Parameters* parameters;
    4040
    41                 /*Icefront constructors, destructors: {{{1*/
     41                /*Icefront constructors, destructors: {{{*/
    4242                Icefront();
    4343                Icefront(int icefront_id,int i, IoModel* iomodel,int in_icefront_type, int analysis_type);
    4444                ~Icefront();
    4545                /*}}}*/
    46                 /*Object virtual functions definitions:{{{1 */
     46                /*Object virtual functions definitions:{{{ */
    4747                void  Echo();
    4848                void  DeepEcho();
    … …  
    5252                Object* copy();
    5353                /*}}}*/
    54                 /*Update virtual functions definitions: {{{1*/
     54                /*Update virtual functions definitions: {{{*/
    5555                void  InputUpdateFromVector(double* vector, int name, int type);
    5656                void  InputUpdateFromVector(int* vector, int name, int type);
    … …  
    6666                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6767                /*}}}*/
    68                 /*Load virtual functions definitions: {{{1*/
     68                /*Load virtual functions definitions: {{{*/
    6969                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    7070                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    … …  
    7777                bool  InAnalysis(int analysis_type);
    7878                /*}}}*/
    79                 /*Load management: {{{1*/
     79                /*Load management: {{{*/
    8080                void GetDofList(int** pdoflist,int approximation_enum,int setenum);
    8181                void GetSegmentNormal(double* normal,double xyz_list[2][3]);

  • issm/trunk-jpl/src/c/objects/Loads/Load.h

    r11679 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313class Object;
    1414class Matrix;
    … …  
    2626                virtual       ~Load(){};
    2727               
    28                 /*Virtual functions: {{{1*/
     28                /*Virtual functions: {{{*/
    2929                virtual void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;
    3030                virtual void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0;

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

    r12014 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88#include <config.h>
    … …  
    2424
    2525/*Numericalflux constructors and destructor*/
    26 /*FUNCTION Numericalflux::Numericalflux(){{{1*/
     26/*FUNCTION Numericalflux::Numericalflux(){{{*/
    2727Numericalflux::Numericalflux(){
    2828        this->inputs=NULL;
    … …  
    3434}
    3535/*}}}*/
    36 /*}}}*//*FUNCTION Numericalflux::Numericalflux(int id, int i, IoModel* iomodel, int analysis_type) {{{1*/
     36/*}}}*//*FUNCTION Numericalflux::Numericalflux(int id, int i, IoModel* iomodel, int analysis_type) {{{*/
    3737Numericalflux::Numericalflux(int numericalflux_id,int i, IoModel* iomodel, int in_analysis_type){
    3838
    … …  
    139139}
    140140/*}}}*/
    141 /*FUNCTION Numericalflux::~Numericalflux(){{{1*/
     141/*FUNCTION Numericalflux::~Numericalflux(){{{*/
    142142Numericalflux::~Numericalflux(){
    143143        delete inputs;
    … …  
    149149
    150150/*Object virtual functions definitions:*/
    151 /*FUNCTION Numericalflux::Echo {{{1*/
     151/*FUNCTION Numericalflux::Echo {{{*/
    152152void Numericalflux::Echo(void){
    153153        printf("Numericalflux:\n");
    … …  
    160160}
    161161/*}}}*/
    162 /*FUNCTION Numericalflux::DeepEcho {{{1*/
     162/*FUNCTION Numericalflux::DeepEcho {{{*/
    163163void Numericalflux::DeepEcho(void){
    164164
    … …  
    178178}               
    179179/*}}}*/
    180 /*FUNCTION Numericalflux::Id {{{1*/
     180/*FUNCTION Numericalflux::Id {{{*/
    181181int    Numericalflux::Id(void){
    182182        return id;
    183183}
    184184/*}}}*/
    185 /*FUNCTION Numericalflux::MyRank {{{1*/
     185/*FUNCTION Numericalflux::MyRank {{{*/
    186186int    Numericalflux::MyRank(void){
    187187        extern int my_rank;
    … …  
    189189}
    190190/*}}}*/
    191 /*FUNCTION Numericalflux::ObjectEnum{{{1*/
     191/*FUNCTION Numericalflux::ObjectEnum{{{*/
    192192int Numericalflux::ObjectEnum(void){
    193193
    … …  
    196196}
    197197/*}}}*/
    198 /*FUNCTION Numericalflux::copy {{{1*/
     198/*FUNCTION Numericalflux::copy {{{*/
    199199Object* Numericalflux::copy() {
    200200       
    … …  
    228228
    229229/*Load virtual functions definitions:*/
    230 /*FUNCTION Numericalflux::Configure {{{1*/
     230/*FUNCTION Numericalflux::Configure {{{*/
    231231void  Numericalflux::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    232232
    … …  
    245245}
    246246/*}}}*/
    247 /*FUNCTION Numericalflux::SetCurrentConfiguration {{{1*/
     247/*FUNCTION Numericalflux::SetCurrentConfiguration {{{*/
    248248void  Numericalflux::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    249249
    250250}
    251251/*}}}*/
    252 /*FUNCTION Numericalflux::CreateKMatrix {{{1*/
     252/*FUNCTION Numericalflux::CreateKMatrix {{{*/
    253253void  Numericalflux::CreateKMatrix(Matrix* Kff, Matrix* Kfs){
    254254
    … …  
    281281}
    282282/*}}}*/
    283 /*FUNCTION Numericalflux::CreatePVector {{{1*/
     283/*FUNCTION Numericalflux::CreatePVector {{{*/
    284284void  Numericalflux::CreatePVector(Vector* pf){
    285285
    … …  
    311311}
    312312/*}}}*/
    313 /*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{1*/
     313/*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{*/
    314314void  Numericalflux::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){
    315315
    … …  
    319319}
    320320/*}}}*/
    321 /*FUNCTION Numericalflux::PenaltyCreatePVector{{{1*/
     321/*FUNCTION Numericalflux::PenaltyCreatePVector{{{*/
    322322void  Numericalflux::PenaltyCreatePVector(Vector* pf,double kmax){
    323323
    … …  
    327327}
    328328/*}}}*/
    329 /*FUNCTION Numericalflux::InAnalysis{{{1*/
     329/*FUNCTION Numericalflux::InAnalysis{{{*/
    330330bool Numericalflux::InAnalysis(int in_analysis_type){
    331331        if (in_analysis_type==this->analysis_type) return true;
    … …  
    335335
    336336/*Numericalflux management*/
    337 /*FUNCTION Numericalflux::CreateKMatrixPrognostic{{{1*/
     337/*FUNCTION Numericalflux::CreateKMatrixPrognostic{{{*/
    338338ElementMatrix* Numericalflux::CreateKMatrixPrognostic(void){
    339339
    … …  
    351351}
    352352/*}}}*/
    353 /*FUNCTION Numericalflux::CreateKMatrixPrognosticInternal {{{1*/
     353/*FUNCTION Numericalflux::CreateKMatrixPrognosticInternal {{{*/
    354354ElementMatrix* Numericalflux::CreateKMatrixPrognosticInternal(void){
    355355
    … …  
    416416}
    417417/*}}}*/
    418 /*FUNCTION Numericalflux::CreateKMatrixPrognosticBoundary {{{1*/
     418/*FUNCTION Numericalflux::CreateKMatrixPrognosticBoundary {{{*/
    419419ElementMatrix* Numericalflux::CreateKMatrixPrognosticBoundary(void){
    420420
    … …  
    488488}
    489489/*}}}*/
    490 /*FUNCTION Numericalflux::CreateKMatrixBalancethickness{{{1*/
     490/*FUNCTION Numericalflux::CreateKMatrixBalancethickness{{{*/
    491491ElementMatrix* Numericalflux::CreateKMatrixBalancethickness(void){
    492492
    … …  
    504504}
    505505/*}}}*/
    506 /*FUNCTION Numericalflux::CreateKMatrixBalancethicknessInternal {{{1*/
     506/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessInternal {{{*/
    507507ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessInternal(void){
    508508
    … …  
    568568}
    569569/*}}}*/
    570 /*FUNCTION Numericalflux::CreateKMatrixBalancethicknessBoundary {{{1*/
     570/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessBoundary {{{*/
    571571ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessBoundary(void){
    572572
    … …  
    639639}
    640640/*}}}*/
    641 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethickness{{{1*/
     641/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethickness{{{*/
    642642ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethickness(void){
    643643
    … …  
    655655}
    656656/*}}}*/
    657 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessInternal {{{1*/
     657/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessInternal {{{*/
    658658ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessInternal(void){
    659659
    … …  
    663663}
    664664/*}}}*/
    665 /*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary {{{1*/
     665/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary {{{*/
    666666ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary(void){
    667667
    … …  
    671671}
    672672/*}}}*/
    673 /*FUNCTION Numericalflux::CreatePVectorPrognostic{{{1*/
     673/*FUNCTION Numericalflux::CreatePVectorPrognostic{{{*/
    674674ElementVector* Numericalflux::CreatePVectorPrognostic(void){
    675675
    … …  
    687687}
    688688/*}}}*/
    689 /*FUNCTION Numericalflux::CreatePVectorPrognosticInternal{{{1*/
     689/*FUNCTION Numericalflux::CreatePVectorPrognosticInternal{{{*/
    690690ElementVector* Numericalflux::CreatePVectorPrognosticInternal(void){
    691691
    … …  
    695695}
    696696/*}}}*/
    697 /*FUNCTION Numericalflux::CreatePVectorPrognosticBoundary{{{1*/
     697/*FUNCTION Numericalflux::CreatePVectorPrognosticBoundary{{{*/
    698698ElementVector* Numericalflux::CreatePVectorPrognosticBoundary(void){
    699699
    … …  
    765765}
    766766/*}}}*/
    767 /*FUNCTION Numericalflux::CreatePVectorBalancethickness{{{1*/
     767/*FUNCTION Numericalflux::CreatePVectorBalancethickness{{{*/
    768768ElementVector* Numericalflux::CreatePVectorBalancethickness(void){
    769769
    … …  
    781781}
    782782/*}}}*/
    783 /*FUNCTION Numericalflux::CreatePVectorBalancethicknessInternal{{{1*/
     783/*FUNCTION Numericalflux::CreatePVectorBalancethicknessInternal{{{*/
    784784ElementVector* Numericalflux::CreatePVectorBalancethicknessInternal(void){
    785785
    … …  
    789789}
    790790/*}}}*/
    791 /*FUNCTION Numericalflux::CreatePVectorBalancethicknessBoundary{{{1*/
     791/*FUNCTION Numericalflux::CreatePVectorBalancethicknessBoundary{{{*/
    792792ElementVector* Numericalflux::CreatePVectorBalancethicknessBoundary(void){
    793793
    … …  
    856856}
    857857/*}}}*/
    858 /*FUNCTION Numericalflux::CreatePVectorAdjointBalancethickness{{{1*/
     858/*FUNCTION Numericalflux::CreatePVectorAdjointBalancethickness{{{*/
    859859ElementVector* Numericalflux::CreatePVectorAdjointBalancethickness(void){
    860860
    … …  
    863863}
    864864/*}}}*/
    865 /*FUNCTION Numericalflux::GetNormal {{{1*/
     865/*FUNCTION Numericalflux::GetNormal {{{*/
    866866void Numericalflux:: GetNormal(double* normal,double xyz_list[4][3]){
    867867

  • issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Load.h"
    1111class Hook;
    … …  
    3535
    3636
    37                 /*Numericalflux constructors,destructors {{{1*/
     37                /*Numericalflux constructors,destructors {{{*/
    3838                Numericalflux();
    3939                Numericalflux(int numericalflux_id,int i, IoModel* iomodel,int analysis_type);
    4040                ~Numericalflux();
    4141                /*}}}*/
    42                 /*Object virtual functions definitions:{{{1 */
     42                /*Object virtual functions definitions:{{{ */
    4343                void  Echo();
    4444                void  DeepEcho();
    … …  
    4848                Object* copy();
    4949                /*}}}*/
    50                 /*Update virtual functions resolution: {{{1*/
     50                /*Update virtual functions resolution: {{{*/
    5151                void    InputUpdateFromVector(double* vector, int name, int type){/*Do nothing*/}
    5252                void    InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");}
    … …  
    6262                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6363                /*}}}*/
    64                 /*Load virtual functions definitions: {{{1*/
     64                /*Load virtual functions definitions: {{{*/
    6565                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    6666                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    … …  
    7373                bool  InAnalysis(int analysis_type);
    7474                /*}}}*/
    75                 /*Numericalflux management:{{{1*/
     75                /*Numericalflux management:{{{*/
    7676                void  GetNormal(double* normal,double xyz_list[4][3]);
    7777                ElementMatrix* CreateKMatrixPrognostic(void);

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

    r12014 r12365  
    44
    55/*Headers*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2424
    2525/*Pengrid constructors and destructor*/
    26 /*FUNCTION Pengrid::Pengrid(){{{1*/
     26/*FUNCTION Pengrid::Pengrid(){{{*/
    2727Pengrid::Pengrid(){
    2828        this->inputs=NULL;
    … …  
    4040
    4141}
    42 /*}}}1*/
    43 /*FUNCTION Pengrid::Pengrid(int index, int id, IoModel* iomodel,int analysis_type){{{1*/
     42/*}}}*/
     43/*FUNCTION Pengrid::Pengrid(int index, int id, IoModel* iomodel,int analysis_type){{{*/
    4444Pengrid::Pengrid(int id, int index, IoModel* iomodel, int in_analysis_type){ //i is the element index
    4545
    … …  
    9090}
    9191/*}}}*/
    92 /*FUNCTION Pengrid::~Pengrid(){{{1*/
     92/*FUNCTION Pengrid::~Pengrid(){{{*/
    9393Pengrid::~Pengrid(){
    9494        delete inputs;
    … …  
    9898        return;
    9999}
    100 /*}}}1*/
     100/*}}}*/
    101101                       
    102102/*Object virtual functions definitions:*/
    103 /*FUNCTION Pengrid::Echo {{{1*/
     103/*FUNCTION Pengrid::Echo {{{*/
    104104void Pengrid::Echo(void){
    105105        this->DeepEcho();
    106106}
    107 /*}}}1*/
    108 /*FUNCTION Pengrid::DeepEcho{{{1*/
     107/*}}}*/
     108/*FUNCTION Pengrid::DeepEcho{{{*/
    109109void Pengrid::DeepEcho(void){
    110110
    … …  
    123123}
    124124/*}}}*/
    125 /*FUNCTION Pengrid::Id {{{1*/
     125/*FUNCTION Pengrid::Id {{{*/
    126126int    Pengrid::Id(void){ return id; }
    127 /*}}}1*/
    128 /*FUNCTION Pengrid::MyRank {{{1*/
     127/*}}}*/
     128/*FUNCTION Pengrid::MyRank {{{*/
    129129int    Pengrid::MyRank(void){
    130130        extern int my_rank;
    131131        return my_rank;
    132132}
    133 /*}}}1*/
    134 /*FUNCTION Pengrid::ObjectEnum{{{1*/
     133/*}}}*/
     134/*FUNCTION Pengrid::ObjectEnum{{{*/
    135135int Pengrid::ObjectEnum(void){
    136136
    137137        return PengridEnum;
    138138}
    139 /*}}}1*/
    140 /*FUNCTION Icefront::copy {{{1*/
     139/*}}}*/
     140/*FUNCTION Icefront::copy {{{*/
    141141Object* Pengrid::copy() {
    142142       
    … …  
    177177
    178178/*Load virtual functions definitions:*/
    179 /*FUNCTION Pengrid::Configure {{{1*/
     179/*FUNCTION Pengrid::Configure {{{*/
    180180void  Pengrid::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    181181
    … …  
    194194        this->parameters=parametersin;
    195195}
    196 /*}}}1*/
    197 /*FUNCTION Pengrid::SetCurrentConfiguration {{{1*/
     196/*}}}*/
     197/*FUNCTION Pengrid::SetCurrentConfiguration {{{*/
    198198void  Pengrid::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    199199
    200200}
    201 /*}}}1*/
    202 /*FUNCTION Pengrid::CreateKMatrix {{{1*/
     201/*}}}*/
     202/*FUNCTION Pengrid::CreateKMatrix {{{*/
    203203void  Pengrid::CreateKMatrix(Matrix* Kff, Matrix* Kfs){
    204204
    … …  
    207207
    208208}
    209 /*}}}1*/
    210 /*FUNCTION Pengrid::CreatePVector {{{1*/
     209/*}}}*/
     210/*FUNCTION Pengrid::CreatePVector {{{*/
    211211void  Pengrid::CreatePVector(Vector* pf){
    212212
    … …  
    215215
    216216}
    217 /*}}}1*/
    218 /*FUNCTION Pengrid::PenaltyCreateMatrix {{{1*/
     217/*}}}*/
     218/*FUNCTION Pengrid::PenaltyCreateMatrix {{{*/
    219219void  Pengrid::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){
    220220
    … …  
    248248        }
    249249}
    250 /*}}}1*/
    251 /*FUNCTION Pengrid::PenaltyCreatePVector {{{1*/
     250/*}}}*/
     251/*FUNCTION Pengrid::PenaltyCreatePVector {{{*/
    252252void  Pengrid::PenaltyCreatePVector(Vector* pf,double kmax){
    253253
    … …  
    280280        }
    281281}
    282 /*}}}1*/
    283 /*FUNCTION Pengrid::InAnalysis{{{1*/
     282/*}}}*/
     283/*FUNCTION Pengrid::InAnalysis{{{*/
    284284bool Pengrid::InAnalysis(int in_analysis_type){
    285285        if (in_analysis_type==this->analysis_type)return true;
    … …  
    289289
    290290/*Update virtual functions definitions:*/
    291 /*FUNCTION Pengrid::InputUpdateFromVector(double* vector, int name, int type) {{{1*/
     291/*FUNCTION Pengrid::InputUpdateFromVector(double* vector, int name, int type) {{{*/
    292292void  Pengrid::InputUpdateFromVector(double* vector, int name, int type){
    293293        /*Nothing updated yet*/
    294294}
    295295/*}}}*/
    296 /*FUNCTION Pengrid::InputUpdateFromVector(int* vector, int name, int type) {{{1*/
     296/*FUNCTION Pengrid::InputUpdateFromVector(int* vector, int name, int type) {{{*/
    297297void  Pengrid::InputUpdateFromVector(int* vector, int name, int type){
    298298        /*Nothing updated yet*/
    299299}
    300300/*}}}*/
    301 /*FUNCTION Pengrid::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
     301/*FUNCTION Pengrid::InputUpdateFromVector(bool* vector, int name, int type) {{{*/
    302302void  Pengrid::InputUpdateFromVector(bool* vector, int name, int type){
    303303        /*Nothing updated yet*/
    304304}
    305305/*}}}*/
    306 /*FUNCTION Pengrid::InputUpdateFromMatrixDakota(double* vector, int nrows, int ncols, int name, int type) {{{1*/
     306/*FUNCTION Pengrid::InputUpdateFromMatrixDakota(double* vector, int nrows, int ncols, int name, int type) {{{*/
    307307void  Pengrid::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){
    308308        /*Nothing updated yet*/
    309309}
    310310/*}}}*/
    311 /*FUNCTION Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     311/*FUNCTION Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/
    312312void  Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type){
    313313        /*Nothing updated yet*/
    314314}
    315315/*}}}*/
    316 /*FUNCTION Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     316/*FUNCTION Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/
    317317void  Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type){
    318318        /*Nothing updated yet*/
    319319}
    320320/*}}}*/
    321 /*FUNCTION Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     321/*FUNCTION Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/
    322322void  Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    323323        /*Nothing updated yet*/
    324324}
    325325/*}}}*/
    326 /*FUNCTION Pengrid::InputUpdateFromConstant(double constant, int name) {{{1*/
     326/*FUNCTION Pengrid::InputUpdateFromConstant(double constant, int name) {{{*/
    327327void  Pengrid::InputUpdateFromConstant(double constant, int name){
    328328        switch(name){
    … …  
    335335}
    336336/*}}}*/
    337 /*FUNCTION Pengrid::InputUpdateFromConstant(int constant, int name) {{{1*/
     337/*FUNCTION Pengrid::InputUpdateFromConstant(int constant, int name) {{{*/
    338338void  Pengrid::InputUpdateFromConstant(int constant, int name){
    339339        /*Nothing updated yet*/
    340340}
    341341/*}}}*/
    342 /*FUNCTION Pengrid::InputUpdateFromConstant(bool constant, int name) {{{1*/
     342/*FUNCTION Pengrid::InputUpdateFromConstant(bool constant, int name) {{{*/
    343343void  Pengrid::InputUpdateFromConstant(bool constant, int name){
    344344
    … …  
    352352}
    353353/*}}}*/
    354 /*FUNCTION Pengrid::InputUpdateFromSolution{{{1*/
     354/*FUNCTION Pengrid::InputUpdateFromSolution{{{*/
    355355void  Pengrid::InputUpdateFromSolution(double* solution){
    356356        /*Nothing updated yet*/
    … …  
    359359
    360360/*Pengrid management:*/
    361 /*FUNCTION Pengrid::ConstraintActivate {{{1*/
     361/*FUNCTION Pengrid::ConstraintActivate {{{*/
    362362void  Pengrid::ConstraintActivate(int* punstable){
    363363
    … …  
    383383
    384384}
    385 /*}}}1*/
    386 /*FUNCTION Pengrid::ConstraintActivateThermal {{{1*/
     385/*}}}*/
     386/*FUNCTION Pengrid::ConstraintActivateThermal {{{*/
    387387void  Pengrid::ConstraintActivateThermal(int* punstable){
    388388
    … …  
    452452        *punstable=unstable;
    453453}
    454 /*}}}1*/
     454/*}}}*/
    455455#ifdef _HAVE_DIAGNOSTIC_
    456 /*FUNCTION Pengrid::PenaltyCreateKMatrixDiagnosticStokes {{{1*/
     456/*FUNCTION Pengrid::PenaltyCreateKMatrixDiagnosticStokes {{{*/
    457457ElementMatrix* Pengrid::PenaltyCreateKMatrixDiagnosticStokes(double kmax){
    458458       
    … …  
    485485        return Ke;
    486486}
    487 /*}}}1*/
     487/*}}}*/
    488488#endif
    489489#ifdef _HAVE_THERMAL_
    490 /*FUNCTION Pengrid::PenaltyCreateKMatrixMelting {{{1*/
     490/*FUNCTION Pengrid::PenaltyCreateKMatrixMelting {{{*/
    491491ElementMatrix* Pengrid::PenaltyCreateKMatrixMelting(double kmax){
    492492
    … …  
    517517        return Ke;
    518518}
    519 /*}}}1*/
    520 /*FUNCTION Pengrid::PenaltyCreateKMatrixThermal {{{1*/
     519/*}}}*/
     520/*FUNCTION Pengrid::PenaltyCreateKMatrixThermal {{{*/
    521521ElementMatrix* Pengrid::PenaltyCreateKMatrixThermal(double kmax){
    522522
    … …  
    536536        return Ke;
    537537}
    538 /*}}}1*/
    539 /*FUNCTION Pengrid::PenaltyCreatePVectorMelting {{{1*/
     538/*}}}*/
     539/*FUNCTION Pengrid::PenaltyCreatePVectorMelting {{{*/
    540540ElementVector* Pengrid::PenaltyCreatePVectorMelting(double kmax){
    541541       
    … …  
    579579        return pe;
    580580}
    581 /*}}}1*/
    582 /*FUNCTION Pengrid::PenaltyCreatePVectorThermal {{{1*/
     581/*}}}*/
     582/*FUNCTION Pengrid::PenaltyCreatePVectorThermal {{{*/
    583583ElementVector* Pengrid::PenaltyCreatePVectorThermal(double kmax){
    584584
    … …  
    606606        return pe;
    607607}
    608 /*}}}1*/
     608/*}}}*/
    609609#endif
    610 /*FUNCTION Pengrid::ResetConstraint {{{1*/
     610/*FUNCTION Pengrid::ResetConstraint {{{*/
    611611void  Pengrid::ResetConstraint(void){
    612612        active=0;
    613613        zigzag_counter=0;
    614614}
    615 /*}}}1*/
    616 /*FUNCTION Pengrid::UpdateInputs {{{1*/
     615/*}}}*/
     616/*FUNCTION Pengrid::UpdateInputs {{{*/
    617617void  Pengrid::UpdateInputs(double* solution){
    618618        _error_("not supported yet!");
    619619}
    620 /*}}}1*/
     620/*}}}*/

  • issm/trunk-jpl/src/c/objects/Loads/Pengrid.h

    r12014 r12365  
    66
    77/*Headers:*/
    8 /*{{{1*/
     8/*{{{*/
    99#include "./Load.h"
    1010class Hook;
    … …  
    4040        public:
    4141
    42                 /*Pengrid constructors, destructors {{{1*/
     42                /*Pengrid constructors, destructors {{{*/
    4343                Pengrid();
    4444                Pengrid(int index, int id, IoModel* iomodel,int analysis_type);
    4545                ~Pengrid();
    4646                /*}}}*/
    47                 /*Object virtual functions definitions:{{{1 */
     47                /*Object virtual functions definitions:{{{ */
    4848                void  Echo();
    4949                void  DeepEcho();
    … …  
    5353                Object* copy();
    5454                /*}}}*/
    55                 /*Update virtual functions resolution: {{{1*/
     55                /*Update virtual functions resolution: {{{*/
    5656                void  InputUpdateFromVector(double* vector, int name, int type);
    5757                void  InputUpdateFromVector(int* vector, int name, int type);
    … …  
    6767                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6868                /*}}}*/
    69                 /*Load virtual functions definitions: {{{1*/
     69                /*Load virtual functions definitions: {{{*/
    7070                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    7171                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    … …  
    7878                bool  InAnalysis(int analysis_type);
    7979                /*}}}*/
    80                 /*Pengrid management {{{1*/
     80                /*Pengrid management {{{*/
    8181                #ifdef _HAVE_DIAGNOSTIC_
    8282                ElementMatrix* PenaltyCreateKMatrixDiagnosticStokes(double kmax);

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

    r12014 r12365  
    44
    55/*Headers*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88#include <config.h>
    … …  
    2323
    2424/*Penpair constructors and destructor*/
    25 /*FUNCTION Penpair::constructor {{{1*/
     25/*FUNCTION Penpair::constructor {{{*/
    2626Penpair::Penpair(){
    2727
    … …  
    3131        return;
    3232}
    33 /*}}}1*/
    34 /*FUNCTION Penpair::creation {{{1*/
     33/*}}}*/
     34/*FUNCTION Penpair::creation {{{*/
    3535Penpair::Penpair(int penpair_id, int* penpair_node_ids,int in_analysis_type){
    3636       
    … …  
    4343        return;
    4444}
    45 /*}}}1*/
    46 /*FUNCTION Penpair::destructor {{{1*/
     45/*}}}*/
     46/*FUNCTION Penpair::destructor {{{*/
    4747Penpair::~Penpair(){
    4848        delete hnodes;
    4949        return;
    5050}
    51 /*}}}1*/
     51/*}}}*/
    5252
    5353/*Object virtual functions definitions:*/
    54 /*FUNCTION Penpair::Echo {{{1*/
     54/*FUNCTION Penpair::Echo {{{*/
    5555void Penpair::Echo(void){
    5656
    … …  
    6464        return;
    6565}
    66 /*}}}1*/
    67 /*FUNCTION Penpair::DeepEcho {{{1*/
     66/*}}}*/
     67/*FUNCTION Penpair::DeepEcho {{{*/
    6868void Penpair::DeepEcho(void){
    6969
    … …  
    7575        return;
    7676}               
    77 /*}}}1*/
    78 /*FUNCTION Penpair::Id {{{1*/
     77/*}}}*/
     78/*FUNCTION Penpair::Id {{{*/
    7979int    Penpair::Id(void){ return id; }
    80 /*}}}1*/
    81 /*FUNCTION Penpair::MyRank {{{1*/
     80/*}}}*/
     81/*FUNCTION Penpair::MyRank {{{*/
    8282int    Penpair::MyRank(void){
    8383        extern int my_rank;
    8484        return my_rank;
    8585}
    86 /*}}}1*/
    87 /*FUNCTION Penpair::ObjectEnum{{{1*/
     86/*}}}*/
     87/*FUNCTION Penpair::ObjectEnum{{{*/
    8888int Penpair::ObjectEnum(void){
    8989
    9090        return PenpairEnum;
    9191}
    92 /*}}}1*/
    93 /*FUNCTION Penpair::copy {{{1*/
     92/*}}}*/
     93/*FUNCTION Penpair::copy {{{*/
    9494Object* Penpair::copy() {
    9595       
    … …  
    115115               
    116116/*Load virtual functions definitions:*/
    117 /*FUNCTION Penpair::Configure {{{1*/
     117/*FUNCTION Penpair::Configure {{{*/
    118118void  Penpair::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    119119
    … …  
    129129
    130130}
    131 /*}}}1*/
    132 /*FUNCTION Penpair::SetCurrentConfiguration {{{1*/
     131/*}}}*/
     132/*FUNCTION Penpair::SetCurrentConfiguration {{{*/
    133133void  Penpair::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    134134
    135135}
    136 /*}}}1*/
    137 /*FUNCTION Penpair::CreateKMatrix {{{1*/
     136/*}}}*/
     137/*FUNCTION Penpair::CreateKMatrix {{{*/
    138138void  Penpair::CreateKMatrix(Matrix* Kff, Matrix* Kfs){
    139139        /*If you code this piece, don't forget that a penalty will be inactive if it is dealing with clone nodes*/
    … …  
    142142
    143143}
    144 /*}}}1*/
    145 /*FUNCTION Penpair::CreatePVector {{{1*/
     144/*}}}*/
     145/*FUNCTION Penpair::CreatePVector {{{*/
    146146void  Penpair::CreatePVector(Vector* pf){
    147147
    … …  
    150150
    151151}
    152 /*}}}1*/
    153 /*FUNCTION Penpair::CreateJacobianMatrix{{{1*/
     152/*}}}*/
     153/*FUNCTION Penpair::CreateJacobianMatrix{{{*/
    154154void  Penpair::CreateJacobianMatrix(Matrix* Jff){
    155155        this->CreateKMatrix(Jff,NULL);
    156156}
    157 /*}}}1*/
    158 /*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/
     157/*}}}*/
     158/*FUNCTION Penpair::PenaltyCreateKMatrix {{{*/
    159159void  Penpair::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){
    160160
    … …  
    181181        }
    182182}
    183 /*}}}1*/
    184 /*FUNCTION Penpair::PenaltyCreatePVector {{{1*/
     183/*}}}*/
     184/*FUNCTION Penpair::PenaltyCreatePVector {{{*/
    185185void  Penpair::PenaltyCreatePVector(Vector* pf,double kmax){
    186186        /*No loads applied, do nothing: */
    187187        return;
    188188}
    189 /*}}}1*/
    190 /*FUNCTION Penpair::PenaltyCreateJacobianMatrix{{{1*/
     189/*}}}*/
     190/*FUNCTION Penpair::PenaltyCreateJacobianMatrix{{{*/
    191191void  Penpair::PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){
    192192        this->PenaltyCreateKMatrix(Jff,NULL,kmax);
    193193}
    194 /*}}}1*/
    195 /*FUNCTION Penpair::InAnalysis{{{1*/
     194/*}}}*/
     195/*FUNCTION Penpair::InAnalysis{{{*/
    196196bool Penpair::InAnalysis(int in_analysis_type){
    197197        if (in_analysis_type==this->analysis_type)return true;
    … …  
    201201
    202202/*Update virtual functions definitions:*/
    203 /*FUNCTION Penpair::InputUpdateFromConstant(double constant, int name) {{{1*/
     203/*FUNCTION Penpair::InputUpdateFromConstant(double constant, int name) {{{*/
    204204void  Penpair::InputUpdateFromConstant(double constant, int name){
    205205        /*Nothing updated yet*/
    206206}
    207207/*}}}*/
    208 /*FUNCTION Penpair::InputUpdateFromConstant(int constant, int name) {{{1*/
     208/*FUNCTION Penpair::InputUpdateFromConstant(int constant, int name) {{{*/
    209209void  Penpair::InputUpdateFromConstant(int constant, int name){
    210210        /*Nothing updated yet*/
    211211}
    212212/*}}}*/
    213 /*FUNCTION Penpair::InputUpdateFromConstant(bool constant, int name) {{{1*/
     213/*FUNCTION Penpair::InputUpdateFromConstant(bool constant, int name) {{{*/
    214214void  Penpair::InputUpdateFromConstant(bool constant, int name){
    215215        /*Nothing updated yet*/
    216216}
    217217/*}}}*/
    218 /*FUNCTION Penpair::InputUpdateFromVector(double* vector, int name, int type) {{{1*/
     218/*FUNCTION Penpair::InputUpdateFromVector(double* vector, int name, int type) {{{*/
    219219void  Penpair::InputUpdateFromVector(double* vector, int name, int type){
    220220        /*Nothing updated yet*/
    221221}
    222222/*}}}*/
    223 /*FUNCTION Penpair::InputUpdateFromVector(int* vector, int name, int type) {{{1*/
     223/*FUNCTION Penpair::InputUpdateFromVector(int* vector, int name, int type) {{{*/
    224224void  Penpair::InputUpdateFromVector(int* vector, int name, int type){
    225225        /*Nothing updated yet*/
    226226}
    227227/*}}}*/
    228 /*FUNCTION Penpair::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
     228/*FUNCTION Penpair::InputUpdateFromVector(bool* vector, int name, int type) {{{*/
    229229void  Penpair::InputUpdateFromVector(bool* vector, int name, int type){
    230230        /*Nothing updated yet*/
    … …  
    233233
    234234/*Penpair management:*/
    235 /*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticHoriz{{{1*/
     235/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticHoriz{{{*/
    236236ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticHoriz(double kmax){
    237237
    … …  
    267267        }
    268268}
    269 /*}}}1*/
    270 /*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn {{{1*/
     269/*}}}*/
     270/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn {{{*/
    271271ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn(double kmax){
    272272       
    … …  
    294294        return Ke;
    295295}
    296 /*}}}1*/
    297 /*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticStokes {{{1*/
     296/*}}}*/
     297/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticStokes {{{*/
    298298ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticStokes(double kmax){
    299299       
    … …  
    331331        return Ke;
    332332}
    333 /*}}}1*/
    334 /*FUNCTION Penpair::PenaltyCreateKMatrixPrognostic {{{1*/
     333/*}}}*/
     334/*FUNCTION Penpair::PenaltyCreateKMatrixPrognostic {{{*/
    335335ElementMatrix* Penpair::PenaltyCreateKMatrixPrognostic(double kmax){
    336336
    … …  
    353353        return Ke;
    354354}
    355 /*}}}1*/
     355/*}}}*/

  • issm/trunk-jpl/src/c/objects/Loads/Penpair.h

    r12014 r12365  
    66
    77/*Headers:*/
    8 /*{{{1*/
     8/*{{{*/
    99#include "./Load.h"
    1010#include "../Node.h"
    … …  
    2727        public:
    2828
    29                 /*Penpair constructors, destructors: {{{1*/
     29                /*Penpair constructors, destructors: {{{*/
    3030                Penpair();
    3131                Penpair(int penpair_id,int* penpair_node_ids,int analysis_type);
    3232                ~Penpair();
    3333                /*}}}*/
    34                 /*Object virtual functions definitions:{{{1 */
     34                /*Object virtual functions definitions:{{{ */
    3535                void  Echo();
    3636                void  DeepEcho();
    … …  
    4040                Object* copy();
    4141                /*}}}*/
    42                 /*Update virtual functions resolution: {{{1*/
     42                /*Update virtual functions resolution: {{{*/
    4343                void  InputUpdateFromVector(double* vector, int name, int type);
    4444                void  InputUpdateFromVector(int* vector, int name, int type);
    … …  
    5454                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    5555                /*}}}*/
    56                         /*Load virtual functions definitions: {{{1*/
     56                        /*Load virtual functions definitions: {{{*/
    5757                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    5858                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    … …  
    6565                bool  InAnalysis(int analysis_type);
    6666                /*}}}*/
    67                         /*Penpair management: {{{1*/
     67                        /*Penpair management: {{{*/
    6868                ElementMatrix* PenaltyCreateKMatrixDiagnosticHoriz(double kmax);
    6969                ElementMatrix* PenaltyCreateKMatrixDiagnosticMacAyealPattyn(double kmax);

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

    r12014 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2424
    2525/*Riftfront constructors and destructor*/
    26 /*FUNCTION Riftfront::Riftfront(){{{1*/
     26/*FUNCTION Riftfront::Riftfront(){{{*/
    2727Riftfront::Riftfront(){
    2828        this->inputs=NULL;
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION Riftfront::Riftfront(int id, int i, IoModel* iomodel,int analysis_type){{{1*/
     38/*FUNCTION Riftfront::Riftfront(int id, int i, IoModel* iomodel,int analysis_type){{{*/
    3939Riftfront::Riftfront(int riftfront_id,int i, IoModel* iomodel,int riftfront_analysis_type){
    4040
    … …  
    117117               
    118118}
    119 /*}}}1*/
    120 /*FUNCTION Riftfront::~Riftfront(){{{1*/
     119/*}}}*/
     120/*FUNCTION Riftfront::~Riftfront(){{{*/
    121121Riftfront::~Riftfront(){
    122122        delete inputs;
    … …  
    130130
    131131/*Object virtual functions definitions:*/
    132 /*FUNCTION Riftfront::Echo {{{1*/
     132/*FUNCTION Riftfront::Echo {{{*/
    133133void Riftfront::Echo(void){
    134134
    … …  
    167167               
    168168}
    169 /*}}}1*/
    170 /*FUNCTION Riftfront::DeepEcho{{{1*/
     169/*}}}*/
     170/*FUNCTION Riftfront::DeepEcho{{{*/
    171171void Riftfront::DeepEcho(void){
    172172
    … …  
    183183}
    184184/*}}}*/
    185 /*FUNCTION Riftfront::Id {{{1*/
     185/*FUNCTION Riftfront::Id {{{*/
    186186int    Riftfront::Id(void){ return id; }
    187 /*}}}1*/
    188 /*FUNCTION Riftfront::MyRank {{{1*/
     187/*}}}*/
     188/*FUNCTION Riftfront::MyRank {{{*/
    189189int    Riftfront::MyRank(void){
    190190        extern int my_rank;
    191191        return my_rank;
    192192}
    193 /*}}}1*/
    194 /*FUNCTION Riftfront::ObjectEnum{{{1*/
     193/*}}}*/
     194/*FUNCTION Riftfront::ObjectEnum{{{*/
    195195int Riftfront::ObjectEnum(void){
    196196
    … …  
    198198
    199199}
    200 /*}}}1*/
    201 /*FUNCTION Riftfront::copy {{{1*/
     200/*}}}*/
     201/*FUNCTION Riftfront::copy {{{*/
    202202Object* Riftfront::copy() {
    203203       
    … …  
    247247               
    248248/*Update virtual functions definitions:*/
    249 /*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{1*/
     249/*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{*/
    250250void  Riftfront::InputUpdateFromConstant(bool constant,int name){
    251251
    … …  
    258258}
    259259/*}}}*/
    260 /*FUNCTION Riftfront::InputUpdateFromConstant(double constant,int name) {{{1*/
     260/*FUNCTION Riftfront::InputUpdateFromConstant(double constant,int name) {{{*/
    261261void  Riftfront::InputUpdateFromConstant(double constant,int name){
    262262
    … …  
    269269}
    270270/*}}}*/
    271 /*FUNCTION Riftfront::InputUpdateFromConstant(double* constant,int name) {{{1*/
     271/*FUNCTION Riftfront::InputUpdateFromConstant(double* constant,int name) {{{*/
    272272void    Riftfront::InputUpdateFromVector(double* vector, int name, int type){
    273273
    … …  
    284284
    285285/*Load virtual functions definitions:*/
    286 /*FUNCTION Riftfront::Configure {{{1*/
     286/*FUNCTION Riftfront::Configure {{{*/
    287287void  Riftfront::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    288288
    … …  
    303303}
    304304/*}}}*/
    305 /*FUNCTION Riftfront::SetCurrentConfiguration {{{1*/
     305/*FUNCTION Riftfront::SetCurrentConfiguration {{{*/
    306306void  Riftfront::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    307307
    308308}
    309309/*}}}*/
    310 /*FUNCTION Riftfront::PenaltyCreateKMatrix {{{1*/
     310/*FUNCTION Riftfront::PenaltyCreateKMatrix {{{*/
    311311void  Riftfront::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){
    312312
    … …  
    333333        }
    334334}
    335 /*}}}1*/
    336 /*FUNCTION Riftfront::PenaltyCreatePVector {{{1*/
     335/*}}}*/
     336/*FUNCTION Riftfront::PenaltyCreatePVector {{{*/
    337337void  Riftfront::PenaltyCreatePVector(Vector* pf,double kmax){
    338338
    … …  
    359359        }
    360360}
    361 /*}}}1*/
    362 /*FUNCTION Riftfront::CreateKMatrix {{{1*/
     361/*}}}*/
     362/*FUNCTION Riftfront::CreateKMatrix {{{*/
    363363void  Riftfront::CreateKMatrix(Matrix* Kff, Matrix* Kfs){
    364364        /*do nothing: */
    365365        return;
    366366}
    367 /*}}}1*/
    368 /*FUNCTION Riftfront::CreatePVector {{{1*/
     367/*}}}*/
     368/*FUNCTION Riftfront::CreatePVector {{{*/
    369369void  Riftfront::CreatePVector(Vector* pf){
    370370        /*do nothing: */
    371371        return;
    372372}
    373 /*}}}1*/
    374 /*FUNCTION Riftfront::InAnalysis{{{1*/
     373/*}}}*/
     374/*FUNCTION Riftfront::InAnalysis{{{*/
    375375bool Riftfront::InAnalysis(int in_analysis_type){
    376376        if (in_analysis_type==this->analysis_type) return true;
    … …  
    380380
    381381/*Riftfront numerics*/
    382 /*FUNCTION Riftfront::PenaltyCreateKMatrixDiagnosticHoriz {{{1*/
     382/*FUNCTION Riftfront::PenaltyCreateKMatrixDiagnosticHoriz {{{*/
    383383ElementMatrix* Riftfront::PenaltyCreateKMatrixDiagnosticHoriz(double kmax){
    384384
    … …  
    462462        return Ke;
    463463}
    464 /*}}}1*/
    465 /*FUNCTION Riftfront::PenaltyCreatePVectorDiagnosticHoriz {{{1*/
     464/*}}}*/
     465/*FUNCTION Riftfront::PenaltyCreatePVectorDiagnosticHoriz {{{*/
    466466ElementVector* Riftfront::PenaltyCreatePVectorDiagnosticHoriz(double kmax){
    467467
    … …  
    562562        return pe;
    563563}
    564 /*}}}1*/
    565 /*FUNCTION Riftfront::Constrain {{{1*/
     564/*}}}*/
     565/*FUNCTION Riftfront::Constrain {{{*/
    566566#define _ZIGZAGCOUNTER_
    567567
    … …  
    654654        return 1;
    655655}
    656 /*}}}1*/
    657 /*FUNCTION Riftfront::FreezeConstraints{{{1*/
     656/*}}}*/
     657/*FUNCTION Riftfront::FreezeConstraints{{{*/
    658658void   Riftfront::FreezeConstraints(void){
    659659
    … …  
    662662
    663663}
    664 /*}}}1*/
    665 /*FUNCTION Riftfront::IsFrozen{{{1*/
     664/*}}}*/
     665/*FUNCTION Riftfront::IsFrozen{{{*/
    666666bool   Riftfront::IsFrozen(void){
    667667
    … …  
    670670        else return 0;
    671671}
    672 /*}}}1*/
    673 /*FUNCTION Riftfront::IsMaterialStable {{{1*/
     672/*}}}*/
     673/*FUNCTION Riftfront::IsMaterialStable {{{*/
    674674int   Riftfront::IsMaterialStable(void){
    675675
    … …  
    688688        return this->material_converged;
    689689}
    690 /*}}}1*/
    691 /*FUNCTION Riftfront::MaxPenetration {{{1*/
     690/*}}}*/
     691/*FUNCTION Riftfront::MaxPenetration {{{*/
    692692int   Riftfront::MaxPenetration(double* ppenetration){
    693693
    … …  
    734734        return 1;
    735735}
    736 /*}}}1*/
    737 /*FUNCTION Riftfront::Penetration {{{1*/
     736/*}}}*/
     737/*FUNCTION Riftfront::Penetration {{{*/
    738738int   Riftfront::Penetration(double* ppenetration){
    739739
    … …  
    773773        return 1;
    774774}
    775 /*}}}1*/
    776 /*FUNCTION Riftfront::PotentialUnstableConstraint {{{1*/
     775/*}}}*/
     776/*FUNCTION Riftfront::PotentialUnstableConstraint {{{*/
    777777int   Riftfront::PotentialUnstableConstraint(int* punstable){
    778778
    … …  
    826826        return 1;
    827827}
    828 /*}}}1*/
    829 /*FUNCTION Riftfront::PreConstrain {{{1*/
     828/*}}}*/
     829/*FUNCTION Riftfront::PreConstrain {{{*/
    830830int   Riftfront::PreConstrain(int* punstable){
    831831
    … …  
    891891        return 1;
    892892}
    893 /*}}}1*/
    894 /*FUNCTION Riftfront::PreStable {{{1*/
     893/*}}}*/
     894/*FUNCTION Riftfront::PreStable {{{*/
    895895bool  Riftfront::PreStable(){
    896896        return prestable;
    897897}
    898 /*}}}1*/
    899 /*FUNCTION Riftfront::SetPreStable {{{1*/
     898/*}}}*/
     899/*FUNCTION Riftfront::SetPreStable {{{*/
    900900void Riftfront::SetPreStable(){
    901901        prestable=1;
    902902}
    903 /*}}}1*/
    904 /*FUNCTION Riftfront::IsInput{{{1*/
     903/*}}}*/
     904/*FUNCTION Riftfront::IsInput{{{*/
    905905bool Riftfront::IsInput(int name){
    906906        if (

  • issm/trunk-jpl/src/c/objects/Loads/Riftfront.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Load.h"
    1111class Hook;
    … …  
    4747
    4848
    49                 /*Riftfrontconstructors,destructors: {{{1*/
     49                /*Riftfrontconstructors,destructors: {{{*/
    5050                Riftfront();
    5151                Riftfront(int riftfront_id,int i, IoModel* iomodel,int analysis_type);
    5252                ~Riftfront();
    5353                /*}}}*/
    54                 /*Object virtual functions definitions:{{{1 */
     54                /*Object virtual functions definitions:{{{ */
    5555                void  Echo();
    5656                void  DeepEcho();
    … …  
    6060                Object* copy();
    6161                /*}}}*/
    62                 /*Update virtual functions resolution: {{{1*/
     62                /*Update virtual functions resolution: {{{*/
    6363                void    InputUpdateFromVector(double* vector, int name, int type);
    6464                void    InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");}
    … …  
    7474                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    7575                /*}}}*/
    76                 /*Load virtual functions definitions: {{{1*/
     76                /*Load virtual functions definitions: {{{*/
    7777                void  Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    7878                void  SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters);
    … …  
    8585                bool  InAnalysis(int analysis_type);
    8686                /*}}}*/
    87                 /*Riftfront specific routines: {{{1*/
     87                /*Riftfront specific routines: {{{*/
    8888                bool  PreStable();
    8989                ElementMatrix* PenaltyCreateKMatrixDiagnosticHoriz(double kmax);

  • issm/trunk-jpl/src/c/objects/Materials/Material.h

    r11695 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111class Object;
    1212#include "../Object.h"

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

    r12014 r12365  
    1717               
    1818/*Matice constructors and destructor*/
    19 /*FUNCTION Matice::Matice(){{{1*/
     19/*FUNCTION Matice::Matice(){{{*/
    2020Matice::Matice(){
    2121        this->inputs=NULL;
    … …  
    2424}
    2525/*}}}*/
    26 /*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{1*/
     26/*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{*/
    2727Matice::Matice(int matice_mid,int index, IoModel* iomodel){
    2828
    … …  
    4848}
    4949/*}}}*/
    50 /*FUNCTION Matice::~Matice(){{{1*/
     50/*FUNCTION Matice::~Matice(){{{*/
    5151Matice::~Matice(){
    5252        delete helement;
    … …  
    5757
    5858/*Object virtual functions definitions:*/
    59 /*FUNCTION Matice::Echo {{{1*/
     59/*FUNCTION Matice::Echo {{{*/
    6060void Matice::Echo(void){
    6161
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION Matice::DeepEcho {{{1*/
     70/*FUNCTION Matice::DeepEcho {{{*/
    7171void Matice::DeepEcho(void){
    7272
    … …  
    7979}               
    8080/*}}}*/
    81 /*FUNCTION Matice::Id {{{1*/
     81/*FUNCTION Matice::Id {{{*/
    8282int    Matice::Id(void){ return mid; }
    8383/*}}}*/
    84 /*FUNCTION Matice::MyRank {{{1*/
     84/*FUNCTION Matice::MyRank {{{*/
    8585int    Matice::MyRank(void){
    8686        extern int my_rank;
    … …  
    8888}
    8989/*}}}*/
    90 /*FUNCTION Matice::ObjectEnum{{{1*/
     90/*FUNCTION Matice::ObjectEnum{{{*/
    9191int Matice::ObjectEnum(void){
    9292
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION Matice::copy {{{1*/
     97/*FUNCTION Matice::copy {{{*/
    9898Object* Matice::copy() {
    9999
    … …  
    115115
    116116/*Matice management*/
    117 /*FUNCTION Matice::Configure {{{1*/
     117/*FUNCTION Matice::Configure {{{*/
    118118void  Matice::Configure(Elements* elementsin){
    119119
    … …  
    123123}
    124124/*}}}*/
    125 /*FUNCTION Matice::SetCurrentConfiguration {{{1*/
     125/*FUNCTION Matice::SetCurrentConfiguration {{{*/
    126126void  Matice::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){
    127127
    128128}
    129129/*}}}*/
    130 /*FUNCTION Matice::GetB {{{1*/
     130/*FUNCTION Matice::GetB {{{*/
    131131double Matice::GetB(){
    132132
    … …  
    138138}
    139139/*}}}*/
    140 /*FUNCTION Matice::GetBbar {{{1*/
     140/*FUNCTION Matice::GetBbar {{{*/
    141141double Matice::GetBbar(){
    142142
    … …  
    148148}
    149149/*}}}*/
    150 /*FUNCTION Matice::GetN {{{1*/
     150/*FUNCTION Matice::GetN {{{*/
    151151double Matice::GetN(){
    152152
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION Matice::GetVectorFromInputs{{{1*/
     160/*FUNCTION Matice::GetVectorFromInputs{{{*/
    161161void  Matice::GetVectorFromInputs(Vector* vector,int input_enum){
    162162
    … …  
    190190}
    191191/*}}}*/
    192 /*FUNCTION Matice::GetViscosity2d {{{1*/
     192/*FUNCTION Matice::GetViscosity2d {{{*/
    193193void  Matice::GetViscosity2d(double* pviscosity, double* epsilon){
    194194        /*From a string tensor and a material object, return viscosity, using Glen's flow law.
    … …  
    254254}
    255255/*}}}*/
    256 /*FUNCTION Matice::GetViscosity3d {{{1*/
     256/*FUNCTION Matice::GetViscosity3d {{{*/
    257257void  Matice::GetViscosity3d(double* pviscosity3d, double* epsilon){
    258258
    … …  
    325325}
    326326/*}}}*/
    327 /*FUNCTION Matice::GetViscosity3dStokes {{{1*/
     327/*FUNCTION Matice::GetViscosity3dStokes {{{*/
    328328void  Matice::GetViscosity3dStokes(double* pviscosity3d, double* epsilon){
    329329        /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]:
    … …  
    397397}
    398398/*}}}*/
    399 /*FUNCTION Matice::GetViscosityComplement {{{1*/
     399/*FUNCTION Matice::GetViscosityComplement {{{*/
    400400void  Matice::GetViscosityComplement(double* pviscosity_complement, double* epsilon){
    401401        /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]:
    … …  
    453453}
    454454/*}}}*/
    455 /*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{1*/
     455/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{*/
    456456void  Matice::GetViscosityDerivativeEpsSquare(double* pmu_prime, double* epsilon){
    457457
    … …  
    487487}
    488488/*}}}*/
    489 /*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{1*/
     489/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{*/
    490490void  Matice::GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* epsilon){
    491491
    … …  
    518518}
    519519/*}}}*/
    520 /*FUNCTION Matice::InputDuplicate{{{1*/
     520/*FUNCTION Matice::InputDuplicate{{{*/
    521521void  Matice::InputDuplicate(int original_enum,int new_enum){
    522522
    … …  
    526526}
    527527/*}}}*/
    528 /*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{1*/
     528/*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{*/
    529529void  Matice::InputUpdateFromVector(double* vector, int name, int type){
    530530
    … …  
    556556}
    557557/*}}}*/
    558 /*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{1*/
     558/*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{*/
    559559void  Matice::InputUpdateFromVector(int* vector, int name, int type){
    560560        /*Nothing updated yet*/
    561561}
    562562/*}}}*/
    563 /*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
     563/*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{*/
    564564void  Matice::InputUpdateFromVector(bool* vector, int name, int type){
    565565        /*Nothing updated yet*/
    566566}
    567567/*}}}*/
    568 /*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     568/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/
    569569void  Matice::InputUpdateFromVectorDakota(double* vector, int name, int type){
    570570
    … …  
    590590                                        for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetSidList()]; //use sid list, to index into serial oriented vector
    591591                                        this->inputs->AddInput(new TriaP1Input(name,values));
    592                                         /*Special case for rheology B in 2D: Pourave land for this solution{{{2*/
     592                                        /*Special case for rheology B in 2D: Pourave land for this solution{{{*/
    593593                                        if(name==MaterialsRheologyBEnum){
    594594                                                /*Are we in 2D?:*/
    … …  
    617617}
    618618/*}}}*/
    619 /*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/
     619/*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/
    620620void  Matice::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){
    621621        /*Nothing updated yet*/
    622622}
    623623/*}}}*/
    624 /*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     624/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/
    625625void  Matice::InputUpdateFromVectorDakota(int* vector, int name, int type){
    626626        /*Nothing updated yet*/
    627627}
    628628/*}}}*/
    629 /*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     629/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/
    630630void  Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    631631        /*Nothing updated yet*/
    632632}
    633633/*}}}*/
    634 /*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{1*/
     634/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{*/
    635635void  Matice::InputUpdateFromConstant(double constant, int name){
    636636        /*Nothing updated yet*/
    637637}
    638638/*}}}*/
    639 /*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{1*/
     639/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{*/
    640640void  Matice::InputUpdateFromConstant(int constant, int name){
    641641        /*Nothing updated yet*/
    642642}
    643643/*}}}*/
    644 /*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{1*/
     644/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{*/
    645645void  Matice::InputUpdateFromConstant(bool constant, int name){
    646646        /*Nothing updated yet*/
    647647}
    648648/*}}}*/
    649 /*FUNCTION Matice::InputUpdateFromSolution{{{1*/
     649/*FUNCTION Matice::InputUpdateFromSolution{{{*/
    650650void  Matice::InputUpdateFromSolution(double* solution){
    651651        /*Nothing updated yet*/
    652652}
    653653/*}}}*/
    654 /*FUNCTION Matice::InputUpdateFromIoModel{{{1*/
     654/*FUNCTION Matice::InputUpdateFromIoModel{{{*/
    655655void Matice::InputUpdateFromIoModel(int index, IoModel* iomodel){
    656656
    … …  
    756756}
    757757/*}}}*/
    758 /*FUNCTION Matice::IsInput{{{1*/
     758/*FUNCTION Matice::IsInput{{{*/
    759759bool Matice::IsInput(int name){
    760760        if (

  • issm/trunk-jpl/src/c/objects/Materials/Matice.h

    r12014 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Material.h"
    1111class IoModel;
    … …  
    2525                Inputs*  inputs;
    2626
    27                 /*Matice constructors, destructors: {{{1*/
     27                /*Matice constructors, destructors: {{{*/
    2828                Matice();
    2929                Matice(int mid,int i, IoModel* iomodel);
    3030                ~Matice();
    3131                /*}}}*/
    32                 /*Object virtual functions definitions:{{{1 */
     32                /*Object virtual functions definitions:{{{ */
    3333                void  Echo();
    3434                void  DeepEcho();
    … …  
    3838                Object* copy();
    3939                /*}}}*/
    40                 /*Update virtual functions definitions: {{{1*/
     40                /*Update virtual functions definitions: {{{*/
    4141                void  InputUpdateFromVector(double* vector, int name, int type);
    4242                void  InputUpdateFromVector(int* vector, int name, int type);
    … …  
    5252                void  InputUpdateFromIoModel(int index, IoModel* iomodel);
    5353                /*}}}*/
    54                 /*Material virtual functions resolution: {{{1*/
     54                /*Material virtual functions resolution: {{{*/
    5555                void   InputDuplicate(int original_enum,int new_enum);
    5656                void   Configure(Elements* elements);
    5757                void   GetVectorFromInputs(Vector* vector,int input_enum);
    5858                /*}}}*/
    59                 /*Matice Numerics: {{{1*/
     59                /*Matice Numerics: {{{*/
    6060                void   SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin);
    6161                void   GetViscosity2d(double* pviscosity, double* pepsilon);

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

    r12326 r12365  
    1717               
    1818/*Matpar constructors and destructor*/
    19 /*FUNCTION Matpar::Matpar() {{{1*/
     19/*FUNCTION Matpar::Matpar() {{{*/
    2020Matpar::Matpar(){
    2121        return;
    2222}
    23 /*}}}1*/
    24 /*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/
     23/*}}}*/
     24/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{*/
    2525Matpar::Matpar(int matpar_mid, IoModel* iomodel){
    2626
    … …  
    4646        iomodel->Constant(&this->hydro_q,HydrologyQEnum);
    4747}
    48 /*}}}1*/
    49 /*FUNCTION Matpar::~Matpar() {{{1*/
     48/*}}}*/
     49/*FUNCTION Matpar::~Matpar() {{{*/
    5050Matpar::~Matpar(){
    5151        return;
    5252}
    53 /*}}}1*/
     53/*}}}*/
    5454
    5555/*Object virtual functions definitions:*/
    56 /*FUNCTION Matpar::Echo {{{1*/
     56/*FUNCTION Matpar::Echo {{{*/
    5757void Matpar::Echo(void){
    5858
    … …  
    7474        return;
    7575}
    76 /*}}}1*/
    77 /*FUNCTION Matpar::DeepEcho {{{1*/
     76/*}}}*/
     77/*FUNCTION Matpar::DeepEcho {{{*/
    7878void Matpar::DeepEcho(void){
    7979
    8080        this->Echo();
    8181}               
    82 /*}}}1*/
    83 /*FUNCTION Matpar::Id {{{1*/
     82/*}}}*/
     83/*FUNCTION Matpar::Id {{{*/
    8484int    Matpar::Id(void){ return mid; }
    85 /*}}}1*/
    86 /*FUNCTION Matpar::MyRank {{{1*/
     85/*}}}*/
     86/*FUNCTION Matpar::MyRank {{{*/
    8787int    Matpar::MyRank(void){
    8888        extern int my_rank;
    8989        return my_rank;
    9090}
    91 /*}}}1*/
    92 /*FUNCTION Matpar::ObjectEnum{{{1*/
     91/*}}}*/
     92/*FUNCTION Matpar::ObjectEnum{{{*/
    9393int Matpar::ObjectEnum(void){
    9494
    … …  
    9696
    9797}
    98 /*}}}1*/
    99 /*FUNCTION Matpar::copy {{{1*/
     98/*}}}*/
     99/*FUNCTION Matpar::copy {{{*/
    100100Object* Matpar::copy() {
    101101        return new Matpar(*this);
    102102}
    103 /*}}}1*/
     103/*}}}*/
    104104
    105105/*Update virtual functions definitions:*/
    106 /*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{1*/
     106/*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{*/
    107107void   Matpar::InputUpdateFromVector(double* vector, int name, int type){
    108108        /*Nothing updated yet*/
    109109}
    110110/*}}}*/
    111 /*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{1*/
     111/*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{*/
    112112void   Matpar::InputUpdateFromVector(int* vector, int name, int type){
    113113        /*Nothing updated yet*/
    114114}
    115115/*}}}*/
    116 /*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/
     116/*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{*/
    117117void   Matpar::InputUpdateFromVector(bool* vector, int name, int type){
    118118        /*Nothing updated yet*/
    119119}
    120120/*}}}*/
    121 /*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/
     121/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/
    122122void   Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type){
    123123        /*Nothing updated yet*/
    124124}
    125125/*}}}*/
    126 /*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/
     126/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/
    127127void   Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type){
    128128        /*Nothing updated yet*/
    129129}
    130130/*}}}*/
    131 /*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/
     131/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/
    132132void   Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    133133        /*Nothing updated yet*/
    134134}
    135135/*}}}*/
    136 /*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/
     136/*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/
    137137void  Matpar::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){
    138138        /*Nothing updated yet*/
    139139}
    140140/*}}}*/
    141 /*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{1*/
     141/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{*/
    142142void   Matpar::InputUpdateFromConstant(double constant, int name){
    143143
    … …  
    188188}
    189189/*}}}*/
    190 /*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{1*/
     190/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{*/
    191191void   Matpar::InputUpdateFromConstant(int constant, int name){
    192192        /*Nothing updated yet*/
    193193}
    194194/*}}}*/
    195 /*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{1*/
     195/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{*/
    196196void   Matpar::InputUpdateFromConstant(bool constant, int name){
    197197        /*Nothing updated yet*/
    198198}
    199199/*}}}*/
    200 /*FUNCTION Matpar::InputUpdateFromSolution{{{1*/
     200/*FUNCTION Matpar::InputUpdateFromSolution{{{*/
    201201void   Matpar::InputUpdateFromSolution(double* solution){
    202202        /*Nothing updated yet*/
    … …  
    205205
    206206/*Matpar management: */
    207 /*FUNCTION Matpar::Configure {{{1*/
     207/*FUNCTION Matpar::Configure {{{*/
    208208void  Matpar::Configure(Elements* elementsin){
    209209
    … …  
    212212}
    213213/*}}}*/
    214 /*FUNCTION Matpar::GetBeta {{{1*/
     214/*FUNCTION Matpar::GetBeta {{{*/
    215215double Matpar::GetBeta(){
    216216        return beta;
    217217}
    218 /*}}}1*/
    219 /*FUNCTION Matpar::GetG {{{1*/
     218/*}}}*/
     219/*FUNCTION Matpar::GetG {{{*/
    220220double Matpar::GetG(){
    221221        return g;
    222222}
    223 /*}}}1*/
    224 /*FUNCTION Matpar::GetHeatCapacity {{{1*/
     223/*}}}*/
     224/*FUNCTION Matpar::GetHeatCapacity {{{*/
    225225double Matpar::GetHeatCapacity(){
    226226        return heatcapacity;
    227227}
    228 /*}}}1*/
    229 /*FUNCTION Matpar::GetLatentHeat {{{1*/
     228/*}}}*/
     229/*FUNCTION Matpar::GetLatentHeat {{{*/
    230230double Matpar::GetLatentHeat(){
    231231        return latentheat;
    232232}
    233 /*}}}1*/
    234 /*FUNCTION Matpar::GetMeltingPoint {{{1*/
     233/*}}}*/
     234/*FUNCTION Matpar::GetMeltingPoint {{{*/
    235235double Matpar::GetMeltingPoint(){
    236236        return meltingpoint;
    237237}
    238 /*}}}1*/
    239 /*FUNCTION Matpar::GetReferenceTemperature {{{1*/
     238/*}}}*/
     239/*FUNCTION Matpar::GetReferenceTemperature {{{*/
    240240double Matpar::GetReferenceTemperature(){
    241241        return referencetemperature;
    242242}
    243 /*}}}1*/
    244 /*FUNCTION Matpar::GetMixedLayerCapacity {{{1*/
     243/*}}}*/
     244/*FUNCTION Matpar::GetMixedLayerCapacity {{{*/
    245245double Matpar::GetMixedLayerCapacity(){
    246246        return mixed_layer_capacity;
    247247}
    248 /*}}}1*/
    249 /*FUNCTION Matpar::GetRhoIce {{{1*/
     248/*}}}*/
     249/*FUNCTION Matpar::GetRhoIce {{{*/
    250250double Matpar::GetRhoIce(){
    251251       
    252252        return rho_ice;
    253253}
    254 /*}}}1*/
    255 /*FUNCTION Matpar::GetRhoWater {{{1*/
     254/*}}}*/
     255/*FUNCTION Matpar::GetRhoWater {{{*/
    256256double Matpar::GetRhoWater(){
    257257        return rho_water;
    258258}
    259 /*}}}1*/
    260 /*FUNCTION Matpar::GetRhoFreshwater {{{1*/
     259/*}}}*/
     260/*FUNCTION Matpar::GetRhoFreshwater {{{*/
    261261double Matpar::GetRhoFreshwater(){
    262262        return rho_freshwater;
    263263}
    264 /*}}}1*/
    265 /*FUNCTION Matpar::GetMuWater {{{1*/
     264/*}}}*/
     265/*FUNCTION Matpar::GetMuWater {{{*/
    266266double Matpar::GetMuWater(){
    267267        return mu_water;
    268268}
    269 /*}}}1*/
    270 /*FUNCTION Matpar::GetThermalConductivity {{{1*/
     269/*}}}*/
     270/*FUNCTION Matpar::GetThermalConductivity {{{*/
    271271double Matpar::GetThermalConductivity(){
    272272        return thermalconductivity;
    273273}
    274 /*}}}1*/
    275 /*FUNCTION Matpar::GetThermalExchangeVelocity {{{1*/
     274/*}}}*/
     275/*FUNCTION Matpar::GetThermalExchangeVelocity {{{*/
    276276double Matpar::GetThermalExchangeVelocity(){
    277277        return thermal_exchange_velocity;
    278278}
    279 /*}}}1*/
    280 /*FUNCTION Matpar::GetKn {{{1*/         
     279/*}}}*/
     280/*FUNCTION Matpar::GetKn {{{*/           
    281281double Matpar::GetKn(){                 
    282282        return kn;               
    283283}               
    284 /*}}}1*/                         
    285 /*FUNCTION Matpar::GetHydrologyP {{{1*/                 
     284/*}}}*/                 
     285/*FUNCTION Matpar::GetHydrologyP {{{*/                   
    286286double Matpar::GetHydrologyP(){         
    287287        return hydro_p;                 
    288288}               
    289 /*}}}1*/                         
    290 /*FUNCTION Matqar::GetHydrologyQ {{{1*/                 
     289/*}}}*/                 
     290/*FUNCTION Matqar::GetHydrologyQ {{{*/                   
    291291double Matpar::GetHydrologyQ(){         
    292292        return hydro_q;                 
    293293}               
    294 /*}}}1*/                         
    295 /*FUNCTION Matpar::GetHydrologyCR {{{1*/                 
     294/*}}}*/                 
     295/*FUNCTION Matpar::GetHydrologyCR {{{*/         
    296296double Matpar::GetHydrologyCR(){                 
    297297        return hydro_CR;                 
    298298}               
    299 /*}}}1*/                         
    300 /*FUNCTION Matpar::GetHydrologyN {{{1*/                 
     299/*}}}*/                 
     300/*FUNCTION Matpar::GetHydrologyN {{{*/                   
    301301double Matpar::GetHydrologyN(){         
    302302        return hydro_n;                 
    303303}               
    304 /*}}}1*/
    305 /*FUNCTION Matpar::TMeltingPoint {{{1*/
     304/*}}}*/
     305/*FUNCTION Matpar::TMeltingPoint {{{*/
    306306double Matpar::TMeltingPoint(double pressure){
    307307        return meltingpoint-beta*pressure;
    308308}
    309 /*}}}1*/
    310 /*FUNCTION Matpar::PureIceEnthalpy{{{1*/
     309/*}}}*/
     310/*FUNCTION Matpar::PureIceEnthalpy{{{*/
    311311double Matpar::PureIceEnthalpy(double pressure){
    312312        return heatcapacity*(TMeltingPoint(pressure)-referencetemperature);
    313313}
    314 /*}}}1*/
    315 /*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{1*/
     314/*}}}*/
     315/*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{*/
    316316double Matpar::GetEnthalpyDiffusionParameter(double enthalpy,double pressure){
    317317        if(enthalpy<PureIceEnthalpy(pressure)){
    … …  
    322322        }
    323323}
    324 /*}}}1*/
    325 /*FUNCTION Matpar::EnthalpyToThermal {{{1*/
     324/*}}}*/
     325/*FUNCTION Matpar::EnthalpyToThermal {{{*/
    326326void Matpar::EnthalpyToThermal(double* ptemperature,double* pwaterfraction,double enthalpy,double pressure){
    327327
    … …  
    342342        *ptemperature=temperature;
    343343}
    344 /*}}}1*/
    345 /*FUNCTION Matpar::ThermalToEnthalpy {{{1*/
     344/*}}}*/
     345/*FUNCTION Matpar::ThermalToEnthalpy {{{*/
    346346void Matpar::ThermalToEnthalpy(double * penthalpy,double temperature,double waterfraction,double pressure){
    347347
    … …  
    359359        *penthalpy=enthalpy;
    360360}
    361 /*}}}1*/
     361/*}}}*/

  • issm/trunk-jpl/src/c/objects/Materials/Matpar.h

    r12326 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Material.h"
    1111class IoModel;
    … …  
    4242                ~Matpar();
    4343
    44                 /*Object virtual functions definitions:{{{1 */
     44                /*Object virtual functions definitions:{{{ */
    4545                void  Echo();
    4646                void  DeepEcho();
    … …  
    5050                Object* copy();
    5151                /*}}}*/
    52                 /*Update virtual functions resolution: {{{1*/
     52                /*Update virtual functions resolution: {{{*/
    5353                void   InputUpdateFromVector(double* vector, int name, int type);
    5454                void   InputUpdateFromVector(int* vector, int name, int type);
    … …  
    6464                void   InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6565                /*}}}*/
    66                 /*Material virtual functions resolution: {{{1*/
     66                /*Material virtual functions resolution: {{{*/
    6767                void   InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
    6868                void   Configure(Elements* elements);
    6969                void   GetVectorFromInputs(Vector* vector,int input_enum){return;}
    7070                /*}}}*/
    71                 /*Numerics: {{{1*/
     71                /*Numerics: {{{*/
    7272                double GetG();
    7373                double GetRhoIce();

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

    r12350 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>
    … …  
    2121
    2222/*Node constructors and destructors:*/
    23 /*FUNCTION Node::Node() default constructor {{{1*/
     23/*FUNCTION Node::Node() default constructor {{{*/
    2424Node::Node(){
    2525                 this->inputs=NULL;
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{1*/
     30/*FUNCTION Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{*/
    3131Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type){
    3232
    … …  
    145145}
    146146/*}}}*/
    147 /*FUNCTION Node::~Node(){{{1*/
     147/*FUNCTION Node::~Node(){{{*/
    148148Node::~Node(){
    149149        delete inputs;
    … …  
    154154
    155155/*Object virtual functions definitions:*/
    156 /*FUNCTION Node::Echo{{{1*/
     156/*FUNCTION Node::Echo{{{*/
    157157void Node::Echo(void){
    158158
    … …  
    168168}
    169169/*}}}*/
    170 /*FUNCTION Node::DeepEcho{{{1*/
     170/*FUNCTION Node::DeepEcho{{{*/
    171171void Node::DeepEcho(void){
    172172
    … …  
    183183}
    184184/*}}}*/
    185 /*FUNCTION Node::Id{{{1*/
     185/*FUNCTION Node::Id{{{*/
    186186int    Node::Id(void){ return id; }
    187187/*}}}*/
    188 /*FUNCTION Node::MyRank{{{1*/
     188/*FUNCTION Node::MyRank{{{*/
    189189int    Node::MyRank(void){
    190190        extern int my_rank;
    … …  
    193193}
    194194/*}}}*/
    195 /*FUNCTION Node::ObjectEnum{{{1*/
     195/*FUNCTION Node::ObjectEnum{{{*/
    196196int Node::ObjectEnum(void){
    197197
    … …  
    202202
    203203/*Node management:*/
    204 /*FUNCTION Node::Configure {{{1*/
     204/*FUNCTION Node::Configure {{{*/
    205205void  Node::Configure(DataSet* nodesin,Vertices* verticesin){
    206206
    … …  
    212212
    213213}
    214 /*FUNCTION Node::SetCurrentConfiguration {{{1*/
     214/*FUNCTION Node::SetCurrentConfiguration {{{*/
    215215void  Node::SetCurrentConfiguration(DataSet* nodesin,Vertices* verticesin){
    216216
    217217}
    218 /*FUNCTION Node::GetDof {{{1*/
     218/*FUNCTION Node::GetDof {{{*/
    219219int   Node::GetDof(int dofindex,int setenum){
    220220
    … …  
    235235}
    236236/*}}}*/
    237 /*FUNCTION Node::GetDofList1{{{1*/
     237/*FUNCTION Node::GetDofList1{{{*/
    238238int  Node::GetDofList1(void){
    239239
    … …  
    245245}
    246246/*}}}*/
    247 /*FUNCTION Node::GetDofList{{{1*/
     247/*FUNCTION Node::GetDofList{{{*/
    248248void  Node::GetDofList(int* outdoflist,int approximation_enum,int setenum){
    249249        int i;
    … …  
    307307}
    308308/*}}}*/
    309 /*FUNCTION Node::GetSidList{{{1*/
     309/*FUNCTION Node::GetSidList{{{*/
    310310int  Node::GetSidList(void){
    311311
    … …  
    317317}
    318318/*}}}*/
    319 /*FUNCTION Node::GetLocalDofList{{{1*/
     319/*FUNCTION Node::GetLocalDofList{{{*/
    320320void  Node::GetLocalDofList(int* outdoflist,int approximation_enum,int setenum){
    321321        int i;
    … …  
    416416}
    417417/*}}}*/
    418 /*FUNCTION Node::Sid{{{1*/
     418/*FUNCTION Node::Sid{{{*/
    419419int    Node::Sid(void){ return sid; }
    420420/*}}}*/
    421 /*FUNCTION Node::GetVertexId {{{1*/
     421/*FUNCTION Node::GetVertexId {{{*/
    422422int   Node::GetVertexId(void){
    423423
    … …  
    428428}
    429429/*}}}*/
    430 /*FUNCTION Node::GetVertexDof {{{1*/
     430/*FUNCTION Node::GetVertexDof {{{*/
    431431int   Node::GetVertexDof(void){
    432432
    … …  
    438438/*}}}*/
    439439#ifdef _HAVE_DIAGNOSTIC_
    440 /*FUNCTION Node::GetCoordinateSystem{{{1*/
     440/*FUNCTION Node::GetCoordinateSystem{{{*/
    441441void Node::GetCoordinateSystem(IssmDouble* coord_system_out){
    442442
    … …  
    447447/*}}}*/
    448448#endif
    449 /*FUNCTION Node::SetVertexDof {{{1*/
     449/*FUNCTION Node::SetVertexDof {{{*/
    450450void   Node::SetVertexDof(int in_dof){
    451451
    … …  
    457457}
    458458/*}}}*/
    459 /*FUNCTION Node::InAnalysis{{{1*/
     459/*FUNCTION Node::InAnalysis{{{*/
    460460bool Node::InAnalysis(int in_analysis_type){
    461461        if (in_analysis_type==this->analysis_type) return true;
    … …  
    465465
    466466/*Node numerics:*/
    467 /*FUNCTION Node::ApplyConstraints{{{1*/
     467/*FUNCTION Node::ApplyConstraints{{{*/
    468468void  Node::ApplyConstraint(int dof,IssmDouble value){
    469469
    … …  
    476476}
    477477/*}}}*/
    478 /*FUNCTION Node::RelaxConstraint{{{1*/
     478/*FUNCTION Node::RelaxConstraint{{{*/
    479479void  Node::RelaxConstraint(int dof){
    480480
    … …  
    484484}
    485485/*}}}*/
    486 /*FUNCTION Node::CreateVecSets {{{1*/
     486/*FUNCTION Node::CreateVecSets {{{*/
    487487void  Node::CreateVecSets(Vector* pv_g,Vector* pv_f,Vector* pv_s){
    488488
    … …  
    510510}
    511511/*}}}*/
    512 /*FUNCTION Node::CreateNodalConstraints{{{1*/
     512/*FUNCTION Node::CreateNodalConstraints{{{*/
    513513void  Node::CreateNodalConstraints(Vector* ys){
    514514
    … …  
    539539}
    540540/*}}}*/
    541 /*FUNCTION Node::DofInSSet {{{1*/
     541/*FUNCTION Node::DofInSSet {{{*/
    542542void  Node::DofInSSet(int dof){
    543543
    … …  
    549549}
    550550/*}}}*/
    551 /*FUNCTION Node::DofInFSet {{{1*/
     551/*FUNCTION Node::DofInFSet {{{*/
    552552void  Node::DofInFSet(int dof){
    553553
    … …  
    559559}
    560560/*}}}*/
    561 /*FUNCTION Node::FreezeDof{{{1*/
     561/*FUNCTION Node::FreezeDof{{{*/
    562562void  Node::FreezeDof(int dof){
    563563       
    … …  
    566566}
    567567/*}}}*/
    568 /*FUNCTION Node::GetApproximation {{{1*/
     568/*FUNCTION Node::GetApproximation {{{*/
    569569int   Node::GetApproximation(){
    570570
    … …  
    577577}
    578578/*}}}*/
    579 /*FUNCTION Node::GetConnectivity {{{1*/
     579/*FUNCTION Node::GetConnectivity {{{*/
    580580int Node::GetConnectivity(){
    581581
    … …  
    585585}
    586586/*}}}*/
    587 /*FUNCTION Node::GetNumberOfDofs{{{1*/
     587/*FUNCTION Node::GetNumberOfDofs{{{*/
    588588int   Node::GetNumberOfDofs(int approximation_enum,int setenum){
    589589
    … …  
    633633}
    634634/*}}}*/
    635 /*FUNCTION Node::GetSigma {{{1*/
     635/*FUNCTION Node::GetSigma {{{*/
    636636IssmDouble Node::GetSigma(){
    637637        Vertex* vertex=NULL;
    … …  
    641641}
    642642/*}}}*/
    643 /*FUNCTION Node::GetX {{{1*/
     643/*FUNCTION Node::GetX {{{*/
    644644IssmDouble Node::GetX(){
    645645        Vertex* vertex=NULL;
    … …  
    649649}
    650650/*}}}*/
    651 /*FUNCTION Node::GetY {{{1*/
     651/*FUNCTION Node::GetY {{{*/
    652652IssmDouble Node::GetY(){
    653653        Vertex* vertex=NULL;
    … …  
    657657}
    658658/*}}}*/
    659 /*FUNCTION Node::GetZ {{{1*/
     659/*FUNCTION Node::GetZ {{{*/
    660660IssmDouble Node::GetZ(){
    661661        Vertex* vertex=NULL;
    … …  
    665665}
    666666/*}}}*/
    667 /*FUNCTION Node::IsClone {{{1*/
     667/*FUNCTION Node::IsClone {{{*/
    668668int   Node::IsClone(){
    669669       
    … …  
    672672}
    673673/*}}}*/
    674 /*FUNCTION Node::IsOnBed {{{1*/
     674/*FUNCTION Node::IsOnBed {{{*/
    675675int   Node::IsOnBed(){
    676676
    … …  
    683683}
    684684/*}}}*/
    685 /*FUNCTION Node::IsGrounded {{{1*/
     685/*FUNCTION Node::IsGrounded {{{*/
    686686int   Node::IsGrounded(){
    687687
    … …  
    694694}               
    695695/*}}}*/
    696 /*FUNCTION Node::IsFloating {{{1*/
     696/*FUNCTION Node::IsFloating {{{*/
    697697int   Node::IsFloating(){
    698698       
    … …  
    705705}
    706706/*}}}*/
    707 /*FUNCTION Node::IsOnSurface {{{1*/
     707/*FUNCTION Node::IsOnSurface {{{*/
    708708int   Node::IsOnSurface(){
    709709
    … …  
    716716}
    717717/*}}}*/
    718 /*FUNCTION Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){{{1*/
     718/*FUNCTION Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){{{*/
    719719void  Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){
    720720
    … …  
    722722}
    723723/*}}}*/
    724 /*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{1*/
     724/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{*/
    725725void  Node::InputUpdateFromVector(int* vector, int name, int type){
    726726
    … …  
    728728}
    729729/*}}}*/
    730 /*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{1*/
     730/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{*/
    731731void  Node::InputUpdateFromVector(bool* vector, int name, int type){
    732732
    … …  
    734734}
    735735/*}}}*/
    736 /*FUNCTION Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){{{1*/
     736/*FUNCTION Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){{{*/
    737737void  Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){
    738738
    … …  
    740740}
    741741/*}}}*/
    742 /*FUNCTION Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){{{1*/
     742/*FUNCTION Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){{{*/
    743743void  Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){
    744744
    … …  
    746746}
    747747/*}}}*/
    748 /*FUNCTION Node::InputUpdateFromVectorDakota(int* vector, int name, int type){{{1*/
     748/*FUNCTION Node::InputUpdateFromVectorDakota(int* vector, int name, int type){{{*/
    749749void  Node::InputUpdateFromVectorDakota(int* vector, int name, int type){
    750750
    … …  
    752752}
    753753/*}}}*/
    754 /*FUNCTION Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){{{1*/
     754/*FUNCTION Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){{{*/
    755755void  Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    756756
    … …  
    758758}
    759759/*}}}*/
    760 /*FUNCTION Node::InputUpdateFromConstant(IssmDouble constant, int name){{{1*/
     760/*FUNCTION Node::InputUpdateFromConstant(IssmDouble constant, int name){{{*/
    761761void  Node::InputUpdateFromConstant(IssmDouble constant, int name){
    762762
    … …  
    764764}
    765765/*}}}*/
    766 /*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{1*/
     766/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{*/
    767767void  Node::InputUpdateFromConstant(int constant, int name){
    768768
    … …  
    770770}
    771771/*}}}*/
    772 /*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{1*/
     772/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{*/
    773773void  Node::InputUpdateFromConstant(bool constant, int name){
    774774
    … …  
    776776}
    777777/*}}}*/
    778 /*FUNCTION Node::UpdateSpcs {{{1*/
     778/*FUNCTION Node::UpdateSpcs {{{*/
    779779void   Node::UpdateSpcs(IssmDouble* ys){
    780780
    … …  
    791791}
    792792/*}}}*/
    793 /*FUNCTION Node::VecMerge {{{1*/
     793/*FUNCTION Node::VecMerge {{{*/
    794794void   Node::VecMerge(Vector* ug, IssmDouble* vector_serial,int setenum){
    795795
    … …  
    842842}
    843843/*}}}*/
    844 /*FUNCTION Node::VecReduce {{{1*/
     844/*FUNCTION Node::VecReduce {{{*/
    845845void   Node::VecReduce(Vector* vector, IssmDouble* ug_serial,int setenum){
    846846
    … …  
    889889
    890890/* DofObject routines:*/
    891 /*FUNCTION Node::DistributeDofs{{{1*/
     891/*FUNCTION Node::DistributeDofs{{{*/
    892892void  Node::DistributeDofs(int* pdofcount,int setenum){
    893893
    … …  
    936936}
    937937/*}}}*/
    938 /*FUNCTION Node::Off_setDofs{{{1*/
     938/*FUNCTION Node::Off_setDofs{{{*/
    939939void  Node::OffsetDofs(int dofcount,int setenum){
    940940       
    … …  
    960960}
    961961/*}}}*/
    962 /*FUNCTION Node::ShowTrueDofs{{{1*/
     962/*FUNCTION Node::ShowTrueDofs{{{*/
    963963void  Node::ShowTrueDofs(int* truedofs, int ncols,int setenum){
    964964
    … …  
    977977}
    978978/*}}}*/
    979 /*FUNCTION Node::UpdateCloneDofs{{{1*/
     979/*FUNCTION Node::UpdateCloneDofs{{{*/
    980980void  Node::UpdateCloneDofs(int* alltruedofs,int ncols,int setenum){
    981981
    … …  
    996996}
    997997/*}}}*/
    998 /*FUNCTION Node::SetClone {{{1*/
     998/*FUNCTION Node::SetClone {{{*/
    999999void  Node::SetClone(int* minranks){
    10001000

  • issm/trunk-jpl/src/c/objects/Node.h

    r12322 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Object.h"
    1111#include "../shared/shared.h"
    … …  
    3434                IssmDouble         coord_system[3][3];
    3535
    36                 /*Node constructors, destructors {{{1*/
     36                /*Node constructors, destructors {{{*/
    3737                Node();
    3838                Node(int node_id,int node_sid, int vertex_id,int io_index, IoModel* iomodel,int analysis_type);
    3939                ~Node();
    4040                /*}}}*/
    41                 /*Object virtual functions definitions:{{{1 */
     41                /*Object virtual functions definitions:{{{ */
    4242                void  Echo();
    4343                void  DeepEcho();
    … …  
    4747                Object* copy(){_error_("Not implemented yet (similar to Elements)");};
    4848                /*}}}*/
    49                 /*Update virtual functions definitions: {{{1*/
     49                /*Update virtual functions definitions: {{{*/
    5050               
    5151                void  InputUpdateFromVector(IssmDouble* vector, int name, int type);
    … …  
    6262                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("Not implemented yet!");}
    6363                /*}}}*/
    64                 /*Node numerical routines {{{1*/
     64                /*Node numerical routines {{{*/
    6565                void   Configure(DataSet* nodes,Vertices* vertices);
    6666                void   CreateNodalConstraints(Vector* ys);
    … …  
    102102               
    103103                /*}}}*/
    104                 /*Dof Object routines {{{1*/
     104                /*Dof Object routines {{{*/
    105105                void  DistributeDofs(int* pdofcount,int setenum);
    106106                void  OffsetDofs(int dofcount,int setenum);

  • issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp

    r11734 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020
    2121/*ElementMatrix constructors and destructor*/
    22 /*FUNCTION ElementMatrix::ElementMatrix(){{{1*/
     22/*FUNCTION ElementMatrix::ElementMatrix(){{{*/
    2323ElementMatrix::ElementMatrix(){
    2424
    … …  
    4444}
    4545/*}}}*/
    46 /*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke){{{1*/
     46/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke){{{*/
    4747ElementMatrix::ElementMatrix(ElementMatrix* Ke){
    4848
    … …  
    5252}
    5353/*}}}*/
    54 /*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){{{1*/
     54/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){{{*/
    5555ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){
    5656
    … …  
    181181}
    182182/*}}}*/
    183 /*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){{{1*/
     183/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){{{*/
    184184ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){
    185185
    … …  
    196196}
    197197/*}}}*/
    198 /*FUNCTION ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{1*/
     198/*FUNCTION ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{*/
    199199ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){
    200200
    … …  
    228228}
    229229/*}}}*/
    230 /*FUNCTION ElementMatrix::~ElementMatrix(){{{1*/
     230/*FUNCTION ElementMatrix::~ElementMatrix(){{{*/
    231231ElementMatrix::~ElementMatrix(){
    232232       
    … …  
    245245
    246246/*ElementMatrix specific routines: */
    247 /*FUNCTION ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){{{1*/
     247/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){{{*/
    248248void ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){
    249249
    … …  
    300300}
    301301/*}}}*/
    302 /*FUNCTION ElementMatrix::AddToGlobal(Matrix* Jff){{{1*/
     302/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Jff){{{*/
    303303void ElementMatrix::AddToGlobal(Matrix* Jff){
    304304
    … …  
    337337}
    338338/*}}}*/
    339 /*FUNCTION ElementMatrix::CheckConsistency{{{1*/
     339/*FUNCTION ElementMatrix::CheckConsistency{{{*/
    340340void ElementMatrix::CheckConsistency(void){
    341341        /*Check element matrix values, only in debugging mode*/
    … …  
    350350}
    351351/*}}}*/
    352 /*FUNCTION ElementMatrix::Transpose{{{1*/
     352/*FUNCTION ElementMatrix::Transpose{{{*/
    353353void ElementMatrix::Transpose(void){
    354354
    … …  
    373373}
    374374/*}}}*/
    375 /*FUNCTION ElementMatrix::Echo{{{1*/
     375/*FUNCTION ElementMatrix::Echo{{{*/
    376376void ElementMatrix::Echo(void){
    377377
    … …  
    419419}
    420420/*}}}*/
    421 /*FUNCTION ElementMatrix::Init{{{1*/
     421/*FUNCTION ElementMatrix::Init{{{*/
    422422void ElementMatrix::Init(ElementMatrix* Ke){
    423423
    … …  
    483483}
    484484/*}}}*/
    485 /*FUNCTION ElementMatrix::SetDiag{{{1*/
     485/*FUNCTION ElementMatrix::SetDiag{{{*/
    486486void ElementMatrix::SetDiag(double scalar){
    487487

  • issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h

    r11679 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313#include "../Object.h"
    1414#include "../../toolkits/toolkits.h"
    … …  
    4949                int*     col_sglobaldoflist;
    5050
    51                 /*ElementMatrix constructors, destructors {{{1*/
     51                /*ElementMatrix constructors, destructors {{{*/
    5252                ElementMatrix();
    5353                ElementMatrix(ElementMatrix* Ke);
    … …  
    5757                ~ElementMatrix();
    5858                /*}}}*/
    59                 /*ElementMatrix specific routines {{{1*/
     59                /*ElementMatrix specific routines {{{*/
    6060                void AddToGlobal(Matrix* Kff, Matrix* Kfs);
    6161                void AddToGlobal(Matrix* Jff);

  • issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp

    r12272 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020
    2121/*ElementVector constructors and destructor*/
    22 /*FUNCTION ElementVector::ElementVector(){{{1*/
     22/*FUNCTION ElementVector::ElementVector(){{{*/
    2323ElementVector::ElementVector(){
    2424
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{1*/
     33/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{*/
    3434ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){
    3535
    … …  
    116116}
    117117/*}}}*/
    118 /*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){{{1*/
     118/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){{{*/
    119119ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){
    120120
    … …  
    131131}
    132132/*}}}*/
    133 /*FUNCTION ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{1*/
     133/*FUNCTION ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{*/
    134134ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){
    135135
    … …  
    149149}
    150150/*}}}*/
    151 /*FUNCTION ElementVector::~ElementVector(){{{1*/
     151/*FUNCTION ElementVector::~ElementVector(){{{*/
    152152ElementVector::~ElementVector(){
    153153       
    … …  
    160160
    161161/*ElementVector specific routines: */
    162 /*FUNCTION ElementVector::AddToGlobal(Vector* pf){{{1*/
     162/*FUNCTION ElementVector::AddToGlobal(Vector* pf){{{*/
    163163void ElementVector::AddToGlobal(Vector* pf){
    164164
    … …  
    184184}
    185185/*}}}*/
    186 /*FUNCTION ElementVector::InsertIntoGlobal(Vector* pf){{{1*/
     186/*FUNCTION ElementVector::InsertIntoGlobal(Vector* pf){{{*/
    187187void ElementVector::InsertIntoGlobal(Vector* pf){
    188188
    … …  
    205205}
    206206/*}}}*/
    207 /*FUNCTION ElementVector::CheckConsistency{{{1*/
     207/*FUNCTION ElementVector::CheckConsistency{{{*/
    208208void ElementVector::CheckConsistency(void){
    209209        /*Check element matrix values, only in debugging mode*/
    … …  
    216216}
    217217/*}}}*/
    218 /*FUNCTION ElementVector::Echo{{{1*/
     218/*FUNCTION ElementVector::Echo{{{*/
    219219void ElementVector::Echo(void){
    220220
    … …  
    238238}
    239239/*}}}*/
    240 /*FUNCTION ElementVector::Init{{{1*/
     240/*FUNCTION ElementVector::Init{{{*/
    241241void ElementVector::Init(ElementVector* pe){
    242242
    … …  
    264264}
    265265/*}}}*/
    266 /*FUNCTION ElementVector::SetValue{{{1*/
     266/*FUNCTION ElementVector::SetValue{{{*/
    267267void ElementVector::SetValue(double scalar){
    268268

  • issm/trunk-jpl/src/c/objects/Numerics/ElementVector.h

    r12272 r12365  
    1010
    1111/*Headers:*/
    12 /*{{{1*/
     12/*{{{*/
    1313#include "../Object.h"
    1414#include "../../toolkits/toolkits.h"
    … …  
    3232                int*     fglobaldoflist;
    3333               
    34                 /*ElementVector constructors, destructors {{{1*/
     34                /*ElementVector constructors, destructors {{{*/
    3535                ElementVector();
    3636                ElementVector(ElementVector* pe1,ElementVector* pe2);
    … …  
    3939                ~ElementVector();
    4040                /*}}}*/
    41                 /*ElementVector specific routines {{{1*/
     41                /*ElementVector specific routines {{{*/
    4242                void AddToGlobal(Vector* pf);
    4343                void InsertIntoGlobal(Vector* pf);

  • issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp

    r12105 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2323
    2424/*Matrix constructors and destructor*/
    25 /*FUNCTION Matrix::Matrix(){{{1*/
     25/*FUNCTION Matrix::Matrix(){{{*/
    2626Matrix::Matrix(){
    2727
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION Matrix::Matrix(int M,int N){{{1*/
     38/*FUNCTION Matrix::Matrix(int M,int N){{{*/
    3939Matrix::Matrix(int M,int N){
    4040
    … …  
    4949}
    5050/*}}}*/
    51 /*FUNCTION Matrix::Matrix(int M,int N,double sparsity){{{1*/
     51/*FUNCTION Matrix::Matrix(int M,int N,double sparsity){{{*/
    5252Matrix::Matrix(int M,int N,double sparsity){
    5353
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){{{1*/
     64/*FUNCTION Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){{{*/
    6565Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){
    6666
    … …  
    8989}
    9090/*}}}*/
    91 /*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){{{1*/
     91/*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){{{*/
    9292Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){
    9393       
    … …  
    102102}
    103103/*}}}*/
    104 /*FUNCTION Matrix::~Matrix(){{{1*/
     104/*FUNCTION Matrix::~Matrix(){{{*/
    105105Matrix::~Matrix(){
    106106
    … …  
    117117
    118118/*Matrix specific routines: */
    119 /*FUNCTION Matrix::Echo{{{1*/
     119/*FUNCTION Matrix::Echo{{{*/
    120120void Matrix::Echo(void){
    121121
    … …  
    140140}
    141141/*}}}*/
    142 /*FUNCTION Matrix::Assemble{{{1*/
     142/*FUNCTION Matrix::Assemble{{{*/
    143143void Matrix::Assemble(void){
    144144        #ifdef _HAVE_PETSC_
    … …  
    155155}
    156156/*}}}*/
    157 /*FUNCTION Matrix::Norm{{{1*/
     157/*FUNCTION Matrix::Norm{{{*/
    158158double Matrix::Norm(NormMode norm_type){
    159159       
    … …  
    168168}
    169169/*}}}*/
    170 /*FUNCTION Matrix::GetSize{{{1*/
     170/*FUNCTION Matrix::GetSize{{{*/
    171171void Matrix::GetSize(int* pM,int* pN){
    172172       
    … …  
    179179}
    180180/*}}}*/
    181 /*FUNCTION Matrix::GetLocalSize{{{1*/
     181/*FUNCTION Matrix::GetLocalSize{{{*/
    182182void Matrix::GetLocalSize(int* pM,int* pN){
    183183       
    … …  
    190190}
    191191/*}}}*/
    192 /*FUNCTION Matrix::MatMult{{{1*/
     192/*FUNCTION Matrix::MatMult{{{*/
    193193void Matrix::MatMult(Vector* X,Vector* AX){
    194194
    … …  
    202202}
    203203/*}}}*/
    204 /*FUNCTION Matrix::Duplicate{{{1*/
     204/*FUNCTION Matrix::Duplicate{{{*/
    205205Matrix* Matrix::Duplicate(void){
    206206
    … …  
    219219}
    220220/*}}}*/
    221 /*FUNCTION Matrix::ToSerial{{{1*/
     221/*FUNCTION Matrix::ToSerial{{{*/
    222222double* Matrix::ToSerial(void){
    223223
    … …  
    232232}
    233233/*}}}*/
    234 /*FUNCTION Matrix::SetValues{{{1*/
     234/*FUNCTION Matrix::SetValues{{{*/
    235235void Matrix::SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode){
    236236
    … …  
    242242}
    243243/*}}}*/
    244 /*FUNCTION Matrix::Convert{{{1*/
     244/*FUNCTION Matrix::Convert{{{*/
    245245void Matrix::Convert(MatrixType type){
    246246

  • issm/trunk-jpl/src/c/objects/Numerics/Matrix.h

    r12013 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    3838                #endif
    3939
    40                 /*Matrix constructors, destructors {{{1*/
     40                /*Matrix constructors, destructors {{{*/
    4141                Matrix();
    4242                Matrix(int M,int N);
    … …  
    4646                ~Matrix();
    4747                /*}}}*/
    48                 /*Matrix specific routines {{{1*/
     48                /*Matrix specific routines {{{*/
    4949                void Echo(void);
    5050                void Assemble(void);

  • issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp

    r12181 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2222
    2323/*Vector constructors and destructor*/
    24 /*FUNCTION Vector::Vector(){{{1*/
     24/*FUNCTION Vector::Vector(){{{*/
    2525Vector::Vector(){
    2626
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION Vector::Vector(int M,bool fromlocalsize){{{1*/
     37/*FUNCTION Vector::Vector(int M,bool fromlocalsize){{{*/
    3838Vector::Vector(int pM,bool fromlocalsize){
    3939
    … …  
    4848}
    4949/*}}}*/
    50 /*FUNCTION Vector::Vector(double* serial_vec,int M){{{1*/
     50/*FUNCTION Vector::Vector(double* serial_vec,int M){{{*/
    5151Vector::Vector(double* serial_vec,int M){
    5252
    … …  
    7070/*}}}*/
    7171#ifdef _HAVE_PETSC_
    72 /*FUNCTION Vector::Vector(Vec petsc_vec){{{1*/
     72/*FUNCTION Vector::Vector(Vec petsc_vec){{{*/
    7373Vector::Vector(Vec petsc_vec){
    7474
    … …  
    8686#endif
    8787#if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_)
    88 /*FUNCTION Vector::Vector(SeqVec* seq_vec){{{1*/
     88/*FUNCTION Vector::Vector(SeqVec* seq_vec){{{*/
    8989Vector::Vector(SeqVec*  seq_vec){
    9090
    … …  
    100100#endif
    101101
    102                 /*FUNCTION Vector::~Vector(){{{1*/
     102                /*FUNCTION Vector::~Vector(){{{*/
    103103Vector::~Vector(){
    104104
    … …  
    115115
    116116/*Vector specific routines: */
    117 /*FUNCTION Vector::Echo{{{1*/
     117/*FUNCTION Vector::Echo{{{*/
    118118void Vector::Echo(void){
    119119
    … …  
    132132}
    133133/*}}}*/
    134 /*FUNCTION Vector::Assemble{{{1*/
     134/*FUNCTION Vector::Assemble{{{*/
    135135void Vector::Assemble(void){
    136136               
    … …  
    145145}
    146146/*}}}*/
    147 /*FUNCTION Vector::SetValues{{{1*/
     147/*FUNCTION Vector::SetValues{{{*/
    148148void Vector::SetValues(int ssize, int* list, double* values, InsMode mode){
    149149               
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION Vector::SetValue{{{1*/
     160/*FUNCTION Vector::SetValue{{{*/
    161161void Vector::SetValue(int dof, double value, InsMode mode){
    162162               
    … …  
    170170}
    171171/*}}}*/
    172 /*FUNCTION Vector::GetValue{{{1*/
     172/*FUNCTION Vector::GetValue{{{*/
    173173void Vector::GetValue(double* pvalue,int dof){
    174174               
    … …  
    181181}
    182182/*}}}*/
    183 /*FUNCTION Vector::GetSize{{{1*/
     183/*FUNCTION Vector::GetSize{{{*/
    184184void Vector::GetSize(int* pM){
    185185               
    … …  
    193193}
    194194/*}}}*/
    195 /*FUNCTION Vector::IsEmpty{{{1*/
     195/*FUNCTION Vector::IsEmpty{{{*/
    196196bool Vector::IsEmpty(void){
    197197
    … …  
    207207}
    208208/*}}}*/
    209 /*FUNCTION Vector::GetLocalSize{{{1*/
     209/*FUNCTION Vector::GetLocalSize{{{*/
    210210void Vector::GetLocalSize(int* pM){
    211211               
    … …  
    219219}
    220220/*}}}*/
    221 /*FUNCTION Vector::Duplicate{{{1*/
     221/*FUNCTION Vector::Duplicate{{{*/
    222222Vector* Vector::Duplicate(void){
    223223       
    … …  
    237237}
    238238/*}}}*/
    239 /*FUNCTION Vector::Set{{{1*/
     239/*FUNCTION Vector::Set{{{*/
    240240void Vector::Set(double value){
    241241       
    … …  
    249249}
    250250/*}}}*/
    251 /*FUNCTION Vector::AXPY{{{1*/
     251/*FUNCTION Vector::AXPY{{{*/
    252252void Vector::AXPY(Vector* X, double a){
    253253       
    … …  
    260260}
    261261/*}}}*/
    262 /*FUNCTION Vector::AYPX{{{1*/
     262/*FUNCTION Vector::AYPX{{{*/
    263263void Vector::AYPX(Vector* X, double a){
    264264       
    … …  
    272272}
    273273/*}}}*/
    274 /*FUNCTION Vector::ToMPISerial{{{1*/
     274/*FUNCTION Vector::ToMPISerial{{{*/
    275275double* Vector::ToMPISerial(void){
    276276
    … …  
    287287}
    288288/*}}}*/
    289 /*FUNCTION Vector::Copy{{{1*/
     289/*FUNCTION Vector::Copy{{{*/
    290290void Vector::Copy(Vector* to){
    291291
    … …  
    298298}
    299299/*}}}*/
    300 /*FUNCTION Vector::Norm{{{1*/
     300/*FUNCTION Vector::Norm{{{*/
    301301double Vector::Norm(NormMode norm_type){
    302302       
    … …  
    311311}
    312312/*}}}*/
    313 /*FUNCTION Vector::Scale{{{1*/
     313/*FUNCTION Vector::Scale{{{*/
    314314void Vector::Scale(double scale_factor){
    315315       
    … …  
    322322}
    323323/*}}}*/
    324 /*FUNCTION Vector::Dot{{{1*/
     324/*FUNCTION Vector::Dot{{{*/
    325325double Vector::Dot(Vector* vector){
    326326
    … …  
    335335}
    336336/*}}}*/
    337 /*FUNCTION Vector::PointwiseDivide{{{1*/
     337/*FUNCTION Vector::PointwiseDivide{{{*/
    338338void Vector::PointwiseDivide(Vector* x,Vector* y){
    339339

  • issm/trunk-jpl/src/c/objects/Numerics/Vector.h

    r12181 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    3636                #endif
    3737
    38                 /*Vector constructors, destructors {{{1*/
     38                /*Vector constructors, destructors {{{*/
    3939                Vector();
    4040                Vector(int M,bool fromlocalsize=false);
    … …  
    4848                ~Vector();
    4949                /*}}}*/
    50                 /*Vector specific routines {{{1*/
     50                /*Vector specific routines {{{*/
    5151                void Echo(void);
    5252                void    AXPY(Vector *X, double a);

  • issm/trunk-jpl/src/c/objects/Options/Option.cpp

    r9761 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION Option::Option(){{{1*/
     23/*FUNCTION Option::Option(){{{*/
    2424Option::Option(){
    2525
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Option::~Option(){{{1*/
     33/*FUNCTION Option::~Option(){{{*/
    3434Option::~Option(){
    3535
    … …  
    4141
    4242/*Other*/
    43 /*FUNCTION Option::Echo {{{1*/
     43/*FUNCTION Option::Echo {{{*/
    4444void  Option::Echo(){
    4545
    … …  
    5757}
    5858/*}}}*/
    59 /*FUNCTION Option::DeepEcho() {{{1*/
     59/*FUNCTION Option::DeepEcho() {{{*/
    6060void  Option::DeepEcho(){
    6161
    … …  
    6767}
    6868/*}}}*/
    69 /*FUNCTION Option::DeepEcho(char* indent) {{{1*/
     69/*FUNCTION Option::DeepEcho(char* indent) {{{*/
    7070void  Option::DeepEcho(char* indent){
    7171
    … …  
    8383}
    8484/*}}}*/
    85 /*FUNCTION Option::Name {{{1*/
     85/*FUNCTION Option::Name {{{*/
    8686char* Option::Name(){
    8787
    … …  
    8989}
    9090/*}}}*/
    91 /*FUNCTION Option::NumEl {{{1*/
     91/*FUNCTION Option::NumEl {{{*/
    9292int   Option::NumEl(){
    9393
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION Option::NDims {{{1*/
     97/*FUNCTION Option::NDims {{{*/
    9898int   Option::NDims(){
    9999
    … …  
    101101}
    102102/*}}}*/
    103 /*FUNCTION Option::Size {{{1*/
     103/*FUNCTION Option::Size {{{*/
    104104int*  Option::Size(){
    105105
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION Option::Get {{{1*/
     109/*FUNCTION Option::Get {{{*/
    110110//void* Option::Get(){
    111111

  • issm/trunk-jpl/src/c/objects/Options/Option.h

    r12292 r12365  
    66#define _OPTIONOBJECT_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2323                int*  size;
    2424
    25                 /*Option constructors, destructors {{{1*/
     25                /*Option constructors, destructors {{{*/
    2626                Option();
    2727                ~Option();
    2828                /*}}}*/
    29                 /*Object virtual functions definitions:{{{1*/
     29                /*Object virtual functions definitions:{{{*/
    3030                virtual void  Echo();
    3131                virtual void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionCell.cpp

    r9761 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION OptionCell::OptionCell(){{{1*/
     23/*FUNCTION OptionCell::OptionCell(){{{*/
    2424OptionCell::OptionCell(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION OptionCell::~OptionCell(){{{1*/
     30/*FUNCTION OptionCell::~OptionCell(){{{*/
    3131OptionCell::~OptionCell(){
    3232
    … …  
    4040
    4141/*Other*/
    42 /*FUNCTION OptionCell::Echo {{{1*/
     42/*FUNCTION OptionCell::Echo {{{*/
    4343void  OptionCell::Echo(){
    4444
    … …  
    5656}
    5757/*}}}*/
    58 /*FUNCTION OptionCell::DeepEcho() {{{1*/
     58/*FUNCTION OptionCell::DeepEcho() {{{*/
    5959void  OptionCell::DeepEcho(){
    6060
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION OptionCell::DeepEcho(char* indent) {{{1*/
     68/*FUNCTION OptionCell::DeepEcho(char* indent) {{{*/
    6969void  OptionCell::DeepEcho(char* indent){
    7070
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION OptionCell::Name {{{1*/
     97/*FUNCTION OptionCell::Name {{{*/
    9898char* OptionCell::Name(){
    9999
    … …  
    101101}
    102102/*}}}*/
    103 /*FUNCTION OptionCell::NumEl {{{1*/
     103/*FUNCTION OptionCell::NumEl {{{*/
    104104int   OptionCell::NumEl(){
    105105
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION OptionCell::NDims {{{1*/
     109/*FUNCTION OptionCell::NDims {{{*/
    110110int   OptionCell::NDims(){
    111111
    … …  
    113113}
    114114/*}}}*/
    115 /*FUNCTION OptionCell::Size {{{1*/
     115/*FUNCTION OptionCell::Size {{{*/
    116116int*  OptionCell::Size(){
    117117
    … …  
    119119}
    120120/*}}}*/
    121 /*FUNCTION OptionCell::Get(Options** pvalue) {{{1*/
     121/*FUNCTION OptionCell::Get(Options** pvalue) {{{*/
    122122void OptionCell::Get(Options** pvalue){
    123123

  • issm/trunk-jpl/src/c/objects/Options/OptionCell.h

    r12292 r12365  
    66#define _OPTIONCELL_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020                Options* values;
    2121
    22                 /*OptionCell constructors, destructors {{{1*/
     22                /*OptionCell constructors, destructors {{{*/
    2323                OptionCell();
    2424                ~OptionCell();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp

    r9761 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION OptionChar::OptionChar(){{{1*/
     23/*FUNCTION OptionChar::OptionChar(){{{*/
    2424OptionChar::OptionChar(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION OptionChar::~OptionChar(){{{1*/
     30/*FUNCTION OptionChar::~OptionChar(){{{*/
    3131OptionChar::~OptionChar(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION OptionChar::Echo {{{1*/
     39/*FUNCTION OptionChar::Echo {{{*/
    4040void  OptionChar::Echo(){
    4141
    … …  
    6060}
    6161/*}}}*/
    62 /*FUNCTION OptionChar::DeepEcho() {{{1*/
     62/*FUNCTION OptionChar::DeepEcho() {{{*/
    6363void  OptionChar::DeepEcho(){
    6464
    … …  
    7070}
    7171/*}}}*/
    72 /*FUNCTION OptionChar::DeepEcho(char* indent) {{{1*/
     72/*FUNCTION OptionChar::DeepEcho(char* indent) {{{*/
    7373void  OptionChar::DeepEcho(char* indent){
    7474
    … …  
    106106}
    107107/*}}}*/
    108 /*FUNCTION OptionChar::Name {{{1*/
     108/*FUNCTION OptionChar::Name {{{*/
    109109char* OptionChar::Name(){
    110110
    … …  
    112112}
    113113/*}}}*/
    114 /*FUNCTION OptionChar::NumEl {{{1*/
     114/*FUNCTION OptionChar::NumEl {{{*/
    115115int   OptionChar::NumEl(){
    116116
    … …  
    118118}
    119119/*}}}*/
    120 /*FUNCTION OptionChar::NDims {{{1*/
     120/*FUNCTION OptionChar::NDims {{{*/
    121121int   OptionChar::NDims(){
    122122
    … …  
    124124}
    125125/*}}}*/
    126 /*FUNCTION OptionChar::Size {{{1*/
     126/*FUNCTION OptionChar::Size {{{*/
    127127int*  OptionChar::Size(){
    128128
    … …  
    130130}
    131131/*}}}*/
    132 /*FUNCTION OptionChar::Get(char** pvalue) {{{1*/
     132/*FUNCTION OptionChar::Get(char** pvalue) {{{*/
    133133void OptionChar::Get(char** pvalue){
    134134
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION OptionChar::Get(char*** ppvalue,int *pnumel) {{{1*/
     146/*FUNCTION OptionChar::Get(char*** ppvalue,int *pnumel) {{{*/
    147147void OptionChar::Get(char*** ppvalue,int *pnumel){
    148148

  • issm/trunk-jpl/src/c/objects/Options/OptionChar.h

    r12292 r12365  
    66#define _OPTIONCHAR_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020                char* values;
    2121
    22                 /*OptionChar constructors, destructors {{{1*/
     22                /*OptionChar constructors, destructors {{{*/
    2323                OptionChar();
    2424                ~OptionChar();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp

    r12292 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION OptionDouble::OptionDouble(){{{1*/
     23/*FUNCTION OptionDouble::OptionDouble(){{{*/
    2424OptionDouble::OptionDouble(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION OptionDouble::~OptionDouble(){{{1*/
     30/*FUNCTION OptionDouble::~OptionDouble(){{{*/
    3131OptionDouble::~OptionDouble(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION OptionDouble::Echo {{{1*/
     39/*FUNCTION OptionDouble::Echo {{{*/
    4040void  OptionDouble::Echo(){
    4141
    … …  
    5656}
    5757/*}}}*/
    58 /*FUNCTION OptionDouble::DeepEcho() {{{1*/
     58/*FUNCTION OptionDouble::DeepEcho() {{{*/
    5959void  OptionDouble::DeepEcho(){
    6060
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION OptionDouble::DeepEcho(char* indent) {{{1*/
     68/*FUNCTION OptionDouble::DeepEcho(char* indent) {{{*/
    6969void  OptionDouble::DeepEcho(char* indent){
    7070
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION OptionDouble::Name {{{1*/
     98/*FUNCTION OptionDouble::Name {{{*/
    9999char* OptionDouble::Name(){
    100100
    … …  
    102102}
    103103/*}}}*/
    104 /*FUNCTION OptionDouble::NumEl {{{1*/
     104/*FUNCTION OptionDouble::NumEl {{{*/
    105105int   OptionDouble::NumEl(){
    106106
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION OptionDouble::NDims {{{1*/
     110/*FUNCTION OptionDouble::NDims {{{*/
    111111int   OptionDouble::NDims(){
    112112
    … …  
    114114}
    115115/*}}}*/
    116 /*FUNCTION OptionDouble::Size {{{1*/
     116/*FUNCTION OptionDouble::Size {{{*/
    117117int*  OptionDouble::Size(){
    118118
    … …  
    120120}
    121121/*}}}*/
    122 /*FUNCTION OptionDouble::Get(int* pvalue) {{{1*/
     122/*FUNCTION OptionDouble::Get(int* pvalue) {{{*/
    123123void OptionDouble::Get(int* pvalue){
    124124
    … …  
    132132}
    133133/*}}}*/
    134 /*FUNCTION OptionDouble::Get(double* pvalue) {{{1*/
     134/*FUNCTION OptionDouble::Get(double* pvalue) {{{*/
    135135void OptionDouble::Get(double* pvalue){
    136136
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION OptionDouble::Get(double** pvalue,int* numel) {{{1*/
     146/*FUNCTION OptionDouble::Get(double** pvalue,int* numel) {{{*/
    147147void OptionDouble::Get(double** pvalue,int* numel){
    148148

  • issm/trunk-jpl/src/c/objects/Options/OptionDouble.h

    r12292 r12365  
    66#define _OPTIONDOUBLE_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020                double* values;
    2121
    22                 /*OptionDouble constructors, destructors {{{1*/
     22                /*OptionDouble constructors, destructors {{{*/
    2323                OptionDouble();
    2424                ~OptionDouble();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp

    r9761 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION OptionLogical::OptionLogical(){{{1*/
     23/*FUNCTION OptionLogical::OptionLogical(){{{*/
    2424OptionLogical::OptionLogical(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION OptionLogical::~OptionLogical(){{{1*/
     30/*FUNCTION OptionLogical::~OptionLogical(){{{*/
    3131OptionLogical::~OptionLogical(){
    3232
    … …  
    3737
    3838/*Other*/
    39 /*FUNCTION OptionLogical::Echo {{{1*/
     39/*FUNCTION OptionLogical::Echo {{{*/
    4040void  OptionLogical::Echo(){
    4141
    … …  
    5656}
    5757/*}}}*/
    58 /*FUNCTION OptionLogical::DeepEcho() {{{1*/
     58/*FUNCTION OptionLogical::DeepEcho() {{{*/
    5959void  OptionLogical::DeepEcho(){
    6060
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION OptionLogical::DeepEcho(char* indent) {{{1*/
     68/*FUNCTION OptionLogical::DeepEcho(char* indent) {{{*/
    6969void  OptionLogical::DeepEcho(char* indent){
    7070
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION OptionLogical::Name {{{1*/
     98/*FUNCTION OptionLogical::Name {{{*/
    9999char* OptionLogical::Name(){
    100100
    … …  
    102102}
    103103/*}}}*/
    104 /*FUNCTION OptionLogical::NumEl {{{1*/
     104/*FUNCTION OptionLogical::NumEl {{{*/
    105105int   OptionLogical::NumEl(){
    106106
    … …  
    108108}
    109109/*}}}*/
    110 /*FUNCTION OptionLogical::NDims {{{1*/
     110/*FUNCTION OptionLogical::NDims {{{*/
    111111int   OptionLogical::NDims(){
    112112
    … …  
    114114}
    115115/*}}}*/
    116 /*FUNCTION OptionLogical::Size {{{1*/
     116/*FUNCTION OptionLogical::Size {{{*/
    117117int*  OptionLogical::Size(){
    118118
    … …  
    120120}
    121121/*}}}*/
    122 /*FUNCTION OptionLogical::Get(bool* pvalue) {{{1*/
     122/*FUNCTION OptionLogical::Get(bool* pvalue) {{{*/
    123123void OptionLogical::Get(bool* pvalue){
    124124

  • issm/trunk-jpl/src/c/objects/Options/OptionLogical.h

    r12292 r12365  
    66#define _OPTIONLOGICAL_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020                bool* values;
    2121
    22                 /*OptionLogical constructors, destructors {{{1*/
     22                /*OptionLogical constructors, destructors {{{*/
    2323                OptionLogical();
    2424                ~OptionLogical();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp

    r9761 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*Constructors/destructor/copy*/
    23 /*FUNCTION OptionStruct::OptionStruct(){{{1*/
     23/*FUNCTION OptionStruct::OptionStruct(){{{*/
    2424OptionStruct::OptionStruct(){
    2525
    … …  
    2828}
    2929/*}}}*/
    30 /*FUNCTION OptionStruct::~OptionStruct(){{{1*/
     30/*FUNCTION OptionStruct::~OptionStruct(){{{*/
    3131OptionStruct::~OptionStruct(){
    3232
    … …  
    4545
    4646/*Other*/
    47 /*FUNCTION OptionStruct::Echo {{{1*/
     47/*FUNCTION OptionStruct::Echo {{{*/
    4848void  OptionStruct::Echo(){
    4949
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION OptionStruct::DeepEcho() {{{1*/
     63/*FUNCTION OptionStruct::DeepEcho() {{{*/
    6464void  OptionStruct::DeepEcho(){
    6565
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION OptionStruct::DeepEcho(char* indent) {{{1*/
     73/*FUNCTION OptionStruct::DeepEcho(char* indent) {{{*/
    7474void  OptionStruct::DeepEcho(char* indent){
    7575
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION OptionStruct::Name {{{1*/
     105/*FUNCTION OptionStruct::Name {{{*/
    106106char* OptionStruct::Name(){
    107107
    … …  
    109109}
    110110/*}}}*/
    111 /*FUNCTION OptionStruct::NumEl {{{1*/
     111/*FUNCTION OptionStruct::NumEl {{{*/
    112112int   OptionStruct::NumEl(){
    113113
    … …  
    115115}
    116116/*}}}*/
    117 /*FUNCTION OptionStruct::NDims {{{1*/
     117/*FUNCTION OptionStruct::NDims {{{*/
    118118int   OptionStruct::NDims(){
    119119
    … …  
    121121}
    122122/*}}}*/
    123 /*FUNCTION OptionStruct::Size {{{1*/
     123/*FUNCTION OptionStruct::Size {{{*/
    124124int*  OptionStruct::Size(){
    125125
    … …  
    127127}
    128128/*}}}*/
    129 /*FUNCTION OptionStruct::Get(Options** pvalue) {{{1*/
     129/*FUNCTION OptionStruct::Get(Options** pvalue) {{{*/
    130130void OptionStruct::Get(Options** pvalue){
    131131
    … …  
    139139}
    140140/*}}}*/
    141 /*FUNCTION OptionStruct::Get(Options*** ppvalue,int* numel) {{{1*/
     141/*FUNCTION OptionStruct::Get(Options*** ppvalue,int* numel) {{{*/
    142142void OptionStruct::Get(Options*** ppvalue,int* numel){
    143143

  • issm/trunk-jpl/src/c/objects/Options/OptionStruct.h

    r12292 r12365  
    66#define _OPTIONSTRUCT_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"
    … …  
    2020                Options** values;
    2121
    22                 /*OptionStruct constructors, destructors {{{1*/
     22                /*OptionStruct constructors, destructors {{{*/
    2323                OptionStruct();
    2424                ~OptionStruct();
    2525                /*}}}*/
    26                 /*Object virtual functions definitions:{{{1*/
     26                /*Object virtual functions definitions:{{{*/
    2727                void  Echo();
    2828                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Options/OptionUtilities.cpp

    r9320 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    1919/*}}}*/
    2020
    21 /*FUNCTION ColumnWiseDimsFromIndex{{{1*/
     21/*FUNCTION ColumnWiseDimsFromIndex{{{*/
    2222int ColumnWiseDimsFromIndex(int* dims,int index,int* size,int ndims){
    2323
    … …  
    3838        return(0);
    3939}/*}}}*/
    40 /*FUNCTION IndexFromColumnWiseDims{{{1*/
     40/*FUNCTION IndexFromColumnWiseDims{{{*/
    4141int IndexFromColumnWiseDims(int* dims, int* size, int ndims) {
    4242
    … …  
    5757        return(index);
    5858}/*}}}*/
    59 /*FUNCTION RowWiseDimsFromIndex{{{1*/
     59/*FUNCTION RowWiseDimsFromIndex{{{*/
    6060int RowWiseDimsFromIndex(int* dims, int index, int* size, int ndims) {
    6161
    … …  
    7676        return(0);
    7777}/*}}}*/
    78 /*FUNCTION IndexFromRowWiseDims{{{1*/
     78/*FUNCTION IndexFromRowWiseDims{{{*/
    7979int IndexFromRowWiseDims(int* dims, int* size, int ndims) {
    8080
    … …  
    9595        return(index);
    9696}/*}}}*/
    97 /*FUNCTION StringFromDims{{{1*/
     97/*FUNCTION StringFromDims{{{*/
    9898int StringFromDims(char* cstr, int* dims, int ndims) {
    9999
    … …  
    104104        return(0);
    105105}/*}}}*/
    106 /*FUNCTION StringFromSize{{{1*/
     106/*FUNCTION StringFromSize{{{*/
    107107int StringFromSize(char* cstr, int* size, int ndims) {
    108108

  • issm/trunk-jpl/src/c/objects/Options/OptionUtilities.h

    r8535 r12365  
    66#define _OPTIONUTILITIES_H_
    77
    8 /*Headers:{{{1*/
     8/*Headers:{{{*/
    99#include "../../include/include.h"
    1010#include "../../shared/Exceptions/exceptions.h"

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*BoolParam constructors and destructor*/
    23 /*FUNCTION BoolParam::BoolParam(){{{1*/
     23/*FUNCTION BoolParam::BoolParam(){{{*/
    2424BoolParam::BoolParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{1*/
     28/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{*/
    2929BoolParam::BoolParam(int in_enum_type,IssmBool in_value){
    3030
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION BoolParam::~BoolParam(){{{1*/
     35/*FUNCTION BoolParam::~BoolParam(){{{*/
    3636BoolParam::~BoolParam(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION BoolParam::Echo {{{1*/
     42/*FUNCTION BoolParam::Echo {{{*/
    4343void BoolParam::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION BoolParam::DeepEcho{{{1*/
     47/*FUNCTION BoolParam::DeepEcho{{{*/
    4848void BoolParam::DeepEcho(void){
    4949
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION BoolParam::Id{{{1*/
     55/*FUNCTION BoolParam::Id{{{*/
    5656int    BoolParam::Id(void){ return -1; }
    5757/*}}}*/
    58 /*FUNCTION BoolParam::MyRank{{{1*/
     58/*FUNCTION BoolParam::MyRank{{{*/
    5959int    BoolParam::MyRank(void){
    6060        extern int my_rank;
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION BoolParam::ObjectEnum{{{1*/
     64/*FUNCTION BoolParam::ObjectEnum{{{*/
    6565int BoolParam::ObjectEnum(void){
    6666
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION BoolParam::copy{{{1*/
     71/*FUNCTION BoolParam::copy{{{*/
    7272Object* BoolParam::copy() {
    7373       
    … …  
    7878
    7979/*BoolParam virtual functions definitions: */
    80 /*FUNCTION BoolParam::GetParameterName{{{1*/
     80/*FUNCTION BoolParam::GetParameterName{{{*/
    8181void BoolParam::GetParameterName(char**pname){
    8282        EnumToStringx(pname,this->enum_type);
    8383}
    8484/*}}}*/
    85 /*FUNCTION BoolParam::UnitConversion{{{1*/
     85/*FUNCTION BoolParam::UnitConversion{{{*/
    8686void  BoolParam::UnitConversion(int direction_enum){
    8787        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/BoolParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2727                IssmBool value;
    2828
    29                 /*BoolParam constructors, destructors: {{{1*/
     29                /*BoolParam constructors, destructors: {{{*/
    3030                BoolParam();
    3131                BoolParam(int enum_type,IssmBool value);
    3232                ~BoolParam();
    3333                /*}}}*/
    34                 /*Object virtual functions definitions:{{{1 */
     34                /*Object virtual functions definitions:{{{ */
    3535                void  Echo();
    3636                void  DeepEcho();
    … …  
    4040                Object* copy();
    4141                /*}}}*/
    42                 /*Param vritual function definitions: {{{1*/
     42                /*Param vritual function definitions: {{{*/
    4343                int   InstanceEnum(){return enum_type;}
    4444                void  GetParameterValue(bool* pbool){*pbool=value;}

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleMatArrayParam constructors and destructor*/
    23 /*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{1*/
     23/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{*/
    2424DoubleMatArrayParam::DoubleMatArrayParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{1*/
     28/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{*/
    2929DoubleMatArrayParam::DoubleMatArrayParam(int in_enum_type,double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){
    3030
    … …  
    6464}
    6565/*}}}*/
    66 /*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{1*/
     66/*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{*/
    6767DoubleMatArrayParam::~DoubleMatArrayParam(){
    6868
    … …  
    8484
    8585/*Object virtual functions definitions:*/
    86 /*FUNCTION DoubleMatArrayParam::Echo {{{1*/
     86/*FUNCTION DoubleMatArrayParam::Echo {{{*/
    8787void DoubleMatArrayParam::Echo(void){
    8888
    … …  
    9494}
    9595/*}}}*/
    96 /*FUNCTION DoubleMatArrayParam::DeepEcho{{{1*/
     96/*FUNCTION DoubleMatArrayParam::DeepEcho{{{*/
    9797void DoubleMatArrayParam::DeepEcho(void){
    9898
    … …  
    118118}
    119119/*}}}*/
    120 /*FUNCTION DoubleMatArrayParam::Id{{{1*/
     120/*FUNCTION DoubleMatArrayParam::Id{{{*/
    121121int    DoubleMatArrayParam::Id(void){ return -1; }
    122122/*}}}*/
    123 /*FUNCTION DoubleMatArrayParam::MyRank{{{1*/
     123/*FUNCTION DoubleMatArrayParam::MyRank{{{*/
    124124int    DoubleMatArrayParam::MyRank(void){
    125125        extern int my_rank;
    … …  
    127127}
    128128/*}}}*/
    129 /*FUNCTION DoubleMatArrayParam::ObjectEnum{{{1*/
     129/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{*/
    130130int DoubleMatArrayParam::ObjectEnum(void){
    131131
    … …  
    134134}
    135135/*}}}*/
    136 /*FUNCTION DoubleMatArrayParam::copy{{{1*/
     136/*FUNCTION DoubleMatArrayParam::copy{{{*/
    137137Object* DoubleMatArrayParam::copy() {
    138138       
    … …  
    143143
    144144/*DoubleMatArrayParam virtual functions definitions: */
    145 /*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{1*/
     145/*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{*/
    146146void  DoubleMatArrayParam::GetParameterValue(double*** pout_array, int* pout_M,int** pout_mdim_array, int** pout_ndim_array){
    147147
    … …  
    196196}
    197197/*}}}*/
    198 /*FUNCTION DoubleMatArrayParam::GetParameterName{{{1*/
     198/*FUNCTION DoubleMatArrayParam::GetParameterName{{{*/
    199199void DoubleMatArrayParam::GetParameterName(char**pname){
    200200        EnumToStringx(pname,this->enum_type);
    201201}
    202202/*}}}*/
    203 /*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{1*/
     203/*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{*/
    204204void  DoubleMatArrayParam::SetValue(double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){
    205205
    … …  
    239239}
    240240/*}}}*/
    241 /*FUNCTION DoubleMatArrayParam::UnitConversion{{{1*/
     241/*FUNCTION DoubleMatArrayParam::UnitConversion{{{*/
    242242void  DoubleMatArrayParam::UnitConversion(int direction_enum){
    243243        /*go through all matrices and convert: */

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    3030
    3131        public:
    32                 /*DoubleMatArrayParam constructors, destructors: {{{1*/
     32                /*DoubleMatArrayParam constructors, destructors: {{{*/
    3333                DoubleMatArrayParam();
    3434                DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array);
    3535                ~DoubleMatArrayParam();
    3636                /*}}}*/
    37                 /*Object virtual functions definitions:{{{1 */
     37                /*Object virtual functions definitions:{{{ */
    3838                void  Echo();
    3939                void  DeepEcho();
    … …  
    4343                Object* copy();
    4444                /*}}}*/
    45                 /*Param vritual function definitions: {{{1*/
     45                /*Param vritual function definitions: {{{*/
    4646                int   InstanceEnum(){return enum_type;}
    4747                void  GetParameterValue(bool* pbool){_error_("DoubleMatArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

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

    r12018 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleMatParam constructors and destructor*/
    23 /*FUNCTION DoubleMatParam::DoubleMatParam(){{{1*/
     23/*FUNCTION DoubleMatParam::DoubleMatParam(){{{*/
    2424DoubleMatParam::DoubleMatParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{1*/
     28/*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{*/
    2929DoubleMatParam::DoubleMatParam(int in_enum_type,double* in_value, int in_M,int in_N){
    3030
    … …  
    3737}
    3838/*}}}*/
    39 /*FUNCTION DoubleMatParam::~DoubleMatParam(){{{1*/
     39/*FUNCTION DoubleMatParam::~DoubleMatParam(){{{*/
    4040DoubleMatParam::~DoubleMatParam(){
    4141        xfree((void**)&value);
    … …  
    4545
    4646/*Object virtual functions definitions:*/
    47 /*FUNCTION DoubleMatParam::Echo {{{1*/
     47/*FUNCTION DoubleMatParam::Echo {{{*/
    4848void DoubleMatParam::Echo(void){
    4949
    … …  
    5454}
    5555/*}}}*/
    56 /*FUNCTION DoubleMatParam::DeepEcho{{{1*/
     56/*FUNCTION DoubleMatParam::DeepEcho{{{*/
    5757void DoubleMatParam::DeepEcho(void){
    5858
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION DoubleMatParam::Id{{{1*/
     71/*FUNCTION DoubleMatParam::Id{{{*/
    7272int    DoubleMatParam::Id(void){ return -1; }
    7373/*}}}*/
    74 /*FUNCTION DoubleMatParam::MyRank{{{1*/
     74/*FUNCTION DoubleMatParam::MyRank{{{*/
    7575int    DoubleMatParam::MyRank(void){
    7676        extern int my_rank;
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION DoubleMatParam::ObjectEnum{{{1*/
     80/*FUNCTION DoubleMatParam::ObjectEnum{{{*/
    8181int DoubleMatParam::ObjectEnum(void){
    8282
    … …  
    8585}
    8686/*}}}*/
    87 /*FUNCTION DoubleMatParam::copy{{{1*/
     87/*FUNCTION DoubleMatParam::copy{{{*/
    8888Object* DoubleMatParam::copy() {
    8989       
    … …  
    9494
    9595/*DoubleMatParam virtual functions definitions: */
    96 /*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/
     96/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/
    9797void  DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
    9898        double* output=NULL;
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/
     109/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/
    110110void  DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    111111        _error_("DoubleMat of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type));
    112112}
    113113/*}}}*/
    114 /*FUNCTION DoubleMatParam::GetParameterName{{{1*/
     114/*FUNCTION DoubleMatParam::GetParameterName{{{*/
    115115void DoubleMatParam::GetParameterName(char**pname){
    116116        EnumToStringx(pname,this->enum_type);
    117117}
    118118/*}}}*/
    119 /*FUNCTION DoubleMatParam::SetValue{{{1*/
     119/*FUNCTION DoubleMatParam::SetValue{{{*/
    120120void  DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){
    121121
    … …  
    130130}
    131131/*}}}*/
    132 /*FUNCTION DoubleMatParam::UnitConversion{{{1*/
     132/*FUNCTION DoubleMatParam::UnitConversion{{{*/
    133133void  DoubleMatParam::UnitConversion(int direction_enum){
    134134        ::UnitConversion(this->value,this->M*this->N,direction_enum,this->enum_type);
    … …  
    137137               
    138138/*diverse: */
    139 /*FUNCTION DoubleMatParam::GetPointer{{{1*/
     139/*FUNCTION DoubleMatParam::GetPointer{{{*/
    140140double* DoubleMatParam::GetPointer(void){
    141141        return this->value;

  • issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2929
    3030        public:
    31                 /*DoubleMatParam constructors, destructors: {{{1*/
     31                /*DoubleMatParam constructors, destructors: {{{*/
    3232                DoubleMatParam();
    3333                DoubleMatParam(int enum_type,IssmDouble* value,int M,int N);
    3434                ~DoubleMatParam();
    3535                /*}}}*/
    36                 /*Object virtual functions definitions:{{{1 */
     36                /*Object virtual functions definitions:{{{ */
    3737                void  Echo();
    3838                void  DeepEcho();
    … …  
    4242                Object* copy();
    4343                /*}}}*/
    44                 /*Param vritual function definitions: {{{1*/
     44                /*Param vritual function definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    4646                void  GetParameterValue(bool* pbool){_error_("DoubleMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

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

    r12018 r12365  
    1818
    1919/*DoubleParam constructors and destructor*/
    20 /*FUNCTION DoubleParam::DoubleParam(){{{1*/
     20/*FUNCTION DoubleParam::DoubleParam(){{{*/
    2121DoubleParam::DoubleParam(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{1*/
     25/*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{*/
    2626DoubleParam::DoubleParam(int in_enum_type,IssmDouble in_value){
    2727
    … …  
    3030}
    3131/*}}}*/
    32 /*FUNCTION DoubleParam::~DoubleParam(){{{1*/
     32/*FUNCTION DoubleParam::~DoubleParam(){{{*/
    3333DoubleParam::~DoubleParam(){
    3434        return;
    … …  
    3737
    3838/*Object virtual functions definitions:*/
    39 /*FUNCTION DoubleParam::Echo {{{1*/
     39/*FUNCTION DoubleParam::Echo {{{*/
    4040void DoubleParam::Echo(void){
    4141        this->DeepEcho();
    4242}
    4343/*}}}*/
    44 /*FUNCTION DoubleParam::DeepEcho{{{1*/
     44/*FUNCTION DoubleParam::DeepEcho{{{*/
    4545void DoubleParam::DeepEcho(void){
    4646
    … …  
    5050}
    5151/*}}}*/
    52 /*FUNCTION DoubleParam::Id{{{1*/
     52/*FUNCTION DoubleParam::Id{{{*/
    5353int    DoubleParam::Id(void){ return -1; }
    5454/*}}}*/
    55 /*FUNCTION DoubleParam::MyRank{{{1*/
     55/*FUNCTION DoubleParam::MyRank{{{*/
    5656int    DoubleParam::MyRank(void){
    5757        extern int my_rank;
    … …  
    5959}
    6060/*}}}*/
    61 /*FUNCTION DoubleParam::ObjectEnum{{{1*/
     61/*FUNCTION DoubleParam::ObjectEnum{{{*/
    6262int DoubleParam::ObjectEnum(void){
    6363
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION DoubleParam::copy{{{1*/
     68/*FUNCTION DoubleParam::copy{{{*/
    6969Object* DoubleParam::copy() {
    7070       
    … …  
    7575
    7676/*DoubleParam virtual functions definitions: */
    77 /*FUNCTION DoubleParam::GetParameterName{{{1*/
     77/*FUNCTION DoubleParam::GetParameterName{{{*/
    7878void DoubleParam::GetParameterName(char**pname){
    7979        EnumToStringx(pname,this->enum_type);
    8080}
    8181/*}}}*/
    82 /*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{1*/
     82/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{*/
    8383void DoubleParam::GetParameterValue(int* pinteger){
    8484        _error_("Double param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));
    8585}
    8686/*}}}*/
    87 /*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{1*/
     87/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{*/
    8888void DoubleParam::GetParameterValue(bool* pbool){
    8989        _error_("Double param of enum %i (%s) cannot return an bool",enum_type,EnumToStringx(enum_type));
    9090}
    9191/*}}}*/
    92 /*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{1*/
     92/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{*/
    9393void DoubleParam::GetParameterValue(int** pintarray,int* pM){
    9494        _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));
    9595}
    9696/*}}}*/
    97 /*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/
     97/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/
    9898void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    9999        _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type));
    100100}
    101101/*}}}*/
    102 /*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
     102/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{*/
    103103void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){
    104104        _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type));
    105105}
    106106/*}}}*/
    107 /*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/
     107/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/
    108108void DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
    109109        _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type));
    110110}
    111111/*}}}*/
    112 /*FUNCTION DoubleParam::UnitConversion{{{1*/
     112/*FUNCTION DoubleParam::UnitConversion{{{*/
    113113void  DoubleParam::UnitConversion(int direction_enum){
    114114        ::UnitConversion(&this->value,1,direction_enum,this->enum_type);

  • issm/trunk-jpl/src/c/objects/Params/DoubleParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*DoubleParam constructors, destructors: {{{1*/
     30                /*DoubleParam constructors, destructors: {{{*/
    3131                DoubleParam();
    3232                DoubleParam(int enum_type,IssmDouble value);
    3333                ~DoubleParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param vritual function definitions: {{{1*/
     43                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool);

  • issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp

    r10660 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2020/*}}}*/
    2121
    22 /*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{1*/
     22/*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{*/
    2323DoubleTransientMatParam::DoubleTransientMatParam(int in_enum_type,double* in_value, int in_M,int in_N):DoubleMatParam(in_enum_type,in_value,in_M,in_N){
    2424}
    2525/*}}}*/
    2626
    27 /*FUNCTION DoubleTransientMatParam::UnitConversion{{{1*/
     27/*FUNCTION DoubleTransientMatParam::UnitConversion{{{*/
    2828void  DoubleTransientMatParam::UnitConversion(int direction_enum){
    2929        ::UnitConversion(this->value,(this->M-1)*this->N,direction_enum,this->enum_type);

  • issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2323
    2424        public:
    25                 /*DoubleTransientMatParam constructors, destructors: {{{1*/
     25                /*DoubleTransientMatParam constructors, destructors: {{{*/
    2626                DoubleTransientMatParam(int enum_type,IssmDouble* value,int M,int N);
    2727                /*}}}*/
    28                 /*Param vritual function definitions: {{{1*/
     28                /*Param vritual function definitions: {{{*/
    2929                void  UnitConversion(int direction_enum);
    3030                /*}}}*/

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

    r12018 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleVecParam constructors and destructor*/
    23 /*FUNCTION DoubleVecParam::DoubleVecParam(){{{1*/
     23/*FUNCTION DoubleVecParam::DoubleVecParam(){{{*/
    2424DoubleVecParam::DoubleVecParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{1*/
     28/*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{*/
    2929DoubleVecParam::DoubleVecParam(int in_enum_type,double* in_values, int in_M){
    3030
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION DoubleVecParam::~DoubleVecParam(){{{1*/
     38/*FUNCTION DoubleVecParam::~DoubleVecParam(){{{*/
    3939DoubleVecParam::~DoubleVecParam(){
    4040        xfree((void**)&values);
    … …  
    4444
    4545/*Object virtual functions definitions:*/
    46 /*FUNCTION DoubleVecParam::Echo {{{1*/
     46/*FUNCTION DoubleVecParam::Echo {{{*/
    4747void DoubleVecParam::Echo(void){
    4848
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION DoubleVecParam::DeepEcho{{{1*/
     55/*FUNCTION DoubleVecParam::DeepEcho{{{*/
    5656void DoubleVecParam::DeepEcho(void){
    5757
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION DoubleVecParam::Id{{{1*/
     68/*FUNCTION DoubleVecParam::Id{{{*/
    6969int    DoubleVecParam::Id(void){ return -1; }
    7070/*}}}*/
    71 /*FUNCTION DoubleVecParam::MyRank{{{1*/
     71/*FUNCTION DoubleVecParam::MyRank{{{*/
    7272int    DoubleVecParam::MyRank(void){
    7373        extern int my_rank;
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION DoubleVecParam::ObjectEnum{{{1*/
     77/*FUNCTION DoubleVecParam::ObjectEnum{{{*/
    7878int DoubleVecParam::ObjectEnum(void){
    7979
    … …  
    8282}
    8383/*}}}*/
    84 /*FUNCTION DoubleVecParam::copy{{{1*/
     84/*FUNCTION DoubleVecParam::copy{{{*/
    8585Object* DoubleVecParam::copy() {
    8686       
    … …  
    9191
    9292/*DoubleVecParam virtual functions definitions: */
    93 /*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
     93/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/
    9494void  DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){
    9595        double* output=NULL;
    … …  
    105105}
    106106/*}}}*/
    107 /*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/
     107/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/
    108108void  DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
    109109        double* output=NULL;
    … …  
    122122}
    123123/*}}}*/
    124 /*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/
     124/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{*/
    125125void  DoubleVecParam::GetParameterValue(int** pintarray,int* pM){
    126126        _error_("DoubleVec param of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type));
    127127}
    128128/*}}}*/
    129 /*FUNCTION DoubleVecParam::GetParameterName{{{1*/
     129/*FUNCTION DoubleVecParam::GetParameterName{{{*/
    130130void DoubleVecParam::GetParameterName(char**pname){
    131131        EnumToStringx(pname,this->enum_type);
    132132}
    133133/*}}}*/
    134 /*FUNCTION DoubleVecParam::SetValue{{{1*/
     134/*FUNCTION DoubleVecParam::SetValue{{{*/
    135135void  DoubleVecParam::SetValue(double* doublearray,int in_M){
    136136
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION DoubleVecParam::UnitConversion{{{1*/
     146/*FUNCTION DoubleVecParam::UnitConversion{{{*/
    147147void  DoubleVecParam::UnitConversion(int direction_enum){
    148148        ::UnitConversion(this->values,this->M,direction_enum,this->enum_type);

  • issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*DoubleVecParam constructors, destructors: {{{1*/
     30                /*DoubleVecParam constructors, destructors: {{{*/
    3131                DoubleVecParam();
    3232                DoubleVecParam(int enum_type,IssmDouble* values,int M);
    3333                ~DoubleVecParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param virtual functions definitions: {{{1*/
     43                /*Param virtual functions definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool){_error_("DoubleVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/FileParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*FileParam constructors and destructor*/
    23 /*FUNCTION FileParam::FileParam(){{{1*/
     23/*FUNCTION FileParam::FileParam(){{{*/
    2424FileParam::FileParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{1*/
     28/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{*/
    2929FileParam::FileParam(int in_enum_type,FILE* in_value){
    3030
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION FileParam::~FileParam(){{{1*/
     35/*FUNCTION FileParam::~FileParam(){{{*/
    3636FileParam::~FileParam(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION FileParam::Echo {{{1*/
     42/*FUNCTION FileParam::Echo {{{*/
    4343void FileParam::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION FileParam::DeepEcho{{{1*/
     47/*FUNCTION FileParam::DeepEcho{{{*/
    4848void FileParam::DeepEcho(void){
    4949
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION FileParam::Id{{{1*/
     55/*FUNCTION FileParam::Id{{{*/
    5656int    FileParam::Id(void){ return -1; }
    5757/*}}}*/
    58 /*FUNCTION FileParam::MyRank{{{1*/
     58/*FUNCTION FileParam::MyRank{{{*/
    5959int    FileParam::MyRank(void){
    6060        extern int my_rank;
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION FileParam::ObjectEnum{{{1*/
     64/*FUNCTION FileParam::ObjectEnum{{{*/
    6565int FileParam::ObjectEnum(void){
    6666
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION FileParam::copy{{{1*/
     71/*FUNCTION FileParam::copy{{{*/
    7272Object* FileParam::copy() {
    7373       
    … …  
    7878
    7979/*FileParam virtual functions definitions: */
    80 /*FUNCTION FileParam::GetParameterName{{{1*/
     80/*FUNCTION FileParam::GetParameterName{{{*/
    8181void FileParam::GetParameterName(char**pname){
    8282        EnumToStringx(pname,this->enum_type);
    8383}
    8484/*}}}*/
    85 /*FUNCTION FileParam::UnitConversion{{{1*/
     85/*FUNCTION FileParam::UnitConversion{{{*/
    8686void  FileParam::UnitConversion(int direction_enum){
    8787        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/FileParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2727
    2828        public:
    29                 /*FileParam constructors, destructors: {{{1*/
     29                /*FileParam constructors, destructors: {{{*/
    3030                FileParam();
    3131                FileParam(int enum_type,FILE* fid);
    3232                ~FileParam();
    3333                /*}}}*/
    34                 /*Object virtual functions definitions:{{{1 */
     34                /*Object virtual functions definitions:{{{ */
    3535                void  Echo();
    3636                void  DeepEcho();
    … …  
    4040                Object* copy();
    4141                /*}}}*/
    42                 /*Param vritual function definitions: {{{1*/
     42                /*Param vritual function definitions: {{{*/
    4343                int   InstanceEnum(){return enum_type;}
    4444                void  GetParameterValue(bool* pbool){  _error_("FileParam of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*IntMatParam constructors and destructor*/
    23 /*FUNCTION IntMatParam::IntMatParam(){{{1*/
     23/*FUNCTION IntMatParam::IntMatParam(){{{*/
    2424IntMatParam::IntMatParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{1*/
     28/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{*/
    2929IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){
    3030
    … …  
    3737}
    3838/*}}}*/
    39 /*FUNCTION IntMatParam::~IntMatParam(){{{1*/
     39/*FUNCTION IntMatParam::~IntMatParam(){{{*/
    4040IntMatParam::~IntMatParam(){
    4141        xfree((void**)&value);
    … …  
    4545
    4646/*Object virtual functions definitions:*/
    47 /*FUNCTION IntMatParam::Echo {{{1*/
     47/*FUNCTION IntMatParam::Echo {{{*/
    4848void IntMatParam::Echo(void){
    4949
    … …  
    5454}
    5555/*}}}*/
    56 /*FUNCTION IntMatParam::DeepEcho{{{1*/
     56/*FUNCTION IntMatParam::DeepEcho{{{*/
    5757void IntMatParam::DeepEcho(void){
    5858
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION IntMatParam::Id{{{1*/
     71/*FUNCTION IntMatParam::Id{{{*/
    7272int    IntMatParam::Id(void){ return -1; }
    7373/*}}}*/
    74 /*FUNCTION IntMatParam::MyRank{{{1*/
     74/*FUNCTION IntMatParam::MyRank{{{*/
    7575int    IntMatParam::MyRank(void){
    7676        extern int my_rank;
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION IntMatParam::ObjectEnum{{{1*/
     80/*FUNCTION IntMatParam::ObjectEnum{{{*/
    8181int IntMatParam::ObjectEnum(void){
    8282
    … …  
    8585}
    8686/*}}}*/
    87 /*FUNCTION IntMatParam::copy{{{1*/
     87/*FUNCTION IntMatParam::copy{{{*/
    8888Object* IntMatParam::copy() {
    8989       
    … …  
    9494
    9595/*IntMatParam virtual functions definitions: */
    96 /*FUNCTION IntMatParam::GetParameterValue{{{1*/
     96/*FUNCTION IntMatParam::GetParameterValue{{{*/
    9797void  IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    9898        int* output=NULL;
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION IntMatParam::GetParameterName{{{1*/
     109/*FUNCTION IntMatParam::GetParameterName{{{*/
    110110void IntMatParam::GetParameterName(char**pname){
    111111        EnumToStringx(pname,this->enum_type);
    112112}
    113113/*}}}*/
    114 /*FUNCTION IntMatParam::SetValue{{{1*/
     114/*FUNCTION IntMatParam::SetValue{{{*/
    115115void  IntMatParam::SetValue(int* intarray,int in_M,int in_N){
    116116
    … …  
    125125}
    126126/*}}}*/
    127 /*FUNCTION IntMatParam::UnitConversion{{{1*/
     127/*FUNCTION IntMatParam::UnitConversion{{{*/
    128128void  IntMatParam::UnitConversion(int direction_enum){
    129129        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/IntMatParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2929
    3030        public:
    31                 /*IntMatParam constructors, destructors: {{{1*/
     31                /*IntMatParam constructors, destructors: {{{*/
    3232                IntMatParam();
    3333                IntMatParam(int enum_type,int* value,int M,int N);
    3434                ~IntMatParam();
    3535                /*}}}*/
    36                 /*Object virtual functions definitions:{{{1 */
     36                /*Object virtual functions definitions:{{{ */
    3737                void  Echo();
    3838                void  DeepEcho();
    … …  
    4242                Object* copy();
    4343                /*}}}*/
    44                 /*Param vritual function definitions: {{{1*/
     44                /*Param vritual function definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    4646                void  GetParameterValue(bool* pbool){_error_("IntMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*IntParam constructors and destructor*/
    23 /*FUNCTION IntParam::IntParam(){{{1*/
     23/*FUNCTION IntParam::IntParam(){{{*/
    2424IntParam::IntParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{1*/
     28/*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{*/
    2929IntParam::IntParam(int in_enum_type,IssmInt in_value){
    3030
    … …  
    3333}
    3434/*}}}*/
    35 /*FUNCTION IntParam::~IntParam(){{{1*/
     35/*FUNCTION IntParam::~IntParam(){{{*/
    3636IntParam::~IntParam(){
    3737        return;
    … …  
    4040
    4141/*Object virtual functions definitions:*/
    42 /*FUNCTION IntParam::Echo {{{1*/
     42/*FUNCTION IntParam::Echo {{{*/
    4343void IntParam::Echo(void){
    4444        this->DeepEcho();
    4545}
    4646/*}}}*/
    47 /*FUNCTION IntParam::DeepEcho{{{1*/
     47/*FUNCTION IntParam::DeepEcho{{{*/
    4848void IntParam::DeepEcho(void){
    4949
    … …  
    5353}
    5454/*}}}*/
    55 /*FUNCTION IntParam::Id{{{1*/
     55/*FUNCTION IntParam::Id{{{*/
    5656int    IntParam::Id(void){ return -1; }
    5757/*}}}*/
    58 /*FUNCTION IntParam::MyRank{{{1*/
     58/*FUNCTION IntParam::MyRank{{{*/
    5959int    IntParam::MyRank(void){
    6060        extern int my_rank;
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION IntParam::ObjectEnum{{{1*/
     64/*FUNCTION IntParam::ObjectEnum{{{*/
    6565int IntParam::ObjectEnum(void){
    6666
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION IntParam::copy{{{1*/
     71/*FUNCTION IntParam::copy{{{*/
    7272Object* IntParam::copy() {
    7373       
    … …  
    7878
    7979/*IntParam virtual functions definitions: */
    80 /*FUNCTION IntParam::GetParameterName{{{1*/
     80/*FUNCTION IntParam::GetParameterName{{{*/
    8181void IntParam::GetParameterName(char**pname){
    8282        EnumToStringx(pname,this->enum_type);
    8383}
    8484/*}}}*/
    85 /*FUNCTION IntParam::UnitConversion{{{1*/
     85/*FUNCTION IntParam::UnitConversion{{{*/
    8686void  IntParam::UnitConversion(int direction_enum){
    8787        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/IntParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*IntParam constructors, destructors: {{{1*/
     30                /*IntParam constructors, destructors: {{{*/
    3131                IntParam();
    3232                IntParam(int enum_type,IssmInt value);
    3333                ~IntParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param vritual function definitions: {{{1*/
     43                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool){_error_("Int param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*IntVecParam constructors and destructor*/
    23 /*FUNCTION IntVecParam::IntVecParam(){{{1*/
     23/*FUNCTION IntVecParam::IntVecParam(){{{*/
    2424IntVecParam::IntVecParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{1*/
     28/*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{*/
    2929IntVecParam::IntVecParam(int in_enum_type,int* in_values, int in_M){
    3030
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{1*/
     41/*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{*/
    4242IntVecParam::IntVecParam(int in_enum_type,double* in_values, int in_M){
    4343
    … …  
    5252}
    5353/*}}}*/
    54 /*FUNCTION IntVecParam::~IntVecParam(){{{1*/
     54/*FUNCTION IntVecParam::~IntVecParam(){{{*/
    5555IntVecParam::~IntVecParam(){
    5656        xfree((void**)&values);
    … …  
    6060
    6161/*Object virtual functions definitions:*/
    62 /*FUNCTION IntVecParam::Echo {{{1*/
     62/*FUNCTION IntVecParam::Echo {{{*/
    6363void IntVecParam::Echo(void){
    6464
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION IntVecParam::DeepEcho{{{1*/
     71/*FUNCTION IntVecParam::DeepEcho{{{*/
    7272void IntVecParam::DeepEcho(void){
    7373
    … …  
    8282}
    8383/*}}}*/
    84 /*FUNCTION IntVecParam::Id{{{1*/
     84/*FUNCTION IntVecParam::Id{{{*/
    8585int    IntVecParam::Id(void){ return -1; }
    8686/*}}}*/
    87 /*FUNCTION IntVecParam::MyRank{{{1*/
     87/*FUNCTION IntVecParam::MyRank{{{*/
    8888int    IntVecParam::MyRank(void){
    8989        extern int my_rank;
    … …  
    9191}
    9292/*}}}*/
    93 /*FUNCTION IntVecParam::ObjectEnum{{{1*/
     93/*FUNCTION IntVecParam::ObjectEnum{{{*/
    9494int IntVecParam::ObjectEnum(void){
    9595
    … …  
    9898}
    9999/*}}}*/
    100 /*FUNCTION IntVecParam::copy{{{1*/
     100/*FUNCTION IntVecParam::copy{{{*/
    101101Object* IntVecParam::copy() {
    102102       
    … …  
    107107
    108108/*IntVecParam virtual functions definitions: */
    109 /*FUNCTION IntVecParam::GetParameterValue{{{1*/
     109/*FUNCTION IntVecParam::GetParameterValue{{{*/
    110110void  IntVecParam::GetParameterValue(int** pintarray,int* pM){
    111111        int* output=NULL;
    … …  
    121121}
    122122/*}}}*/
    123 /*FUNCTION IntVecParam::GetParameterName{{{1*/
     123/*FUNCTION IntVecParam::GetParameterName{{{*/
    124124void IntVecParam::GetParameterName(char**pname){
    125125        EnumToStringx(pname,this->enum_type);
    126126}
    127127/*}}}*/
    128 /*FUNCTION IntVecParam::SetValue{{{1*/
     128/*FUNCTION IntVecParam::SetValue{{{*/
    129129void  IntVecParam::SetValue(int* intarray,int in_M){
    130130
    … …  
    141141}
    142142/*}}}*/
    143 /*FUNCTION IntVecParam::UnitConversion{{{1*/
     143/*FUNCTION IntVecParam::UnitConversion{{{*/
    144144void  IntVecParam::UnitConversion(int direction_enum){
    145145        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/IntVecParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*IntVecParam constructors, destructors: {{{1*/
     30                /*IntVecParam constructors, destructors: {{{*/
    3131                IntVecParam();
    3232                IntVecParam(int enum_type,int* values,int M);
    … …  
    3434                ~IntVecParam();
    3535                /*}}}*/
    36                 /*Object virtual functions definitions:{{{1 */
     36                /*Object virtual functions definitions:{{{ */
    3737                void  Echo();
    3838                void  DeepEcho();
    … …  
    4242                Object* copy();
    4343                /*}}}*/
    44                 /*Param virtual functions definitions: {{{1*/
     44                /*Param virtual functions definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    4646                void  GetParameterValue(bool* pbool){_error_("IntVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*MatrixParam constructors and destructor*/
    23 /*FUNCTION MatrixParam::MatrixParam(){{{1*/
     23/*FUNCTION MatrixParam::MatrixParam(){{{*/
    2424MatrixParam::MatrixParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{1*/
     28/*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{*/
    2929MatrixParam::MatrixParam(int in_enum_type,Matrix* in_value){
    3030
    … …  
    3737}
    3838/*}}}*/
    39 /*FUNCTION MatrixParam::~MatrixParam(){{{1*/
     39/*FUNCTION MatrixParam::~MatrixParam(){{{*/
    4040MatrixParam::~MatrixParam(){
    4141        xdelete(&value);
    … …  
    4444
    4545/*Object virtual functions definitions:*/
    46 /*FUNCTION MatrixParam::Echo {{{1*/
     46/*FUNCTION MatrixParam::Echo {{{*/
    4747void MatrixParam::Echo(void){
    4848
    … …  
    5252}
    5353/*}}}*/
    54 /*FUNCTION MatrixParam::DeepEcho{{{1*/
     54/*FUNCTION MatrixParam::DeepEcho{{{*/
    5555void MatrixParam::DeepEcho(void){
    5656
    … …  
    6161}
    6262/*}}}*/
    63 /*FUNCTION MatrixParam::Id{{{1*/
     63/*FUNCTION MatrixParam::Id{{{*/
    6464int    MatrixParam::Id(void){ return -1; }
    6565/*}}}*/
    66 /*FUNCTION MatrixParam::MyRank{{{1*/
     66/*FUNCTION MatrixParam::MyRank{{{*/
    6767int    MatrixParam::MyRank(void){
    6868        extern int my_rank;
    … …  
    7070}
    7171/*}}}*/
    72 /*FUNCTION MatrixParam::ObjectEnum{{{1*/
     72/*FUNCTION MatrixParam::ObjectEnum{{{*/
    7373int MatrixParam::ObjectEnum(void){
    7474
    … …  
    7777}
    7878/*}}}*/
    79 /*FUNCTION MatrixParam::copy{{{1*/
     79/*FUNCTION MatrixParam::copy{{{*/
    8080Object* MatrixParam::copy() {
    8181       
    … …  
    8686
    8787/*MatrixParam virtual functions definitions: */
    88 /*FUNCTION MatrixParam::GetParameterValue{{{1*/
     88/*FUNCTION MatrixParam::GetParameterValue{{{*/
    8989void  MatrixParam::GetParameterValue(Matrix** poutput){
    9090        Matrix* output=NULL;
    … …  
    9696}
    9797/*}}}*/
    98 /*FUNCTION MatrixParam::GetParameterName{{{1*/
     98/*FUNCTION MatrixParam::GetParameterName{{{*/
    9999void MatrixParam::GetParameterName(char**pname){
    100100        EnumToStringx(pname,this->enum_type);
    101101}
    102102/*}}}*/
    103 /*FUNCTION MatrixParam::SetValue{{{1*/
     103/*FUNCTION MatrixParam::SetValue{{{*/
    104104void  MatrixParam::SetValue(Matrix* matrix){
    105105       
    … …  
    111111}
    112112/*}}}*/
    113 /*FUNCTION MatrixParam::UnitConversion{{{1*/
     113/*FUNCTION MatrixParam::UnitConversion{{{*/
    114114void  MatrixParam::UnitConversion(int direction_enum){
    115115        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/MatrixParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*MatrixParam constructors, destructors: {{{1*/
     30                /*MatrixParam constructors, destructors: {{{*/
    3131                MatrixParam();
    3232                MatrixParam(int enum_type,Matrix* value);
    3333                ~MatrixParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param vritual function definitions: {{{1*/
     43                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool){_error_("Matrix param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/Param.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111
    1212#ifdef HAVE_CONFIG_H

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*StringArrayParam constructors and destructor*/
    23 /*FUNCTION StringArrayParam::StringArrayParam(){{{1*/
     23/*FUNCTION StringArrayParam::StringArrayParam(){{{*/
    2424StringArrayParam::StringArrayParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{1*/
     28/*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{*/
    2929StringArrayParam::StringArrayParam(int in_enum_type,char** in_values, int in_numstrings){
    3030
    … …  
    4949}
    5050/*}}}*/
    51 /*FUNCTION StringArrayParam::~StringArrayParam(){{{1*/
     51/*FUNCTION StringArrayParam::~StringArrayParam(){{{*/
    5252StringArrayParam::~StringArrayParam(){
    5353               
    … …  
    6464
    6565/*Object virtual functions definitions:*/
    66 /*FUNCTION StringArrayParam::Echo {{{1*/
     66/*FUNCTION StringArrayParam::Echo {{{*/
    6767void StringArrayParam::Echo(void){
    6868        this->DeepEcho();
    6969}
    7070/*}}}*/
    71 /*FUNCTION StringArrayParam::DeepEcho{{{1*/
     71/*FUNCTION StringArrayParam::DeepEcho{{{*/
    7272void StringArrayParam::DeepEcho(void){
    7373
    … …  
    8383}
    8484/*}}}*/
    85 /*FUNCTION StringArrayParam::Id{{{1*/
     85/*FUNCTION StringArrayParam::Id{{{*/
    8686int    StringArrayParam::Id(void){ return -1; }
    8787/*}}}*/
    88 /*FUNCTION StringArrayParam::MyRank{{{1*/
     88/*FUNCTION StringArrayParam::MyRank{{{*/
    8989int    StringArrayParam::MyRank(void){
    9090        extern int my_rank;
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION StringArrayParam::ObjectEnum{{{1*/
     94/*FUNCTION StringArrayParam::ObjectEnum{{{*/
    9595int StringArrayParam::ObjectEnum(void){
    9696
    … …  
    9999}
    100100/*}}}*/
    101 /*FUNCTION StringArrayParam::copy{{{1*/
     101/*FUNCTION StringArrayParam::copy{{{*/
    102102Object* StringArrayParam::copy() {
    103103       
    … …  
    108108
    109109/*StringArrayParam virtual functions definitions: */
    110 /*FUNCTION StringArrayParam::GetParameterValue{{{1*/
     110/*FUNCTION StringArrayParam::GetParameterValue{{{*/
    111111void  StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){
    112112       
    … …  
    139139}
    140140/*}}}*/
    141 /*FUNCTION StringArrayParam::GetParameterName{{{1*/
     141/*FUNCTION StringArrayParam::GetParameterName{{{*/
    142142void StringArrayParam::GetParameterName(char**pname){
    143143        EnumToStringx(pname,this->enum_type);
    144144}
    145145/*}}}*/
    146 /*FUNCTION StringArrayParam::SetValue{{{1*/
     146/*FUNCTION StringArrayParam::SetValue{{{*/
    147147void  StringArrayParam::SetValue(char** stringarray,int M){
    148148       
    … …  
    173173}
    174174/*}}}*/
    175 /*FUNCTION StringArrayParam::UnitConversion{{{1*/
     175/*FUNCTION StringArrayParam::UnitConversion{{{*/
    176176void  StringArrayParam::UnitConversion(int direction_enum){
    177177        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    3030
    3131        public:
    32                 /*StringArrayParam constructors, destructors: {{{1*/
     32                /*StringArrayParam constructors, destructors: {{{*/
    3333                StringArrayParam();
    3434                StringArrayParam(int enum_type,char** values, int numstrings);
    3535                ~StringArrayParam();
    3636                /*}}}*/
    37                 /*Object virtual functions definitions:{{{1 */
     37                /*Object virtual functions definitions:{{{ */
    3838                void  Echo();
    3939                void  DeepEcho();
    … …  
    4343                Object* copy();
    4444                /*}}}*/
    45                 /*Param vritual function definitions: {{{1*/
     45                /*Param vritual function definitions: {{{*/
    4646                int   InstanceEnum(){return enum_type;}
    4747                void  GetParameterValue(bool* pbool){_error_("StringArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

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

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*StringParam constructors and destructor*/
    23 /*FUNCTION StringParam::StringParam(){{{1*/
     23/*FUNCTION StringParam::StringParam(){{{*/
    2424StringParam::StringParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{1*/
     28/*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{*/
    2929StringParam::StringParam(int in_enum_type,char* in_value){
    3030
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION StringParam::~StringParam(){{{1*/
     38/*FUNCTION StringParam::~StringParam(){{{*/
    3939StringParam::~StringParam(){
    4040        xfree((void**)&value);
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION StringParam::Echo {{{1*/
     45/*FUNCTION StringParam::Echo {{{*/
    4646void StringParam::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION StringParam::DeepEcho{{{1*/
     50/*FUNCTION StringParam::DeepEcho{{{*/
    5151void StringParam::DeepEcho(void){
    5252        printf("StringParam:\n");
    … …  
    5555}
    5656/*}}}*/
    57 /*FUNCTION StringParam::Id{{{1*/
     57/*FUNCTION StringParam::Id{{{*/
    5858int    StringParam::Id(void){ return -1; }
    5959/*}}}*/
    60 /*FUNCTION StringParam::MyRank{{{1*/
     60/*FUNCTION StringParam::MyRank{{{*/
    6161int    StringParam::MyRank(void){
    6262        extern int my_rank;
    … …  
    6464}
    6565/*}}}*/
    66 /*FUNCTION StringParam::ObjectEnum{{{1*/
     66/*FUNCTION StringParam::ObjectEnum{{{*/
    6767int StringParam::ObjectEnum(void){
    6868
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION StringParam::copy{{{1*/
     73/*FUNCTION StringParam::copy{{{*/
    7474Object* StringParam::copy() {
    7575       
    … …  
    8080
    8181/*StringParam virtual functions definitions: */
    82 /*FUNCTION StringParam::GetParameterValue{{{1*/
     82/*FUNCTION StringParam::GetParameterValue{{{*/
    8383void  StringParam::GetParameterValue(char** pstring){
    8484       
    … …  
    9595}
    9696/*}}}*/
    97 /*FUNCTION StringParam::GetParameterName{{{1*/
     97/*FUNCTION StringParam::GetParameterName{{{*/
    9898void StringParam::GetParameterName(char**pname){
    9999        EnumToStringx(pname,this->enum_type);
    100100}
    101101/*}}}*/
    102 /*FUNCTION StringParam::SetValue{{{1*/
     102/*FUNCTION StringParam::SetValue{{{*/
    103103void  StringParam::SetValue(char* string){
    104104       
    … …  
    115115}
    116116/*}}}*/
    117 /*FUNCTION StringParam::UnitConversion{{{1*/
     117/*FUNCTION StringParam::UnitConversion{{{*/
    118118void  StringParam::UnitConversion(int direction_enum){
    119119        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/StringParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*StringParam constructors, destructors: {{{1*/
     30                /*StringParam constructors, destructors: {{{*/
    3131                StringParam();
    3232                StringParam(int enum_type,char* value);
    3333                ~StringParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param vritual function definitions: {{{1*/
     43                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool){_error_("String param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

  • issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp

    r12014 r12365  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*VectorParam constructors and destructor*/
    23 /*FUNCTION VectorParam::VectorParam(){{{1*/
     23/*FUNCTION VectorParam::VectorParam(){{{*/
    2424VectorParam::VectorParam(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{1*/
     28/*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{*/
    2929VectorParam::VectorParam(int in_enum_type,Vector* in_value){
    3030
    … …  
    3939}
    4040/*}}}*/
    41 /*FUNCTION VectorParam::~VectorParam(){{{1*/
     41/*FUNCTION VectorParam::~VectorParam(){{{*/
    4242VectorParam::~VectorParam(){
    4343        xdelete(&value);
    … …  
    4646
    4747/*Object virtual functions definitions:*/
    48 /*FUNCTION VectorParam::Echo {{{1*/
     48/*FUNCTION VectorParam::Echo {{{*/
    4949void VectorParam::Echo(void){
    5050
    … …  
    5454}
    5555/*}}}*/
    56 /*FUNCTION VectorParam::DeepEcho{{{1*/
     56/*FUNCTION VectorParam::DeepEcho{{{*/
    5757void VectorParam::DeepEcho(void){
    5858
    … …  
    6363}
    6464/*}}}*/
    65 /*FUNCTION VectorParam::Id{{{1*/
     65/*FUNCTION VectorParam::Id{{{*/
    6666int    VectorParam::Id(void){ return -1; }
    6767/*}}}*/
    68 /*FUNCTION VectorParam::MyRank{{{1*/
     68/*FUNCTION VectorParam::MyRank{{{*/
    6969int    VectorParam::MyRank(void){
    7070        extern int my_rank;
    … …  
    7272}
    7373/*}}}*/
    74 /*FUNCTION VectorParam::ObjectEnum{{{1*/
     74/*FUNCTION VectorParam::ObjectEnum{{{*/
    7575int VectorParam::ObjectEnum(void){
    7676
    … …  
    7979}
    8080/*}}}*/
    81 /*FUNCTION VectorParam::copy{{{1*/
     81/*FUNCTION VectorParam::copy{{{*/
    8282Object* VectorParam::copy() {
    8383       
    … …  
    8888
    8989/*VectorParam virtual functions definitions: */
    90 /*FUNCTION VectorParam::GetParameterValue{{{1*/
     90/*FUNCTION VectorParam::GetParameterValue{{{*/
    9191void  VectorParam::GetParameterValue(Vector** poutput){
    9292        Vector*  output=NULL;
    … …  
    9999}
    100100/*}}}*/
    101 /*FUNCTION VectorParam::GetParameterName{{{1*/
     101/*FUNCTION VectorParam::GetParameterName{{{*/
    102102void VectorParam::GetParameterName(char**pname){
    103103        EnumToStringx(pname,this->enum_type);
    104104}
    105105/*}}}*/
    106 /*FUNCTION VectorParam::SetValue{{{1*/
     106/*FUNCTION VectorParam::SetValue{{{*/
    107107void  VectorParam::SetValue(Vector* vector){
    108108
    … …  
    115115}
    116116/*}}}*/
    117 /*FUNCTION VectorParam::UnitConversion{{{1*/
     117/*FUNCTION VectorParam::UnitConversion{{{*/
    118118void  VectorParam::UnitConversion(int direction_enum){
    119119        /*do nothing, no unit conversion*/

  • issm/trunk-jpl/src/c/objects/Params/VectorParam.h

    r12014 r12365  
    88
    99/*Headers:*/
    10 /*{{{1*/
     10/*{{{*/
    1111#ifdef HAVE_CONFIG_H
    1212        #include <config.h>
    … …  
    2828
    2929        public:
    30                 /*VectorParam constructors, destructors: {{{1*/
     30                /*VectorParam constructors, destructors: {{{*/
    3131                VectorParam();
    3232                VectorParam(int enum_type,Vector* value);
    3333                ~VectorParam();
    3434                /*}}}*/
    35                 /*Object virtual functions definitions:{{{1 */
     35                /*Object virtual functions definitions:{{{ */
    3636                void  Echo();
    3737                void  DeepEcho();
    … …  
    4141                Object* copy();
    4242                /*}}}*/
    43                 /*Param vritual function definitions: {{{1*/
     43                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    4545                void  GetParameterValue(bool* pbool){_error_("Vector param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));}

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

    r12102 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>
    … …  
    2222
    2323/*Object constructors and destructors:*/
    24 /*FUNCTION Patch::Patch() default constructor {{{1*/
     24/*FUNCTION Patch::Patch() default constructor {{{*/
    2525Patch::Patch(){
    2626        this->numrows=0;
    … …  
    3131}
    3232/*}}}*/
    33 /*FUNCTION Patch::Patch(int numrows, int maxvertices, int maxnodes){{{1*/
     33/*FUNCTION Patch::Patch(int numrows, int maxvertices, int maxnodes){{{*/
    3434Patch::Patch(int in_numrows, int in_maxvertices, int in_maxnodes){
    3535
    … …  
    6262}
    6363/*}}}*/
    64 /*FUNCTION Patch::~Patch(){{{1*/
     64/*FUNCTION Patch::~Patch(){{{*/
    6565Patch::~Patch(){
    6666        xfree((void**)&values);
    … …  
    6969
    7070/*Object methods*/
    71 /*FUNCTION Patch::fillelementinfo{{{1*/
     71/*FUNCTION Patch::fillelementinfo{{{*/
    7272void Patch::fillelementinfo(int count, int element_id, int* vertices_ids, int num_vertices){
    7373
    … …  
    8888}
    8989/*}}}*/
    90 /*FUNCTION Patch::fillresultinfo{{{1*/
     90/*FUNCTION Patch::fillresultinfo{{{*/
    9191void Patch::fillresultinfo(int count,int enum_type,int step, double time, int interpolation, double* nodal_values, int num_nodes){
    9292
    … …  
    110110}
    111111/*}}}*/
    112 /*FUNCTION Patch::Gather{{{1*/
     112/*FUNCTION Patch::Gather{{{*/
    113113void Patch::Gather(void){
    114114

  • issm/trunk-jpl/src/c/objects/Segment.cpp

    r12339 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>
    … …  
    2020
    2121/*Segment constructors and destructors:*/
    22 /*FUNCTION Segment::Segment() default constructor {{{1*/
     22/*FUNCTION Segment::Segment() default constructor {{{*/
    2323Segment::Segment(){
    2424        this->eid=UNDEF;
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION Segment::Segment(int eid, IssmDouble x1,IssmDouble y1,IssmDouble x2, IssmDouble y2){{{1*/
     31/*FUNCTION Segment::Segment(int eid, IssmDouble x1,IssmDouble y1,IssmDouble x2, IssmDouble y2){{{*/
    3232Segment::Segment(int segment_eid, IssmDouble segment_x1,IssmDouble segment_y1,IssmDouble segment_x2, IssmDouble segment_y2){
    3333
    … …  
    4040}
    4141/*}}}*/
    42 /*FUNCTION Segment::~Segment(){{{1*/
     42/*FUNCTION Segment::~Segment(){{{*/
    4343Segment::~Segment(){
    4444}
    … …  
    4646
    4747/*Object virtual functions definitions:*/
    48 /*FUNCTION Segment::Echo{{{1*/
     48/*FUNCTION Segment::Echo{{{*/
    4949void Segment::Echo(void){
    5050
    … …  
    5656}
    5757/*}}}*/
    58 /*FUNCTION Segment::DeepEcho{{{1*/
     58/*FUNCTION Segment::DeepEcho{{{*/
    5959void Segment::DeepEcho(void){
    6060        this->Echo();
    6161}
    6262/*}}}*/
    63 /*FUNCTION Segment::Id{{{1*/
     63/*FUNCTION Segment::Id{{{*/
    6464int    Segment::Id(void){ return eid; }
    6565/*}}}*/
    66 /*FUNCTION Segment::MyRank{{{1*/
     66/*FUNCTION Segment::MyRank{{{*/
    6767int    Segment::MyRank(void){
    6868        extern int my_rank;
    … …  
    7171}
    7272/*}}}*/
    73 /*FUNCTION Segment::ObjectEnum{{{1*/
     73/*FUNCTION Segment::ObjectEnum{{{*/
    7474int Segment::ObjectEnum(void){
    7575
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION Segment::copy {{{1*/
     80/*FUNCTION Segment::copy {{{*/
    8181Object* Segment::copy() {
    8282        return new Segment(this->eid,this->x1,this->y1,this->x2,this->y2);

  • issm/trunk-jpl/src/c/objects/Segment.h

    r12322 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Object.h"
    1111/*}}}*/
    … …  
    2020                IssmDouble y2;
    2121
    22                 /*Segment constructors, destructors {{{1*/
     22                /*Segment constructors, destructors {{{*/
    2323                Segment();
    2424                Segment(int eid,IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2);
    2525                ~Segment();
    2626                /*}}}*/
    27                 /*Object virtual functions definitions:{{{1 */
     27                /*Object virtual functions definitions:{{{ */
    2828                void  Echo();
    2929                void  DeepEcho();

  • issm/trunk-jpl/src/c/objects/Update.h

    r12322 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "../shared/shared.h"
    1111/*}}}*/

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

    r12340 r12365  
    33 */
    44
    5 /*Include files: {{{1*/
     5/*Include files: {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>
    … …  
    1818
    1919/*Vertex constructors and destructor:*/
    20 /*FUNCTION Vertex::Vertex() {{{1*/
     20/*FUNCTION Vertex::Vertex() {{{*/
    2121Vertex::Vertex(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{1*/
     25/*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{*/
    2626Vertex::Vertex(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){
    2727        this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma,vertex_connectivity);
    2828}
    2929/*}}}*/
    30 /*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/
     30/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{*/
    3131Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
    3232
    … …  
    3838}
    3939/*}}}*/
    40 /*FUNCTION Vertex::~Vertex() {{{1*/
     40/*FUNCTION Vertex::~Vertex() {{{*/
    4141Vertex::~Vertex(){
    4242        return;
    4343}
    4444/*}}}*/
    45 /*FUNCTION Vertex::Init{{{1*/
     45/*FUNCTION Vertex::Init{{{*/
    4646void Vertex::Init(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){
    4747
    … …  
    6161
    6262/*Object virtual functions definitions:*/
    63 /*FUNCTION Vertex::Echo{{{1*/
     63/*FUNCTION Vertex::Echo{{{*/
    6464void Vertex::Echo(void){
    6565
    … …  
    7878}
    7979/*}}}*/
    80 /*FUNCTION Vertex::DeepEcho{{{1*/
     80/*FUNCTION Vertex::DeepEcho{{{*/
    8181void Vertex::DeepEcho(void){
    8282        this->Echo();
    8383}
    8484/*}}}*/
    85 /*FUNCTION Vertex::Id{{{1*/
     85/*FUNCTION Vertex::Id{{{*/
    8686int    Vertex::Id(void){ return id; }
    8787/*}}}*/
    88 /*FUNCTION Vertex::MyRank {{{1*/
     88/*FUNCTION Vertex::MyRank {{{*/
    8989int    Vertex::MyRank(void){
    9090        extern int my_rank;
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION Vertex::ObjectEnum{{{1*/
     94/*FUNCTION Vertex::ObjectEnum{{{*/
    9595int Vertex::ObjectEnum(void){
    9696
    … …  
    9999}
    100100/*}}}*/
    101 /*FUNCTION Vertex::copy {{{1*/
     101/*FUNCTION Vertex::copy {{{*/
    102102Object* Vertex::copy() {
    103103
    … …  
    108108
    109109/* DofObject routines: */
    110 /*FUNCTION Vertex::DistributeDofs{{{1*/
     110/*FUNCTION Vertex::DistributeDofs{{{*/
    111111void  Vertex::DistributeDofs(int* pdofcount){
    112112
    … …  
    131131}
    132132/*}}}*/
    133 /*FUNCTION Vertex::OffsetDofs{{{1*/
     133/*FUNCTION Vertex::OffsetDofs{{{*/
    134134void  Vertex::OffsetDofs(int dofcount){
    135135       
    … …  
    146146}
    147147/*}}}*/
    148 /*FUNCTION Vertex::ShowTrueDofs{{{1*/
     148/*FUNCTION Vertex::ShowTrueDofs{{{*/
    149149void  Vertex::ShowTrueDofs(int* truedofs){
    150150
    … …  
    160160}
    161161/*}}}*/
    162 /*FUNCTION Vertex::UpdateCloneDofs{{{1*/
     162/*FUNCTION Vertex::UpdateCloneDofs{{{*/
    163163void  Vertex::UpdateCloneDofs(int* alltruedofs){
    164164
    … …  
    174174}
    175175/*}}}*/
    176 /*FUNCTION Vertex::SetClone {{{1*/
     176/*FUNCTION Vertex::SetClone {{{*/
    177177void  Vertex::SetClone(int* minranks){
    178178
    … …  
    192192
    193193/*Vertex management: */
    194 /*FUNCTION Vertex::Connectivity{{{1*/
     194/*FUNCTION Vertex::Connectivity{{{*/
    195195int    Vertex::Connectivity(void){return connectivity;}
    196196/*}}}*/
    197 /*FUNCTION Vertex::Sid{{{1*/
     197/*FUNCTION Vertex::Sid{{{*/
    198198int    Vertex::Sid(void){ return sid; }
    199199/*}}}*/
    200 /*FUNCTION Vertex::UpdateVertexPosition {{{1*/
     200/*FUNCTION Vertex::UpdateVertexPosition {{{*/
    201201void  Vertex::UpdatePosition(Vector* vz,Parameters* parameters,IssmDouble* thickness,IssmDouble* bed){
    202202

  • issm/trunk-jpl/src/c/objects/Vertex.h

    r12322 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#include "./Object.h"
    1111class IoModel;
    … …  
    3535                int    dof; //dof to recover values in a vertex indexed vector
    3636
    37                 /*Vertex constructors, destructors {{{1*/
     37                /*Vertex constructors, destructors {{{*/
    3838                Vertex();
    3939                Vertex(int id, int sid,IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma, int connectivity);
    … …  
    4242                ~Vertex();
    4343                /*}}}*/
    44                 /*Object virtual functions definitions:{{{1 */
     44                /*Object virtual functions definitions:{{{ */
    4545                void  Echo();
    4646                void  DeepEcho();
    … …  
    5050                Object* copy();
    5151                /*}}}*/
    52                 /*DofObject routines {{{1*/
     52                /*DofObject routines {{{*/
    5353                void  DistributeDofs(int* pdofcount);
    5454                void  OffsetDofs(int dofcount);
    … …  
    5757                void  SetClone(int* minranks);
    5858                /*}}}*/
    59                 /*Vertex management: {{{1*/
     59                /*Vertex management: {{{*/
    6060                int   Sid(void);
    6161                int   Connectivity(void);

  • issm/trunk-jpl/src/c/python/include/python_macros.h

    r12119 r12365  
    66#define _PYTHON_MACROS_H_
    77
    8 /*Header {{{1*/
     8/*Header {{{*/
    99
    1010#ifdef HAVE_CONFIG_H
    … …  
    1616
    1717#ifdef _HAVE_PYTHON_
    18 /* MODULEBOOT/MODULEEND {{{1*/
     18/* MODULEBOOT/MODULEEND {{{*/
    1919
    2020/*The following macros hide the error exception handling in a matlab module. Just put
    … …  
    3030//}}}
    3131#if _PYTHON_MAJOR_ >=3
    32 /* WRAPPER 3.2 {{{1*/
     32/* WRAPPER 3.2 {{{*/
    3333#define WRAPPER(modulename,...)  \
    3434\
    … …  
    5757/*}}}*/
    5858#else
    59 /* WRAPPER 2.7 {{{1*/
     59/* WRAPPER 2.7 {{{*/
    6060#define WRAPPER(modulename,...)  \
    6161\
    … …  
    7575/*}}}*/
    7676#endif
    77 /* CHECKARGUMENTS {{{1*/
     77/* CHECKARGUMENTS {{{*/
    7878#define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumPythonArguments(args, NRHS,functionpointer)
    7979/*}}}*/

  • issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp

    r12120 r12365  
    1717
    1818/*Primitive data types*/
    19 /*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{1*/
     19/*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{*/
    2020void FetchData(double* pscalar,PyObject* py_float){
    2121
    … …  
    2929}
    3030/*}}}*/
    31 /*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{1*/
     31/*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{*/
    3232void FetchData(int* pinteger, PyObject* py_long){
    3333
    … …  
    4141}
    4242/*}}}*/
    43 /*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{1*/
     43/*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{*/
    4444void FetchData(bool* pboolean,PyObject* py_boolean){
    4545
    … …  
    5757}
    5858/*}}}*/
    59 /*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{1*/
     59/*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{*/
    6060void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_matrix){
    6161
    … …  
    8181}
    8282/*}}}*/
    83 /*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{1*/
     83/*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{*/
    8484void FetchData(double** pvector,int* pM,PyObject* py_vector){
    8585
    … …  
    107107/*Python version dependent: */
    108108#if _PYTHON_MAJOR_ >= 3
    109 /*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{1*/
     109/*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{*/
    110110void FetchData(char** pstring,PyObject* py_unicode){
    111111
    … …  
    124124/*}}}*/
    125125#else
    126 /*FUNCTION FetchData(char** pstring,PyObject* py_string){{{1*/
     126/*FUNCTION FetchData(char** pstring,PyObject* py_string){{{*/
    127127void FetchData(char** pstring,PyObject* py_string){
    128128

  • issm/trunk-jpl/src/c/python/io/WritePythonData.cpp

    r12112 r12365  
    2121
    2222
    23 /*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{1*/
     23/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/
    2424void WriteData(PyObject* py_tuple, int index, char* string){
    2525       
    2626        PyTuple_SetItem(py_tuple, index, PyUnicode_FromString(string));
    2727
    28 }
    29 /*}}}*/
    30 /*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{1*/
     28}/*}}}*/
     29/*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{*/
    3130void WriteData(PyObject* tuple,int index,Matrix* matrix){
    3231       
    … …  
    4544
    4645
    47 }
    48 /*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{1*/
     46}/*}}}*/
     47/*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{*/
    4948void WriteData(PyObject* tuple,int index,Vector* vector){
    5049       
    … …  
    6463}
    6564/*}}}*/
    66 /*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{1*/
     65/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/
    6766void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){
    6867       
    … …  
    7675        PyTuple_SetItem(tuple, index, array);
    7776
    78 }
     77}/*}}}*/

  • issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp

    r11695 r12365  
    1414#endif
    1515
    16 /*IsInPoly {{{1*/
     16/*IsInPoly {{{*/
    1717int IsInPoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){
    1818
    … …  
    5555         return 1;
    5656}/*}}}*/
    57 /*IsOutsidePoly {{{1*/
     57/*IsOutsidePoly {{{*/
    5858int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){
    5959
    … …  
    9696        return 1;
    9797}/*}}}*/
    98 /*pnpoly{{{1*/
     98/*pnpoly{{{*/
    9999int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue) {
    100100        int i, j, c = 0;

  • issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

    r11973 r12365  
    44
    55/*Headers*/
    6 /*{{{1*/
     6/*{{{*/
    77#include "./matrix.h"
    88#include "../Exceptions/exceptions.h"
    … …  
    1616/*}}}*/
    1717
    18 /*FUNCTION TripleMultiply {{{1*/
     18/*FUNCTION TripleMultiply {{{*/
    1919int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){
    2020        /*TripleMultiply    Perform triple matrix product a*b*c+d.*/
    … …  
    9898        return 1;
    9999}/*}}}*/
    100 /*FUNCTION MatrixMuliply {{{1*/
     100/*FUNCTION MatrixMuliply {{{*/
    101101int MatrixMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int iaddc ){
    102102        /*MatrixMultiply    Perform matrix multiplication a*b+c.*/
    … …  
    167167        return noerr;
    168168}/*}}}*/
    169 /*FUNCTION MatrixInverse {{{1*/
     169/*FUNCTION MatrixInverse {{{*/
    170170int MatrixInverse( double* a, int ndim, int nrow, double* b, int nvec, double* pdet ){
    171171/* MatrixInverse    Perform matrix inversion and linear equation solution.
    … …  
    344344        return noerr;
    345345}/*}}}*/
    346 /*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{1*/
     346/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{*/
    347347void Matrix2x2Determinant(double* Adet,double* A){
    348348        /*Compute determinant of a 2x2 matrix*/
    … …  
    352352}
    353353/*}}}*/
    354 /*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{1*/
     354/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{*/
    355355void Matrix2x2Invert(double* Ainv,double* A){
    356356
    … …  
    369369
    370370}/*}}}*/
    371 /*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{1*/
     371/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{*/
    372372void Matrix3x3Determinant(double* Adet,double* A){
    373373        /*Compute determinant of a 3x3 matrix*/
    … …  
    377377}
    378378/*}}}*/
    379 /*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{1*/
     379/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{*/
    380380void Matrix3x3Invert(double* Ainv,double* A){
    381381
    … …  
    399399
    400400}/*}}}*/
    401 /*FUNCTION MatrixTranspose(double* Adet,double* A) {{{1*/
     401/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{*/
    402402void MatrixTranspose(double* tA,double* A, int nrows, int ncols){
    403403        /*Transpose a n*m matrix*/

  • issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

    r11973 r12365  
    1010
    1111/*General Gauss points*/
    12 /*FUNCTION GaussLegendreLinear {{{1*/
     12/*FUNCTION GaussLegendreLinear {{{*/
    1313void GaussLegendreLinear( double** pxgaus, double** pxwgt, int ngaus){
    1414        /* Gauss-Legendre quadrature points.
    … …  
    8787                xfree((void **)&alpha);
    8888        }
    89 }/*}}}1*/
    90 /*FUNCTION GaussLegendreTria{{{1*/
     89}/*}}}*/
     90/*FUNCTION GaussLegendreTria{{{*/
    9191void GaussLegendreTria( int* pngaus, double** pl1, double** pl2, double** pl3, double** pwgt, int iord ) {
    9292        /*Gauss quadrature points for the triangle.
    … …  
    102102
    103103        /*Hardcoded Gauss points declaration*/
    104         /*p= 1, npoint= 1{{{2*/
     104        /*p= 1, npoint= 1{{{*/
    105105        static double wgt1[]={
    106106                1.732050807568877};
    … …  
    111111        static double l31[]={
    112112                0.333333333333333};
    113         /*}}}2*/
    114         /*p= 2, npoint= 3  {{{2*/
     113        /*}}}*/
     114        /*p= 2, npoint= 3  {{{*/
    115115        static double wgt2[]={
    116116                0.577350269189625, 0.577350269189625, 0.577350269189625};
    … …  
    121121        static double l32[]={
    122122                0.166666666666667, 0.166666666666667, 0.666666666666667};
    123         /*}}}2*/
    124         /*p= 3, npoint= 4  {{{2*/
     123        /*}}}*/
     124        /*p= 3, npoint= 4  {{{*/
    125125        static double wgt3[]={
    126126                -0.974278579257493, 0.902109795608790, 0.902109795608790,
    … …  
    135135                0.333333333333333, 0.200000000000000, 0.200000000000000,
    136136                0.600000000000000};
    137         /*}}}2*/
    138         /*p= 4, npoint= 6  {{{2*/
     137        /*}}}*/
     138        /*p= 4, npoint= 6  {{{*/
    139139        static double wgt4[]={
    140140                0.386908262797819, 0.386908262797819, 0.386908262797819,
    … …  
    149149                0.445948490915965, 0.445948490915965, 0.108103018168070,
    150150                0.091576213509771, 0.091576213509771, 0.816847572980459};
    151         /*}}}2*/
    152         /*p= 5, npoint= 7  {{{2*/
     151        /*}}}*/
     152        /*p= 5, npoint= 7  {{{*/
    153153        static double wgt5[]={
    154154                0.389711431702997, 0.229313399254729, 0.229313399254729,
    … …  
    167167                0.059715871789770, 0.101286507323456, 0.101286507323456,
    168168                0.797426985353087};
    169         /*}}}2*/
    170         /*p= 6, npoint=12  {{{2*/
     169        /*}}}*/
     170        /*p= 6, npoint=12  {{{*/
    171171        static double wgt6[]={
    172172                0.202279763184836, 0.202279763184836, 0.202279763184836,
    … …  
    189189                0.636502499121399, 0.310352451033784, 0.636502499121399,
    190190                0.310352451033784, 0.053145049844817, 0.053145049844817};
    191         /*}}}2*/
    192         /*p= 7, npoint=13  {{{2*/
     191        /*}}}*/
     192        /*p= 7, npoint=13  {{{*/
    193193        static double wgt7[]={
    194194                -0.259062916308362, 0.304174548458604, 0.304174548458604,
    … …  
    215215                0.638444188569810, 0.312865496004874, 0.048690315425316,
    216216                0.048690315425316};
    217         /*}}}2*/
    218         /*p= 8, npoint=16  {{{2*/
     217        /*}}}*/
     218        /*p= 8, npoint=16  {{{*/
    219219        static double wgt8[]={
    220220                0.249961964823104, 0.164703541925695, 0.164703541925695,
    … …  
    245245                0.728492392955404, 0.263112829634638, 0.008394777409958,
    246246                0.008394777409958};
    247         /*}}}2*/
    248         /*p= 9, npoint=19  {{{2*/
     247        /*}}}*/
     248        /*p= 9, npoint=19  {{{*/
    249249        static double wgt9[]={
    250250                0.168244134395468, 0.054273292833345, 0.054273292833345,
    … …  
    279279                0.741198598784498, 0.221962989160766, 0.036838412054736,
    280280                0.036838412054736};
    281         /*}}}2*/
    282         /*p=10, npoint=25  {{{2*/
     281        /*}}}*/
     282        /*p=10, npoint=25  {{{*/
    283283        static double wgt10[]={
    284284                0.157301373584232, 0.063611224790829, 0.063611224790829,
    … …  
    321321                0.923655933587500, 0.066803251012200, 0.009540815400299,
    322322                0.009540815400299};
    323         /*}}}2*/
    324         /*p=11, npoint=27  {{{2*/
     323        /*}}}*/
     324        /*p=11, npoint=27  {{{*/
    325325        static double wgt11[]={
    326326                0.001605622060698, 0.001605622060698, 0.001605622060698,
    … …  
    363363                0.807489003159792, 0.171488980304042, 0.807489003159792,
    364364                0.171488980304042, 0.021022016536166, 0.021022016536166};
    365         /*}}}2*/
    366         /*p=12, npoint=33  {{{2*/
     365        /*}}}*/
     366        /*p=12, npoint=33  {{{*/
    367367        static double wgt12[]={
    368368                0.044567514407799, 0.044567514407799, 0.044567514407799,
    … …  
    413413                0.858014033544073, 0.116251915907597, 0.858014033544073,
    414414                0.116251915907597, 0.025734050548330, 0.025734050548330};
    415         /*}}}2*/
    416         /*  p=13, npoint=37  {{{2*/
     415        /*}}}*/
     416        /*  p=13, npoint=37  {{{*/
    417417        static double wgt13[]={
    418418                0.090968907790622, 0.019537784619314, 0.019537784619314,
    … …  
    471471                0.851409537834241, 0.126357385491669, 0.022233076674090,
    472472                0.022233076674090};
    473         /*}}}2*/
    474         /*p=14, npoint=42{{{2*/
     473        /*}}}*/
     474        /*p=14, npoint=42{{{*/
    475475        static double wgt14[]={
    476476                0.037903474783419, 0.037903474783419, 0.037903474783419,
    … …  
    533533                0.879757171370171, 0.118974497696957, 0.879757171370171,
    534534                0.118974497696957, 0.001268330932872, 0.001268330932872};
    535         /*}}}2*/
    536         /*p=15, npoint=48{{{2*/
     535        /*}}}*/
     536        /*p=15, npoint=48{{{*/
    537537        static double wgt15[]={
    538538                0.003320126005206, 0.003320126005206, 0.003320126005206,
    … …  
    603603                0.883964574092416, 0.103575616576386, 0.883964574092416,
    604604                0.103575616576386, 0.012459809331199, 0.012459809331199};
    605         /*}}}2*/
    606         /*p=16, npoint=52  {{{2*/
     605        /*}}}*/
     606        /*p=16, npoint=52  {{{*/
    607607        static double wgt16[]={
    608608                0.081191089584902, 0.011095307165226, 0.011095307165226,
    … …  
    681681                0.900399064086661, 0.085283615682657, 0.014317320230681,
    682682                0.014317320230681};
    683         /*}}}2*/
    684         /*p=17, npoint=61{{{2*/
     683        /*}}}*/
     684        /*p=17, npoint=61{{{*/
    685685        static double wgt17[]={
    686686                0.057914928034477, 0.008822054327014, 0.008822054327014,
    … …  
    771771                0.904625504095608, 0.080711313679564, 0.014663182224828,
    772772                0.014663182224828};
    773         /*}}}2*/
    774         /*  p=18, npoint=70  {{{2*/
     773        /*}}}*/
     774        /*  p=18, npoint=70  {{{*/
    775775
    776776        static double wgt18[]={
    … …  
    874874                1.014347260005363, 0.020874755282586,-0.035222015287949,
    875875                -0.035222015287949};
    876         /*}}}2*/
    877         /*p=19, npoint=73  {{{2*/
     876        /*}}}*/
     877        /*p=19, npoint=73  {{{*/
    878878
    879879        static double wgt19[]={
    … …  
    981981                0.924344252620784, 0.065494628082938, 0.010161119296278,
    982982                0.010161119296278};
    983         /*}}}2*/
    984         /*p=20, npoint=79 {{{2*/
     983        /*}}}*/
     984        /*p=20, npoint=79 {{{*/
    985985        static double wgt20[]={
    986986                0.057256499746719, 0.001501721280705, 0.001501721280705,
    … …  
    10951095                0.929756171556853, 0.059696109149007, 0.010547719294141,
    10961096                0.010547719294141};
    1097         /*}}}2*/
     1097        /*}}}*/
    10981098
    10991099        static double* wgtp[MAX_TRIA_SYM_ORD]={
    … …  
    12051205
    12061206        return;
    1207 }/*}}}1*/
    1208 /*FUNCTION GaussLegendreTetra{{{1*/
     1207}/*}}}*/
     1208/*FUNCTION GaussLegendreTetra{{{*/
    12091209void GaussLegendreTetra( int* pngaus, double** pl1, double** pl2, double** pl3, double** pl4, double** pwgt, int iord ) {
    12101210        /* Gauss quadrature points for the tetrahedron.
    … …  
    12241224
    12251225        /*Hardcoded Gauss points definition*/
    1226         /*p= 1, npoint= 1  {{{2*/
     1226        /*p= 1, npoint= 1  {{{*/
    12271227        static double wgt1[]={
    12281228                1.000000000000000};
    … …  
    12351235        static double l41[]={
    12361236                0.250000000000000};
    1237         /*}}}2*/
    1238         /*p= 2, npoint= 4  {{{2*/
     1237        /*}}}*/
     1238        /*p= 2, npoint= 4  {{{*/
    12391239
    12401240        static double wgt2[]={
    … …  
    12531253                0.138196601125011, 0.138196601125011, 0.138196601125011,
    12541254                0.585410196624969};
    1255         /*}}}2*/
    1256         /*p= 3, npoint= 5  {{{2*/
     1255        /*}}}*/
     1256        /*p= 3, npoint= 5  {{{*/
    12571257        static double wgt3[]={
    12581258                -0.800000000000000, 0.450000000000000, 0.450000000000000,
    … …  
    12701270                0.250000000000000, 0.166666666666667, 0.166666666666667,
    12711271                0.166666666666667, 0.500000000000000};
    1272         /*}}}2*/
    1273         /*p= 4, npoint=11  {{{2*/
     1272        /*}}}*/
     1273        /*p= 4, npoint=11  {{{*/
    12741274
    12751275        static double wgt4[]={
    … …  
    12981298                0.100596423833201, 0.399403576166799, 0.100596423833201,
    12991299                0.399403576166799, 0.399403576166799};
    1300         /*}}}2*/
    1301         /*p= 5, npoint=15  {{{2*/
     1300        /*}}}*/
     1301        /*p= 5, npoint=15  {{{*/
    13021302
    13031303        static double wgt5[]={
    … …  
    13311331                0.433449846426336, 0.433449846426336, 0.066550153573664,
    13321332                0.433449846426336, 0.066550153573664, 0.066550153573664};
    1333         /*}}}2*/
    1334         /*p= 6, npoint=24  {{{2*/
     1333        /*}}}*/
     1334        /*p= 6, npoint=24  {{{*/
    13351335
    13361336        static double wgt6[]={
    … …  
    13831383                0.603005664791649, 0.269672331458316, 0.063661001875018,
    13841384                0.063661001875018, 0.063661001875018, 0.063661001875018};
    1385         /*}}}2*/
     1385        /*}}}*/
    13861386
    13871387        static double* wgtp[MAX_TETRA_SYM_ORD]={wgt1,wgt2,wgt3,wgt4,wgt5,wgt6};
    … …  
    14701470                xfree((void **)&xgaus);
    14711471        }
    1472 }/*}}}1*/
    1473 /*FUNCTION GaussLobatto{{{1*/
     1472}/*}}}*/
     1473/*FUNCTION GaussLobatto{{{*/
    14741474void GaussLobatto( double** pxgaus, double** pxwgt, int ngaus ) {
    14751475        /*Gauss-Lobatto quadrature points.
    … …  
    15791579        }
    15801580
    1581 }/*}}}1*/
    1582 /*FUNCTION GaussRecur{{{1*/
     1581}/*}}}*/
     1582/*FUNCTION GaussRecur{{{*/
    15831583void GaussRecur( double* zero, double* weight, int n, double* alpha, double* beta ) {
    15841584        /*Gauss quadrature points from recursion coefficients.
    … …  
    17001700        xfree((void **)&work);
    17011701
    1702 }/*}}}1*/
     1702}/*}}}*/
    17031703
    17041704/*Element Gauss points TO BE REMOVED*/
    1705 /*FUNCTION gaussQuad{{{1*/
     1705/*FUNCTION gaussQuad{{{*/
    17061706void gaussQuad( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, int nigaus, int njgaus ) {
    17071707        /*Gauss quadrature points for the quadrilaterial.*/
    … …  
    17101710        GaussLegendreLinear(pxgaus, pxwgt, nigaus);
    17111711        GaussLegendreLinear(pegaus, pewgt, njgaus);
    1712 }/*}}}1*/
    1713 /*FUNCTION gaussHexa{{{1*/
     1712}/*}}}*/
     1713/*FUNCTION gaussHexa{{{*/
    17141714void gaussHexa( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, double** pzgaus, double** pzwgt, int nigaus, int njgaus, int nkgaus ) {
    17151715        /*Gauss quadrature points for the hexahedron.*/
    … …  
    17191719        GaussLegendreLinear(pegaus, pewgt, njgaus);
    17201720        GaussLegendreLinear(pzgaus, pzwgt, nkgaus);
    1721 }/*}}}1*/
     1721}/*}}}*/

  • issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh

    r12155 r12365  
    88#Get all lines of Verbosity.cpp
    99cat Verbosity.h |  grep "bool Verbose" | awk '{print $2}' | sed -e "s/(/ /" | awk '{print $1}' | awk '{ printf "%s %s\n", NR, $0 }' >temp
    10 #Build header of Verbosity.cpp {{{1
     10#Build header of Verbosity.cpp {{{
    1111cat <<END > Verbosity.cpp
    1212/*
    … …  
    127127done
    128128
    129 #Add footer of Verbosity.cpp{{{1
     129#Add footer of Verbosity.cpp{{{
    130130cat <<END >> Verbosity.cpp
    131131
    … …  
    147147END
    148148#}}}
    149 #Complete verbose.m {{{1
     149#Complete verbose.m {{{
    150150VERBOSEPATH="$ISSM_DIR/src/m/classes/verbose.m"
    151151cat $VERBOSEPATH  | sed "/%BEGINFIELDS/,$ d"  > temp_begin

  • issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

    r11810 r12365  
    33 */
    44
    5 /*headers {{{1*/
     5/*headers {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/solutions/objectivefunction.cpp

    r11808 r12365  
    33 */
    44
    5 /*include files: {{{1*/
     5/*include files: {{{*/
    66#ifdef HAVE_CONFIG_H
    77        #include <config.h>

  • issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp

    r12011 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    1919
    2020/*SeqMat constructors and destructor*/
    21 /*FUNCTION SeqMat::SeqMat(){{{1*/
     21/*FUNCTION SeqMat::SeqMat(){{{*/
    2222SeqMat::SeqMat(){
    2323
    … …  
    2727}
    2828/*}}}*/
    29 /*FUNCTION SeqMat::SeqMat(int M,int N){{{1*/
     29/*FUNCTION SeqMat::SeqMat(int M,int N){{{*/
    3030SeqMat::SeqMat(int pM,int pN){
    3131
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{1*/
     38/*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{*/
    3939SeqMat::SeqMat(int pM,int pN, double sparsity){
    4040
    … …  
    4545}
    4646/*}}}*/
    47 /*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{1*/
     47/*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{*/
    4848SeqMat::SeqMat(double* serial_mat,int pM,int pN,double sparsity){
    4949
    … …  
    6060}
    6161/*}}}*/
    62 /*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{1*/
     62/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{*/
    6363SeqMat::SeqMat(int pM,int pN, int connectivity,int numberofdofspernode){
    6464
    … …  
    6969}
    7070/*}}}*/
    71 /*FUNCTION SeqMat::~SeqMat(){{{1*/
     71/*FUNCTION SeqMat::~SeqMat(){{{*/
    7272SeqMat::~SeqMat(){
    7373
    … …  
    7979
    8080/*SeqMat specific routines: */
    81 /*FUNCTION SeqMat::Echo{{{1*/
     81/*FUNCTION SeqMat::Echo{{{*/
    8282void SeqMat::Echo(void){
    8383
    … …  
    9292}
    9393/*}}}*/
    94 /*FUNCTION SeqMat::Assemble{{{1*/
     94/*FUNCTION SeqMat::Assemble{{{*/
    9595void SeqMat::Assemble(void){
    9696               
    … …  
    9999}
    100100/*}}}*/
    101 /*FUNCTION SeqMat::Norm{{{1*/
     101/*FUNCTION SeqMat::Norm{{{*/
    102102double SeqMat::Norm(NormMode mode){
    103103
    … …  
    124124}
    125125/*}}}*/
    126 /*FUNCTION SeqMat::GetSize{{{1*/
     126/*FUNCTION SeqMat::GetSize{{{*/
    127127void SeqMat::GetSize(int* pM,int* pN){
    128128
    … …  
    132132}
    133133/*}}}*/
    134 /*FUNCTION SeqMat::GetLocalSize{{{1*/
     134/*FUNCTION SeqMat::GetLocalSize{{{*/
    135135void SeqMat::GetLocalSize(int* pM,int* pN){
    136136       
    … …  
    140140}
    141141/*}}}*/
    142 /*FUNCTION SeqMat::MatMult{{{1*/
     142/*FUNCTION SeqMat::MatMult{{{*/
    143143void SeqMat::MatMult(SeqVec* X,SeqVec* AX){
    144144
    … …  
    163163}
    164164/*}}}*/
    165 /*FUNCTION SeqMat::Duplicate{{{1*/
     165/*FUNCTION SeqMat::Duplicate{{{*/
    166166SeqMat* SeqMat::Duplicate(void){
    167167
    … …  
    172172}
    173173/*}}}*/
    174 /*FUNCTION SeqMat::ToSerial{{{1*/
     174/*FUNCTION SeqMat::ToSerial{{{*/
    175175double* SeqMat::ToSerial(void){
    176176
    … …  
    185185}
    186186/*}}}*/
    187 /*FUNCTION SeqMat::SetValues{{{1*/
     187/*FUNCTION SeqMat::SetValues{{{*/
    188188void SeqMat::SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode){
    189189       
    … …  
    203203}
    204204/*}}}*/
    205 /*FUNCTION SeqMat::Convert{{{1*/
     205/*FUNCTION SeqMat::Convert{{{*/
    206206void SeqMat::Convert(MatrixType type){
    207207

  • issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h

    r12018 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#ifdef HAVE_CONFIG_H
    1111        #include <config.h>
    … …  
    2626                double* matrix;
    2727
    28                 /*SeqMat constructors, destructors {{{1*/
     28                /*SeqMat constructors, destructors {{{*/
    2929                SeqMat();
    3030                SeqMat(int M,int N);
    … …  
    3434                ~SeqMat();
    3535                /*}}}*/
    36                 /*SeqMat specific routines {{{1*/
     36                /*SeqMat specific routines {{{*/
    3737                void Echo(void);
    3838                void Assemble(void);

  • issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp

    r12011 r12365  
    44
    55/*Headers:*/
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    1919
    2020/*SeqVec constructors and destructor*/
    21 /*FUNCTION SeqVec::SeqVec(){{{1*/
     21/*FUNCTION SeqVec::SeqVec(){{{*/
    2222SeqVec::SeqVec(){
    2323
    … …  
    2626}
    2727/*}}}*/
    28 /*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{1*/
     28/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{*/
    2929SeqVec::SeqVec(int pM,bool fromlocalsize){
    3030
    … …  
    3434}
    3535/*}}}*/
    36 /*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{1*/
     36/*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{*/
    3737SeqVec::SeqVec(double* buffer,int pM){
    3838
    … …  
    4747}
    4848/*}}}*/
    49                 /*FUNCTION SeqVec::~SeqVec(){{{1*/
     49                /*FUNCTION SeqVec::~SeqVec(){{{*/
    5050SeqVec::~SeqVec(){
    5151        xfree((void**)&this->vector);
    … …  
    5555
    5656/*SeqVec specific routines: */
    57 /*FUNCTION SeqVec::Echo{{{1*/
     57/*FUNCTION SeqVec::Echo{{{*/
    5858void SeqVec::Echo(void){
    5959
    … …  
    6666/*}}}*/
    6767
    68 /*FUNCTION SeqVec::Assemble{{{1*/
     68/*FUNCTION SeqVec::Assemble{{{*/
    6969void SeqVec::Assemble(void){
    7070               
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION SeqVec::SetValues{{{1*/
     75/*FUNCTION SeqVec::SetValues{{{*/
    7676void SeqVec::SetValues(int ssize, int* list, double* values, InsMode mode){
    7777       
    … …  
    9191}
    9292/*}}}*/
    93 /*FUNCTION SeqVec::SetValue{{{1*/
     93/*FUNCTION SeqVec::SetValue{{{*/
    9494void SeqVec::SetValue(int dof, double value, InsMode mode){
    9595
    … …  
    107107}
    108108/*}}}*/
    109 /*FUNCTION SeqVec::GetValue{{{1*/
     109/*FUNCTION SeqVec::GetValue{{{*/
    110110void SeqVec::GetValue(double* pvalue,int dof){
    111111
    … …  
    115115/*}}}*/
    116116               
    117 /*FUNCTION SeqVec::GetSize{{{1*/
     117/*FUNCTION SeqVec::GetSize{{{*/
    118118void SeqVec::GetSize(int* pM){
    119119
    … …  
    122122}
    123123/*}}}*/
    124 /*FUNCTION SeqVec::GetLocalSize{{{1*/
     124/*FUNCTION SeqVec::GetLocalSize{{{*/
    125125void SeqVec::GetLocalSize(int* pM){
    126126       
    … …  
    129129}
    130130/*}}}*/
    131 /*FUNCTION SeqVec::Duplicate{{{1*/
     131/*FUNCTION SeqVec::Duplicate{{{*/
    132132SeqVec* SeqVec::Duplicate(void){
    133133       
    … …  
    136136}
    137137/*}}}*/
    138 /*FUNCTION SeqVec::Set{{{1*/
     138/*FUNCTION SeqVec::Set{{{*/
    139139void SeqVec::Set(double value){
    140140
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION SeqVec::AXPY{{{1*/
     146/*FUNCTION SeqVec::AXPY{{{*/
    147147void SeqVec::AXPY(SeqVec* X, double a){
    148148
    … …  
    154154}
    155155/*}}}*/
    156 /*FUNCTION SeqVec::AYPX{{{1*/
     156/*FUNCTION SeqVec::AYPX{{{*/
    157157void SeqVec::AYPX(SeqVec* X, double a){
    158158       
    … …  
    164164}
    165165/*}}}*/
    166 /*FUNCTION SeqVec::ToMPISerial{{{1*/
     166/*FUNCTION SeqVec::ToMPISerial{{{*/
    167167double* SeqVec::ToMPISerial(void){
    168168
    … …  
    177177}
    178178/*}}}*/
    179 /*FUNCTION SeqVec::Copy{{{1*/
     179/*FUNCTION SeqVec::Copy{{{*/
    180180void SeqVec::Copy(SeqVec* to){
    181181
    … …  
    187187}
    188188/*}}}*/
    189 /*FUNCTION SeqVec::Norm{{{1*/
     189/*FUNCTION SeqVec::Norm{{{*/
    190190double SeqVec::Norm(NormMode mode){
    191191
    … …  
    209209}
    210210/*}}}*/
    211 /*FUNCTION SeqVec::Scale{{{1*/
     211/*FUNCTION SeqVec::Scale{{{*/
    212212void SeqVec::Scale(double scale_factor){
    213213
    … …  
    217217}
    218218/*}}}*/
    219 /*FUNCTION SeqVec::Dot{{{1*/
     219/*FUNCTION SeqVec::Dot{{{*/
    220220double SeqVec::Dot(SeqVec* input){
    221221
    … …  
    228228}
    229229/*}}}*/
    230 /*FUNCTION SeqVec::PointwiseDivide{{{1*/
     230/*FUNCTION SeqVec::PointwiseDivide{{{*/
    231231void SeqVec::PointwiseDivide(SeqVec* x,SeqVec* y){
    232232

  • issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h

    r12018 r12365  
    77
    88/*Headers:*/
    9 /*{{{1*/
     9/*{{{*/
    1010#ifdef HAVE_CONFIG_H
    1111        #include <config.h>
    … …  
    2525                int M;
    2626
    27                 /*SeqVec constructors, destructors {{{1*/
     27                /*SeqVec constructors, destructors {{{*/
    2828                SeqVec();
    2929                SeqVec(int M,bool fromlocalsize=false);
    … …  
    3131                ~SeqVec();
    3232                /*}}}*/
    33                 /*SeqVec specific routines {{{1*/
     33                /*SeqVec specific routines {{{*/
    3434                void Echo(void);
    3535                void Assemble(void);

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp

    r12106 r12365  
    2020#include "../../mpi/patches/mpipatches.h"
    2121
    22 /*NewMat(int M,int N){{{1*/
     22/*NewMat(int M,int N){{{*/
    2323Mat NewMat(int M,int N){
    2424
    … …  
    4848}
    4949/*}}}*/
    50 /*NewMat(int M,int N,double sparsity){{{1*/
     50/*NewMat(int M,int N,double sparsity){{{*/
    5151Mat NewMat(int M,int N,double sparsity){
    5252
    … …  
    8181}
    8282/*}}}*/
    83 /*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{1*/
     83/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{*/
    8484Mat NewMat(int M,int N,int connectivity,int numberofdofspernode){
    8585

  • issm/trunk-jpl/src/m/classes/bamggeom.m

    r8587 r12365  
    66classdef bamggeom
    77        properties (SetAccess=public)
    8                 % {{{1
     8                % {{{
    99                Vertices=[];
    1010                Edges=[];
    … …  
    1818        end
    1919        methods
    20                 function bg = bamggeom(varargin)% {{{1
     20                function bg = bamggeom(varargin)% {{{
    2121                %BAMGGEOM - constructor for bamggeom object
    2222                %
    … …  
    4444                        end
    4545                end%}}}
    46                 function display(bg)% {{{1
     46                function display(bg)% {{{
    4747                        disp(sprintf('\n%s = \n',inputname(1)));
    4848                        disp(struct(bg))

  • issm/trunk-jpl/src/m/classes/bamgmesh.m

    r8587 r12365  
    66classdef bamgmesh
    77        properties (SetAccess=public)
    8                 % {{{1
     8                % {{{
    99                Vertices=[];
    1010                Edges=[];
    … …  
    2626        end
    2727        methods
    28                 function bg = bamgmesh(varargin)% {{{1
     28                function bg = bamgmesh(varargin)% {{{
    2929
    3030                switch nargin
    … …  
    4848                        end
    4949                end%}}}
    50                 function display(bm)% {{{1
     50                function display(bm)% {{{
    5151                        disp(sprintf('\n%s = \n',inputname(1)));
    5252                        disp(struct(bm))

  • issm/trunk-jpl/src/m/classes/model/model.m

    r12351 r12365  
    66classdef model
    77    properties (SetAccess=public) %Model fields
    8                  % {{{1
     8                 % {{{
    99                 %Careful here: no other class should be used as default value this is a bug of matlab
    1010                 mesh             = 0;
    … …  
    7575         end
    7676         methods
    77                  function md = model(varargin) % {{{1
     77                 function md = model(varargin) % {{{
    7878
    7979                         switch nargin
    … …  
    357357
    358358                 end% }}}
    359                  function md = setdefaultparameters(md) % {{{1
     359                 function md = setdefaultparameters(md) % {{{
    360360
    361361                         %initialize subclasses

  • issm/trunk-jpl/src/m/classes/model/planet.m

    r9548 r12365  
    66classdef planet < model
    77    properties (SetAccess=public) %Planet fields
    8                  % {{{1
     8                 % {{{
    99                 %Planet specific fields
    1010                 r=NaN;
    … …  
    1414         end
    1515         methods
    16                 function md=planetmesh(md,varargin) % {{{1
     16                function md=planetmesh(md,varargin) % {{{
    1717                %PLANETMESH: build 2d shell mesh
    1818                %

  • issm/trunk-jpl/src/m/classes/organizer.m

    r9423 r12365  
    1616classdef organizer
    1717    properties (SetAccess=private)
    18                  % {{{1
     18                 % {{{
    1919                 currentstep   =0;
    2020         end
    … …  
    2828         end
    2929         methods
    30                  function org=organizer(varargin) % {{{1
     30                 function org=organizer(varargin) % {{{
    3131
    3232                         %process options
    … …  
    5757                 end
    5858                 %}}}
    59                  function disp(org) % {{{1
     59                 function disp(org) % {{{
    6060                         disp(sprintf('   Repository: ''%s''',org.repository));
    6161                         disp(sprintf('   Prefix:     ''%s''',org.prefix));
    … …  
    6969                 end
    7070                 %}}}
    71                  function md=loadmodel(org,string),% {{{1
     71                 function md=loadmodel(org,string),% {{{
    7272
    7373                         %Get model path
    … …  
    9595                         end
    9696                 end%}}}
    97                  function bool=perform(org,string) % {{{1
     97                 function bool=perform(org,string) % {{{
    9898                         
    9999                         bool=false;
    … …  
    129129
    130130                 end%}}}
    131                  function savemodel(org,md) % {{{1
     131                 function savemodel(org,md) % {{{
    132132
    133133                         %check

  • issm/trunk-jpl/src/m/classes/plotoptions.m

    r11892 r12365  
    66classdef plotoptions
    77    properties (SetAccess=public)
    8                  % {{{1
     8                 % {{{
    99                 numberofplots = 0;
    1010                 figurenumber  = 1;
    … …  
    1313         end
    1414         methods
    15                  function opt=plotoptions(varargin) % {{{1
     15                 function opt=plotoptions(varargin) % {{{
    1616                         opt=buildlist(opt,varargin{:});
    1717                 end
    1818                 %}}}
    19                  function disp(opt) % {{{1
     19                 function disp(opt) % {{{
    2020                         disp(sprintf('\n%s = \n',inputname(1)));
    2121                         disp(sprintf('   numberofplots: %i',opt.numberofplots));
    … …  
    4141                 end
    4242                 %}}}
    43                  function opt=buildlist(opt,varargin) % {{{1
     43                 function opt=buildlist(opt,varargin) % {{{
    4444
    4545                         %check length of input

  • issm/trunk-jpl/src/m/classes/solver.m

    r12048 r12365  
    1818                                 end
    1919                         end % }}}
    20                  function obj = addoptions(obj,analysis,varargin) % {{{1
     20                 function obj = addoptions(obj,analysis,varargin) % {{{
    2121                 % Usage example:
    2222                 %    md.solver=addoptions(md.solver,DiagnosticHorizAnalysisEnum,stokesoptions());

  • issm/trunk-jpl/src/m/classes/verbose.m

    r11867 r12365  
    2121classdef verbose
    2222        properties (SetAccess=public)
    23                 % {{{1
     23                % {{{
    2424                %BEGINFIELDS
    2525                mprocessor  = false;
    … …  
    3535        %}}}
    3636        methods
    37                 function verbose=verbose(varargin) % {{{1
     37                function verbose=verbose(varargin) % {{{
    3838
    3939                        switch(nargin),
    … …  
    7070                end
    7171                %}}}
    72                 function binary=VerboseToBinary(verbose) % {{{1
     72                function binary=VerboseToBinary(verbose) % {{{
    7373
    7474                %BEGINVERB2BIN
    … …  
    8585                end
    8686                %}}}
    87                 function verbose=BinaryToVerbose(verbose,binary) % {{{1
     87                function verbose=BinaryToVerbose(verbose,binary) % {{{
    8888
    8989                %BEGINBIN2VERB
    … …  
    102102
    103103                end % }}}
    104                 function disp(verbose) % {{{1
     104                function disp(verbose) % {{{
    105105                       
    106106                %BEGINDISP

  • issm/trunk-jpl/src/m/model/WriteData.m

    r10969 r12365  
    233233        enum=eval([string 'Enum();']);
    234234end % }}}
    235 function code=FormatToCode(format) % {{{1
     235function code=FormatToCode(format) % {{{
    236236%This routine takes the format string, and hardcodes it into an integer, which
    237237%is passed along the record, in order to identify the nature of the dataset being

  • issm/trunk-jpl/src/m/model/mesh/bamg.m

    r11652 r12365  
    5858bamg_mesh=bamgmesh;
    5959
    60 % Bamg Geometry parameters {{{1
     60% Bamg Geometry parameters {{{
    6161if exist(options,'domain'),
    6262
    … …  
    259259end
    260260%}}}
    261 % Bamg Mesh parameters {{{1
     261% Bamg Mesh parameters {{{
    262262if (~exist(options,'domain') & md.mesh.numberofvertices~=0 & md.mesh.dimension==2),
    263263
    … …  
    274274end
    275275%}}}
    276 % Bamg Options {{{1
     276% Bamg Options {{{
    277277bamg_options.Crack=getfieldvalue(options,'Crack',0);
    278278bamg_options.anisomax=getfieldvalue(options,'anisomax',10^30);

  • issm/trunk-jpl/src/m/model/setmask.m

    r11234 r12365  
    2525elements=md.mesh.elements;
    2626
    27 %Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1
     27%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{
    2828elementonfloatingice=FlagElements(md,floatingicename);
    2929elementongroundedice=FlagElements(md,groundedicename);

  • issm/trunk-jpl/src/m/model/setmask.py

    r12112 r12365  
    2222        elements = md.mesh.elements
    2323
    24         #Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1
     24        #Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{
    2525        elementonfloatingice = fe.FlagElements(md, floatingicename)
    2626        elementongroundedice = fe.FlagElements(md, groundedicename)

  • issm/trunk-jpl/src/m/qmu/preqmu.m

    r9668 r12365  
    4444responses=expandresponses(md,responses);
    4545
    46 %go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{1
     46%go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{
    4747numvariables=0;
    4848variable_fieldnames=fieldnames(variables);
    … …  
    7676system(['rm -rf ' md.miscellaneous.name '.m']);
    7777
    78 %build a list of variables and responses descriptors. the list is not expanded. {{{1
     78%build a list of variables and responses descriptors. the list is not expanded. {{{
    7979variabledescriptors={};
    8080variable_fieldnames=fieldnames(md.qmu.variables(options.ivar));
Note: See TracChangeset for help on using the changeset viewer.