Changeset 24731

Timestamp:

04/23/20 11:15:46 (5 years ago)

Author:

tsantos

Message:

CHG: inserting PVector in the FCT method

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp (modified) (7 diffs)

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

@@ -144 +144 @@
         *pLHS  = LHS;
 }/*}}}*/
-void CreateRHS(Vec* pRHS,Mat K,Mat D,Vec Ml,Vec u,IssmDouble theta,IssmDouble deltat,IssmDouble dmax,FemModel* femmodel,int configuration_type){/*{{{*/
+void CreateRHS(Vec* pRHS,Mat K,Mat D,Vec Ml,Vec p,Vec u,IssmDouble theta,IssmDouble deltat,IssmDouble dmax,FemModel* femmodel,int configuration_type){/*{{{*/
         /*Create Right Hand side of Lower order solution
          *
@@ -170 +170 @@
         VecPointwiseMult(RHS,Ml,u);
         VecAXPBYPCZ(RHS,(1-theta)*deltat,(1-theta)*deltat,1,Ku,Du);
+        VecAXPBY(RHS,deltat,1,p);
         VecFree(&Ku);
         VecFree(&Du);
@@ -392 +393 @@
         Matrix<IssmDouble>*  K  = NULL;
         Matrix<IssmDouble>*  Mc = NULL;
+        Vector<IssmDouble>*  p  = NULL;
         Vector<IssmDouble>*  ug = NULL;
         Vector<IssmDouble>*  uf = NULL;
@@ -401 +403 @@
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         femmodel->UpdateConstraintsx();
-        theta = 0.5;
+        theta = 0.5; //0.5==Crank-Nicolson, 1==Backward Euler
 
         /*Create analysis*/
@@ -410 +412 @@
                         manalysis->MassMatrix(&Mc,femmodel);
                         manalysis->FctKMatrix(&K,NULL,femmodel);
+                        manalysis->FctPVector(&p,femmodel);
                         break;
                 case DamageEvolutionAnalysisEnum:
@@ -431 +434 @@
         Mat K_petsc  = K->pmatrix->matrix;
         Mat Mc_petsc = Mc->pmatrix->matrix;
+        Vec p_petsc      = p->pvector->vector;
 
         /*Get previous solution u^n*/
@@ -449 +453 @@
 
         /*Create RHS: [ML + (1 - theta) deltaT L^n] u^n */
-        CreateRHS(&RHS,K_petsc,D_petsc,Ml_petsc,uf->pvector->vector,theta,deltat,dmax,femmodel,configuration_type);
+        CreateRHS(&RHS,K_petsc,D_petsc,Ml_petsc,p_petsc,uf->pvector->vector,theta,deltat,dmax,femmodel,configuration_type);
         delete uf;
+        delete p;
 
         /*Go solve lower order solution*/