Changeset 23133

Timestamp:

08/20/18 11:11:04 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting Schur stuff

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.h (modified) (1 diff)
• solutionsequences/solutionsequence_schurcg.cpp (deleted)
• solutionsequences/solutionsequences.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -251 +251 @@
                                         ./solutionsequences/solutionsequence_newton.cpp\
                                         ./solutionsequences/solutionsequence_fct.cpp\
-                                        ./solutionsequences/solutionsequence_schurcg.cpp\
                                         ./solutionsequences/convergence.cpp\
                                         ./classes/Options/Options.cpp\

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp ¶

@@ -5449 +5449 @@
 }/*}}}*/
 
-/*Schur*/
-void StressbalanceAnalysis::SchurF(Vector<IssmDouble>** pF,FemModel* femmodel){
-
-        /*Initialize Mass matrix*/
-        Vector<IssmDouble> *F = NULL;
-        //AllocateSystemMatricesx(&Mff,NULL,NULL,NULL,femmodel);
-
-        /*Create and assemble matrix*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element*       element = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                ElementVector* Fe = this->CreatePVectorFS(element);
-                if(F){
-                        Fe->AddToGlobal(F);
-                }
-                delete Fe;
-        }
-        F->Assemble();
-
-        /*Assign output pointer*/
-        *pF=F;
-}
-
 /*Coupling (Tiling)*/
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingHOFS(Element* element){/*{{{*/

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h ¶

@@ -97 +97 @@
                 void           InputUpdateFromSolutionFSXTH_tau(Elements* elements,Parameters* parameters);
 
-                /*Schur complement conjugate gradient stuff*/
-                void SchurF(Vector<IssmDouble>** pF,FemModel* femmodel);
-
                 /*Coupling*/
                 ElementMatrix* CreateKMatrixCouplingHOFS(Element* element);

issm/trunk-jpl/src/c/solutionsequences/solutionsequences.h ¶

@@ -18 +18 @@
 void solutionsequence_newton(FemModel* femmodel);
 void solutionsequence_fct(FemModel* femmodel);
-void solutionsequence_schurcg(FemModel* femmodel);
 void solutionsequence_FScoupling_nonlinear(FemModel* femmodel,bool conserve_loads);
 void solutionsequence_linear(FemModel* femmodel);