Changeset 17962


Ignore:
Timestamp:
05/08/14 10:52:36 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed FUNCTION

Location:
issm/trunk-jpl/src/c/classes/Elements
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Element.cpp

    r17941 r17962  
    3333
    3434/*Other*/
    35 void Element::AddInput(Input* input_in){/*{{{*/
     35void       Element::AddInput(Input* input_in){/*{{{*/
    3636
    3737        /*Call inputs method*/
    … …  
    3939        this->inputs->AddInput(input_in);
    4040}/*}}}*/
    41 /* bool Element::AllActive(void){/\*{{{*\/ */
    42 
    43 /*      int numnodes = this->GetNumberOfNodes(); */
    44 /*      for(int i=0;i<numnodes;i++){ */
    45 /*              if(!this->nodes[i]->IsActive()) return false; */
    46 /*      } */
    47 /*      return true; */
    48 /* }/\*}}}*\/ */
    49 /* bool Element::AnyActive(void){/\*{{{*\/ */
    50 
    51 /*      int numnodes = this->GetNumberOfNodes(); */
    52 /*      for(int i=0;i<numnodes;i++){ */
    53 /*              if(this->nodes[i]->IsActive()) return true; */
    54 /*      } */
    55 /*      return false; */
    56 /* }/\*}}}*\/ */
    57 void Element::CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
     41void       Element::CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
    5842
    5943        int         i,counter;
    … …  
    129113}
    130114/*}}}*/
    131 void Element::DeleteMaterials(void){/*{{{*/
     115void       Element::DeleteMaterials(void){/*{{{*/
    132116        delete this->material;
    133117}/*}}}*/
    134 void Element::DeepEcho(void){/*{{{*/
     118void       Element::DeepEcho(void){/*{{{*/
    135119
    136120        _printf_(EnumToStringx(this->ObjectEnum())<<" element:\n");
    … …  
    166150}
    167151/*}}}*/
    168 void Element::Echo(void){/*{{{*/
     152void       Element::Echo(void){/*{{{*/
    169153        _printf_(EnumToStringx(this->ObjectEnum())<<" element:\n");
    170154        _printf_("   id : "<<this->id <<"\n");
    … …  
    229213        return divergence;
    230214}/*}}}*/
    231 void Element::ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure){/*{{{*/
     215void       Element::ThermalToEnthalpy(IssmDouble* penthalpy,IssmDouble temperature,IssmDouble waterfraction,IssmDouble pressure){/*{{{*/
    232216        matpar->ThermalToEnthalpy(penthalpy,temperature,waterfraction,pressure);
    233217}/*}}}*/
    234 void Element::EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure){/*{{{*/
     218void       Element::EnthalpyToThermal(IssmDouble* ptemperature,IssmDouble* pwaterfraction,IssmDouble enthalpy,IssmDouble pressure){/*{{{*/
    235219        matpar->EnthalpyToThermal(ptemperature,pwaterfraction,enthalpy,pressure);
    236220}/*}}}*/
    … …  
    241225        return matpar->GetEnthalpyDiffusionParameterVolume(numvertices,enthalpy,pressure);
    242226}/*}}}*/
    243 void Element::FindParam(bool* pvalue,int paramenum){/*{{{*/
     227void       Element::FindParam(bool* pvalue,int paramenum){/*{{{*/
    244228        this->parameters->FindParam(pvalue,paramenum);
    245229}/*}}}*/
    246 void Element::FindParam(int* pvalue,int paramenum){/*{{{*/
     230void       Element::FindParam(int* pvalue,int paramenum){/*{{{*/
    247231        this->parameters->FindParam(pvalue,paramenum);
    248232}/*}}}*/
    249 void Element::FindParam(IssmDouble* pvalue,int paramenum){/*{{{*/
     233void       Element::FindParam(IssmDouble* pvalue,int paramenum){/*{{{*/
    250234        this->parameters->FindParam(pvalue,paramenum);
    251235}/*}}}*/
    252 void Element::FindParam(int** pvalues,int* psize,int paramenum){/*{{{*/
     236void       Element::FindParam(int** pvalues,int* psize,int paramenum){/*{{{*/
    253237        this->parameters->FindParam(pvalues,psize,paramenum);
    254238}/*}}}*/
    255 void Element::GetDofList(int** pdoflist,int approximation_enum,int setenum){/*{{{*/
     239void       Element::GetDofList(int** pdoflist,int approximation_enum,int setenum){/*{{{*/
    256240
    257241        /*Fetch number of nodes and dof for this finite element*/
    … …  
    276260}
    277261/*}}}*/
    278 void Element::GetDofListVelocity(int** pdoflist,int setenum){/*{{{*/
     262void       Element::GetDofListVelocity(int** pdoflist,int setenum){/*{{{*/
    279263
    280264        /*Fetch number of nodes and dof for this finite element*/
    … …  
    299283}
    300284/*}}}*/
    301 void Element::GetDofListPressure(int** pdoflist,int setenum){/*{{{*/
     285void       Element::GetDofListPressure(int** pdoflist,int setenum){/*{{{*/
    302286
    303287        /*Fetch number of nodes and dof for this finite element*/
    … …  
    337321        }
    338322}/*}}}*/
    339 void Element::GetPhi(IssmDouble* phi, IssmDouble*  epsilon, IssmDouble viscosity){/*{{{*/
     323void       Element::GetPhi(IssmDouble* phi, IssmDouble*  epsilon, IssmDouble viscosity){/*{{{*/
    340324        /*Compute deformational heating from epsilon and viscosity */
    341325
    … …  
    374358}
    375359/*}}}*/
    376 Input* Element::GetInput(int inputenum){/*{{{*/
     360Input*     Element::GetInput(int inputenum){/*{{{*/
    377361        return inputs->GetInput(inputenum);
    378362}/*}}}*/
    379 void Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){/*{{{*/
     363void       Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype){/*{{{*/
    380364
    381365        /*Recover input*/
    … …  
    400384}
    401385/*}}}*/
    402 void Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/
     386void       Element::GetInputListOnVertices(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/
    403387
    404388        /*Recover input*/
    … …  
    425409}
    426410/*}}}*/
    427 void Element::GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/
     411void       Element::GetInputListOnNodes(IssmDouble* pvalue,int enumtype,IssmDouble defaultvalue){/*{{{*/
    428412
    429413        _assert_(pvalue);
    … …  
    446430}
    447431/*}}}*/
    448 void Element::GetInputListOnNodes(IssmDouble* pvalue,int enumtype){/*{{{*/
     432void       Element::GetInputListOnNodes(IssmDouble* pvalue,int enumtype){/*{{{*/
    449433
    450434        _assert_(pvalue);
    … …  
    463447}
    464448/*}}}*/
    465 void Element::GetInputListOnNodesVelocity(IssmDouble* pvalue,int enumtype){/*{{{*/
     449void       Element::GetInputListOnNodesVelocity(IssmDouble* pvalue,int enumtype){/*{{{*/
    466450
    467451        _assert_(pvalue);
    … …  
    480464}
    481465/*}}}*/
    482 void Element::GetInputValue(bool* pvalue,int inputenum){/*{{{*/
     466void       Element::GetInputValue(bool* pvalue,int inputenum){/*{{{*/
    483467
    484468        Input* input=inputs->GetInput(inputenum);
    … …  
    487471
    488472}/*}}}*/
    489 void Element::GetInputValue(int* pvalue,int inputenum){/*{{{*/
     473void       Element::GetInputValue(int* pvalue,int inputenum){/*{{{*/
    490474
    491475        Input* input=inputs->GetInput(inputenum);
    … …  
    494478
    495479}/*}}}*/
    496 void Element::GetInputValue(IssmDouble* pvalue,int inputenum){/*{{{*/
     480void       Element::GetInputValue(IssmDouble* pvalue,int inputenum){/*{{{*/
    497481
    498482        Input* input=inputs->GetInput(inputenum);
    … …  
    501485
    502486}/*}}}*/
    503 void Element::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){/*{{{*/
     487void       Element::GetInputValue(IssmDouble* pvalue,Gauss* gauss,int inputenum){/*{{{*/
    504488
    505489        Input* input=inputs->GetInput(inputenum);
    … …  
    508492
    509493}/*}}}*/
    510 void Element::GetNodesSidList(int* sidlist){/*{{{*/
     494void       Element::GetNodesSidList(int* sidlist){/*{{{*/
    511495
    512496        _assert_(sidlist);
    … …  
    518502}
    519503/*}}}*/
    520 void Element::GetNodesLidList(int* lidlist){/*{{{*/
     504void       Element::GetNodesLidList(int* lidlist){/*{{{*/
    521505
    522506        _assert_(lidlist);
    … …  
    528512}
    529513/*}}}*/
    530 void  Element::GetVectorFromInputs(Vector<IssmDouble>* vector,int input_enum){/*{{{*/
     514void       Element::GetVectorFromInputs(Vector<IssmDouble>* vector,int input_enum){/*{{{*/
    531515
    532516        /*Fetch number vertices for this element and allocate arrays*/
    … …  
    546530}
    547531/*}}}*/
    548 void  Element::GetVertexPidList(int* pidlist){/*{{{*/
     532void       Element::GetVertexPidList(int* pidlist){/*{{{*/
    549533
    550534        int numvertices = this->GetNumberOfVertices();
    … …  
    553537}
    554538/*}}}*/
    555 void Element::GetVerticesCoordinates(IssmDouble** pxyz_list){/*{{{*/
     539void       Element::GetVerticesCoordinates(IssmDouble** pxyz_list){/*{{{*/
    556540
    557541        int         numvertices = this->GetNumberOfVertices();
    … …  
    562546
    563547}/*}}}*/
    564 void Element::GetVerticesSidList(int* sidlist){/*{{{*/
     548void       Element::GetVerticesSidList(int* sidlist){/*{{{*/
    565549
    566550        int numvertices = this->GetNumberOfVertices();
    … …  
    568552}
    569553/*}}}*/
    570 void Element::GetVerticesConnectivityList(int* connectivity){/*{{{*/
     554void       Element::GetVerticesConnectivityList(int* connectivity){/*{{{*/
    571555
    572556        int numvertices = this->GetNumberOfVertices();
    … …  
    616600        return z;
    617601}/*}}}*/
    618 bool Element::HasNodeOnBase(){/*{{{*/
     602bool       Element::HasNodeOnBase(){/*{{{*/
    619603        return (this->inputs->Max(MeshVertexonbaseEnum)>0.);
    620604}/*}}}*/
    621 bool Element::HasNodeOnSurface(){/*{{{*/
     605bool       Element::HasNodeOnSurface(){/*{{{*/
    622606        return (this->inputs->Max(MeshVertexonsurfaceEnum)>0.);
    623607}/*}}}*/
    624 int  Element::Id(){/*{{{*/
     608int        Element::Id(){/*{{{*/
    625609
    626610        return this->id;
    … …  
    628612}
    629613/*}}}*/
    630 void Element::InputChangeName(int original_enum,int new_enum){/*{{{*/
     614void       Element::InputChangeName(int original_enum,int new_enum){/*{{{*/
    631615        this->inputs->ChangeEnum(original_enum,new_enum);
    632616}
    633617/*}}}*/
    634 void Element::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){/*{{{*/
     618void       Element::InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){/*{{{*/
    635619
    636620        /*Intermediaries*/
    … …  
    700684        }
    701685}/*}}}*/
    702 void  Element::InputDuplicate(int original_enum,int new_enum){/*{{{*/
     686void       Element::InputDuplicate(int original_enum,int new_enum){/*{{{*/
    703687
    704688        /*Call inputs method*/
    … …  
    707691}
    708692/*}}}*/
    709 void Element::InputUpdateFromConstant(int constant, int name){/*{{{*/
     693void       Element::InputUpdateFromConstant(int constant, int name){/*{{{*/
    710694
    711695        /*Check that name is an element input*/
    … …  
    716700}
    717701/*}}}*/
    718 void Element::InputUpdateFromConstant(IssmDouble constant, int name){/*{{{*/
     702void       Element::InputUpdateFromConstant(IssmDouble constant, int name){/*{{{*/
    719703
    720704        /*Check that name is an element input*/
    … …  
    725709}
    726710/*}}}*/
    727 void Element::InputUpdateFromConstant(bool constant, int name){/*{{{*/
     711void       Element::InputUpdateFromConstant(bool constant, int name){/*{{{*/
    728712
    729713        /*Check that name is an element input*/
    … …  
    734718}
    735719/*}}}*/
    736 bool Element::IsFloating(){/*{{{*/
     720bool       Element::IsFloating(){/*{{{*/
    737721
    738722        bool shelf;
    … …  
    752736        return shelf;
    753737}/*}}}*/
    754 bool Element::IsIceInElement(){/*{{{*/
     738bool       Element::IsIceInElement(){/*{{{*/
    755739        return (this->inputs->Min(MaskIceLevelsetEnum)<0.);
    756740}
    757741/*}}}*/
    758 bool Element::IsInput(int name){/*{{{*/
     742bool       Element::IsInput(int name){/*{{{*/
    759743        if (
    760744                                name==ThicknessEnum ||
    … …  
    847831        return this->matpar->PureIceEnthalpy(pressure);
    848832}/*}}}*/
    849 void Element::ResultInterpolation(int* pinterpolation,int* pnodesperelement,int output_enum){/*{{{*/
     833void       Element::ResultInterpolation(int* pinterpolation,int* pnodesperelement,int output_enum){/*{{{*/
    850834
    851835        Input* input=this->inputs->GetInput(output_enum);
    … …  
    898882        *pnodesperelement = input->GetResultNumberOfNodes();
    899883}/*}}}*/
    900 void Element::ResultToVector(Vector<IssmDouble>* vector,int output_enum){/*{{{*/
     884void       Element::ResultToVector(Vector<IssmDouble>* vector,int output_enum){/*{{{*/
    901885
    902886        Input* input=this->inputs->GetInput(output_enum);
    … …  
    944928        }
    945929} /*}}}*/
    946 void Element::ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum){/*{{{*/
     930void       Element::ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum){/*{{{*/
    947931
    948932        Input* input=this->inputs->GetInput(output_enum);
    … …  
    952936
    953937} /*}}}*/
    954 void Element::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){/*{{{*/
     938void       Element::SetwiseNodeConnectivity(int* pd_nz,int* po_nz,Node* node,bool* flags,int* flagsindices,int set1_enum,int set2_enum){/*{{{*/
    955939
    956940        /*Intermediaries*/
    … …  
    10221006}
    10231007/*}}}*/
    1024 int  Element::Sid(){/*{{{*/
     1008int        Element::Sid(){/*{{{*/
    10251009
    10261010        return this->sid;
    … …  
    10321016        return this->matpar->TMeltingPoint(pressure);
    10331017}/*}}}*/
    1034 void Element::ViscousHeatingCreateInput(void){/*{{{*/
     1018void       Element::ViscousHeatingCreateInput(void){/*{{{*/
    10351019
    10361020        /*Intermediaries*/
    … …  
    10741058}
    10751059/*}}}*/
    1076 void Element::ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
     1060void       Element::ViscosityFS(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
    10771061        /*The effective strain rate is defined in Paterson 3d Ed p 91 eq 9,
    10781062         * and Cuffey p 303 eq 8.18:
    … …  
    11131097}
    11141098/*}}}*/
    1115 void Element::ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surface_input){/*{{{*/
     1099void       Element::ViscosityL1L2(IssmDouble* pviscosity,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* surface_input){/*{{{*/
    11161100        /*Compute the L1L2 viscosity
    11171101         *
    … …  
    11721156        *pviscosity = viscosity;
    11731157}/*}}}*/
    1174 void Element::ViscosityHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
     1158void       Element::ViscosityHO(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
    11751159
    11761160        /*Intermediaries*/
    … …  
    11971181        *pviscosity=viscosity;
    11981182}/*}}}*/
    1199 void Element::ViscositySSA(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
     1183void       Element::ViscositySSA(IssmDouble* pviscosity,int dim,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
    12001184
    12011185        /*Intermediaries*/
    … …  
    12221206        *pviscosity=viscosity;
    12231207}/*}}}*/
    1224 void Element::ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
     1208void       Element::ViscositySSADerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
    12251209        this->material->GetViscosity2dDerivativeEpsSquare(pmu_prime,epsilon);
    12261210}/*}}}*/
    1227 void Element::ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
     1211void       Element::ViscosityHODerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
    12281212        this->material->GetViscosityDerivativeEpsSquare(pmu_prime,epsilon);
    12291213}/*}}}*/
    1230 void Element::ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
     1214void       Element::ViscosityFSDerivativeEpsSquare(IssmDouble* pmu_prime,IssmDouble* epsilon){/*{{{*/
    12311215        this->material->GetViscosityDerivativeEpsSquare(pmu_prime,epsilon);
    12321216}/*}}}*/
    1233 void Element::StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
     1217void       Element::StrainRateFS(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
    12341218        /*Compute the 3d Strain Rate (6 components):
    12351219         *
    … …  
    12591243
    12601244}/*}}}*/
    1261 void Element::StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
     1245void       Element::StrainRateHO(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
    12621246        /*Compute the 3d Blatter/HOStrain Rate (5 components):
    12631247         *
    … …  
    12891273
    12901274}/*}}}*/
    1291 void Element::StrainRateHO2dvertical(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
     1275void       Element::StrainRateHO2dvertical(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
    12921276        /*Compute the 2d Blatter/HOStrain Rate (2 components):
    12931277         *
    … …  
    13131297
    13141298}/*}}}*/
    1315 void Element::StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
     1299void       Element::StrainRateSSA(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input){/*{{{*/
    13161300
    13171301        /*Intermediaries*/
    … …  
    13321316
    13331317}/*}}}*/
    1334 void Element::StrainRateSSA1d(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input){/*{{{*/
     1318void       Element::StrainRateSSA1d(IssmDouble* epsilon,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input){/*{{{*/
    13351319
    13361320        /*Intermediaries*/
    … …  
    13471331
    13481332}/*}}}*/
    1349 void Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/
     1333void       Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/
    13501334
    13511335        /*All nodes have the same Coordinate System*/
    … …  
    13601344        xDelete<int>(cs_array);
    13611345}/*}}}*/
    1362 void Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
     1346void       Element::TransformInvStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
    13631347
    13641348        int         i,j;
    … …  
    13941378        xDelete<IssmDouble>(values);
    13951379}/*}}}*/
    1396 void Element::TransformLoadVectorCoord(ElementVector* pe,int transformenum){/*{{{*/
     1380void       Element::TransformLoadVectorCoord(ElementVector* pe,int transformenum){/*{{{*/
    13971381
    13981382        /*All nodes have the same Coordinate System*/
    … …  
    14071391        xDelete<int>(cs_array);
    14081392}/*}}}*/
    1409 void Element::TransformLoadVectorCoord(ElementVector* pe,int* cs_array){/*{{{*/
     1393void       Element::TransformLoadVectorCoord(ElementVector* pe,int* cs_array){/*{{{*/
    14101394
    14111395        this->TransformLoadVectorCoord(pe,this->nodes,this->GetNumberOfNodes(),cs_array);
    14121396
    14131397}/*}}}*/
    1414 void Element::TransformLoadVectorCoord(ElementVector* pe,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
     1398void       Element::TransformLoadVectorCoord(ElementVector* pe,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
    14151399
    14161400        int         i;
    … …  
    14451429        xDelete<IssmDouble>(values);
    14461430}/*}}}*/
    1447 void Element::TransformSolutionCoord(IssmDouble* values,int transformenum){/*{{{*/
     1431void       Element::TransformSolutionCoord(IssmDouble* values,int transformenum){/*{{{*/
    14481432
    14491433        /*All nodes have the same Coordinate System*/
    … …  
    14581442        xDelete<int>(cs_array);
    14591443}/*}}}*/
    1460 void Element::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){/*{{{*/
     1444void       Element::TransformSolutionCoord(IssmDouble* values,int* transformenum_list){/*{{{*/
    14611445        this->TransformSolutionCoord(values,this->nodes,this->GetNumberOfNodes(),transformenum_list);
    14621446}/*}}}*/
    1463 void Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){/*{{{*/
     1447void       Element::TransformSolutionCoord(IssmDouble* values,int numnodes,int transformenum){/*{{{*/
    14641448
    14651449        /*All nodes have the same Coordinate System*/
    … …  
    14731457        xDelete<int>(cs_array);
    14741458}/*}}}*/
    1475 void Element::TransformSolutionCoord(IssmDouble* solution,int numnodes,int* cs_array){/*{{{*/
     1459void       Element::TransformSolutionCoord(IssmDouble* solution,int numnodes,int* cs_array){/*{{{*/
    14761460        this->TransformSolutionCoord(solution,this->nodes,numnodes,cs_array);
    14771461}/*}}}*/
    1478 void Element::TransformSolutionCoord(IssmDouble* values,Node** nodes_list,int numnodes,int transformenum){/*{{{*/
     1462void       Element::TransformSolutionCoord(IssmDouble* values,Node** nodes_list,int numnodes,int transformenum){/*{{{*/
    14791463        /*NOT NEEDED*/
    14801464        /*All nodes have the same Coordinate System*/
    … …  
    14881472        xDelete<int>(cs_array);
    14891473}/*}}}*/
    1490 void Element::TransformSolutionCoord(IssmDouble* solution,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
     1474void       Element::TransformSolutionCoord(IssmDouble* solution,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
    14911475
    14921476        int         i;
    … …  
    15211505        xDelete<IssmDouble>(values);
    15221506}/*}}}*/
    1523 void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/
     1507void       Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int transformenum){/*{{{*/
    15241508
    15251509        /*All nodes have the same Coordinate System*/
    … …  
    15341518        xDelete<int>(cs_array);
    15351519}/*}}}*/
    1536 void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){/*{{{*/
     1520void       Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,int* transformenum_list){/*{{{*/
    15371521        this->TransformStiffnessMatrixCoord(Ke,this->nodes,this->GetNumberOfNodes(),transformenum_list);
    15381522}/*}}}*/
    1539 void Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
     1523void       Element::TransformStiffnessMatrixCoord(ElementMatrix* Ke,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
    15401524
    15411525        int         numdofs = 0;

  • issm/trunk-jpl/src/c/classes/Elements/ElementHook.cpp

    r17514 r17962  
    1616
    1717/*Object constructors and destructor*/
    18 /*FUNCTION ElementHook::ElementHook(){{{*/
    19 ElementHook::ElementHook(){
     18ElementHook::ElementHook(){/*{{{*/
    2019        numanalyses=UNDEF;
    2120        this->hnodes     = NULL;
    … …  
    2625}
    2726/*}}}*/
    28 /*FUNCTION ElementHook::~ElementHook(){{{*/
    29 ElementHook::~ElementHook(){
     27ElementHook::~ElementHook(){/*{{{*/
    3028
    3129        int i;
    … …  
    4139}
    4240/*}}}*/
    43 /*FUNCTION ElementHook::ElementHook(int in_numanalyses,int element_id, int numvertices,IoModel* iomodel){{{*/
    44 ElementHook::ElementHook(int in_numanalyses,int element_id,int numvertices,IoModel* iomodel){
     41ElementHook::ElementHook(int in_numanalyses,int element_id,int numvertices,IoModel* iomodel){/*{{{*/
    4542
    4643        /*intermediary: */
    … …  
    7875/*}}}*/
    7976
    80 /*FUNCTION ElementHook::SetHookNodes{{{*/
    81 void ElementHook::SetHookNodes(int* node_ids,int numnodes,int analysis_counter){
     77void ElementHook::SetHookNodes(int* node_ids,int numnodes,int analysis_counter){/*{{{*/
    8278        this->hnodes[analysis_counter]= new Hook(node_ids,numnodes);
    8379}
    8480/*}}}*/
    85 /*FUNCTION ElementHook::InitHookNeighbors{{{*/
    86 void ElementHook::InitHookNeighbors(int* element_ids){
     81void ElementHook::InitHookNeighbors(int* element_ids){/*{{{*/
    8782        this->hneighbors=new Hook(element_ids,2);
    8883}
    8984/*}}}*/
    90 /*FUNCTION ElementHook::SpawnTriaHook{{{*/
    91 void ElementHook::SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3){
     85void ElementHook::SpawnTriaHook(ElementHook* triahook,int index1,int index2,int index3){/*{{{*/
    9286
    9387        /*Create arrow of indices depending on location (0=base 1=surface)*/
    … …  
    117111}
    118112/*}}}*/
    119 /*FUNCTION ElementHook::SpawnSegHook{{{*/
    120 void ElementHook::SpawnSegHook(ElementHook* triahook,int index1,int index2){
     113void ElementHook::SpawnSegHook(ElementHook* triahook,int index1,int index2){/*{{{*/
    121114
    122115        triahook->numanalyses=this->numanalyses;

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

    r16486 r17962  
    2323
    2424/*Object constructors and destructor*/
    25 /*FUNCTION Elements::Elements(){{{*/
    26 Elements::Elements(){
     25Elements::Elements(){/*{{{*/
    2726        enum_type=MeshElementsEnum;
    2827        return;
    2928}
    3029/*}}}*/
    31 /*FUNCTION Elements::~Elements(){{{*/
    32 Elements::~Elements(){
     30Elements::~Elements(){/*{{{*/
    3331        return;
    3432}
    … …  
    3634
    3735/*Object management*/
    38 /*FUNCTION Elements::Configure{{{*/
    39 void Elements::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
     36void Elements::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){/*{{{*/
    4037
    4138        vector<Object*>::iterator object;
    … …  
    5148}
    5249/*}}}*/
    53 /*FUNCTION Elements::SetCurrentConfiguration{{{*/
    54 void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){
     50void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){/*{{{*/
    5551
    5652        vector<Object*>::iterator object;
    … …  
    6662}
    6763/*}}}*/
    68 /*FUNCTION Elements::MaxNumNodes{{{*/
    69 int Elements::MaxNumNodes(void){
     64int  Elements::MaxNumNodes(void){/*{{{*/
    7065
    7166        int max=0;
    … …  
    8883}
    8984/*}}}*/
    90 /*FUNCTION Elements::NumberOfElements{{{*/
    91 int Elements::NumberOfElements(void){
     85int  Elements::NumberOfElements(void){/*{{{*/
    9286
    9387        int local_nelem;
    … …  
    10094}
    10195/*}}}*/
    102 /*FUNCTION Elements::InputDuplicate{{{*/
    103 void Elements::InputDuplicate(int input_enum,int output_enum){
     96void Elements::InputDuplicate(int input_enum,int output_enum){/*{{{*/
    10497
    10598        for(int i=0;i<this->Size();i++){

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

    r17926 r17962  
    2727
    2828/*Object constructors and destructor*/
    29 /*FUNCTION PentaRef::PentaRef(){{{*/
    30 PentaRef::PentaRef(){
     29PentaRef::PentaRef(){/*{{{*/
    3130        this->element_type_list=NULL;
    3231}
    3332/*}}}*/
    34 /*FUNCTION PentaRef::PentaRef(int* types,int nummodels){{{*/
    35 PentaRef::PentaRef(const int nummodels){
     33PentaRef::PentaRef(const int nummodels){/*{{{*/
    3634
    3735        /*Only allocate pointer*/
    … …  
    4038}
    4139/*}}}*/
    42 /*FUNCTION PentaRef::~PentaRef(){{{*/
    43 PentaRef::~PentaRef(){
     40PentaRef::~PentaRef(){/*{{{*/
    4441        xDelete<int>(element_type_list);
    4542}
    … …  
    4744
    4845/*Management*/
    49 /*FUNCTION PentaRef::SetElementType{{{*/
    50 void PentaRef::SetElementType(int type,int type_counter){
     46void PentaRef::SetElementType(int type,int type_counter){/*{{{*/
    5147
    5248        /*initialize element type*/
    … …  
    5652
    5753/*Reference Element numerics*/
    58 /*FUNCTION PentaRef::GetJacobian {{{*/
    59 void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss_in){
     54void PentaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss_in){/*{{{*/
    6055        /*The Jacobian is constant over the element, discard the gaussian points.
    6156         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    113108}
    114109/*}}}*/
    115 /*FUNCTION PentaRef::GetJacobianDeterminant {{{*/
    116 void PentaRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){
     110void PentaRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    117111        /*On a penta, Jacobian varies according to coordinates. We need to get the Jacobian, and take
    118112         * the determinant of it: */
    … …  
    128122}
    129123/*}}}*/
    130 /*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{*/
    131 void PentaRef::GetTriaJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){
     124void PentaRef::GetTriaJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    132125        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    133126         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    148141}
    149142/*}}}*/
    150 /*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/
    151 void PentaRef::GetSegmentJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){
     143void PentaRef::GetSegmentJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    152144        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    153145         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    165157}
    166158/*}}}*/
    167 /*FUNCTION PentaRef::GetJacobianInvert {{{*/
    168 void PentaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss){
     159void PentaRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    169160
    170161        /*Jacobian*/
    … …  
    178169}
    179170/*}}}*/
    180 /*FUNCTION PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){{{*/
    181 void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){
     171void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){/*{{{*/
    182172        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    183173
    … …  
    187177}
    188178/*}}}*/
    189 /*FUNCTION PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){{{*/
    190 void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){
     179void PentaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){/*{{{*/
    191180        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    192181
    … …  
    332321}
    333322/*}}}*/
    334 /*FUNCTION PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){{{*/
    335 void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
     323void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    336324        GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
    337325}
    338326/*}}}*/
    339 /*FUNCTION PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){{{*/
    340 void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){
     327void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){/*{{{*/
    341328
    342329        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    371358}
    372359/*}}}*/
    373 /*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){{{*/
    374 void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){
     360void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){/*{{{*/
    375361        GetNodalFunctionsDerivativesReference(dbasis,gauss,this->element_type);
    376362}
    377363/*}}}*/
    378 /*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){{{*/
    379 void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){
     364void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){/*{{{*/
    380365
    381366        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    799784}
    800785/*}}}*/
    801 /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{*/
    802 void PentaRef::GetNodalFunctionsMINIDerivatives(IssmDouble* dbasismini,IssmDouble* xyz_list, Gauss* gauss){
     786void PentaRef::GetNodalFunctionsMINIDerivatives(IssmDouble* dbasismini,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    803787
    804788        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    829813}
    830814/*}}}*/
    831 /*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{*/
    832 void PentaRef::GetNodalFunctionsMINIDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){
     815void PentaRef::GetNodalFunctionsMINIDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){/*{{{*/
    833816        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    834817         * natural coordinate system) at the gaussian point. */
    … …  
    871854}
    872855/*}}}*/
    873 /*FUNCTION PentaRef::GetNodalFunctionsP1 {{{*/
    874 void PentaRef::GetNodalFunctionsP1(IssmDouble* basis, Gauss* gauss_in){
     856void PentaRef::GetNodalFunctionsP1(IssmDouble* basis, Gauss* gauss_in){/*{{{*/
    875857        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    876858
    … …  
    888870}
    889871/*}}}*/
    890 /*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{*/
    891 void PentaRef::GetNodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
     872void PentaRef::GetNodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    892873
    893874        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    917898}
    918899/*}}}*/
    919 /*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{*/
    920 void PentaRef::GetNodalFunctionsP1DerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){
     900void PentaRef::GetNodalFunctionsP1DerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){/*{{{*/
    921901
    922902        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    955935}
    956936/*}}}*/
    957 /*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{*/
    958 void PentaRef::GetQuadJacobianDeterminant(IssmDouble* Jdet,IssmDouble* xyz_list,Gauss* gauss){
     937void PentaRef::GetQuadJacobianDeterminant(IssmDouble* Jdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    959938        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    960939
    … …  
    981960}
    982961/*}}}*/
    983 /*FUNCTION PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss){{{*/
    984 void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss){
     962void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss){/*{{{*/
    985963
    986964        GetInputValue(pvalue,plist,gauss,this->element_type);
    … …  
    988966}
    989967/*}}}*/
    990 /*FUNCTION PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss,int finiteelement){{{*/
    991 void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss,int finiteelement){
     968void PentaRef::GetInputValue(IssmDouble* pvalue,IssmDouble* plist,Gauss* gauss,int finiteelement){/*{{{*/
    992969
    993970        /*Output*/
    … …  
    1010987}
    1011988/*}}}*/
    1012 /*FUNCTION PentaRef::GetInputDerivativeValue{{{*/
    1013 void PentaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){
     989void PentaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    1014990        /*From node values of parameter p (p_list[0], p_list[1], p_list[2],
    1015991         * p_list[3], p_list[4] and p_list[4]), return parameter derivative value at
    … …  
    10471023}
    10481024/*}}}*/
    1049 /*FUNCTION PentaRef::NumberofNodes(){{{*/
    1050 int PentaRef::NumberofNodes(void){
     1025int  PentaRef::NumberofNodes(void){/*{{{*/
    10511026
    10521027        return this->NumberofNodes(this->element_type);
    10531028}
    10541029/*}}}*/
    1055 /*FUNCTION PentaRef::NumberofNodes(int finiteelement){{{*/
    1056 int PentaRef::NumberofNodes(int finiteelement){
     1030int  PentaRef::NumberofNodes(int finiteelement){/*{{{*/
    10571031
    10581032        switch(finiteelement){
    … …  
    10781052}
    10791053/*}}}*/
    1080 /*FUNCTION PentaRef::VelocityInterpolation{{{*/
    1081 int PentaRef::VelocityInterpolation(void){
     1054int  PentaRef::VelocityInterpolation(void){/*{{{*/
    10821055
    10831056        switch(this->element_type){
    … …  
    10941067}
    10951068/*}}}*/
    1096 /*FUNCTION PentaRef::PressureInterpolation{{{*/
    1097 int PentaRef::PressureInterpolation(void){
     1069int  PentaRef::PressureInterpolation(void){/*{{{*/
    10981070
    10991071        switch(this->element_type){
    … …  
    11101082}
    11111083/*}}}*/
    1112 /*FUNCTION PentaRef::TensorInterpolation{{{*/
    1113 int PentaRef::TensorInterpolation(void){
     1084int  PentaRef::TensorInterpolation(void){/*{{{*/
    11141085
    11151086        switch(this->element_type){
    … …  
    11211092}
    11221093/*}}}*/
    1123 /*FUNCTION PentaRef::BasalNodeIndices{{{*/
    1124 void PentaRef::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){
     1094void PentaRef::BasalNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
    11251095
    11261096        /*Output*/
    … …  
    11961166}
    11971167/*}}}*/
    1198 /*FUNCTION PentaRef::SurfaceNodeIndices{{{*/
    1199 void PentaRef::SurfaceNodeIndices(int* pnumindices,int** pindices,int finiteelement){
     1168void PentaRef::SurfaceNodeIndices(int* pnumindices,int** pindices,int finiteelement){/*{{{*/
    12001169
    12011170        /*Output*/

  • issm/trunk-jpl/src/c/classes/Elements/Seg.cpp

    r17516 r17962  
    1919#define NUMVERTICES 2
    2020/*Constructors/destructor/copy*/
    21 /*FUNCTION Seg::Seg(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/
    22 Seg::Seg(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)
     21Seg::Seg(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
    2322                :SegRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
    2423
    … …  
    4039                }
    4140/*}}}*/
    42 /*FUNCTION Seg::~Seg(){{{*/
    43 Seg::~Seg(){
     41Seg::~Seg(){/*{{{*/
    4442        this->parameters=NULL;
    4543}
    4644/*}}}*/
    47 /*FUNCTION Seg::copy {{{*/
    48 Object* Seg::copy() {
     45Object* Seg::copy(){/*{{{*/
    4946        _error_("not implemented yet");
    5047}
    5148/*}}}*/
    5249
    53 /*FUNCTION Seg::CharacteristicLength{{{*/
    54 IssmDouble Seg::CharacteristicLength(void){
     50IssmDouble Seg::CharacteristicLength(void){/*{{{*/
    5551
    5652        IssmDouble xyz_list[NUMVERTICES][3];
    … …  
    6561}
    6662/*}}}*/
    67 /*FUNCTION Seg::FiniteElement{{{*/
    68 int Seg::FiniteElement(void){
     63int        Seg::FiniteElement(void){/*{{{*/
    6964        return this->element_type;
    7065}
    7166/*}}}*/
    72 /*FUNCTION Seg::ObjectEnum{{{*/
    73 int Seg::ObjectEnum(void){
     67int        Seg::ObjectEnum(void){/*{{{*/
    7468
    7569        return SegEnum;
    … …  
    7771}
    7872/*}}}*/
    79 
    80 void  Seg::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
     73void       Seg::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
    8174       
    8275        /* Intermediaries */
    … …  
    10699        *pxyz_front=xyz_front;
    107100}/*}}}*/
    108 /*FUNCTION Seg::GetNumberOfNodes;{{{*/
    109 int Seg::GetNumberOfNodes(void){
     101int        Seg::GetNumberOfNodes(void){/*{{{*/
    110102        return this->NumberofNodes();
    111103}
    112104/*}}}*/
    113 /*FUNCTION Seg::GetNumberOfVertices;{{{*/
    114 int Seg::GetNumberOfVertices(void){
     105int        Seg::GetNumberOfVertices(void){/*{{{*/
    115106        return NUMVERTICES;
    116107}
    117108/*}}}*/
    118 /*FUNCTION Seg::GetVerticesCoordinates(IssmDouble** pxyz_list){{{*/
    119 void Seg::GetVerticesCoordinates(IssmDouble** pxyz_list){
     109void       Seg::GetVerticesCoordinates(IssmDouble** pxyz_list){/*{{{*/
    120110
    121111        IssmDouble* xyz_list = xNew<IssmDouble>(NUMVERTICES*3);
    … …  
    126116
    127117}/*}}}*/
    128 bool Seg::IsIcefront(void){/*{{{*/
     118bool       Seg::IsIcefront(void){/*{{{*/
    129119
    130120        bool isicefront;
    … …  
    145135        return isicefront;
    146136}/*}}}*/
    147 /*FUNCTION Seg::JacobianDeterminant{{{*/
    148 void Seg::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     137void       Seg::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    149138
    150139        _assert_(gauss->Enum()==GaussSegEnum);
    … …  
    153142}
    154143/*}}}*/
    155 /*FUNCTION Seg::JacobianDeterminantSurface{{{*/
    156 void Seg::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     144void       Seg::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    157145
    158146        *pJdet = 1.;
    … …  
    160148}
    161149/*}}}*/
    162 /*FUNCTION Seg::NewGauss(){{{*/
    163 Gauss* Seg::NewGauss(void){
     150Gauss*     Seg::NewGauss(void){/*{{{*/
    164151        return new GaussSeg();
    165152}
    166153/*}}}*/
    167 /*FUNCTION Seg::NewGauss(int order){{{*/
    168 Gauss* Seg::NewGauss(int order){
     154Gauss*     Seg::NewGauss(int order){/*{{{*/
    169155        return new GaussSeg(order);
    170156}
    171157/*}}}*/
    172 /*FUNCTION Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){{{*/
    173 Gauss* Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){
     158Gauss*     Seg::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){/*{{{*/
    174159
    175160        /*Output*/
    … …  
    189174}
    190175/*}}}*/
    191 /*FUNCTION Seg::NodalFunctions{{{*/
    192 void Seg::NodalFunctions(IssmDouble* basis, Gauss* gauss){
     176void       Seg::NodalFunctions(IssmDouble* basis, Gauss* gauss){/*{{{*/
    193177
    194178        _assert_(gauss->Enum()==GaussSegEnum);
    … …  
    197181}
    198182/*}}}*/
    199 /*FUNCTION Seg::NodalFunctionsDerivatives{{{*/
    200 void Seg::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     183void       Seg::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    201184
    202185        _assert_(gauss->Enum()==GaussSegEnum);
    … …  
    205188}
    206189/*}}}*/
    207 /*FUNCTION Seg::NormalSection{{{*/
    208 void Seg::NormalSection(IssmDouble* normal,IssmDouble* xyz_list_front){
     190void       Seg::NormalSection(IssmDouble* normal,IssmDouble* xyz_list_front){/*{{{*/
    209191
    210192        IssmDouble* xyz_list = xNew<IssmDouble>(NUMVERTICES*3);

  • issm/trunk-jpl/src/c/classes/Elements/SegRef.cpp

    r17926 r17962  
    2020
    2121/*Object constructors and destructor*/
    22 /*FUNCTION SegRef::SegRef(){{{*/
    23 SegRef::SegRef(){
     22SegRef::SegRef(){/*{{{*/
    2423        this->element_type_list=NULL;
    2524}
    2625/*}}}*/
    27 /*FUNCTION SegRef::SegRef(int* types,int nummodels){{{*/
    28 SegRef::SegRef(const int nummodels){
     26SegRef::SegRef(const int nummodels){/*{{{*/
    2927
    3028        /*Only allocate pointer*/
    … …  
    3331}
    3432/*}}}*/
    35 /*FUNCTION SegRef::~SegRef(){{{*/
    36 SegRef::~SegRef(){
     33SegRef::~SegRef(){/*{{{*/
    3734        xDelete<int>(element_type_list);
    3835}
    … …  
    4037
    4138/*Management*/
    42 /*FUNCTION SegRef::SetElementType{{{*/
    43 void SegRef::SetElementType(int type,int type_counter){
     39void SegRef::SetElementType(int type,int type_counter){/*{{{*/
    4440
    4541        /*initialize element type*/
    … …  
    4945
    5046/*Reference Element numerics*/
    51 /*FUNCTION SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss){{{*/
    52 void SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss){
     47void SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss){/*{{{*/
    5348        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    5449
    … …  
    5853}
    5954/*}}}*/
    60 /*FUNCTION SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss,int finiteelement){{{*/
    61 void SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss,int finiteelement){
     55void SegRef::GetNodalFunctions(IssmDouble* basis,GaussSeg* gauss,int finiteelement){/*{{{*/
    6256        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    6357
    … …  
    8276}
    8377/*}}}*/
    84 /*FUNCTION SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss){{{*/
    85 void SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss){
     78void SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss){/*{{{*/
    8679
    8780        GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
    … …  
    8982}
    9083/*}}}*/
    91 /*FUNCTION SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss,int finiteelement){{{*/
    92 void SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss,int finiteelement){
     84void SegRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussSeg* gauss,int finiteelement){/*{{{*/
    9385
    9486        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    118110}
    119111/*}}}*/
    120 /*FUNCTION SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss){{{*/
    121 void SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss){
     112void SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss){/*{{{*/
    122113        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    123114         * natural coordinate system) at the gaussian point. */
    … …  
    127118}
    128119/*}}}*/
    129 /*FUNCTION SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss,int finiteelement){{{*/
    130 void SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss,int finiteelement){
     120void SegRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussSeg* gauss,int finiteelement){/*{{{*/
    131121        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    132122         * natural coordinate system) at the gaussian point. */
    … …  
    157147}
    158148/*}}}*/
    159 /*FUNCTION SegRef::GetInputDerivativeValue{{{*/
    160 void SegRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussSeg* gauss){
     149void SegRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussSeg* gauss){/*{{{*/
    161150
    162151        /*From node values of parameter p (plist[0],plist[1]), return parameter derivative value at gaussian
    … …  
    186175}
    187176/*}}}*/
    188 /*FUNCTION SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss){{{*/
    189 void SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss){
     177void SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss){/*{{{*/
    190178
    191179        GetInputValue(p,plist,gauss,this->element_type);
    192180}
    193181/*}}}*/
    194 /*FUNCTION SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss,int finiteelement){{{*/
    195 void SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss,int finiteelement){
     182void SegRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussSeg* gauss,int finiteelement){/*{{{*/
    196183
    197184        /*Output*/
    … …  
    213200}
    214201/*}}}*/
    215 /*FUNCTION SegRef::GetJacobian{{{*/
    216 void SegRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussSeg* gauss){
     202void SegRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussSeg* gauss){/*{{{*/
    217203        /*The Jacobian is constant over the element, discard the gaussian points.
    218204         * J is assumed to have been allocated of size 1*/
    … …  
    224210}
    225211/*}}}*/
    226 /*FUNCTION SegRef::GetJacobianDeterminant{{{*/
    227 void SegRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussSeg* gauss){
     212void SegRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussSeg* gauss){/*{{{*/
    228213        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    229214         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    235220}
    236221/*}}}*/
    237 /*FUNCTION SegRef::GetJacobianInvert {{{*/
    238 void SegRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussSeg* gauss){
     222void SegRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussSeg* gauss){/*{{{*/
    239223
    240224        /*Jacobian*/
    … …  
    248232}
    249233/*}}}*/
    250 /*FUNCTION SegRef::NumberofNodes(){{{*/
    251 int SegRef::NumberofNodes(void){
     234int  SegRef::NumberofNodes(void){/*{{{*/
    252235
    253236        return this->NumberofNodes(this->element_type);
    254237}
    255238/*}}}*/
    256 /*FUNCTION SegRef::NumberofNodes(int finiteelement){{{*/
    257 int SegRef::NumberofNodes(int finiteelement){
     239int  SegRef::NumberofNodes(int finiteelement){/*{{{*/
    258240
    259241        switch(finiteelement){

  • issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

    r17925 r17962  
    2020
    2121/*Constructors/destructor/copy*/
    22 /*FUNCTION Tetra::Tetra(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/
    23 Tetra::Tetra(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)
     22Tetra::Tetra(int seg_id, int seg_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
    2423                :TetraRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
    2524
    … …  
    4140                }
    4241/*}}}*/
    43 /*FUNCTION Tetra::~Tetra(){{{*/
    44 Tetra::~Tetra(){
     42Tetra::~Tetra(){/*{{{*/
    4543        this->parameters=NULL;
    4644}
    4745/*}}}*/
    48 /*FUNCTION Tetra::copy {{{*/
    49 Object* Tetra::copy() {
     46Object* Tetra::copy() {/*{{{*/
    5047        _error_("not implemented yet");
    5148}
    5249/*}}}*/
    5350
    54 /*FUNCTION Tetra::FiniteElement{{{*/
    55 int Tetra::FiniteElement(void){
     51int      Tetra::FiniteElement(void){/*{{{*/
    5652        return this->element_type;
    5753} /*}}}*/
    58 /*FUNCTION Tetra::ObjectEnum{{{*/
    59 int Tetra::ObjectEnum(void){
     54int      Tetra::ObjectEnum(void){/*{{{*/
    6055
    6156        return TetraEnum;
    6257
    6358}/*}}}*/
    64 
    65 /*FUNCTION Tetra::AddInput{{{*/
    66 void  Tetra::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){
     59void     Tetra::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){/*{{{*/
    6760
    6861        /*Call inputs method*/
    … …  
    7164}
    7265/*}}}*/
    73 /*FUNCTION Tetra::Configure {{{*/
    74 void  Tetra::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){
     66void     Tetra::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){/*{{{*/
    7567
    7668        int analysis_counter;
    … …  
    10395}
    10496/*}}}*/
    105 /*FUNCTION Tetra::ElementSizes (THIS ONE){{{*/
    106 void Tetra::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){
     97void     Tetra::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){/*{{{*/
    10798
    10899        IssmDouble xyz_list[NUMVERTICES][3];
    … …  
    130121}
    131122/*}}}*/
    132 /*FUNCTION Tetra::FaceOnBaseIndices{{{*/
    133 void Tetra::FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3){
     123void     Tetra::FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3){/*{{{*/
    134124
    135125        IssmDouble values[NUMVERTICES];
    … …  
    151141}
    152142/*}}}*/
    153 /*FUNCTION Tetra::FaceOnSurfaceIndices{{{*/
    154 void Tetra::FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3){
     143void     Tetra::FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3){/*{{{*/
    155144
    156145        IssmDouble values[NUMVERTICES];
    … …  
    172161}
    173162/*}}}*/
    174 /*FUNCTION Tetra::FaceOnFrontIndices{{{*/
    175 void Tetra::FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3){
     163void     Tetra::FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3){/*{{{*/
    176164
    177165        IssmDouble values[NUMVERTICES];
    … …  
    193181}
    194182/*}}}*/
    195 /*FUNCTION Tetra::GetElementType {{{*/
    196 int Tetra::GetElementType(){
     183int      Tetra::GetElementType(){/*{{{*/
    197184
    198185        /*return TetraRef field*/
    … …  
    200187}
    201188/*}}}*/
    202 /*FUNCTION Tetra::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype) (THIS ONE??){{{*/
    203 void Tetra::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){
     189void     Tetra::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){/*{{{*/
    204190
    205191        Input* input=inputs->GetInput(enumtype);
    … …  
    213199}
    214200/*}}}*/
    215 /*FUNCTION Tetra::GetNodeIndex (THIS ONE){{{*/
    216 int Tetra::GetNodeIndex(Node* node){
     201int      Tetra::GetNodeIndex(Node* node){/*{{{*/
    217202
    218203        _assert_(nodes);
    … …  
    226211}
    227212/*}}}*/
    228 /*FUNCTION Tetra::GetNumberOfNodes;{{{*/
    229 int Tetra::GetNumberOfNodes(void){
     213int      Tetra::GetNumberOfNodes(void){/*{{{*/
    230214        return this->NumberofNodes();
    231215}
    232216/*}}}*/
    233 /*FUNCTION Tetra::GetNumberOfVertices;{{{*/
    234 int Tetra::GetNumberOfVertices(void){
     217int      Tetra::GetNumberOfVertices(void){/*{{{*/
    235218        return NUMVERTICES;
    236219}
    237220/*}}}*/
    238 /*FUNCTION Tetra::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/
    239 void Tetra::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){
     221void     Tetra::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){/*{{{*/
    240222
    241223        int        indices[3];
    … …  
    254236
    255237}/*}}}*/
    256 /*FUNCTION Tetra::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/
    257 void Tetra::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){
     238void     Tetra::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){/*{{{*/
    258239
    259240        int        indices[3];
    … …  
    272253
    273254}/*}}}*/
    274 /*FUNCTION Tetra::HasFaceOnBase{{{*/
    275 bool Tetra::HasFaceOnBase(){
     255bool     Tetra::HasFaceOnBase(){/*{{{*/
    276256
    277257        IssmDouble values[NUMVERTICES];
    … …  
    292272}
    293273/*}}}*/
    294 /*FUNCTION Tetra::HasFaceOnSurface{{{*/
    295 bool Tetra::HasFaceOnSurface(){
     274bool     Tetra::HasFaceOnSurface(){/*{{{*/
    296275
    297276        IssmDouble values[NUMVERTICES];
    … …  
    312291}
    313292/*}}}*/
    314 /*FUNCTION Tetra::InputUpdateFromIoModel {{{*/
    315 void Tetra::InputUpdateFromIoModel(int index,IoModel* iomodel){
     293void     Tetra::InputUpdateFromIoModel(int index,IoModel* iomodel){ /*{{{*/
    316294
    317295        /*Intermediaries*/
    … …  
    416394}
    417395/*}}}*/
    418 /*FUNCTION Tetra::InputUpdateFromSolutionOneDof{{{*/
    419 void  Tetra::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){
     396void     Tetra::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){/*{{{*/
    420397
    421398        /*Intermediary*/
    … …  
    443420}
    444421/*}}}*/
    445 /*FUNCTION Tetra::IsOnBase {{{*/
    446 bool Tetra::IsOnBase(){
     422bool     Tetra::IsOnBase(){/*{{{*/
    447423        return HasFaceOnBase();
    448424}
    449425/*}}}*/
    450 /*FUNCTION Tetra::IsOnSurface {{{*/
    451 bool Tetra::IsOnSurface(){
     426bool     Tetra::IsOnSurface(){/*{{{*/
    452427        return HasFaceOnSurface();
    453428}
    454429/*}}}*/
    455 bool Tetra::IsIcefront(void){/*{{{*/
     430bool     Tetra::IsIcefront(void){/*{{{*/
    456431
    457432        /*Retrieve all inputs and parameters*/
    … …  
    467442        return false;
    468443}/*}}}*/
    469 /*FUNCTION Tetra::JacobianDeterminant{{{*/
    470 void Tetra::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     444void     Tetra::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    471445
    472446        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    475449}
    476450/*}}}*/
    477 /*FUNCTION Tetra::JacobianDeterminantSurface{{{*/
    478 void Tetra::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     451void     Tetra::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    479452
    480453        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    483456}
    484457/*}}}*/
    485 /*FUNCTION Tetra::JacobianDeterminantBase{{{*/
    486 void Tetra::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){
     458void     Tetra::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){/*{{{*/
    487459
    488460        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    491463}
    492464/*}}}*/
    493 /*FUNCTION Tetra::JacobianDeterminantTop{{{*/
    494 void Tetra::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){
     465void     Tetra::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){/*{{{*/
    495466
    496467        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    499470}
    500471/*}}}*/
    501 /*FUNCTION Tetra::NewGauss(){{{*/
    502 Gauss* Tetra::NewGauss(void){
     472Gauss*   Tetra::NewGauss(void){/*{{{*/
    503473        return new GaussTetra();
    504474}
    505475/*}}}*/
    506 /*FUNCTION Tetra::NewGauss(int order){{{*/
    507 Gauss* Tetra::NewGauss(int order){
     476Gauss*   Tetra::NewGauss(int order){/*{{{*/
    508477        return new GaussTetra(order);
    509478}
    510479/*}}}*/
    511 /*FUNCTION Tetra::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/
    512 Gauss* Tetra::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){
     480Gauss*   Tetra::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){/*{{{*/
    513481        /*FIXME: this is messed up, should provide indices and not xyz_list!*/
    514482        int indices[3];
    … …  
    517485}
    518486/*}}}*/
    519 /*FUNCTION Tetra::NewGaussBase(int order){{{*/
    520 Gauss* Tetra::NewGaussBase(int order){
     487Gauss*   Tetra::NewGaussBase(int order){/*{{{*/
    521488
    522489        int indices[3];
    … …  
    525492}
    526493/*}}}*/
    527 /*FUNCTION Tetra::NewGaussTop(int order){{{*/
    528 Gauss* Tetra::NewGaussTop(int order){
     494Gauss*   Tetra::NewGaussTop(int order){/*{{{*/
    529495
    530496        int indices[3];
    … …  
    533499}
    534500/*}}}*/
    535 /*FUNCTION Tetra::NodalFunctions{{{*/
    536 void Tetra::NodalFunctions(IssmDouble* basis, Gauss* gauss){
     501void     Tetra::NodalFunctions(IssmDouble* basis, Gauss* gauss){/*{{{*/
    537502
    538503        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    541506}
    542507/*}}}*/
    543 /*FUNCTION Tetra::NodalFunctionsVelocity{{{*/
    544 void Tetra::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
     508void     Tetra::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){/*{{{*/
    545509
    546510        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    549513}
    550514/*}}}*/
    551 /*FUNCTION Tetra::NodalFunctionsPressure{{{*/
    552 void Tetra::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
     515void     Tetra::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){/*{{{*/
    553516
    554517        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    557520}
    558521/*}}}*/
    559 /*FUNCTION Tetra::NodalFunctionsTensor{{{*/
    560 void Tetra::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
     522void     Tetra::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){/*{{{*/
    561523
    562524        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    565527}
    566528/*}}}*/
    567 /*FUNCTION Tetra::NodalFunctionsDerivatives{{{*/
    568 void Tetra::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     529void     Tetra::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    569530
    570531        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    573534}
    574535/*}}}*/
    575 /*FUNCTION Tetra::NodalFunctionsDerivativesVelocity{{{*/
    576 void Tetra::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     536void     Tetra::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    577537
    578538        _assert_(gauss->Enum()==GaussTetraEnum);
    … …  
    581541}
    582542/*}}}*/
    583 /*FUNCTION Tetra::NormalSection{{{*/
    584 void Tetra::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){
     543void     Tetra::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){/*{{{*/
    585544
    586545        /*Build unit outward pointing vector*/
    … …  
    602561}
    603562/*}}}*/
    604 /*FUNCTION Tetra::NormalBase (THIS ONE){{{*/
    605 void Tetra::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){
     563void     Tetra::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){/*{{{*/
    606564
    607565        IssmDouble v13[3],v23[3];
    … …  
    627585}
    628586/*}}}*/
    629 /*FUNCTION Tetra::NormalTop (THIS ONE){{{*/
    630 void Tetra::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){
     587void     Tetra::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){/*{{{*/
    631588
    632589        IssmDouble v13[3],v23[3];
    … …  
    650607}
    651608/*}}}*/
    652 /*FUNCTION Tetra::NumberofNodesPressure{{{*/
    653 int Tetra::NumberofNodesPressure(void){
     609int      Tetra::NumberofNodesPressure(void){/*{{{*/
    654610        return TetraRef::NumberofNodes(this->PressureInterpolation());
    655611}
    656612/*}}}*/
    657 /*FUNCTION Tetra::NumberofNodesVelocity{{{*/
    658 int Tetra::NumberofNodesVelocity(void){
     613int      Tetra::NumberofNodesVelocity(void){/*{{{*/
    659614        return TetraRef::NumberofNodes(this->VelocityInterpolation());
    660615}
    661616/*}}}*/
    662 /*FUNCTION Tetra::ReduceMatrices{{{*/
    663 void Tetra::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){
     617void     Tetra::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){/*{{{*/
    664618
    665619        if(pe){
    … …  
    696650}
    697651/*}}}*/
    698 /*FUNCTION Tetra::ResetFSBasalBoundaryCondition {{{*/
    699 void  Tetra::ResetFSBasalBoundaryCondition(void){
     652void     Tetra::ResetFSBasalBoundaryCondition(void){/*{{{*/
    700653
    701654        int numnodes = this->GetNumberOfNodes();
    … …  
    756709}
    757710/*}}}*/
    758 /*FUNCTION Tetra::SetCurrentConfiguration {{{*/
    759 void  Tetra::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){
     711void     Tetra::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){/*{{{*/
    760712
    761713        /*go into parameters and get the analysis_counter: */
    … …  
    772724}
    773725/*}}}*/
    774 /*FUNCTION Tetra::SpawnBasalElement{{{*/
    775 Element*  Tetra::SpawnBasalElement(void){
     726Element* Tetra::SpawnBasalElement(void){/*{{{*/
    776727
    777728        _assert_(HasFaceOnBase());
    … …  
    781732        return SpawnTria(index1,index2,index3);
    782733}/*}}}*/
    783 /*FUNCTION Tetra::SpawnTopElement{{{*/
    784 Element*  Tetra::SpawnTopElement(void){
     734Element* Tetra::SpawnTopElement(void){/*{{{*/
    785735
    786736        _assert_(HasFaceOnSurface());
    … …  
    790740        return SpawnTria(index1,index2,index3);
    791741}/*}}}*/
    792 /*FUNCTION Tetra::SpawnTria{{{*/
    793 Tria*  Tetra::SpawnTria(int index1,int index2,int index3){
     742Tria*    Tetra::SpawnTria(int index1,int index2,int index3){/*{{{*/
    794743
    795744        int analysis_counter;
    … …  
    818767}
    819768/*}}}*/
    820 /*FUNCTION Tetra::Update {{{*/
    821 void Tetra::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){
     769void     Tetra::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){ /*{{{*/
    822770
    823771        /*Intermediaries*/
    … …  
    923871}
    924872/*}}}*/
    925 /*FUNCTION Tetra::VelocityInterpolation{{{*/
    926 int Tetra::VelocityInterpolation(void){
     873int      Tetra::VelocityInterpolation(void){/*{{{*/
    927874        return TetraRef::VelocityInterpolation();
    928875}
    929876/*}}}*/
    930 /*FUNCTION Tetra::ViscousHeating (THIS ONE){{{*/
    931 void Tetra::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){
     877void     Tetra::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
    932878
    933879        /*Intermediaries*/
    … …  
    945891}
    946892/*}}}*/
    947 /*FUNCTION Tetra::PressureInterpolation{{{*/
    948 int Tetra::PressureInterpolation(void){
     893int      Tetra::PressureInterpolation(void){/*{{{*/
    949894        return TetraRef::PressureInterpolation();
    950895}
    951896/*}}}*/
    952 /*FUNCTION Tetra::TensorInterpolation{{{*/
    953 int Tetra::TensorInterpolation(void){
     897int      Tetra::TensorInterpolation(void){/*{{{*/
    954898        return TetraRef::TensorInterpolation();
    955899}
    956900/*}}}*/
    957 /*FUNCTION Tetra::ZeroLevelsetCoordinates{{{*/
    958 void Tetra::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){
     901void     Tetra::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
    959902        /*Compute portion of the element that is grounded*/
    960903

  • issm/trunk-jpl/src/c/classes/Elements/TetraRef.cpp

    r17875 r17962  
    44
    55/*Headers:*/
    6 /*{{{*/
     6/*{{{*//*{{{*/
    77#ifdef HAVE_CONFIG_H
    88#include <config.h>
    … …  
    2222
    2323/*Object constructors and destructor*/
    24 /*FUNCTION TetraRef::TetraRef(){{{*/
    25 TetraRef::TetraRef(){
     24TetraRef::TetraRef(){/*{{{*/
    2625        this->element_type_list=NULL;
    2726}
    2827/*}}}*/
    29 /*FUNCTION TetraRef::TetraRef(int* types,int nummodels){{{*/
    30 TetraRef::TetraRef(const int nummodels){
     28TetraRef::TetraRef(const int nummodels){/*{{{*/
    3129
    3230        /*Only allocate pointer*/
    … …  
    3533}
    3634/*}}}*/
    37 /*FUNCTION TetraRef::~TetraRef(){{{*/
    38 TetraRef::~TetraRef(){
     35TetraRef::~TetraRef(){/*{{{*/
    3936        xDelete<int>(element_type_list);
    4037}
    … …  
    4239
    4340/*Management*/
    44 /*FUNCTION TetraRef::SetElementType{{{*/
    45 void TetraRef::SetElementType(int type,int type_counter){
     41void TetraRef::SetElementType(int type,int type_counter){/*{{{*/
    4642
    4743        /*initialize element type*/
    … …  
    5147
    5248/*Reference Element numerics*/
    53 /*FUNCTION TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss){{{*/
    54 void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss){
     49void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss){/*{{{*/
    5550        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    5651        _assert_(basis);
    … …  
    5853}
    5954/*}}}*/
    60 /*FUNCTION TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement){{{*/
    61 void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement){
     55void TetraRef::GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement){/*{{{*/
    6256        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    6357
    … …  
    10296}
    10397/*}}}*/
    104 /*FUNCTION TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){{{*/
    105 void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){
     98void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){/*{{{*/
    10699        GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
    107100}
    108101/*}}}*/
    109 /*FUNCTION TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement){{{*/
    110 void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement){
     102void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement){/*{{{*/
    111103
    112104        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    141133}
    142134/*}}}*/
    143 /*FUNCTION TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){{{*/
    144 void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){
     135void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){/*{{{*/
    145136        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    146137         * natural coordinate system) at the gaussian point. */
    … …  
    150141}
    151142/*}}}*/
    152 /*FUNCTION TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement){{{*/
    153 void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement){
     143void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement){/*{{{*/
    154144        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    155145         * natural coordinate system) at the gaussian point. */
    … …  
    249239}
    250240/*}}}*/
    251 /*FUNCTION TetraRef::GetInputDerivativeValue{{{*/
    252 void TetraRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTetra* gauss){
     241void TetraRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTetra* gauss){/*{{{*/
    253242        /*From node values of parameter p (p_list[0], p_list[1], p_list[2],
    254243         * p_list[3], p_list[4] and p_list[4]), return parameter derivative value at
    … …  
    285274}
    286275/*}}}*/
    287 /*FUNCTION TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss){{{*/
    288 void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss){
     276void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss){/*{{{*/
    289277
    290278        GetInputValue(p,plist,gauss,this->element_type);
    291279}
    292280/*}}}*/
    293 /*FUNCTION TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement){{{*/
    294 void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement){
     281void TetraRef::GetInputValue(IssmDouble* p, IssmDouble* plist, GaussTetra* gauss,int finiteelement){/*{{{*/
    295282
    296283        /*Output*/
    … …  
    312299}
    313300/*}}}*/
    314 /*FUNCTION TetraRef::GetJacobian{{{*/
    315 void TetraRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTetra* gauss){
     301void TetraRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTetra* gauss){/*{{{*/
    316302        /*The Jacobian is constant over the element, discard the gaussian points.
    317303         * J is assumed to have been allocated of size 1*/
    … …  
    345331}
    346332/*}}}*/
    347 /*FUNCTION TetraRef::GetJacobianDeterminant{{{*/
    348 void TetraRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussTetra* gauss){
     333void TetraRef::GetJacobianDeterminant(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussTetra* gauss){/*{{{*/
    349334        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    350335         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    360345}
    361346/*}}}*/
    362 /*FUNCTION TetraRef::GetJacobianDeterminantFace{{{*/
    363 void TetraRef::GetJacobianDeterminantFace(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussTetra* gauss){
     347void TetraRef::GetJacobianDeterminantFace(IssmDouble*  Jdet, IssmDouble* xyz_list,GaussTetra* gauss){/*{{{*/
    364348        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    365349         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    380364}
    381365/*}}}*/
    382 /*FUNCTION TetraRef::GetJacobianInvert {{{*/
    383 void TetraRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTetra* gauss){
     366void TetraRef::GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTetra* gauss){/*{{{*/
    384367
    385368        /*Jacobian*/
    … …  
    393376}
    394377/*}}}*/
    395 /*FUNCTION TetraRef::NumberofNodes(){{{*/
    396 int TetraRef::NumberofNodes(void){
     378int  TetraRef::NumberofNodes(void){/*{{{*/
    397379
    398380        return this->NumberofNodes(this->element_type);
    399381}
    400382/*}}}*/
    401 /*FUNCTION TetraRef::NumberofNodes(int finiteelement){{{*/
    402 int TetraRef::NumberofNodes(int finiteelement){
     383int  TetraRef::NumberofNodes(int finiteelement){/*{{{*/
    403384
    404385        switch(finiteelement){
    … …  
    420401}
    421402/*}}}*/
    422 /*FUNCTION TetraRef::VelocityInterpolation{{{*/
    423 int TetraRef::VelocityInterpolation(void){
     403int  TetraRef::VelocityInterpolation(void){/*{{{*/
    424404
    425405        switch(this->element_type){
    … …  
    435415}
    436416/*}}}*/
    437 /*FUNCTION TetraRef::PressureInterpolation{{{*/
    438 int TetraRef::PressureInterpolation(void){
     417int TetraRef::PressureInterpolation(void){/*{{{*/
    439418
    440419        switch(this->element_type){
    … …  
    449428        return -1;
    450429}/*}}}*/
    451 /*FUNCTION TetraRef::TensorInterpolation{{{*/
    452 int TetraRef::TensorInterpolation(void){
     430int  TetraRef::TensorInterpolation(void){/*{{{*/
    453431        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    454432

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

    r17943 r17962  
    2424
    2525/*Constructors/destructor/copy*/
    26 /*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/
    27 Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels)
     26Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
    2827        :TriaRef(nummodels),ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
    2928
    … …  
    4544}
    4645/*}}}*/
    47 /*FUNCTION Tria::~Tria(){{{*/
    48 Tria::~Tria(){
     46Tria::~Tria(){/*{{{*/
    4947        this->parameters=NULL;
    5048}
    5149/*}}}*/
    52 /*FUNCTION Tria::copy {{{*/
    53 Object* Tria::copy() {
     50Object* Tria::copy() {/*{{{*/
    5451
    5552        int i;
    … …  
    9592
    9693/*Other*/
    97 /*FUNCTION Tria::AddBasalInput{{{*/
    98 void  Tria::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){
     94void       Tria::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){/*{{{*/
    9995
    10096        /*Call inputs method*/
    … …  
    128124}
    129125/*}}}*/
    130 /*FUNCTION Tria::AddInput{{{*/
    131 void  Tria::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){
     126void       Tria::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){/*{{{*/
    132127
    133128        /*Call inputs method*/
    … …  
    136131}
    137132/*}}}*/
    138 /*FUNCTION Tria::CharacteristicLength{{{*/
    139 IssmDouble Tria::CharacteristicLength(void){
     133IssmDouble Tria::CharacteristicLength(void){/*{{{*/
    140134
    141135        return sqrt(2*this->GetArea());
    142136}
    143137/*}}}*/
    144 /*FUNCTION Tria::ComputeBasalStress {{{*/
    145 void  Tria::ComputeBasalStress(Vector<IssmDouble>* eps){
     138void       Tria::ComputeBasalStress(Vector<IssmDouble>* eps){/*{{{*/
    146139        _error_("Not Implemented yet");
    147140}
    148141/*}}}*/
    149 /*FUNCTION Tria::ComputeSigmaNN {{{*/
    150 void  Tria::ComputeSigmaNN(){
     142void       Tria::ComputeSigmaNN(){/*{{{*/
    151143
    152144        if(!IsOnBase()){
    … …  
    205197}
    206198/*}}}*/
    207 /*FUNCTION Tria::ComputeStrainRate {{{*/
    208 void  Tria::ComputeStrainRate(){
     199void       Tria::ComputeStrainRate(){/*{{{*/
    209200
    210201        IssmDouble      xyz_list[NUMVERTICES][3];
    … …  
    251242}
    252243/*}}}*/
    253 /*FUNCTION Tria::ComputeStressTensor {{{*/
    254 void  Tria::ComputeStressTensor(){
     244void       Tria::ComputeStressTensor(){/*{{{*/
    255245
    256246        IssmDouble  xyz_list[NUMVERTICES][3];
    … …  
    304294}
    305295/*}}}*/
    306 /*FUNCTION Tria::ComputeDeviatoricStressTensor {{{*/
    307 void  Tria::ComputeDeviatoricStressTensor(){
     296void       Tria::ComputeDeviatoricStressTensor(){/*{{{*/
    308297
    309298        IssmDouble  xyz_list[NUMVERTICES][3];
    … …  
    355344}
    356345/*}}}*/
    357 /*FUNCTION Tria::Configure {{{*/
    358 void  Tria::Configure(Elements* elementsin, Loads* loadsin,Nodes* nodesin,Vertices *verticesin,Materials* materialsin, Parameters* parametersin){
     346void       Tria::Configure(Elements* elementsin, Loads* loadsin,Nodes* nodesin,Vertices *verticesin,Materials* materialsin, Parameters* parametersin){/*{{{*/
    359347
    360348        /*go into parameters and get the analysis_counter: */
    … …  
    387375}
    388376/*}}}*/
    389 /*FUNCTION Tria::Delta18oParameterization{{{*/
    390 void  Tria::Delta18oParameterization(void){
     377void       Tria::Delta18oParameterization(void){/*{{{*/
    391378
    392379        int        i;
    … …  
    458445}
    459446/*}}}*/
    460 /*FUNCTION Tria::ElementSizes{{{*/
    461 void Tria::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){
     447void       Tria::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){/*{{{*/
    462448
    463449        IssmDouble xyz_list[NUMVERTICES][3];
    … …  
    482468}
    483469/*}}}*/
    484 /*FUNCTION Tria::FiniteElement{{{*/
    485 int Tria::FiniteElement(void){
     470int        Tria::FiniteElement(void){/*{{{*/
    486471        return this->element_type;
    487472}
    488473/*}}}*/
    489 /*FUNCTION Tria::ObjectEnum{{{*/
    490 int Tria::ObjectEnum(void){
     474int        Tria::ObjectEnum(void){/*{{{*/
    491475
    492476        return TriaEnum;
    … …  
    494478}
    495479/*}}}*/
    496 /*FUNCTION Tria::GetArea {{{*/
    497 IssmDouble Tria::GetArea(void){
     480IssmDouble Tria::GetArea(void){/*{{{*/
    498481
    499482        IssmDouble xyz_list[NUMVERTICES][3];
    … …  
    510493}
    511494/*}}}*/
    512 /*FUNCTION Tria::GetAreaCoordinates{{{*/
    513 void Tria::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){
     495void       Tria::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){/*{{{*/
    514496        /*Computeportion of the element that is grounded*/
    515497
    … …  
    546528}
    547529/*}}}*/
    548 /*FUNCTION Tria::GetElementType {{{*/
    549 int Tria::GetElementType(){
     530int        Tria::GetElementType(){/*{{{*/
    550531
    551532        /*return TriaRef field*/
    … …  
    554535}
    555536/*}}}*/
    556 /*FUNCTION Tria::GetGroundedPart{{{*/
    557 void Tria::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){
     537void       Tria::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){/*{{{*/
    558538        /*Computeportion of the element that is grounded*/
    559539
    … …  
    608588}
    609589/*}}}*/
    610 /*FUNCTION Tria::GetGroundedPortion{{{*/
    611 IssmDouble Tria::GetGroundedPortion(IssmDouble* xyz_list){
     590IssmDouble Tria::GetGroundedPortion(IssmDouble* xyz_list){/*{{{*/
    612591        /*Computeportion of the element that is grounded*/
    613592
    … …  
    727706}
    728707/*}}}*/
    729 /*FUNCTION Tria::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/
    730 void Tria::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){
     708void       Tria::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){/*{{{*/
    731709
    732710        int        indices[2];
    … …  
    745723
    746724}/*}}}*/
    747 /*FUNCTION Tria::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/
    748 void Tria::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){
     725void       Tria::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){/*{{{*/
    749726
    750727        int        indices[2];
    … …  
    763740
    764741}/*}}}*/
    765 /*FUNCTION Tria::NormalSection{{{*/
    766 void Tria::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){
     742void       Tria::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){/*{{{*/
    767743
    768744        /*Build unit outward pointing vector*/
    … …  
    779755}
    780756/*}}}*/
    781 /*FUNCTION Tria::ZeroLevelsetCoordinates{{{*/
    782 void Tria::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){
     757void       Tria::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
    783758
    784759        int         normal_orientation=0;
    … …  
    874849}
    875850/*}}}*/
    876 void  Tria::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
     851void       Tria::GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
    877852       
    878853        /* Intermediaries */
    … …  
    914889        xDelete<int>(indicesfront);
    915890}/*}}}*/
    916 /*FUNCTION Tria::GetNodeIndex {{{*/
    917 int Tria::GetNodeIndex(Node* node){
     891int        Tria::GetNodeIndex(Node* node){/*{{{*/
    918892
    919893        _assert_(nodes);
    … …  
    925899}
    926900/*}}}*/
    927 /*FUNCTION Tria::GetNumberOfNodes;{{{*/
    928 int Tria::GetNumberOfNodes(void){
     901int        Tria::GetNumberOfNodes(void){/*{{{*/
    929902        return this->NumberofNodes();
    930903}
    931904/*}}}*/
    932 /*FUNCTION Tria::GetNumberOfVertices;{{{*/
    933 int Tria::GetNumberOfVertices(void){
     905int        Tria::GetNumberOfVertices(void){/*{{{*/
    934906        return NUMVERTICES;
    935907}
    936908/*}}}*/
    937 /*FUNCTION Tria::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype) {{{*/
    938 void Tria::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){
     909void       Tria::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){/*{{{*/
    939910
    940911        Input* input=inputs->GetInput(enumtype);
    … …  
    948919}
    949920/*}}}*/
    950 Node* Tria::GetNode(int node_number){/*{{{*/
     921Node*      Tria::GetNode(int node_number){/*{{{*/
    951922        _assert_(node_number>=0);
    952923        _assert_(node_number<this->NumberofNodes());
    … …  
    954925
    955926}/*}}}*/
    956 /*FUNCTION Tria::InputDepthAverageAtBase {{{*/
    957 void  Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type){
     927void       Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type){/*{{{*/
    958928
    959929        /*New input*/
    … …  
    973943}
    974944/*}}}*/
    975 /*FUNCTION Tria::InputScale{{{*/
    976 void  Tria::InputScale(int enum_type,IssmDouble scale_factor){
     945void       Tria::InputScale(int enum_type,IssmDouble scale_factor){/*{{{*/
    977946
    978947        Input* input=NULL;
    … …  
    986955}
    987956/*}}}*/
    988 /*FUNCTION Tria::InputUpdateFromIoModel{{{*/
    989 void Tria::InputUpdateFromIoModel(int index, IoModel* iomodel){ //i is the element index
     957void       Tria::InputUpdateFromIoModel(int index, IoModel* iomodel){ //i is the element index/*{{{*/
    990958
    991959        /*Intermediaries*/
    … …  
    10841052}
    10851053/*}}}*/
    1086 /*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{*/
    1087 void  Tria::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){
     1054void       Tria::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){/*{{{*/
    10881055
    10891056        /*Intermediary*/
    … …  
    11111078}
    11121079/*}}}*/
    1113 /*FUNCTION Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type);{{{*/
    1114 void  Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){
     1080void       Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){/*{{{*/
    11151081
    11161082        /*Check that name is an element input*/
    … …  
    11771143}
    11781144/*}}}*/
    1179 /*FUNCTION Tria::IsOnBase {{{*/
    1180 bool Tria::IsOnBase(){
     1145bool       Tria::IsOnBase(){/*{{{*/
    11811146
    11821147        int domaintype;
    … …  
    11911156}
    11921157/*}}}*/
    1193 /*FUNCTION Tria::IsOnSurface {{{*/
    1194 bool Tria::IsOnSurface(){
     1158bool       Tria::IsOnSurface(){/*{{{*/
    11951159
    11961160        int domaintype;
    … …  
    12051169}
    12061170/*}}}*/
    1207 /*FUNCTION Tria::JacobianDeterminant{{{*/
    1208 void Tria::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     1171void       Tria::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    12091172
    12101173        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    12131176}
    12141177/*}}}*/
    1215 /*FUNCTION Tria::JacobianDeterminantBase{{{*/
    1216 void Tria::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){
     1178void       Tria::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){/*{{{*/
    12171179
    12181180        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    12211183}
    12221184/*}}}*/
    1223 /*FUNCTION Tria::JacobianDeterminantSurface{{{*/
    1224 void Tria::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     1185void       Tria::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    12251186
    12261187        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    12291190}
    12301191/*}}}*/
    1231 /*FUNCTION Tria::JacobianDeterminantTop{{{*/
    1232 void Tria::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){
     1192void       Tria::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){/*{{{*/
    12331193
    12341194        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    12371197}
    12381198/*}}}*/
    1239 /*FUNCTION Tria::HasEdgeOnBase {{{*/
    1240 bool Tria::HasEdgeOnBase(){
     1199bool       Tria::HasEdgeOnBase(){/*{{{*/
    12411200
    12421201        IssmDouble values[NUMVERTICES];
    … …  
    12591218}
    12601219/*}}}*/
    1261 /*FUNCTION Tria::HasEdgeOnSurface {{{*/
    1262 bool Tria::HasEdgeOnSurface(){
     1220bool       Tria::HasEdgeOnSurface(){/*{{{*/
    12631221
    12641222        IssmDouble values[NUMVERTICES];
    … …  
    12811239}
    12821240/*}}}*/
    1283 /*FUNCTION Tria::EdgeOnBaseIndices{{{*/
    1284 void Tria::EdgeOnBaseIndices(int* pindex1,int* pindex2){
     1241void       Tria::EdgeOnBaseIndices(int* pindex1,int* pindex2){/*{{{*/
    12851242
    12861243        IssmDouble values[NUMVERTICES];
    … …  
    13021259}
    13031260/*}}}*/
    1304 /*FUNCTION Tria::EdgeOnSurfaceIndices{{{*/
    1305 void Tria::EdgeOnSurfaceIndices(int* pindex1,int* pindex2){
     1261void       Tria::EdgeOnSurfaceIndices(int* pindex1,int* pindex2){/*{{{*/
    13061262
    13071263        IssmDouble values[NUMVERTICES];
    … …  
    13231279}
    13241280/*}}}*/
    1325 /*FUNCTION Tria::EdgeOnBaseIndex{{{*/
    1326 int Tria::EdgeOnBaseIndex(void){
     1281int        Tria::EdgeOnBaseIndex(void){/*{{{*/
    13271282
    13281283        IssmDouble values[NUMVERTICES];
    … …  
    13421297}
    13431298/*}}}*/
    1344 /*FUNCTION Tria::EdgeOnSurfaceIndex{{{*/
    1345 int Tria::EdgeOnSurfaceIndex(void){
     1299int        Tria::EdgeOnSurfaceIndex(void){/*{{{*/
    13461300
    13471301        IssmDouble values[NUMVERTICES];
    … …  
    13611315}
    13621316/*}}}*/
    1363 /*FUNCTION Tria::FSContactMigration{{{*/
    1364 void Tria::FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){
     1317void       Tria::FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){/*{{{*/
    13651318
    13661319        if(!IsOnBase()) return;
    … …  
    14411394}
    14421395/*}}}*/
    1443 /*FUNCTION Tria::IsNodeOnShelfFromFlags {{{*/
    1444 bool   Tria::IsNodeOnShelfFromFlags(IssmDouble* flags){
     1396bool       Tria::IsNodeOnShelfFromFlags(IssmDouble* flags){/*{{{*/
    14451397
    14461398        int  i;
    … …  
    14561408}
    14571409/*}}}*/
    1458 /*FUNCTION Tria::NewGauss(){{{*/
    1459 Gauss* Tria::NewGauss(void){
     1410Gauss*     Tria::NewGauss(void){/*{{{*/
    14601411        return new GaussTria();
    14611412}
    14621413/*}}}*/
    1463 /*FUNCTION Tria::NewGauss(int order){{{*/
    1464 Gauss* Tria::NewGauss(int order){
     1414Gauss*     Tria::NewGauss(int order){/*{{{*/
    14651415        return new GaussTria(order);
    14661416}
    14671417/*}}}*/
    1468 /*FUNCTION Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){{{*/
    1469 Gauss* Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){
     1418Gauss*     Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order){/*{{{*/
    14701419
    14711420        IssmDouble  area_coordinates[2][3];
    … …  
    14741423}
    14751424/*}}}*/
    1476 /*FUNCTION Tria::NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating){{{*/
    1477 Gauss* Tria::NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){
     1425Gauss*     Tria::NewGauss(int point1,IssmDouble fraction1,IssmDouble fraction2,bool mainlyfloating,int order){/*{{{*/
    14781426
    14791427        return new GaussTria(point1,fraction1,fraction2,mainlyfloating,order);
    14801428}
    14811429/*}}}*/
    1482 /*FUNCTION Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/
    1483 Gauss* Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){
     1430Gauss*     Tria::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){/*{{{*/
    14841431
    14851432        IssmDouble  area_coordinates[2][3];
    … …  
    14881435}
    14891436/*}}}*/
    1490 /*FUNCTION Tria::NewGaussBase(int order){{{*/
    1491 Gauss* Tria::NewGaussBase(int order){
     1437Gauss*     Tria::NewGaussBase(int order){/*{{{*/
    14921438
    14931439        int indices[2];
    … …  
    14961442}
    14971443/*}}}*/
    1498 /*FUNCTION Tria::NewGaussTop(int order){{{*/
    1499 Gauss* Tria::NewGaussTop(int order){
     1444Gauss*     Tria::NewGaussTop(int order){/*{{{*/
    15001445
    15011446        int indices[2];
    … …  
    15041449}
    15051450/*}}}*/
    1506 /*FUNCTION Tria::NodalFunctions{{{*/
    1507 void Tria::NodalFunctions(IssmDouble* basis, Gauss* gauss){
     1451void       Tria::NodalFunctions(IssmDouble* basis, Gauss* gauss){/*{{{*/
    15081452
    15091453        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15121456}
    15131457/*}}}*/
    1514 /*FUNCTION Tria::NodalFunctionsDerivatives{{{*/
    1515 void Tria::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1458void       Tria::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    15161459
    15171460        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15201463}
    15211464/*}}}*/
    1522 /*FUNCTION Tria::NodalFunctionsDerivativesVelocity{{{*/
    1523 void Tria::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1465void       Tria::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    15241466
    15251467        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15281470}
    15291471/*}}}*/
    1530 /*FUNCTION Tria::NodalFunctionsVelocity{{{*/
    1531 void Tria::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
     1472void       Tria::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){/*{{{*/
    15321473
    15331474        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15361477}
    15371478/*}}}*/
    1538 /*FUNCTION Tria::NodalFunctionsPressure{{{*/
    1539 void Tria::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
     1479void       Tria::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){/*{{{*/
    15401480
    15411481        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15441484}
    15451485/*}}}*/
    1546 /*FUNCTION Tria::NodalFunctionsTensor{{{*/
    1547 void Tria::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
     1486void       Tria::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){/*{{{*/
    15481487
    15491488        _assert_(gauss->Enum()==GaussTriaEnum);
    … …  
    15521491}
    15531492/*}}}*/
    1554 /*FUNCTION Tria::NodalValue {{{*/
    1555 int    Tria::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){
     1493int        Tria::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){/*{{{*/
    15561494
    15571495        int         found = 0;
    … …  
    15851523}
    15861524/*}}}*/
    1587 /*FUNCTION Tria::NormalBase {{{*/
    1588 void Tria::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){
     1525void       Tria::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){/*{{{*/
    15891526
    15901527        /*Build unit outward pointing vector*/
    … …  
    16021539}
    16031540/*}}}*/
    1604 /*FUNCTION Tria::NormalTop {{{*/
    1605 void Tria::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){
     1541void       Tria::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){/*{{{*/
    16061542
    16071543        /*Build unit outward pointing vector*/
    … …  
    16211557}
    16221558/*}}}*/
    1623 /*FUNCTION Tria::VelocityInterpolation{{{*/
    1624 int Tria::VelocityInterpolation(void){
     1559int        Tria::VelocityInterpolation(void){/*{{{*/
    16251560        return TriaRef::VelocityInterpolation();
    16261561}
    16271562/*}}}*/
    1628 /*FUNCTION Tria::PressureInterpolation{{{*/
    1629 int Tria::PressureInterpolation(void){
     1563int        Tria::PressureInterpolation(void){/*{{{*/
    16301564        return TriaRef::PressureInterpolation();
    16311565}
    16321566/*}}}*/
    1633 /*FUNCTION Tria::TensorInterpolation{{{*/
    1634 int Tria::TensorInterpolation(void){
     1567int        Tria::TensorInterpolation(void){/*{{{*/
    16351568        return TriaRef::TensorInterpolation();
    16361569}
    16371570/*}}}*/
    1638 /*FUNCTION Tria::NumberofNodesPressure{{{*/
    1639 int Tria::NumberofNodesPressure(void){
     1571int        Tria::NumberofNodesPressure(void){/*{{{*/
    16401572        return TriaRef::NumberofNodes(this->PressureInterpolation());
    16411573}
    16421574/*}}}*/
    1643 /*FUNCTION Tria::NumberofNodesVelocity{{{*/
    1644 int Tria::NumberofNodesVelocity(void){
     1575int        Tria::NumberofNodesVelocity(void){/*{{{*/
    16451576        return TriaRef::NumberofNodes(this->VelocityInterpolation());
    16461577}
    16471578/*}}}*/
    1648 /*FUNCTION Tria::PositiveDegreeDay{{{*/
    1649 void  Tria::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){
     1579void       Tria::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){/*{{{*/
    16501580
    16511581   IssmDouble agd[NUMVERTICES];             // surface mass balance
    … …  
    16961626}
    16971627/*}}}*/
    1698 /*FUNCTION Tria::ReduceMatrices {{{*/
    1699 void Tria::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){
     1628void       Tria::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){/*{{{*/
    17001629
    17011630        /*Static condensation if requested*/
    … …  
    17351664}
    17361665/*}}}*/
    1737 /*FUNCTION Tria::ResetFSBasalBoundaryCondition{{{*/
    1738 void  Tria::ResetFSBasalBoundaryCondition(void){
     1666void       Tria::ResetFSBasalBoundaryCondition(void){/*{{{*/
    17391667
    17401668        int numnodes = this->NumberofNodesVelocity();
    … …  
    17861714}
    17871715/*}}}*/
    1788 /*FUNCTION Tria::SetClone {{{*/
    1789 void  Tria::SetClone(int* minranks){
     1716void       Tria::SetClone(int* minranks){/*{{{*/
    17901717
    17911718        _error_("not implemented yet");
    17921719}
    17931720/*}}}*/
    1794 /*FUNCTION Tria::SmbGradients{{{*/
    1795 void Tria::SmbGradients(void){
     1721void       Tria::SmbGradients(void){/*{{{*/
    17961722
    17971723        int i;
    … …  
    18381764}
    18391765/*}}}*/
    1840 /*FUNCTION Tria::SpawnSeg {{{*/
    1841 Seg*  Tria::SpawnSeg(int index1,int index2){
     1766Seg*       Tria::SpawnSeg(int index1,int index2){/*{{{*/
    18421767
    18431768        int analysis_counter;
    … …  
    18661791}
    18671792/*}}}*/
    1868 /*FUNCTION Tria::SpawnBasalElement{{{*/
    1869 Element*  Tria::SpawnBasalElement(void){
     1793Element*   Tria::SpawnBasalElement(void){/*{{{*/
    18701794
    18711795        int index1,index2;
    … …  
    18851809}
    18861810/*}}}*/
    1887 /*FUNCTION Tria::SpawnTopElement{{{*/
    1888 Element*  Tria::SpawnTopElement(void){
     1811Element*   Tria::SpawnTopElement(void){/*{{{*/
    18891812
    18901813        int index1,index2;
    … …  
    19041827}
    19051828/*}}}*/
    1906 /*FUNCTION Tria::SetCurrentConfiguration {{{*/
    1907 void  Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){
     1829void       Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){/*{{{*/
    19081830
    19091831        /*go into parameters and get the analysis_counter: */
    … …  
    19201842}
    19211843/*}}}*/
    1922 /*FUNCTION Tria::SurfaceArea {{{*/
    1923 IssmDouble Tria::SurfaceArea(void){
     1844IssmDouble Tria::SurfaceArea(void){/*{{{*/
    19241845
    19251846        IssmDouble S;
    … …  
    19481869}
    19491870/*}}}*/
    1950 /*FUNCTION Tria::TimeAdapt{{{*/
    1951 IssmDouble  Tria::TimeAdapt(void){
     1871IssmDouble Tria::TimeAdapt(void){/*{{{*/
    19521872
    19531873        /*intermediary: */
    … …  
    19901910}
    19911911/*}}}*/
    1992 /*FUNCTION Tria::Update{{{*/
    1993 void Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){
     1912void       Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){/*{{{*/
    19941913
    19951914        /*Intermediaries*/
    … …  
    20872006}
    20882007/*}}}*/
    2089 /*FUNCTION Tria::UpdateConstraintsExtrudeFromBase{{{*/
    2090 void  Tria::UpdateConstraintsExtrudeFromBase(void){
     2008void       Tria::UpdateConstraintsExtrudeFromBase(void){/*{{{*/
    20912009
    20922010        if(!HasEdgeOnBase()) return;
    … …  
    21122030}
    21132031/*}}}*/
    2114 /*FUNCTION Tria::UpdateConstraintsExtrudeFromTop{{{*/
    2115 void  Tria::UpdateConstraintsExtrudeFromTop(void){
     2032void       Tria::UpdateConstraintsExtrudeFromTop(void){/*{{{*/
    21162033
    21172034        if(!HasEdgeOnSurface()) return;
    … …  
    21352052}
    21362053/*}}}*/
    2137 /*FUNCTION Tria::ValueP1OnGauss{{{*/
    2138 void Tria::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){
     2054void       Tria::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){/*{{{*/
    21392055        TriaRef::GetInputValue(pvalue,values,gauss,P1Enum);
    21402056}
    21412057/*}}}*/
    2142 /*FUNCTION Tria::ValueP1DerivativesOnGauss{{{*/
    2143 void Tria::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){
     2058void       Tria::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    21442059        TriaRef::GetInputDerivativeValue(dvalue,values,xyz_list,gauss);
    21452060}
    21462061/*}}}*/
    2147 /*FUNCTION Tria::VertexConnectivity{{{*/
    2148 int Tria::VertexConnectivity(int vertexindex){
     2062int        Tria::VertexConnectivity(int vertexindex){/*{{{*/
    21492063        _assert_(this->vertices);
    21502064        return this->vertices[vertexindex]->Connectivity();
    21512065}
    21522066/*}}}*/
    2153 /*FUNCTION Tria::IsZeroLevelset{{{*/
    2154 bool Tria::IsZeroLevelset(int levelset_enum){
     2067bool       Tria::IsZeroLevelset(int levelset_enum){/*{{{*/
    21552068
    21562069        bool iszerols;
    … …  
    21712084}
    21722085/*}}}*/
    2173 bool Tria::IsIcefront(void){/*{{{*/
     2086bool       Tria::IsIcefront(void){/*{{{*/
    21742087
    21752088        bool isicefront;
    … …  
    21902103        return isicefront;
    21912104}/*}}}*/
    2192 bool Tria::IsFaceOnBoundary(void){/*{{{*/
     2105bool       Tria::IsFaceOnBoundary(void){/*{{{*/
    21932106
    21942107        IssmDouble values[NUMVERTICES];
    … …  
    22102123        }
    22112124}/*}}}*/
    2212 /*FUNCTION Tria::AverageOntoPartition {{{*/
    2213 void  Tria::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
     2125void       Tria::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){/*{{{*/
    22142126
    22152127        bool       already = false;
    … …  
    22492161}
    22502162/*}}}*/
    2251 /*FUNCTION Tria::IceVolume {{{*/
    2252 IssmDouble Tria::IceVolume(void){
     2163IssmDouble Tria::IceVolume(void){/*{{{*/
    22532164
    22542165        /*The volume of a troncated prism is base * 1/3 sum(length of edges)*/
    … …  
    22782189}
    22792190/*}}}*/
    2280 /*FUNCTION Tria::IceVolumeAboveFloatation {{{*/
    2281 IssmDouble Tria::IceVolumeAboveFloatation(void){
     2191IssmDouble Tria::IceVolumeAboveFloatation(void){/*{{{*/
    22822192
    22832193        /*The volume above floatation: H + rho_water/rho_ice * bathymetry */
    … …  
    23092219}
    23102220/*}}}*/
    2311 /*FUNCTION Tria::MassFlux {{{*/
    2312 IssmDouble Tria::MassFlux( IssmDouble x1, IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){
     2221IssmDouble Tria::MassFlux( IssmDouble x1, IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){/*{{{*/
    23132222
    23142223        int        domaintype;
    … …  
    23732282}
    23742283/*}}}*/
    2375 /*FUNCTION Tria::MassFlux {{{*/
    2376 IssmDouble Tria::MassFlux( IssmDouble* segment){
     2284IssmDouble Tria::MassFlux( IssmDouble* segment){/*{{{*/
    23772285
    23782286        int        domaintype;
    … …  
    24402348}
    24412349/*}}}*/
    2442 /*FUNCTION Tria::MaxAbsVx{{{*/
    2443 void  Tria::MaxAbsVx(IssmDouble* pmaxabsvx){
     2350void       Tria::MaxAbsVx(IssmDouble* pmaxabsvx){/*{{{*/
    24442351
    24452352        /*Get maximum:*/
    … …  
    24502357}
    24512358/*}}}*/
    2452 /*FUNCTION Tria::MaxAbsVy{{{*/
    2453 void  Tria::MaxAbsVy(IssmDouble* pmaxabsvy){
     2359void       Tria::MaxAbsVy(IssmDouble* pmaxabsvy){/*{{{*/
    24542360
    24552361        /*Get maximum:*/
    … …  
    24602366}
    24612367/*}}}*/
    2462 /*FUNCTION Tria::MaxAbsVz{{{*/
    2463 void  Tria::MaxAbsVz(IssmDouble* pmaxabsvz){
     2368void       Tria::MaxAbsVz(IssmDouble* pmaxabsvz){/*{{{*/
    24642369
    24652370        /*Get maximum:*/
    … …  
    24702375}
    24712376/*}}}*/
    2472 /*FUNCTION Tria::MaxVel{{{*/
    2473 void  Tria::MaxVel(IssmDouble* pmaxvel){
     2377void       Tria::MaxVel(IssmDouble* pmaxvel){/*{{{*/
    24742378
    24752379        /*Get maximum:*/
    … …  
    24802384}
    24812385/*}}}*/
    2482 /*FUNCTION Tria::MaxVx{{{*/
    2483 void  Tria::MaxVx(IssmDouble* pmaxvx){
     2386void       Tria::MaxVx(IssmDouble* pmaxvx){/*{{{*/
    24842387
    24852388        /*Get maximum:*/
    … …  
    24902393}
    24912394/*}}}*/
    2492 /*FUNCTION Tria::MaxVy{{{*/
    2493 void  Tria::MaxVy(IssmDouble* pmaxvy){
     2395void       Tria::MaxVy(IssmDouble* pmaxvy){/*{{{*/
    24942396
    24952397        /*Get maximum:*/
    … …  
    25012403}
    25022404/*}}}*/
    2503 /*FUNCTION Tria::MaxVz{{{*/
    2504 void  Tria::MaxVz(IssmDouble* pmaxvz){
     2405void       Tria::MaxVz(IssmDouble* pmaxvz){/*{{{*/
    25052406
    25062407        /*Get maximum:*/
    … …  
    25112412}
    25122413/*}}}*/
    2513 /*FUNCTION Tria::MinVel{{{*/
    2514 void  Tria::MinVel(IssmDouble* pminvel){
     2414void       Tria::MinVel(IssmDouble* pminvel){/*{{{*/
    25152415
    25162416        /*Get minimum:*/
    … …  
    25212421}
    25222422/*}}}*/
    2523 /*FUNCTION Tria::MinVx{{{*/
    2524 void  Tria::MinVx(IssmDouble* pminvx){
     2423void       Tria::MinVx(IssmDouble* pminvx){/*{{{*/
    25252424
    25262425        /*Get minimum:*/
    … …  
    25312430}
    25322431/*}}}*/
    2533 /*FUNCTION Tria::MinVy{{{*/
    2534 void  Tria::MinVy(IssmDouble* pminvy){
     2432void       Tria::MinVy(IssmDouble* pminvy){/*{{{*/
    25352433
    25362434        /*Get minimum:*/
    … …  
    25412439}
    25422440/*}}}*/
    2543 /*FUNCTION Tria::MinVz{{{*/
    2544 void  Tria::MinVz(IssmDouble* pminvz){
     2441void       Tria::MinVz(IssmDouble* pminvz){/*{{{*/
    25452442
    25462443        /*Get minimum:*/
    … …  
    25512448}
    25522449/*}}}*/
    2553 /*FUNCTION Tria::ElementResponse{{{*/
    2554 void Tria::ElementResponse(IssmDouble* presponse,int response_enum){
     2450void       Tria::ElementResponse(IssmDouble* presponse,int response_enum){/*{{{*/
    25552451
    25562452        switch(response_enum){
    … …  
    25772473}
    25782474/*}}}*/
    2579 /*FUNCTION Tria::TotalSmb {{{*/
    2580 IssmDouble Tria::TotalSmb(void){
     2475IssmDouble Tria::TotalSmb(void){/*{{{*/
    25812476
    25822477        /*The smb[kg yr-1] of one element is area[m2] * smb [kg m^-2 yr^-1]*/
    … …  
    26062501}
    26072502/*}}}*/
    2608 /*FUNCTION Tria::MisfitArea{{{*/
    2609 IssmDouble Tria::MisfitArea(int weightsenum){
     2503IssmDouble Tria::MisfitArea(int weightsenum){/*{{{*/
    26102504
    26112505        /*Intermediaries*/
    … …  
    26442538}
    26452539/*}}}*/
    2646 /*FUNCTION Tria::Misfit{{{*/
    2647 IssmDouble Tria::Misfit(int modelenum,int observationenum,int weightsenum){
     2540IssmDouble Tria::Misfit(int modelenum,int observationenum,int weightsenum){/*{{{*/
    26482541
    26492542        /*Intermediaries*/
    … …  
    26882581
    26892582#ifdef _HAVE_GIA_
    2690 /*FUNCTION Tria::GiaDeflection {{{*/
    2691 void Tria::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x, IssmDouble* y){
     2583void       Tria::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x, IssmDouble* y){/*{{{*/
    26922584
    26932585        int i;
    … …  
    28162708#endif
    28172709
    2818 /*FUNCTION Tria::BalancethicknessMisfit{{{*/
    2819 IssmDouble Tria::BalancethicknessMisfit(void){
     2710IssmDouble Tria::BalancethicknessMisfit(void){/*{{{*/
    28202711
    28212712        /* Intermediaries */
    … …  
    28742765}
    28752766/*}}}*/
    2876 /*FUNCTION Tria::InputControlUpdate{{{*/
    2877 void  Tria::InputControlUpdate(IssmDouble scalar,bool save_parameter){
     2767void       Tria::InputControlUpdate(IssmDouble scalar,bool save_parameter){/*{{{*/
    28782768
    28792769        /*Intermediary*/
    … …  
    29022792}
    29032793/*}}}*/
    2904 /*FUNCTION Tria::ControlInputGetGradient{{{*/
    2905 void Tria::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){
     2794void       Tria::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){/*{{{*/
    29062795
    29072796        int vertexpidlist[NUMVERTICES];
    … …  
    29152804
    29162805}/*}}}*/
    2917 /*FUNCTION Tria::ControlInputScaleGradient{{{*/
    2918 void Tria::ControlInputScaleGradient(int enum_type,IssmDouble scale){
     2806void       Tria::ControlInputScaleGradient(int enum_type,IssmDouble scale){/*{{{*/
    29192807
    29202808        Input* input=inputs->GetInput(enum_type);
    … …  
    29242812        ((ControlInput*)input)->ScaleGradient(scale);
    29252813}/*}}}*/
    2926 /*FUNCTION Tria::ControlInputSetGradient{{{*/
    2927 void Tria::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){
     2814void       Tria::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){/*{{{*/
    29282815
    29292816        int    vertexpidlist[NUMVERTICES];
    … …  
    29422829
    29432830}/*}}}*/
    2944 /*FUNCTION Tria::ControlToVectors{{{*/
    2945 void Tria::ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){
     2831void       Tria::ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){/*{{{*/
    29462832
    29472833        Input* input=inputs->GetInput(control_enum);
    … …  
    29742860
    29752861}/*}}}*/
    2976 /*FUNCTION Tria::Gradj {{{*/
    2977 void  Tria::Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index){
     2862void       Tria::Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index){/*{{{*/
    29782863        /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/
    29792864
    … …  
    30422927}
    30432928/*}}}*/
    3044 /*FUNCTION Tria::GradjBGradient{{{*/
    3045 void  Tria::GradjBGradient(Vector<IssmDouble>* gradient,int control_index){
     2929void       Tria::GradjBGradient(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    30462930
    30472931        int        i;
    … …  
    30822966}
    30832967/*}}}*/
    3084 /*FUNCTION Tria::GradjBSSA{{{*/
    3085 void  Tria::GradjBSSA(Vector<IssmDouble>* gradient,int control_index){
     2968void       Tria::GradjBSSA(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    30862969
    30872970        /*Intermediaries*/
    … …  
    31393022}
    31403023/*}}}*/
    3141 /*FUNCTION Tria::GradjDSSA{{{*/
    3142 void  Tria::GradjDSSA(Vector<IssmDouble>* gradient,int control_index){
     3024void       Tria::GradjDSSA(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    31433025
    31443026        /*Intermediaries*/
    … …  
    31973079}
    31983080/*}}}*/
    3199 /*FUNCTION Tria::GradjDragSSA {{{*/
    3200 void  Tria::GradjDragSSA(Vector<IssmDouble>* gradient,int control_index){
     3081void       Tria::GradjDragSSA(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    32013082
    32023083        int        i;
    … …  
    32843165}
    32853166/*}}}*/
    3286 /*FUNCTION Tria::GradjDragGradient{{{*/
    3287 void  Tria::GradjDragGradient(Vector<IssmDouble>* gradient,int control_index){
     3167void       Tria::GradjDragGradient(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    32883168
    32893169        int        i;
    … …  
    33283208}
    33293209/*}}}*/
    3330 /*FUNCTION Tria::GradjDhDtBalancedthickness{{{*/
    3331 void  Tria::GradjDhDtBalancedthickness(Vector<IssmDouble>* gradient,int control_index){
     3210void       Tria::GradjDhDtBalancedthickness(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33323211
    33333212        /*Intermediaries*/
    … …  
    33443223}
    33453224/*}}}*/
    3346 /*FUNCTION Tria::GradjVxBalancedthickness{{{*/
    3347 void  Tria::GradjVxBalancedthickness(Vector<IssmDouble>* gradient,int control_index){
     3225void       Tria::GradjVxBalancedthickness(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33483226
    33493227        /*Intermediaries*/
    … …  
    33873265}
    33883266/*}}}*/
    3389 /*FUNCTION Tria::GradjVyBalancedthickness{{{*/
    3390 void  Tria::GradjVyBalancedthickness(Vector<IssmDouble>* gradient,int control_index){
     3267void       Tria::GradjVyBalancedthickness(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33913268
    33923269        /*Intermediaries*/
    … …  
    34293306}
    34303307/*}}}*/
    3431 /*FUNCTION Tria::GradjThicknessBalancethicknessSoft{{{*/
    3432 void  Tria::GradjThicknessBalancethicknessSoft(Vector<IssmDouble>* gradient,int control_index){
     3308void       Tria::GradjThicknessBalancethicknessSoft(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    34333309
    34343310        /*Intermediaries */
    … …  
    35383414}
    35393415/*}}}*/
    3540 /*FUNCTION Tria::GradientIndexing{{{*/
    3541 void  Tria::GradientIndexing(int* indexing,int control_index){
     3416void       Tria::GradientIndexing(int* indexing,int control_index){/*{{{*/
    35423417
    35433418        /*Get some parameters*/
    … …  
    35523427}
    35533428/*}}}*/
    3554 /*FUNCTION Tria::RheologyBbarAbsGradient{{{*/
    3555 IssmDouble Tria::RheologyBbarAbsGradient(void){
     3429IssmDouble Tria::RheologyBbarAbsGradient(void){/*{{{*/
    35563430
    35573431        /* Intermediaries */
    … …  
    35953469}
    35963470/*}}}*/
    3597 /*FUNCTION Tria::SurfaceAverageVelMisfit {{{*/
    3598 IssmDouble Tria::SurfaceAverageVelMisfit(void){
     3471IssmDouble Tria::SurfaceAverageVelMisfit(void){/*{{{*/
    35993472
    36003473        IssmDouble Jelem=0,S,Jdet;
    … …  
    36513524}
    36523525/*}}}*/
    3653 /*FUNCTION Tria::SurfaceLogVelMisfit {{{*/
    3654 IssmDouble Tria::SurfaceLogVelMisfit(void){
     3526IssmDouble Tria::SurfaceLogVelMisfit(void){/*{{{*/
    36553527
    36563528        IssmDouble Jelem=0.;
    … …  
    37113583}
    37123584/*}}}*/
    3713 /*FUNCTION Tria::SurfaceLogVxVyMisfit {{{*/
    3714 IssmDouble Tria::SurfaceLogVxVyMisfit(void){
     3585IssmDouble Tria::SurfaceLogVxVyMisfit(void){/*{{{*/
    37153586
    37163587        IssmDouble Jelem=0, S=0;
    … …  
    37713642}
    37723643/*}}}*/
    3773 /*FUNCTION Tria::SurfaceAbsVelMisfit {{{*/
    3774 IssmDouble Tria::SurfaceAbsVelMisfit(void){
     3644IssmDouble Tria::SurfaceAbsVelMisfit(void){/*{{{*/
    37753645
    37763646        IssmDouble Jelem=0;
    … …  
    38273697}
    38283698/*}}}*/
    3829 /*FUNCTION Tria::SurfaceRelVelMisfit {{{*/
    3830 IssmDouble Tria::SurfaceRelVelMisfit(void){
     3699IssmDouble Tria::SurfaceRelVelMisfit(void){/*{{{*/
    38313700
    38323701        IssmDouble  Jelem=0;
    … …  
    38883757}
    38893758/*}}}*/
    3890 /*FUNCTION Tria::ThicknessAbsGradient{{{*/
    3891 IssmDouble Tria::ThicknessAbsGradient(void){
     3759IssmDouble Tria::ThicknessAbsGradient(void){/*{{{*/
    38923760
    38933761        /* Intermediaries */
    … …  
    39313799}
    39323800/*}}}*/
    3933 /*FUNCTION Tria::ThicknessAlongGradient{{{*/
    3934 IssmDouble Tria::ThicknessAlongGradient(void){
     3801IssmDouble Tria::ThicknessAlongGradient(void){/*{{{*/
    39353802
    39363803        /* Intermediaries */
    … …  
    39823849}
    39833850/*}}}*/
    3984 /*FUNCTION Tria::ThicknessAcrossGradient{{{*/
    3985 IssmDouble Tria::ThicknessAcrossGradient(void){
     3851IssmDouble Tria::ThicknessAcrossGradient(void){/*{{{*/
    39863852
    39873853        /* Intermediaries */
    … …  
    40333899}
    40343900/*}}}*/
    4035 /*FUNCTION Tria::ThicknessAbsMisfit {{{*/
    4036 IssmDouble Tria::ThicknessAbsMisfit(void){
     3901IssmDouble Tria::ThicknessAbsMisfit(void){/*{{{*/
    40373902
    40383903        /*Intermediaries*/
    … …  
    40773942}
    40783943/*}}}*/
    4079 /*FUNCTION Tria::DragCoefficientAbsGradient{{{*/
    4080 IssmDouble Tria::DragCoefficientAbsGradient(void){
     3944IssmDouble Tria::DragCoefficientAbsGradient(void){/*{{{*/
    40813945
    40823946        /* Intermediaries */
    … …  
    41203984}
    41213985/*}}}*/
    4122 /*FUNCTION Tria::GetVectorFromControlInputs{{{*/
    4123 void  Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){
     3986void       Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){/*{{{*/
    41243987
    41253988        int vertexpidlist[NUMVERTICES];
    … …  
    41434006}
    41444007/*}}}*/
    4145 /*FUNCTION Tria::SetControlInputsFromVector{{{*/
    4146 void  Tria::SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){
     4008void       Tria::SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){/*{{{*/
    41474009
    41484010        IssmDouble  values[NUMVERTICES];
    … …  
    41714033}
    41724034/*}}}*/
    4173 /*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/
    4174 void  Tria::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){
     4035void       Tria::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){/*{{{*/
    41754036
    41764037        int        *doflist = NULL;
    … …  
    42064067
    42074068#ifdef _HAVE_DAKOTA_
    4208 /*FUNCTION Tria::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type);{{{*/
    4209 void  Tria::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){
     4069void       Tria::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*{{{*/
    42104070
    42114071        int i,j;
    … …  
    42984158}
    42994159/*}}}*/
    4300 /*FUNCTION Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type);{{{*/
    4301 void  Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){
     4160void       Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){/*{{{*/
    43024161
    43034162        int             i,t,row;
    … …  
    43394198#endif
    43404199
    4341 /*FUNCTION Tria::MigrateGroundingLine{{{*/
    4342 void  Tria::MigrateGroundingLine(IssmDouble* phi_ungrounding){
     4200void       Tria::MigrateGroundingLine(IssmDouble* phi_ungrounding){/*{{{*/
    43434201
    43444202        int        i,migration_style;
    … …  
    44704328}
    44714329/*}}}*/
    4472 /*FUNCTION Tria::PotentialUngrounding{{{*/
    4473 void  Tria::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
     4330void       Tria::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){/*{{{*/
    44744331
    44754332        IssmDouble  h[NUMVERTICES],r[NUMVERTICES],gl[NUMVERTICES];
    … …  
    44984355}
    44994356/*}}}*/
    4500 /*FUNCTION Tria::UpdatePotentialUngrounding{{{*/
    4501 int Tria::UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){
     4357int        Tria::UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){/*{{{*/
    45024358
    45034359        int i;

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

    r17875 r17962  
    44
    55/*Headers:*/
    6 /*{{{*/
     6/*{{{*//*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2222
    2323/*Object constructors and destructor*/
    24 /*FUNCTION TriaRef::TriaRef(){{{*/
    25 TriaRef::TriaRef(){
     24TriaRef::TriaRef(){/*{{{*/
    2625        this->element_type_list=NULL;
    2726}
    2827/*}}}*/
    29 /*FUNCTION TriaRef::TriaRef(int* types,int nummodels){{{*/
    30 TriaRef::TriaRef(const int nummodels){
     28TriaRef::TriaRef(const int nummodels){/*{{{*/
    3129
    3230        /*Only allocate pointer*/
    … …  
    3533}
    3634/*}}}*/
    37 /*FUNCTION TriaRef::~TriaRef(){{{*/
    38 TriaRef::~TriaRef(){
     35TriaRef::~TriaRef(){/*{{{*/
    3936        xDelete<int>(element_type_list);
    4037}
    … …  
    4239
    4340/*Management*/
    44 /*FUNCTION TriaRef::SetElementType{{{*/
    45 void TriaRef::SetElementType(int type,int type_counter){
     41void TriaRef::SetElementType(int type,int type_counter){/*{{{*/
    4642
    4743        /*initialize element type*/
    … …  
    5147
    5248/*Reference Element numerics*/
    53 /*FUNCTION TriaRef::GetSegmentBFlux{{{*/
    54 void TriaRef::GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2){
     49void TriaRef::GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2){/*{{{*/
    5550        /*Compute B  matrix. B=[phi1 phi2 -phi3 -phi4]
    5651         *
    … …  
    7772}
    7873/*}}}*/
    79 /*FUNCTION TriaRef::GetSegmentBprimeFlux{{{*/
    80 void TriaRef::GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2){
     74void TriaRef::GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2){/*{{{*/
    8175        /*Compute Bprime  matrix. Bprime=[phi1 phi2 phi3 phi4]
    8276         *
    … …  
    10397}
    10498/*}}}*/
    105 /*FUNCTION TriaRef::GetJacobian{{{*/
    106 void TriaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss){
     99void TriaRef::GetJacobian(IssmDouble* J, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    107100        /*The Jacobian is constant over the element, discard the gaussian points.
    108101         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    121114}
    122115/*}}}*/
    123 /*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{*/
    124 void TriaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){
     116void TriaRef::GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    125117        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    126118         * J is assumed to have been allocated*/
    … …  
    136128}
    137129/*}}}*/
    138 /*FUNCTION TriaRef::GetJacobianDeterminant{{{*/
    139 void TriaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){
     130void TriaRef::GetJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    140131        /*The Jacobian determinant is constant over the element, discard the gaussian points.
    141132         * J is assumed to have been allocated of size NDOF2xNDOF2.*/
    … …  
    151142}
    152143/*}}}*/
    153 /*FUNCTION TriaRef::GetJacobianInvert{{{*/
    154 void TriaRef::GetJacobianInvert(IssmDouble*  Jinv, IssmDouble* xyz_list,Gauss* gauss){
     144void TriaRef::GetJacobianInvert(IssmDouble*  Jinv, IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    155145
    156146        /*Jacobian*/
    … …  
    165155}
    166156/*}}}*/
    167 /*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){{{*/
    168 void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){
     157void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss){/*{{{*/
    169158        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    170159
    … …  
    174163}
    175164/*}}}*/
    176 /*FUNCTION TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss,int finiteelement){{{*/
    177 void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){
     165void TriaRef::GetNodalFunctions(IssmDouble* basis,Gauss* gauss_in,int finiteelement){/*{{{*/
    178166        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    179167
    … …  
    216204}
    217205/*}}}*/
    218 /*FUNCTION TriaRef::GetSegmentNodalFunctions{{{*/
    219 void TriaRef::GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss,int index1,int index2){
     206void TriaRef::GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss,int index1,int index2){/*{{{*/
    220207        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    221208
    … …  
    256243}
    257244/*}}}*/
    258 /*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){{{*/
    259 void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
     245void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    260246
    261247        GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
    … …  
    263249}
    264250/*}}}*/
    265 /*FUNCTION TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){{{*/
    266 void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){
     251void TriaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){/*{{{*/
    267252
    268253        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    … …  
    294279}
    295280/*}}}*/
    296 /*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){{{*/
    297 void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){
     281void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){/*{{{*/
    298282        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    299283         * natural coordinate system) at the gaussian point. */
    … …  
    303287}
    304288/*}}}*/
    305 /*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement){{{*/
    306 void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){
     289void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){/*{{{*/
    307290        /*This routine returns the values of the nodal functions derivatives  (with respect to the
    308291         * natural coordinate system) at the gaussian point. */
    … …  
    371354}
    372355/*}}}*/
    373 /*FUNCTION TriaRef::GetInputDerivativeValue{{{*/
    374 void TriaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){
     356void TriaRef::GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    375357
    376358        /*From node values of parameter p (plist[0],plist[1],plist[2]), return parameter derivative value at gaussian
    … …  
    404386}
    405387/*}}}*/
    406 /*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss){{{*/
    407 void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss){
     388void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss){/*{{{*/
    408389
    409390        GetInputValue(p,plist,gauss,this->element_type);
    410391}
    411392/*}}}*/
    412 /*FUNCTION TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss,int finiteelement){{{*/
    413 void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss,int finiteelement){
     393void TriaRef::GetInputValue(IssmDouble* p, IssmDouble* plist, Gauss* gauss,int finiteelement){/*{{{*/
    414394
    415395        /*Output*/
    … …  
    431411}
    432412/*}}}*/
    433 /*FUNCTION TriaRef::NumberofNodes(){{{*/
    434 int TriaRef::NumberofNodes(void){
     413int  TriaRef::NumberofNodes(void){/*{{{*/
    435414
    436415        return this->NumberofNodes(this->element_type);
    437416}
    438417/*}}}*/
    439 /*FUNCTION TriaRef::NumberofNodes(int finiteelement){{{*/
    440 int TriaRef::NumberofNodes(int finiteelement){
     418int  TriaRef::NumberofNodes(int finiteelement){/*{{{*/
    441419
    442420        switch(finiteelement){
    … …  
    459437}
    460438/*}}}*/
    461 /*FUNCTION TriaRef::VelocityInterpolation{{{*/
    462 int TriaRef::VelocityInterpolation(void){
     439int  TriaRef::VelocityInterpolation(void){/*{{{*/
    463440
    464441        switch(this->element_type){
    … …  
    475452}
    476453/*}}}*/
    477 /*FUNCTION TriaRef::PressureInterpolation{{{*/
    478 int TriaRef::PressureInterpolation(void){
     454int  TriaRef::PressureInterpolation(void){/*{{{*/
    479455
    480456        switch(this->element_type){
    … …  
    491467}
    492468/*}}}*/
    493 /*FUNCTION TriaRef::TensorInterpolation{{{*/
    494 int TriaRef::TensorInterpolation(void){
     469int  TriaRef::TensorInterpolation(void){/*{{{*/
    495470        /*This routine returns the values of the nodal functions  at the gaussian point.*/
    496471
    … …  
    501476}
    502477/*}}}*/
    503 /*FUNCTION TriaRef::NodeOnEdgeIndices{{{*/
    504 void TriaRef::NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement){
     478void TriaRef::NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement){/*{{{*/
    505479
    506480        /*Output*/
Note: See TracChangeset for help on using the changeset viewer.