Changeset 24433

Timestamp:

12/04/19 21:35:47 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: more flexible test

Location:

issm/trunk-jpl/src/c

Files:

• analyses/ExtrapolationAnalysis.cpp (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• analyses/MasstransportAnalysis.h (modified) (1 diff)
• modules/SystemMatricesx/SystemMatricesx.cpp (modified) (2 diffs)

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

@@ -82 +82 @@
 }/*}}}*/
 ElementMatrix* ExtrapolationAnalysis::CreateKMatrix(Element* element){/*{{{*/
-
-        if(!element->AnyFSet()) return NULL;
 
         /*Intermediaries */

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

@@ -789 +789 @@
         return pe;
 }/*}}}*/
-void           MasstransportAnalysis::GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
-        /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2.
-         * For node i, Bi can be expressed in the actual coordinate system
-         * by:
-         *       Bi=[ N ]
-         *          [ N ]
-         * where N is the finiteelement function for node i.
-         *
-         * We assume B_prog has been allocated already, of size: 2x(NDOF1*numnodes)
-         */
-
-        /*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++){
-                for(int j=0;j<dim;j++){
-                        B[numnodes*j+i] = basis[i];
-                }
-        }
-
-        /*Clean-up*/
-        xDelete<IssmDouble>(basis);
-}/*}}}*/
-void           MasstransportAnalysis::GetBprime(IssmDouble* Bprime,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
-        /*Compute B'  matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2.
-         * For node i, Bi' can be expressed in the actual coordinate system
-         * by:
-         *       Bi_prime=[ dN/dx ]
-         *                [ dN/dy ]
-         * where N is the finiteelement function for node i.
-         *
-         * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes)
-         */
-
-        /*Fetch number of nodes for this finite element*/
-        int numnodes = element->GetNumberOfNodes();
-
-        /*Get nodal functions derivatives*/
-        IssmDouble* dbasis=xNew<IssmDouble>(dim*numnodes);
-        element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
-
-        /*Build B': */
-        for(int i=0;i<numnodes;i++){
-                for(int j=0;j<dim;j++){
-                        Bprime[numnodes*j+i] = dbasis[j*numnodes+i];
-                }
-        }
-
-        /*Clean-up*/
-        xDelete<IssmDouble>(dbasis);
-
-}/*}}}*/
 void           MasstransportAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
         element->GetSolutionFromInputsOneDof(solution,ThicknessEnum);

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

@@ -30 +30 @@
                 ElementVector* CreatePVectorCG(Element* element);
                 ElementVector* CreatePVectorDG(Element* element);
-                void           GetB(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss);
-                void           GetBprime(IssmDouble* B,Element* element,int dim,IssmDouble* xyz_list,Gauss* gauss);
                 void           GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element);
                 void           GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index);

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

@@ -43 +43 @@
                 for (i=0;i<femmodel->elements->Size();i++){
                         element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                        //if(!element->AnyFSet()) continue;
+                        if(!element->AnyFSet() && analysisenum!=StressbalanceAnalysisEnum) continue;
                         ElementMatrix* Ke = analysis->CreateKMatrix(element);
                         ElementVector* pe = analysis->CreatePVector(element);
@@ -77 +77 @@
         for (i=0;i<femmodel->elements->Size();i++){
                 element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                //if(!element->AnyFSet()) continue;
+                if(!element->AnyFSet() && analysisenum!=StressbalanceAnalysisEnum) continue;
                 ElementMatrix* Ke = analysis->CreateKMatrix(element);
                 ElementVector* pe = analysis->CreatePVector(element);