Changeset 17241

Timestamp:

02/07/14 16:16:58 (11 years ago)

Author:

jbondzio

Message:

BUG: integration for steadystate stressbalance LSM over elements with no ice

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• classes/FemModel.cpp (modified) (1 diff)
• modules/modules.h (modified) (1 diff)

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

@@ -289 +289 @@
                                         ./modules/IoModelToConstraintsx/IoModelToConstraintsx.h\
                                         ./modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp\
+                                        ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h\
+                                        ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp\
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\
                                         ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\

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

@@ -189 +189 @@
         iomodel->FetchDataToInput(elements,LoadingforceYEnum);
         iomodel->FetchDataToInput(elements,DamageDEnum);
+        iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
 
         if(iomodel->meshtype==Mesh3DEnum){
@@ -1023 +1024 @@
 void StressbalanceAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
+        _printf0_("Updating active and non-active nodes in Femmodel \n");
+        SetActiveNodesLSMx(femmodel->elements);
         return;
 }/*}}}*/
@@ -1112 +1115 @@
 ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA(Element* element){/*{{{*/
 
+        /* Check if ice in element */
+        if(!element->IsIceInElement()) return NULL;
+
         /*Intermediaries*/
         int      meshtype;
         Element* basalelement;
-
-        /* Check if ice in element */
-        if(!element->IsIceInElement()) return NULL;
 
         /*Get basal element*/

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -407 +407 @@
         if(VerboseModule()) _printf0_("   Updating constraints for time: " << time << "\n");
 
-        // analysis->UpdateConstraints();
+        Analysis* analysis= EnumToAnalysis(analysis_type);
+        analysis->UpdateConstraints(this);
+        delete analysis;
         
         /*Second, constraints might be time dependent: */

issm/trunk-jpl/src/c/modules/modules.h

@@ -32 +32 @@
 #include "./GiaDeflectionCorex/GiaDeflectionCorex.h"
 #include "./SetControlInputsFromVectorx/SetControlInputsFromVectorx.h"
+#include "./SetActiveNodesLSMx/SetActiveNodesLSMx.h"
 #include "./Gradjx/Gradjx.h"
 #include "./GroundinglineMigrationx/GroundinglineMigrationx.h"