Changeset 18391

Timestamp:

08/14/14 15:49:48 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: forgot IsInput

Location:

issm/trunk-jpl/src/c

Files:

• analyses/AdjointBalancethickness2Analysis.cpp (modified) (3 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)

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

@@ -176 +176 @@
         switch(control_type){
                 case BalancethicknessApparentMassbalanceEnum: GradientJAdot(element,gradient,control_index); break;
-                case BalancethicknessNuxEnum: GradientJNux(element,gradient,control_index); break;
-                case BalancethicknessNuyEnum: GradientJNuy(element,gradient,control_index); break;
+                case BalancethicknessNuxEnum: GradientJNux(element,gradient,control_index); break;//should be in first part....
+                case BalancethicknessNuyEnum: GradientJNuy(element,gradient,control_index); break;//should be in first part....
                 default: _error_("control type not supported yet: " << EnumToStringx(control_type));
         }
@@ -256 +256 @@
         Input* potential_input = element->GetInput(PotentialEnum);             _assert_(potential_input);
 
-
         Gauss* gauss=element->NewGauss(2);
         for(int ig=gauss->begin();ig<gauss->end();ig++){
@@ -275 +274 @@
                         _assert_(!xIsNan<IssmDouble>(ge[i]));
                 }
+        }
+        if(element->Id()==1){
+                printarray(ge,3);
         }
         gradient->SetValues(numvertices,vertexpidlist,ge,ADD_VAL);

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1054 +1054 @@
                                 name==BalancethicknessThickeningRateEnum ||
                                 name==BalancethicknessApparentMassbalanceEnum ||
+                                name==BalancethicknessNuxEnum ||
+                                name==BalancethicknessNuyEnum ||
                                 name==SigmaNNEnum ||
                                 name==SurfaceSlopeXEnum ||