Changeset 24939

Timestamp:

05/31/20 21:34:58 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some cleanup

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• analyses/EnthalpyAnalysis.h (modified) (1 diff)
• classes/Inputs2/DoubleInput2.cpp (modified) (1 diff)
• classes/Inputs2/IntInput2.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -1287 +1287 @@
         return kappa;
 }/*}}}*/
-void           EnthalpyAnalysis::GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
-        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*1.
-         * For node i, Bi' can be expressed in the actual coordinate system
-         * by:
-         *       Bi_advec =[ h ]
-         *                 [ h ]
-         *                 [ h ]
-         * where h is the interpolation function for node i.
-         *
-         * We assume B has been allocated already, of size: 3x(1*NUMNODESP1)
-         */
-
-        /*Fetch number of nodes for this finite element*/
-        int numnodes = element->GetNumberOfNodes();
-
-        /*Get nodal functions*/
-        IssmDouble* basis=xNew<IssmDouble>(numnodes);
-        element->NodalFunctions(basis,gauss);
-
-        /*Build B: */
-        for(int i=0;i<numnodes;i++){
-                B[numnodes*0+i] = basis[i];
-                B[numnodes*1+i] = basis[i];
-                B[numnodes*2+i] = basis[i];
-        }
-
-        /*Clean-up*/
-        xDelete<IssmDouble>(basis);
-}/*}}}*/
-void           EnthalpyAnalysis::GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
-        /*Compute B  matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*1.
-         * For node i, Bi' can be expressed in the actual coordinate system
-         * by:
-         *       Biprime_advec=[ dh/dx ]
-         *                     [ dh/dy ]
-         *                     [ dh/dz ]
-         * where h is the interpolation function for node i.
-         *
-         * We assume B has been allocated already, of size: 3x(1*numnodes)
-         */
-
-        /*Fetch number of nodes for this finite element*/
-        int numnodes = element->GetNumberOfNodes();
-
-        /*Get nodal functions derivatives*/
-        IssmDouble* dbasis=xNew<IssmDouble>(3*numnodes);
-        element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
-
-        /*Build B: */
-        for(int i=0;i<numnodes;i++){
-                B[numnodes*0+i] = dbasis[0*numnodes+i];
-                B[numnodes*1+i] = dbasis[1*numnodes+i];
-                B[numnodes*2+i] = dbasis[2*numnodes+i];
-        }
-
-        /*Clean-up*/
-        xDelete<IssmDouble>(dbasis);
-}/*}}}*/
 void           EnthalpyAnalysis::GetBasalConstraints(Vector<IssmDouble>* vec_spc,Element* element){/*{{{*/
 

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.h

@@ -41 +41 @@
                 static IssmDouble EnthalpyDiffusionParameter(Element* element,IssmDouble enthalpy,IssmDouble pressure);
                 static IssmDouble EnthalpyDiffusionParameterVolume(Element* element,int enthalpy_enum);
-                void              GetBAdvec(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
-                void              GetBAdvecprime(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
                 static void       GetBasalConstraints(Vector<IssmDouble>* vec_spc,Element* element);
                 static void       GetBasalConstraintsSteadystate(Vector<IssmDouble>* vec_spc,Element* element);

issm/trunk-jpl/src/c/classes/Inputs2/DoubleInput2.cpp

@@ -76 +76 @@
 void DoubleInput2::GetInput(IssmDouble* pvalue,int index){/*{{{*/
 
-        if(index<0){
-                printf("-------------- file: DoubleInput2.cpp line: %g\n",__LINE__); 
-        }
         _assert_(index>=0); 
         _assert_(index<this->size); 

issm/trunk-jpl/src/c/classes/Inputs2/IntInput2.cpp

@@ -76 +76 @@
 void IntInput2::GetInput(int* pvalue,int index){/*{{{*/
 
-        if(index<0){
-                printf("-------------- file: IntInput2.cpp line: %i\n",__LINE__); 
-                int* temp = xNew<int>(3);
-        }
         _assert_(index>=0); 
         _assert_(index<this->size);