Changeset 17967


Ignore:
Timestamp:
05/09/14 08:25:21 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removed FUNCTION

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r17943 r17967  
    2020
    2121/*Constructors/destructor/copy*/
    22 /*FUNCTION Penta::~Penta(){{{*/
    23 Penta::~Penta(){
     22Penta::~Penta(){/*{{{*/
    2423        this->parameters=NULL;
    2524}
    2625/*}}}*/
    27 /*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{*/
    28 Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels)
     26Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels)/*{{{*/
    2927        :PentaRef(nummodels)
    3028        ,ElementHook(nummodels,index+1,NUMVERTICES,iomodel){
     
    6159}
    6260/*}}}*/
    63 /*FUNCTION Penta::copy {{{*/
    64 Object* Penta::copy() {
     61Object* Penta::copy() {/*{{{*/
    6562
    6663        int i;
     
    108105
    109106/*Other*/
    110 /*FUNCTION Penta::AddInput{{{*/
    111 void  Penta::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){
     107void       Penta::AddInput(int input_enum,IssmDouble* values, int interpolation_enum){/*{{{*/
    112108
    113109        _assert_(this->inputs);
     
    115111}
    116112/*}}}*/
    117 /*FUNCTION Penta::AddBasalInput{{{*/
    118 void  Penta::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){
     113void       Penta::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){/*{{{*/
    119114
    120115        _assert_(this->inputs);
     
    141136}
    142137/*}}}*/
    143 /*FUNCTION Penta::ComputeBasalStress {{{*/
    144 void  Penta::ComputeBasalStress(Vector<IssmDouble>* sigma_b){
     138void       Penta::ComputeBasalStress(Vector<IssmDouble>* sigma_b){/*{{{*/
    145139
    146140        int         i,j;
     
    229223}
    230224/*}}}*/
    231 /*FUNCTION Penta::ComputeStrainRate {{{*/
    232 void  Penta::ComputeStrainRate(){
     225void       Penta::ComputeStrainRate(){/*{{{*/
    233226
    234227        IssmDouble      xyz_list[NUMVERTICES][3];
     
    278271}
    279272/*}}}*/
    280 /*FUNCTION Penta::ComputeStressTensor {{{*/
    281 void  Penta::ComputeStressTensor(){
     273void       Penta::ComputeStressTensor(){/*{{{*/
    282274
    283275        IssmDouble      xyz_list[NUMVERTICES][3];
     
    332324}
    333325/*}}}*/
    334 /*FUNCTION Penta::ComputeDeviatoricStressTensor {{{*/
    335 void  Penta::ComputeDeviatoricStressTensor(){
     326void       Penta::ComputeDeviatoricStressTensor(){/*{{{*/
    336327
    337328        IssmDouble      xyz_list[NUMVERTICES][3];
     
    384375}
    385376/*}}}*/
    386 /*FUNCTION Penta::Configure {{{*/
    387 void  Penta::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){
     377void       Penta::Configure(Elements* elementsin, Loads* loadsin, Nodes* nodesin,Vertices* verticesin, Materials* materialsin, Parameters* parametersin){/*{{{*/
    388378
    389379        int analysis_counter;
     
    418408}
    419409/*}}}*/
    420 /*FUNCTION Penta::Delta18oParameterization{{{*/
    421 void  Penta::Delta18oParameterization(void){
     410void       Penta::Delta18oParameterization(void){/*{{{*/
    422411
    423412        /*Are we on the base? If not, return*/
     
    493482}
    494483/*}}}*/
    495 /*FUNCTION Penta::FiniteElement{{{*/
    496 int Penta::FiniteElement(void){
     484int        Penta::FiniteElement(void){/*{{{*/
    497485        return this->element_type;
    498486}
    499487/*}}}*/
    500 /*FUNCTION Penta::FSContactMigration{{{*/
    501 void Penta::FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){
     488void       Penta::FSContactMigration(Vector<IssmDouble>* vertexgrounded,Vector<IssmDouble>* vertexfloating){/*{{{*/
    502489
    503490        if(!IsOnBase()) return;
     
    580567}
    581568/*}}}*/
    582 /*FUNCTION Penta::ObjectEnum{{{*/
    583 int Penta::ObjectEnum(void){
     569int        Penta::ObjectEnum(void){/*{{{*/
    584570
    585571        return PentaEnum;
     
    587573}
    588574/*}}}*/
    589 /*FUNCTION Penta::GetAreaCoordinates{{{*/
    590 void Penta::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){
     575void       Penta::GetAreaCoordinates(IssmDouble* area_coordinates,IssmDouble* xyz_zero,IssmDouble* xyz_list,int numpoints){/*{{{*/
    591576        /*Computeportion of the element that is grounded*/
    592577
     
    623608}
    624609/*}}}*/
    625 /*FUNCTION Penta::GetUpperPenta{{{*/
    626 Penta* Penta::GetUpperPenta(void){
     610Penta*     Penta::GetUpperPenta(void){/*{{{*/
    627611
    628612        Penta* upper_penta=NULL;
     
    633617}
    634618/*}}}*/
    635 /*FUNCTION Penta::GetLowerPenta{{{*/
    636 Penta* Penta::GetLowerPenta(void){
     619Penta*     Penta::GetLowerPenta(void){/*{{{*/
    637620
    638621        Penta* lower_penta=NULL;
     
    643626}
    644627/*}}}*/
    645 /*FUNCTION Penta::GetSurfacePenta{{{*/
    646 Penta* Penta::GetSurfacePenta(void){
     628Penta*     Penta::GetSurfacePenta(void){/*{{{*/
    647629
    648630        /*Output*/
     
    664646}
    665647/*}}}*/
    666 /*FUNCTION Penta::GetBasalPenta{{{*/
    667 Penta* Penta::GetBasalPenta(void){
     648Penta*     Penta::GetBasalPenta(void){/*{{{*/
    668649
    669650        /*Output*/
     
    685666}
    686667/*}}}*/
    687 /*FUNCTION Penta::GetUpperElement{{{*/
    688 Element* Penta::GetUpperElement(void){
     668Element*   Penta::GetUpperElement(void){/*{{{*/
    689669
    690670        /*Output*/
     
    693673}
    694674/*}}}*/
    695 /*FUNCTION Penta::GetBasalElement{{{*/
    696 Element* Penta::GetBasalElement(void){
     675Element*   Penta::GetBasalElement(void){/*{{{*/
    697676
    698677        /*Output*/
     
    701680}
    702681/*}}}*/
    703 /*FUNCTION Penta::GetGroundedPart{{{*/
    704 void Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){
     682void       Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){/*{{{*/
    705683        /*Computeportion of the element that is grounded*/
    706684
     
    755733}
    756734/*}}}*/
    757 /*FUNCTION Penta::GetGroundedPortion{{{*/
    758 IssmDouble Penta::GetGroundedPortion(IssmDouble* xyz_list){
     735IssmDouble Penta::GetGroundedPortion(IssmDouble* xyz_list){/*{{{*/
    759736        /*Computeportion of the element that is grounded*/
    760737
     
    857834}
    858835/*}}}*/
    859 /*FUNCTION Penta::GetElementType {{{*/
    860 int Penta::GetElementType(){
     836int        Penta::GetElementType(){/*{{{*/
    861837
    862838        /*return PentaRef field*/
     
    864840}
    865841/*}}}*/
    866 /*FUNCTION Penta::ElementSizes{{{*/
    867 void Penta::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){
     842void       Penta::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){/*{{{*/
    868843
    869844        IssmDouble xyz_list[NUMVERTICES][3];
     
    891866}
    892867/*}}}*/
    893 /*FUNCTION Penta::GetNodeIndex {{{*/
    894 int Penta::GetNodeIndex(Node* node){
     868int        Penta::GetNodeIndex(Node* node){/*{{{*/
    895869
    896870        _assert_(nodes);
     
    904878}
    905879/*}}}*/
    906 /*FUNCTION Penta::GetNumberOfNodes;{{{*/
    907 int Penta::GetNumberOfNodes(void){
     880int        Penta::GetNumberOfNodes(void){/*{{{*/
    908881        return this->NumberofNodes();
    909882}
    910883/*}}}*/
    911 /*FUNCTION Penta::GetNumberOfVertices;{{{*/
    912 int Penta::GetNumberOfVertices(void){
     884int        Penta::GetNumberOfVertices(void){/*{{{*/
    913885        return NUMVERTICES;
    914886}
    915887/*}}}*/
    916 /*FUNCTION Penta::GetNode(int node_number) {{{*/
    917 Node* Penta::GetNode(int node_number){
     888Node* Penta::GetNode(int node_number){/*{{{*/
    918889        _assert_(node_number>=0);
    919890        _assert_(node_number<this->NumberofNodes());
     
    921892}
    922893/*}}}*/
    923 /*FUNCTION Penta::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype) {{{*/
    924 void Penta::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){
     894void       Penta::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){/*{{{*/
    925895
    926896        Input* input=inputs->GetInput(enumtype);
     
    934904}
    935905/*}}}*/
    936 /*FUNCTION Penta::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){{{*/
    937 void Penta::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){
     906void       Penta::GetVerticesCoordinatesBase(IssmDouble** pxyz_list){/*{{{*/
    938907
    939908        IssmDouble* xyz_list = xNew<IssmDouble>(NUMVERTICES2D*3);
     
    944913
    945914}/*}}}*/
    946 /*FUNCTION Penta::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){{{*/
    947 void Penta::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){
     915void       Penta::GetVerticesCoordinatesTop(IssmDouble** pxyz_list){/*{{{*/
    948916
    949917        IssmDouble* xyz_list = xNew<IssmDouble>(NUMVERTICES2D*3);
     
    954922
    955923}/*}}}*/
    956 /*FUNCTION Penta::NormalSection{{{*/
    957 void Penta::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){
     924void       Penta::NormalSection(IssmDouble* normal,IssmDouble* xyz_list){/*{{{*/
    958925
    959926        /*Build unit outward pointing vector*/
     
    975942}
    976943/*}}}*/
    977 /*FUNCTION Penta::StabilizationParameter {{{*/
    978 IssmDouble Penta::StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){
     944IssmDouble Penta::StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){/*{{{*/
    979945        /*Compute stabilization parameter*/
    980946        /*kappa=thermalconductivity/(rho_ice*hearcapacity) for thermal model*/
     
    993959}
    994960/*}}}*/
    995 /*FUNCTION Penta::ZeroLevelsetCoordinates{{{*/
    996 void Penta::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){
     961void       Penta::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){/*{{{*/
    997962        /*Compute portion of the element that is grounded*/
    998963
     
    11491114}
    11501115/*}}}*/
    1151 /*FUNCTION Penta::InputDepthAverageAtBase{{{*/
    1152 void  Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type){
     1116void       Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type){/*{{{*/
    11531117
    11541118        int  step,i;
     
    12511215}
    12521216/*}}}*/
    1253 /*FUNCTION Penta::InputExtrude {{{*/
    1254 void  Penta::InputExtrude(int enum_type){
     1217void       Penta::InputExtrude(int enum_type){/*{{{*/
    12551218
    12561219        int     i,num_inputs;
     
    12951258}
    12961259/*}}}*/
    1297 /*FUNCTION Penta::InputScale{{{*/
    1298 void  Penta::InputScale(int enum_type,IssmDouble scale_factor){
     1260void       Penta::InputScale(int enum_type,IssmDouble scale_factor){/*{{{*/
    12991261
    13001262        Input* input=NULL;
     
    13081270}
    13091271/*}}}*/
    1310 /*FUNCTION Penta::InputUpdateFromIoModel {{{*/
    1311 void Penta::InputUpdateFromIoModel(int index,IoModel* iomodel){
     1272void       Penta::InputUpdateFromIoModel(int index,IoModel* iomodel){ /*{{{*/
    13121273
    13131274        /*Intermediaries*/
     
    14051366}
    14061367/*}}}*/
    1407 /*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{*/
    1408 void  Penta::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){
     1368void       Penta::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){/*{{{*/
    14091369
    14101370        /*Intermediary*/
     
    14321392}
    14331393/*}}}*/
    1434 /*FUNCTION Penta::InputUpdateFromSolutionOneDofCollpased{{{*/
    1435 void  Penta::InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int enum_type){
     1394void       Penta::InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int enum_type){/*{{{*/
    14361395
    14371396        const int  numdof   = NDOF1*NUMVERTICES;
     
    14721431}
    14731432/*}}}*/
    1474 /*FUNCTION Penta::InputUpdateFromVector(IssmDouble* vector, int name, int type);{{{*/
    1475 void  Penta::InputUpdateFromVector(IssmDouble* vector, int name, int type){
     1433void       Penta::InputUpdateFromVector(IssmDouble* vector, int name, int type){/*{{{*/
    14761434
    14771435        const int   numdof         = NDOF1 *NUMVERTICES;
     
    15321490}
    15331491/*}}}*/
    1534 /*FUNCTION Penta::IsOnBase{{{*/
    1535 bool Penta::IsOnBase(void){
     1492bool       Penta::IsOnBase(void){/*{{{*/
    15361493
    15371494        IssmDouble values[NUMVERTICES];
     
    15511508}
    15521509/*}}}*/
    1553 /*FUNCTION Penta::IsOnSurface{{{*/
    1554 bool Penta::IsOnSurface(void){
     1510bool       Penta::IsOnSurface(void){/*{{{*/
    15551511
    15561512        IssmDouble values[NUMVERTICES];
     
    15701526}
    15711527/*}}}*/
    1572 /*FUNCTION Penta::IsNodeOnShelfFromFlags {{{*/
    1573 bool   Penta::IsNodeOnShelfFromFlags(IssmDouble* flags){
     1528bool   Penta::IsNodeOnShelfFromFlags(IssmDouble* flags){/*{{{*/
    15741529
    15751530        int  i;
     
    15851540}
    15861541/*}}}*/
    1587 /*FUNCTION Penta::JacobianDeterminant{{{*/
    1588 void Penta::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){
     1542void       Penta::JacobianDeterminant(IssmDouble* pJdet,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    15891543
    15901544        _assert_(gauss->Enum()==GaussPentaEnum);
     
    15931547}
    15941548/*}}}*/
    1595 /*FUNCTION Penta::JacobianDeterminantBase{{{*/
    1596 void Penta::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){
     1549void       Penta::JacobianDeterminantBase(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){/*{{{*/
    15971550
    15981551        _assert_(gauss->Enum()==GaussPentaEnum);
     
    16011554}
    16021555/*}}}*/
    1603 /*FUNCTION Penta::JacobianDeterminantLine{{{*/
    1604 void Penta::JacobianDeterminantLine(IssmDouble* pJdet,IssmDouble* xyz_list_line,Gauss* gauss){
     1556void       Penta::JacobianDeterminantLine(IssmDouble* pJdet,IssmDouble* xyz_list_line,Gauss* gauss){/*{{{*/
    16051557
    16061558        _assert_(gauss->Enum()==GaussPentaEnum);
     
    16091561}
    16101562/*}}}*/
    1611 /*FUNCTION Penta::JacobianDeterminantTop{{{*/
    1612 void Penta::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){
     1563void       Penta::JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_top,Gauss* gauss){/*{{{*/
    16131564
    16141565        _assert_(gauss->Enum()==GaussPentaEnum);
     
    16171568}
    16181569/*}}}*/
    1619 /*FUNCTION Penta::JacobianDeterminantSurface{{{*/
    1620 void Penta::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list_quad,Gauss* gauss){
     1570void       Penta::JacobianDeterminantSurface(IssmDouble* pJdet,IssmDouble* xyz_list_quad,Gauss* gauss){/*{{{*/
    16211571
    16221572        _assert_(gauss->Enum()==GaussPentaEnum);
     
    16251575}
    16261576/*}}}*/
    1627 /*FUNCTION Penta::MinEdgeLength{{{*/
    1628 IssmDouble Penta::MinEdgeLength(IssmDouble* xyz_list){
     1577IssmDouble Penta::MinEdgeLength(IssmDouble* xyz_list){/*{{{*/
    16291578        /*Return the minimum lenght of the nine egdes of the penta*/
    16301579
     
    16471596}
    16481597/*}}}*/
    1649 /*FUNCTION Penta::NodalValue {{{*/
    1650 int    Penta::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){
     1598int    Penta::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){/*{{{*/
    16511599
    16521600        int i;
     
    16791627}
    16801628/*}}}*/
    1681 /*FUNCTION Penta::NewGauss(){{{*/
    1682 Gauss* Penta::NewGauss(void){
     1629Gauss* Penta::NewGauss(void){/*{{{*/
    16831630        return new GaussPenta();
    16841631}
    16851632/*}}}*/
    1686 /*FUNCTION Penta::NewGauss(int order){{{*/
    1687 Gauss* Penta::NewGauss(int order){
     1633Gauss* Penta::NewGauss(int order){/*{{{*/
    16881634        return new GaussPenta(order,order);
    16891635}
    16901636/*}}}*/
    1691 /*FUNCTION Penta::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){{{*/
    1692 Gauss* Penta::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){
     1637Gauss* Penta::NewGauss(IssmDouble* xyz_list, IssmDouble* xyz_list_front,int order_horiz,int order_vert){/*{{{*/
    16931638
    16941639        IssmDouble  area_coordinates[4][3];
     
    16991644}
    17001645/*}}}*/
    1701 /*FUNCTION Penta::NewGaussBase(int order){{{*/
    1702 Gauss* Penta::NewGaussBase(int order){
     1646Gauss* Penta::NewGaussBase(int order){/*{{{*/
    17031647        return new GaussPenta(0,1,2,order);
    17041648}
    17051649/*}}}*/
    1706 /*FUNCTION Penta::NewGaussLine(int vertex1,int vertex2,int order){{{*/
    1707 Gauss* Penta::NewGaussLine(int vertex1,int vertex2,int order){
     1650Gauss* Penta::NewGaussLine(int vertex1,int vertex2,int order){/*{{{*/
    17081651        return new GaussPenta(vertex1,vertex2,order);
    17091652}
    17101653/*}}}*/
    1711 /*FUNCTION Penta::NewGaussTop(int order){{{*/
    1712 Gauss* Penta::NewGaussTop(int order){
     1654Gauss* Penta::NewGaussTop(int order){/*{{{*/
    17131655        return new GaussPenta(3,4,5,order);
    17141656}
    17151657/*}}}*/
    1716 /*FUNCTION Penta::NodalFunctions{{{*/
    1717 void Penta::NodalFunctions(IssmDouble* basis, Gauss* gauss){
     1658void       Penta::NodalFunctions(IssmDouble* basis, Gauss* gauss){/*{{{*/
    17181659
    17191660        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17221663}
    17231664/*}}}*/
    1724 /*FUNCTION Penta::NodalFunctionsP1{{{*/
    1725 void Penta::NodalFunctionsP1(IssmDouble* basis, Gauss* gauss){
     1665void       Penta::NodalFunctionsP1(IssmDouble* basis, Gauss* gauss){/*{{{*/
    17261666
    17271667        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17301670}
    17311671/*}}}*/
    1732 /*FUNCTION Penta::NodalFunctionsDerivatives{{{*/
    1733 void Penta::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1672void       Penta::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    17341673
    17351674        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17381677}
    17391678/*}}}*/
    1740 /*FUNCTION Penta::NodalFunctionsP1Derivatives{{{*/
    1741 void Penta::NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1679void       Penta::NodalFunctionsP1Derivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    17421680
    17431681        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17461684}
    17471685/*}}}*/
    1748 /*FUNCTION Penta::NodalFunctionsMINIDerivatives{{{*/
    1749 void Penta::NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1686void       Penta::NodalFunctionsMINIDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    17501687
    17511688        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17541691}
    17551692/*}}}*/
    1756 /*FUNCTION Penta::NodalFunctionsDerivativesVelocity{{{*/
    1757 void Penta::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
     1693void       Penta::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    17581694
    17591695        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17621698}
    17631699/*}}}*/
    1764 /*FUNCTION Penta::NodalFunctionsVelocity{{{*/
    1765 void Penta::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
     1700void       Penta::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){/*{{{*/
    17661701
    17671702        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17701705}
    17711706/*}}}*/
    1772 /*FUNCTION Penta::NodalFunctionsPressure{{{*/
    1773 void Penta::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
     1707void       Penta::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){/*{{{*/
    17741708
    17751709        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17781712}
    17791713/*}}}*/
    1780 /*FUNCTION Penta::NodalFunctionsTensor{{{*/
    1781 void Penta::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
     1714void       Penta::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){/*{{{*/
    17821715
    17831716        _assert_(gauss->Enum()==GaussPentaEnum);
     
    17861719}
    17871720/*}}}*/
    1788 /*FUNCTION Penta::NormalBase {{{*/
    1789 void Penta::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){
     1721void       Penta::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){/*{{{*/
    17901722
    17911723        IssmDouble v13[3],v23[3];
     
    18091741}
    18101742/*}}}*/
    1811 /*FUNCTION Penta::NormalTop {{{*/
    1812 void Penta::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){
     1743void       Penta::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){/*{{{*/
    18131744
    18141745        int i;
     
    18321763}
    18331764/*}}}*/
    1834 /*FUNCTION Penta::NumberofNodesPressure{{{*/
    1835 int Penta::NumberofNodesPressure(void){
     1765int        Penta::NumberofNodesPressure(void){/*{{{*/
    18361766        return PentaRef::NumberofNodes(this->PressureInterpolation());
    18371767}
    18381768/*}}}*/
    1839 /*FUNCTION Penta::NumberofNodesVelocity{{{*/
    1840 int Penta::NumberofNodesVelocity(void){
     1769int        Penta::NumberofNodesVelocity(void){/*{{{*/
    18411770        return PentaRef::NumberofNodes(this->VelocityInterpolation());
    18421771}
    18431772/*}}}*/
    1844 /*FUNCTION Penta::PositiveDegreeDay{{{*/
    1845 void  Penta::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){
     1773void       Penta::PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){/*{{{*/
    18461774
    18471775   IssmDouble agd[NUMVERTICES];             // surface mass balance
     
    18941822}
    18951823/*}}}*/
    1896 /*FUNCTION Penta::ReduceMatrices{{{*/
    1897 void Penta::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){
     1824void       Penta::ReduceMatrices(ElementMatrix* Ke,ElementVector* pe){/*{{{*/
    18981825
    18991826        int analysis_type;
     
    19511878}
    19521879/*}}}*/
    1953 /*FUNCTION Penta::ResetFSBasalBoundaryCondition{{{*/
    1954 void  Penta::ResetFSBasalBoundaryCondition(void){
     1880void       Penta::ResetFSBasalBoundaryCondition(void){/*{{{*/
    19551881
    19561882        int          approximation;
     
    20141940}
    20151941/*}}}*/
    2016 /*FUNCTION Penta::SetClone {{{*/
    2017 void  Penta::SetClone(int* minranks){
     1942void       Penta::SetClone(int* minranks){/*{{{*/
    20181943
    20191944        _error_("not implemented yet");
    20201945}
    20211946/*}}}*/
    2022 /*FUNCTION Penta::SetCurrentConfiguration {{{*/
    2023 void  Penta::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){
     1947void       Penta::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, Nodes* nodesin, Materials* materialsin, Parameters* parametersin){/*{{{*/
    20241948
    20251949        /*go into parameters and get the analysis_counter: */
     
    20361960}
    20371961/*}}}*/
    2038 /*FUNCTION Penta::SetTemporaryElementType{{{*/
    2039 void Penta::SetTemporaryElementType(int element_type_in){
     1962void       Penta::SetTemporaryElementType(int element_type_in){/*{{{*/
    20401963        this->element_type=element_type_in;
    20411964}
    20421965/*}}}*/
    2043 /*FUNCTION Penta::SpawnTria {{{*/
    2044 Tria*  Penta::SpawnTria(int index1,int index2,int index3){
     1966Tria*      Penta::SpawnTria(int index1,int index2,int index3){/*{{{*/
    20451967
    20461968        int analysis_counter;
     
    20691991}
    20701992/*}}}*/
    2071 /*FUNCTION Penta::SpawnBasalElement{{{*/
    2072 Element*  Penta::SpawnBasalElement(void){
     1993Element*   Penta::SpawnBasalElement(void){/*{{{*/
    20731994
    20741995        _assert_(this->IsOnBase());
     
    20872008}
    20882009/*}}}*/
    2089 /*FUNCTION Penta::SpawnTopElement{{{*/
    2090 Element*  Penta::SpawnTopElement(void){
     2010Element*   Penta::SpawnTopElement(void){/*{{{*/
    20912011
    20922012        _assert_(this->IsOnSurface());
     
    20972017}
    20982018/*}}}*/
    2099 /*FUNCTION Penta::SmbGradients{{{*/
    2100 void Penta::SmbGradients(void){
     2019void       Penta::SmbGradients(void){/*{{{*/
    21012020
    21022021        int i;
     
    21432062}
    21442063/*}}}*/
    2145 /*FUNCTION Penta::SurfaceArea {{{*/
    2146 IssmDouble Penta::SurfaceArea(void){
     2064IssmDouble Penta::SurfaceArea(void){/*{{{*/
    21472065
    21482066        int    approximation;
     
    21802098}
    21812099/*}}}*/
    2182 /*FUNCTION Penta::TimeAdapt{{{*/
    2183 IssmDouble  Penta::TimeAdapt(void){
     2100IssmDouble Penta::TimeAdapt(void){/*{{{*/
    21842101
    21852102        int    i;
     
    22242141        return dt;
    22252142}/*}}}*/
    2226 /*FUNCTION Penta::Update {{{*/
    2227 void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){
     2143void       Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type,int finiteelement_type){ /*{{{*/
    22282144
    22292145        /*Intermediaries*/
     
    25312447}
    25322448/*}}}*/
    2533 /*FUNCTION Penta::UpdateConstraintsExtrudeFromBase{{{*/
    2534 void  Penta::UpdateConstraintsExtrudeFromBase(void){
     2449void       Penta::UpdateConstraintsExtrudeFromBase(void){/*{{{*/
    25352450
    25362451        if(!IsOnBase()) return;
     
    25562471}
    25572472/*}}}*/
    2558 /*FUNCTION Penta::UpdateConstraintsExtrudeFromTop{{{*/
    2559 void  Penta::UpdateConstraintsExtrudeFromTop(void){
     2473void       Penta::UpdateConstraintsExtrudeFromTop(void){/*{{{*/
    25602474
    25612475        if(!IsOnSurface()) return;
     
    25782492}
    25792493/*}}}*/
    2580 /*FUNCTION Penta::ValueP1OnGauss{{{*/
    2581 void Penta::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){
     2494void       Penta::ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){/*{{{*/
    25822495        PentaRef::GetInputValue(pvalue,values,gauss,P1Enum);
    25832496}
    25842497/*}}}*/
    2585 /*FUNCTION Penta::ValueP1DerivativesOnGauss{{{*/
    2586 void Penta::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){
     2498void       Penta::ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
    25872499        PentaRef::GetInputDerivativeValue(dvalue,values,xyz_list,gauss);
    25882500}
    25892501/*}}}*/
    2590 /*FUNCTION Penta::VertexConnectivity{{{*/
    2591 int Penta::VertexConnectivity(int vertexindex){
     2502int        Penta::VertexConnectivity(int vertexindex){/*{{{*/
    25922503        _assert_(this->vertices);
    25932504        return this->vertices[vertexindex]->Connectivity();
    25942505}
    25952506/*}}}*/
    2596 /*FUNCTION Penta::VerticalSegmentIndices{{{*/
    2597 void Penta::VerticalSegmentIndices(int** pindices,int* pnumseg){
     2507void       Penta::VerticalSegmentIndices(int** pindices,int* pnumseg){/*{{{*/
    25982508
    25992509        /*output*/
     
    26082518}
    26092519/*}}}*/
    2610 /*FUNCTION Penta::ViscousHeating{{{*/
    2611 void Penta::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){
     2520void       Penta::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){/*{{{*/
    26122521
    26132522        /*Intermediaries*/
     
    26252534}
    26262535/*}}}*/
    2627 /*FUNCTION Penta::VelocityInterpolation{{{*/
    2628 int Penta::VelocityInterpolation(void){
     2536int        Penta::VelocityInterpolation(void){/*{{{*/
    26292537        return PentaRef::VelocityInterpolation();
    26302538}
    26312539/*}}}*/
    2632 /*FUNCTION Penta::PressureInterpolation{{{*/
    2633 int Penta::PressureInterpolation(void){
     2540int        Penta::PressureInterpolation(void){/*{{{*/
    26342541        return PentaRef::PressureInterpolation();
    26352542}
    26362543/*}}}*/
    2637 /*FUNCTION Penta::IsZeroLevelset{{{*/
    2638 bool Penta::IsZeroLevelset(int levelset_enum){
     2544bool       Penta::IsZeroLevelset(int levelset_enum){/*{{{*/
    26392545
    26402546        bool        iszerols;
     
    26542560}
    26552561/*}}}*/
    2656 bool  Penta::IsIcefront(void){/*{{{*/
     2562bool       Penta::IsIcefront(void){/*{{{*/
    26572563
    26582564        bool isicefront;
     
    26732579        return isicefront;
    26742580}/*}}}*/
    2675 /*FUNCTION Penta::AverageOntoPartition {{{*/
    2676 void  Penta::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
     2581void       Penta::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){/*{{{*/
    26772582        _error_("Not supported yet!");
    26782583}
    26792584/*}}}*/
    2680 /*FUNCTION Penta::IceVolume {{{*/
    2681 IssmDouble Penta::IceVolume(void){
     2585IssmDouble Penta::IceVolume(void){/*{{{*/
    26822586
    26832587        /*The volume of a troncated prism is base * 1/3 sum(length of edges)*/
     
    27012605}
    27022606/*}}}*/
    2703 /*FUNCTION Penta::IceVolumeAboveFloatation {{{*/
    2704 IssmDouble Penta::IceVolumeAboveFloatation(void){
     2607IssmDouble Penta::IceVolumeAboveFloatation(void){/*{{{*/
    27052608
    27062609        /*Volume above floatation: H + rho_water/rho_ice*bathymetry for nodes on the bed*/
     
    27322635}
    27332636/*}}}*/
    2734 /*FUNCTION Penta::MinVel{{{*/
    2735 void  Penta::MinVel(IssmDouble* pminvel){
     2637void       Penta::MinVel(IssmDouble* pminvel){/*{{{*/
    27362638
    27372639        /*Get minimum:*/
     
    27422644}
    27432645/*}}}*/
    2744 /*FUNCTION Penta::MinVx{{{*/
    2745 void  Penta::MinVx(IssmDouble* pminvx){
     2646void       Penta::MinVx(IssmDouble* pminvx){/*{{{*/
    27462647
    27472648        /*Get minimum:*/
     
    27522653}
    27532654/*}}}*/
    2754 /*FUNCTION Penta::MinVy{{{*/
    2755 void  Penta::MinVy(IssmDouble* pminvy){
     2655void       Penta::MinVy(IssmDouble* pminvy){/*{{{*/
    27562656
    27572657        /*Get minimum:*/
     
    27622662}
    27632663/*}}}*/
    2764 /*FUNCTION Penta::MinVz{{{*/
    2765 void  Penta::MinVz(IssmDouble* pminvz){
     2664void       Penta::MinVz(IssmDouble* pminvz){/*{{{*/
    27662665
    27672666        /*Get minimum:*/
     
    27722671}
    27732672/*}}}*/
    2774 /*FUNCTION Penta::MassFlux {{{*/
    2775 IssmDouble Penta::MassFlux( IssmDouble* segment){
     2673IssmDouble Penta::MassFlux( IssmDouble* segment){/*{{{*/
    27762674
    27772675        IssmDouble mass_flux=0;
     
    27962694}
    27972695/*}}}*/
    2798 /*FUNCTION Penta::MassFlux {{{*/
    2799 IssmDouble Penta::MassFlux( IssmDouble x1, IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){
     2696IssmDouble Penta::MassFlux( IssmDouble x1, IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){/*{{{*/
    28002697
    28012698        IssmDouble mass_flux=0;
     
    28202717}
    28212718/*}}}*/
    2822 /*FUNCTION Penta::MaxAbsVx{{{*/
    2823 void  Penta::MaxAbsVx(IssmDouble* pmaxabsvx){
     2719void       Penta::MaxAbsVx(IssmDouble* pmaxabsvx){/*{{{*/
    28242720
    28252721        /*Get maximum:*/
     
    28302726}
    28312727/*}}}*/
    2832 /*FUNCTION Penta::MaxAbsVy{{{*/
    2833 void  Penta::MaxAbsVy(IssmDouble* pmaxabsvy){
     2728void       Penta::MaxAbsVy(IssmDouble* pmaxabsvy){/*{{{*/
    28342729
    28352730        /*Get maximum:*/
     
    28402735}
    28412736/*}}}*/
    2842 /*FUNCTION Penta::MaxAbsVz{{{*/
    2843 void  Penta::MaxAbsVz(IssmDouble* pmaxabsvz){
     2737void       Penta::MaxAbsVz(IssmDouble* pmaxabsvz){/*{{{*/
    28442738
    28452739        /*Get maximum:*/
     
    28502744}
    28512745/*}}}*/
    2852 /*FUNCTION Penta::MaxVel{{{*/
    2853 void  Penta::MaxVel(IssmDouble* pmaxvel){
     2746void       Penta::MaxVel(IssmDouble* pmaxvel){/*{{{*/
    28542747
    28552748        /*Get maximum:*/
     
    28612754}
    28622755/*}}}*/
    2863 /*FUNCTION Penta::MaxVx{{{*/
    2864 void  Penta::MaxVx(IssmDouble* pmaxvx){
     2756void       Penta::MaxVx(IssmDouble* pmaxvx){/*{{{*/
    28652757
    28662758        /*Get maximum:*/
     
    28712763}
    28722764/*}}}*/
    2873 /*FUNCTION Penta::MaxVy{{{*/
    2874 void  Penta::MaxVy(IssmDouble* pmaxvy){
     2765void       Penta::MaxVy(IssmDouble* pmaxvy){/*{{{*/
    28752766
    28762767        /*Get maximum:*/
     
    28812772}
    28822773/*}}}*/
    2883 /*FUNCTION Penta::MaxVz{{{*/
    2884 void  Penta::MaxVz(IssmDouble* pmaxvz){
     2774void       Penta::MaxVz(IssmDouble* pmaxvz){/*{{{*/
    28852775
    28862776        /*Get maximum:*/
     
    28912781}
    28922782/*}}}*/
    2893 /*FUNCTION Penta::ElementResponse{{{*/
    2894 void Penta::ElementResponse(IssmDouble* presponse,int response_enum){
     2783void       Penta::ElementResponse(IssmDouble* presponse,int response_enum){/*{{{*/
    28952784
    28962785        switch(response_enum){
     
    29212810}
    29222811/*}}}*/
    2923 /*FUNCTION Penta::TotalSmb {{{*/
    2924 IssmDouble Penta::TotalSmb(void){
     2812IssmDouble Penta::TotalSmb(void){/*{{{*/
    29252813
    29262814        /*The smb[Gt yr-1] of one element is area[m2] * smb [ m ice yr^-1] * rho_ice [kg m-3] / 1e+10^12 */
     
    29532841
    29542842#ifdef _HAVE_GIA_
    2955 /*FUNCTION Penta::GiaDeflection {{{*/
    2956 void Penta::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){
     2843void       Penta::GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y){/*{{{*/
    29572844        _error_("GIA deflection not implemented yet!");
    29582845}
     
    29602847#endif
    29612848
    2962 /*FUNCTION Penta::ControlInputGetGradient{{{*/
    2963 void Penta::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){
     2849void       Penta::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){/*{{{*/
    29642850
    29652851        int vertexpidlist[NUMVERTICES];
     
    29842870
    29852871}/*}}}*/
    2986 /*FUNCTION Penta::ControlInputScaleGradient{{{*/
    2987 void Penta::ControlInputScaleGradient(int enum_type,IssmDouble scale){
     2872void       Penta::ControlInputScaleGradient(int enum_type,IssmDouble scale){/*{{{*/
    29882873
    29892874        Input* input=NULL;
     
    30032888        ((ControlInput*)input)->ScaleGradient(scale);
    30042889}/*}}}*/
    3005 /*FUNCTION Penta::ControlInputSetGradient{{{*/
    3006 void Penta::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){
     2890void       Penta::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){/*{{{*/
    30072891
    30082892        int    vertexpidlist[NUMVERTICES];
     
    30292913
    30302914}/*}}}*/
    3031 /*FUNCTION Penta::ControlToVectors{{{*/
    3032 void Penta::ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){
     2915void       Penta::ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){/*{{{*/
    30332916
    30342917        Input* input=NULL;
     
    30712954
    30722955}/*}}}*/
    3073 /*FUNCTION Penta::GradientIndexing{{{*/
    3074 void Penta::GradientIndexing(int* indexing,int control_index){
     2956void       Penta::GradientIndexing(int* indexing,int control_index){/*{{{*/
    30752957
    30762958        /*Get some parameters*/
     
    30852967}
    30862968/*}}}*/
    3087 /*FUNCTION Penta::Gradj {{{*/
    3088 void  Penta::Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index){
     2969void       Penta::Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index){/*{{{*/
    30892970        /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/
    30902971
     
    31783059}
    31793060/*}}}*/
    3180 /*FUNCTION Penta::GradjDragSSA {{{*/
    3181 void  Penta::GradjDragSSA(Vector<IssmDouble>* gradient,int control_index){
     3061void       Penta::GradjDragSSA(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    31823062
    31833063        /*Gradient is 0 if on shelf or not on bed*/
     
    31903070
    31913071} /*}}}*/
    3192 /*FUNCTION Penta::GradjDragHO {{{*/
    3193 void  Penta::GradjDragHO(Vector<IssmDouble>* gradient,int control_index){
     3072void       Penta::GradjDragHO(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    31943073
    31953074        int        i,j;
     
    32613140}
    32623141/*}}}*/
    3263 /*FUNCTION Penta::GradjDragFS {{{*/
    3264 void  Penta::GradjDragFS(Vector<IssmDouble>* gradient,int control_index){
     3142void       Penta::GradjDragFS(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    32653143
    32663144        int        i,j;
     
    33533231}
    33543232/*}}}*/
    3355 /*FUNCTION Penta::GradjBbarSSA {{{*/
    3356 void  Penta::GradjBbarSSA(Vector<IssmDouble>* gradient,int control_index){
     3233void       Penta::GradjBbarSSA(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33573234
    33583235        /*This element should be collapsed into a tria element at its base*/
     
    33733250
    33743251} /*}}}*/
    3375 /*FUNCTION Penta::GradjBbarHO {{{*/
    3376 void  Penta::GradjBbarHO(Vector<IssmDouble>* gradient,int control_index){
     3252void       Penta::GradjBbarHO(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33773253
    33783254        /*Gradient is computed on bed only (Bbar)*/
     
    33923268        this->inputs->DeleteInput(DamageDbarEnum);
    33933269} /*}}}*/
    3394 /*FUNCTION Penta::GradjBbarFS {{{*/
    3395 void  Penta::GradjBbarFS(Vector<IssmDouble>* gradient,int control_index){
     3270void       Penta::GradjBbarFS(Vector<IssmDouble>* gradient,int control_index){/*{{{*/
    33963271
    33973272        /*Gradient is computed on bed only (Bbar)*/
     
    34113286        this->inputs->DeleteInput(DamageDbarEnum);
    34123287} /*}}}*/
    3413 /*FUNCTION Penta::InputControlUpdate{{{*/
    3414 void  Penta::InputControlUpdate(IssmDouble scalar,bool save_parameter){
     3288void       Penta::InputControlUpdate(IssmDouble scalar,bool save_parameter){/*{{{*/
    34153289
    34163290        /*Intermediary*/
     
    34553329}
    34563330/*}}}*/
    3457 /*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/
    3458 IssmDouble Penta::SurfaceAverageVelMisfit(void){
     3331IssmDouble Penta::SurfaceAverageVelMisfit(void){/*{{{*/
    34593332
    34603333        int    approximation;
     
    34923365}
    34933366/*}}}*/
    3494 /*FUNCTION Penta::SurfaceAbsVelMisfit {{{*/
    3495 IssmDouble Penta::SurfaceAbsVelMisfit(void){
     3367IssmDouble Penta::SurfaceAbsVelMisfit(void){/*{{{*/
    34963368
    34973369        int    approximation;
     
    35293401}
    35303402/*}}}*/
    3531 /*FUNCTION Penta::SurfaceLogVelMisfit {{{*/
    3532 IssmDouble Penta::SurfaceLogVelMisfit(void){
     3403IssmDouble Penta::SurfaceLogVelMisfit(void){/*{{{*/
    35333404
    35343405        int    approximation;
     
    35663437}
    35673438/*}}}*/
    3568 /*FUNCTION Penta::SurfaceLogVxVyMisfit {{{*/
    3569 IssmDouble Penta::SurfaceLogVxVyMisfit(void){
     3439IssmDouble Penta::SurfaceLogVxVyMisfit(void){/*{{{*/
    35703440
    35713441        IssmDouble J;
     
    36053475}
    36063476/*}}}*/
    3607 /*FUNCTION Penta::SurfaceRelVelMisfit {{{*/
    3608 IssmDouble Penta::SurfaceRelVelMisfit(void){
     3477IssmDouble Penta::SurfaceRelVelMisfit(void){/*{{{*/
    36093478
    36103479        int    approximation;
     
    36423511}
    36433512/*}}}*/
    3644 /*FUNCTION Penta::ThicknessAbsGradient{{{*/
    3645 IssmDouble Penta::ThicknessAbsGradient(void){
     3513IssmDouble Penta::ThicknessAbsGradient(void){/*{{{*/
    36463514
    36473515        _error_("Not implemented yet");
    36483516}
    36493517/*}}}*/
    3650 /*FUNCTION Penta::ThicknessAbsMisfit {{{*/
    3651 IssmDouble Penta::ThicknessAbsMisfit(void){
     3518IssmDouble Penta::ThicknessAbsMisfit(void){/*{{{*/
    36523519
    36533520        int    approximation;
     
    36683535}
    36693536/*}}}*/
    3670 /*FUNCTION Penta::DragCoefficientAbsGradient{{{*/
    3671 IssmDouble Penta::DragCoefficientAbsGradient(void){
     3537IssmDouble Penta::DragCoefficientAbsGradient(void){/*{{{*/
    36723538
    36733539        IssmDouble J;
     
    36833549}
    36843550/*}}}*/
    3685 /*FUNCTION Penta::RheologyBbarAbsGradient{{{*/
    3686 IssmDouble Penta::RheologyBbarAbsGradient(void){
     3551IssmDouble Penta::RheologyBbarAbsGradient(void){/*{{{*/
    36873552
    36883553        IssmDouble J;
     
    36983563}
    36993564/*}}}*/
    3700 /*FUNCTION Penta::GetVectorFromControlInputs{{{*/
    3701 void  Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){
     3565void       Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){/*{{{*/
    37023566
    37033567        int vertexpidlist[NUMVERTICES];
     
    37213585}
    37223586/*}}}*/
    3723 /*FUNCTION Penta::SetControlInputsFromVector{{{*/
    3724 void  Penta::SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){
     3587void       Penta::SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){/*{{{*/
    37253588
    37263589        IssmDouble  values[NUMVERTICES];
     
    37513614
    37523615#ifdef _HAVE_DAKOTA_
    3753 /*FUNCTION Penta::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type);{{{*/
    3754 void  Penta::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){
     3616void       Penta::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*{{{*/
    37553617
    37563618        int i,j;
     
    38523714}
    38533715/*}}}*/
    3854 /*FUNCTION Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type);{{{*/
    3855 void  Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){
     3716void       Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){/*{{{*/
    38563717
    38573718        int             i,t,row;
     
    38923753/*}}}*/
    38933754#endif
    3894 /*FUNCTION Penta::GetSolutionFromInputsOneDof {{{*/
    3895 void Penta::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){
     3755void       Penta::GetSolutionFromInputsOneDof(Vector<IssmDouble>* solution, int enum_type){/*{{{*/
    38963756
    38973757        const int    numdof=NDOF1*NUMVERTICES;
     
    39233783}
    39243784/*}}}*/
    3925 /*FUNCTION Penta::MigrateGroundingLine{{{*/
    3926 void  Penta::MigrateGroundingLine(IssmDouble* phi_ungrounding){
     3785void       Penta::MigrateGroundingLine(IssmDouble* phi_ungrounding){/*{{{*/
    39273786
    39283787        int        i,migration_style;
     
    40283887}
    40293888/*}}}*/
    4030 /*FUNCTION Penta::PotentialUngrounding{{{*/
    4031 void  Penta::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
     3889void       Penta::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){/*{{{*/
    40323890
    40333891        IssmDouble  h[NUMVERTICES],r[NUMVERTICES],gl[NUMVERTICES];
     
    40563914}
    40573915/*}}}*/
    4058 /*FUNCTION Penta::UpdatePotentialUngrounding{{{*/
    4059 int Penta::UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){
     3916int        Penta::UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){/*{{{*/
    40603917
    40613918        int i;
Note: See TracChangeset for help on using the changeset viewer.