Changeset 16893

Timestamp:

11/22/13 12:12:08 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing problem with L1L2 friction

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)

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

@@ -1449 +1449 @@
         ElementMatrix* Ke2=CreateKMatrixL1L2Friction(element);
         ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2);
+        //if(element->Id()==62){
+        //Ke->Echo();
+        //Ke=element->CreateKMatrix();
+        //Ke->Echo();
+        //_error_("S");
+        //}
 
         /*clean-up and return*/
@@ -1457 +1463 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2Friction(Element* element){/*{{{*/
 
-        if(!element->IsOnBed() || !element->IsFloating()) return NULL;
+        if(!element->IsOnBed() || element->IsFloating()) return NULL;
         Element* basalelement = element->SpawnBasalElement();
         ElementMatrix* Ke = CreateKMatrixSSAFriction(basalelement);