Changeset 18193

Timestamp:

06/27/14 11:50:41 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: BalancethicknessAparentMassbalance was not in Isiinput

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (1 diff)
• cores/adjointbalancethickness2_core.cpp (modified) (1 diff)
• cores/controlvalidation_core.cpp (modified) (1 diff)

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

@@ -4825 +4825 @@
                 Input* vx_input=element->GetInput(VxEnum);                 _assert_(vx_input);
                 Input* vy_input=element->GetInput(VyEnum);                 _assert_(vy_input);
-                Input* vz_input;
+                Input* vz_input=NULL;
                 if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);}
 

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

@@ -903 +903 @@
                                 name==BedEnum ||
                                 name==BalancethicknessThickeningRateEnum ||
+                                name==BalancethicknessApparentMassbalanceEnum ||
                                 name==SurfaceSlopeXEnum ||
                                 name==SurfaceSlopeYEnum ||

issm/trunk-jpl/src/c/cores/adjointbalancethickness2_core.cpp

@@ -32 +32 @@
 
         /*Save results*/
-        if(save_results){
+        if(save_results || true){
                 if(VerboseSolution()) _printf0_("   saving results\n");
                 int outputs[1] = {AdjointEnum};

issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp

@@ -54 +54 @@
         IssmDouble exp0 = 0.;
         IssmDouble incr = -0.2;
-        IssmDouble exp1 = -8.;
+        IssmDouble exp1 = -10.;
         int        num  = reCast<int,IssmDouble>((exp1-exp0)/incr);