Changeset 24713

Timestamp:

04/16/20 20:45:52 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying (a little bit) FCT

Location:

issm/trunk-jpl/src/c

Files:

• analyses/DamageEvolutionAnalysis.cpp (modified) (1 diff)
• analyses/DamageEvolutionAnalysis.h (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (2 diffs)
• analyses/MasstransportAnalysis.h (modified) (1 diff)
• solutionsequences/solutionsequence_fct.cpp (modified) (6 diffs)

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

@@ -894 +894 @@
         }
 }/*}}}*/
-void           DamageEvolutionAnalysis::LumpedMassMatrix(Vector<IssmDouble>** pMlff,FemModel* femmodel){/*{{{*/
-
-        /*Initialize Lumped mass matrix (actually we just save its diagonal)*/
-        int fsize      = femmodel->nodes->NumberOfDofs(FsetEnum);
-        int flocalsize = femmodel->nodes->NumberOfDofsLocal(FsetEnum);
-        Vector<IssmDouble>* Mlff = new Vector<IssmDouble>(flocalsize,fsize);
-
-        /*Create and assemble matrix*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element*       element = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                ElementMatrix* MLe     = this->CreateMassMatrix(element);
-                if(MLe){
-                        MLe->Lump();
-                        MLe->AddDiagonalToGlobal(Mlff);
-                }
-                delete MLe;
-        }
-        Mlff->Assemble();
-
-        /*Assign output pointer*/
-        *pMlff=Mlff;
-}/*}}}*/
 void           DamageEvolutionAnalysis::MassMatrix(Matrix<IssmDouble>** pMff,FemModel* femmodel){/*{{{*/
 

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

@@ -41 +41 @@
                 ElementMatrix* CreateMassMatrix(Element* element);
                 void           FctKMatrix(Matrix<IssmDouble>** pKff,Matrix<IssmDouble>** pKfs,FemModel* femmodel);
-                void           LumpedMassMatrix(Vector<IssmDouble>** pMLff,FemModel* femmodel);
                 void           MassMatrix(Matrix<IssmDouble>** pMff,FemModel* femmodel);
 };

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

@@ -975 +975 @@
         /*Clean up and return*/
         xDelete<IssmDouble>(xyz_list);
+        xDelete<IssmDouble>(D);
         xDelete<IssmDouble>(basis);
         xDelete<IssmDouble>(dbasis);
@@ -1048 +1049 @@
         }
 }/*}}}*/
-void           MasstransportAnalysis::LumpedMassMatrix(Vector<IssmDouble>** pMlff,FemModel* femmodel){/*{{{*/
-
-        /*Initialize Lumped mass matrix (actually we just save its diagonal)*/
-        int fsize      = femmodel->nodes->NumberOfDofs(FsetEnum);
-        int flocalsize = femmodel->nodes->NumberOfDofsLocal(FsetEnum);
-        Vector<IssmDouble>* Mlff = new Vector<IssmDouble>(flocalsize,fsize);
-
-        /*Create and assemble matrix*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element*       element = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                ElementMatrix* MLe     = this->CreateMassMatrix(element);
-                if(MLe){
-                        MLe->Lump();
-                        MLe->AddDiagonalToGlobal(Mlff);
-                }
-                delete MLe;
-        }
-        Mlff->Assemble();
-
-        /*Assign output pointer*/
-        *pMlff=Mlff;
-}/*}}}*/
 void           MasstransportAnalysis::MassMatrix(Matrix<IssmDouble>** pMff,FemModel* femmodel){/*{{{*/
 

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

@@ -39 +39 @@
                 ElementMatrix* CreateMassMatrix(Element* element);
                 void           FctKMatrix(Matrix<IssmDouble>** pKff,Matrix<IssmDouble>** pKfs,FemModel* femmodel);
-                void           LumpedMassMatrix(Vector<IssmDouble>** pMLff,FemModel* femmodel);
                 void           MassMatrix(Matrix<IssmDouble>** pMff,FemModel* femmodel);
 };

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp

@@ -338 +338 @@
         IssmDouble           theta,deltat,dmax;
         int                  configuration_type,analysis_type;
-        Vector<IssmDouble>*  Ml = NULL;
         Matrix<IssmDouble>*  K  = NULL;
         Matrix<IssmDouble>*  Mc = NULL;
@@ -357 +356 @@
                 case MasstransportAnalysisEnum:
                         manalysis = new MasstransportAnalysis();
-                        manalysis->LumpedMassMatrix(&Ml,femmodel);
                         manalysis->MassMatrix(&Mc,femmodel);
                         manalysis->FctKMatrix(&K,NULL,femmodel);
@@ -363 +361 @@
                 case DamageEvolutionAnalysisEnum:
                         danalysis = new DamageEvolutionAnalysis();
-                        danalysis->LumpedMassMatrix(&Ml,femmodel);
                         danalysis->MassMatrix(&Mc,femmodel);
                         danalysis->FctKMatrix(&K,NULL,femmodel);
@@ -381 +378 @@
         Vec udot     = NULL;
         Mat K_petsc  = K->pmatrix->matrix;
-        Vec Ml_petsc = Ml->pvector->vector;
         Mat Mc_petsc = Mc->pmatrix->matrix;
-
-        /*Create D Matrix*/
-        CreateDMatrix(&D_petsc,K_petsc);
-
-        /*Create LHS: [ML − theta*detlat *(K+D)^n+1]*/
-        CreateLHS(&LHS,&dmax,K_petsc,D_petsc,Ml_petsc,theta,deltat,femmodel,configuration_type);
 
         /*Get previous solution u^n*/
@@ -394 +384 @@
         Reducevectorgtofx(&uf, ug, femmodel->nodes,femmodel->parameters);
         delete ug;
+
+        /*Compute lumped mass matrix*/
+        Vec Ml_petsc = NULL;
+        VecDuplicate(uf->pvector->vector,&Ml_petsc);
+        MatGetRowSum(Mc_petsc,Ml_petsc);
+
+        /*Create D Matrix*/
+        CreateDMatrix(&D_petsc,K_petsc);
+
+        /*Create LHS: [ML − theta*detlat *(K+D)^n+1]*/
+        CreateLHS(&LHS,&dmax,K_petsc,D_petsc,Ml_petsc,theta,deltat,femmodel,configuration_type);
 
         /*Create RHS: [ML + (1 − theta) deltaT L^n] u^n */
@@ -445 +446 @@
         VecFree(&Fbar);
         VecFree(&udot);
-        delete Ml;
+        VecFree(&Ml_petsc);
 
         /*Update Element inputs*/