Changeset 20457

Timestamp:

04/07/16 12:49:45 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing L1L2 with new levelset implementation

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (5 diffs)
• modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (1 diff)

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

@@ -1901 +1901 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixL1L2(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         /*compute all stiffness matrices for this element*/
         ElementMatrix* Ke1=CreateKMatrixL1L2Viscous(element);
@@ -1982 +1985 @@
 }/*}}}*/
 ElementVector* StressbalanceAnalysis::CreatePVectorL1L2(Element* element){/*{{{*/
+
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
 
         /*Intermediaries*/
@@ -2969 +2975 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixFS(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         /*Get type of algorithm*/
         int fe_FS;
@@ -3401 +3410 @@
 ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         ElementVector* pe = NULL;
 
@@ -3686 +3698 @@
 ElementVector* StressbalanceAnalysis::CreatePVectorFS(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         ElementVector* pe = NULL;
-
         int fe_FS;
         element->FindParam(&fe_FS,FlowequationFeFSEnum);

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

@@ -66 +66 @@
 
                         if(analysis_type==StressbalanceAnalysisEnum){
-                                bool isSIA,isSSA;
+                                bool isSIA,isSSA,isL1L2;
                                 femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
                                 femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
-                                if(isSIA || isSSA)
+                                femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum);
+                                if(isSIA || isSSA || isL1L2)
                                         solvein2d=true;
                         }