Changeset 17227 for issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

Timestamp:

02/07/14 09:36:22 (11 years ago)

Author:

jbondzio

Message:

CHG: backup dump - to be reverted

File:

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

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){
@@ -1024 +1026 @@
 }/*}}}*/
 void StressbalanceAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
-        /*Default, do nothing*/
+        SetActiveNodesLSMx(femmodel->elements);
         return;
 }/*}}}*/
@@ -1143 +1145 @@
         delete Ke1;
         delete Ke2;
+        
+        // FIXME: TESTING
+//      _printf0_("\n element ID: " << element->Id() << ";\n");
+//      Ke->Echo();
         return Ke;
 }/*}}}*/
@@ -1265 +1271 @@
                 newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity);
                 D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet;
+                
+//              _printf0_("element, node, weight, Jdet: " << element->Id() << "; " << ig << "; " << gauss->weight << "; " << Jdet << "\n");
+
                 for(int i=0;i<3;i++) D[i*3+i]=D_scalar;
 
@@ -1315 +1324 @@
         delete pe1;
         delete pe2;
+
+//      _printf0_("\n element ID: " << element->Id() << ";\n");
+//      pe->Echo();
+
         return pe;
 }/*}}}*/
@@ -1372 +1385 @@
 
         /*If no front, return NULL*/
-        if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+        if(!element->IsIcefront()) return NULL;
 
         /*Intermediaries*/
@@ -1395 +1408 @@
         IssmDouble gravity     = element->GetMaterialParameter(ConstantsGEnum);
         element->GetVerticesCoordinates(&xyz_list);
-        element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum);
+
+//      element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum);
+        element->GetIcefrontCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum);
+
         element->NormalSection(&normal[0],xyz_list_front);
+//      element->GetNormalFromLSF(&normal[0]);
 
         /*Start looping on Gaussian points*/
@@ -1785 +1802 @@
 
         /*If no front, return NULL*/
-        if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+        if(!element->IsIcefront()) return NULL;
 
         /*Intermediaries*/
@@ -2208 +2225 @@
 
         /*If no front, return NULL*/
-        if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+        if(!element->IsIcefront()) return NULL;
 
         /*Intermediaries*/
@@ -2974 +2991 @@
 
         /*If no front, return NULL*/
-        if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL;
+        if(!element->IsIcefront()) return NULL;
 
         /*Intermediaries*/